diff --git a/.agents/skills/writing-kea-logics/SKILL.md b/.agents/skills/writing-kea-logics/SKILL.md
index 992bee4550fc..c82afb27bc20 100644
--- a/.agents/skills/writing-kea-logics/SKILL.md
+++ b/.agents/skills/writing-kea-logics/SKILL.md
@@ -44,9 +44,9 @@ If your work overlaps it, read the companion skill first.
    action that changed the value instead. See
    [references/reacting-to-changes.md](references/reacting-to-changes.md).
 
-4. **Generated types are the contract.** Every logic has an auto-generated
-   `*LogicType.ts` next to it. Import with `import type` and pass it as the kea type
-   parameter. Never edit the generated file.
+4. **Generated types are the contract.** Every logic has an inline generated
+   `MakeLogicType` block above its `kea()` call. Import a logic type from the logic
+   source file, never from a separate `*LogicType.ts` file.
 
 5. **Resources that need cleanup go through `cache.disposables`.** See the
    [using-kea-disposables](../using-kea-disposables/SKILL.md) skill.
@@ -131,12 +131,23 @@ today" — they age, so the pattern itself is the source of truth.
 ## Types and typegen
 
 ```ts
-import type { fooLogicType } from './fooLogicType'
+import { MakeLogicType, kea } from 'kea'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface fooLogicValues {
+  name: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface fooLogicActions {
+  setName: (name: string) => { name: string }
+}
+
+export type fooLogicType = MakeLogicType<fooLogicValues, fooLogicActions>
 export const fooLogic = kea<fooLogicType>([...])
 ```
 
-Generated `*LogicType.ts` files are produced by `kea-typegen` (we use the
-`3.6.2-leakfix.x` private fork). Commands:
+Inline type blocks are produced by `kea-typegen` 3.8.2. Commands:
 
 - `pnpm --filter=@posthog/frontend typegen:watch` — watch mode while writing logics
 - `pnpm --filter=@posthog/frontend typegen:write` — one-shot write
@@ -149,19 +160,19 @@ on a single logic, scope both to that file:
 
 ```sh
 # Regenerate the type for one logic
-pnpm --filter=@posthog/frontend exec kea-typegen write \
-    -f frontend/src/scenes/foo/fooLogic.ts -r ./frontend/src
+pnpm --filter=@posthog/frontend typegen:file frontend/src/scenes/foo/fooLogic.ts
 
 # Type-check just that file (and its imports — fast, but won't catch downstream
 # breakage in other files that consume the new types)
-pnpm --filter=@posthog/frontend exec tsc --noEmit \
+pnpm --filter=@posthog/frontend exec tsgo --noEmit \
     frontend/src/scenes/foo/fooLogic.ts
 ```
 
 Use this loop while writing the logic; run the full `typegen:check` /
 `typescript:check` once at the end to confirm nothing else broke.
 
-Never edit a `*LogicType.ts` file by hand — change the logic and re-run typegen.
+Do not create or import a separate `*LogicType.ts` file. Change the logic and re-run
+typegen so the inline generated block stays authoritative.
 
 For keyed logics, annotate the export explicitly:
 `export const fooLogic: LogicWrapper<fooLogicType> = kea<fooLogicType>([...])`.
diff --git a/.agents/skills/writing-kea-logics/references/anti-patterns.md b/.agents/skills/writing-kea-logics/references/anti-patterns.md
index 65512dc38cae..17262c3580f5 100644
--- a/.agents/skills/writing-kea-logics/references/anti-patterns.md
+++ b/.agents/skills/writing-kea-logics/references/anti-patterns.md
@@ -343,10 +343,10 @@ That's a `forms` builder waiting to be written.
 
 ## Types
 
-### Editing `*LogicType.ts` by hand
+### Creating or importing `*LogicType.ts`
 
-It's regenerated by `kea-typegen`. Your changes will be wiped. Change the logic and
-re-run typegen.
+Logic types are generated inline in the logic source. A separate type file will drift
+or be deleted by typegen. Import the type from the logic source and re-run typegen.
 
 ### Importing the runtime logic when you only need its type
 
diff --git a/.kearc b/.kearc
index d4ae51476b54..c097318ad2a3 100644
--- a/.kearc
+++ b/.kearc
@@ -3,5 +3,5 @@
   "rootPath": "./frontend/src",
   "typesPath": "./frontend/src",
   "writePaths": true,
-  "inlinePaths": ["./frontend/src/scenes/notebooks"]
+  "inline": true
 }
diff --git a/frontend/package.json b/frontend/package.json
index a25277228b1e..7b2ca3138a55 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -335,7 +335,7 @@
         "jest-environment-jsdom": "^29.3.1",
         "jest-image-snapshot": "^6.1.0",
         "jest-junit": "^16.0.0",
-        "kea-typegen": "3.8.2",
+        "kea-typegen": "3.8.3",
         "less": "^3.12.2",
         "lint-staged": "catalog:",
         "mockdate": "^3.0.5",
diff --git a/frontend/src/exporter/ExporterLogin.tsx b/frontend/src/exporter/ExporterLogin.tsx
index a2a8d51095c0..e9e2db8c0891 100644
--- a/frontend/src/exporter/ExporterLogin.tsx
+++ b/frontend/src/exporter/ExporterLogin.tsx
@@ -1,8 +1,9 @@
 import '../scenes/authentication/login/Login.scss'
 
 import clsx from 'clsx'
-import { actions, kea, path, reducers, useValues } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers, useValues } from 'kea'
 import { Form, forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 
 import { BridgePage } from 'lib/components/BridgePage/BridgePage'
 import { LemonBanner } from 'lib/lemon-ui/LemonBanner'
@@ -12,12 +13,85 @@ import { LemonInput } from 'lib/lemon-ui/LemonInput'
 import { ERROR_MESSAGES } from 'scenes/authentication/shared/loginErrorMessages'
 import { SupportModalButton } from 'scenes/authentication/shared/SupportModalButton'
 
-import type { loginLogicType } from './ExporterLoginType'
-
 export interface LoginForm {
     password: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface loginLogicValues {
+    generalError: {
+        code: string
+        detail: string
+    } | null
+    isLoginSubmitting: boolean
+    isLoginValid: boolean
+    isSuccess: boolean
+    login: LoginForm
+    loginAllErrors: Record<string, any>
+    loginChanged: boolean
+    loginErrors: DeepPartialMap<LoginForm, ValidationErrorType>
+    loginHasErrors: boolean
+    loginManualErrors: Record<string, any>
+    loginTouched: boolean
+    loginTouches: Record<string, boolean>
+    loginValidationErrors: DeepPartialMap<LoginForm, ValidationErrorType>
+    showLoginErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface loginLogicActions {
+    clearGeneralError: () => {
+        value: true
+    }
+    resetLogin: (values?: LoginForm) => {
+        values?: LoginForm
+    }
+    setGeneralError: (
+        code: string,
+        detail: string
+    ) => {
+        code: string
+        detail: string
+    }
+    setLoginManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setLoginValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setLoginValues: (values: DeepPartial<LoginForm>) => {
+        values: DeepPartial<LoginForm>
+    }
+    setSuccess: () => {
+        value: true
+    }
+    submitLogin: () => {
+        value: boolean
+    }
+    submitLoginFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitLoginRequest: (login: LoginForm) => {
+        login: LoginForm
+    }
+    submitLoginSuccess: (login: LoginForm) => {
+        login: LoginForm
+    }
+    touchLoginField: (key: string) => {
+        key: string
+    }
+}
+
+export type loginLogicType = MakeLogicType<loginLogicValues, loginLogicActions>
+
 export const loginLogic = kea<loginLogicType>([
     path(['exporter', 'ExporterLogin']),
     actions({
diff --git a/frontend/src/exporter/exporterViewLogic.ts b/frontend/src/exporter/exporterViewLogic.ts
index af16e6e9ff45..25a554ef9325 100644
--- a/frontend/src/exporter/exporterViewLogic.ts
+++ b/frontend/src/exporter/exporterViewLogic.ts
@@ -1,14 +1,70 @@
-import { actions, afterMount, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
 
 import { heatmapDataLogic } from 'lib/components/heatmaps/heatmapDataLogic'
 
-import type { exporterViewLogicType } from './exporterViewLogicType'
+import type { HrefMatchType } from '../lib/components/heatmaps/heatmapDataLogic'
+import type { CommonFilters, HeatmapFilters, HeatmapFixedPositionMode } from '../lib/components/heatmaps/types'
 import { ExportType, ExportedData } from './types'
 
 const isUrlPattern = (url: string): boolean => {
     return /[*+?^${}()|[\]\\]/.test(url)
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface exporterViewLogicValues {
+    exportedData: ExportedData
+    isLoading: boolean
+    screenshotUrl: string | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface exporterViewLogicActions {
+    setCommonFilters: (filters: CommonFilters) => {
+        filters: CommonFilters
+    } // heatmapDataLogic
+    setHeatmapColorPalette: (palette: string | null) => {
+        palette: string | null
+    } // heatmapDataLogic
+    setHeatmapFilters: (filters: HeatmapFilters) => {
+        filters: HeatmapFilters
+    } // heatmapDataLogic
+    setHeatmapFixedPositionMode: (mode: HeatmapFixedPositionMode) => {
+        mode: HeatmapFixedPositionMode
+    } // heatmapDataLogic
+    setHref: (href: string) => {
+        href: string
+    } // heatmapDataLogic
+    setHrefMatchType: (matchType: HrefMatchType) => {
+        matchType: HrefMatchType
+    } // heatmapDataLogic
+    setWindowWidthOverride: (widthOverride: number | null) => {
+        widthOverride: number | null
+    } // heatmapDataLogic
+    fetchScreenshotUrl: () => {
+        value: true
+    }
+    setIsLoading: (isLoading: boolean) => {
+        isLoading: boolean
+    }
+    setScreenshotUrl: (screenshotUrl: string) => {
+        screenshotUrl: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface exporterViewLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        exportedData: (arg: ExportedData) => ExportedData
+    }
+}
+
+export type exporterViewLogicType = MakeLogicType<
+    exporterViewLogicValues,
+    exporterViewLogicActions,
+    ExportedData,
+    exporterViewLogicMeta
+>
+
 // This is a simple logic that is mounted by the Exporter view and then can be found by any nested callers
 // This simplifies passing props everywhere.
 // E.g. api.ts uses this to add the sharing_access_token
diff --git a/frontend/src/kea-disposables.test.ts b/frontend/src/kea-disposables.test.ts
index 4b2e87c4fe74..43c5cbaec21e 100644
--- a/frontend/src/kea-disposables.test.ts
+++ b/frontend/src/kea-disposables.test.ts
@@ -1,9 +1,7 @@
-import { kea, path } from 'kea'
+import { MakeLogicType, kea, path } from 'kea'
 
 import { initKeaTests } from '~/test/init'
 
-import type { logicType } from './kea-disposables.testType'
-
 // Helper: trigger visibilitychange after mutating document.hidden
 const setHidden = (hidden: boolean): void => {
     Object.defineProperty(document, 'hidden', { configurable: true, get: () => hidden })
@@ -14,6 +12,9 @@ const setHidden = (hidden: boolean): void => {
     document.dispatchEvent(new Event('visibilitychange'))
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export type logicType = MakeLogicType<{}, {}>
+
 describe('disposablesPlugin', () => {
     let logic: ReturnType<typeof kea<logicType>>
     let setupCalls: number
diff --git a/frontend/src/layout/FeaturePreviews/featurePreviewsLogic.tsx b/frontend/src/layout/FeaturePreviews/featurePreviewsLogic.tsx
index 067d8a6b3b35..d953bd941ee1 100644
--- a/frontend/src/layout/FeaturePreviews/featurePreviewsLogic.tsx
+++ b/frontend/src/layout/FeaturePreviews/featurePreviewsLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { EarlyAccessFeature, posthog } from 'posthog-js'
 
@@ -14,7 +14,10 @@ import { userLogic } from 'scenes/userLogic'
 
 import { ProductIntentContext, ProductKey } from '~/queries/schema/schema-general'
 
-import type { featurePreviewsLogicType } from './featurePreviewsLogicType'
+import type { SupportFormFields } from '../../lib/components/Support/supportLogic'
+import type { FeatureFlagsSet } from '../../lib/logic/featureFlagLogic'
+import type { ProductCrossSellProperties } from '../../lib/utils/product-intents'
+import type { UserType } from '../../types'
 
 export interface EnrichedEarlyAccessFeature extends Omit<EarlyAccessFeature, 'flagKey'> {
     flagKey: string
@@ -24,6 +27,105 @@ export interface EnrichedEarlyAccessFeature extends Omit<EarlyAccessFeature, 'fl
 
 const search = createFeaturePreviewSearch<EnrichedEarlyAccessFeature>()
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface featurePreviewsLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    user: UserType | null // userLogic
+    activeFeedbackFlagKey: string | null
+    activeFeedbackFlagKeyLoading: boolean
+    conceptEnrollments: Record<string, boolean>
+    earlyAccessFeatures: EnrichedEarlyAccessFeature[]
+    filteredEarlyAccessFeatures: EnrichedEarlyAccessFeature[]
+    rawEarlyAccessFeatures: EarlyAccessFeature[]
+    rawEarlyAccessFeaturesLoading: boolean
+    searchTerm: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface featurePreviewsLogicActions {
+    submitSupportTicket: (form: SupportFormFields) => SupportFormFields // supportLogic
+    addProductIntentForCrossSell: (properties: ProductCrossSellProperties) => ProductCrossSellProperties // teamLogic
+    beginEarlyAccessFeatureFeedback: (flagKey: string) => {
+        flagKey: string
+    }
+    cancelEarlyAccessFeatureFeedback: () => {
+        value: true
+    }
+    copyExternalFeaturePreviewLink: (flagKey: string) => {
+        flagKey: string
+    }
+    loadEarlyAccessFeatures: () => any
+    loadEarlyAccessFeaturesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadEarlyAccessFeaturesSuccess: (
+        rawEarlyAccessFeatures: EarlyAccessFeature[],
+        payload?: any
+    ) => {
+        rawEarlyAccessFeatures: EarlyAccessFeature[]
+        payload?: any
+    }
+    setSearchTerm: (searchTerm: string) => {
+        searchTerm: string
+    }
+    submitEarlyAccessFeatureFeedback: (message: string) => {
+        message: string
+    }
+    submitEarlyAccessFeatureFeedbackFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    submitEarlyAccessFeatureFeedbackSuccess: (
+        activeFeedbackFlagKey: string | null,
+        payload?: {
+            message: string
+        }
+    ) => {
+        activeFeedbackFlagKey: string | null
+        payload?: {
+            message: string
+        }
+    }
+    updateEarlyAccessFeatureEnrollment: (
+        flagKey: string,
+        enabled: boolean,
+        stage?: string
+    ) => {
+        enabled: boolean
+        flagKey: string
+        stage: string | undefined
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface featurePreviewsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        earlyAccessFeatures: (
+            rawEarlyAccessFeatures: EarlyAccessFeature[],
+            featureFlags: FeatureFlagsSet,
+            conceptEnrollments: Record<string, boolean>
+        ) => EnrichedEarlyAccessFeature[]
+        filteredEarlyAccessFeatures: (
+            earlyAccessFeatures: EnrichedEarlyAccessFeature[],
+            searchTerm: string
+        ) => EnrichedEarlyAccessFeature[]
+    }
+}
+
+export type featurePreviewsLogicType = MakeLogicType<
+    featurePreviewsLogicValues,
+    featurePreviewsLogicActions,
+    Record<string, any>,
+    featurePreviewsLogicMeta
+>
+
 export const featurePreviewsLogic = kea<featurePreviewsLogicType>([
     path(['layout', 'FeaturePreviews', 'featurePreviewsLogic']),
     connect(() => ({
@@ -154,7 +256,11 @@ export const featurePreviewsLogic = kea<featurePreviewsLogicType>([
     selectors({
         earlyAccessFeatures: [
             (s) => [s.rawEarlyAccessFeatures, s.featureFlags, s.conceptEnrollments],
-            (rawEarlyAccessFeatures, featureFlags, conceptEnrollments): EnrichedEarlyAccessFeature[] => {
+            (
+                rawEarlyAccessFeatures: EarlyAccessFeature[],
+                featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet,
+                conceptEnrollments: Record<string, boolean>
+            ): EnrichedEarlyAccessFeature[] => {
                 // posthog-js persists enrollment as person properties in localStorage,
                 // which survives page reloads even though concept-stage flags evaluate
                 // to false on the server.
diff --git a/frontend/src/layout/globalModalsLogic.ts b/frontend/src/layout/globalModalsLogic.ts
index 3f026a48b0d2..d6443d1e4f30 100644
--- a/frontend/src/layout/globalModalsLogic.ts
+++ b/frontend/src/layout/globalModalsLogic.ts
@@ -1,8 +1,30 @@
-import { actions, kea, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers } from 'kea'
 
 import { bindModalToUrl } from 'lib/logic/bindModalToUrl'
 
-import type { globalModalsLogicType } from './globalModalsLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface globalModalsLogicValues {
+    isCreateOrganizationModalShown: boolean
+    isCreateProjectModalShown: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface globalModalsLogicActions {
+    hideCreateOrganizationModal: () => {
+        value: true
+    }
+    hideCreateProjectModal: () => {
+        value: true
+    }
+    showCreateOrganizationModal: () => {
+        value: true
+    }
+    showCreateProjectModal: () => {
+        value: true
+    }
+}
+
+export type globalModalsLogicType = MakeLogicType<globalModalsLogicValues, globalModalsLogicActions>
 
 export const globalModalsLogic = kea<globalModalsLogicType>([
     path(['layout', 'navigation', 'globalModalsLogic']),
diff --git a/frontend/src/layout/navigation-3000/navigationLogic.tsx b/frontend/src/layout/navigation-3000/navigationLogic.tsx
index c068e7b30cc3..b566a445b7c7 100644
--- a/frontend/src/layout/navigation-3000/navigationLogic.tsx
+++ b/frontend/src/layout/navigation-3000/navigationLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, connect, events, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, listeners, path, props, reducers, selectors } from 'kea'
 import { router } from 'kea-router'
 import { subscriptions } from 'kea-subscriptions'
 import posthog from 'posthog-js'
@@ -48,8 +48,10 @@ import { dashboardsModel } from '~/models/dashboardsModel'
 import { groupsModel } from '~/models/groupsModel'
 import { AccessControlLevel, AccessControlResourceType, ReplayTabs } from '~/types'
 
+import type { GroupsAccessStatus } from '../../lib/introductions/groupsAccessLogic'
+import type { SceneConfig, SceneExport, SceneParams, SceneProps } from '../../scenes/sceneTypes'
+import type { GroupType, GroupTypeIndex, SavedSessionRecordingPlaylistsResult } from '../../types'
 import { navigationLogic } from '../navigation/navigationLogic'
-import type { navigation3000LogicType } from './navigationLogicType'
 import { BasicListItem, ExtendedListItem, NavbarItem, SidebarNavbarItem } from './types'
 
 /** Multi-segment item keys are joined using this separator for easy comparisons. */
@@ -64,6 +66,178 @@ const DEFAULT_SIDEBAR_WIDTH_PX: number = 288
 const MAXIMUM_SIDEBAR_WIDTH_PX: number = 1024
 const MAXIMUM_SIDEBAR_WIDTH_PERCENTAGE: number = 50
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface navigation3000LogicValues {
+    groupTypes: Map<GroupTypeIndex, GroupType>; // groupsModel
+    groupsAccessStatus: GroupsAccessStatus; // groupsModel
+    mobileLayout: boolean; // navigationLogic
+    isCurrentOrganizationUnavailable: boolean; // organizationLogic
+    activeSceneId: string | null; // sceneLogic
+    sceneConfig: SceneConfig | null; // sceneLogic
+    savedFilters: SavedSessionRecordingPlaylistsResult; // sessionRecordingSavedFiltersLogic
+    savedFiltersLoading: boolean; // sessionRecordingSavedFiltersLogic
+    accordionCollapseMapping: Record<string, boolean>;
+    activeNavbarItem: SidebarNavbarItem | null;
+    activeNavbarItemId: string | null;
+    activeNavbarItemIdRaw: string;
+    internalSearchTerm: string;
+    isListItemVisible: (key: string) => boolean;
+    isNavCollapsed: boolean;
+    isNavCollapsedDesktop: boolean;
+    isNavShown: boolean;
+    isNavShownMobile: boolean;
+    isResizeInProgress: boolean;
+    isSearchShown: boolean;
+    isSidebarKeyboardShortcutAcknowledged: boolean;
+    isSidebarShown: boolean;
+    lastFocusedItemIndex: number;
+    listItemAccordionCollapseMapping: Record<string, boolean>;
+    mode: Navigation3000Mode;
+    navbarItemIdMapping: Record<string, NavbarItem>;
+    navbarItems: NavbarItem[][];
+    newItemCategory: string | null;
+    newItemInlineCategory: string | null;
+    normalizedActiveListItemKey: number | string | string[] | null;
+    savingNewItem: boolean;
+    searchTerm: string;
+    sidebarContentsFlattened: BasicListItem[] | ExtendedListItem[];
+    sidebarOverslide: number;
+    sidebarOverslideDirection: "max" | "min" | null;
+    sidebarWidth: number;
+    zenMode: boolean;
+    zenModeFromUrl: boolean;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface navigation3000LogicActions {
+    setScene: (sceneId: string, sceneKey: string | undefined, params: SceneParams, scrollToTop?: boolean | undefined, exportedScene?: SceneExport<SceneProps> | undefined) => {
+        exportedScene: SceneExport<SceneProps> | undefined;
+        params: SceneParams;
+        sceneId: string;
+        sceneKey: string | undefined;
+        scrollToTop: boolean;
+    }; // sceneLogic
+    acknowledgeSidebarKeyboardShortcut: () => {
+        value: true;
+    };
+    beginResize: () => {
+        value: true;
+    };
+    cancelNewItem: () => {
+        value: true;
+    };
+    endResize: () => {
+        value: true;
+    };
+    focusNextItem: () => {
+        value: true;
+    };
+    focusPreviousItem: () => {
+        value: true;
+    };
+    hideNavOnMobile: () => {
+        value: true;
+    };
+    hideSidebar: () => {
+        value: true;
+    };
+    initiateNewItemInCategory: (category: string) => {
+        category: string;
+    };
+    initiateNewItemInlineInCategory: (category: string) => {
+        category: string;
+    };
+    saveNewItem: (itemName: string) => {
+        itemName: string;
+    };
+    saveNewItemComplete: () => {
+        value: true;
+    };
+    setIsSearchShown: (isSearchShown: boolean) => {
+        isSearchShown: boolean;
+    };
+    setLastFocusedItemByKey: (key: number | string) => {
+        key: number | string;
+    };
+    setLastFocusedItemIndex: (index: number) => {
+        index: number;
+    };
+    setSearchTerm: (searchTerm: string) => {
+        searchTerm: string;
+    };
+    setSidebarOverslide: (overslide: number) => {
+        overslide: number;
+    };
+    setSidebarWidth: (width: number) => {
+        width: number;
+    };
+    setZenMode: (zenMode: boolean, trigger: ZenModeTrigger) => {
+        trigger: ZenModeTrigger;
+        zenMode: boolean;
+    };
+    showNavOnMobile: () => {
+        value: true;
+    };
+    showSidebar: (newNavbarItemId?: string) => {
+        newNavbarItemId: string | undefined;
+    };
+    syncSidebarWidthWithMouseMove: (delta: number) => {
+        delta: number;
+    };
+    syncSidebarWidthWithViewport: () => {
+        value: true;
+    };
+    toggleAccordion: (key: string) => {
+        key: string;
+    };
+    toggleListItemAccordion: (key: string) => {
+        key: string;
+    };
+    toggleNavCollapsed: (override?: boolean) => {
+        override: boolean | undefined;
+    };
+    toggleSidebar: () => {
+        value: true;
+    };
+    toggleZenMode: (trigger: ZenModeTrigger) => {
+        trigger: ZenModeTrigger;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface navigation3000LogicProps {
+    inputElement?: HTMLInputElement | null;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface navigation3000LogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        zenModeFromUrl: (searchParams: Record<string, any>) => boolean;
+        mode: (sceneConfig: SceneConfig | null, isCurrentOrganizationUnavailable: boolean, zenMode: boolean, activeSceneId: string | null, featureFlags: import("lib/logic/featureFlagLogic").FeatureFlagsSet) => Navigation3000Mode;
+        isNavShown: (isNavShownMobile: boolean, mobileLayout: boolean) => boolean;
+        isNavCollapsed: (isNavCollapsedDesktop: boolean, mobileLayout: boolean) => boolean;
+        navbarItems: (featureFlags: import("lib/logic/featureFlagLogic").FeatureFlagsSet, dashboardsLoading: boolean, pinnedDashboards: (import("~/types").DashboardBasicType | import("~/types").DashboardType<import("~/types").QueryBasedInsightModel<import("../../queries/schema").Node<Record<string, any>>>>)[], savedFilters: SavedSessionRecordingPlaylistsResult, savedFiltersLoading: boolean) => NavbarItem[][];
+        navbarItemIdMapping: (navbarItems: NavbarItem[][]) => Record<string, NavbarItem>;
+        sidebarOverslideDirection: (sidebarOverslide: number) => "max" | "min" | null;
+        activeNavbarItem: (activeNavbarItemId: string | null, navbarItemIdMapping: Record<string, NavbarItem>) => SidebarNavbarItem | null;
+        searchTerm: (internalSearchTerm: string, isSearchShown: boolean) => string;
+        sidebarContentsFlattened: (arg: import("./types").SidebarCategory[] | null) => BasicListItem[] | ExtendedListItem[];
+        normalizedActiveListItemKey: (arg: number | string | [
+            string,
+            number | string
+        ] | null) => number | string | string[] | null;
+        isListItemVisible: (listItemAccordionCollapseMapping: Record<string, boolean>) => (key: string) => boolean;
+        activeNavbarItemId: (activeNavbarItemIdRaw: string) => string | null;
+        newItemCategory: (arg: import("./types").SidebarCategory[] | null, newItemInlineCategory: string | null, location: {
+            hash: string;
+            pathname: string;
+            search: string;
+        }) => string | null;
+    };
+}
+
+export type navigation3000LogicType = MakeLogicType<navigation3000LogicValues, navigation3000LogicActions, navigation3000LogicProps, navigation3000LogicMeta>;
+
 export const navigation3000Logic = kea<navigation3000LogicType>([
     path(['layout', 'navigation-3000', 'navigationLogic']),
     props({} as { inputElement?: HTMLInputElement | null }),
@@ -356,7 +530,7 @@ export const navigation3000Logic = kea<navigation3000LogicType>([
     selectors({
         zenModeFromUrl: [
             () => [router.selectors.searchParams],
-            (searchParams): boolean => {
+            (searchParams: Record<string, any>): boolean => {
                 // Enable zen mode via ?zen or ?zen=true or ?zen=1
                 const zenParam = searchParams?.zen
                 return zenParam !== undefined && zenParam !== 'false' && zenParam !== '0'
@@ -371,11 +545,11 @@ export const navigation3000Logic = kea<navigation3000LogicType>([
                 featureFlagLogic.selectors.featureFlags,
             ],
             (
-                sceneConfig,
-                isCurrentOrganizationUnavailable,
-                zenMode,
-                activeSceneId,
-                featureFlags
+                sceneConfig: null | import('scenes/sceneTypes').SceneConfig,
+                isCurrentOrganizationUnavailable: boolean,
+                zenMode: boolean,
+                activeSceneId: string | null,
+                featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet
             ): Navigation3000Mode => {
                 if (zenMode) {
                     return 'zen'
@@ -400,11 +574,11 @@ export const navigation3000Logic = kea<navigation3000LogicType>([
         ],
         isNavShown: [
             (s) => [s.isNavShownMobile, s.mobileLayout],
-            (isNavShownMobile, mobileLayout): boolean => !mobileLayout || isNavShownMobile,
+            (isNavShownMobile: boolean, mobileLayout: boolean): boolean => !mobileLayout || isNavShownMobile,
         ],
         isNavCollapsed: [
             (s) => [s.isNavCollapsedDesktop, s.mobileLayout],
-            (isNavCollapsedDesktop, mobileLayout): boolean => !mobileLayout && isNavCollapsedDesktop,
+            (isNavCollapsedDesktop: boolean, mobileLayout: boolean): boolean => !mobileLayout && isNavCollapsedDesktop,
         ],
         navbarItems: [
             (s) => [
@@ -414,7 +588,20 @@ export const navigation3000Logic = kea<navigation3000LogicType>([
                 s.savedFilters,
                 s.savedFiltersLoading,
             ],
-            (featureFlags, dashboardsLoading, pinnedDashboards, savedFilters, savedFiltersLoading): NavbarItem[][] => {
+            (
+                featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet,
+                dashboardsLoading: boolean,
+                pinnedDashboards: (
+                    | import('~/types').DashboardBasicType
+                    | import('~/types').DashboardType<
+                          import('~/types').QueryBasedInsightModel<
+                              import('../../queries/schema').Node<Record<string, any>>
+                          >
+                      >
+                )[],
+                savedFilters: import('~/types').SavedSessionRecordingPlaylistsResult,
+                savedFiltersLoading: boolean
+            ): NavbarItem[][] => {
                 return [
                     [
                         {
@@ -690,13 +877,13 @@ export const navigation3000Logic = kea<navigation3000LogicType>([
         ],
         navbarItemIdMapping: [
             (s) => [s.navbarItems],
-            (navbarItems): Record<string, NavbarItem> => {
+            (navbarItems: NavbarItem[][]): Record<string, NavbarItem> => {
                 return Object.fromEntries(navbarItems.flat().map((item) => [item.identifier, item]))
             },
         ],
         sidebarOverslideDirection: [
             (s) => [s.sidebarOverslide],
-            (sidebarOverslide): 'min' | 'max' | null => {
+            (sidebarOverslide: number): 'min' | 'max' | null => {
                 if (sidebarOverslide < 0) {
                     return 'min'
                 } else if (sidebarOverslide > 0) {
@@ -707,20 +894,23 @@ export const navigation3000Logic = kea<navigation3000LogicType>([
         ],
         activeNavbarItem: [
             (s) => [s.activeNavbarItemId, s.navbarItemIdMapping],
-            (activeNavbarItemId, navbarItemIdMapping): SidebarNavbarItem | null => {
+            (
+                activeNavbarItemId: string | null,
+                navbarItemIdMapping: Record<string, NavbarItem>
+            ): SidebarNavbarItem | null => {
                 const item = activeNavbarItemId ? navbarItemIdMapping[activeNavbarItemId] : null
                 return item && 'logic' in item ? (item as SidebarNavbarItem) : null
             },
         ],
         searchTerm: [
             (s) => [s.internalSearchTerm, s.isSearchShown],
-            (internalSearchTerm, isSearchShown): string => {
+            (internalSearchTerm: string, isSearchShown: boolean): string => {
                 return isSearchShown ? internalSearchTerm : ''
             },
         ],
         sidebarContentsFlattened: [
             (s) => [(state) => s.activeNavbarItem(state)?.logic?.findMounted()?.selectors.contents(state) || null],
-            (sidebarContents): BasicListItem[] | ExtendedListItem[] => {
+            (sidebarContents: import('./types').SidebarCategory[] | null): BasicListItem[] | ExtendedListItem[] => {
                 const flattenItems = (items: any[]): (BasicListItem | ExtendedListItem)[] => {
                     return items.flatMap((item) => {
                         if ('items' in item) {
@@ -737,7 +927,9 @@ export const navigation3000Logic = kea<navigation3000LogicType>([
                 (state) =>
                     s.activeNavbarItem(state)?.logic?.findMounted()?.selectors.activeListItemKey?.(state) || null,
             ],
-            (activeListItemKey): string | number | string[] | null =>
+            (
+                activeListItemKey: number | string | [string, number | string] | null
+            ): string | number | string[] | null =>
                 activeListItemKey
                     ? Array.isArray(activeListItemKey)
                         ? activeListItemKey.join(ITEM_KEY_PART_SEPARATOR)
@@ -746,7 +938,7 @@ export const navigation3000Logic = kea<navigation3000LogicType>([
         ],
         isListItemVisible: [
             (s) => [s.listItemAccordionCollapseMapping],
-            (listItemAccordionCollapseMapping) => {
+            (listItemAccordionCollapseMapping: Record<string, boolean>) => {
                 return (key: string): boolean => {
                     // Split the key into parts to check each parent's visibility
                     const parts = key.split(ITEM_KEY_PART_SEPARATOR)
@@ -763,7 +955,7 @@ export const navigation3000Logic = kea<navigation3000LogicType>([
         ],
         activeNavbarItemId: [
             (s) => [s.activeNavbarItemIdRaw],
-            (activeNavbarItemIdRaw): string | null => {
+            (activeNavbarItemIdRaw: string): string | null => {
                 if (activeNavbarItemIdRaw === Scene.SQLEditor) {
                     return Scene.SQLEditor
                 }
@@ -776,7 +968,15 @@ export const navigation3000Logic = kea<navigation3000LogicType>([
                 s.newItemInlineCategory,
                 router.selectors.location,
             ],
-            (sidebarContents, newItemInlineCategory, location): string | null => {
+            (
+                sidebarContents: import('./types').SidebarCategory[] | null,
+                newItemInlineCategory: string | null,
+                location: {
+                    hash: string
+                    pathname: string
+                    search: string
+                }
+            ): string | null => {
                 if (!sidebarContents) {
                     return null
                 }
diff --git a/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/ResourceAccessControlsV2/accessControlsLogic.ts b/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/ResourceAccessControlsV2/accessControlsLogic.ts
index 85fbef163684..0fbb3072dadb 100644
--- a/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/ResourceAccessControlsV2/accessControlsLogic.ts
+++ b/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/ResourceAccessControlsV2/accessControlsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { urlToAction } from 'kea-router'
 
@@ -20,10 +20,12 @@ import {
     OrganizationMemberType,
 } from '~/types'
 
+import type { FeatureFlagsSet } from '../../../../../../lib/logic/featureFlagLogic'
+import type { AccessControlUIVersion } from '../../../../../../lib/utils/accessControlUtils'
+import type { AccessControlResponseType, AccessControlUpdateType, RoleType } from '../../../../../../types'
 import { accessControlLogic } from '../accessControlLogic'
 import { isResourceRolledOut, resourcesAccessControlLogic } from '../resourcesAccessControlLogic'
 import { roleAccessControlLogic } from '../roleAccessControlLogic'
-import type { accessControlsLogicType } from './accessControlsLogicType'
 import {
     AccessControlFilters,
     AccessControlMemberEntry,
@@ -84,6 +86,304 @@ function matchesFilters(
     return true
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accessControlsLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    sortedMembers: OrganizationMemberType[] | null // membersLogic
+    resources: APIScopeObject[] // resourcesAccessControlLogic
+    roles: RoleType[] // roleAccessControlLogic
+    hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean // userLogic
+    activeTab: AccessControlsTab
+    allMembers: OrganizationMemberType[]
+    availableProjectLevels: AccessControlLevel[]
+    availableResourceLevels: AccessControlLevel[]
+    canEdit: boolean
+    canUseRoles: boolean
+    defaults: AccessControlDefaultsResponse | null
+    defaultsLoading: boolean
+    filteredMembers: AccessControlMemberEntry[]
+    filteredRoles: AccessControlRoleEntry[]
+    filters: AccessControlFilters
+    loading: boolean
+    membersData: AccessControlMembersResponse | null
+    membersDataLoading: boolean
+    resourceKeys: {
+        key: APIScopeObject
+        label: string
+    }[]
+    resourcesWithProject: {
+        key: APIScopeObject
+        label: string
+    }[]
+    rolesData: AccessControlRolesResponse | null
+    rolesDataLoading: boolean
+    ruleModalState: GroupedAccessControlRuleModalLogicProps | null
+    ruleOptions: {
+        key: AccessControlLevel
+        label: string
+    }[]
+    searchText: string
+    visibleResourceKeySet: Set<APIScopeObject>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accessControlsLogicActions {
+    updateAccessControlDefault: (
+        level: AccessControlLevel,
+        source?: AccessControlUIVersion | undefined
+    ) => {
+        level: AccessControlLevel
+        source: AccessControlUIVersion
+    } // accessControlLogic
+    updateAccessControlDefaultSuccess: (
+        accessControls: AccessControlResponseType | null,
+        payload?:
+            | {
+                  level: AccessControlLevel
+                  source: AccessControlUIVersion
+              }
+            | undefined
+    ) => {
+        accessControls: AccessControlResponseType | null
+        payload?: {
+            level: AccessControlLevel
+            source: AccessControlUIVersion
+        }
+    } // accessControlLogic
+    updateAccessControlMembers: (
+        accessControls: {
+            level: AccessControlLevel | null
+            member: OrganizationMemberType['id']
+        }[],
+        source?: AccessControlUIVersion | undefined
+    ) => {
+        accessControls: {
+            level: AccessControlLevel | null
+            member: string
+        }[]
+        source: AccessControlUIVersion
+    } // accessControlLogic
+    updateAccessControlMembersSuccess: (
+        accessControls: AccessControlResponseType | null,
+        payload?:
+            | {
+                  accessControls: {
+                      level: AccessControlLevel | null
+                      member: string
+                  }[]
+                  source: AccessControlUIVersion
+              }
+            | undefined
+    ) => {
+        accessControls: AccessControlResponseType | null
+        payload?: {
+            accessControls: {
+                level: AccessControlLevel | null
+                member: string
+            }[]
+            source: AccessControlUIVersion
+        }
+    } // accessControlLogic
+    updateAccessControlRoles: (
+        accessControls: {
+            level: AccessControlLevel | null
+            role: RoleType['id']
+        }[],
+        source?: AccessControlUIVersion | undefined
+    ) => {
+        accessControls: {
+            level: AccessControlLevel | null
+            role: string
+        }[]
+        source: AccessControlUIVersion
+    } // accessControlLogic
+    updateAccessControlRolesSuccess: (
+        accessControls: AccessControlResponseType | null,
+        payload?:
+            | {
+                  accessControls: {
+                      level: AccessControlLevel | null
+                      role: string
+                  }[]
+                  source: AccessControlUIVersion
+              }
+            | undefined
+    ) => {
+        accessControls: AccessControlResponseType | null
+        payload?: {
+            accessControls: {
+                level: AccessControlLevel | null
+                role: string
+            }[]
+            source: AccessControlUIVersion
+        }
+    } // accessControlLogic
+    updateResourceAccessControls: (
+        accessControls: Pick<AccessControlUpdateType, 'access_level' | 'organization_member' | 'resource' | 'role'>[],
+        saveType: 'default' | 'member' | 'role'
+    ) => {
+        accessControls: Pick<AccessControlUpdateType, 'access_level' | 'organization_member' | 'resource' | 'role'>[]
+        saveType: 'default' | 'member' | 'role'
+    } // resourcesAccessControlLogic
+    updateResourceAccessControlsSuccess: (
+        resourceAccessControls: AccessControlResponseType | null,
+        payload?:
+            | {
+                  accessControls: Pick<
+                      AccessControlUpdateType,
+                      'access_level' | 'organization_member' | 'resource' | 'role'
+                  >[]
+                  saveType: 'default' | 'member' | 'role'
+              }
+            | undefined
+    ) => {
+        payload?: {
+            accessControls: Pick<
+                AccessControlUpdateType,
+                'access_level' | 'organization_member' | 'resource' | 'role'
+            >[]
+            saveType: 'default' | 'member' | 'role'
+        }
+        resourceAccessControls: AccessControlResponseType | null
+    } // resourcesAccessControlLogic
+    closeRuleModal: () => {
+        value: true
+    }
+    loadDefaults: () => any
+    loadDefaultsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadDefaultsSuccess: (
+        defaults: AccessControlDefaultsResponse,
+        payload?: any
+    ) => {
+        defaults: AccessControlDefaultsResponse
+        payload?: any
+    }
+    loadMembers: () => any
+    loadMembersFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadMembersSuccess: (
+        membersData: AccessControlMembersResponse,
+        payload?: any
+    ) => {
+        membersData: AccessControlMembersResponse
+        payload?: any
+    }
+    loadRoles: () => any
+    loadRolesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRolesSuccess: (
+        rolesData: AccessControlRolesResponse,
+        payload?: any
+    ) => {
+        rolesData: AccessControlRolesResponse
+        payload?: any
+    }
+    openRuleModal: (state: GroupedAccessControlRuleModalLogicProps) => {
+        state: GroupedAccessControlRuleModalLogicProps
+    }
+    saveGroupedRules: (params: {
+        projectLevel: AccessControlLevel | null
+        resourceLevels: Record<APIScopeObject, AccessControlLevel | null>
+        scopeId: string
+        scopeType: ScopeType
+    }) => {
+        projectLevel: AccessControlLevel | null
+        resourceLevels: Record<APIScopeObject, AccessControlLevel | null>
+        scopeId: string
+        scopeType: ScopeType
+    }
+    setActiveTab: (activeTab: AccessControlsTab) => {
+        activeTab: AccessControlsTab
+    }
+    setFilters: (filters: Partial<AccessControlFilters>) => {
+        filters: Partial<AccessControlFilters>
+    }
+    setSearchText: (searchText: string) => {
+        searchText: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accessControlsLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        allMembers: (sortedMembers: OrganizationMemberType[] | null) => OrganizationMemberType[]
+        canUseRoles: (
+            hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean
+        ) => boolean
+        canEdit: (defaults: AccessControlDefaultsResponse | null) => boolean
+        availableProjectLevels: (defaults: AccessControlDefaultsResponse | null) => AccessControlLevel[]
+        availableResourceLevels: (defaults: AccessControlDefaultsResponse | null) => AccessControlLevel[]
+        resourceKeys: (
+            defaults: AccessControlDefaultsResponse | null,
+            resources: APIScopeObject[],
+            featureFlags: FeatureFlagsSet
+        ) => {
+            key: APIScopeObject
+            label: string
+        }[]
+        resourcesWithProject: (
+            resourceKeys: {
+                key: APIScopeObject
+                label: string
+            }[]
+        ) => {
+            key: APIScopeObject
+            label: string
+        }[]
+        visibleResourceKeySet: (
+            resourceKeys: {
+                key: APIScopeObject
+                label: string
+            }[]
+        ) => Set<APIScopeObject>
+        ruleOptions: (
+            availableProjectLevels: AccessControlLevel[],
+            availableResourceLevels: AccessControlLevel[]
+        ) => {
+            key: AccessControlLevel
+            label: string
+        }[]
+        filteredRoles: (
+            rolesData: AccessControlRolesResponse | null,
+            searchText: string,
+            filters: AccessControlFilters,
+            canUseRoles: boolean,
+            visibleResourceKeySet: Set<APIScopeObject>
+        ) => AccessControlRoleEntry[]
+        filteredMembers: (
+            membersData: AccessControlMembersResponse | null,
+            searchText: string,
+            filters: AccessControlFilters,
+            visibleResourceKeySet: Set<APIScopeObject>
+        ) => AccessControlMemberEntry[]
+        loading: (defaultsLoading: boolean, rolesDataLoading: boolean, membersDataLoading: boolean) => boolean
+    }
+}
+
+export type accessControlsLogicType = MakeLogicType<
+    accessControlsLogicValues,
+    accessControlsLogicActions,
+    AccessControlsLogicProps,
+    accessControlsLogicMeta
+>
+
 export const accessControlsLogic = kea<accessControlsLogicType>([
     path([
         'layout',
@@ -199,28 +499,41 @@ export const accessControlsLogic = kea<accessControlsLogicType>([
     }),
 
     selectors({
-        allMembers: [(s) => [s.sortedMembers], (sortedMembers): OrganizationMemberType[] => sortedMembers ?? []],
+        allMembers: [
+            (s) => [s.sortedMembers],
+            (sortedMembers: OrganizationMemberType[] | null): OrganizationMemberType[] => sortedMembers ?? [],
+        ],
 
         canUseRoles: [
             (s) => [s.hasAvailableFeature],
-            (hasAvailableFeature): boolean => hasAvailableFeature(AvailableFeature.ROLE_BASED_ACCESS),
+            (hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean): boolean =>
+                hasAvailableFeature(AvailableFeature.ROLE_BASED_ACCESS),
         ],
 
-        canEdit: [(s) => [s.defaults], (defaults): boolean => defaults?.can_edit ?? false],
+        canEdit: [
+            (s) => [s.defaults],
+            (defaults: AccessControlDefaultsResponse | null): boolean => defaults?.can_edit ?? false,
+        ],
 
         availableProjectLevels: [
             (s) => [s.defaults],
-            (defaults): AccessControlLevel[] => defaults?.available_project_levels ?? [],
+            (defaults: AccessControlDefaultsResponse | null): AccessControlLevel[] =>
+                defaults?.available_project_levels ?? [],
         ],
 
         availableResourceLevels: [
             (s) => [s.defaults],
-            (defaults): AccessControlLevel[] => defaults?.available_resource_levels ?? [],
+            (defaults: AccessControlDefaultsResponse | null): AccessControlLevel[] =>
+                defaults?.available_resource_levels ?? [],
         ],
 
         resourceKeys: [
             (s) => [s.defaults, s.resources, s.featureFlags],
-            (defaults, resources, featureFlags): { key: APIScopeObject; label: string }[] => {
+            (
+                defaults: AccessControlDefaultsResponse | null,
+                resources: APIScopeObject[],
+                featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet
+            ): { key: APIScopeObject; label: string }[] => {
                 if (defaults) {
                     return Object.keys(defaults.resource_access_levels)
                         .filter((resource) => isResourceRolledOut(resource as AccessControlResourceType, featureFlags))
@@ -239,19 +552,32 @@ export const accessControlsLogic = kea<accessControlsLogicType>([
 
         resourcesWithProject: [
             (s) => [s.resourceKeys],
-            (resourceKeys): { key: APIScopeObject; label: string }[] => {
+            (
+                resourceKeys: {
+                    key: APIScopeObject
+                    label: string
+                }[]
+            ): { key: APIScopeObject; label: string }[] => {
                 return [{ key: 'project' as APIScopeObject, label: 'Project' }, ...resourceKeys]
             },
         ],
 
         visibleResourceKeySet: [
             (s) => [s.resourceKeys],
-            (resourceKeys): Set<APIScopeObject> => new Set(resourceKeys.map((r) => r.key)),
+            (
+                resourceKeys: {
+                    key: APIScopeObject
+                    label: string
+                }[]
+            ): Set<APIScopeObject> => new Set(resourceKeys.map((r) => r.key)),
         ],
 
         ruleOptions: [
             (s) => [s.availableProjectLevels, s.availableResourceLevels],
-            (projectLevels, resourceLevels): { key: AccessControlLevel; label: string }[] => {
+            (
+                projectLevels: AccessControlLevel[],
+                resourceLevels: AccessControlLevel[]
+            ): { key: AccessControlLevel; label: string }[] => {
                 const levelSet = new Set<AccessControlLevel>()
                 for (const level of projectLevels) {
                     levelSet.add(level)
@@ -271,7 +597,13 @@ export const accessControlsLogic = kea<accessControlsLogicType>([
 
         filteredRoles: [
             (s) => [s.rolesData, s.searchText, s.filters, s.canUseRoles, s.visibleResourceKeySet],
-            (rolesData, searchText, filters, canUseRoles, visibleResourceKeySet): AccessControlRoleEntry[] => {
+            (
+                rolesData: AccessControlRolesResponse | null,
+                searchText: string,
+                filters: AccessControlFilters,
+                canUseRoles: boolean,
+                visibleResourceKeySet: Set<APIScopeObject>
+            ): AccessControlRoleEntry[] => {
                 if (!canUseRoles || !rolesData) {
                     return []
                 }
@@ -290,7 +622,12 @@ export const accessControlsLogic = kea<accessControlsLogicType>([
 
         filteredMembers: [
             (s) => [s.membersData, s.searchText, s.filters, s.visibleResourceKeySet],
-            (membersData, searchText, filters, visibleResourceKeySet): AccessControlMemberEntry[] => {
+            (
+                membersData: AccessControlMembersResponse | null,
+                searchText: string,
+                filters: AccessControlFilters,
+                visibleResourceKeySet: Set<APIScopeObject>
+            ): AccessControlMemberEntry[] => {
                 if (!membersData) {
                     return []
                 }
@@ -317,7 +654,7 @@ export const accessControlsLogic = kea<accessControlsLogicType>([
 
         loading: [
             (s) => [s.defaultsLoading, s.rolesDataLoading, s.membersDataLoading],
-            (defaultsLoading, rolesLoading, membersLoading): boolean =>
+            (defaultsLoading: boolean, rolesLoading: boolean, membersLoading: boolean): boolean =>
                 defaultsLoading || rolesLoading || membersLoading,
         ],
     }),
diff --git a/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/ResourceAccessControlsV2/groupedAccessControlRuleModalLogic.ts b/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/ResourceAccessControlsV2/groupedAccessControlRuleModalLogic.ts
index 2704f0c65da0..fc982f2fdd12 100644
--- a/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/ResourceAccessControlsV2/groupedAccessControlRuleModalLogic.ts
+++ b/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/ResourceAccessControlsV2/groupedAccessControlRuleModalLogic.ts
@@ -1,11 +1,172 @@
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 
 import { APIScopeObject, AccessControlLevel, EffectiveAccessControlEntry } from '~/types'
 
 import { accessControlsLogic } from './accessControlsLogic'
-import type { groupedAccessControlRuleModalLogicType } from './groupedAccessControlRuleModalLogicType'
 import { getEntryId, getInheritedReasonTooltip, getLevelOptionsForResource } from './helpers'
 import { FormAccessLevel, GroupedAccessControlRuleModalLogicProps } from './types'
+import type { AccessControlSettingsEntry, ScopeType } from './types'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface groupedAccessControlRuleModalLogicValues {
+    availableProjectLevels: AccessControlLevel[] // accessControlsLogic
+    availableResourceLevels: AccessControlLevel[] // accessControlsLogic
+    canEdit: boolean // accessControlsLogic
+    loading: boolean // accessControlsLogic
+    entry: AccessControlSettingsEntry
+    entryId: string
+    featuresDisabledReason:
+        | 'Cannot edit'
+        | 'Loading...'
+        | 'User is an organization admin and has access to all features'
+        | undefined
+    formProjectLevel: FormAccessLevel
+    formResourceLevels: Record<APIScopeObject, FormAccessLevel>
+    isOrgAdmin: boolean
+    isProjectLevelShowingInherited: boolean
+    isResourceLevelShowingInherited: (resource: APIScopeObject) => boolean
+    modalTitle: 'Update default access' | 'Update member access' | 'Update role access'
+    projectDisabledReason: 'Cannot edit' | 'Loading...' | 'User is an organization admin' | undefined
+    projectInheritedReasonTooltip: string | undefined
+    projectLevelOptions: {
+        disabledReason?: string | undefined
+        label: string
+        value: AccessControlLevel
+    }[]
+    resourceInheritedReasonTooltip: (resource: APIScopeObject) => string | undefined
+    resourceLevelOptions: (
+        resource: APIScopeObject,
+        resourceLabel: string
+    ) => (
+        | {
+              disabledReason?: string | undefined
+              label: string
+              value: AccessControlLevel
+          }
+        | {
+              disabledReason: undefined
+              label: string
+              value: AccessControlLevel | null
+          }
+    )[]
+    scopeType: ScopeType
+    showResourceAddOverrideButton: (resource: APIScopeObject) => boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface groupedAccessControlRuleModalLogicActions {
+    closeRuleModal: () => {
+        value: true
+    } // accessControlsLogic
+    saveGroupedRules: (params: {
+        projectLevel: AccessControlLevel | null
+        resourceLevels: Record<APIScopeObject, AccessControlLevel | null>
+        scopeId: string
+        scopeType: ScopeType
+    }) => {
+        projectLevel: AccessControlLevel | null
+        resourceLevels: Record<APIScopeObject, AccessControlLevel | null>
+        scopeId: string
+        scopeType: ScopeType
+    } // accessControlsLogic
+    clearResourceOverrides: () => {
+        value: true
+    }
+    close: () => {
+        value: true
+    }
+    save: () => {
+        value: true
+    }
+    setProjectLevel: (level: AccessControlLevel | null) => {
+        level: AccessControlLevel | null
+    }
+    setResourceLevel: (
+        resource: APIScopeObject,
+        level: AccessControlLevel | null
+    ) => {
+        level: AccessControlLevel | null
+        resource: APIScopeObject
+    }
+    setResourceLevels: (levels: Record<APIScopeObject, FormAccessLevel>) => {
+        levels: Record<APIScopeObject, FormAccessLevel>
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface groupedAccessControlRuleModalLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        entry: (entry: AccessControlSettingsEntry) => AccessControlSettingsEntry
+        scopeType: (scopeType: ScopeType) => ScopeType
+        entryId: (entry: AccessControlSettingsEntry) => string
+        modalTitle: (scopeType: ScopeType) => 'Update default access' | 'Update member access' | 'Update role access'
+        isOrgAdmin: (entry: AccessControlSettingsEntry) => boolean
+        featuresDisabledReason: (
+            loading: boolean,
+            canEdit: boolean,
+            isOrgAdmin: boolean
+        ) => 'Cannot edit' | 'Loading...' | 'User is an organization admin and has access to all features' | undefined
+        isProjectLevelShowingInherited: (
+            formProjectLevel: FormAccessLevel,
+            entry: AccessControlSettingsEntry
+        ) => boolean
+        projectInheritedReasonTooltip: (
+            isProjectLevelShowingInherited: boolean,
+            entry: AccessControlSettingsEntry
+        ) => string | undefined
+        projectLevelOptions: (
+            availableProjectLevels: AccessControlLevel[],
+            entry: AccessControlSettingsEntry
+        ) => {
+            disabledReason?: string | undefined
+            label: string
+            value: AccessControlLevel
+        }[]
+        projectDisabledReason: (
+            loading: boolean,
+            canEdit: boolean,
+            isOrgAdmin: boolean
+        ) => 'Cannot edit' | 'Loading...' | 'User is an organization admin' | undefined
+        isResourceLevelShowingInherited: (
+            formResourceLevels: Record<APIScopeObject, FormAccessLevel>,
+            entry: AccessControlSettingsEntry
+        ) => (resource: APIScopeObject) => boolean
+        resourceInheritedReasonTooltip: (
+            isResourceLevelShowingInherited: (resource: APIScopeObject) => boolean,
+            entry: AccessControlSettingsEntry
+        ) => (resource: APIScopeObject) => string | undefined
+        resourceLevelOptions: (
+            availableResourceLevels: AccessControlLevel[],
+            entry: AccessControlSettingsEntry,
+            formResourceLevels: Record<APIScopeObject, FormAccessLevel>
+        ) => (
+            resource: APIScopeObject,
+            resourceLabel: string
+        ) => (
+            | {
+                  disabledReason?: string | undefined
+                  label: string
+                  value: AccessControlLevel
+              }
+            | {
+                  disabledReason: undefined
+                  label: string
+                  value: AccessControlLevel | null
+              }
+        )[]
+        showResourceAddOverrideButton: (
+            formResourceLevels: Record<APIScopeObject, FormAccessLevel>
+        ) => (resource: APIScopeObject) => boolean
+    }
+}
+
+export type groupedAccessControlRuleModalLogicType = MakeLogicType<
+    groupedAccessControlRuleModalLogicValues,
+    groupedAccessControlRuleModalLogicActions,
+    GroupedAccessControlRuleModalLogicProps,
+    groupedAccessControlRuleModalLogicMeta
+>
 
 export const groupedAccessControlRuleModalLogic = kea<groupedAccessControlRuleModalLogicType>([
     path((key) => ['scenes', 'access_control', 'groupedAccessControlRuleModalLogic', key]),
@@ -51,13 +212,13 @@ export const groupedAccessControlRuleModalLogic = kea<groupedAccessControlRuleMo
     })),
 
     selectors({
-        entry: [(_, p) => [p.entry], (entry) => entry],
-        scopeType: [(_, p) => [p.scopeType], (scopeType) => scopeType],
-        entryId: [(_, p) => [p.entry], (entry) => getEntryId(entry)],
+        entry: [(_, p) => [p.entry], (entry: import('./types').AccessControlSettingsEntry) => entry],
+        scopeType: [(_, p) => [p.scopeType], (scopeType: import('./types').ScopeType) => scopeType],
+        entryId: [(_, p) => [p.entry], (entry: import('./types').AccessControlSettingsEntry) => getEntryId(entry)],
 
         modalTitle: [
             (s) => [s.scopeType],
-            (scopeType) => {
+            (scopeType: import('./types').ScopeType) => {
                 switch (scopeType) {
                     case 'default':
                         return 'Update default access'
@@ -68,10 +229,14 @@ export const groupedAccessControlRuleModalLogic = kea<groupedAccessControlRuleMo
                 }
             },
         ],
-        isOrgAdmin: [(s) => [s.entry], (entry) => entry.project.inherited_access_level_reason === 'organization_admin'],
+        isOrgAdmin: [
+            (s) => [s.entry],
+            (entry: import('./types').AccessControlSettingsEntry) =>
+                entry.project.inherited_access_level_reason === 'organization_admin',
+        ],
         featuresDisabledReason: [
             (s) => [s.loading, s.canEdit, s.isOrgAdmin],
-            (loading, canEdit, isOrgAdmin) => {
+            (loading: boolean, canEdit: boolean, isOrgAdmin: boolean) => {
                 if (loading) {
                     return 'Loading...'
                 }
@@ -88,20 +253,20 @@ export const groupedAccessControlRuleModalLogic = kea<groupedAccessControlRuleMo
         // Project access level
         isProjectLevelShowingInherited: [
             (s) => [s.formProjectLevel, s.entry],
-            (formProjectLevel, entry) =>
+            (formProjectLevel: FormAccessLevel, entry: import('./types').AccessControlSettingsEntry) =>
                 formProjectLevel === entry.project.inherited_access_level &&
                 entry.project.inherited_access_level !== null,
         ],
         projectInheritedReasonTooltip: [
             (s) => [s.isProjectLevelShowingInherited, s.entry],
-            (isProjectLevelShowingInherited, entry) =>
+            (isProjectLevelShowingInherited: boolean, entry: import('./types').AccessControlSettingsEntry) =>
                 isProjectLevelShowingInherited
                     ? getInheritedReasonTooltip(entry.project.inherited_access_level_reason)
                     : undefined,
         ],
         projectLevelOptions: [
             (s) => [s.availableProjectLevels, s.entry],
-            (availableProjectLevels, entry) => {
+            (availableProjectLevels: AccessControlLevel[], entry: import('./types').AccessControlSettingsEntry) => {
                 const { inherited_access_level, inherited_access_level_reason, minimum, maximum } = entry.project
                 return getLevelOptionsForResource(availableProjectLevels, {
                     minimum,
@@ -114,7 +279,7 @@ export const groupedAccessControlRuleModalLogic = kea<groupedAccessControlRuleMo
         ],
         projectDisabledReason: [
             (s) => [s.loading, s.canEdit, s.isOrgAdmin],
-            (loading, canEdit, isOrgAdmin) => {
+            (loading: boolean, canEdit: boolean, isOrgAdmin: boolean) => {
                 if (loading) {
                     return 'Loading...'
                 }
@@ -131,26 +296,38 @@ export const groupedAccessControlRuleModalLogic = kea<groupedAccessControlRuleMo
         // Resource access level
         isResourceLevelShowingInherited: [
             (s) => [s.formResourceLevels, s.entry],
-            (formResourceLevels, entry) => (resource: APIScopeObject) => {
-                const resourceEntry = entry.resources[resource] as EffectiveAccessControlEntry
-                return (
-                    formResourceLevels[resource] === resourceEntry.inherited_access_level &&
-                    resourceEntry.inherited_access_level !== null
-                )
-            },
+            (
+                formResourceLevels: Record<APIScopeObject, FormAccessLevel>,
+                entry: import('./types').AccessControlSettingsEntry
+            ) =>
+                (resource: APIScopeObject) => {
+                    const resourceEntry = entry.resources[resource] as EffectiveAccessControlEntry
+                    return (
+                        formResourceLevels[resource] === resourceEntry.inherited_access_level &&
+                        resourceEntry.inherited_access_level !== null
+                    )
+                },
         ],
         resourceInheritedReasonTooltip: [
             (s) => [s.isResourceLevelShowingInherited, s.entry],
-            (isResourceLevelShowingInherited, entry) => (resource: APIScopeObject) =>
-                isResourceLevelShowingInherited(resource)
-                    ? getInheritedReasonTooltip(
-                          (entry.resources[resource] as EffectiveAccessControlEntry).inherited_access_level_reason
-                      )
-                    : undefined,
+            (
+                isResourceLevelShowingInherited: (resource: APIScopeObject) => boolean,
+                entry: import('./types').AccessControlSettingsEntry
+            ) =>
+                (resource: APIScopeObject) =>
+                    isResourceLevelShowingInherited(resource)
+                        ? getInheritedReasonTooltip(
+                              (entry.resources[resource] as EffectiveAccessControlEntry).inherited_access_level_reason
+                          )
+                        : undefined,
         ],
         resourceLevelOptions: [
             (s) => [s.availableResourceLevels, s.entry, s.formResourceLevels],
-            (availableResourceLevels, entry, formResourceLevels) =>
+            (
+                availableResourceLevels: AccessControlLevel[],
+                entry: import('./types').AccessControlSettingsEntry,
+                formResourceLevels: Record<APIScopeObject, FormAccessLevel>
+            ) =>
                 (resource: APIScopeObject, resourceLabel: string) => {
                     const { access_level, inherited_access_level, inherited_access_level_reason, minimum, maximum } =
                         entry.resources[resource] as EffectiveAccessControlEntry
@@ -179,7 +356,8 @@ export const groupedAccessControlRuleModalLogic = kea<groupedAccessControlRuleMo
         ],
         showResourceAddOverrideButton: [
             (s) => [s.formResourceLevels],
-            (formResourceLevels) => (resource: APIScopeObject) => formResourceLevels[resource] === null,
+            (formResourceLevels: Record<APIScopeObject, FormAccessLevel>) => (resource: APIScopeObject) =>
+                formResourceLevels[resource] === null,
         ],
     }),
 
diff --git a/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/accessControlLogic.ts b/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/accessControlLogic.ts
index 161194d85e10..98873b3db56c 100644
--- a/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/accessControlLogic.ts
+++ b/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/accessControlLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { LemonSelectOption } from '@posthog/lemon-ui'
@@ -25,7 +25,7 @@ import {
     RoleType,
 } from '~/types'
 
-import type { accessControlLogicType } from './accessControlLogicType'
+import type { GuardAvailableFeatureFn } from '../../../../../lib/components/UpgradeModal/upgradeModalLogic'
 import { roleAccessControlLogic } from './roleAccessControlLogic'
 
 export type AccessControlLogicProps = {
@@ -35,6 +35,212 @@ export type AccessControlLogicProps = {
     description: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accessControlLogicValues {
+    sortedMembers: OrganizationMemberType[] | null // membersLogic
+    roles: RoleType[] // roleAccessControlLogic
+    currentProjectId: number | string // teamLogic
+    guardAvailableFeature: GuardAvailableFeatureFn // upgradeModalLogic
+    accessControlDefault: AccessControlTypeProject
+    accessControlDefaultLevel: string | null
+    accessControlDefaultOptions: LemonSelectOption<string>[]
+    accessControlMembers: (AccessControlTypeMember | AccessControlTypeOrganizationAdmins)[]
+    accessControlRoles: AccessControlTypeRole[]
+    accessControls: AccessControlResponseType | null
+    accessControlsLoading: boolean
+    addableMembers: any[]
+    addableRoles: RoleType[]
+    availableLevels: AccessControlLevel[]
+    availableLevelsWithNone: AccessControlLevel[]
+    canEditAccessControls: boolean | null
+    endpoint: string
+    humanReadableResource: string
+    membersById: Record<string, OrganizationMemberType>
+    minimumAccessLevel: AccessControlLevel | null
+    organizationAdmins: OrganizationMemberType[]
+    organizationAdminsAsAccessControlMember: AccessControlTypeOrganizationAdmins
+    resource: APIScopeObject
+    rolesById: Record<string, RoleType>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accessControlLogicActions {
+    ensureAllMembersLoaded: () => {
+        value: true
+    } // membersLogic
+    loadAccessControls: () => any
+    loadAccessControlsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAccessControlsSuccess: (
+        accessControls: AccessControlResponseType,
+        payload?: any
+    ) => {
+        accessControls: AccessControlResponseType
+        payload?: any
+    }
+    updateAccessControl: (accessControl: Pick<AccessControlType, 'access_level' | 'organization_member' | 'role'>) => {
+        accessControl: Pick<AccessControlType, 'access_level' | 'organization_member' | 'role'>
+    }
+    updateAccessControlDefault: (
+        level: AccessControlLevel,
+        source?: AccessControlUIVersion
+    ) => {
+        level: AccessControlLevel
+        source: AccessControlUIVersion
+    }
+    updateAccessControlDefaultFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateAccessControlDefaultSuccess: (
+        accessControls: AccessControlResponseType | null,
+        payload?: {
+            level: AccessControlLevel
+            source: AccessControlUIVersion
+        }
+    ) => {
+        accessControls: AccessControlResponseType | null
+        payload?: {
+            level: AccessControlLevel
+            source: AccessControlUIVersion
+        }
+    }
+    updateAccessControlMembers: (
+        accessControls: {
+            level: AccessControlLevel | null
+            member: OrganizationMemberType['id']
+        }[],
+        source?: AccessControlUIVersion
+    ) => {
+        accessControls: {
+            level: AccessControlLevel | null
+            member: string
+        }[]
+        source: AccessControlUIVersion
+    }
+    updateAccessControlMembersFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateAccessControlMembersSuccess: (
+        accessControls: AccessControlResponseType | null,
+        payload?: {
+            accessControls: {
+                level: AccessControlLevel | null
+                member: string
+            }[]
+            source: AccessControlUIVersion
+        }
+    ) => {
+        accessControls: AccessControlResponseType | null
+        payload?: {
+            accessControls: {
+                level: AccessControlLevel | null
+                member: string
+            }[]
+            source: AccessControlUIVersion
+        }
+    }
+    updateAccessControlRoles: (
+        accessControls: {
+            level: AccessControlLevel | null
+            role: RoleType['id']
+        }[],
+        source?: AccessControlUIVersion
+    ) => {
+        accessControls: {
+            level: AccessControlLevel | null
+            role: string
+        }[]
+        source: AccessControlUIVersion
+    }
+    updateAccessControlRolesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateAccessControlRolesSuccess: (
+        accessControls: AccessControlResponseType | null,
+        payload?: {
+            accessControls: {
+                level: AccessControlLevel | null
+                role: string
+            }[]
+            source: AccessControlUIVersion
+        }
+    ) => {
+        accessControls: AccessControlResponseType | null
+        payload?: {
+            accessControls: {
+                level: AccessControlLevel | null
+                role: string
+            }[]
+            source: AccessControlUIVersion
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accessControlLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        resource: (resource: APIScopeObject) => APIScopeObject
+        endpoint: (currentProjectId: number | string, resource: APIScopeObject, resource_id: string) => string
+        humanReadableResource: (resource: APIScopeObject) => string
+        minimumAccessLevel: (accessControls: AccessControlResponseType | null) => AccessControlLevel | null
+        availableLevelsWithNone: (accessControls: AccessControlResponseType | null) => AccessControlLevel[]
+        availableLevels: (availableLevelsWithNone: AccessControlLevel[]) => AccessControlLevel[]
+        canEditAccessControls: (accessControls: AccessControlResponseType | null) => boolean | null
+        accessControlDefaultLevel: (accessControls: AccessControlResponseType | null) => string | null
+        accessControlDefaultOptions: (
+            availableLevelsWithNone: AccessControlLevel[],
+            minimumAccessLevel: AccessControlLevel | null,
+            arg: any
+        ) => LemonSelectOption<string>[]
+        accessControlDefault: (
+            accessControls: AccessControlResponseType | null,
+            accessControlDefaultLevel: string | null
+        ) => AccessControlTypeProject
+        organizationAdmins: (sortedMembers: OrganizationMemberType[] | null) => OrganizationMemberType[]
+        organizationAdminsAsAccessControlMember: (
+            organizationAdmins: OrganizationMemberType[]
+        ) => AccessControlTypeOrganizationAdmins
+        accessControlMembers: (
+            accessControls: AccessControlResponseType | null,
+            organizationAdminsAsAccessControlMember: AccessControlTypeOrganizationAdmins
+        ) => (AccessControlTypeMember | AccessControlTypeOrganizationAdmins)[]
+        accessControlRoles: (accessControls: AccessControlResponseType | null) => AccessControlTypeRole[]
+        rolesById: (roles: RoleType[]) => Record<string, RoleType>
+        addableRoles: (roles: RoleType[], accessControlRoles: AccessControlTypeRole[]) => RoleType[]
+        membersById: (sortedMembers: OrganizationMemberType[] | null) => Record<string, OrganizationMemberType>
+        addableMembers: (
+            sortedMembers: OrganizationMemberType[] | null,
+            accessControlMembers: (AccessControlTypeMember | AccessControlTypeOrganizationAdmins)[],
+            organizationAdmins: OrganizationMemberType[]
+        ) => any[]
+    }
+}
+
+export type accessControlLogicType = MakeLogicType<
+    accessControlLogicValues,
+    accessControlLogicActions,
+    AccessControlLogicProps,
+    accessControlLogicMeta
+>
+
 export const accessControlLogic = kea<accessControlLogicType>([
     props({} as AccessControlLogicProps),
     key((props) => `${props.resource}-${props.resource_id}`),
@@ -167,11 +373,11 @@ export const accessControlLogic = kea<accessControlLogicType>([
         updateAccessControlMembersSuccess: () => actions.loadAccessControls(),
     })),
     selectors({
-        resource: [(_, p) => [p.resource], (resource) => resource],
+        resource: [(_, p) => [p.resource], (resource: APIScopeObject) => resource],
 
         endpoint: [
             (s, p) => [s.currentProjectId, p.resource, p.resource_id],
-            (currentProjectId, resource, resource_id): string => {
+            (currentProjectId: number | string, resource: APIScopeObject, resource_id: string): string => {
                 // TODO: This is far from perfect... but it's a start
                 if (resource === 'project') {
                     return `api/projects/${currentProjectId}/access_controls`
@@ -186,46 +392,49 @@ export const accessControlLogic = kea<accessControlLogicType>([
             },
         ],
 
-        humanReadableResource: [(_, p) => [p.resource], (resource) => resource.replace(/_/g, ' ')],
+        humanReadableResource: [(_, p) => [p.resource], (resource: APIScopeObject) => resource.replace(/_/g, ' ')],
 
         minimumAccessLevel: [
             (s) => [s.accessControls],
-            (accessControls): AccessControlLevel | null => {
+            (accessControls: AccessControlResponseType | null): AccessControlLevel | null => {
                 return accessControls?.minimum_access_level ?? null
             },
         ],
 
         availableLevelsWithNone: [
             (s) => [s.accessControls],
-            (accessControls): AccessControlLevel[] => {
+            (accessControls: AccessControlResponseType | null): AccessControlLevel[] => {
                 return accessControls?.available_access_levels ?? []
             },
         ],
 
         availableLevels: [
             (s) => [s.availableLevelsWithNone],
-            (availableLevelsWithNone): AccessControlLevel[] => {
+            (availableLevelsWithNone: AccessControlLevel[]): AccessControlLevel[] => {
                 return availableLevelsWithNone.filter((level) => level !== 'none')
             },
         ],
 
         canEditAccessControls: [
             (s) => [s.accessControls],
-            (accessControls): boolean | null => {
+            (accessControls: AccessControlResponseType | null): boolean | null => {
                 return accessControls?.user_can_edit_access_levels ?? null
             },
         ],
 
         accessControlDefaultLevel: [
             (s) => [s.accessControls],
-            (accessControls): string | null => {
+            (accessControls: AccessControlResponseType | null): string | null => {
                 return accessControls?.default_access_level ?? null
             },
         ],
 
         accessControlDefaultOptions: [
             (s) => [s.availableLevelsWithNone, s.minimumAccessLevel, (_, props) => props.resource],
-            (availableLevelsWithNone, minimumAccessLevel): LemonSelectOption<string>[] => {
+            (
+                availableLevelsWithNone: AccessControlLevel[],
+                minimumAccessLevel: AccessControlLevel | null
+            ): LemonSelectOption<string>[] => {
                 const options = availableLevelsWithNone.map((level) => {
                     const isDisabled = minimumAccessLevel
                         ? availableLevelsWithNone.indexOf(level) < availableLevelsWithNone.indexOf(minimumAccessLevel)
@@ -244,7 +453,10 @@ export const accessControlLogic = kea<accessControlLogicType>([
 
         accessControlDefault: [
             (s) => [s.accessControls, s.accessControlDefaultLevel],
-            (accessControls, accessControlDefaultLevel): AccessControlTypeProject => {
+            (
+                accessControls: AccessControlResponseType | null,
+                accessControlDefaultLevel: string | null
+            ): AccessControlTypeProject => {
                 const found = accessControls?.access_controls?.find(
                     (accessControl) => !accessControl.organization_member && !accessControl.role
                 ) as AccessControlTypeProject
@@ -258,14 +470,14 @@ export const accessControlLogic = kea<accessControlLogicType>([
 
         organizationAdmins: [
             (s) => [s.sortedMembers],
-            (members): OrganizationMemberType[] => {
+            (members: OrganizationMemberType[] | null): OrganizationMemberType[] => {
                 return members?.filter((member) => member.level >= OrganizationMembershipLevel.Admin) ?? []
             },
         ],
 
         organizationAdminsAsAccessControlMember: [
             (s) => [s.organizationAdmins],
-            (organizationAdmins): AccessControlTypeOrganizationAdmins => {
+            (organizationAdmins: OrganizationMemberType[]): AccessControlTypeOrganizationAdmins => {
                 return {
                     organization_admin_members: organizationAdmins.map((member) => member.id),
                     access_level: AccessControlLevel.Admin,
@@ -280,8 +492,8 @@ export const accessControlLogic = kea<accessControlLogicType>([
         accessControlMembers: [
             (s) => [s.accessControls, s.organizationAdminsAsAccessControlMember],
             (
-                accessControls,
-                organizationAdminsAsAccessControlMember
+                accessControls: AccessControlResponseType | null,
+                organizationAdminsAsAccessControlMember: AccessControlTypeOrganizationAdmins
             ): (AccessControlTypeMember | AccessControlTypeOrganizationAdmins)[] => {
                 const members = (accessControls?.access_controls || [])
                     .filter((accessControl) => !!accessControl.organization_member)
@@ -297,7 +509,7 @@ export const accessControlLogic = kea<accessControlLogicType>([
 
         accessControlRoles: [
             (s) => [s.accessControls],
-            (accessControls): AccessControlTypeRole[] => {
+            (accessControls: AccessControlResponseType | null): AccessControlTypeRole[] => {
                 return (accessControls?.access_controls || []).filter(
                     (accessControl) => !!accessControl.role
                 ) as AccessControlTypeRole[]
@@ -306,28 +518,32 @@ export const accessControlLogic = kea<accessControlLogicType>([
 
         rolesById: [
             (s) => [s.roles],
-            (roles): Record<string, RoleType> => {
+            (roles: RoleType[]): Record<string, RoleType> => {
                 return Object.fromEntries((roles || []).map((role) => [role.id, role]))
             },
         ],
 
         addableRoles: [
             (s) => [s.roles, s.accessControlRoles],
-            (roles, accessControlRoles): RoleType[] => {
+            (roles: RoleType[], accessControlRoles: AccessControlTypeRole[]): RoleType[] => {
                 return roles ? roles.filter((role) => !accessControlRoles.find((ac) => ac.role === role.id)) : []
             },
         ],
 
         membersById: [
             (s) => [s.sortedMembers],
-            (members): Record<string, OrganizationMemberType> => {
+            (members: OrganizationMemberType[] | null): Record<string, OrganizationMemberType> => {
                 return Object.fromEntries((members || []).map((member) => [member.id, member]))
             },
         ],
 
         addableMembers: [
             (s) => [s.sortedMembers, s.accessControlMembers, s.organizationAdmins],
-            (members, accessControlMembers, organizationAdmins): any[] => {
+            (
+                members: OrganizationMemberType[] | null,
+                accessControlMembers: (AccessControlTypeMember | AccessControlTypeOrganizationAdmins)[],
+                organizationAdmins: OrganizationMemberType[]
+            ): any[] => {
                 return members
                     ? members.filter(
                           (member) =>
diff --git a/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/resourcesAccessControlLogic.ts b/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/resourcesAccessControlLogic.ts
index 28d032475f49..82b70aeffbd6 100644
--- a/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/resourcesAccessControlLogic.ts
+++ b/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/resourcesAccessControlLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -24,7 +24,7 @@ import {
     RoleType,
 } from '~/types'
 
-import type { resourcesAccessControlLogicType } from './resourcesAccessControlLogicType'
+import type { FeatureFlagsSet } from '../../../../../lib/logic/featureFlagLogic'
 import { roleAccessControlLogic } from './roleAccessControlLogic'
 
 export type DefaultResourceAccessControls = {
@@ -58,6 +58,140 @@ export function isResourceRolledOut(
     return !requiredFlag || !!featureFlags[requiredFlag]
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface resourcesAccessControlLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    sortedMembers: OrganizationMemberType[] | null // membersLogic
+    roles: RoleType[] // roleAccessControlLogic
+    currentProjectId: number | string // teamLogic
+    hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean // userLogic
+    addableMembers: OrganizationMemberType[]
+    addableRoles: RoleType[]
+    availableLevels: AccessControlLevel[]
+    canEditRoleBasedAccessControls: boolean | null
+    defaultAccessLevel: string | null
+    defaultModalOpen: boolean
+    defaultResourceAccessControls: DefaultResourceAccessControls
+    editingMember: MemberResourceAccessControls | null
+    editingRole: RoleResourceAccessControls | null
+    memberModalOpen: boolean
+    memberResourceAccessControls: MemberResourceAccessControls[]
+    organizationAdmins: OrganizationMemberType[]
+    resourceAccessControls: AccessControlResponseType | null
+    resourceAccessControlsLoading: boolean
+    resources: APIScopeObject[]
+    roleModalOpen: boolean
+    roleResourceAccessControls: RoleResourceAccessControls[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface resourcesAccessControlLogicActions {
+    closeDefaultModal: () => {
+        value: true
+    }
+    closeMemberModal: () => {
+        value: true
+    }
+    closeRoleModal: () => {
+        value: true
+    }
+    loadResourceAccessControls: () => any
+    loadResourceAccessControlsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadResourceAccessControlsSuccess: (
+        resourceAccessControls: AccessControlResponseType,
+        payload?: any
+    ) => {
+        resourceAccessControls: AccessControlResponseType
+        payload?: any
+    }
+    openDefaultModal: () => {
+        value: true
+    }
+    openMemberModal: (editingMember?: MemberResourceAccessControls | null) => {
+        editingMember: MemberResourceAccessControls | null
+    }
+    openRoleModal: (editingRole?: RoleResourceAccessControls | null) => {
+        editingRole: RoleResourceAccessControls | null
+    }
+    updateResourceAccessControls: (
+        accessControls: Pick<AccessControlUpdateType, 'access_level' | 'organization_member' | 'resource' | 'role'>[],
+        saveType: 'default' | 'member' | 'role'
+    ) => {
+        accessControls: Pick<AccessControlUpdateType, 'access_level' | 'organization_member' | 'resource' | 'role'>[]
+        saveType: 'default' | 'member' | 'role'
+    }
+    updateResourceAccessControlsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateResourceAccessControlsSuccess: (
+        resourceAccessControls: AccessControlResponseType | null,
+        payload?: {
+            accessControls: Pick<
+                AccessControlUpdateType,
+                'access_level' | 'organization_member' | 'resource' | 'role'
+            >[]
+            saveType: 'default' | 'member' | 'role'
+        }
+    ) => {
+        resourceAccessControls: AccessControlResponseType | null
+        payload?: {
+            accessControls: Pick<
+                AccessControlUpdateType,
+                'access_level' | 'organization_member' | 'resource' | 'role'
+            >[]
+            saveType: 'default' | 'member' | 'role'
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface resourcesAccessControlLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        availableLevels: (resourceAccessControls: AccessControlResponseType | null) => AccessControlLevel[]
+        defaultAccessLevel: (resourceAccessControls: AccessControlResponseType | null) => string | null
+        organizationAdmins: (sortedMembers: OrganizationMemberType[] | null) => OrganizationMemberType[]
+        defaultResourceAccessControls: (
+            resourceAccessControls: AccessControlResponseType | null
+        ) => DefaultResourceAccessControls
+        addableMembers: (
+            sortedMembers: OrganizationMemberType[] | null,
+            memberResourceAccessControls: MemberResourceAccessControls[],
+            organizationAdmins: OrganizationMemberType[]
+        ) => OrganizationMemberType[]
+        addableRoles: (roles: RoleType[], roleResourceAccessControls: RoleResourceAccessControls[]) => RoleType[]
+        memberResourceAccessControls: (
+            sortedMembers: OrganizationMemberType[] | null,
+            resourceAccessControls: AccessControlResponseType | null
+        ) => MemberResourceAccessControls[]
+        roleResourceAccessControls: (
+            roles: RoleType[],
+            resourceAccessControls: AccessControlResponseType | null
+        ) => RoleResourceAccessControls[]
+        resources: (
+            hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean,
+            featureFlags: FeatureFlagsSet
+        ) => APIScopeObject[]
+        canEditRoleBasedAccessControls: (resourceAccessControls: AccessControlResponseType | null) => boolean | null
+    }
+}
+
+export type resourcesAccessControlLogicType = MakeLogicType<
+    resourcesAccessControlLogicValues,
+    resourcesAccessControlLogicActions,
+    Record<string, any>,
+    resourcesAccessControlLogicMeta
+>
+
 export const resourcesAccessControlLogic = kea<resourcesAccessControlLogicType>([
     path(['scenes', 'accessControl', 'resourcesAccessControlLogic']),
     connect(() => ({
@@ -181,28 +315,28 @@ export const resourcesAccessControlLogic = kea<resourcesAccessControlLogicType>(
     selectors({
         availableLevels: [
             (s) => [s.resourceAccessControls],
-            (resourceAccessControls): AccessControlLevel[] => {
+            (resourceAccessControls: AccessControlResponseType | null): AccessControlLevel[] => {
                 return resourceAccessControls?.available_access_levels ?? []
             },
         ],
 
         defaultAccessLevel: [
             (s) => [s.resourceAccessControls],
-            (resourceAccessControls): string | null => {
+            (resourceAccessControls: AccessControlResponseType | null): string | null => {
                 return resourceAccessControls?.default_access_level ?? null
             },
         ],
 
         organizationAdmins: [
             (s) => [s.sortedMembers],
-            (members): OrganizationMemberType[] => {
+            (members: OrganizationMemberType[] | null): OrganizationMemberType[] => {
                 return members?.filter((member) => member.level >= OrganizationMembershipLevel.Admin) ?? []
             },
         ],
 
         defaultResourceAccessControls: [
             (s) => [s.resourceAccessControls],
-            (resourceAccessControls): DefaultResourceAccessControls => {
+            (resourceAccessControls: AccessControlResponseType | null): DefaultResourceAccessControls => {
                 const accessControls = resourceAccessControls?.access_controls ?? []
 
                 // Find all acs without a roles (they are the default ones)
@@ -309,7 +443,10 @@ export const resourcesAccessControlLogic = kea<resourcesAccessControlLogicType>(
 
         resources: [
             (s) => [s.hasAvailableFeature, s.featureFlags],
-            (hasAvailableFeature, featureFlags): APIScopeObject[] => {
+            (
+                hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean,
+                featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet
+            ): APIScopeObject[] => {
                 const allResources = [
                     AccessControlResourceType.Action,
                     AccessControlResourceType.ActivityLog,
@@ -347,7 +484,7 @@ export const resourcesAccessControlLogic = kea<resourcesAccessControlLogicType>(
 
         canEditRoleBasedAccessControls: [
             (s) => [s.resourceAccessControls],
-            (resourceAccessControls): boolean | null => {
+            (resourceAccessControls: AccessControlResponseType | null): boolean | null => {
                 return resourceAccessControls?.user_can_edit_access_levels ?? null
             },
         ],
diff --git a/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/roleAccessControlLogic.ts b/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/roleAccessControlLogic.ts
index 96f18f30c304..6b4da5090b8f 100644
--- a/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/roleAccessControlLogic.ts
+++ b/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/roleAccessControlLogic.ts
@@ -1,5 +1,6 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, router } from 'kea-router'
 
@@ -19,7 +20,7 @@ import {
     RoleType,
 } from '~/types'
 
-import type { roleAccessControlLogicType } from './roleAccessControlLogicType'
+import type { AvailableFeature } from '../../../../../types'
 
 export type DefaultResourceAccessControls = {
     accessControlByResource: Record<APIScopeObject, AccessControlTypeRole>
@@ -31,6 +32,226 @@ export type RoleResourceAccessControls = DefaultResourceAccessControls & {
     role?: RoleType
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface roleAccessControlLogicValues {
+    sortedMembers: OrganizationMemberType[] | null // membersLogic
+    currentProjectId: number | string // teamLogic
+    hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean // userLogic
+    canEditRoles: boolean | null
+    editingRole: {
+        name: string
+    }
+    editingRoleAllErrors: Record<string, any>
+    editingRoleChanged: boolean
+    editingRoleErrors: DeepPartialMap<
+        {
+            name: string
+        },
+        ValidationErrorType
+    >
+    editingRoleHasErrors: boolean
+    editingRoleId: string | null
+    editingRoleManualErrors: Record<string, any>
+    editingRoleTouched: boolean
+    editingRoleTouches: Record<string, boolean>
+    editingRoleValidationErrors: DeepPartialMap<
+        {
+            name: string
+        },
+        ValidationErrorType
+    >
+    isEditingRoleSubmitting: boolean
+    isEditingRoleValid: boolean
+    resourceAccessControls: AccessControlResponseType | null
+    resourceAccessControlsLoading: boolean
+    roles: RoleType[]
+    rolesLoading: boolean
+    selectedRoleId: string | null
+    showEditingRoleErrors: boolean
+    sortedRoles: RoleType[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface roleAccessControlLogicActions {
+    ensureAllMembersLoaded: () => {
+        value: true
+    } // membersLogic
+    loadCurrentOrganization: () => any // organizationLogic
+    addMembersToRole: (
+        role: RoleType,
+        members: string[]
+    ) => {
+        members: string[]
+        role: RoleType
+    }
+    addMembersToRoleFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    addMembersToRoleSuccess: (
+        roles: RoleType[],
+        payload?: {
+            members: string[]
+            role: RoleType
+        }
+    ) => {
+        roles: RoleType[]
+        payload?: {
+            members: string[]
+            role: RoleType
+        }
+    }
+    deleteRole: (roleId: RoleType['id']) => {
+        roleId: string
+    }
+    deleteRoleFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteRoleSuccess: (
+        roles: RoleType[],
+        payload?: {
+            roleId: string
+        }
+    ) => {
+        roles: RoleType[]
+        payload?: {
+            roleId: string
+        }
+    }
+    loadResourceAccessControls: () => any
+    loadResourceAccessControlsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadResourceAccessControlsSuccess: (
+        resourceAccessControls: AccessControlResponseType,
+        payload?: any
+    ) => {
+        resourceAccessControls: AccessControlResponseType
+        payload?: any
+    }
+    loadRoles: () => any
+    loadRolesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRolesSuccess: (
+        roles: RoleType[],
+        payload?: any
+    ) => {
+        roles: RoleType[]
+        payload?: any
+    }
+    removeMemberFromRole: (
+        role: RoleType,
+        roleMemberId: string
+    ) => {
+        role: RoleType
+        roleMemberId: string
+    }
+    removeMemberFromRoleFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    removeMemberFromRoleSuccess: (
+        roles: RoleType[],
+        payload?: {
+            role: RoleType
+            roleMemberId: string
+        }
+    ) => {
+        roles: RoleType[]
+        payload?: {
+            role: RoleType
+            roleMemberId: string
+        }
+    }
+    resetEditingRole: (values?: { name: string }) => {
+        values?: {
+            name: string
+        }
+    }
+    selectRoleId: (roleId: RoleType['id'] | null) => {
+        roleId: string | null
+    }
+    setEditingRoleId: (roleId: string | null) => {
+        roleId: string | null
+    }
+    setEditingRoleManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setEditingRoleValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setEditingRoleValues: (
+        values: DeepPartial<{
+            name: string
+        }>
+    ) => {
+        values: DeepPartial<{
+            name: string
+        }>
+    }
+    submitEditingRole: () => {
+        value: boolean
+    }
+    submitEditingRoleFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitEditingRoleRequest: (editingRole: { name: string }) => {
+        editingRole: {
+            name: string
+        }
+    }
+    submitEditingRoleSuccess: (editingRole: { name: string }) => {
+        editingRole: {
+            name: string
+        }
+    }
+    touchEditingRoleField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface roleAccessControlLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        sortedRoles: (roles: RoleType[]) => RoleType[]
+        canEditRoles: (resourceAccessControls: AccessControlResponseType | null) => boolean | null
+    }
+}
+
+export type roleAccessControlLogicType = MakeLogicType<
+    roleAccessControlLogicValues,
+    roleAccessControlLogicActions,
+    Record<string, any>,
+    roleAccessControlLogicMeta
+>
+
 export const roleAccessControlLogic = kea<roleAccessControlLogicType>([
     path(['scenes', 'accessControl', 'roleAccessControlLogic']),
     connect(() => ({
diff --git a/frontend/src/layout/navigation-3000/sidepanel/panels/activity/sidePanelActivityLogic.tsx b/frontend/src/layout/navigation-3000/sidepanel/panels/activity/sidePanelActivityLogic.tsx
index feface92f0b7..8364f11510a6 100644
--- a/frontend/src/layout/navigation-3000/sidepanel/panels/activity/sidePanelActivityLogic.tsx
+++ b/frontend/src/layout/navigation-3000/sidepanel/panels/activity/sidePanelActivityLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { lazyLoaders } from 'kea-loaders'
 import { subscriptions } from 'kea-subscriptions'
 
@@ -13,10 +13,10 @@ import { projectLogic } from 'scenes/projectLogic'
 
 import { ActivityScope, UserBasicType } from '~/types'
 
+import type { SidePanelTab } from '../../../../../types'
 import { sidePanelContextLogic } from '../../sidePanelContextLogic'
 import { sidePanelStateLogic } from '../../sidePanelStateLogic'
 import { SidePanelSceneContext } from '../../types'
-import type { sidePanelActivityLogicType } from './sidePanelActivityLogicType'
 
 // ActivityScope values that should not appear in dropdowns
 const HIDDEN_ACTIVITY_SCOPES: ActivityScope[] = [
@@ -48,6 +48,101 @@ export enum SidePanelActivityTab {
     Metalytics = 'metalytics',
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sidePanelActivityLogicValues {
+    currentProjectId: number | null // projectLogic
+    sceneSidePanelContext: SidePanelSceneContext // sidePanelContextLogic
+    selectedTabOptions: string | null // sidePanelStateLogic
+    activeFilters: ActivityFilters | null
+    activeTab: SidePanelActivityTab
+    allActivity: HumanizedActivityLogItem[]
+    allActivityHasNext: boolean
+    allActivityResponse: PaginatedResponse<ActivityLogItem> | null
+    allActivityResponseLoading: boolean
+    contextFromPage: ActivityFilters | null
+    visibleActivityScopes: ActivityScope[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sidePanelActivityLogicActions {
+    openSidePanel: (
+        tab: SidePanelTab,
+        options?: string | undefined
+    ) => {
+        options: string | undefined
+        tab: SidePanelTab
+    } // sidePanelStateLogic
+    loadAllActivity: () => {
+        value: true
+    }
+    loadAllActivityFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAllActivitySuccess: (
+        allActivityResponse: PaginatedResponse<ActivityLogItem>,
+        payload?: {
+            value: true
+        }
+    ) => {
+        allActivityResponse: PaginatedResponse<ActivityLogItem>
+        payload?: {
+            value: true
+        }
+    }
+    loadOlderActivity: () => {
+        value: true
+    }
+    loadOlderActivityFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadOlderActivitySuccess: (
+        allActivityResponse: PaginatedResponse<ActivityLogItem> | null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        allActivityResponse: PaginatedResponse<ActivityLogItem> | null
+        payload?: {
+            value: true
+        }
+    }
+    maybeLoadOlderActivity: () => {
+        value: true
+    }
+    setActiveFilters: (filters: ActivityFilters | null) => {
+        filters: ActivityFilters | null
+    }
+    setActiveTab: (tab: SidePanelActivityTab) => {
+        tab: SidePanelActivityTab
+    }
+    setContextFromPage: (filters: ActivityFilters | null) => {
+        filters: ActivityFilters | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sidePanelActivityLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        allActivity: (allActivityResponse: PaginatedResponse<ActivityLogItem> | null) => HumanizedActivityLogItem[]
+        allActivityHasNext: (allActivityResponse: PaginatedResponse<ActivityLogItem> | null) => boolean
+    }
+}
+
+export type sidePanelActivityLogicType = MakeLogicType<
+    sidePanelActivityLogicValues,
+    sidePanelActivityLogicActions,
+    Record<string, any>,
+    sidePanelActivityLogicMeta
+>
+
 export const sidePanelActivityLogic = kea<sidePanelActivityLogicType>([
     path(['scenes', 'navigation', 'sidepanel', 'sidePanelActivityLogic']),
     connect(() => ({
@@ -142,11 +237,14 @@ export const sidePanelActivityLogic = kea<sidePanelActivityLogicType>([
     selectors({
         allActivity: [
             (s) => [s.allActivityResponse],
-            (allActivityResponse): HumanizedActivityLogItem[] => {
+            (allActivityResponse: PaginatedResponse<ActivityLogItem> | null): HumanizedActivityLogItem[] => {
                 return humanize(allActivityResponse?.results || [], describerFor, true)
             },
         ],
-        allActivityHasNext: [(s) => [s.allActivityResponse], (allActivityResponse) => !!allActivityResponse?.next],
+        allActivityHasNext: [
+            (s) => [s.allActivityResponse],
+            (allActivityResponse: PaginatedResponse<ActivityLogItem> | null) => !!allActivityResponse?.next,
+        ],
         visibleActivityScopes: [
             () => [],
             (): ActivityScope[] => {
diff --git a/frontend/src/layout/navigation-3000/sidepanel/panels/activity/sidePanelNotificationsLogic.tsx b/frontend/src/layout/navigation-3000/sidepanel/panels/activity/sidePanelNotificationsLogic.tsx
index 5a8cc4937dd0..a36a8c0fc3b4 100644
--- a/frontend/src/layout/navigation-3000/sidepanel/panels/activity/sidePanelNotificationsLogic.tsx
+++ b/frontend/src/layout/navigation-3000/sidepanel/panels/activity/sidePanelNotificationsLogic.tsx
@@ -1,4 +1,15 @@
-import { actions, afterMount, beforeUnmount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    afterMount,
+    beforeUnmount,
+    connect,
+    kea,
+    listeners,
+    path,
+    reducers,
+    selectors,
+} from 'kea'
 import { lazyLoaders } from 'kea-loaders'
 import { router } from 'kea-router'
 import posthog, { JsonRecord } from 'posthog-js'
@@ -41,8 +52,10 @@ import {
 } from 'products/notifications/frontend/generated/api.schemas'
 import { RESOURCE_EDITED_EVENT_TYPE, resourceEditedLogic } from 'products/notifications/frontend/resourceEditedLogic'
 
+import type { FeatureFlagsSet } from '../../../../../lib/logic/featureFlagLogic'
+import type { OrganizationType, TeamPublicType, TeamType } from '../../../../../types'
 import { sidePanelContextLogic } from '../../sidePanelContextLogic'
-import type { sidePanelNotificationsLogicType } from './sidePanelNotificationsLogicType'
+import type { SidePanelSceneContext } from '../../types'
 
 const LEGACY_POLL_TIMEOUT = 5 * 60 * 1000
 const SSE_RETRY_ATTEMPTS = 3
@@ -152,6 +165,263 @@ export interface ChangelogFlagPayload {
     email?: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sidePanelNotificationsLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    currentOrganization: OrganizationType | null // organizationLogic
+    currentProjectId: number | null // projectLogic
+    sceneSidePanelContext: SidePanelSceneContext // sidePanelContextLogic
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    currentTeamId: number | null // teamLogic
+    archivedGroups: NotificationGroup[]
+    archivedListOffset: number
+    archivedLoaded: boolean
+    archivedNotifications: InAppNotification[]
+    archivingEnabled: boolean
+    errorCounter: number
+    expandedGroupKeys: Set<string>
+    groups: NotificationGroup[]
+    hasArchivableNotifications: boolean
+    hasMoreArchived: boolean
+    hasMoreNotifications: boolean
+    hasNotifications: boolean
+    hasUnread: boolean
+    importantChanges: ChangesResponse | null
+    importantChangesLoading: boolean
+    inAppNotifications: InAppNotification[]
+    inAppUnreadCount: number
+    isInitialLoadComplete: boolean
+    isLoadingMore: boolean
+    isLoadingMoreArchived: boolean
+    legacyNotifications: HumanizedActivityLogItem[]
+    loadedGroupKeys: Set<string>
+    loadedUnreadCount: number
+    loadingGroupKeys: Set<string>
+    mainListOffset: number
+    manuallyToggledIds: Set<string>
+    notifications: HumanizedActivityLogItem[] | InAppNotification[]
+    projectNameForNotification: (notification: InAppNotification) => string | null
+    realTimeNotificationsEnabled: boolean
+    sourcePathForNotification: (notification: InAppNotification) => string | null
+    unreadCount: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sidePanelNotificationsLogicActions {
+    resourceEdited: (event: ResourceEditedEvent) => {
+        event: ResourceEditedEvent
+    } // resourceEditedLogic
+    loadCurrentTeamSuccess: (
+        currentTeam: TeamPublicType | null,
+        payload?: any
+    ) => {
+        currentTeam: TeamPublicType | null
+        payload?: any
+    } // teamLogic
+    appendArchivedNotifications: (
+        notifications: InAppNotification[],
+        hasMore: boolean
+    ) => {
+        hasMore: boolean
+        notifications: InAppNotification[]
+    }
+    appendInAppNotifications: (
+        notifications: InAppNotification[],
+        hasMore: boolean
+    ) => {
+        hasMore: boolean
+        notifications: InAppNotification[]
+    }
+    archiveAll: () => {
+        value: true
+    }
+    archiveGroup: (group: NotificationGroup) => {
+        group: NotificationGroup
+    }
+    archiveNotification: (id: string) => {
+        id: string
+    }
+    clearErrorCount: () => {
+        value: true
+    }
+    incrementErrorCount: () => {
+        value: true
+    }
+    initialLoadDone: () => {
+        value: true
+    }
+    loadArchivedGroupChildren: (group: NotificationGroup) => {
+        group: NotificationGroup
+    }
+    loadArchivedNotifications: () => {
+        value: true
+    }
+    loadGroupChildren: (group: NotificationGroup) => {
+        group: NotificationGroup
+    }
+    loadImportantChanges: (onlyUnread?: any) => {
+        onlyUnread: any
+    }
+    loadImportantChangesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadImportantChangesSuccess: (
+        importantChanges: ChangesResponse | null,
+        payload?: {
+            onlyUnread: any
+        }
+    ) => {
+        importantChanges: ChangesResponse | null
+        payload?: {
+            onlyUnread: any
+        }
+    }
+    loadMoreArchived: () => {
+        value: true
+    }
+    loadMoreArchivedSuccess: (count: number) => {
+        count: number
+    }
+    loadMoreNotifications: () => {
+        value: true
+    }
+    loadMoreNotificationsSuccess: (count: number) => {
+        count: number
+    }
+    markAllAsRead: () => {
+        value: true
+    }
+    markAllAsReadFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    markAllAsReadSuccess: (
+        importantChanges: ChangesResponse | null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        importantChanges: ChangesResponse | null
+        payload?: {
+            value: true
+        }
+    }
+    markAsRead: (id: string) => {
+        id: string
+    }
+    markGroupChildrenLoaded: (groupKey: string) => {
+        groupKey: string
+    }
+    navigateToNotification: (notification: InAppNotification) => {
+        notification: InAppNotification
+    }
+    notificationReceived: (notification: InAppNotification) => {
+        notification: InAppNotification
+    }
+    refreshInAppUnreadCount: () => {
+        value: true
+    }
+    removeNotifications: (ids: string[]) => {
+        ids: string[]
+    }
+    setArchivedNotifications: (
+        notifications: InAppNotification[],
+        hasMore: boolean
+    ) => {
+        hasMore: boolean
+        notifications: InAppNotification[]
+    }
+    setGroupChildrenRead: (
+        groupKey: string,
+        read: boolean
+    ) => {
+        groupKey: string
+        read: boolean
+    }
+    setGroupLoading: (
+        groupKey: string,
+        loading: boolean
+    ) => {
+        groupKey: string
+        loading: boolean
+    }
+    setInAppNotifications: (
+        notifications: InAppNotification[],
+        hasMore: boolean
+    ) => {
+        hasMore: boolean
+        notifications: InAppNotification[]
+    }
+    setInAppUnreadCount: (count: number) => {
+        count: number
+    }
+    startSSE: () => {
+        value: true
+    }
+    stopSSE: () => {
+        value: true
+    }
+    toggleGroupExpanded: (groupKey: string) => {
+        groupKey: string
+    }
+    toggleGroupRead: (group: NotificationGroup) => {
+        group: NotificationGroup
+    }
+    togglePolling: (pageIsVisible: boolean) => {
+        pageIsVisible: boolean
+    }
+    toggleRead: (id: string) => {
+        id: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sidePanelNotificationsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        realTimeNotificationsEnabled: (featureFlags: FeatureFlagsSet) => boolean
+        archivingEnabled: (featureFlags: FeatureFlagsSet) => boolean
+        legacyNotifications: (importantChanges: ChangesResponse | null) => HumanizedActivityLogItem[]
+        notifications: (
+            realTimeNotificationsEnabled: boolean,
+            legacyNotifications: HumanizedActivityLogItem[],
+            inAppNotifications: InAppNotification[]
+        ) => HumanizedActivityLogItem[] | InAppNotification[]
+        hasNotifications: (notifications: HumanizedActivityLogItem[] | InAppNotification[]) => boolean
+        hasArchivableNotifications: (inAppNotifications: InAppNotification[]) => boolean
+        unreadCount: (
+            realTimeNotificationsEnabled: boolean,
+            legacyNotifications: HumanizedActivityLogItem[],
+            inAppUnreadCount: number
+        ) => number
+        hasUnread: (unreadCount: number) => boolean
+        loadedUnreadCount: (inAppNotifications: InAppNotification[]) => number
+        projectNameForNotification: (
+            currentTeamId: number | null,
+            currentOrganization: OrganizationType | null
+        ) => (notification: InAppNotification) => string | null
+        sourcePathForNotification: (featureFlags: FeatureFlagsSet) => (notification: InAppNotification) => string | null
+        groups: (inAppNotifications: InAppNotification[], loadedGroupKeys: Set<string>) => NotificationGroup[]
+        archivedGroups: (
+            archivedNotifications: InAppNotification[],
+            loadedGroupKeys: Set<string>
+        ) => NotificationGroup[]
+    }
+}
+
+export type sidePanelNotificationsLogicType = MakeLogicType<
+    sidePanelNotificationsLogicValues,
+    sidePanelNotificationsLogicActions,
+    Record<string, any>,
+    sidePanelNotificationsLogicMeta
+>
+
 export const sidePanelNotificationsLogic = kea<sidePanelNotificationsLogicType>([
     path(['layout', 'navigation-3000', 'sidepanel', 'panels', 'activity', 'sidePanelNotificationsLogic']),
     connect(() => ({
@@ -895,15 +1165,17 @@ export const sidePanelNotificationsLogic = kea<sidePanelNotificationsLogicType>(
     selectors({
         realTimeNotificationsEnabled: [
             (s) => [s.featureFlags],
-            (featureFlags): boolean => !!featureFlags[FEATURE_FLAGS.REAL_TIME_NOTIFICATIONS],
+            (featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet): boolean =>
+                !!featureFlags[FEATURE_FLAGS.REAL_TIME_NOTIFICATIONS],
         ],
         archivingEnabled: [
             (s) => [s.featureFlags],
-            (featureFlags): boolean => !!featureFlags[FEATURE_FLAGS.CLEARABLE_NOTIFICATIONS],
+            (featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet): boolean =>
+                !!featureFlags[FEATURE_FLAGS.CLEARABLE_NOTIFICATIONS],
         ],
         legacyNotifications: [
             (s) => [s.importantChanges],
-            (importantChanges): HumanizedActivityLogItem[] => {
+            (importantChanges: ChangesResponse | null): HumanizedActivityLogItem[] => {
                 try {
                     let importantChangesHumanized = humanize(importantChanges?.results || [], describerFor, true)
 
@@ -961,39 +1233,46 @@ export const sidePanelNotificationsLogic = kea<sidePanelNotificationsLogicType>(
         notifications: [
             (s) => [s.realTimeNotificationsEnabled, s.legacyNotifications, s.inAppNotifications],
             (
-                realTimeEnabled,
-                legacyNotifications,
-                inAppNotifications
+                realTimeEnabled: boolean,
+                legacyNotifications: HumanizedActivityLogItem[],
+                inAppNotifications: InAppNotification[]
             ): HumanizedActivityLogItem[] | InAppNotification[] => {
                 return realTimeEnabled ? inAppNotifications : legacyNotifications
             },
         ],
-        hasNotifications: [(s) => [s.notifications], (notifications) => !!notifications.length],
+        hasNotifications: [
+            (s) => [s.notifications],
+            (notifications: HumanizedActivityLogItem[] | InAppNotification[]) => !!notifications.length,
+        ],
         hasArchivableNotifications: [
             (s) => [s.inAppNotifications],
-            (inAppNotifications): boolean => inAppNotifications.some((n) => n.archivable),
+            (inAppNotifications: InAppNotification[]): boolean => inAppNotifications.some((n) => n.archivable),
         ],
         unreadCount: [
             (s) => [s.realTimeNotificationsEnabled, s.legacyNotifications, s.inAppUnreadCount],
-            (realTimeEnabled, legacyNotifications, inAppUnreadCount): number => {
+            (
+                realTimeEnabled: boolean,
+                legacyNotifications: HumanizedActivityLogItem[],
+                inAppUnreadCount: number
+            ): number => {
                 if (realTimeEnabled) {
                     return inAppUnreadCount
                 }
                 return legacyNotifications.filter((ic) => ic.unread).length
             },
         ],
-        hasUnread: [(s) => [s.unreadCount], (unreadCount) => unreadCount > 0],
+        hasUnread: [(s) => [s.unreadCount], (unreadCount: number) => unreadCount > 0],
         // Unread among the rows actually loaded into the panel. The panel's "Mark all as read"
         // button and Unread tab key off this — not `inAppUnreadCount`, a separately-fetched server
         // total that's hand-patched at several call sites — so they can never drift from the
         // visible rows. `inAppUnreadCount` stays the source for the global bell badge.
         loadedUnreadCount: [
             (s) => [s.inAppNotifications],
-            (inAppNotifications): number => inAppNotifications.filter((n) => !n.read).length,
+            (inAppNotifications: InAppNotification[]): number => inAppNotifications.filter((n) => !n.read).length,
         ],
         projectNameForNotification: [
             (s) => [s.currentTeamId, s.currentOrganization],
-            (currentTeamId, currentOrganization) => {
+            (currentTeamId: number | null, currentOrganization: null | import('~/types').OrganizationType) => {
                 return (notification: InAppNotification): string | null => {
                     if (notification.team_id === null || notification.team_id === currentTeamId) {
                         return null
@@ -1004,7 +1283,7 @@ export const sidePanelNotificationsLogic = kea<sidePanelNotificationsLogicType>(
         ],
         sourcePathForNotification: [
             (s) => [s.featureFlags],
-            (featureFlags) =>
+            (featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet) =>
                 (notification: InAppNotification): string | null => {
                     // When the recap flag is on, the digest links to the recap page instead of the raw dashboard
                     const recapEnabled = !!featureFlags[FEATURE_FLAGS.WEB_ANALYTICS_RECAP]
diff --git a/frontend/src/layout/navigation-3000/sidepanel/panels/discussion/sidePanelDiscussionLogic.ts b/frontend/src/layout/navigation-3000/sidepanel/panels/discussion/sidePanelDiscussionLogic.ts
index 52783c43d2c3..1c66cf70844b 100644
--- a/frontend/src/layout/navigation-3000/sidepanel/panels/discussion/sidePanelDiscussionLogic.ts
+++ b/frontend/src/layout/navigation-3000/sidepanel/panels/discussion/sidePanelDiscussionLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { subscriptions } from 'kea-subscriptions'
 
@@ -6,8 +6,100 @@ import api from 'lib/api'
 import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
 import { CommentsLogicProps } from 'scenes/comments/commentsLogic'
 
+import type { FeatureFlagsSet } from '../../../../../lib/logic/featureFlagLogic'
 import { sidePanelContextLogic } from '../../sidePanelContextLogic'
-import type { sidePanelDiscussionLogicType } from './sidePanelDiscussionLogicType'
+import type { SidePanelSceneContext } from '../../types'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sidePanelDiscussionLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    sceneSidePanelContext: SidePanelSceneContext // sidePanelContextLogic
+    commentCount: number
+    commentCountLoading: boolean
+    commentsListRef: HTMLDivElement | null
+    commentsLogicProps: CommentsLogicProps | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sidePanelDiscussionLogicActions {
+    incrementCommentCount: () => any
+    incrementCommentCountFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    incrementCommentCountSuccess: (
+        commentCount: number,
+        payload?: any
+    ) => {
+        commentCount: number
+        payload?: any
+    }
+    loadCommentCount: () => {
+        value: true
+    }
+    loadCommentCountFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadCommentCountSuccess: (
+        commentCount: number,
+        payload?: {
+            value: true
+        }
+    ) => {
+        commentCount: number
+        payload?: {
+            value: true
+        }
+    }
+    resetCommentCount: () => {
+        value: true
+    }
+    resetCommentCountFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    resetCommentCountSuccess: (
+        commentCount: number,
+        payload?: {
+            value: true
+        }
+    ) => {
+        commentCount: number
+        payload?: {
+            value: true
+        }
+    }
+    scrollToLastComment: () => {
+        value: true
+    }
+    setCommentsListRef: (ref: HTMLDivElement) => {
+        ref: HTMLDivElement
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sidePanelDiscussionLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        commentsLogicProps: (sceneSidePanelContext: SidePanelSceneContext) => CommentsLogicProps | null
+    }
+}
+
+export type sidePanelDiscussionLogicType = MakeLogicType<
+    sidePanelDiscussionLogicValues,
+    sidePanelDiscussionLogicActions,
+    Record<string, any>,
+    sidePanelDiscussionLogicMeta
+>
 
 export const sidePanelDiscussionLogic = kea<sidePanelDiscussionLogicType>([
     path(['scenes', 'navigation', 'sidepanel', 'sidePanelDiscussionLogic']),
@@ -69,7 +161,7 @@ export const sidePanelDiscussionLogic = kea<sidePanelDiscussionLogicType>([
     selectors({
         commentsLogicProps: [
             (s) => [s.sceneSidePanelContext],
-            (sceneSidePanelContext): CommentsLogicProps | null => {
+            (sceneSidePanelContext: import('../../types').SidePanelSceneContext): CommentsLogicProps | null => {
                 return sceneSidePanelContext.activity_scope
                     ? {
                           scope: sceneSidePanelContext.activity_scope,
diff --git a/frontend/src/layout/navigation-3000/sidepanel/panels/exports/sidePanelExportsLogic.ts b/frontend/src/layout/navigation-3000/sidepanel/panels/exports/sidePanelExportsLogic.ts
index 08b970a56d1b..0f569ceb4fa1 100644
--- a/frontend/src/layout/navigation-3000/sidepanel/panels/exports/sidePanelExportsLogic.ts
+++ b/frontend/src/layout/navigation-3000/sidepanel/panels/exports/sidePanelExportsLogic.ts
@@ -1,9 +1,39 @@
-import { afterMount, connect, kea, path } from 'kea'
+import { MakeLogicType, afterMount, connect, kea, path } from 'kea'
 
 import { exportsLogic } from 'lib/components/ExportButton/exportsLogic'
 
+import type { ExportedAssetType, ExporterFormat, SidePanelTab } from '../../../../../types'
 import { sidePanelStateLogic } from '../../sidePanelStateLogic'
-import type { sidePanelExportsLogicType } from './sidePanelExportsLogicType'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sidePanelExportsLogicValues {
+    assetFormat: ExporterFormat | null // exportsLogic
+    exports: ExportedAssetType[] // exportsLogic
+    exportsLoading: boolean // exportsLogic
+    freshUndownloadedExports: ExportedAssetType[] // exportsLogic
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sidePanelExportsLogicActions {
+    loadExports: () => {
+        value: true
+    } // exportsLogic
+    removeFresh: (exportedAsset: ExportedAssetType) => {
+        exportedAsset: ExportedAssetType
+    } // exportsLogic
+    setAssetFormat: (format: ExporterFormat | null) => {
+        format: ExporterFormat | null
+    } // exportsLogic
+    openSidePanel: (
+        tab: SidePanelTab,
+        options?: string | undefined
+    ) => {
+        options: string | undefined
+        tab: SidePanelTab
+    } // sidePanelStateLogic
+}
+
+export type sidePanelExportsLogicType = MakeLogicType<sidePanelExportsLogicValues, sidePanelExportsLogicActions>
 
 export const sidePanelExportsLogic = kea<sidePanelExportsLogicType>([
     path(['scenes', 'navigation', 'sidepanel', 'sidePanelExportsLogic']),
diff --git a/frontend/src/layout/navigation-3000/sidepanel/panels/max/sidePanelMaxAILogic.ts b/frontend/src/layout/navigation-3000/sidepanel/panels/max/sidePanelMaxAILogic.ts
index 58a113adcd32..3faca2d3065f 100644
--- a/frontend/src/layout/navigation-3000/sidepanel/panels/max/sidePanelMaxAILogic.ts
+++ b/frontend/src/layout/navigation-3000/sidepanel/panels/max/sidePanelMaxAILogic.ts
@@ -1,7 +1,6 @@
-import { actions, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 
-import type { sidePanelMaxAILogicType } from './sidePanelMaxAILogicType'
 import { sidePanelMaxAPI } from './sidePanelMaxAPI'
 
 interface RateLimit {
@@ -43,6 +42,74 @@ interface RateLimitAction {
     limitType?: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sidePanelMaxAILogicValues {
+    assistantResponse: string | null
+    assistantResponseLoading: boolean
+    currentMessages: ChatMessage[]
+    hasServerError: boolean
+    isRateLimited: boolean
+    isSearchingThinking: boolean
+    rateLimitType: string | null
+    retryAfter: number | null
+    retryAttempts: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sidePanelMaxAILogicActions {
+    appendAssistantMessage: (content: string) => {
+        content: string
+    }
+    clearChatHistory: () => {
+        value: true
+    }
+    retryAfter: (
+        message: string,
+        retryAfter: number,
+        limitType?: string
+    ) => {
+        limitType: string | undefined
+        message: string
+        retryAfter: number
+    }
+    setRateLimited: (
+        isLimited: boolean,
+        limitType?: string
+    ) => {
+        isLimited: boolean
+        limitType: string | undefined
+    }
+    setSearchingThinking: (isSearching: boolean) => {
+        isSearching: boolean
+    }
+    setServerError: (isError: boolean) => {
+        isError: boolean
+    }
+    submitMessage: (message: string) => {
+        message: string
+    }
+    submitMessageFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    submitMessageSuccess: (
+        assistantResponse: string | null,
+        payload?: {
+            message: string
+        }
+    ) => {
+        assistantResponse: string | null
+        payload?: {
+            message: string
+        }
+    }
+}
+
+export type sidePanelMaxAILogicType = MakeLogicType<sidePanelMaxAILogicValues, sidePanelMaxAILogicActions>
+
 export const sidePanelMaxAILogic = kea<sidePanelMaxAILogicType>([
     path(['scenes', 'navigation', 'sidepanel', 'sidePanelMaxAILogic']),
 
diff --git a/frontend/src/layout/navigation-3000/sidepanel/sidePanelContextLogic.ts b/frontend/src/layout/navigation-3000/sidepanel/sidePanelContextLogic.ts
index 83364fe8f571..10cae195268d 100644
--- a/frontend/src/layout/navigation-3000/sidepanel/sidePanelContextLogic.ts
+++ b/frontend/src/layout/navigation-3000/sidepanel/sidePanelContextLogic.ts
@@ -1,4 +1,4 @@
-import { connect, kea, path, selectors } from 'kea'
+import { MakeLogicType, connect, kea, path, selectors } from 'kea'
 import { router } from 'kea-router'
 import { objectsEqual } from 'kea-test-utils'
 
@@ -6,7 +6,6 @@ import { removeProjectIdIfPresent } from 'lib/utils/kea-router'
 import { sceneLogic } from 'scenes/sceneLogic'
 import { SceneConfig } from 'scenes/sceneTypes'
 
-import type { sidePanelContextLogicType } from './sidePanelContextLogicType'
 import { SidePanelSceneContext } from './types'
 import { SIDE_PANEL_CONTEXT_KEY } from './types'
 
@@ -26,6 +25,21 @@ export const activityFiltersForScene = (sceneConfig: SceneConfig | null): SidePa
     return null
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sidePanelContextLogicValues {
+    sceneConfig: SceneConfig | null; // sceneLogic
+    sceneSidePanelContext: SidePanelSceneContext;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sidePanelContextLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        sceneSidePanelContext: (sceneConfig: SceneConfig | null, arg: any) => SidePanelSceneContext;
+    };
+}
+
+export type sidePanelContextLogicType = MakeLogicType<sidePanelContextLogicValues, {}, Record<string, any>, sidePanelContextLogicMeta>;
+
 export const sidePanelContextLogic = kea<sidePanelContextLogicType>([
     path(['scenes', 'navigation', 'sidepanel', 'sidePanelContextLogic']),
     connect(() => ({
@@ -54,7 +68,7 @@ export const sidePanelContextLogic = kea<sidePanelContextLogicType>([
                     return null
                 },
             ],
-            (sceneConfig, context): SidePanelSceneContext => {
+            (sceneConfig: SceneConfig | null, context): SidePanelSceneContext => {
                 return {
                     ...context,
                     ...(!context?.activity_scope ? activityFiltersForScene(sceneConfig) : {}),
diff --git a/frontend/src/layout/navigation-3000/sidepanel/sidePanelLogic.tsx b/frontend/src/layout/navigation-3000/sidepanel/sidePanelLogic.tsx
index c31f6205d9b0..f14da97ae7e8 100644
--- a/frontend/src/layout/navigation-3000/sidepanel/sidePanelLogic.tsx
+++ b/frontend/src/layout/navigation-3000/sidepanel/sidePanelLogic.tsx
@@ -1,4 +1,4 @@
-import { connect, kea, path, selectors } from 'kea'
+import { MakeLogicType, connect, kea, path, selectors } from 'kea'
 import { combineUrl, router, urlToAction } from 'kea-router'
 
 import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
@@ -9,9 +9,10 @@ import { userLogic } from 'scenes/userLogic'
 import { sceneLayoutLogic } from '~/layout/scenes/sceneLayoutLogic'
 import { AvailableFeature, SidePanelTab } from '~/types'
 
+import type { TeamPublicType, TeamType } from '../../../types'
 import { sidePanelContextLogic } from './sidePanelContextLogic'
-import type { sidePanelLogicType } from './sidePanelLogicType'
 import { sidePanelStateLogic } from './sidePanelStateLogic'
+import type { SidePanelSceneContext } from './types'
 
 const TABS_REQUIRING_A_TEAM = [
     SidePanelTab.Max,
@@ -22,6 +23,54 @@ const TABS_REQUIRING_A_TEAM = [
     SidePanelTab.Exports,
 ]
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sidePanelLogicValues {
+    isCloudOrDev: boolean | undefined // preflightLogic
+    scenePanelIsPresent: boolean // sceneLayoutLogic
+    sceneSidePanelContext: SidePanelSceneContext // sidePanelContextLogic
+    selectedTab: SidePanelTab | null // sidePanelStateLogic
+    sidePanelOpen: boolean // sidePanelStateLogic
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean // userLogic
+    enabledTabs: SidePanelTab[]
+    visibleTabs: SidePanelTab[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sidePanelLogicActions {
+    closeSidePanel: (tab?: SidePanelTab | undefined) => {
+        tab: SidePanelTab | undefined
+    } // sidePanelStateLogic
+    openSidePanel: (
+        tab: SidePanelTab,
+        options?: string | undefined
+    ) => {
+        options: string | undefined
+        tab: SidePanelTab
+    } // sidePanelStateLogic
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sidePanelLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        enabledTabs: (
+            sceneSidePanelContext: SidePanelSceneContext,
+            currentTeam: TeamPublicType | TeamType | null,
+            scenePanelIsPresent: boolean,
+            isCloudOrDev: boolean | undefined,
+            hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean
+        ) => SidePanelTab[]
+        visibleTabs: (enabledTabs: SidePanelTab[]) => SidePanelTab[]
+    }
+}
+
+export type sidePanelLogicType = MakeLogicType<
+    sidePanelLogicValues,
+    sidePanelLogicActions,
+    Record<string, any>,
+    sidePanelLogicMeta
+>
+
 export const sidePanelLogic = kea<sidePanelLogicType>([
     path(['scenes', 'navigation', 'sidepanel', 'sidePanelLogic']),
     connect(() => ({
@@ -51,7 +100,13 @@ export const sidePanelLogic = kea<sidePanelLogicType>([
                 s.isCloudOrDev,
                 s.hasAvailableFeature,
             ],
-            (sceneSidePanelContext, currentTeam, scenePanelIsPresent, isCloudOrDev, hasAvailableFeature) => {
+            (
+                sceneSidePanelContext: import('./types').SidePanelSceneContext,
+                currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType,
+                scenePanelIsPresent: boolean,
+                isCloudOrDev: boolean | undefined,
+                hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean
+            ) => {
                 const tabs: SidePanelTab[] = []
 
                 if (scenePanelIsPresent) {
@@ -88,7 +143,7 @@ export const sidePanelLogic = kea<sidePanelLogicType>([
         /** Tabs shown in the navigation bar */
         visibleTabs: [
             (s) => [s.enabledTabs],
-            (enabledTabs): SidePanelTab[] => {
+            (enabledTabs: SidePanelTab[]): SidePanelTab[] => {
                 // Some tabs are openable programmatically but not shown in the nav bar
                 const hiddenTabs: SidePanelTab[] = [SidePanelTab.Exports]
                 return enabledTabs.filter((tab) => !hiddenTabs.includes(tab))
diff --git a/frontend/src/layout/navigation-3000/sidepanel/sidePanelStateLogic.tsx b/frontend/src/layout/navigation-3000/sidepanel/sidePanelStateLogic.tsx
index 20df423b775a..82c4d70e80a6 100644
--- a/frontend/src/layout/navigation-3000/sidepanel/sidePanelStateLogic.tsx
+++ b/frontend/src/layout/navigation-3000/sidepanel/sidePanelStateLogic.tsx
@@ -1,11 +1,43 @@
-import { actions, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers } from 'kea'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 import { windowValues } from 'kea-window-values'
 import posthog from 'posthog-js'
 
 import { SidePanelTab } from '~/types'
 
-import type { sidePanelStateLogicType } from './sidePanelStateLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sidePanelStateLogicValues {
+    modalMode: boolean
+    selectedTab: SidePanelTab | null
+    selectedTabOptions: string | null
+    sidePanelAvailable: boolean
+    sidePanelOpen: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sidePanelStateLogicActions {
+    closeSidePanel: (tab?: SidePanelTab) => {
+        tab: SidePanelTab | undefined
+    }
+    openSidePanel: (
+        tab: SidePanelTab,
+        options?: string
+    ) => {
+        options: string | undefined
+        tab: SidePanelTab
+    }
+    setSidePanelAvailable: (available: boolean) => {
+        available: boolean
+    }
+    setSidePanelOpen: (open: boolean) => {
+        open: boolean
+    }
+    setSidePanelOptions: (options: string | null) => {
+        options: string | null
+    }
+}
+
+export type sidePanelStateLogicType = MakeLogicType<sidePanelStateLogicValues, sidePanelStateLogicActions>
 
 // The side panel imports a lot of other components so this allows us to avoid circular dependencies
 
diff --git a/frontend/src/layout/navigation/Breadcrumbs/breadcrumbsLogic.tsx b/frontend/src/layout/navigation/Breadcrumbs/breadcrumbsLogic.tsx
index 2ef611c0125f..cd5205d3e90f 100644
--- a/frontend/src/layout/navigation/Breadcrumbs/breadcrumbsLogic.tsx
+++ b/frontend/src/layout/navigation/Breadcrumbs/breadcrumbsLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
 import { subscriptions } from 'kea-subscriptions'
 
 import { objectsEqual } from 'lib/utils/objects'
@@ -13,7 +13,78 @@ import { userLogic } from 'scenes/userLogic'
 
 import { Breadcrumb, ProjectTreeRef } from '~/types'
 
-import type { breadcrumbsLogicType } from './breadcrumbsLogicType'
+import type { SceneConfig } from '../../../scenes/sceneTypes'
+import type {
+    OrganizationBasicType,
+    OrganizationType,
+    PreflightStatus,
+    ProjectType,
+    TeamPublicType,
+    TeamType,
+    UserType,
+} from '../../../types'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface breadcrumbsLogicValues {
+    currentOrganization: OrganizationType | null; // organizationLogic
+    preflight: PreflightStatus | null; // preflightLogic
+    currentProject: ProjectType | null; // projectLogic
+    activeSceneId: string | null; // sceneLogic
+    sceneConfig: SceneConfig | null; // sceneLogic
+    currentTeam: TeamPublicType | TeamType | null; // teamLogic
+    otherOrganizations: OrganizationBasicType[]; // userLogic
+    user: UserType | null; // userLogic
+    actionsContainer: HTMLElement | null;
+    appBreadcrumbs: Breadcrumb[];
+    breadcrumbs: Breadcrumb[];
+    documentTitle: string;
+    firstBreadcrumb: Breadcrumb;
+    projectTreeRef: ProjectTreeRef | null;
+    renameState: [
+        breadcrumbGlobalKey: string,
+        tentativeName: string
+    ] | null;
+    sceneBreadcrumbKeys: Breadcrumb["key"][];
+    sceneBreadcrumbs: Breadcrumb[];
+    sceneBreadcrumbsDisplayString: string;
+    tailBreadcrumbs: Breadcrumb[];
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface breadcrumbsLogicActions {
+    finishRenaming: () => {
+        value: true;
+    };
+    setActionsContainer: (element: HTMLElement | null) => {
+        element: HTMLElement | null;
+    };
+    tentativelyRename: (breadcrumbGlobalKey: string, tentativeName: string) => {
+        breadcrumbGlobalKey: string;
+        tentativeName: string;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface breadcrumbsLogicProps {
+    hashParams: Record<string, any>;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface breadcrumbsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        sceneBreadcrumbs: (arg: Breadcrumb[]) => Breadcrumb[];
+        projectTreeRef: (arg: ProjectTreeRef | null) => ProjectTreeRef | null;
+        appBreadcrumbs: (preflight: PreflightStatus | null, sceneConfig: SceneConfig | null, activeSceneId: string | null, user: UserType | null, currentProject: ProjectType | null, currentTeam: TeamPublicType | TeamType | null) => Breadcrumb[];
+        sceneBreadcrumbKeys: (sceneBreadcrumbs: Breadcrumb[]) => Breadcrumb["key"][];
+        breadcrumbs: (appBreadcrumbs: Breadcrumb[], sceneBreadcrumbs: Breadcrumb[]) => Breadcrumb[];
+        firstBreadcrumb: (breadcrumbs: Breadcrumb[]) => Breadcrumb;
+        tailBreadcrumbs: (breadcrumbs: Breadcrumb[]) => Breadcrumb[];
+        sceneBreadcrumbsDisplayString: (sceneBreadcrumbs: Breadcrumb[]) => string;
+        documentTitle: (sceneBreadcrumbs: Breadcrumb[], preflight: PreflightStatus | null) => string;
+    };
+}
+
+export type breadcrumbsLogicType = MakeLogicType<breadcrumbsLogicValues, breadcrumbsLogicActions, breadcrumbsLogicProps, breadcrumbsLogicMeta>;
 
 export const breadcrumbsLogic = kea<breadcrumbsLogicType>([
     path(['layout', 'navigation', 'Breadcrumbs', 'breadcrumbsLogic']),
@@ -95,7 +166,7 @@ export const breadcrumbsLogic = kea<breadcrumbsLogicType>([
                     return []
                 },
             ],
-            (crumbs): Breadcrumb[] => crumbs,
+            (crumbs: Breadcrumb[]): Breadcrumb[] => crumbs,
             { resultEqualityCheck: objectsEqual },
         ],
         projectTreeRef: [
@@ -121,7 +192,14 @@ export const breadcrumbsLogic = kea<breadcrumbsLogicType>([
         ],
         appBreadcrumbs: [
             (s) => [s.preflight, s.sceneConfig, s.activeSceneId, s.user, s.currentProject, s.currentTeam],
-            (preflight, sceneConfig, activeSceneId, user, currentProject, currentTeam) => {
+            (
+                preflight: null | import('~/types').PreflightStatus,
+                sceneConfig: null | import('../../../scenes/sceneTypes').SceneConfig,
+                activeSceneId: string | null,
+                user: null | import('~/types').UserType,
+                currentProject: null | import('~/types').ProjectType,
+                currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType
+            ) => {
                 const breadcrumbs: Breadcrumb[] = []
                 if (!activeSceneId || !sceneConfig) {
                     return breadcrumbs
@@ -164,18 +242,19 @@ export const breadcrumbsLogic = kea<breadcrumbsLogicType>([
         ],
         sceneBreadcrumbKeys: [
             (s) => [s.sceneBreadcrumbs],
-            (sceneBreadcrumbs): Breadcrumb['key'][] => sceneBreadcrumbs.map((breadcrumb) => breadcrumb.key),
+            (sceneBreadcrumbs: Breadcrumb[]): Breadcrumb['key'][] =>
+                sceneBreadcrumbs.map((breadcrumb) => breadcrumb.key),
         ],
         breadcrumbs: [
             (s) => [s.appBreadcrumbs, s.sceneBreadcrumbs],
-            (appBreadcrumbs, sceneBreadcrumbs): Breadcrumb[] => {
+            (appBreadcrumbs: Breadcrumb[], sceneBreadcrumbs: Breadcrumb[]): Breadcrumb[] => {
                 return appBreadcrumbs.concat(sceneBreadcrumbs)
             },
         ],
-        firstBreadcrumb: [(s) => [s.breadcrumbs], (breadcrumbs) => breadcrumbs[0]],
+        firstBreadcrumb: [(s) => [s.breadcrumbs], (breadcrumbs: Breadcrumb[]) => breadcrumbs[0]],
         tailBreadcrumbs: [
             (s) => [s.breadcrumbs],
-            (breadcrumbs) => {
+            (breadcrumbs: Breadcrumb[]) => {
                 const tailBreadcrumbs = breadcrumbs.slice(1)
                 // Remove "path" from the last breadcrumb to disable its link
                 if (tailBreadcrumbs.length > 0) {
@@ -186,7 +265,7 @@ export const breadcrumbsLogic = kea<breadcrumbsLogicType>([
         ],
         sceneBreadcrumbsDisplayString: [
             (s) => [s.sceneBreadcrumbs],
-            (sceneBreadcrumbs): string =>
+            (sceneBreadcrumbs: Breadcrumb[]): string =>
                 sceneBreadcrumbs
                     .filter((breadcrumb) => !!breadcrumb.name)
                     .map((breadcrumb) => breadcrumb.name)
@@ -194,7 +273,7 @@ export const breadcrumbsLogic = kea<breadcrumbsLogicType>([
         ],
         documentTitle: [
             (s) => [s.sceneBreadcrumbs, s.preflight],
-            (sceneBreadcrumbs, preflight): string =>
+            (sceneBreadcrumbs: Breadcrumb[], preflight: null | import('~/types').PreflightStatus): string =>
                 [
                     ...sceneBreadcrumbs
                         .filter((breadcrumb) => !!breadcrumb.name)
diff --git a/frontend/src/layout/navigation/ImpersonationNotice/impersonationNoticeLogic.ts b/frontend/src/layout/navigation/ImpersonationNotice/impersonationNoticeLogic.ts
index 7d9ef8852a09..55447aa022f9 100644
--- a/frontend/src/layout/navigation/ImpersonationNotice/impersonationNoticeLogic.ts
+++ b/frontend/src/layout/navigation/ImpersonationNotice/impersonationNoticeLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { urlToAction } from 'kea-router'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -13,7 +13,6 @@ import { userLogic } from 'scenes/userLogic'
 import { OrganizationMemberType, Region, UserType } from '~/types'
 
 import { adminLoginAs } from './adminLoginAs'
-import type { impersonationNoticeLogicType } from './impersonationNoticeLogicType'
 
 export interface ExpiredSessionInfo {
     email: string
@@ -48,6 +47,130 @@ function adminLoginUrlForRegion(region: Region, email: string): string {
     return `https://${domain}/admin/posthog/user/?q=${encodeURIComponent(email)}`
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface impersonationNoticeLogicValues {
+    members: OrganizationMemberType[] | null // membersLogic
+    membersLoading: boolean // membersLogic
+    isImpersonationUpgradeInProgress: boolean // userLogic
+    user: UserType | null // userLogic
+    adminLoginUrls: AdminLoginUrl[]
+    changeableMembers: OrganizationMemberType[]
+    expiredSessionInfo: ExpiredSessionInfo | null
+    isChangingUser: boolean
+    isImpersonated: boolean
+    isMinimized: boolean
+    isReImpersonating: boolean
+    isReadOnly: boolean
+    isSessionExpired: boolean
+    isUpgradeModalOpen: boolean
+    pageHiddenAt: number | null
+    ticketContext: ImpersonationTicketContext | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface impersonationNoticeLogicActions {
+    ensureAllMembersLoaded: () => {
+        value: true
+    } // membersLogic
+    loadUser: (resetOnFailure?: boolean | undefined) => {
+        resetOnFailure: boolean | undefined
+    } // userLogic
+    loadUserSuccess: (
+        user: UserType | null,
+        payload?:
+            | {
+                  resetOnFailure: boolean | undefined
+              }
+            | undefined
+    ) => {
+        payload?: {
+            resetOnFailure: boolean | undefined
+        }
+        user: UserType | null
+    } // userLogic
+    upgradeImpersonation: (reason: string) => {
+        reason: string
+    } // userLogic
+    upgradeImpersonationSuccess: (
+        user: UserType | null,
+        payload?:
+            | {
+                  reason: string
+              }
+            | undefined
+    ) => {
+        payload?: {
+            reason: string
+        }
+        user: UserType | null
+    } // userLogic
+    changeUser: (
+        userId: number,
+        reason?: string
+    ) => {
+        reason: string | undefined
+        userId: number
+    }
+    changeUserFailure: (error: string) => {
+        error: string
+    }
+    clearPageHiddenAt: () => {
+        value: true
+    }
+    closeUpgradeModal: () => {
+        value: true
+    }
+    maximize: () => {
+        value: true
+    }
+    minimize: () => {
+        value: true
+    }
+    openUpgradeModal: () => {
+        value: true
+    }
+    reImpersonate: (
+        reason: string,
+        readOnly: boolean
+    ) => {
+        readOnly: boolean
+        reason: string
+    }
+    reImpersonateFailure: (error: string) => {
+        error: string
+    }
+    returnToPostHog: () => {
+        value: true
+    }
+    setPageVisible: (visible: boolean) => {
+        visible: boolean
+    }
+    setSessionExpired: (info: ExpiredSessionInfo | null) => {
+        info: ExpiredSessionInfo | null
+    }
+    setTicketContext: (context: ImpersonationTicketContext | null) => {
+        context: ImpersonationTicketContext | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface impersonationNoticeLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        isReadOnly: (user: UserType | null) => boolean
+        isImpersonated: (user: UserType | null) => boolean
+        adminLoginUrls: (ticketContext: ImpersonationTicketContext | null) => AdminLoginUrl[]
+        isSessionExpired: (expiredSessionInfo: ExpiredSessionInfo | null) => boolean
+        changeableMembers: (members: OrganizationMemberType[] | null, user: UserType | null) => OrganizationMemberType[]
+    }
+}
+
+export type impersonationNoticeLogicType = MakeLogicType<
+    impersonationNoticeLogicValues,
+    impersonationNoticeLogicActions,
+    Record<string, any>,
+    impersonationNoticeLogicMeta
+>
+
 export const impersonationNoticeLogic = kea<impersonationNoticeLogicType>([
     path(['layout', 'navigation', 'ImpersonationNotice', 'impersonationNoticeLogic']),
 
diff --git a/frontend/src/layout/navigation/SelfReadOnlyNotice/selfReadOnlyModeLogic.ts b/frontend/src/layout/navigation/SelfReadOnlyNotice/selfReadOnlyModeLogic.ts
index df65678256b7..39c640cd92c7 100644
--- a/frontend/src/layout/navigation/SelfReadOnlyNotice/selfReadOnlyModeLogic.ts
+++ b/frontend/src/layout/navigation/SelfReadOnlyNotice/selfReadOnlyModeLogic.ts
@@ -1,4 +1,15 @@
-import { actions, afterMount, beforeUnmount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    afterMount,
+    beforeUnmount,
+    connect,
+    kea,
+    listeners,
+    path,
+    reducers,
+    selectors,
+} from 'kea'
 import posthog from 'posthog-js'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -7,7 +18,7 @@ import { FEATURE_FLAGS } from 'lib/constants'
 import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
 import { setReadOnlyGetter, setReadOnlyNotifier } from 'lib/readOnlyGuard'
 
-import type { selfReadOnlyModeLogicType } from './selfReadOnlyModeLogicType'
+import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
 
 export const ESCALATION_OPTIONS = [
     { seconds: 30, label: 'Allow for 30s' },
@@ -31,6 +42,44 @@ export function dropReadOnlyExceptions<T extends { event?: string; properties?:
     return event
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface selfReadOnlyModeLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    escalatedUntil: number | null
+    isEscalated: boolean
+    isFlagEnabled: boolean
+    isReadOnly: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface selfReadOnlyModeLogicActions {
+    endEscalation: () => {
+        value: true
+    }
+    escalate: (durationSeconds: number) => {
+        durationSeconds: number
+    }
+    notifyBlocked: (method: string) => {
+        method: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface selfReadOnlyModeLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        isFlagEnabled: (featureFlags: FeatureFlagsSet) => boolean
+        isEscalated: (escalatedUntil: number | null) => boolean
+        isReadOnly: (isFlagEnabled: boolean, isEscalated: boolean) => boolean
+    }
+}
+
+export type selfReadOnlyModeLogicType = MakeLogicType<
+    selfReadOnlyModeLogicValues,
+    selfReadOnlyModeLogicActions,
+    Record<string, any>,
+    selfReadOnlyModeLogicMeta
+>
+
 export const selfReadOnlyModeLogic = kea<selfReadOnlyModeLogicType>([
     path(['layout', 'navigation', 'SelfReadOnlyNotice', 'selfReadOnlyModeLogic']),
 
@@ -57,16 +106,20 @@ export const selfReadOnlyModeLogic = kea<selfReadOnlyModeLogicType>([
     selectors({
         isFlagEnabled: [
             (s) => [s.featureFlags],
-            (featureFlags): boolean => !!featureFlags[FEATURE_FLAGS.READ_ONLY_MODE],
+            (featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet): boolean =>
+                !!featureFlags[FEATURE_FLAGS.READ_ONLY_MODE],
         ],
         // isEscalated reads Date.now() inside a selector — selectors aren't time-reactive.
         // It only flips back to false when escalatedUntil is reset by the setTimeout in the
         // `escalate` listener firing `endEscalation`. Acceptable: the timer runs even on
         // hidden tabs (pauseOnPageHidden: false).
-        isEscalated: [(s) => [s.escalatedUntil], (until): boolean => until !== null && until > Date.now()],
+        isEscalated: [
+            (s) => [s.escalatedUntil],
+            (until: number | null): boolean => until !== null && until > Date.now(),
+        ],
         isReadOnly: [
             (s) => [s.isFlagEnabled, s.isEscalated],
-            (isFlagEnabled, isEscalated): boolean => isFlagEnabled && !isEscalated,
+            (isFlagEnabled: boolean, isEscalated: boolean): boolean => isFlagEnabled && !isEscalated,
         ],
     }),
 
diff --git a/frontend/src/layout/navigation/navigationLogic.ts b/frontend/src/layout/navigation/navigationLogic.ts
index 05a15cb5484d..aa6d76e111e9 100644
--- a/frontend/src/layout/navigation/navigationLogic.ts
+++ b/frontend/src/layout/navigation/navigationLogic.ts
@@ -1,7 +1,24 @@
-import { actions, kea, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers } from 'kea'
 import { windowValues } from 'kea-window-values'
 
-import type { navigationLogicType } from './navigationLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface navigationLogicValues {
+    fullscreen: boolean
+    isConfigureHomeModalOpen: boolean
+    mobileLayout: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface navigationLogicActions {
+    hideConfigureHomeModal: () => {
+        value: true
+    }
+    showConfigureHomeModal: () => {
+        value: true
+    }
+}
+
+export type navigationLogicType = MakeLogicType<navigationLogicValues, navigationLogicActions>
 
 export const navigationLogic = kea<navigationLogicType>([
     path(['layout', 'navigation', 'navigationLogic']),
diff --git a/frontend/src/layout/navigation/noEventsBannerLogic.ts b/frontend/src/layout/navigation/noEventsBannerLogic.ts
index 8e777ce3421c..1df29f4493b2 100644
--- a/frontend/src/layout/navigation/noEventsBannerLogic.ts
+++ b/frontend/src/layout/navigation/noEventsBannerLogic.ts
@@ -1,11 +1,16 @@
-import { afterMount, connect, kea, path } from 'kea'
+import { MakeLogicType, afterMount, connect, kea, path } from 'kea'
 
 import { teamLogic } from 'scenes/teamLogic'
 
-import type { noEventsBannerLogicType } from './noEventsBannerLogicType'
-
 const POLL_INTERVAL_MS = 30_000
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface noEventsBannerLogicActions {
+    loadCurrentTeam: () => any // teamLogic
+}
+
+export type noEventsBannerLogicType = MakeLogicType<{}, noEventsBannerLogicActions>
+
 export const noEventsBannerLogic = kea<noEventsBannerLogicType>([
     path(['layout', 'navigation', 'noEventsBannerLogic']),
     connect(() => ({
diff --git a/frontend/src/layout/navigation/projectNoticeLogic.tsx b/frontend/src/layout/navigation/projectNoticeLogic.tsx
index be63c8064f93..9f203f7ca6fa 100644
--- a/frontend/src/layout/navigation/projectNoticeLogic.tsx
+++ b/frontend/src/layout/navigation/projectNoticeLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 
@@ -29,8 +29,6 @@ import { userLogic } from 'scenes/userLogic'
 import { ProductKey } from '~/queries/schema/schema-general'
 import { OnboardingStepKey, UserType } from '~/types'
 
-import type { projectNoticeLogicType } from './projectNoticeLogicType'
-
 export type ProjectNoticeVariant =
     | 'billing_alert'
     | 'demo_project'
@@ -115,6 +113,75 @@ function buildBillingAlertNotice(
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface projectNoticeLogicValues {
+    memberCount: number; // membersLogic
+    currentOrganizationId: string; // organizationLogic
+    hasReverseProxy: boolean | null; // reverseProxyCheckerLogic
+    user: UserType | null; // userLogic
+    effectiveBillingAlert: BillingAlertConfig | null;
+    noticeDismissedThisSession: boolean;
+    projectNotice: ProjectNoticeBlueprint | null;
+    projectNoticeDismissKey: string | null;
+    projectNoticeVariant: ProjectNoticeVariant | null;
+    proxyRecords: ProxyRecord[] | null;
+    proxyRecordsLoading: boolean;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface projectNoticeLogicActions {
+    reportProjectNoticeDismissed: (key: string) => {
+        key: string;
+    }; // eventUsageLogic
+    reportProjectNoticeShown: (variant: string) => {
+        variant: string;
+    }; // eventUsageLogic
+    requestVerificationLink: (uuid: string) => {
+        uuid: string;
+    }; // verifyEmailLogic
+    dismissProjectNotice: (dismissKey: string | null) => {
+        dismissKey: string | null;
+    };
+    loadRecords: () => any;
+    loadRecordsFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadRecordsSuccess: (proxyRecords: ProxyRecord[] | null, payload?: any) => {
+        proxyRecords: ProxyRecord[] | null;
+        payload?: any;
+    };
+    reportNoticeShown: () => {
+        value: true;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface projectNoticeLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        effectiveBillingAlert: (billingAlert: BillingAlertConfig | null, fakeBillingAlert: import("lib/components/Superpowers/superpowersLogic").FakeBillingAlert) => BillingAlertConfig | null;
+        projectNoticeVariant: (currentOrganization: null | import("~/types").OrganizationType, currentTeam: null | import("~/types").TeamPublicType | import("~/types").TeamType, preflight: null | import("~/types").PreflightStatus, isCloudOrDev: boolean | undefined, user: UserType | null, memberCount: number, internetConnectionIssue: boolean, hasProjectNoticeRestriction: boolean, proxyRecords: ProxyRecord[] | null, effectiveBillingAlert: BillingAlertConfig | null, currentLocation: {
+            hash: string;
+            hashParams: Record<string, any>;
+            method: string;
+            pathname: string;
+            search: string;
+            searchParams: Record<string, any>;
+        }, noticeDismissedThisSession: boolean, activeSceneId: string | null, arg: number, hasReverseProxy: boolean | null) => ProjectNoticeVariant | null;
+        projectNoticeDismissKey: (projectNoticeVariant: ProjectNoticeVariant | null, effectiveBillingAlert: BillingAlertConfig | null) => string | null;
+        projectNotice: (projectNoticeVariant: ProjectNoticeVariant | null, effectiveBillingAlert: BillingAlertConfig | null, projectNoticeDismissKey: string | null, currentOrganization: null | import("~/types").OrganizationType, user: UserType | null, canAccessBilling: boolean, currentLocation: {
+            hash: string;
+            hashParams: Record<string, any>;
+            method: string;
+            pathname: string;
+            search: string;
+            searchParams: Record<string, any>;
+        }, activeSceneProductKey: ProductKey | null) => ProjectNoticeBlueprint | null;
+    };
+}
+
+export type projectNoticeLogicType = MakeLogicType<projectNoticeLogicValues, projectNoticeLogicActions, Record<string, any>, projectNoticeLogicMeta>;
+
 export const projectNoticeLogic = kea<projectNoticeLogicType>([
     path(['layout', 'navigation', 'projectNoticeLogic']),
     connect(() => ({
@@ -172,7 +239,10 @@ export const projectNoticeLogic = kea<projectNoticeLogicType>([
     selectors({
         effectiveBillingAlert: [
             () => [billingLogic.selectors.billingAlert, superpowersLogic.selectors.fakeBillingAlert],
-            (billingAlert, fakeBillingAlert): BillingAlertConfig | null => {
+            (
+                billingAlert: BillingAlertConfig | null,
+                fakeBillingAlert: import('lib/components/Superpowers/superpowersLogic').FakeBillingAlert
+            ): BillingAlertConfig | null => {
                 if (fakeBillingAlert !== 'none') {
                     return {
                         status: fakeBillingAlert,
@@ -203,21 +273,28 @@ export const projectNoticeLogic = kea<projectNoticeLogicType>([
                 s.hasReverseProxy,
             ],
             (
-                organization,
-                currentTeam,
-                preflight,
-                isCloudOrDev,
-                user,
-                memberCount,
-                internetConnectionIssue,
-                hasEventIngestionRestriction,
-                proxyRecords,
-                effectiveBillingAlert,
-                currentLocation,
-                noticeDismissedThisSession,
-                activeSceneId,
-                liveEventCount,
-                hasReverseProxy
+                organization: null | import('~/types').OrganizationType,
+                currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType,
+                preflight: null | import('~/types').PreflightStatus,
+                isCloudOrDev: boolean | undefined,
+                user: UserType | null,
+                memberCount: number,
+                internetConnectionIssue: boolean,
+                hasEventIngestionRestriction: boolean,
+                proxyRecords: ProxyRecord[] | null,
+                effectiveBillingAlert: BillingAlertConfig | null,
+                currentLocation: {
+                    hash: string
+                    hashParams: Record<string, any>
+                    method: string
+                    pathname: string
+                    search: string
+                    searchParams: Record<string, any>
+                },
+                noticeDismissedThisSession: boolean,
+                activeSceneId: string | null,
+                liveEventCount: number,
+                hasReverseProxy: boolean | null
             ): ProjectNoticeVariant | null => {
                 if (!organization) {
                     return null
@@ -279,7 +356,7 @@ export const projectNoticeLogic = kea<projectNoticeLogicType>([
         ],
         projectNoticeDismissKey: [
             (s) => [s.projectNoticeVariant, s.effectiveBillingAlert],
-            (variant, effectiveBillingAlert): string | null => {
+            (variant: ProjectNoticeVariant | null, effectiveBillingAlert: BillingAlertConfig | null): string | null => {
                 switch (variant) {
                     case 'billing_alert':
                         return effectiveBillingAlert?.dismissKey
@@ -306,14 +383,21 @@ export const projectNoticeLogic = kea<projectNoticeLogicType>([
                 sceneLogic.selectors.activeSceneProductKey,
             ],
             (
-                variant,
-                effectiveBillingAlert,
-                dismissKey,
-                currentOrganization,
-                user,
-                canAccessBilling,
-                currentLocation,
-                activeSceneProductKey
+                variant: ProjectNoticeVariant | null,
+                effectiveBillingAlert: BillingAlertConfig | null,
+                dismissKey: string | null,
+                currentOrganization: null | import('~/types').OrganizationType,
+                user: UserType | null,
+                canAccessBilling: boolean,
+                currentLocation: {
+                    hash: string
+                    hashParams: Record<string, any>
+                    method: string
+                    pathname: string
+                    search: string
+                    searchParams: Record<string, any>
+                },
+                activeSceneProductKey: ProductKey | null
             ): ProjectNoticeBlueprint | null => {
                 if (!variant) {
                     return null
diff --git a/frontend/src/layout/panel-layout/ProjectTree/customProductsLogic.tsx b/frontend/src/layout/panel-layout/ProjectTree/customProductsLogic.tsx
index c8f623e1173a..37c3914ee5a1 100644
--- a/frontend/src/layout/panel-layout/ProjectTree/customProductsLogic.tsx
+++ b/frontend/src/layout/panel-layout/ProjectTree/customProductsLogic.tsx
@@ -1,4 +1,4 @@
-import { kea, path } from 'kea'
+import { MakeLogicType, kea, path } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -8,7 +8,47 @@ import { getAppContext } from 'lib/utils/getAppContext'
 
 import type { UserProductListItem } from '~/queries/schema/schema-general'
 
-import type { customProductsLogicType } from './customProductsLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface customProductsLogicValues {
+    customProducts: UserProductListItem[]
+    customProductsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface customProductsLogicActions {
+    loadCustomProducts: () => any
+    loadCustomProductsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadCustomProductsSuccess: (
+        customProducts: UserProductListItem[],
+        payload?: any
+    ) => {
+        customProducts: UserProductListItem[]
+        payload?: any
+    }
+    seed: () => any
+    seedFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    seedSuccess: (
+        customProducts: UserProductListItem[],
+        payload?: any
+    ) => {
+        customProducts: UserProductListItem[]
+        payload?: any
+    }
+}
+
+export type customProductsLogicType = MakeLogicType<customProductsLogicValues, customProductsLogicActions>
 
 export const customProductsLogic = kea<customProductsLogicType>([
     path(['layout', 'panel-layout', 'ProjectTree', 'customProductsLogic']),
diff --git a/frontend/src/layout/panel-layout/ProjectTree/menus/recentItemsMenuLogic.ts b/frontend/src/layout/panel-layout/ProjectTree/menus/recentItemsMenuLogic.ts
index cb75844496a1..9f15e28e00dc 100644
--- a/frontend/src/layout/panel-layout/ProjectTree/menus/recentItemsMenuLogic.ts
+++ b/frontend/src/layout/panel-layout/ProjectTree/menus/recentItemsMenuLogic.ts
@@ -1,12 +1,33 @@
-import { connect, kea, path, selectors } from 'kea'
+import { MakeLogicType, connect, kea, path, selectors } from 'kea'
 
 import { recentItemsModel } from '~/models/recentItemsModel'
 import { FileSystemEntry } from '~/queries/schema/schema-general'
 
-import type { recentItemsMenuLogicType } from './recentItemsMenuLogicType'
-
 const RECENT_ITEMS_LIMIT = 10
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface recentItemsMenuLogicValues {
+    cachedRecents: FileSystemEntry[] // recentItemsModel
+    recentsHasLoaded: boolean // recentItemsModel
+    recentItems: FileSystemEntry[]
+    recentItemsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface recentItemsMenuLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        recentItems: (cachedRecents: FileSystemEntry[]) => FileSystemEntry[]
+        recentItemsLoading: (recentsHasLoaded: boolean) => boolean
+    }
+}
+
+export type recentItemsMenuLogicType = MakeLogicType<
+    recentItemsMenuLogicValues,
+    {},
+    Record<string, any>,
+    recentItemsMenuLogicMeta
+>
+
 export const recentItemsMenuLogic = kea<recentItemsMenuLogicType>([
     path(['layout', 'panel-layout', 'ProjectTree', 'menus', 'recentItemsMenuLogic']),
     connect(() => ({
@@ -15,8 +36,8 @@ export const recentItemsMenuLogic = kea<recentItemsMenuLogicType>([
     selectors({
         recentItems: [
             (s) => [s.cachedRecents],
-            (cachedRecents): FileSystemEntry[] => cachedRecents.slice(0, RECENT_ITEMS_LIMIT),
+            (cachedRecents: FileSystemEntry[]): FileSystemEntry[] => cachedRecents.slice(0, RECENT_ITEMS_LIMIT),
         ],
-        recentItemsLoading: [(s) => [s.recentsHasLoaded], (recentsHasLoaded): boolean => !recentsHasLoaded],
+        recentItemsLoading: [(s) => [s.recentsHasLoaded], (recentsHasLoaded: boolean): boolean => !recentsHasLoaded],
     }),
 ])
diff --git a/frontend/src/layout/panel-layout/ProjectTree/projectTreeDataLogic.tsx b/frontend/src/layout/panel-layout/ProjectTree/projectTreeDataLogic.tsx
index 6a33fa22411e..d433bf337584 100644
--- a/frontend/src/layout/panel-layout/ProjectTree/projectTreeDataLogic.tsx
+++ b/frontend/src/layout/panel-layout/ProjectTree/projectTreeDataLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { IconDocument, IconFolder, IconPlus } from '@posthog/icons'
@@ -43,9 +43,13 @@ import { groupsModel } from '~/models/groupsModel'
 import { FileSystemEntry, FileSystemIconType, FileSystemImport } from '~/queries/schema/schema-general'
 import { UserBasicType } from '~/types'
 
+import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
+import type { Noun } from '../../../models/groupsModel'
+import type { UserProductListItem } from '../../../queries/schema/schema-general'
+import type { GroupType, GroupTypeIndex, ProjectTreeRef, UserType } from '../../../types'
 import { panelLayoutLogic } from '../panelLayoutLogic'
+import type { PanelLayoutNavIdentifier } from '../panelLayoutLogic'
 import { customProductsLogic } from './customProductsLogic'
-import type { projectTreeDataLogicType } from './projectTreeDataLogicType'
 
 const MOVE_ALERT_LIMIT = 50
 const DELETE_ALERT_LIMIT = 0
@@ -154,6 +158,370 @@ const humanizeFileSystemEntryType = (type?: string): string => {
     return humanizedType
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface projectTreeDataLogicValues {
+    projectTreeRef: ProjectTreeRef | null // breadcrumbsLogic
+    customProducts: UserProductListItem[] // customProductsLogic
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun // groupsModel
+    groupTypes: Map<GroupTypeIndex, GroupType> // groupsModel
+    groupTypesLoading: boolean // groupsModel
+    groupsAccessStatus: GroupsAccessStatus // groupsModel
+    user: UserType | null // userLogic
+    folderLoadOffset: Record<string, number>
+    folderStates: Record<string, FolderState>
+    folders: Record<string, FileSystemEntry[]>
+    getCustomProductTreeItems: (searchTerm: string) => TreeDataItem[]
+    getShortcutTreeItems: (searchTerm: string, onlyFolders: boolean) => TreeDataItem[]
+    getStaticTreeItems: (searchTerm: string, onlyFolders: boolean) => TreeDataItem[]
+    groupItems: FileSystemImport[]
+    itemsByHref: Record<string, FileSystemEntry>
+    itemsByPath: Record<string, FileSystemEntry>
+    itemsByRef: Record<string, FileSystemEntry>
+    lastNewFolder: string | null
+    loadingPaths: Record<string, boolean>
+    pendingActions: ProjectTreeAction[]
+    pendingLoader: boolean
+    pendingLoaderLoading: boolean
+    projectTreeRefEntry: FileSystemEntry | null
+    savedItems: FileSystemEntry[]
+    savedItemsLoading: boolean
+    shortcutData: FileSystemEntry[]
+    shortcutDataHasLoaded: boolean
+    shortcutDataLoading: boolean
+    shortcutEntryIdMap: Map<string, string>
+    shortcutNonFolderPaths: Set<string>
+    sortedItems: FileSystemEntry[]
+    treeItemsNew: TreeDataItem[]
+    unfiledItems: boolean
+    unfiledItemsLoading: boolean
+    users: Record<string, UserBasicType>
+    viableItems: FileSystemEntry[]
+    viableItemsById: Record<string, FileSystemEntry>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface projectTreeDataLogicActions {
+    setActivePanelIdentifier: (identifier: PanelLayoutNavIdentifier) => {
+        identifier: PanelLayoutNavIdentifier
+    } // panelLayoutLogic
+    addLoadedResults: (results: RecentResults | SearchResults) => {
+        results: RecentResults | SearchResults
+    }
+    addLoadedUsers: (users: UserBasicType[]) => {
+        users: UserBasicType[]
+    }
+    addShortcutItem: (item: FileSystemEntry) => {
+        item: FileSystemEntry
+    }
+    addShortcutItemFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    addShortcutItemSuccess: (
+        shortcutData: FileSystemEntry[],
+        payload?: {
+            item: FileSystemEntry
+        }
+    ) => {
+        shortcutData: FileSystemEntry[]
+        payload?: {
+            item: FileSystemEntry
+        }
+    }
+    createSavedItem: (savedItem: FileSystemEntry) => {
+        savedItem: FileSystemEntry
+    }
+    deleteItem: (
+        item: FileSystemEntry,
+        projectTreeLogicKey: string
+    ) => {
+        item: FileSystemEntry
+        projectTreeLogicKey: string
+    }
+    deleteSavedItem: (savedItem: FileSystemEntry) => {
+        savedItem: FileSystemEntry
+    }
+    deleteShortcut: (id: FileSystemEntry['id']) => {
+        id: string
+    }
+    deleteShortcutFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteShortcutSuccess: (
+        shortcutData: FileSystemEntry[],
+        payload?: {
+            id: string
+        }
+    ) => {
+        shortcutData: FileSystemEntry[]
+        payload?: {
+            id: string
+        }
+    }
+    deleteTypeAndRef: (
+        type: string,
+        ref: string
+    ) => {
+        ref: string
+        type: string
+    }
+    linkItem: (
+        oldPath: string,
+        newPath: string,
+        force: boolean,
+        projectTreeLogicKey: string
+    ) => {
+        force: boolean
+        newPath: string
+        oldPath: string
+        projectTreeLogicKey: string
+    }
+    loadFolder: (
+        folder: string,
+        forceReload?: boolean
+    ) => {
+        folder: string
+        forceReload: boolean
+    }
+    loadFolderFailure: (
+        folder: string,
+        error: string
+    ) => {
+        error: string
+        folder: string
+    }
+    loadFolderIfNotLoaded: (folderId: string) => {
+        folderId: string
+    }
+    loadFolderStart: (
+        folder: string,
+        forceReload?: boolean
+    ) => {
+        folder: string
+        forceReload: boolean
+    }
+    loadFolderSuccess: (
+        folder: string,
+        entries: FileSystemEntry[],
+        hasMore: boolean,
+        offsetIncrease: number,
+        forceReload?: boolean
+    ) => {
+        entries: FileSystemEntry[]
+        folder: string
+        forceReload: boolean
+        hasMore: boolean
+        offsetIncrease: number
+    }
+    loadShortcuts: () => {
+        value: true
+    }
+    loadShortcutsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadShortcutsSuccess: (
+        shortcutData: FileSystemEntry[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        shortcutData: FileSystemEntry[]
+        payload?: {
+            value: true
+        }
+    }
+    loadUnfiledItems: () => {
+        value: true
+    }
+    loadUnfiledItemsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadUnfiledItemsSuccess: (
+        unfiledItems: boolean,
+        payload?: {
+            value: true
+        }
+    ) => {
+        unfiledItems: boolean
+        payload?: {
+            value: true
+        }
+    }
+    moveItem: (
+        item: FileSystemEntry,
+        newPath: string,
+        force: boolean,
+        projectTreeLogicKey: string
+    ) => {
+        force: boolean
+        item: FileSystemEntry
+        newPath: string
+        projectTreeLogicKey: string
+    }
+    movedItem: (
+        item: FileSystemEntry,
+        oldPath: string,
+        newPath: string
+    ) => {
+        item: FileSystemEntry
+        newPath: string
+        oldPath: string
+    }
+    pruneClosedFolders: (expandedFolders: string[]) => {
+        expandedFolders: string[]
+    }
+    queueAction: (
+        action: ProjectTreeAction,
+        projectTreeLogicKey: string
+    ) => {
+        action: ProjectTreeAction
+        projectTreeLogicKey: string
+    }
+    queueActionFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    queueActionSuccess: (
+        pendingLoader: boolean,
+        payload?: {
+            action: ProjectTreeAction
+            projectTreeLogicKey: string
+        }
+    ) => {
+        pendingLoader: boolean
+        payload?: {
+            action: ProjectTreeAction
+            projectTreeLogicKey: string
+        }
+    }
+    removeQueuedAction: (action: ProjectTreeAction) => {
+        action: ProjectTreeAction
+    }
+    reorderShortcutByDrag: (
+        activeTreeId: string,
+        overTreeId: string,
+        position: 'after' | 'before'
+    ) => {
+        activeTreeId: string
+        overTreeId: string
+        position: 'after' | 'before'
+    }
+    reorderShortcuts: (orderedIds: NonNullable<FileSystemEntry['id']>[]) => {
+        orderedIds: string[]
+    }
+    reorderShortcutsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    reorderShortcutsSuccess: (
+        shortcutData: FileSystemEntry[],
+        payload?: {
+            orderedIds: string[]
+        }
+    ) => {
+        shortcutData: FileSystemEntry[]
+        payload?: {
+            orderedIds: string[]
+        }
+    }
+    restoredItems: () => {
+        value: true
+    }
+    setLastNewFolder: (folder: string | null) => {
+        folder: string | null
+    }
+    syncTypeAndRef: (
+        type: string,
+        ref: string
+    ) => {
+        ref: string
+        type: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface projectTreeDataLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        savedItems: (folders: Record<string, FileSystemEntry[]>) => FileSystemEntry[]
+        shortcutEntryIdMap: (shortcutData: FileSystemEntry[]) => Map<string, string>
+        savedItemsLoading: (folderStates: Record<string, FolderState>) => boolean
+        viableItems: (savedItems: FileSystemEntry[], pendingActions: ProjectTreeAction[]) => FileSystemEntry[]
+        sortedItems: (viableItems: FileSystemEntry[]) => FileSystemEntry[]
+        itemsByRef: (sortedItems: FileSystemEntry[]) => Record<string, FileSystemEntry>
+        itemsByHref: (sortedItems: FileSystemEntry[]) => Record<string, FileSystemEntry>
+        itemsByPath: (sortedItems: FileSystemEntry[]) => Record<string, FileSystemEntry>
+        viableItemsById: (viableItems: FileSystemEntry[]) => Record<string, FileSystemEntry>
+        loadingPaths: (
+            unfiledItemsLoading: boolean,
+            savedItemsLoading: boolean,
+            pendingLoaderLoading: boolean,
+            pendingActions: ProjectTreeAction[]
+        ) => Record<string, boolean>
+        projectTreeRefEntry: (
+            projectTreeRef: ProjectTreeRef | null,
+            sortedItems: FileSystemEntry[]
+        ) => FileSystemEntry | null
+        groupItems: (
+            groupTypes: Map<GroupTypeIndex, GroupType>,
+            groupsAccessStatus: GroupsAccessStatus,
+            aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun,
+            shortcutData: FileSystemEntry[],
+            featureFlags: FeatureFlagsSet
+        ) => FileSystemImport[]
+        getShortcutTreeItems: (
+            shortcutData: FileSystemEntry[],
+            viableItems: FileSystemEntry[],
+            folderStates: Record<string, FolderState>,
+            users: Record<string, UserBasicType>,
+            featureFlags: FeatureFlagsSet
+        ) => (searchTerm: string, onlyFolders: boolean) => TreeDataItem[]
+        getStaticTreeItems: (
+            featureFlags: FeatureFlagsSet,
+            getShortcutTreeItems: (searchTerm: string, onlyFolders: boolean) => TreeDataItem[],
+            groupItems: FileSystemImport[]
+        ) => (searchTerm: string, onlyFolders: boolean) => TreeDataItem[]
+        treeItemsNew: (
+            getStaticTreeItems: (searchTerm: string, onlyFolders: boolean) => TreeDataItem[]
+        ) => TreeDataItem[]
+        shortcutNonFolderPaths: (shortcutData: FileSystemEntry[]) => Set<string>
+        getCustomProductTreeItems: (
+            customProducts: UserProductListItem[],
+            featureFlags: FeatureFlagsSet,
+            folderStates: Record<string, FolderState>,
+            users: Record<string, UserBasicType>
+        ) => (searchTerm: string) => TreeDataItem[]
+    }
+}
+
+export type projectTreeDataLogicType = MakeLogicType<
+    projectTreeDataLogicValues,
+    projectTreeDataLogicActions,
+    Record<string, any>,
+    projectTreeDataLogicMeta
+>
+
 export const projectTreeDataLogic = kea<projectTreeDataLogicType>([
     path(['layout', 'panel-layout', 'ProjectTree', 'projectTreeDataLogic']),
     connect(() => ({
@@ -759,7 +1127,7 @@ export const projectTreeDataLogic = kea<projectTreeDataLogicType>([
     selectors({
         savedItems: [
             (s) => [s.folders],
-            (folders): FileSystemEntry[] =>
+            (folders: Record<string, FileSystemEntry[]>): FileSystemEntry[] =>
                 Object.entries(folders).reduce((acc, [_, items]) => acc.concat(items), [] as FileSystemEntry[]),
         ],
         // Maps each top-level Starred row's tree id to the underlying FileSystemEntry id, so the
@@ -768,7 +1136,7 @@ export const projectTreeDataLogic = kea<projectTreeDataLogicType>([
         // intentionally excluded.
         shortcutEntryIdMap: [
             (s) => [s.shortcutData],
-            (shortcutData): Map<string, string> => {
+            (shortcutData: FileSystemEntry[]): Map<string, string> => {
                 const map = new Map<string, string>()
                 for (const shortcut of shortcutData) {
                     if (!shortcut.id) {
@@ -783,12 +1151,13 @@ export const projectTreeDataLogic = kea<projectTreeDataLogicType>([
         ],
         savedItemsLoading: [
             (s) => [s.folderStates],
-            (folderStates): boolean => Object.values(folderStates).some((state) => state === 'loading'),
+            (folderStates: Record<string, FolderState>): boolean =>
+                Object.values(folderStates).some((state) => state === 'loading'),
         ],
         viableItems: [
             // Combine savedItems with pendingActions
             (s) => [s.savedItems, s.pendingActions],
-            (savedItems, pendingActions): FileSystemEntry[] => {
+            (savedItems: FileSystemEntry[], pendingActions: ProjectTreeAction[]): FileSystemEntry[] => {
                 const initialItems = [...savedItems]
                 const itemsByPath = initialItems.reduce(
                     (acc, item) => {
@@ -864,11 +1233,11 @@ export const projectTreeDataLogic = kea<projectTreeDataLogicType>([
         ],
         sortedItems: [
             (s) => [s.viableItems],
-            (viableItems): FileSystemEntry[] => [...viableItems].sort(sortFilesAndFolders),
+            (viableItems: FileSystemEntry[]): FileSystemEntry[] => [...viableItems].sort(sortFilesAndFolders),
         ],
         itemsByRef: [
             (s) => [s.sortedItems],
-            (sortedItems): Record<string, FileSystemEntry> => {
+            (sortedItems: FileSystemEntry[]): Record<string, FileSystemEntry> => {
                 const keyedByRef: Record<string, FileSystemEntry> = {}
 
                 for (const item of sortedItems) {
@@ -882,7 +1251,7 @@ export const projectTreeDataLogic = kea<projectTreeDataLogicType>([
         ],
         itemsByHref: [
             (s) => [s.sortedItems],
-            (sortedItems): Record<string, FileSystemEntry> => {
+            (sortedItems: FileSystemEntry[]): Record<string, FileSystemEntry> => {
                 const keyedByHref: Record<string, FileSystemEntry> = {}
 
                 for (const item of sortedItems) {
@@ -896,7 +1265,7 @@ export const projectTreeDataLogic = kea<projectTreeDataLogicType>([
         ],
         itemsByPath: [
             (s) => [s.sortedItems],
-            (sortedItems): Record<string, FileSystemEntry> => {
+            (sortedItems: FileSystemEntry[]): Record<string, FileSystemEntry> => {
                 const keyedByPath: Record<string, FileSystemEntry> = {}
 
                 for (const item of sortedItems) {
@@ -910,7 +1279,7 @@ export const projectTreeDataLogic = kea<projectTreeDataLogicType>([
         ],
         viableItemsById: [
             (s) => [s.viableItems],
-            (viableItems): Record<string, FileSystemEntry> =>
+            (viableItems: FileSystemEntry[]): Record<string, FileSystemEntry> =>
                 viableItems.reduce(
                     (acc, item) =>
                         Object.assign(acc, {
@@ -922,7 +1291,12 @@ export const projectTreeDataLogic = kea<projectTreeDataLogicType>([
         loadingPaths: [
             // Paths that are currently being loaded
             (s) => [s.unfiledItemsLoading, s.savedItemsLoading, s.pendingLoaderLoading, s.pendingActions],
-            (unfiledItemsLoading, savedItemsLoading, pendingLoaderLoading, pendingActions) => {
+            (
+                unfiledItemsLoading: boolean,
+                savedItemsLoading: boolean,
+                pendingLoaderLoading: boolean,
+                pendingActions: ProjectTreeAction[]
+            ) => {
                 const loadingPaths: Record<string, boolean> = {}
                 if (unfiledItemsLoading) {
                     loadingPaths['Unfiled'] = true
@@ -939,7 +1313,10 @@ export const projectTreeDataLogic = kea<projectTreeDataLogicType>([
         ],
         projectTreeRefEntry: [
             (s) => [s.projectTreeRef, s.sortedItems],
-            (projectTreeRef, sortedItems): FileSystemEntry | null => {
+            (
+                projectTreeRef: null | import('~/types').ProjectTreeRef,
+                sortedItems: FileSystemEntry[]
+            ): FileSystemEntry | null => {
                 if (!projectTreeRef || !projectTreeRef.type || !projectTreeRef.ref) {
                     return null
                 }
@@ -953,7 +1330,16 @@ export const projectTreeDataLogic = kea<projectTreeDataLogicType>([
         ],
         groupItems: [
             (s) => [s.groupTypes, s.groupsAccessStatus, s.aggregationLabel, s.shortcutData, s.featureFlags],
-            (groupTypes, groupsAccessStatus, aggregationLabel, shortcutData, featureFlags): FileSystemImport[] => {
+            (
+                groupTypes: Map<import('~/types').GroupTypeIndex, import('~/types').GroupType>,
+                groupsAccessStatus: GroupsAccessStatus,
+                aggregationLabel: (
+                    groupTypeIndex: number | null | undefined,
+                    deferToUserWording?: boolean
+                ) => import('~/models/groupsModel').Noun,
+                shortcutData: FileSystemEntry[],
+                featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet
+            ): FileSystemImport[] => {
                 const showGroupsIntroductionPage = [
                     GroupsAccessStatus.HasAccess,
                     GroupsAccessStatus.HasGroupTypes,
@@ -1002,11 +1388,11 @@ export const projectTreeDataLogic = kea<projectTreeDataLogicType>([
         getShortcutTreeItems: [
             (s) => [s.shortcutData, s.viableItems, s.folderStates, s.users, s.featureFlags],
             (
-                shortcutData,
-                viableItems,
-                folderStates,
-                users,
-                featureFlags
+                shortcutData: FileSystemEntry[],
+                viableItems: FileSystemEntry[],
+                folderStates: Record<string, FolderState>,
+                users: Record<string, UserBasicType>,
+                featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet
             ): ((searchTerm: string, onlyFolders: boolean) => TreeDataItem[]) => {
                 return function getStaticItems(searchTerm: string, onlyFolders: boolean): TreeDataItem[] {
                     const newShortcutData = []
@@ -1076,9 +1462,9 @@ export const projectTreeDataLogic = kea<projectTreeDataLogicType>([
         getStaticTreeItems: [
             (s) => [s.featureFlags, s.getShortcutTreeItems, s.groupItems],
             (
-                featureFlags,
-                getShortcutTreeItems,
-                groupItems
+                featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet,
+                getShortcutTreeItems: (searchTerm: string, onlyFolders: boolean) => TreeDataItem[],
+                groupItems: FileSystemImport[]
             ): ((searchTerm: string, onlyFolders: boolean) => TreeDataItem[]) => {
                 const convert = (
                     imports: FileSystemImport[],
@@ -1131,16 +1517,22 @@ export const projectTreeDataLogic = kea<projectTreeDataLogicType>([
         ],
         treeItemsNew: [
             (s) => [s.getStaticTreeItems],
-            (getStaticTreeItems) => getStaticTreeItems('', false).find((item) => item.id === 'new://')?.children ?? [],
+            (getStaticTreeItems: (searchTerm: string, onlyFolders: boolean) => TreeDataItem[]) =>
+                getStaticTreeItems('', false).find((item) => item.id === 'new://')?.children ?? [],
         ],
         shortcutNonFolderPaths: [
             (s) => [s.shortcutData],
-            (shortcutData) =>
+            (shortcutData: FileSystemEntry[]) =>
                 new Set(shortcutData.filter((shortcut) => shortcut.type !== 'folder').map((shortcut) => shortcut.path)),
         ],
         getCustomProductTreeItems: [
             (s) => [s.customProducts, s.featureFlags, s.folderStates, s.users],
-            (customProducts, featureFlags, folderStates, users): ((searchTerm: string) => TreeDataItem[]) => {
+            (
+                customProducts: import('~/queries/schema/schema-general').UserProductListItem[],
+                featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet,
+                folderStates: Record<string, FolderState>,
+                users: Record<string, UserBasicType>
+            ): ((searchTerm: string) => TreeDataItem[]) => {
                 return function getCustomProductItems(searchTerm: string): TreeDataItem[] {
                     const allProducts = getDefaultTreeProducts()
                     const productMap = new Map<string, FileSystemImport>(allProducts.map((p) => [p.path, p]))
diff --git a/frontend/src/layout/panel-layout/ProjectTree/projectTreeLogic.tsx b/frontend/src/layout/panel-layout/ProjectTree/projectTreeLogic.tsx
index 2c7b261b0aba..b9900c350246 100644
--- a/frontend/src/layout/panel-layout/ProjectTree/projectTreeLogic.tsx
+++ b/frontend/src/layout/panel-layout/ProjectTree/projectTreeLogic.tsx
@@ -1,4 +1,17 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, propsChanged, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    afterMount,
+    connect,
+    kea,
+    key,
+    listeners,
+    path,
+    props,
+    propsChanged,
+    reducers,
+    selectors,
+} from 'kea'
 import { loaders } from 'kea-loaders'
 import { subscriptions } from 'kea-subscriptions'
 
@@ -15,8 +28,10 @@ import { PAGINATION_LIMIT, projectTreeDataLogic } from '~/layout/panel-layout/Pr
 import { FileSystemEntry } from '~/queries/schema/schema-general'
 import { ProjectTreeRef } from '~/types'
 
+import type { Breadcrumb, UserBasicType } from '../../../types'
 import { panelLayoutLogic } from '../panelLayoutLogic'
-import type { projectTreeLogicType } from './projectTreeLogicType'
+import type { PanelLayoutNavIdentifier } from '../panelLayoutLogic'
+import type { FolderState, ProjectTreeAction } from './types'
 import {
     convertFileSystemEntryToTreeDataItem,
     findInProjectTree,
@@ -61,6 +76,417 @@ const FOLDER_LOADING = [
     } as TreeDataItem,
 ]
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface projectTreeLogicValues {
+    appBreadcrumbs: Breadcrumb[] // breadcrumbsLogic
+    projectTreeRef: ProjectTreeRef | null // breadcrumbsLogic
+    sceneBreadcrumbs: Breadcrumb[] // breadcrumbsLogic
+    folderLoadOffset: Record<string, number> // projectTreeDataLogic
+    folderStates: Record<string, FolderState> // projectTreeDataLogic
+    folders: Record<string, FileSystemEntry[]> // projectTreeDataLogic
+    getCustomProductTreeItems: (searchTerm: string) => TreeDataItem[] // projectTreeDataLogic
+    getStaticTreeItems: (searchTerm: string, onlyFolders: boolean) => TreeDataItem[] // projectTreeDataLogic
+    lastNewFolder: string | null // projectTreeDataLogic
+    loadingPaths: Record<string, boolean> // projectTreeDataLogic
+    shortcutData: FileSystemEntry[] // projectTreeDataLogic
+    sortedItems: FileSystemEntry[] // projectTreeDataLogic
+    users: Record<string, UserBasicType> // projectTreeDataLogic
+    viableItems: FileSystemEntry[] // projectTreeDataLogic
+    viableItemsById: Record<string, FileSystemEntry> // projectTreeDataLogic
+    checkedItemCountNumeric: number
+    checkedItems: Record<string, boolean>
+    checkedItemsArray: FileSystemEntry[]
+    checkedItemsCount: string
+    editingItemId: string
+    expandedFolders: string[]
+    expandedSearchFolders: string[]
+    fullFileSystem: TreeDataItem[]
+    fullFileSystemFiltered: TreeDataItem[]
+    helpNoticeVisible: boolean
+    lastCheckedItem: {
+        checked: boolean
+        id: string
+        shift: boolean
+    } | null
+    lastViewedId: string
+    onlyFolders: boolean
+    projectTree: TreeDataItem[]
+    projectTreeItems: TreeDataItem[]
+    recentResults: RecentResults
+    recentResultsLoading: boolean
+    recentTreeItems: TreeDataItem[]
+    scrollTargetId: string
+    searchResults: SearchResults
+    searchResultsLoading: boolean
+    searchTerm: string
+    searchTreeItems: TreeDataItem[]
+    selectMode: LemonTreeSelectMode
+    sortMethod: ProjectTreeSortMethod
+    treeTableColumnOffsets: number[]
+    treeTableColumnSizes: number[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface projectTreeLogicActions {
+    resetPanelLayout: (keyboardAction: boolean) => {
+        keyboardAction: boolean
+    } // panelLayoutLogic
+    setActivePanelIdentifier: (identifier: PanelLayoutNavIdentifier) => {
+        identifier: PanelLayoutNavIdentifier
+    } // panelLayoutLogic
+    addLoadedResults: (results: RecentResults | SearchResults) => {
+        results: RecentResults | SearchResults
+    } // projectTreeDataLogic
+    addLoadedUsers: (users: UserBasicType[]) => {
+        users: UserBasicType[]
+    } // projectTreeDataLogic
+    createSavedItem: (savedItem: FileSystemEntry) => {
+        savedItem: FileSystemEntry
+    } // projectTreeDataLogic
+    deleteItem: (
+        item: FileSystemEntry,
+        projectTreeLogicKey: string
+    ) => {
+        item: FileSystemEntry
+        projectTreeLogicKey: string
+    } // projectTreeDataLogic
+    deleteSavedItem: (savedItem: FileSystemEntry) => {
+        savedItem: FileSystemEntry
+    } // projectTreeDataLogic
+    deleteTypeAndRef: (
+        type: string,
+        ref: string
+    ) => {
+        ref: string
+        type: string
+    } // projectTreeDataLogic
+    linkItem: (
+        oldPath: string,
+        newPath: string,
+        force: boolean,
+        projectTreeLogicKey: string
+    ) => {
+        force: boolean
+        newPath: string
+        oldPath: string
+        projectTreeLogicKey: string
+    } // projectTreeDataLogic
+    loadFolder: (
+        folder: string,
+        forceReload?: boolean | undefined
+    ) => {
+        folder: string
+        forceReload: boolean
+    } // projectTreeDataLogic
+    loadFolderIfNotLoaded: (folderId: string) => {
+        folderId: string
+    } // projectTreeDataLogic
+    loadFolderStart: (
+        folder: string,
+        forceReload?: boolean | undefined
+    ) => {
+        folder: string
+        forceReload: boolean
+    } // projectTreeDataLogic
+    loadFolderSuccess: (
+        folder: string,
+        entries: FileSystemEntry[],
+        hasMore: boolean,
+        offsetIncrease: number,
+        forceReload?: boolean | undefined
+    ) => {
+        entries: FileSystemEntry[]
+        folder: string
+        forceReload: boolean
+        hasMore: boolean
+        offsetIncrease: number
+    } // projectTreeDataLogic
+    moveItem: (
+        item: FileSystemEntry,
+        newPath: string,
+        force: boolean,
+        projectTreeLogicKey: string
+    ) => {
+        force: boolean
+        item: FileSystemEntry
+        newPath: string
+        projectTreeLogicKey: string
+    } // projectTreeDataLogic
+    movedItem: (
+        item: FileSystemEntry,
+        oldPath: string,
+        newPath: string
+    ) => {
+        item: FileSystemEntry
+        newPath: string
+        oldPath: string
+    } // projectTreeDataLogic
+    pruneClosedFolders: (expandedFolders: string[]) => {
+        expandedFolders: string[]
+    } // projectTreeDataLogic
+    queueAction: (
+        action: ProjectTreeAction,
+        projectTreeLogicKey: string
+    ) => {
+        action: ProjectTreeAction
+        projectTreeLogicKey: string
+    } // projectTreeDataLogic
+    addFolder: (
+        folder: string,
+        editAfter?: any,
+        callback?: (folder: string) => void
+    ) => {
+        callback: ((folder: string) => void) | undefined
+        editAfter: any
+        folder: string
+    }
+    assureVisibility: (projectTreeRef: ProjectTreeRef) => {
+        projectTreeRef: ProjectTreeRef
+    }
+    checkSelectedFolders: () => {
+        value: true
+    }
+    clearScrollTarget: () => {
+        value: true
+    }
+    clearSearch: () => {
+        value: true
+    }
+    createFolder: (
+        parentPath: string,
+        editAfter?: any,
+        callback?: (folder: string) => void
+    ) => {
+        callback: ((folder: string) => void) | undefined
+        editAfter: any
+        parentPath: string
+    }
+    deleteCheckedItems: () => {
+        value: true
+    }
+    expandProjectFolder: (path: string) => {
+        path: string
+    }
+    linkCheckedItems: (path: string) => {
+        path: string
+    }
+    loadRecentResults: (type: 'end' | 'start') => {
+        type: 'end' | 'start'
+    }
+    loadRecentResultsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRecentResultsSuccess: (
+        recentResults: {
+            endTime: string | null
+            hasMore: boolean
+            results: FileSystemEntry[]
+            startTime: string | null
+        },
+        payload?: {
+            type: 'end' | 'start'
+        }
+    ) => {
+        recentResults: {
+            endTime: string | null
+            hasMore: boolean
+            results: FileSystemEntry[]
+            startTime: string | null
+        }
+        payload?: {
+            type: 'end' | 'start'
+        }
+    }
+    loadSearchResults: (
+        searchTerm: string,
+        offset?: any
+    ) => {
+        offset: any
+        searchTerm: string
+    }
+    loadSearchResultsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSearchResultsSuccess: (
+        searchResults: {
+            hasMore: boolean
+            lastCount: number
+            results: FileSystemEntry[]
+            searchTerm: string
+        },
+        payload?: {
+            offset: any
+            searchTerm: string
+        }
+    ) => {
+        searchResults: {
+            hasMore: boolean
+            lastCount: number
+            results: FileSystemEntry[]
+            searchTerm: string
+        }
+        payload?: {
+            offset: any
+            searchTerm: string
+        }
+    }
+    moveCheckedItems: (path: string) => {
+        path: string
+    }
+    onItemChecked: (
+        id: string,
+        checked: boolean,
+        shift: boolean
+    ) => {
+        checked: boolean
+        id: string
+        shift: boolean
+    }
+    rename: (
+        value: string,
+        item: FileSystemEntry
+    ) => {
+        item: FileSystemEntry
+        value: string
+    }
+    scrollToView: (item: FileSystemEntry) => {
+        item: FileSystemEntry
+    }
+    setCheckedItems: (checkedItems: Record<string, boolean>) => {
+        checkedItems: Record<string, boolean>
+    }
+    setEditingItemId: (id: string) => {
+        id: string
+    }
+    setExpandedFolders: (folderIds: string[]) => {
+        folderIds: string[]
+    }
+    setExpandedSearchFolders: (folderIds: string[]) => {
+        folderIds: string[]
+    }
+    setHelpNoticeVisibility: (visible: boolean) => {
+        visible: boolean
+    }
+    setLastCheckedItem: (
+        id: string,
+        checked: boolean,
+        shift: boolean
+    ) => {
+        checked: boolean
+        id: string
+        shift: boolean
+    }
+    setLastViewedId: (id: string) => {
+        id: string
+    }
+    setOnlyFolders: (onlyFolders: boolean) => {
+        onlyFolders: boolean
+    }
+    setSearchTerm: (searchTerm: string) => {
+        searchTerm: string
+    }
+    setSelectMode: (selectMode: LemonTreeSelectMode) => {
+        selectMode: LemonTreeSelectMode
+    }
+    setSortMethod: (sortMethod: ProjectTreeSortMethod) => {
+        sortMethod: ProjectTreeSortMethod
+    }
+    setTreeTableColumnSizes: (sizes: number[]) => {
+        sizes: number[]
+    }
+    toggleFolderOpen: (
+        folderId: string,
+        isExpanded: boolean
+    ) => {
+        folderId: string
+        isExpanded: boolean
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface projectTreeLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        projectTree: (
+            viableItems: FileSystemEntry[],
+            folderStates: Record<string, FolderState>,
+            checkedItems: Record<string, boolean>,
+            users: Record<string, UserBasicType>,
+            onlyFolders: boolean
+        ) => TreeDataItem[]
+        recentTreeItems: (
+            recentResults: RecentResults,
+            recentResultsLoading: boolean,
+            folderStates: Record<string, FolderState>,
+            checkedItems: Record<string, boolean>,
+            users: Record<string, UserBasicType>
+        ) => TreeDataItem[]
+        searchTreeItems: (
+            searchResults: SearchResults,
+            searchResultsLoading: boolean,
+            folderStates: Record<string, FolderState>,
+            checkedItems: Record<string, boolean>,
+            sortMethod: ProjectTreeSortMethod,
+            onlyFolders: boolean,
+            users: Record<string, UserBasicType>
+        ) => TreeDataItem[]
+        projectTreeItems: (
+            searchTerm: string,
+            searchTreeItems: TreeDataItem[],
+            projectTree: TreeDataItem[],
+            loadingPaths: Record<string, boolean>,
+            recentTreeItems: TreeDataItem[],
+            sortMethod: ProjectTreeSortMethod
+        ) => TreeDataItem[]
+        fullFileSystem: (
+            searchTerm: string,
+            searchTreeItems: TreeDataItem[],
+            searchResultsLoading: boolean,
+            projectTree: TreeDataItem[],
+            loadingPaths: Record<string, boolean>,
+            recentTreeItems: TreeDataItem[],
+            recentResultsLoading: boolean,
+            sortMethod: ProjectTreeSortMethod,
+            onlyFolders: boolean,
+            getStaticTreeItems: (searchTerm: string, onlyFolders: boolean) => TreeDataItem[],
+            getCustomProductTreeItems: (searchTerm: string) => TreeDataItem[],
+            arg: any
+        ) => TreeDataItem[]
+        fullFileSystemFiltered: (
+            fullFileSystem: TreeDataItem[],
+            searchTerm: string,
+            arg: any,
+            arg2: any,
+            arg3: any
+        ) => TreeDataItem[]
+        treeTableColumnOffsets: (treeTableColumnSizes: number[]) => number[]
+        checkedItemCountNumeric: (checkedItems: Record<string, boolean>) => number
+        checkedItemsCount: (
+            checkedItems: Record<string, boolean>,
+            viableItemsById: Record<string, FileSystemEntry>
+        ) => string
+        checkedItemsArray: (
+            checkedItems: Record<string, boolean>,
+            viableItemsById: Record<string, FileSystemEntry>
+        ) => FileSystemEntry[]
+    }
+}
+
+export type projectTreeLogicType = MakeLogicType<
+    projectTreeLogicValues,
+    projectTreeLogicActions,
+    ProjectTreeLogicProps,
+    projectTreeLogicMeta
+>
+
 export const projectTreeLogic = kea<projectTreeLogicType>([
     path(['layout', 'navigation-3000', 'components', 'projectTreeLogic']),
     props({} as ProjectTreeLogicProps),
@@ -443,7 +869,13 @@ export const projectTreeLogic = kea<projectTreeLogicType>([
     selectors({
         projectTree: [
             (s) => [s.viableItems, s.folderStates, s.checkedItems, s.users, s.onlyFolders],
-            (viableItems, folderStates, checkedItems, users, onlyFolders): TreeDataItem[] => {
+            (
+                viableItems: FileSystemEntry[],
+                folderStates: Record<string, import('./types').FolderState>,
+                checkedItems: Record<string, boolean>,
+                users: Record<string, import('~/types').UserBasicType>,
+                onlyFolders: boolean
+            ): TreeDataItem[] => {
                 const children = convertFileSystemEntryToTreeDataItem({
                     imports: viableItems.map((i) => ({ ...i, protocol: 'project://' })),
                     folderStates,
@@ -459,7 +891,13 @@ export const projectTreeLogic = kea<projectTreeLogicType>([
         ],
         recentTreeItems: [
             (s) => [s.recentResults, s.recentResultsLoading, s.folderStates, s.checkedItems, s.users],
-            (recentResults, recentResultsLoading, folderStates, checkedItems, users): TreeDataItem[] => {
+            (
+                recentResults: RecentResults,
+                recentResultsLoading: boolean,
+                folderStates: Record<string, import('./types').FolderState>,
+                checkedItems: Record<string, boolean>,
+                users: Record<string, import('~/types').UserBasicType>
+            ): TreeDataItem[] => {
                 const results = convertFileSystemEntryToTreeDataItem({
                     imports: recentResults.results.map((i) => ({ ...i, protocol: 'project://' })),
                     folderStates,
@@ -503,13 +941,13 @@ export const projectTreeLogic = kea<projectTreeLogicType>([
                 s.users,
             ],
             (
-                searchResults,
-                searchResultsLoading,
-                folderStates,
-                checkedItems,
-                sortMethod,
-                onlyFolders,
-                users
+                searchResults: SearchResults,
+                searchResultsLoading: boolean,
+                folderStates: Record<string, import('./types').FolderState>,
+                checkedItems: Record<string, boolean>,
+                sortMethod: ProjectTreeSortMethod,
+                onlyFolders: boolean,
+                users: Record<string, import('~/types').UserBasicType>
             ): TreeDataItem[] => {
                 const results = convertFileSystemEntryToTreeDataItem({
                     imports: searchResults.results.map((i) => ({ ...i, protocol: 'project://' })),
@@ -552,7 +990,14 @@ export const projectTreeLogic = kea<projectTreeLogicType>([
         ],
         projectTreeItems: [
             (s) => [s.searchTerm, s.searchTreeItems, s.projectTree, s.loadingPaths, s.recentTreeItems, s.sortMethod],
-            (searchTerm, searchTreeItems, projectTree, loadingPaths, recentTreeItems, sortMethod): TreeDataItem[] => {
+            (
+                searchTerm: string,
+                searchTreeItems: TreeDataItem[],
+                projectTree: TreeDataItem[],
+                loadingPaths: Record<string, boolean>,
+                recentTreeItems: TreeDataItem[],
+                sortMethod: ProjectTreeSortMethod
+            ): TreeDataItem[] => {
                 if (searchTerm) {
                     return searchTreeItems
                 }
@@ -582,17 +1027,17 @@ export const projectTreeLogic = kea<projectTreeLogicType>([
                 (_, props) => props.root,
             ],
             (
-                searchTerm,
-                searchTreeItems,
-                searchResultsLoading,
-                projectTree,
-                loadingPaths,
-                recentTreeItems,
-                recentResultsLoading,
-                sortMethod,
-                onlyFolders,
-                getStaticTreeItems,
-                getCustomProductTreeItems,
+                searchTerm: string,
+                searchTreeItems: TreeDataItem[],
+                searchResultsLoading: boolean,
+                projectTree: TreeDataItem[],
+                loadingPaths: Record<string, boolean>,
+                recentTreeItems: TreeDataItem[],
+                recentResultsLoading: boolean,
+                sortMethod: ProjectTreeSortMethod,
+                onlyFolders: boolean,
+                getStaticTreeItems: (searchTerm: string, onlyFolders: boolean) => TreeDataItem[],
+                getCustomProductTreeItems: (searchTerm: string) => TreeDataItem[],
                 root
             ): TreeDataItem[] => {
                 if (root === 'custom-products://') {
@@ -630,7 +1075,7 @@ export const projectTreeLogic = kea<projectTreeLogicType>([
                 (_, props) => props.includeRoot,
                 (_, props) => props.hideFolders,
             ],
-            (fullFileSystem, searchTerm, root, includeRoot, hideFolders): TreeDataItem[] => {
+            (fullFileSystem: TreeDataItem[], searchTerm: string, root, includeRoot, hideFolders): TreeDataItem[] => {
                 let firstFolders = fullFileSystem
 
                 // Filter out folders specified in hideFolders prop
@@ -710,15 +1155,16 @@ export const projectTreeLogic = kea<projectTreeLogicType>([
         ],
         treeTableColumnOffsets: [
             (s) => [s.treeTableColumnSizes],
-            (sizes): number[] => sizes.map((_, index) => sizes.slice(0, index).reduce((acc, s) => acc + s, 0)),
+            (sizes: number[]): number[] =>
+                sizes.map((_, index) => sizes.slice(0, index).reduce((acc, s) => acc + s, 0)),
         ],
         checkedItemCountNumeric: [
             (s) => [s.checkedItems],
-            (checkedItems): number => Object.values(checkedItems).filter((v) => !!v).length,
+            (checkedItems: Record<string, boolean>): number => Object.values(checkedItems).filter((v) => !!v).length,
         ],
         checkedItemsCount: [
             (s) => [s.checkedItems, s.viableItemsById],
-            (checkedItems, viableItemsById): string => {
+            (checkedItems: Record<string, boolean>, viableItemsById: Record<string, FileSystemEntry>): string => {
                 let hasFolder = false
                 let sum = 0
                 for (const [key, value] of Object.entries(checkedItems)) {
@@ -735,7 +1181,10 @@ export const projectTreeLogic = kea<projectTreeLogicType>([
         ],
         checkedItemsArray: [
             (s) => [s.checkedItems, s.viableItemsById],
-            (checkedItems, viableItemsById): FileSystemEntry[] => {
+            (
+                checkedItems: Record<string, boolean>,
+                viableItemsById: Record<string, FileSystemEntry>
+            ): FileSystemEntry[] => {
                 return Object.entries(checkedItems)
                     .filter(([_, checked]) => checked)
                     .map(([id]) => viableItemsById[id])
diff --git a/frontend/src/layout/panel-layout/ai-first/tabs/editToolsLogic.ts b/frontend/src/layout/panel-layout/ai-first/tabs/editToolsLogic.ts
index 31adbd03fed5..ce194dd65caf 100644
--- a/frontend/src/layout/panel-layout/ai-first/tabs/editToolsLogic.ts
+++ b/frontend/src/layout/panel-layout/ai-first/tabs/editToolsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 
 import { lemonToast } from '@posthog/lemon-ui'
 
@@ -8,10 +8,59 @@ import { customProductsLogic } from '~/layout/panel-layout/ProjectTree/customPro
 import { getItemId } from '~/layout/panel-layout/ProjectTree/utils'
 import { UserProductListItem, UserProductListReason } from '~/queries/schema/schema-general'
 
-import type { editToolsLogicType } from './editToolsLogicType'
-
 const PRODUCTS_ROOT = 'products://'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface editToolsLogicValues {
+    customProducts: UserProductListItem[] // customProductsLogic
+    checkedTools: Record<string, boolean>
+    isEditMode: boolean
+    localToggles: Record<string, boolean>
+    selectedPaths: Set<string>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface editToolsLogicActions {
+    loadCustomProducts: () => any // customProductsLogic
+    loadCustomProductsSuccess: (
+        customProducts: UserProductListItem[],
+        payload?: any
+    ) => {
+        customProducts: UserProductListItem[]
+        payload?: any
+    } // customProductsLogic
+    enterEditMode: () => {
+        value: true
+    }
+    saveAndExitEditMode: () => {
+        value: true
+    }
+    setLocalToggles: (toggles: Record<string, boolean>) => {
+        toggles: Record<string, boolean>
+    }
+    toggleTool: (toolPath: string) => {
+        toolPath: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface editToolsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        selectedPaths: (customProducts: UserProductListItem[]) => Set<string>
+        checkedTools: (
+            customProducts: UserProductListItem[],
+            localToggles: Record<string, boolean>
+        ) => Record<string, boolean>
+    }
+}
+
+export type editToolsLogicType = MakeLogicType<
+    editToolsLogicValues,
+    editToolsLogicActions,
+    Record<string, any>,
+    editToolsLogicMeta
+>
+
 export const editToolsLogic = kea<editToolsLogicType>([
     path(['layout', 'panel-layout', 'ai-first', 'tabs', 'editToolsLogic']),
     connect(() => ({
@@ -43,12 +92,12 @@ export const editToolsLogic = kea<editToolsLogicType>([
     selectors({
         selectedPaths: [
             (s) => [s.customProducts],
-            (customProducts): Set<string> =>
+            (customProducts: UserProductListItem[]): Set<string> =>
                 new Set(customProducts.map((item: { product_path: string }) => item.product_path)),
         ],
         checkedTools: [
             (s) => [s.customProducts, s.localToggles],
-            (customProducts, localToggles): Record<string, boolean> => {
+            (customProducts: UserProductListItem[], localToggles: Record<string, boolean>): Record<string, boolean> => {
                 const result: Record<string, boolean> = {}
                 for (const item of customProducts) {
                     const id = getItemId({ path: item.product_path, type: '' }, PRODUCTS_ROOT)
diff --git a/frontend/src/layout/panel-layout/ai-first/tabs/navRecentsLogic.ts b/frontend/src/layout/panel-layout/ai-first/tabs/navRecentsLogic.ts
index 13aec3d5b039..2600ef3b6734 100644
--- a/frontend/src/layout/panel-layout/ai-first/tabs/navRecentsLogic.ts
+++ b/frontend/src/layout/panel-layout/ai-first/tabs/navRecentsLogic.ts
@@ -1,12 +1,28 @@
-import { connect, kea, path, selectors } from 'kea'
+import { MakeLogicType, connect, kea, path, selectors } from 'kea'
 
 import { recentItemsModel } from '~/models/recentItemsModel'
 import { FileSystemEntry } from '~/queries/schema/schema-general'
 
-import type { navRecentsLogicType } from './navRecentsLogicType'
-
 const NAV_RECENTS_LIMIT = 15
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface navRecentsLogicValues {
+    cachedRecents: FileSystemEntry[] // recentItemsModel
+    recentsHasLoaded: boolean // recentItemsModel
+    recentItems: FileSystemEntry[]
+    recentItemsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface navRecentsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        recentItems: (cachedRecents: FileSystemEntry[]) => FileSystemEntry[]
+        recentItemsLoading: (recentsHasLoaded: boolean) => boolean
+    }
+}
+
+export type navRecentsLogicType = MakeLogicType<navRecentsLogicValues, {}, Record<string, any>, navRecentsLogicMeta>
+
 export const navRecentsLogic = kea<navRecentsLogicType>([
     path(['layout', 'panel-layout', 'ai-first', 'tabs', 'navRecentsLogic']),
     connect(() => ({
@@ -15,8 +31,8 @@ export const navRecentsLogic = kea<navRecentsLogicType>([
     selectors({
         recentItems: [
             (s) => [s.cachedRecents],
-            (cachedRecents): FileSystemEntry[] => cachedRecents.slice(0, NAV_RECENTS_LIMIT),
+            (cachedRecents: FileSystemEntry[]): FileSystemEntry[] => cachedRecents.slice(0, NAV_RECENTS_LIMIT),
         ],
-        recentItemsLoading: [(s) => [s.recentsHasLoaded], (recentsHasLoaded): boolean => !recentsHasLoaded],
+        recentItemsLoading: [(s) => [s.recentsHasLoaded], (recentsHasLoaded: boolean): boolean => !recentsHasLoaded],
     }),
 ])
diff --git a/frontend/src/layout/panel-layout/installationStatusNavLogic.ts b/frontend/src/layout/panel-layout/installationStatusNavLogic.ts
index 2e4a568c2f97..8989b146744b 100644
--- a/frontend/src/layout/panel-layout/installationStatusNavLogic.ts
+++ b/frontend/src/layout/panel-layout/installationStatusNavLogic.ts
@@ -1,4 +1,4 @@
-import { connect, kea, path, selectors } from 'kea'
+import { MakeLogicType, connect, kea, path, selectors } from 'kea'
 
 import { activeCloudRunLogic } from 'scenes/onboarding/shared/wizard-sync/activeCloudRunLogic'
 import { wizardActiveSessionDetectorLogic } from 'scenes/onboarding/shared/wizard-sync/wizardActiveSessionDetectorLogic'
@@ -6,10 +6,54 @@ import { wizardSyncUiLogic } from 'scenes/onboarding/shared/wizard-sync/wizardSy
 import { teamLogic } from 'scenes/teamLogic'
 import { urls } from 'scenes/urls'
 
-import type { installationStatusNavLogicType } from './installationStatusNavLogicType'
+import type { CloudRunHandle } from '../../scenes/onboarding/shared/wizard-sync/activeCloudRunLogic'
+import type { TeamPublicType, TeamType } from '../../types'
 
 export type NavInstallationPhase = 'running' | 'completed' | 'error' | 'connecting' | 'idle'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface installationStatusNavLogicValues {
+    activeCloudRun: CloudRunHandle | null // activeCloudRunLogic
+    panelMounted: boolean // activeCloudRunLogic
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    hasOnboardedAnyProduct: boolean // teamLogic
+    hasActiveSession: boolean // wizardActiveSessionDetectorLogic
+    dialogOpen: boolean // wizardSyncUiLogic
+    isRunActive: boolean
+    onboardingUrl: string
+    phase: NavInstallationPhase
+    shouldShow: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface installationStatusNavLogicActions {
+    openDialog: () => {
+        value: true
+    } // wizardSyncUiLogic
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface installationStatusNavLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        shouldShow: (
+            hasOnboardedAnyProduct: boolean,
+            currentTeam: TeamPublicType | TeamType | null,
+            activeCloudRun: CloudRunHandle | null,
+            hasActiveSession: boolean,
+            panelMounted: boolean
+        ) => boolean
+        isRunActive: (activeCloudRun: CloudRunHandle | null, hasActiveSession: boolean) => boolean
+        phase: (isRunActive: boolean) => NavInstallationPhase
+    }
+}
+
+export type installationStatusNavLogicType = MakeLogicType<
+    installationStatusNavLogicValues,
+    installationStatusNavLogicActions,
+    Record<string, any>,
+    installationStatusNavLogicMeta
+>
+
 /**
  * Coordinates whether to show an "Installation status" item in the sidebar footer,
  * and what label / badge tone to display.
@@ -39,7 +83,15 @@ export const installationStatusNavLogic = kea<installationStatusNavLogicType>([
         /** Whether the nav item should render at all. */
         shouldShow: [
             (s) => [s.hasOnboardedAnyProduct, s.currentTeam, s.activeCloudRun, s.hasActiveSession, s.panelMounted],
-            (hasOnboardedAnyProduct, currentTeam, activeCloudRun, hasActiveSession, panelMounted): boolean => {
+            (
+                hasOnboardedAnyProduct: boolean,
+                currentTeam: null | import('../../types').TeamPublicType | import('../../types').TeamType,
+                activeCloudRun:
+                    | null
+                    | import('scenes/onboarding/shared/wizard-sync/activeCloudRunLogic').CloudRunHandle,
+                hasActiveSession: boolean,
+                panelMounted: boolean
+            ): boolean => {
                 // Panel-mounted inline progress already shows the run — avoid double-surfacing
                 if (panelMounted) {
                     return false
@@ -59,11 +111,19 @@ export const installationStatusNavLogic = kea<installationStatusNavLogicType>([
         /** Whether an active run (cloud or local) is the reason we're showing. */
         isRunActive: [
             (s) => [s.activeCloudRun, s.hasActiveSession],
-            (activeCloudRun, hasActiveSession): boolean => !!(activeCloudRun || hasActiveSession),
+            (
+                activeCloudRun:
+                    | null
+                    | import('scenes/onboarding/shared/wizard-sync/activeCloudRunLogic').CloudRunHandle,
+                hasActiveSession: boolean
+            ): boolean => !!(activeCloudRun || hasActiveSession),
         ],
 
         /** High-level phase for the badge tone: 'running' while in flight, 'idle' for incomplete onboarding. */
-        phase: [(s) => [s.isRunActive], (isRunActive): NavInstallationPhase => (isRunActive ? 'running' : 'idle')],
+        phase: [
+            (s) => [s.isRunActive],
+            (isRunActive: boolean): NavInstallationPhase => (isRunActive ? 'running' : 'idle'),
+        ],
 
         /** URL to navigate to on click when no run is active. */
         onboardingUrl: [() => [], (): string => urls.onboarding()],
diff --git a/frontend/src/layout/panel-layout/panelLayoutLogic.tsx b/frontend/src/layout/panel-layout/panelLayoutLogic.tsx
index efa017eee712..fc483beeff0a 100644
--- a/frontend/src/layout/panel-layout/panelLayoutLogic.tsx
+++ b/frontend/src/layout/panel-layout/panelLayoutLogic.tsx
@@ -1,10 +1,9 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { router, urlToAction } from 'kea-router'
 
 import { removeProjectIdIfPresent } from 'lib/utils/kea-router'
 
 import { navigation3000Logic } from '../navigation-3000/navigationLogic'
-import type { panelLayoutLogicType } from './panelLayoutLogicType'
 
 export type PanelLayoutNavIdentifier =
     | 'Project'
@@ -26,6 +25,119 @@ export const PANEL_NAVBAR_DEFAULT_WIDTH: number = 215
 // Below this the drag snaps to collapsed mode.
 export const PANEL_NAVBAR_COLLAPSE_THRESHOLD: number = 140
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface panelLayoutLogicValues {
+    mobileLayout: boolean // navigation3000Logic
+    location: {
+        pathname: string
+        search: string
+        hash: string
+    } // router
+    activePanelIdentifier: string
+    activePanelIdentifierFromUrl: PanelLayoutNavIdentifier | ''
+    activePanelIdentifierFromUrlAiFirst: PanelLayoutNavIdentifier | ''
+    expandedNavSections: Record<string, boolean>
+    isLayoutNavCollapsed: boolean
+    isLayoutNavCollapsedDesktop: boolean
+    isLayoutNavbarVisible: boolean
+    isLayoutNavbarVisibleForDesktop: boolean
+    isLayoutNavbarVisibleForMobile: boolean
+    isLayoutPanelCloseable: boolean
+    isLayoutPanelVisible: boolean
+    mainContentRect: DOMRect | null
+    mainContentRef: PanelLayoutMainContentRef
+    navExperimentActiveTab: NavExperimentTab
+    navbarWidth: number
+    panelIsResizing: boolean
+    panelWidth: number
+    panelWillHide: boolean
+    pathname: string
+    sidePanelWidth: number
+    visibleSideAction: string
+    visitedNavTabs: NavExperimentTab[]
+    visitedPanels: PanelLayoutNavIdentifier[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface panelLayoutLogicActions {
+    clearActivePanelIdentifier: () => {
+        value: true
+    }
+    closePanel: () => {
+        value: true
+    }
+    resetPanelLayout: (keyboardAction: boolean) => {
+        keyboardAction: boolean
+    }
+    setActivePanelIdentifier: (identifier: PanelLayoutNavIdentifier) => {
+        identifier: PanelLayoutNavIdentifier
+    }
+    setMainContentRect: (rect: DOMRect) => {
+        rect: DOMRect
+    }
+    setMainContentRef: (ref: PanelLayoutMainContentRef) => {
+        ref: PanelLayoutMainContentRef
+    }
+    setNavExperimentTab: (tab: NavExperimentTab) => {
+        tab: NavExperimentTab
+    }
+    setNavbarWidth: (width: number) => {
+        width: number
+    }
+    setPanelIsResizing: (isResizing: boolean) => {
+        isResizing: boolean
+    }
+    setPanelWidth: (width: number) => {
+        width: number
+    }
+    setPanelWillHide: (willHide: boolean) => {
+        willHide: boolean
+    }
+    setSidePanelWidth: (width: number) => {
+        width: number
+    }
+    setVisibleSideAction: (sideAction: string) => {
+        sideAction: string
+    }
+    showLayoutNavBar: (visible: boolean) => {
+        visible: boolean
+    }
+    showLayoutPanel: (visible: boolean) => {
+        visible: boolean
+    }
+    toggleLayoutNavCollapsed: (override?: boolean) => {
+        override: boolean | undefined
+    }
+    toggleNavSection: (section: string) => {
+        section: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface panelLayoutLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        isLayoutNavCollapsed: (isLayoutNavCollapsedDesktop: boolean, mobileLayout: boolean) => boolean
+        activePanelIdentifierFromUrl: (location: {
+            hash: string
+            pathname: string
+            search: string
+        }) => PanelLayoutNavIdentifier | ''
+        activePanelIdentifierFromUrlAiFirst: (location: {
+            hash: string
+            pathname: string
+            search: string
+        }) => PanelLayoutNavIdentifier | ''
+        pathname: (location: { hash: string; pathname: string; search: string }) => string
+    }
+}
+
+export type panelLayoutLogicType = MakeLogicType<
+    panelLayoutLogicValues,
+    panelLayoutLogicActions,
+    Record<string, any>,
+    panelLayoutLogicMeta
+>
+
 export const panelLayoutLogic = kea<panelLayoutLogicType>([
     path(['layout', 'panel-layout', 'panelLayoutLogic']),
     connect(() => ({
@@ -246,11 +358,12 @@ export const panelLayoutLogic = kea<panelLayoutLogicType>([
     selectors({
         isLayoutNavCollapsed: [
             (s) => [s.isLayoutNavCollapsedDesktop, s.mobileLayout],
-            (isLayoutNavCollapsedDesktop, mobileLayout): boolean => !mobileLayout && isLayoutNavCollapsedDesktop,
+            (isLayoutNavCollapsedDesktop: boolean, mobileLayout: boolean): boolean =>
+                !mobileLayout && isLayoutNavCollapsedDesktop,
         ],
         activePanelIdentifierFromUrl: [
             () => [router.selectors.location],
-            (location): PanelLayoutNavIdentifier | '' => {
+            (location: { hash: string; pathname: string; search: string }): PanelLayoutNavIdentifier | '' => {
                 const cleanPath = removeProjectIdIfPresent(location.pathname)
 
                 if (cleanPath.startsWith('/data-management/')) {
@@ -266,7 +379,7 @@ export const panelLayoutLogic = kea<panelLayoutLogicType>([
         ],
         activePanelIdentifierFromUrlAiFirst: [
             () => [router.selectors.location],
-            (location): PanelLayoutNavIdentifier | '' => {
+            (location: { hash: string; pathname: string; search: string }): PanelLayoutNavIdentifier | '' => {
                 const cleanPath = removeProjectIdIfPresent(location.pathname)
 
                 if (
@@ -281,7 +394,10 @@ export const panelLayoutLogic = kea<panelLayoutLogicType>([
                 return ''
             },
         ],
-        pathname: [(s) => [s.location], (location): string => location.pathname],
+        pathname: [
+            (s) => [s.location],
+            (location: { hash: string; pathname: string; search: string }): string => location.pathname,
+        ],
     }),
     urlToAction(({ actions, values }) => ({
         '*': () => {
diff --git a/frontend/src/layout/scenes/sceneLayoutLogic.tsx b/frontend/src/layout/scenes/sceneLayoutLogic.tsx
index 63b059388739..5e9cd5e98997 100644
--- a/frontend/src/layout/scenes/sceneLayoutLogic.tsx
+++ b/frontend/src/layout/scenes/sceneLayoutLogic.tsx
@@ -1,14 +1,46 @@
-import { actions, connect, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers } from 'kea'
 import React from 'react'
 
 import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
 import { SceneConfig } from 'scenes/sceneTypes'
 
+import type { FeatureFlagsSet } from '../../lib/logic/featureFlagLogic'
 import { panelLayoutLogic } from '../panel-layout/panelLayoutLogic'
-import type { sceneLayoutLogicType } from './sceneLayoutLogicType'
 
 export type SceneLayoutContainerRef = React.RefObject<HTMLElement> | null
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sceneLayoutLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    mainContentRect: DOMRect | null // panelLayoutLogic
+    sceneLayoutConfig: SceneConfig | null
+    scenePanelElement: HTMLElement | null
+    scenePanelIsPresent: boolean
+    scenePanelOpenManual: boolean
+    showDescription: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sceneLayoutLogicActions {
+    registerScenePanelElement: (element: HTMLElement | null) => {
+        element: HTMLElement | null
+    }
+    setSceneLayoutConfig: (config: SceneConfig) => {
+        config: SceneConfig
+    }
+    setScenePanelIsPresent: (active: boolean) => {
+        active: boolean
+    }
+    setScenePanelOpen: (open: boolean) => {
+        open: boolean
+    }
+    toggleShowDescription: () => {
+        value: true
+    }
+}
+
+export type sceneLayoutLogicType = MakeLogicType<sceneLayoutLogicValues, sceneLayoutLogicActions>
+
 export const sceneLayoutLogic = kea<sceneLayoutLogicType>([
     path(['layout', 'scene-layout', 'sceneLayoutLogic']),
     connect(() => ({
diff --git a/frontend/src/lib/approvals/approvalsGateLogic.ts b/frontend/src/lib/approvals/approvalsGateLogic.ts
index e1190381ebff..b43dd335f82b 100644
--- a/frontend/src/lib/approvals/approvalsGateLogic.ts
+++ b/frontend/src/lib/approvals/approvalsGateLogic.ts
@@ -1,4 +1,4 @@
-import { afterMount, connect, kea, path, selectors } from 'kea'
+import { MakeLogicType, afterMount, connect, kea, path, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -7,7 +7,54 @@ import { userLogic } from 'scenes/userLogic'
 
 import { ApprovalPolicy, AvailableFeature } from '~/types'
 
-import type { approvalsGateLogicType } from './approvalsGateLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface approvalsGateLogicValues {
+    currentTeamIdStrict: number | string // teamLogic
+    hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean // userLogic
+    activePolicies: ApprovalPolicy[]
+    activePoliciesLoading: boolean
+    isApprovalRequired: (actionKey: string) => boolean
+    isApprovalsFeatureEnabled: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface approvalsGateLogicActions {
+    loadActivePolicies: () => any
+    loadActivePoliciesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadActivePoliciesSuccess: (
+        activePolicies: ApprovalPolicy[],
+        payload?: any
+    ) => {
+        activePolicies: ApprovalPolicy[]
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface approvalsGateLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        isApprovalsFeatureEnabled: (
+            hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean
+        ) => boolean
+        isApprovalRequired: (
+            isApprovalsFeatureEnabled: boolean,
+            activePolicies: ApprovalPolicy[]
+        ) => (actionKey: string) => boolean
+    }
+}
+
+export type approvalsGateLogicType = MakeLogicType<
+    approvalsGateLogicValues,
+    approvalsGateLogicActions,
+    Record<string, any>,
+    approvalsGateLogicMeta
+>
 
 export const approvalsGateLogic = kea<approvalsGateLogicType>([
     path(['lib', 'approvals', 'approvalsGateLogic']),
@@ -41,7 +88,8 @@ export const approvalsGateLogic = kea<approvalsGateLogicType>([
     selectors({
         isApprovalsFeatureEnabled: [
             (s) => [s.hasAvailableFeature],
-            (hasAvailableFeature): boolean => hasAvailableFeature(AvailableFeature.APPROVALS),
+            (hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean): boolean =>
+                hasAvailableFeature(AvailableFeature.APPROVALS),
         ],
 
         isApprovalRequired: [
diff --git a/frontend/src/lib/components/Account/newAccountMenuLogic.ts b/frontend/src/lib/components/Account/newAccountMenuLogic.ts
index d8bd4e2cc055..e96402ddf925 100644
--- a/frontend/src/lib/components/Account/newAccountMenuLogic.ts
+++ b/frontend/src/lib/components/Account/newAccountMenuLogic.ts
@@ -1,6 +1,41 @@
-import { actions, kea, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers } from 'kea'
 
-import type { newAccountMenuLogicType } from './newAccountMenuLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface newAccountMenuLogicValues {
+    isAccountMenuOpen: boolean
+    isOrgSwitcherOpen: boolean
+    isProjectSwitcherOpen: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface newAccountMenuLogicActions {
+    closeOrgSwitcher: () => {
+        value: true
+    }
+    closeProjectSwitcher: () => {
+        value: true
+    }
+    openOrgSwitcher: () => {
+        value: true
+    }
+    openProjectSwitcher: () => {
+        value: true
+    }
+    setAccountMenuOpen: (isOpen: boolean) => {
+        isOpen: boolean
+    }
+    toggleAccountMenu: () => {
+        value: true
+    }
+    toggleOrgSwitcher: () => {
+        value: true
+    }
+    toggleProjectSwitcher: () => {
+        value: true
+    }
+}
+
+export type newAccountMenuLogicType = MakeLogicType<newAccountMenuLogicValues, newAccountMenuLogicActions>
 
 export const newAccountMenuLogic = kea<newAccountMenuLogicType>([
     path(['lib', 'components', 'Account', 'accountMenuLogic']),
diff --git a/frontend/src/lib/components/Account/pendingInvitesLogic.ts b/frontend/src/lib/components/Account/pendingInvitesLogic.ts
index 487d9ef059b6..77b7b8d6203a 100644
--- a/frontend/src/lib/components/Account/pendingInvitesLogic.ts
+++ b/frontend/src/lib/components/Account/pendingInvitesLogic.ts
@@ -1,19 +1,42 @@
-import { connect, kea, path, selectors } from 'kea'
+import { MakeLogicType, connect, kea, path, selectors } from 'kea'
 
 import { userLogic } from 'scenes/userLogic'
 
 import { PendingInviteForCurrentUser } from '~/types'
 
-import type { pendingInvitesLogicType } from './pendingInvitesLogicType'
+import type { UserType } from '../../../types'
 
 export type { PendingInviteForCurrentUser }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface pendingInvitesLogicValues {
+    user: UserType | null // userLogic
+    pendingInvites: PendingInviteForCurrentUser[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface pendingInvitesLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        pendingInvites: (user: UserType | null) => PendingInviteForCurrentUser[]
+    }
+}
+
+export type pendingInvitesLogicType = MakeLogicType<
+    pendingInvitesLogicValues,
+    {},
+    Record<string, any>,
+    pendingInvitesLogicMeta
+>
+
 export const pendingInvitesLogic = kea<pendingInvitesLogicType>([
     path(['lib', 'components', 'Account', 'pendingInvitesLogic']),
     connect(() => ({
         values: [userLogic, ['user']],
     })),
     selectors({
-        pendingInvites: [(s) => [s.user], (user): PendingInviteForCurrentUser[] => user?.pending_invites ?? []],
+        pendingInvites: [
+            (s) => [s.user],
+            (user: null | import('~/types').UserType): PendingInviteForCurrentUser[] => user?.pending_invites ?? [],
+        ],
     }),
 ])
diff --git a/frontend/src/lib/components/ActivityLog/activityLogLogic.tsx b/frontend/src/lib/components/ActivityLog/activityLogLogic.tsx
index 83bd8f521705..303eb58bdc72 100644
--- a/frontend/src/lib/components/ActivityLog/activityLogLogic.tsx
+++ b/frontend/src/lib/components/ActivityLog/activityLogLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router, urlToAction } from 'kea-router'
 
@@ -16,8 +16,6 @@ import { urls } from 'scenes/urls'
 
 import { ActivityScope } from '~/types'
 
-import type { activityLogLogicType } from './activityLogLogicType'
-
 // Define which scopes should be expanded to include multiple scopes
 const SCOPE_EXPANSIONS: Partial<Record<ActivityScope, ActivityScope[]>> = {
     [ActivityScope.TAG]: [ActivityScope.TAG, ActivityScope.TAGGED_ITEM],
@@ -115,6 +113,65 @@ export type ActivityLogLogicProps = {
     startingPage?: number
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface activityLogLogicValues {
+    activity: ActivityLogPaginatedResponse<ActivityLogItem>
+    activityLoading: boolean
+    highlightedActivityId: string | null
+    humanizedActivity: HumanizedActivityLogItem[]
+    page: number
+    pagination: PaginationManual
+    totalCount: number | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface activityLogLogicActions {
+    fetchActivity: () => any
+    fetchActivityFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    fetchActivitySuccess: (
+        activity: {
+            count: any
+            results: ActivityLogItem[]
+        },
+        payload?: any
+    ) => {
+        activity: {
+            count: any
+            results: ActivityLogItem[]
+        }
+        payload?: any
+    }
+    setHighlightedActivityId: (id: string | null) => {
+        id: string | null
+    }
+    setPage: (page: number) => {
+        page: number
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface activityLogLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        pagination: (page: number, totalCount: number | null) => PaginationManual
+        humanizedActivity: (activity: ActivityLogPaginatedResponse<ActivityLogItem>) => HumanizedActivityLogItem[]
+        totalCount: (activity: ActivityLogPaginatedResponse<ActivityLogItem>) => number | null
+    }
+}
+
+export type activityLogLogicType = MakeLogicType<
+    activityLogLogicValues,
+    activityLogLogicActions,
+    ActivityLogLogicProps,
+    activityLogLogicMeta
+>
+
 export const activityLogLogic = kea<activityLogLogicType>([
     props({} as ActivityLogLogicProps),
     key(({ scope, id }) => `activity/${Array.isArray(scope) ? scope.join(',') : scope}/${id || 'all'}`),
@@ -155,7 +212,7 @@ export const activityLogLogic = kea<activityLogLogicType>([
     selectors(({ actions }) => ({
         pagination: [
             (s) => [s.page, s.totalCount],
-            (page, totalCount): PaginationManual => {
+            (page: number, totalCount: number | null): PaginationManual => {
                 return {
                     controlled: true,
                     pageSize: ACTIVITY_PAGE_SIZE,
@@ -168,13 +225,13 @@ export const activityLogLogic = kea<activityLogLogicType>([
         ],
         humanizedActivity: [
             (s) => [s.activity],
-            (activity): HumanizedActivityLogItem[] => {
+            (activity: ActivityLogPaginatedResponse<ActivityLogItem>): HumanizedActivityLogItem[] => {
                 return activity.results ? humanize(activity.results, describerFor) : []
             },
         ],
         totalCount: [
             (s) => [s.activity],
-            (activity): number | null => {
+            (activity: ActivityLogPaginatedResponse<ActivityLogItem>): number | null => {
                 return activity.count ?? null
             },
         ],
diff --git a/frontend/src/lib/components/AddToDashboard/addToDashboardModalLogic.ts b/frontend/src/lib/components/AddToDashboard/addToDashboardModalLogic.ts
index ecf9ae5f894f..e344fb26ea80 100644
--- a/frontend/src/lib/components/AddToDashboard/addToDashboardModalLogic.ts
+++ b/frontend/src/lib/components/AddToDashboard/addToDashboardModalLogic.ts
@@ -1,5 +1,5 @@
 import FuseClass, { FuseResult } from 'fuse.js'
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { router } from 'kea-router'
 
 import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
@@ -14,11 +14,139 @@ import { userLogic } from 'scenes/userLogic'
 import { dashboardsModel, nameCompareFunction } from '~/models/dashboardsModel'
 import { DashboardBasicType, DashboardType, InsightLogicProps } from '~/types'
 
-import type { addToDashboardModalLogicType } from './addToDashboardModalLogicType'
+import type { Node } from '../../../queries/schema/schema-general'
+import type { QueryBasedInsightModel, UserType } from '../../../types'
 
 // Helping kea-typegen navigate the exported default class for Fuse
 export interface Fuse extends FuseClass<any> {}
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface addToDashboardModalLogicValues {
+    insight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>> // insightLogic
+    user: UserType | null // userLogic
+    _dashboardToNavigateTo: number | null
+    availableDashboards: DashboardBasicType[]
+    currentDashboards: DashboardBasicType[]
+    dashboardWithActiveAPICall: number | null
+    dashboardsFuse: Fuse
+    filteredDashboards: DashboardBasicType[]
+    orderedDashboards: DashboardBasicType[]
+    scrollIndex: number
+    searchQuery: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface addToDashboardModalLogicActions {
+    reportCreatedDashboardFromModal: () => {
+        value: true
+    } // eventUsageLogic
+    reportRemovedInsightFromDashboard: (
+        insight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>> | null,
+        dashboardId: number | null
+    ) => {
+        dashboardId: number | null
+        insight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>> | null
+    } // eventUsageLogic
+    reportSavedInsightToDashboard: (
+        insight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>> | null,
+        dashboardId: number | null
+    ) => {
+        dashboardId: number | null
+        insight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>> | null
+    } // eventUsageLogic
+    updateInsight: (
+        insightUpdate: Partial<QueryBasedInsightModel<Node<Record<string, any>>>>,
+        callback?: (() => void) | undefined
+    ) => {
+        callback: (() => void) | undefined
+        insightUpdate: Partial<QueryBasedInsightModel<Node<Record<string, any>>>>
+    } // insightLogic
+    updateInsightFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    } // insightLogic
+    updateInsightSuccess: (
+        insight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>>,
+        payload?:
+            | {
+                  callback: (() => void) | undefined
+                  insightUpdate: Partial<QueryBasedInsightModel<Node<Record<string, any>>>>
+              }
+            | undefined
+    ) => {
+        insight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>>
+        payload?: {
+            callback: (() => void) | undefined
+            insightUpdate: Partial<QueryBasedInsightModel<Node<Record<string, any>>>>
+        }
+    } // insightLogic
+    showNewDashboardModal: () => {
+        value: true
+    } // newDashboardLogic
+    addNewDashboard: () => {
+        value: true
+    }
+    addToDashboard: (dashboardId: number) => {
+        dashboardId: number
+    }
+    removeFromDashboard: (dashboardId: number) => {
+        dashboardId: number
+    }
+    setDashboardToNavigateTo: (dashboardId: number | null) => {
+        dashboardId: number | null
+    }
+    setScrollIndex: (index: number) => {
+        index: number
+    }
+    setSearchQuery: (query: string) => {
+        query: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface addToDashboardModalLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        dashboardsFuse: (
+            nameSortedDashboards: (
+                | DashboardBasicType
+                | DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>>
+            )[]
+        ) => Fuse
+        filteredDashboards: (
+            searchQuery: string,
+            dashboardsFuse: Fuse,
+            nameSortedDashboards: (
+                | DashboardBasicType
+                | DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>>
+            )[]
+        ) => DashboardBasicType[]
+        currentDashboards: (
+            filteredDashboards: DashboardBasicType[],
+            insight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>>
+        ) => DashboardBasicType[]
+        availableDashboards: (
+            filteredDashboards: DashboardBasicType[],
+            currentDashboards: DashboardBasicType[]
+        ) => DashboardBasicType[]
+        orderedDashboards: (
+            currentDashboards: DashboardBasicType[],
+            availableDashboards: DashboardBasicType[],
+            user: UserType | null
+        ) => DashboardBasicType[]
+    }
+}
+
+export type addToDashboardModalLogicType = MakeLogicType<
+    addToDashboardModalLogicValues,
+    addToDashboardModalLogicActions,
+    InsightLogicProps,
+    addToDashboardModalLogicMeta
+>
+
 export const addToDashboardModalLogic = kea<addToDashboardModalLogicType>([
     props({} as InsightLogicProps),
     key(keyForInsightLogicProps('new')),
@@ -64,7 +192,16 @@ export const addToDashboardModalLogic = kea<addToDashboardModalLogicType>([
     selectors({
         dashboardsFuse: [
             () => [dashboardsModel.selectors.nameSortedDashboards],
-            (nameSortedDashboards): Fuse => {
+            (
+                nameSortedDashboards: (
+                    | DashboardBasicType
+                    | DashboardType<
+                          import('~/types').QueryBasedInsightModel<
+                              import('../../../queries/schema').Node<Record<string, any>>
+                          >
+                      >
+                )[]
+            ): Fuse => {
                 return createFuse(nameSortedDashboards || [], {
                     keys: ['name', 'description', 'tags'],
                 })
@@ -72,24 +209,46 @@ export const addToDashboardModalLogic = kea<addToDashboardModalLogicType>([
         ],
         filteredDashboards: [
             (s) => [s.searchQuery, s.dashboardsFuse, dashboardsModel.selectors.nameSortedDashboards],
-            (searchQuery, dashboardsFuse, nameSortedDashboards): DashboardBasicType[] =>
+            (
+                searchQuery: string,
+                dashboardsFuse: Fuse,
+                nameSortedDashboards: (
+                    | DashboardBasicType
+                    | DashboardType<
+                          import('~/types').QueryBasedInsightModel<
+                              import('../../../queries/schema').Node<Record<string, any>>
+                          >
+                      >
+                )[]
+            ): DashboardBasicType[] =>
                 searchQuery.length
                     ? dashboardsFuse.search(searchQuery).map((r: FuseResult<DashboardType>) => r.item)
                     : nameSortedDashboards,
         ],
         currentDashboards: [
             (s) => [s.filteredDashboards, s.insight],
-            (filteredDashboards, insight): DashboardBasicType[] =>
+            (
+                filteredDashboards: DashboardBasicType[],
+                insight: Partial<
+                    import('~/types').QueryBasedInsightModel<
+                        import('../../../queries/schema').Node<Record<string, any>>
+                    >
+                >
+            ): DashboardBasicType[] =>
                 filteredDashboards.filter((d) => insight.dashboard_tiles?.map((dt) => dt.dashboard_id)?.includes(d.id)),
         ],
         availableDashboards: [
             (s) => [s.filteredDashboards, s.currentDashboards],
-            (filteredDashboards, currentDashboards): DashboardBasicType[] =>
+            (filteredDashboards: DashboardBasicType[], currentDashboards: DashboardBasicType[]): DashboardBasicType[] =>
                 filteredDashboards.filter((d) => !currentDashboards?.map((cd) => cd.id).includes(d.id)),
         ],
         orderedDashboards: [
             (s) => [s.currentDashboards, s.availableDashboards, userLogic.selectors.user],
-            (currentDashboards, availableDashboards, user): DashboardBasicType[] => {
+            (
+                currentDashboards: DashboardBasicType[],
+                availableDashboards: DashboardBasicType[],
+                user: null | import('~/types').UserType
+            ): DashboardBasicType[] => {
                 const myUuid = user?.uuid ?? null
                 const currentSorted = [...currentDashboards].sort(nameCompareFunction)
                 const isMine = (d: DashboardBasicType): boolean => myUuid !== null && d.created_by?.uuid === myUuid
diff --git a/frontend/src/lib/components/AnnotationsOverlay/annotationsOverlayLogic.ts b/frontend/src/lib/components/AnnotationsOverlay/annotationsOverlayLogic.ts
index d4082ec4adc5..03a79c701cfc 100644
--- a/frontend/src/lib/components/AnnotationsOverlay/annotationsOverlayLogic.ts
+++ b/frontend/src/lib/components/AnnotationsOverlay/annotationsOverlayLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 
 import { isPersonPropertyFilter, parseProperties } from 'lib/components/PropertyFilters/utils'
 import { FEATURE_FLAGS } from 'lib/constants'
@@ -24,7 +24,10 @@ import {
     QueryBasedInsightModel,
 } from '~/types'
 
-import type { annotationsOverlayLogicType } from './annotationsOverlayLogicType'
+import type { AnnotationData } from '../../../models/annotationsModel'
+import type { Node } from '../../../queries/schema/schema-general'
+import type { RawAnnotationType } from '../../../types'
+import type { FeatureFlagsSet } from '../../logic/featureFlagLogic'
 
 export interface AnnotationsOverlayLogicProps extends Omit<InsightLogicProps, 'dashboardId'> {
     dashboardId: DashboardType['id'] | undefined
@@ -72,6 +75,117 @@ function hasPersonPropertyFiltersOrBreakdown(
     return false
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface annotationsOverlayLogicValues {
+    annotations: AnnotationType[] // annotationsModel
+    annotationsLoading: boolean // annotationsModel
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    insightId: number | null // insightLogic
+    savedInsight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>> // insightLogic
+    breakdownFilter: BreakdownFilter | null | undefined // insightVizDataLogic
+    interval: IntervalType | null | undefined // insightVizDataLogic
+    properties: PropertyGroupFilter | AnyPropertyFilter[] | null | undefined // insightVizDataLogic
+    timezone: string // teamLogic
+    activeDate: Dayjs | null
+    annotationBadgeDataIndices: Array<{
+        dataIndex: number
+        date: Dayjs
+        dateKey: string
+    }>
+    annotationsOverlayProps: AnnotationsOverlayLogicProps
+    dateRange: [Dayjs, Dayjs] | null
+    groupedAnnotations: Record<number | string, DatedAnnotationType[]>
+    groupingUnit: IntervalType
+    intervalUnit: IntervalType
+    isDateLocked: boolean
+    isPopoverShown: boolean
+    relevantAnnotations: DatedAnnotationType[]
+    tickDates: Dayjs[]
+    tickPositions: number[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface annotationsOverlayLogicActions {
+    createAnnotationGenerically: (annotationData: AnnotationData) => AnnotationData // annotationsModel
+    deleteAnnotation: (annotation: AnnotationType) => {
+        annotation: AnnotationType
+    } // annotationsModel
+    updateAnnotation: (args_0: {
+        annotationData: AnnotationDataWithoutInsight
+        annotationId: RawAnnotationType['id']
+    }) => {
+        annotationData: AnnotationDataWithoutInsight
+        annotationId: RawAnnotationType[]
+    } // annotationsModel
+    activateDate: (date: Dayjs) => {
+        date: Dayjs
+    }
+    closePopover: () => {
+        value: true
+    }
+    createAnnotation: (annotationData: AnnotationDataWithoutInsight) => {
+        annotationData: AnnotationDataWithoutInsight
+    }
+    deactivateDate: () => {
+        value: true
+    }
+    lockDate: () => {
+        value: true
+    }
+    unlockDate: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface annotationsOverlayLogicMeta {
+    key: number | string
+    __keaTypeGenInternalSelectorTypes: {
+        annotationsOverlayProps: (arg: any) => AnnotationsOverlayLogicProps
+        intervalUnit: (interval: IntervalType | null | undefined) => IntervalType
+        groupingUnit: (intervalUnit: IntervalType) => IntervalType
+        tickPositions: (
+            ticks: {
+                value: number
+            }[]
+        ) => number[]
+        tickDates: (timezone: string, arg: string[], tickPositions: number[]) => Dayjs[]
+        dateRange: (timezone: string, arg: string[], intervalUnit: IntervalType) => [Dayjs, Dayjs] | null
+        relevantAnnotations: (
+            annotations: AnnotationType[],
+            dateRange: [Dayjs, Dayjs] | null,
+            timezone: string,
+            featureFlags: FeatureFlagsSet,
+            insightNumericId: number | 'new',
+            dashboardId: number | undefined,
+            savedInsight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>>,
+            properties: PropertyGroupFilter | AnyPropertyFilter[] | null | undefined,
+            breakdownFilter: BreakdownFilter | null | undefined
+        ) => DatedAnnotationType[]
+        groupedAnnotations: (
+            relevantAnnotations: DatedAnnotationType[],
+            intervalUnit: IntervalType
+        ) => Record<number | string, DatedAnnotationType[]>
+        annotationBadgeDataIndices: (
+            groupedAnnotations: Record<number | string, DatedAnnotationType[]>,
+            intervalUnit: IntervalType,
+            timezone: string,
+            arg: string[]
+        ) => Array<{
+            dataIndex: number
+            date: Dayjs
+            dateKey: string
+        }>
+    }
+}
+
+export type annotationsOverlayLogicType = MakeLogicType<
+    annotationsOverlayLogicValues,
+    annotationsOverlayLogicActions,
+    AnnotationsOverlayLogicProps,
+    annotationsOverlayLogicMeta
+>
+
 export const annotationsOverlayLogic = kea<annotationsOverlayLogicType>([
     path((key) => ['lib', 'components', 'Annotations', 'annotationsOverlayLogic', key]),
     props({ dashboardId: undefined } as AnnotationsOverlayLogicProps),
@@ -136,17 +250,27 @@ export const annotationsOverlayLogic = kea<annotationsOverlayLogicType>([
             () => [(_, props) => props],
             (props: AnnotationsOverlayLogicProps): AnnotationsOverlayLogicProps => props,
         ],
-        intervalUnit: [(s) => [s.interval], (interval) => interval || 'day'],
-        groupingUnit: [(s) => [s.intervalUnit], (intervalUnit): IntervalType => getGroupingUnit(intervalUnit)],
-        tickPositions: [(_, p) => [p.ticks], (ticks): number[] => ticks.map(({ value }) => value)],
+        intervalUnit: [(s) => [s.interval], (interval: IntervalType | null | undefined) => interval || 'day'],
+        groupingUnit: [
+            (s) => [s.intervalUnit],
+            (intervalUnit: IntervalType): IntervalType => getGroupingUnit(intervalUnit),
+        ],
+        tickPositions: [
+            (_, p) => [p.ticks],
+            (
+                ticks: {
+                    value: number
+                }[]
+            ): number[] => ticks.map(({ value }) => value),
+        ],
         tickDates: [
             (s) => [s.timezone, (_, props: AnnotationsOverlayLogicProps) => props.dates, s.tickPositions],
-            (timezone, dates, tickPositions): Dayjs[] =>
+            (timezone: string, dates: string[], tickPositions: number[]): Dayjs[] =>
                 tickPositions.map((dateIndex) => parseDateInTimezone(dates[dateIndex], timezone)),
         ],
         dateRange: [
             (s) => [s.timezone, (_, props: AnnotationsOverlayLogicProps) => props.dates, s.intervalUnit],
-            (timezone, dates, intervalUnit): [Dayjs, Dayjs] | null => {
+            (timezone: string, dates: string[], intervalUnit: IntervalType): [Dayjs, Dayjs] | null => {
                 if (dates.length === 0) {
                     return null
                 }
@@ -168,15 +292,17 @@ export const annotationsOverlayLogic = kea<annotationsOverlayLogicType>([
                 s.breakdownFilter,
             ],
             (
-                annotations,
-                dateRange,
-                timezone,
-                featureFlags,
-                insightNumericId,
-                dashboardId,
-                savedInsight,
-                properties,
-                breakdownFilter
+                annotations: AnnotationType[],
+                dateRange: [Dayjs, Dayjs] | null,
+                timezone: string,
+                featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet,
+                insightNumericId: number | 'new',
+                dashboardId: number | undefined,
+                savedInsight: Partial<
+                    QueryBasedInsightModel<import('~/queries/schema/schema-general').Node<Record<string, any>>>
+                >,
+                properties: PropertyGroupFilter | AnyPropertyFilter[] | null | undefined,
+                breakdownFilter: BreakdownFilter | null | undefined
             ) => {
                 // This assumes that there are no more annotations in the project than AnnotationsViewSet
                 // pagination class's default_limit of 100. As of June 2023, this is not true on Cloud US,
@@ -243,7 +369,7 @@ export const annotationsOverlayLogic = kea<annotationsOverlayLogicType>([
         ],
         groupedAnnotations: [
             (s) => [s.relevantAnnotations, s.intervalUnit],
-            (relevantAnnotations, intervalUnit) => {
+            (relevantAnnotations: DatedAnnotationType[], intervalUnit: IntervalType) => {
                 return groupBy(relevantAnnotations, (annotation) => {
                     return determineAnnotationsDateGroup(annotation.date_marker, intervalUnit)
                 })
@@ -259,10 +385,10 @@ export const annotationsOverlayLogic = kea<annotationsOverlayLogicType>([
                 (_, props: AnnotationsOverlayLogicProps) => props.dates,
             ],
             (
-                groupedAnnotations,
-                intervalUnit,
-                timezone,
-                dates
+                groupedAnnotations: Record<number | string, DatedAnnotationType[]>,
+                intervalUnit: IntervalType,
+                timezone: string,
+                dates: string[]
             ): Array<{ dateKey: string; date: Dayjs; dataIndex: number }> => {
                 if (dates.length === 0) {
                     return []
diff --git a/frontend/src/lib/components/AppMetrics/appMetricsLogic.ts b/frontend/src/lib/components/AppMetrics/appMetricsLogic.ts
index 35b26890f76b..01c9b67baae4 100644
--- a/frontend/src/lib/components/AppMetrics/appMetricsLogic.ts
+++ b/frontend/src/lib/components/AppMetrics/appMetricsLogic.ts
@@ -1,4 +1,17 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, propsChanged, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    afterMount,
+    connect,
+    kea,
+    key,
+    listeners,
+    path,
+    props,
+    propsChanged,
+    reducers,
+    selectors,
+} from 'kea'
 import { loaders } from 'kea-loaders'
 import { subscriptions } from 'kea-subscriptions'
 
@@ -10,7 +23,7 @@ import { teamLogic } from 'scenes/teamLogic'
 
 import { HogQLQueryString, hogql } from '~/queries/utils'
 
-import type { appMetricsLogicType } from './appMetricsLogicType'
+import type { TeamPublicType, TeamType } from '../../../types'
 
 const DEFAULT_INTERVAL = 'day'
 
@@ -238,6 +251,105 @@ const convertDateFieldToDayJs = (date: string, timezone: string): Dayjs => {
     return dateStringToDayJs(date, timezone) ?? dayjs().tz(timezone)
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface appMetricsLogicValues {
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    appMetricsTrends: AppMetricsTimeSeriesResponse | null
+    appMetricsTrendsLoading: boolean
+    appMetricsTrendsPreviousPeriod: AppMetricsTimeSeriesResponse | null
+    appMetricsTrendsPreviousPeriodLoading: boolean
+    availableIntervals: AppMetricsCommonParams['interval'][]
+    getDateRangeAbsolute: () => {
+        dateFrom: Dayjs
+        dateTo: Dayjs
+        diffMs: number
+    }
+    getSingleTrendSeries: (name: string, previousPeriod?: boolean) => AppMetricsTimeSeriesResponse | null
+    params: Partial<AppMetricsCommonParams>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface appMetricsLogicActions {
+    loadAppMetricsTrends: () => {
+        value: true
+    }
+    loadAppMetricsTrendsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAppMetricsTrendsPreviousPeriod: () => {
+        value: true
+    }
+    loadAppMetricsTrendsPreviousPeriodFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAppMetricsTrendsPreviousPeriodSuccess: (
+        appMetricsTrendsPreviousPeriod: AppMetricsTimeSeriesResponse,
+        payload?: {
+            value: true
+        }
+    ) => {
+        appMetricsTrendsPreviousPeriod: AppMetricsTimeSeriesResponse
+        payload?: {
+            value: true
+        }
+    }
+    loadAppMetricsTrendsSuccess: (
+        appMetricsTrends: AppMetricsTimeSeriesResponse,
+        payload?: {
+            value: true
+        }
+    ) => {
+        appMetricsTrends: AppMetricsTimeSeriesResponse
+        payload?: {
+            value: true
+        }
+    }
+    setParams: (params: Partial<AppMetricsCommonParams>) => {
+        params: Partial<AppMetricsCommonParams>
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface appMetricsLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        getSingleTrendSeries: (
+            appMetricsTrends: AppMetricsTimeSeriesResponse | null,
+            appMetricsTrendsPreviousPeriod: AppMetricsTimeSeriesResponse | null
+        ) => (name: string, previousPeriod?: boolean) => AppMetricsTimeSeriesResponse | null
+        getDateRangeAbsolute: (
+            params: Partial<AppMetricsCommonParams>,
+            currentTeam: TeamPublicType | TeamType | null
+        ) => () => {
+            dateFrom: Dayjs
+            dateTo: Dayjs
+            diffMs: number
+        }
+        availableIntervals: (
+            getDateRangeAbsolute: () => {
+                dateFrom: Dayjs
+                dateTo: Dayjs
+                diffMs: number
+            }
+        ) => AppMetricsCommonParams['interval'][]
+    }
+}
+
+export type appMetricsLogicType = MakeLogicType<
+    appMetricsLogicValues,
+    appMetricsLogicActions,
+    AppMetricsLogicProps,
+    appMetricsLogicMeta
+>
+
 // IDEA - have a generic helper logic that can be used anywhere for rendering metrics
 export const appMetricsLogic = kea<appMetricsLogicType>([
     props({} as unknown as AppMetricsLogicProps),
@@ -307,7 +419,10 @@ export const appMetricsLogic = kea<appMetricsLogicType>([
     selectors(() => ({
         getSingleTrendSeries: [
             (s) => [s.appMetricsTrends, s.appMetricsTrendsPreviousPeriod],
-            (appMetricsTrends, appMetricsTrendsPreviousPeriod) =>
+            (
+                appMetricsTrends: AppMetricsTimeSeriesResponse | null,
+                appMetricsTrendsPreviousPeriod: AppMetricsTimeSeriesResponse | null
+            ) =>
                 (name: string, previousPeriod: boolean = false): AppMetricsTimeSeriesResponse | null => {
                     const targetTrend = previousPeriod ? appMetricsTrendsPreviousPeriod : appMetricsTrends
                     if (!targetTrend) {
@@ -327,23 +442,33 @@ export const appMetricsLogic = kea<appMetricsLogicType>([
 
         getDateRangeAbsolute: [
             (s) => [s.params, s.currentTeam],
-            (params, currentTeam) => (): { dateFrom: Dayjs; dateTo: Dayjs; diffMs: number } => {
-                const dateFrom = convertDateFieldToDayJs(params.dateFrom ?? '-7d', currentTeam?.timezone ?? 'UTC')
-                const dateTo = params.dateTo
-                    ? convertDateFieldToDayJs(params.dateTo, currentTeam?.timezone ?? 'UTC')
-                    : dayjs()
-                          .tz(currentTeam?.timezone ?? 'UTC')
-                          .endOf(params.interval ?? DEFAULT_INTERVAL)
-
-                const diffMs = dateTo.diff(dateFrom)
-
-                return { dateFrom, dateTo, diffMs }
-            },
+            (
+                params: Partial<AppMetricsCommonParams>,
+                currentTeam: null | import('../../../types').TeamPublicType | import('../../../types').TeamType
+            ) =>
+                (): { dateFrom: Dayjs; dateTo: Dayjs; diffMs: number } => {
+                    const dateFrom = convertDateFieldToDayJs(params.dateFrom ?? '-7d', currentTeam?.timezone ?? 'UTC')
+                    const dateTo = params.dateTo
+                        ? convertDateFieldToDayJs(params.dateTo, currentTeam?.timezone ?? 'UTC')
+                        : dayjs()
+                              .tz(currentTeam?.timezone ?? 'UTC')
+                              .endOf(params.interval ?? DEFAULT_INTERVAL)
+
+                    const diffMs = dateTo.diff(dateFrom)
+
+                    return { dateFrom, dateTo, diffMs }
+                },
         ],
 
         availableIntervals: [
             (s) => [s.getDateRangeAbsolute],
-            (getDateRangeAbsolute): AppMetricsCommonParams['interval'][] => {
+            (
+                getDateRangeAbsolute: () => {
+                    dateFrom: Dayjs
+                    dateTo: Dayjs
+                    diffMs: number
+                }
+            ): AppMetricsCommonParams['interval'][] => {
                 const diffMs = getDateRangeAbsolute().diffMs
 
                 // If the diff is less than 2 days (ish), we can show the minute interval but not day
diff --git a/frontend/src/lib/components/AuthorizedUrlList/authorizedUrlListLogic.ts b/frontend/src/lib/components/AuthorizedUrlList/authorizedUrlListLogic.ts
index 72b25da4fd6f..d1e50338c1fb 100644
--- a/frontend/src/lib/components/AuthorizedUrlList/authorizedUrlListLogic.ts
+++ b/frontend/src/lib/components/AuthorizedUrlList/authorizedUrlListLogic.ts
@@ -1,4 +1,5 @@
 import {
+    MakeLogicType,
     actions,
     afterMount,
     connect,
@@ -11,7 +12,9 @@ import {
     selectors,
     sharedListeners,
 } from 'kea'
+import type { BreakPointFunction } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { encodeParams, urlToAction } from 'kea-router'
 import { subscriptions } from 'kea-subscriptions'
@@ -30,7 +33,7 @@ import { ProductIntentContext, ProductKey } from '~/queries/schema/schema-genera
 import { hogql } from '~/queries/utils'
 import { ExperimentIdType, ToolbarParams, ToolbarUserIntent } from '~/types'
 
-import type { authorizedUrlListLogicType } from './authorizedUrlListLogicType'
+import type { TeamPublicType, TeamType, UserType } from '../../../types'
 
 export interface ProposeNewUrlFormType {
     url: string
@@ -305,6 +308,166 @@ export const defaultAuthorizedUrlProperties = {
     userIntent: undefined,
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface authorizedUrlListLogicValues {
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    currentTeamId: number | null // teamLogic
+    user: UserType | null // userLogic
+    authorizedUrls: string[]
+    checkUrlIsAuthorized: (url: string) => boolean
+    checkUrlIsSafeToFrame: (url: string) => boolean
+    editUrlIndex: number | null
+    isAddUrlFormVisible: boolean
+    isProposedUrlSubmitting: boolean
+    isProposedUrlValid: boolean
+    launchUrl: (url: string) => string
+    onlyAllowDomains: boolean
+    proposedUrl: ProposeNewUrlFormType
+    proposedUrlAllErrors: Record<string, any>
+    proposedUrlChanged: boolean
+    proposedUrlErrors: DeepPartialMap<ProposeNewUrlFormType, ValidationErrorType>
+    proposedUrlHasErrors: boolean
+    proposedUrlManualErrors: Record<string, any>
+    proposedUrlTouched: boolean
+    proposedUrlTouches: Record<string, boolean>
+    proposedUrlValidationErrors: DeepPartialMap<ProposeNewUrlFormType, ValidationErrorType>
+    showProposedURLForm: boolean
+    showProposedUrlErrors: boolean
+    suggestions: any[]
+    suggestionsLoading: boolean
+    urlToEdit: string
+    urlsKeyed: KeyedAppUrl[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface authorizedUrlListLogicActions {
+    updateCurrentTeam: (payload: Partial<TeamType>) => Partial<TeamType> // teamLogic
+    addUrl: (
+        url: string,
+        launch?: boolean
+    ) => {
+        launch: boolean | undefined
+        url: string
+    }
+    cancelProposingUrl: () => {
+        value: true
+    }
+    copyLaunchCode: () => {
+        value: true
+    }
+    launchAtUrl: (url: string) => {
+        url: string
+    }
+    loadSuggestions: (_: void) => void
+    loadSuggestionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSuggestionsSuccess: (
+        suggestions: SuggestedDomain[],
+        payload?: void
+    ) => {
+        suggestions: SuggestedDomain[]
+        payload?: void
+    }
+    newUrl: () => {
+        value: true
+    }
+    removeUrl: (index: number) => {
+        index: number
+    }
+    resetProposedUrl: (values?: ProposeNewUrlFormType) => {
+        values?: ProposeNewUrlFormType
+    }
+    setAuthorizedUrls: (authorizedUrls: string[]) => {
+        authorizedUrls: string[]
+    }
+    setEditUrlIndex: (originalIndex: number | null) => {
+        originalIndex: number | null
+    }
+    setProposedUrlManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setProposedUrlValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setProposedUrlValues: (values: DeepPartial<ProposeNewUrlFormType>) => {
+        values: DeepPartial<ProposeNewUrlFormType>
+    }
+    submitProposedUrl: () => {
+        value: boolean
+    }
+    submitProposedUrlFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitProposedUrlRequest: (proposedUrl: ProposeNewUrlFormType) => {
+        proposedUrl: ProposeNewUrlFormType
+    }
+    submitProposedUrlSuccess: (proposedUrl: ProposeNewUrlFormType) => {
+        proposedUrl: ProposeNewUrlFormType
+    }
+    touchProposedUrlField: (key: string) => {
+        key: string
+    }
+    updateUrl: (
+        index: number,
+        url: string
+    ) => {
+        index: number
+        url: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface authorizedUrlListLogicMeta {
+    key: string
+    sharedListeners: {
+        saveUrls: (
+            payload: any,
+            breakpoint: BreakPointFunction,
+            action: {
+                type: string
+                payload: any
+            },
+            previousState: any
+        ) => void | Promise<void>
+    }
+    __keaTypeGenInternalSelectorTypes: {
+        urlToEdit: (authorizedUrls: string[], editUrlIndex: number | null) => string
+        urlsKeyed: (authorizedUrls: string[], suggestions: any[]) => KeyedAppUrl[]
+        launchUrl: (
+            currentTeam: TeamPublicType | TeamType | null,
+            user: UserType | null,
+            actionId: number | null,
+            experimentId: ExperimentIdType | null,
+            productTourId: string | null,
+            arg: ToolbarUserIntent | undefined
+        ) => (url: string) => string
+        isAddUrlFormVisible: (editUrlIndex: number | null) => boolean
+        onlyAllowDomains: (type: AuthorizedUrlListType) => boolean
+        checkUrlIsAuthorized: (authorizedUrls: string[]) => (url: string) => boolean
+        checkUrlIsSafeToFrame: (authorizedUrls: string[]) => (url: string) => boolean
+    }
+}
+
+export type authorizedUrlListLogicType = MakeLogicType<
+    authorizedUrlListLogicValues,
+    authorizedUrlListLogicActions,
+    AuthorizedUrlListLogicProps,
+    authorizedUrlListLogicMeta
+>
+
 export const authorizedUrlListLogic = kea<authorizedUrlListLogicType>([
     path((key) => ['lib', 'components', 'AuthorizedUrlList', 'authorizedUrlListLogic', key]),
     key((props) => `${props.type}-${props.experimentId}-${props.actionId}-${props.productTourId}`), // Some will be undefined but that's ok, this avoids experiment/action with same ID sharing same store
@@ -509,7 +672,7 @@ export const authorizedUrlListLogic = kea<authorizedUrlListLogicType>([
     selectors({
         urlToEdit: [
             (s) => [s.authorizedUrls, s.editUrlIndex],
-            (authorizedUrls, editUrlIndex) => {
+            (authorizedUrls: string[], editUrlIndex: number | null) => {
                 if (editUrlIndex === null || editUrlIndex === -1) {
                     return NEW_URL
                 }
@@ -518,7 +681,7 @@ export const authorizedUrlListLogic = kea<authorizedUrlListLogicType>([
         ],
         urlsKeyed: [
             (s) => [s.authorizedUrls, s.suggestions],
-            (authorizedUrls, suggestions): KeyedAppUrl[] => {
+            (authorizedUrls: string[], suggestions: any[]): KeyedAppUrl[] => {
                 const keyedUrls = authorizedUrls
                     .map((url, index) => ({
                         url,
@@ -546,35 +709,46 @@ export const authorizedUrlListLogic = kea<authorizedUrlListLogicType>([
                 p.productTourId,
                 p.userIntent ?? (() => undefined),
             ],
-            (currentTeam, user, actionId, experimentId, productTourId, userIntent) => (url: string) => {
-                const commonOptions = {
-                    token: currentTeam?.api_token,
-                    dataAttributes: currentTeam?.data_attributes,
-                    userEmail: user?.email,
-                    distinctId: user?.distinct_id,
-                }
-                if (experimentId) {
-                    return directToolbarUrl(url, { ...commonOptions, experimentId })
-                }
-                if (productTourId) {
-                    return directToolbarUrl(url, { ...commonOptions, productTourId, userIntent })
-                }
-                return directToolbarUrl(url, { ...commonOptions, actionId })
-            },
+            (
+                currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType,
+                user: null | import('~/types').UserType,
+                actionId: number | null,
+                experimentId: ExperimentIdType | null,
+                productTourId: string | null,
+                userIntent: ToolbarUserIntent | undefined
+            ) =>
+                (url: string) => {
+                    const commonOptions = {
+                        token: currentTeam?.api_token,
+                        dataAttributes: currentTeam?.data_attributes,
+                        userEmail: user?.email,
+                        distinctId: user?.distinct_id,
+                    }
+                    if (experimentId) {
+                        return directToolbarUrl(url, { ...commonOptions, experimentId })
+                    }
+                    if (productTourId) {
+                        return directToolbarUrl(url, { ...commonOptions, productTourId, userIntent })
+                    }
+                    return directToolbarUrl(url, { ...commonOptions, actionId })
+                },
+        ],
+        isAddUrlFormVisible: [(s) => [s.editUrlIndex], (editUrlIndex: number | null) => editUrlIndex === -1],
+        onlyAllowDomains: [
+            (_, p) => [p.type],
+            (type: AuthorizedUrlListType) => type === AuthorizedUrlListType.RECORDING_DOMAINS,
         ],
-        isAddUrlFormVisible: [(s) => [s.editUrlIndex], (editUrlIndex) => editUrlIndex === -1],
-        onlyAllowDomains: [(_, p) => [p.type], (type) => type === AuthorizedUrlListType.RECORDING_DOMAINS],
 
         checkUrlIsAuthorized: [
             (s) => [s.authorizedUrls],
-            (authorizedUrls) => (url: string) => {
+            (authorizedUrls: string[]) => (url: string) => {
                 return checkUrlIsAuthorized(url, authorizedUrls)
             },
         ],
 
         checkUrlIsSafeToFrame: [
             (s) => [s.authorizedUrls],
-            (authorizedUrls) => (url: string) => {
+            (authorizedUrls: string[]) => (url: string) => {
                 return checkUrlIsSafeToFrame(url, authorizedUrls)
             },
         ],
diff --git a/frontend/src/lib/components/Cards/ButtonTileCard/buttonTileCardModalLogic.ts b/frontend/src/lib/components/Cards/ButtonTileCard/buttonTileCardModalLogic.ts
index 39bc5b916764..88cc58b33ce5 100644
--- a/frontend/src/lib/components/Cards/ButtonTileCard/buttonTileCardModalLogic.ts
+++ b/frontend/src/lib/components/Cards/ButtonTileCard/buttonTileCardModalLogic.ts
@@ -1,5 +1,6 @@
-import { connect, kea, key, listeners, path, props } from 'kea'
+import { MakeLogicType, connect, kea, key, listeners, path, props } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import posthog from 'posthog-js'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -7,8 +8,6 @@ import { lemonToast } from '@posthog/lemon-ui'
 import { dashboardsModel } from '~/models/dashboardsModel'
 import { DashboardType, QueryBasedInsightModel } from '~/types'
 
-import type { buttonTileCardModalLogicType } from './buttonTileCardModalLogicType'
-
 export interface ButtonTileForm {
     url: string
     text: string
@@ -55,6 +54,74 @@ const isValidPathname = (value: string): boolean => {
     return /^\/[a-zA-Z0-9._~:/?#[\]@!$&'()*+,;=%-]*$/.test(value)
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface buttonTileCardModalLogicValues {
+    buttonTile: ButtonTileForm
+    buttonTileAllErrors: Record<string, any>
+    buttonTileChanged: boolean
+    buttonTileErrors: DeepPartialMap<ButtonTileForm, ValidationErrorType>
+    buttonTileHasErrors: boolean
+    buttonTileManualErrors: Record<string, any>
+    buttonTileTouched: boolean
+    buttonTileTouches: Record<string, boolean>
+    buttonTileValidationErrors: DeepPartialMap<ButtonTileForm, ValidationErrorType>
+    isButtonTileSubmitting: boolean
+    isButtonTileValid: boolean
+    showButtonTileErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface buttonTileCardModalLogicActions {
+    updateDashboard: (args_0: any) => any // dashboardsModel
+    resetButtonTile: (values?: ButtonTileForm) => {
+        values?: ButtonTileForm
+    }
+    setButtonTileManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setButtonTileValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setButtonTileValues: (values: DeepPartial<ButtonTileForm>) => {
+        values: DeepPartial<ButtonTileForm>
+    }
+    submitButtonTile: () => {
+        value: boolean
+    }
+    submitButtonTileFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitButtonTileRequest: (buttonTile: ButtonTileForm) => {
+        buttonTile: ButtonTileForm
+    }
+    submitButtonTileSuccess: (buttonTile: ButtonTileForm) => {
+        buttonTile: ButtonTileForm
+    }
+    touchButtonTileField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface buttonTileCardModalLogicMeta {
+    key: string
+}
+
+export type buttonTileCardModalLogicType = MakeLogicType<
+    buttonTileCardModalLogicValues,
+    buttonTileCardModalLogicActions,
+    ButtonTileCardModalProps,
+    buttonTileCardModalLogicMeta
+>
+
 export const buttonTileCardModalLogic = kea<buttonTileCardModalLogicType>([
     path(['scenes', 'dashboard', 'buttonTileCardModal', 'logic']),
     props({} as ButtonTileCardModalProps),
diff --git a/frontend/src/lib/components/Cards/InsightCard/dashboardWidgetMenusLogic.ts b/frontend/src/lib/components/Cards/InsightCard/dashboardWidgetMenusLogic.ts
index 4c2c28825cc2..8443d0cba807 100644
--- a/frontend/src/lib/components/Cards/InsightCard/dashboardWidgetMenusLogic.ts
+++ b/frontend/src/lib/components/Cards/InsightCard/dashboardWidgetMenusLogic.ts
@@ -1,11 +1,12 @@
-import { connect, kea, key, path, props, selectors } from 'kea'
+import { MakeLogicType, connect, kea, key, path, props, selectors } from 'kea'
 
 import { accessLevelSatisfied } from 'lib/utils/accessControlUtils'
 
 import { dashboardsModel } from '~/models/dashboardsModel'
 import { AccessControlLevel, AccessControlResourceType, DashboardBasicType, DashboardTileBasicType } from '~/types'
 
-import type { dashboardWidgetMenusLogicType } from './dashboardWidgetMenusLogicType'
+import type { Node } from '../../../../queries/schema/schema-general'
+import type { DashboardType, QueryBasedInsightModel } from '../../../../types'
 import type { DashboardWidgetPlacementDestination } from './DashboardWidgetPlacementMenu'
 
 /** Stable key for kea; e.g. insight short_id, `text-${id}`, `button-${id}`, or `text-tile-${tileId}`. */
@@ -22,6 +23,40 @@ function canEditDestinationDashboard(d: DashboardBasicType): boolean {
         : true
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dashboardWidgetMenusLogicValues {
+    nameSortedDashboards: (DashboardBasicType | DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>>)[] // dashboardsModel
+    copyToDestinations: DashboardWidgetPlacementDestination[]
+    dashboardIdsWithThisWidget: Set<number>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dashboardWidgetMenusLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        dashboardIdsWithThisWidget: (
+            dashboards: number[] | null | undefined,
+            dashboard_tiles: DashboardTileBasicType[] | null | undefined,
+            dashboardId: number | null | undefined
+        ) => Set<number>
+        copyToDestinations: (
+            nameSortedDashboards: (
+                | DashboardBasicType
+                | DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>>
+            )[],
+            dashboardIdsWithThisWidget: Set<number>,
+            dashboardId: number | null | undefined
+        ) => DashboardWidgetPlacementDestination[]
+    }
+}
+
+export type dashboardWidgetMenusLogicType = MakeLogicType<
+    dashboardWidgetMenusLogicValues,
+    {},
+    DashboardWidgetMenusLogicProps,
+    dashboardWidgetMenusLogicMeta
+>
+
 /** Copy / Move dashboard submenus for insight, text, and button widgets (placement + ACL). */
 export const dashboardWidgetMenusLogic = kea<dashboardWidgetMenusLogicType>([
     path(['lib', 'components', 'Cards', 'InsightCard', 'dashboardWidgetMenusLogic']),
@@ -59,7 +94,18 @@ export const dashboardWidgetMenusLogic = kea<dashboardWidgetMenusLogicType>([
         /** Destinations for Copy to and Move to submenus (disabled rows explain why a target is unavailable). */
         copyToDestinations: [
             (s, p) => [s.nameSortedDashboards, s.dashboardIdsWithThisWidget, p.dashboardId],
-            (nameSortedDashboards, dashboardIdsWithThisWidget, dashboardId): DashboardWidgetPlacementDestination[] => {
+            (
+                nameSortedDashboards: (
+                    | DashboardBasicType
+                    | import('~/types').DashboardType<
+                          import('~/types').QueryBasedInsightModel<
+                              import('../../../../queries/schema').Node<Record<string, any>>
+                          >
+                      >
+                )[],
+                dashboardIdsWithThisWidget: Set<number>,
+                dashboardId: number | null | undefined
+            ): DashboardWidgetPlacementDestination[] => {
                 return nameSortedDashboards
                     .filter((d) => (dashboardId == null || d.id !== dashboardId) && canEditDestinationDashboard(d))
                     .map((d) => ({
diff --git a/frontend/src/lib/components/Cards/TextCard/textCardModalLogic.ts b/frontend/src/lib/components/Cards/TextCard/textCardModalLogic.ts
index 6d5dc5dd754d..113472db2918 100644
--- a/frontend/src/lib/components/Cards/TextCard/textCardModalLogic.ts
+++ b/frontend/src/lib/components/Cards/TextCard/textCardModalLogic.ts
@@ -1,5 +1,6 @@
-import { connect, kea, key, listeners, path, props } from 'kea'
+import { MakeLogicType, connect, kea, key, listeners, path, props } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import posthog from 'posthog-js'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -7,8 +8,6 @@ import { lemonToast } from '@posthog/lemon-ui'
 import { dashboardsModel } from '~/models/dashboardsModel'
 import { DashboardTile, DashboardType, QueryBasedInsightModel } from '~/types'
 
-import type { textCardModalLogicType } from './textCardModalLogicType'
-
 export interface TextTileForm {
     body: string
     transparent_background: boolean
@@ -30,6 +29,74 @@ const getExistingTextTile = (dashboard: DashboardType<QueryBasedInsightModel>, t
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface textCardModalLogicValues {
+    isTextTileSubmitting: boolean
+    isTextTileValid: boolean
+    showTextTileErrors: boolean
+    textTile: TextTileForm
+    textTileAllErrors: Record<string, any>
+    textTileChanged: boolean
+    textTileErrors: DeepPartialMap<TextTileForm, ValidationErrorType>
+    textTileHasErrors: boolean
+    textTileManualErrors: Record<string, any>
+    textTileTouched: boolean
+    textTileTouches: Record<string, boolean>
+    textTileValidationErrors: DeepPartialMap<TextTileForm, ValidationErrorType>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface textCardModalLogicActions {
+    updateDashboard: (args_0: any) => any // dashboardsModel
+    resetTextTile: (values?: TextTileForm) => {
+        values?: TextTileForm
+    }
+    setTextTileManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setTextTileValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setTextTileValues: (values: DeepPartial<TextTileForm>) => {
+        values: DeepPartial<TextTileForm>
+    }
+    submitTextTile: () => {
+        value: boolean
+    }
+    submitTextTileFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitTextTileRequest: (textTile: TextTileForm) => {
+        textTile: TextTileForm
+    }
+    submitTextTileSuccess: (textTile: TextTileForm) => {
+        textTile: TextTileForm
+    }
+    touchTextTileField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface textCardModalLogicMeta {
+    key: string
+}
+
+export type textCardModalLogicType = MakeLogicType<
+    textCardModalLogicValues,
+    textCardModalLogicActions,
+    TextCardModalProps,
+    textCardModalLogicMeta
+>
+
 export const textCardModalLogic = kea<textCardModalLogicType>([
     path(['scenes', 'dashboard', 'dashboardTextTileModal', 'logic']),
     props({} as TextCardModalProps),
diff --git a/frontend/src/lib/components/Command/commandLogic.tsx b/frontend/src/lib/components/Command/commandLogic.tsx
index 090c6ca1c417..aac5fbddf83b 100644
--- a/frontend/src/lib/components/Command/commandLogic.tsx
+++ b/frontend/src/lib/components/Command/commandLogic.tsx
@@ -1,6 +1,24 @@
-import { actions, kea, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers } from 'kea'
 
-import type { commandLogicType } from './commandLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface commandLogicValues {
+    isCommandOpen: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface commandLogicActions {
+    closeCommand: () => {
+        value: true
+    }
+    openCommand: () => {
+        value: true
+    }
+    toggleCommand: () => {
+        value: true
+    }
+}
+
+export type commandLogicType = MakeLogicType<commandLogicValues, commandLogicActions>
 
 export const commandLogic = kea<commandLogicType>([
     path(['lib', 'components', 'Command', 'commandLogic']),
diff --git a/frontend/src/lib/components/CyclotronJob/cyclotronJobInputLogic.ts b/frontend/src/lib/components/CyclotronJob/cyclotronJobInputLogic.ts
index 3f9c03716ad9..6bd1fa23173b 100644
--- a/frontend/src/lib/components/CyclotronJob/cyclotronJobInputLogic.ts
+++ b/frontend/src/lib/components/CyclotronJob/cyclotronJobInputLogic.ts
@@ -1,6 +1,4 @@
-import { kea } from 'kea'
-
-import type { cyclotronJobInputLogicType } from './cyclotronJobInputLogicType'
+import { MakeLogicType, kea } from 'kea'
 
 export interface CyclotronJobInputLogicProps {
     fieldKey: string
@@ -19,6 +17,41 @@ export function formatJsonValue(value: any): string {
     return typeof value !== 'string' ? JSON.stringify(value, null, 2) : value
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface cyclotronJobInputLogicValues {
+    error: string | null
+    hasError: boolean
+    jsonValue: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface cyclotronJobInputLogicActions {
+    setError: (error: string | null) => {
+        error: string | null
+    }
+    setJsonValue: (value: string) => {
+        value: string
+    }
+    validateJson: (value: string) => {
+        value: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface cyclotronJobInputLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        hasError: (error: any) => boolean
+    }
+}
+
+export type cyclotronJobInputLogicType = MakeLogicType<
+    cyclotronJobInputLogicValues,
+    cyclotronJobInputLogicActions,
+    CyclotronJobInputLogicProps,
+    cyclotronJobInputLogicMeta
+>
+
 export const cyclotronJobInputLogic = kea<cyclotronJobInputLogicType>({
     path: ['lib', 'components', 'CyclotronJob', 'cyclotronJobInputLogic'],
     props: {} as CyclotronJobInputLogicProps,
diff --git a/frontend/src/lib/components/CyclotronJob/cyclotronJobTemplateSuggestionsLogic.tsx b/frontend/src/lib/components/CyclotronJob/cyclotronJobTemplateSuggestionsLogic.tsx
index c8f4c338669b..98ff8d382f33 100644
--- a/frontend/src/lib/components/CyclotronJob/cyclotronJobTemplateSuggestionsLogic.tsx
+++ b/frontend/src/lib/components/CyclotronJob/cyclotronJobTemplateSuggestionsLogic.tsx
@@ -1,12 +1,10 @@
 import FuseClass from 'fuse.js'
-import { actions, kea, key, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, key, path, props, reducers, selectors } from 'kea'
 
 import { STL as HOG_STL } from '@posthog/hogvm'
 
 import { createFuse } from 'lib/utils/fuseSearch'
 
-import type { cyclotronJobTemplateSuggestionsLogicType } from './cyclotronJobTemplateSuggestionsLogicType'
-
 export type CyclotronJobTemplateOption = {
     key: string
     description: string
@@ -77,6 +75,42 @@ const LIQUID_USAGE_EXAMPLES: CyclotronJobTemplateOption[] = [
     },
 ]
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface cyclotronJobTemplateSuggestionsLogicValues {
+    allOptions: CyclotronJobTemplateOption[]
+    optionsFiltered: CyclotronJobTemplateOption[]
+    optionsFuse: Fuse
+    search: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface cyclotronJobTemplateSuggestionsLogicActions {
+    setSearch: (search: string) => {
+        search: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface cyclotronJobTemplateSuggestionsLogicMeta {
+    key: 'hog' | 'liquid'
+    __keaTypeGenInternalSelectorTypes: {
+        allOptions: (templating: 'hog' | 'liquid') => CyclotronJobTemplateOption[]
+        optionsFuse: (allOptions: CyclotronJobTemplateOption[]) => Fuse
+        optionsFiltered: (
+            allOptions: CyclotronJobTemplateOption[],
+            optionsFuse: Fuse,
+            search: string
+        ) => CyclotronJobTemplateOption[]
+    }
+}
+
+export type cyclotronJobTemplateSuggestionsLogicType = MakeLogicType<
+    cyclotronJobTemplateSuggestionsLogicValues,
+    cyclotronJobTemplateSuggestionsLogicActions,
+    CyclotronJobTemplateSuggestionsLogicProps,
+    cyclotronJobTemplateSuggestionsLogicMeta
+>
+
 export const cyclotronJobTemplateSuggestionsLogic = kea<cyclotronJobTemplateSuggestionsLogicType>([
     props({} as CyclotronJobTemplateSuggestionsLogicProps),
     key(({ templating }: CyclotronJobTemplateSuggestionsLogicProps) => templating),
@@ -92,14 +126,14 @@ export const cyclotronJobTemplateSuggestionsLogic = kea<cyclotronJobTemplateSugg
     selectors({
         allOptions: [
             (_, p) => [p.templating],
-            (templating): CyclotronJobTemplateOption[] => {
+            (templating: 'hog' | 'liquid'): CyclotronJobTemplateOption[] => {
                 return templating === 'hog' ? [...HOG_USAGE_EXAMPLES, ...HOG_STL_EXAMPLES] : LIQUID_USAGE_EXAMPLES
             },
         ],
 
         optionsFuse: [
             (s) => [s.allOptions],
-            (allOptions): Fuse => {
+            (allOptions: CyclotronJobTemplateOption[]): Fuse => {
                 return createFuse(allOptions, {
                     keys: ['description', 'example'],
                 })
@@ -108,7 +142,11 @@ export const cyclotronJobTemplateSuggestionsLogic = kea<cyclotronJobTemplateSugg
 
         optionsFiltered: [
             (s) => [s.allOptions, s.optionsFuse, s.search],
-            (allOptions, optionsFuse, search): CyclotronJobTemplateOption[] => {
+            (
+                allOptions: CyclotronJobTemplateOption[],
+                optionsFuse: Fuse,
+                search: string
+            ): CyclotronJobTemplateOption[] => {
                 if (!search) {
                     return allOptions
                 }
diff --git a/frontend/src/lib/components/DateFilter/DateRangePicker/dateRangePickerLogic.ts b/frontend/src/lib/components/DateFilter/DateRangePicker/dateRangePickerLogic.ts
index 96088a81147d..6254d4347131 100644
--- a/frontend/src/lib/components/DateFilter/DateRangePicker/dateRangePickerLogic.ts
+++ b/frontend/src/lib/components/DateFilter/DateRangePicker/dateRangePickerLogic.ts
@@ -1,9 +1,7 @@
-import { actions, kea, key, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, kea, key, path, props, reducers } from 'kea'
 
 import { DateRange } from '~/queries/schema/schema-general'
 
-import type { dateRangePickerLogicType } from './dateRangePickerLogicType'
-
 const MAX_HISTORY_ITEMS = 5
 
 const dateRangesEqual = (a: DateRange, b: DateRange): boolean => a.date_from === b.date_from && a.date_to === b.date_to
@@ -13,6 +11,42 @@ export interface DateRangePickerLogicProps {
     key: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dateRangePickerLogicValues {
+    customFrom: string
+    customTo: string
+    history: DateRange[]
+    popoverOpen: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dateRangePickerLogicActions {
+    addToHistory: (dateRange: DateRange) => {
+        dateRange: DateRange
+    }
+    setCustomFrom: (value: string) => {
+        value: string
+    }
+    setCustomTo: (value: string) => {
+        value: string
+    }
+    setPopoverOpen: (open: boolean) => {
+        open: boolean
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dateRangePickerLogicMeta {
+    key: string
+}
+
+export type dateRangePickerLogicType = MakeLogicType<
+    dateRangePickerLogicValues,
+    dateRangePickerLogicActions,
+    DateRangePickerLogicProps,
+    dateRangePickerLogicMeta
+>
+
 export const dateRangePickerLogic = kea<dateRangePickerLogicType>([
     props({} as DateRangePickerLogicProps),
     key((props) => props.key),
diff --git a/frontend/src/lib/components/DateFilter/dateFilterLogic.ts b/frontend/src/lib/components/DateFilter/dateFilterLogic.ts
index 8efd658fcabc..9eea9d95b76a 100644
--- a/frontend/src/lib/components/DateFilter/dateFilterLogic.ts
+++ b/frontend/src/lib/components/DateFilter/dateFilterLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 
 import {
     DateFilterLogicProps,
@@ -12,8 +12,6 @@ import { formatDate, formatDateRange, formatDateTime, formatDateTimeRange, isDat
 
 import { DateMappingOption } from '~/types'
 
-import type { dateFilterLogicType } from './dateFilterLogicType'
-
 const RELATIVE_UNIT_LABEL: Record<string, string> = {
     h: 'hour',
     d: 'day',
@@ -47,6 +45,136 @@ function hasTimePrecision(dateValue: string | Dayjs | null | undefined): boolean
     return false
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dateFilterLogicValues {
+    dateFrom: any
+    dateFromHasTimePrecision: boolean
+    dateOptions: DateMappingOption[] | undefined
+    dateTo: any
+    dateToHasTimePrecision: boolean
+    explicitDate: boolean
+    fixedRangeGranularity: 'day' | 'minute'
+    isCustomRelativeRange: boolean
+    isCustomRelativeRangeView: boolean
+    isDateToNow: boolean
+    isFixedDate: any
+    isFixedRange: boolean
+    isFixedRangeWithTime: boolean
+    isRollingDateRange: boolean
+    isVisible: boolean
+    label: string | null
+    rangeDateFrom: Dayjs | null
+    rangeDateTo: Dayjs | null
+    view: DateFilterView
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dateFilterLogicActions {
+    applyRange: () => {
+        value: true
+    }
+    close: () => {
+        value: true
+    }
+    open: () => {
+        value: true
+    }
+    openCustomRelativeRange: () => {
+        value: true
+    }
+    openDateToNow: () => {
+        value: true
+    }
+    openFixedDate: () => {
+        value: true
+    }
+    openFixedRange: () => {
+        value: true
+    }
+    openFixedRangeWithTime: () => {
+        value: true
+    }
+    openJumpToTimestamp: () => {
+        value: true
+    }
+    setDate: (
+        dateFrom: string | null,
+        dateTo: string | null,
+        keepPopoverOpen?: any,
+        explicitDate?: boolean
+    ) => {
+        dateFrom: string | null
+        dateTo: string | null
+        explicitDate: boolean
+        keepPopoverOpen: any
+    }
+    setExplicitDate: (explicitDate: boolean) => {
+        explicitDate: boolean
+    }
+    setFixedRangeGranularity: (granularity: 'day' | 'minute') => {
+        granularity: 'day' | 'minute'
+    }
+    setRangeDateFrom: (range: Dayjs | null) => {
+        range: Dayjs | null
+    }
+    setRangeDateTo: (range: Dayjs | null) => {
+        range: Dayjs | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dateFilterLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        dateFrom: (arg: any) => any
+        dateTo: (arg: any) => any
+        dateOptions: (arg: any) => DateMappingOption[] | undefined
+        isFixedRange: (dateFrom: any, dateTo: any) => boolean
+        isFixedRangeWithTime: (
+            isFixedRange: boolean,
+            dateFromHasTimePrecision: boolean,
+            dateToHasTimePrecision: boolean
+        ) => boolean
+        isDateToNow: (dateFrom: any, dateTo: any, arg: any) => boolean
+        isFixedDate: (dateFrom: any, dateTo: any, arg: any) => any
+        isRollingDateRange: (
+            isFixedRange: boolean,
+            isDateToNow: boolean,
+            isFixedDate: any,
+            dateOptions: DateMappingOption[] | undefined,
+            dateFrom: any,
+            dateTo: any
+        ) => boolean
+        isCustomRelativeRange: (dateFrom: any, dateTo: any) => boolean
+        isCustomRelativeRangeView: (view: DateFilterView) => boolean
+        dateFromHasTimePrecision: (dateFrom: any) => boolean
+        dateToHasTimePrecision: (dateTo: any) => boolean
+        label: (
+            dateFrom: any,
+            dateTo: any,
+            isFixedRange: boolean,
+            isDateToNow: boolean,
+            isFixedDate: any,
+            isCustomRelativeRange: boolean,
+            dateOptions: DateMappingOption[] | undefined,
+            arg: any,
+            arg2: any,
+            arg3: any,
+            arg4: any,
+            arg5: any,
+            dateFromHasTimePrecision: boolean,
+            dateToHasTimePrecision: boolean
+        ) => string | null
+    }
+}
+
+export type dateFilterLogicType = MakeLogicType<
+    dateFilterLogicValues,
+    dateFilterLogicActions,
+    DateFilterLogicProps,
+    dateFilterLogicMeta
+>
+
 export const dateFilterLogic = kea<dateFilterLogicType>([
     path(['lib', 'components', 'DateFilter', 'DateFilterLogic']),
     props({} as DateFilterLogicProps),
@@ -150,7 +278,7 @@ export const dateFilterLogic = kea<dateFilterLogicType>([
         ],
         isFixedRangeWithTime: [
             (s) => [s.isFixedRange, s.dateFromHasTimePrecision, s.dateToHasTimePrecision],
-            (isFixedRange, dateFromHasTimePrecision, dateToHasTimePrecision) =>
+            (isFixedRange: boolean, dateFromHasTimePrecision: boolean, dateToHasTimePrecision: boolean) =>
                 isFixedRange && (dateFromHasTimePrecision || dateToHasTimePrecision),
         ],
         isDateToNow: [
@@ -164,7 +292,14 @@ export const dateFilterLogic = kea<dateFilterLogicType>([
         ],
         isRollingDateRange: [
             (s) => [s.isFixedRange, s.isDateToNow, s.isFixedDate, s.dateOptions, s.dateFrom, s.dateTo],
-            (isFixedRange, isDateToNow, isFixedDate, dateOptions, dateFrom, dateTo): boolean =>
+            (
+                isFixedRange: boolean,
+                isDateToNow: boolean,
+                isFixedDate,
+                dateOptions: DateMappingOption[] | undefined,
+                dateFrom,
+                dateTo
+            ): boolean =>
                 !isFixedRange &&
                 !isDateToNow &&
                 !isFixedDate &&
@@ -183,7 +318,10 @@ export const dateFilterLogic = kea<dateFilterLogicType>([
                 return isRelativeFromDate && isRelativeToDate && !!dateFrom && !!dateTo
             },
         ],
-        isCustomRelativeRangeView: [(s) => [s.view], (view): boolean => view === DateFilterView.CustomRelativeRange],
+        isCustomRelativeRangeView: [
+            (s) => [s.view],
+            (view: DateFilterView): boolean => view === DateFilterView.CustomRelativeRange,
+        ],
         dateFromHasTimePrecision: [(s) => [s.dateFrom], (dateFrom) => hasTimePrecision(dateFrom)],
         dateToHasTimePrecision: [(s) => [s.dateTo], (dateTo) => hasTimePrecision(dateTo)],
         label: [
@@ -206,18 +344,18 @@ export const dateFilterLogic = kea<dateFilterLogicType>([
             (
                 dateFrom,
                 dateTo,
-                isFixedRange,
-                isDateToNow,
+                isFixedRange: boolean,
+                isDateToNow: boolean,
                 isFixedDate,
-                isCustomRelativeRange,
-                dateOptions,
+                isCustomRelativeRange: boolean,
+                dateOptions: DateMappingOption[] | undefined,
                 isFixedDateMode,
                 placeholder,
                 allowTimePrecision,
                 showCustomRelativeRange,
                 allowSingleAndRange,
-                dateFromHasTimePrecision,
-                dateToHasTimePrecision
+                dateFromHasTimePrecision: boolean,
+                dateToHasTimePrecision: boolean
             ) => {
                 // Only render the "N days ago to M days ago" label when the consumer has opted into
                 // the custom-relative-range picker — other call sites (e.g. trends) may legitimately
diff --git a/frontend/src/lib/components/DateFilter/rollingDateRangeFilterLogic.ts b/frontend/src/lib/components/DateFilter/rollingDateRangeFilterLogic.ts
index d162b77c7b72..9d7d07872217 100644
--- a/frontend/src/lib/components/DateFilter/rollingDateRangeFilterLogic.ts
+++ b/frontend/src/lib/components/DateFilter/rollingDateRangeFilterLogic.ts
@@ -1,12 +1,10 @@
 import './RollingDateRangeFilter.scss'
 
-import { actions, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 
 import { Dayjs } from 'lib/dayjs'
 import { dateFilterToText } from 'lib/utils/dateFilters'
 
-import type { rollingDateRangeFilterLogicType } from './rollingDateRangeFilterLogicType'
-
 const dateOptionsMap = {
     y: 'years',
     q: 'quarters',
@@ -48,6 +46,55 @@ const dateOptionDefault = (dateFrom: Dayjs | string | null | undefined): DateOpt
     return 'days'
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface rollingDateRangeFilterLogicValues {
+    counter: number | null
+    dateOption: DateOption
+    formattedDate: string | null
+    isDateOptionsSelectorOpen: boolean
+    startOfDateRange: string | null
+    value: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface rollingDateRangeFilterLogicActions {
+    decreaseCounter: () => {
+        value: true
+    }
+    increaseCounter: () => {
+        value: true
+    }
+    select: () => {
+        value: true
+    }
+    setCounter: (counter: number | null | undefined) => {
+        counter: number | null | undefined
+    }
+    setDateOption: (option: DateOption) => {
+        option: DateOption
+    }
+    toggleDateOptionsSelector: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface rollingDateRangeFilterLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        value: (counter: number | null, dateOption: DateOption) => string
+        formattedDate: (value: string) => string | null
+        startOfDateRange: (value: string) => string | null
+    }
+}
+
+export type rollingDateRangeFilterLogicType = MakeLogicType<
+    rollingDateRangeFilterLogicValues,
+    rollingDateRangeFilterLogicActions,
+    RollingDateFilterLogicPropsType,
+    rollingDateRangeFilterLogicMeta
+>
+
 export const rollingDateRangeFilterLogic = kea<rollingDateRangeFilterLogicType>([
     path(['lib', 'components', 'DateFilter', 'RollingDateRangeFilterLogic']),
     props({} as RollingDateFilterLogicPropsType),
@@ -97,7 +144,7 @@ export const rollingDateRangeFilterLogic = kea<rollingDateRangeFilterLogicType>(
     selectors(() => ({
         value: [
             (s) => [s.counter, s.dateOption],
-            (counter, dateOption) => {
+            (counter: number | null, dateOption: DateOption) => {
                 if (!counter) {
                     return ''
                 }
diff --git a/frontend/src/lib/components/DefinitionPopover/definitionPopoverLogic.ts b/frontend/src/lib/components/DefinitionPopover/definitionPopoverLogic.ts
index dea1422a02ee..a992ab167a09 100644
--- a/frontend/src/lib/components/DefinitionPopover/definitionPopoverLogic.ts
+++ b/frontend/src/lib/components/DefinitionPopover/definitionPopoverLogic.ts
@@ -1,5 +1,5 @@
 import { deepEqual as equal } from 'fast-equals'
-import { actions, connect, events, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -20,7 +20,8 @@ import { ActionType, CohortType, EventDefinition, PropertyDefinition } from '~/t
 
 import { DataWarehouseTableForInsight } from 'products/data_warehouse/frontend/types'
 
-import type { definitionPopoverLogicType } from './definitionPopoverLogicType'
+import type { TaxonomicFilterValue } from '../TaxonomicFilter/types'
+import type { PropertyDefinitionType } from '../../../types'
 
 const IS_TEST_MODE = process.env.NODE_ENV === 'test'
 
@@ -42,6 +43,106 @@ export interface DefinitionPopoverLogicProps {
     openDetailInNewTab?: boolean
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface definitionPopoverLogicValues {
+    getPropertyDefinition: (s: TaxonomicFilterValue, type: PropertyDefinitionType, groupTypeIndex?: number) => PropertyDefinition | null; // propertyDefinitionsModel
+    currentProjectId: number | string; // teamLogic
+    definition: Partial<TaxonomicDefinitionTypes>;
+    definitionLoading: boolean;
+    dirty: boolean;
+    hasSentAs: any;
+    hideEdit: any;
+    hideView: any;
+    isAction: boolean;
+    isCohort: boolean;
+    isDataWarehouse: boolean;
+    isDataWarehousePersonProperty: boolean;
+    isEvent: boolean;
+    isProperty: any;
+    isViewable: boolean;
+    isVirtual: boolean | undefined;
+    localDefinition: Partial<TaxonomicDefinitionTypes>;
+    mediaPreviews: string[];
+    openDetailInNewTab: any;
+    resolvedDefinition: Partial<TaxonomicDefinitionTypes>;
+    singularType: string;
+    state: DefinitionPopoverState;
+    type: any;
+    viewFullDetailUrl: string | undefined;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface definitionPopoverLogicActions {
+    handleCancel: () => {
+        value: true;
+    };
+    handleSave: (_: any) => any;
+    handleSaveFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    handleSaveSuccess: (definition: Partial<TaxonomicDefinitionTypes>, payload?: any) => {
+        definition: Partial<TaxonomicDefinitionTypes>;
+        payload?: any;
+    };
+    recordHoverActivity: () => {
+        value: true;
+    };
+    setDefinition: (item: Partial<TaxonomicDefinitionTypes>) => {
+        isDataWarehouse: boolean;
+        item: Partial<TaxonomicDefinitionTypes>;
+        selectedItemMeta: Record<string, any> | null | undefined;
+    };
+    setDefinitionFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    setDefinitionSuccess: (definition: TaxonomicDefinitionTypes, payload?: {
+        isDataWarehouse: boolean;
+        item: Partial<TaxonomicDefinitionTypes>;
+        selectedItemMeta: Record<string, any> | null | undefined;
+    }) => {
+        definition: TaxonomicDefinitionTypes;
+        payload?: {
+            isDataWarehouse: boolean;
+            item: Partial<TaxonomicDefinitionTypes>;
+            selectedItemMeta: Record<string, any> | null | undefined;
+        };
+    };
+    setLocalDefinition: (item: Partial<TaxonomicDefinitionTypes>) => {
+        item: Partial<TaxonomicDefinitionTypes>;
+    };
+    setPopoverState: (state: DefinitionPopoverState) => {
+        state: DefinitionPopoverState;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface definitionPopoverLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        type: (arg: any) => any;
+        hideView: (arg: any) => any;
+        hideEdit: (arg: any) => any;
+        openDetailInNewTab: (arg: any) => any;
+        singularType: (type: any) => string;
+        mediaPreviews: (definition: Partial<TaxonomicDefinitionTypes>) => string[];
+        dirty: (state: DefinitionPopoverState, definition: Partial<TaxonomicDefinitionTypes>, localDefinition: Partial<TaxonomicDefinitionTypes>) => boolean;
+        isViewable: (type: any) => boolean;
+        isAction: (type: any) => boolean;
+        isEvent: (type: any) => boolean;
+        isProperty: (type: any) => any;
+        isVirtual: (definition: Partial<TaxonomicDefinitionTypes>) => boolean | undefined;
+        hasSentAs: (type: any, isProperty: any, isEvent: boolean, isVirtual: boolean | undefined) => any;
+        isCohort: (type: any) => boolean;
+        isDataWarehouse: (type: any) => boolean;
+        isDataWarehousePersonProperty: (type: any) => boolean;
+        resolvedDefinition: (definition: Partial<TaxonomicDefinitionTypes>, isProperty: any, type: any, getPropertyDefinition: (s: TaxonomicFilterValue, type: PropertyDefinitionType, groupTypeIndex?: number) => PropertyDefinition | null) => Partial<TaxonomicDefinitionTypes>;
+        viewFullDetailUrl: (resolvedDefinition: Partial<TaxonomicDefinitionTypes>, isAction: boolean, isEvent: boolean, isProperty: any, isCohort: boolean) => string | undefined;
+    };
+}
+
+export type definitionPopoverLogicType = MakeLogicType<definitionPopoverLogicValues, definitionPopoverLogicActions, DefinitionPopoverLogicProps, definitionPopoverLogicMeta>;
+
 export const definitionPopoverLogic = kea<definitionPopoverLogicType>([
     props({} as DefinitionPopoverLogicProps),
     path(['lib', 'components', 'DefinitionPanel', 'definitionPopoverLogic']),
@@ -170,11 +271,11 @@ export const definitionPopoverLogic = kea<definitionPopoverLogicType>([
         singularType: [(s) => [s.type], (type) => getSingularType(type)],
         mediaPreviews: [
             (s) => [s.definition],
-            (definition): string[] => (definition as EventDefinition)?.media_preview_urls ?? [],
+            (definition: Partial<TaxonomicDefinitionTypes>): string[] => (definition as EventDefinition)?.media_preview_urls ?? [],
         ],
         dirty: [
             (s) => [s.state, s.definition, s.localDefinition],
-            (state, definition, localDefinition) =>
+            (state: DefinitionPopoverState, definition: Partial<TaxonomicDefinitionTypes>, localDefinition: Partial<TaxonomicDefinitionTypes>) =>
                 state === DefinitionPopoverState.Edit && !equal(definition, localDefinition),
         ],
         isViewable: [
@@ -219,13 +320,13 @@ export const definitionPopoverLogic = kea<definitionPopoverLogicType>([
         ],
         isVirtual: [
             (s) => [s.definition],
-            (definition) => {
+            (definition: Partial<TaxonomicDefinitionTypes>) => {
                 return 'virtual' in definition && definition.virtual
             },
         ],
         hasSentAs: [
             (s) => [s.type, s.isProperty, s.isEvent, s.isVirtual],
-            (type, isProperty, isEvent, isVirtual) =>
+            (type, isProperty, isEvent: boolean, isVirtual: boolean | undefined) =>
                 isEvent || (isProperty && !isVirtual && type !== TaxonomicFilterGroupType.SessionProperties),
         ],
         isCohort: [(s) => [s.type], (type) => type === TaxonomicFilterGroupType.Cohorts],
@@ -236,7 +337,7 @@ export const definitionPopoverLogic = kea<definitionPopoverLogicType>([
         ],
         resolvedDefinition: [
             (s) => [s.definition, s.isProperty, s.type, s.getPropertyDefinition],
-            (definition, isProperty, type, getPropertyDefinition): Partial<TaxonomicDefinitionTypes> => {
+            (definition: Partial<TaxonomicDefinitionTypes>, isProperty, type, getPropertyDefinition: (s: TaxonomicFilterValue, type: PropertyDefinitionType, groupTypeIndex?: number) => PropertyDefinition | null): Partial<TaxonomicDefinitionTypes> => {
                 // Pinned/default property items are stored as { name } only. Hydrate them with the
                 // saved definition id recovered from propertyDefinitionsModel so View, Edit and Save
                 // all operate on a complete definition (and self-heal as the model loads) rather
@@ -258,7 +359,7 @@ export const definitionPopoverLogic = kea<definitionPopoverLogicType>([
         ],
         viewFullDetailUrl: [
             (s) => [s.resolvedDefinition, s.isAction, s.isEvent, s.isProperty, s.isCohort],
-            (resolvedDefinition, isAction, isEvent, isProperty, isCohort) => {
+            (resolvedDefinition: Partial<TaxonomicDefinitionTypes>, isAction: boolean, isEvent: boolean, isProperty, isCohort: boolean) => {
                 if (isAction) {
                     const id = (resolvedDefinition as ActionType).id
                     return id != null ? urls.action(id) : undefined
diff --git a/frontend/src/lib/components/DomainConnect/domainConnectLogic.ts b/frontend/src/lib/components/DomainConnect/domainConnectLogic.ts
index 3e3297ca7f98..a2a9f2caa801 100644
--- a/frontend/src/lib/components/DomainConnect/domainConnectLogic.ts
+++ b/frontend/src/lib/components/DomainConnect/domainConnectLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, key, listeners, path, props, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, key, listeners, path, props, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 
@@ -7,8 +7,6 @@ import { lemonToast } from 'lib/lemon-ui/LemonToast'
 
 import { DomainConnectProviderName } from '~/queries/schema/schema-general'
 
-import type { domainConnectLogicType } from './domainConnectLogicType'
-
 export interface DomainConnectProvider {
     endpoint: string
     name: DomainConnectProviderName
@@ -33,6 +31,62 @@ export interface DomainConnectLogicProps {
     proxyRecordId?: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface domainConnectLogicValues {
+    autoDetected: boolean
+    availableProviders: DomainConnectProvider[]
+    domainConnectInfo: any
+    domainConnectInfoLoading: boolean
+    hasAnyOption: boolean
+    providerName: DomainConnectProviderName | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface domainConnectLogicActions {
+    checkDomain: () => {
+        value: true
+    }
+    checkDomainFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    checkDomainSuccess: (
+        domainConnectInfo: DomainConnectInfo | null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        domainConnectInfo: DomainConnectInfo | null
+        payload?: {
+            value: true
+        }
+    }
+    openDomainConnect: (providerEndpoint?: string) => {
+        providerEndpoint: string | undefined
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface domainConnectLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        autoDetected: (domainConnectInfo: any) => boolean
+        providerName: (domainConnectInfo: any) => DomainConnectProviderName | null
+        availableProviders: (domainConnectInfo: any) => DomainConnectProvider[]
+        hasAnyOption: (autoDetected: boolean, availableProviders: DomainConnectProvider[]) => boolean
+    }
+}
+
+export type domainConnectLogicType = MakeLogicType<
+    domainConnectLogicValues,
+    domainConnectLogicActions,
+    DomainConnectLogicProps,
+    domainConnectLogicMeta
+>
+
 export const domainConnectLogic = kea<domainConnectLogicType>([
     path((key) => ['lib', 'components', 'DomainConnect', 'domainConnectLogic', key]),
     props({} as DomainConnectLogicProps),
diff --git a/frontend/src/lib/components/Errors/Frame/framesCodeSourceLogic.ts b/frontend/src/lib/components/Errors/Frame/framesCodeSourceLogic.ts
index 2df9c5a90419..af9aefe4ce4f 100644
--- a/frontend/src/lib/components/Errors/Frame/framesCodeSourceLogic.ts
+++ b/frontend/src/lib/components/Errors/Frame/framesCodeSourceLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { subscriptions } from 'kea-subscriptions'
 import { match } from 'ts-pattern'
 
@@ -9,14 +9,47 @@ import {
 
 import api from 'lib/api'
 
-import type { framesCodeSourceLogicType } from './framesCodeSourceLogicType'
 import { stackFrameLogic } from './stackFrameLogic'
+import type { KeyedStackFrameRecords } from './stackFrameLogic'
 
 export interface SourceData {
     url: string
     provider: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface framesCodeSourceLogicValues {
+    stackFrameRecords: KeyedStackFrameRecords // stackFrameLogic
+    frameSourceUrls: Record<string, SourceData | null>
+    getSourceDataForFrame: (rawId: string) => SourceData | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface framesCodeSourceLogicActions {
+    computeSourceUrls: () => {
+        value: true
+    }
+    setSourceData: (data: Record<string, SourceData | null>) => {
+        data: Record<string, SourceData | null>
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface framesCodeSourceLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        getSourceDataForFrame: (
+            frameSourceUrls: Record<string, SourceData | null>
+        ) => (rawId: string) => SourceData | null
+    }
+}
+
+export type framesCodeSourceLogicType = MakeLogicType<
+    framesCodeSourceLogicValues,
+    framesCodeSourceLogicActions,
+    Record<string, any>,
+    framesCodeSourceLogicMeta
+>
+
 export const framesCodeSourceLogic = kea<framesCodeSourceLogicType>([
     path(['components', 'Errors', 'framesCodeSourceLogic']),
 
diff --git a/frontend/src/lib/components/Errors/Frame/stackFrameLogic.ts b/frontend/src/lib/components/Errors/Frame/stackFrameLogic.ts
index 4f52e4ef6a46..a1272d49eca6 100644
--- a/frontend/src/lib/components/Errors/Frame/stackFrameLogic.ts
+++ b/frontend/src/lib/components/Errors/Frame/stackFrameLogic.ts
@@ -1,11 +1,10 @@
-import { actions, afterMount, kea, listeners, path } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, listeners, path } from 'kea'
 import { loaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
 import api from 'lib/api'
 
 import { ErrorTrackingStackFrame, ErrorTrackingStackFrameRecord, ErrorTrackingSymbolSet } from '../types'
-import type { stackFrameLogicType } from './stackFrameLogicType'
 
 export type KeyedStackFrameRecords = Record<ErrorTrackingStackFrameRecord['raw_id'], ErrorTrackingStackFrameRecord>
 
@@ -22,6 +21,60 @@ function mapStackFrameRecords(
     )
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface stackFrameLogicValues {
+    stackFrameRecords: KeyedStackFrameRecords
+    stackFrameRecordsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface stackFrameLogicActions {
+    loadForSymbolSet: (symbolSetId: ErrorTrackingSymbolSet['id']) => {
+        symbolSetId: string
+    }
+    loadForSymbolSetFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadForSymbolSetSuccess: (
+        stackFrameRecords: KeyedStackFrameRecords,
+        payload?: {
+            symbolSetId: string
+        }
+    ) => {
+        stackFrameRecords: KeyedStackFrameRecords
+        payload?: {
+            symbolSetId: string
+        }
+    }
+    loadFromRawIds: (rawIds: ErrorTrackingStackFrame['raw_id'][]) => {
+        rawIds: string[]
+    }
+    loadFromRawIdsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadFromRawIdsSuccess: (
+        stackFrameRecords: KeyedStackFrameRecords,
+        payload?: {
+            rawIds: string[]
+        }
+    ) => {
+        stackFrameRecords: KeyedStackFrameRecords
+        payload?: {
+            rawIds: string[]
+        }
+    }
+}
+
+export type stackFrameLogicType = MakeLogicType<stackFrameLogicValues, stackFrameLogicActions>
+
 export const stackFrameLogic = kea<stackFrameLogicType>([
     path(['components', 'Errors', 'stackFrameLogic']),
 
diff --git a/frontend/src/lib/components/Errors/errorPropertiesLogic.ts b/frontend/src/lib/components/Errors/errorPropertiesLogic.ts
index 2bffd49a619b..5a13cf079f39 100644
--- a/frontend/src/lib/components/Errors/errorPropertiesLogic.ts
+++ b/frontend/src/lib/components/Errors/errorPropertiesLogic.ts
@@ -1,4 +1,4 @@
-import { connect, kea, key, path, props, selectors } from 'kea'
+import { MakeLogicType, connect, kea, key, path, props, selectors } from 'kea'
 import { subscriptions } from 'kea-subscriptions'
 
 import {
@@ -20,14 +20,80 @@ import {
 import { dayjs } from 'lib/dayjs'
 import { preflightLogic } from 'lib/logic/preflightLogic'
 
-import type { errorPropertiesLogicType } from './errorPropertiesLogicType'
 import { KeyedStackFrameRecords, stackFrameLogic } from './Frame/stackFrameLogic'
+import type { ExceptionAttributes } from './types'
 
 export interface ErrorPropertiesLogicProps {
     properties?: ErrorEventProperties
     id: ErrorEventId
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface errorPropertiesLogicValues {
+    isCloudOrDev: boolean | undefined // preflightLogic
+    stackFrameRecords: KeyedStackFrameRecords // stackFrameLogic
+    stackFrameRecordsLoading: boolean // stackFrameLogic
+    additionalProperties: Record<string, unknown>
+    exceptionAttributes: ExceptionAttributes | null
+    exceptionList: ErrorTrackingException[]
+    exceptionType: string | null
+    fingerprintRecords: FingerprintRecordPart[]
+    frames: ErrorTrackingStackFrame[]
+    getExceptionFingerprint: (excId: string) => FingerprintRecordPart | undefined
+    getFrameFingerprint: (frameRawId: string) => FingerprintRecordPart | undefined
+    hasStacktrace: boolean
+    properties: Record<string, any>
+    recordingStatus: string | undefined
+    release: ErrorTrackingRelease | null | undefined
+    sessionId: string | undefined
+    uuid: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface errorPropertiesLogicActions {
+    loadFromRawIds: (rawIds: string[]) => {
+        rawIds: string[]
+    } // stackFrameLogic
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface errorPropertiesLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        properties: (arg: ErrorEventProperties) => Record<string, any>
+        exceptionAttributes: (properties: Record<string, any>) => ExceptionAttributes | null
+        exceptionList: (properties: Record<string, any>) => ErrorTrackingException[]
+        exceptionType: (exceptionList: ErrorTrackingException[]) => string | null
+        additionalProperties: (
+            properties: Record<string, any>,
+            isCloudOrDev: boolean | undefined
+        ) => Record<string, unknown>
+        fingerprintRecords: (properties: Record<string, any>) => FingerprintRecordPart[]
+        hasStacktrace: (exceptionList: ErrorTrackingException[]) => boolean
+        sessionId: (properties: Record<string, any>) => string | undefined
+        recordingStatus: (properties: Record<string, any>) => string | undefined
+        getExceptionFingerprint: (
+            fingerprintRecords: FingerprintRecordPart[]
+        ) => (excId: string) => FingerprintRecordPart | undefined
+        getFrameFingerprint: (
+            fingerprintRecords: FingerprintRecordPart[]
+        ) => (frameRawId: string) => FingerprintRecordPart | undefined
+        frames: (exceptionList: ErrorTrackingException[]) => ErrorTrackingStackFrame[]
+        uuid: (id: string) => string
+        release: (
+            frames: ErrorTrackingStackFrame[],
+            stackFrameRecords: KeyedStackFrameRecords
+        ) => ErrorTrackingRelease | null | undefined
+    }
+}
+
+export type errorPropertiesLogicType = MakeLogicType<
+    errorPropertiesLogicValues,
+    errorPropertiesLogicActions,
+    ErrorPropertiesLogicProps,
+    errorPropertiesLogicMeta
+>
+
 export const errorPropertiesLogic = kea<errorPropertiesLogicType>([
     path((key) => ['components', 'Errors', 'errorPropertiesLogic', key]),
     props({} as ErrorPropertiesLogicProps),
diff --git a/frontend/src/lib/components/EventPropertyTabs/eventPropertyFilteringLogic.ts b/frontend/src/lib/components/EventPropertyTabs/eventPropertyFilteringLogic.ts
index c79328e7fcaa..29717a7a1baf 100644
--- a/frontend/src/lib/components/EventPropertyTabs/eventPropertyFilteringLogic.ts
+++ b/frontend/src/lib/components/EventPropertyTabs/eventPropertyFilteringLogic.ts
@@ -1,11 +1,33 @@
-import { connect, kea, path, selectors } from 'kea'
+import { MakeLogicType, connect, kea, path, selectors } from 'kea'
 
 import { preflightLogic } from 'lib/logic/preflightLogic'
 import { userPreferencesLogic } from 'lib/logic/userPreferencesLogic'
 
 import { CLOUD_INTERNAL_POSTHOG_PROPERTY_KEYS, PROPERTY_KEYS } from '~/taxonomy/taxonomy'
 
-import type { eventPropertyFilteringLogicType } from './eventPropertyFilteringLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface eventPropertyFilteringLogicValues {
+    isCloudOrDev: boolean | undefined // preflightLogic
+    hidePostHogPropertiesInTable: boolean // userPreferencesLogic
+    filterProperties: (props: Record<string, any>) => Record<string, any>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface eventPropertyFilteringLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        filterProperties: (
+            hidePostHogPropertiesInTable: boolean,
+            isCloudOrDev: boolean | undefined
+        ) => (props: Record<string, any>) => Record<string, any>
+    }
+}
+
+export type eventPropertyFilteringLogicType = MakeLogicType<
+    eventPropertyFilteringLogicValues,
+    {},
+    Record<string, any>,
+    eventPropertyFilteringLogicMeta
+>
 
 export const eventPropertyFilteringLogic = kea<eventPropertyFilteringLogicType>([
     path(['lib', 'components', 'EventPropertyTabs', 'eventPropertyFilteringLogic']),
@@ -15,7 +37,7 @@ export const eventPropertyFilteringLogic = kea<eventPropertyFilteringLogicType>(
     selectors({
         filterProperties: [
             (s) => [s.hidePostHogPropertiesInTable, s.isCloudOrDev],
-            (hidePostHogPropertiesInTable, isCloudOrDev) => {
+            (hidePostHogPropertiesInTable: boolean, isCloudOrDev: boolean | undefined) => {
                 return (props: Record<string, any>) => {
                     if (!hidePostHogPropertiesInTable) {
                         return props
diff --git a/frontend/src/lib/components/ExportButton/exportsLogic.ts b/frontend/src/lib/components/ExportButton/exportsLogic.ts
index 03e8a9e93dab..f55bc329987f 100644
--- a/frontend/src/lib/components/ExportButton/exportsLogic.ts
+++ b/frontend/src/lib/components/ExportButton/exportsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 
@@ -16,8 +16,6 @@ import { cohortsModel } from '~/models/cohortsModel'
 import { AnyDataNode } from '~/queries/schema/schema-general'
 import { APIErrorType, CohortType, ExportContext, ExportedAssetType, ExporterFormat, LocalExportContext } from '~/types'
 
-import type { exportsLogicType } from './exportsLogicType'
-
 const POLL_DELAY_MS = 10000
 // Long-running formats (e.g. MP4 session-replay renders) can take 30+ minutes,
 // so polling every 10s produces unhelpful timeout noise. Back off when the
@@ -37,6 +35,119 @@ export const pickPollDelayMs = (pendingAssets: ExportedAssetType[]): number => {
 const isLocalExport = (context: ExportContext | undefined): context is LocalExportContext =>
     !!(context && 'localData' in context)
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface exportsLogicValues {
+    assetFormat: ExporterFormat | null
+    exports: ExportedAssetType[]
+    exportsLoading: boolean
+    freshUndownloadedExports: ExportedAssetType[]
+    hasReachedExportFullVideoLimit: boolean
+    pollingExports: ExportedAssetType[]
+    pollingExportsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface exportsLogicActions {
+    addFresh: (exportedAsset: ExportedAssetType) => {
+        exportedAsset: ExportedAssetType
+    }
+    checkExportStatus: (exportedAsset: ExportedAssetType) => {
+        exportedAsset: ExportedAssetType
+    }
+    createExport: ({ exportData }: any) => any
+    createExportFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    createExportSuccess: (
+        pollingExports: any[],
+        payload?: any
+    ) => {
+        pollingExports: any[]
+        payload?: any
+    }
+    createStaticCohort: (
+        name: string,
+        query: AnyDataNode
+    ) => {
+        name: string
+        query: AnyDataNode
+    }
+    loadExports: () => {
+        value: true
+    }
+    loadExportsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadExportsSuccess: (
+        exports: ExportedAssetType[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        exports: ExportedAssetType[]
+        payload?: {
+            value: true
+        }
+    }
+    pollExportStatus: (exportedAsset: ExportedAssetType) => {
+        exportedAsset: ExportedAssetType
+    }
+    removeFresh: (exportedAsset: ExportedAssetType) => {
+        exportedAsset: ExportedAssetType
+    }
+    setAssetFormat: (format: ExporterFormat | null) => {
+        format: ExporterFormat | null
+    }
+    setHasReachedExportFullVideoLimit: (hasReached: boolean) => {
+        hasReached: boolean
+    }
+    startExport: (exportData: TriggerExportProps) => {
+        exportData: TriggerExportProps
+    }
+    startHeatmapExport: (export_context: ExportContext) => {
+        export_context: ExportContext
+    }
+    startReplayExport: (
+        sessionRecordingId: string,
+        format?: ExporterFormat,
+        timestamp?: number,
+        duration?: number,
+        mode?: SessionRecordingPlayerMode,
+        options?: {
+            css_selector?: string
+            filename?: string
+            height?: number
+            skip_inactivity?: boolean
+            width?: number
+        }
+    ) => {
+        duration: number | undefined
+        format: ExporterFormat | undefined
+        mode: SessionRecordingPlayerMode | undefined
+        options:
+            | {
+                  css_selector?: string | undefined
+                  filename?: string | undefined
+                  height?: number | undefined
+                  skip_inactivity?: boolean | undefined
+                  width?: number | undefined
+              }
+            | undefined
+        sessionRecordingId: string
+        timestamp: number | undefined
+    }
+}
+
+export type exportsLogicType = MakeLogicType<exportsLogicValues, exportsLogicActions>
+
 export const exportsLogic = kea<exportsLogicType>([
     path(['scenes', 'navigation', 'sidepanel', 'exportsLogic']),
 
diff --git a/frontend/src/lib/components/FileSystem/ItemSelectModal/itemSelectModalLogic.tsx b/frontend/src/lib/components/FileSystem/ItemSelectModal/itemSelectModalLogic.tsx
index c304d4aa8a32..221128304bd5 100644
--- a/frontend/src/lib/components/FileSystem/ItemSelectModal/itemSelectModalLogic.tsx
+++ b/frontend/src/lib/components/FileSystem/ItemSelectModal/itemSelectModalLogic.tsx
@@ -1,5 +1,6 @@
-import { actions, connect, kea, path, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, path, reducers } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 
 import { lemonToast } from '@posthog/lemon-ui'
 
@@ -10,7 +11,100 @@ import { projectTreeDataLogic } from '~/layout/panel-layout/ProjectTree/projectT
 import { joinPath, splitPath } from '~/layout/panel-layout/ProjectTree/utils'
 import { FileSystemEntry } from '~/queries/schema/schema-general'
 
-import type { itemSelectModalLogicType } from './itemSelectModalLogicType'
+import type { FeatureFlagsSet } from '../../../logic/featureFlagLogic'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface itemSelectModalLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    shortcutData: FileSystemEntry[] // projectTreeDataLogic
+    form: {
+        item: TreeDataItem | null
+    }
+    formAllErrors: Record<string, any>
+    formChanged: boolean
+    formErrors: DeepPartialMap<
+        {
+            item: TreeDataItem | null
+        },
+        ValidationErrorType
+    >
+    formHasErrors: boolean
+    formManualErrors: Record<string, any>
+    formTouched: boolean
+    formTouches: Record<string, boolean>
+    formValidationErrors: DeepPartialMap<
+        {
+            item: TreeDataItem | null
+        },
+        ValidationErrorType
+    >
+    isFormSubmitting: boolean
+    isFormValid: boolean
+    isOpen: boolean
+    showFormErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface itemSelectModalLogicActions {
+    addShortcutItem: (item: FileSystemEntry) => {
+        item: FileSystemEntry
+    } // projectTreeDataLogic
+    closeItemSelectModal: () => {
+        value: true
+    }
+    openItemSelectModal: () => {
+        value: true
+    }
+    resetForm: (values?: { item: TreeDataItem | null }) => {
+        values?: {
+            item: TreeDataItem | null
+        }
+    }
+    setFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setFormValues: (
+        values: DeepPartial<{
+            item: TreeDataItem | null
+        }>
+    ) => {
+        values: DeepPartial<{
+            item: TreeDataItem | null
+        }>
+    }
+    submitForm: () => {
+        value: boolean
+    }
+    submitFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitFormRequest: (form: { item: TreeDataItem | null }) => {
+        form: {
+            item: TreeDataItem | null
+        }
+    }
+    submitFormSuccess: (form: { item: TreeDataItem | null }) => {
+        form: {
+            item: TreeDataItem | null
+        }
+    }
+    touchFormField: (key: string) => {
+        key: string
+    }
+}
+
+export type itemSelectModalLogicType = MakeLogicType<itemSelectModalLogicValues, itemSelectModalLogicActions>
 
 export const itemSelectModalLogic = kea<itemSelectModalLogicType>([
     path(['lib', 'components', 'FileSystem', 'ItemSelectModal', 'itemSelectModalLogic']),
diff --git a/frontend/src/lib/components/FileSystem/LinkTo/linkToLogic.tsx b/frontend/src/lib/components/FileSystem/LinkTo/linkToLogic.tsx
index 870f213a011d..b0e63cb7550c 100644
--- a/frontend/src/lib/components/FileSystem/LinkTo/linkToLogic.tsx
+++ b/frontend/src/lib/components/FileSystem/LinkTo/linkToLogic.tsx
@@ -1,5 +1,6 @@
-import { actions, connect, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 
 import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
 
@@ -9,7 +10,118 @@ import { projectTreeLogic } from '~/layout/panel-layout/ProjectTree/projectTreeL
 import { calculateMovePath, joinPath, splitPath } from '~/layout/panel-layout/ProjectTree/utils'
 import { FileSystemEntry } from '~/queries/schema/schema-general'
 
-import type { linkToLogicType } from './linkToLogicType'
+import type { ProjectTreeRef } from '../../../../types'
+import type { FeatureFlagsSet } from '../../../logic/featureFlagLogic'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface linkToLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    lastNewFolder: string | null // projectTreeDataLogic
+    projectTreeRef: ProjectTreeRef | null // projectTreeDataLogic
+    projectTreeRefEntry: FileSystemEntry | null // projectTreeDataLogic
+    form: {
+        folder: string | null
+    }
+    formAllErrors: Record<string, any>
+    formChanged: boolean
+    formErrors: DeepPartialMap<
+        {
+            folder: string | null
+        },
+        ValidationErrorType
+    >
+    formHasErrors: boolean
+    formManualErrors: Record<string, any>
+    formTouched: boolean
+    formTouches: Record<string, boolean>
+    formValidationErrors: DeepPartialMap<
+        {
+            folder: string | null
+        },
+        ValidationErrorType
+    >
+    isFormSubmitting: boolean
+    isFormValid: boolean
+    isOpen: boolean
+    linkingItems: FileSystemEntry[]
+    showFormErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface linkToLogicActions {
+    linkItem: (
+        oldPath: string,
+        newPath: string,
+        force: boolean,
+        projectTreeLogicKey: string
+    ) => {
+        force: boolean
+        newPath: string
+        oldPath: string
+        projectTreeLogicKey: string
+    } // projectTreeDataLogic
+    setLastNewFolder: (folder: string | null) => {
+        folder: string | null
+    } // projectTreeDataLogic
+    closeLinkToModal: () => {
+        value: true
+    }
+    closedLinkToModal: () => {
+        value: true
+    }
+    openLinkToModal: (items: FileSystemEntry[]) => {
+        items: FileSystemEntry[]
+    }
+    resetForm: (values?: { folder: string | null }) => {
+        values?: {
+            folder: string | null
+        }
+    }
+    setFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setFormValues: (
+        values: DeepPartial<{
+            folder: string | null
+        }>
+    ) => {
+        values: DeepPartial<{
+            folder: string | null
+        }>
+    }
+    submitForm: () => {
+        value: boolean
+    }
+    submitFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitFormRequest: (form: { folder: string | null }) => {
+        form: {
+            folder: string | null
+        }
+    }
+    submitFormSuccess: (form: { folder: string | null }) => {
+        form: {
+            folder: string | null
+        }
+    }
+    touchFormField: (key: string) => {
+        key: string
+    }
+}
+
+export type linkToLogicType = MakeLogicType<linkToLogicValues, linkToLogicActions>
 
 export const linkToLogic = kea<linkToLogicType>([
     path(['lib', 'components', 'LinkTo', 'linkToLogic']),
diff --git a/frontend/src/lib/components/FileSystem/MoveTo/moveToLogic.tsx b/frontend/src/lib/components/FileSystem/MoveTo/moveToLogic.tsx
index 19029cc4ddc9..f8b3bf788671 100644
--- a/frontend/src/lib/components/FileSystem/MoveTo/moveToLogic.tsx
+++ b/frontend/src/lib/components/FileSystem/MoveTo/moveToLogic.tsx
@@ -1,5 +1,6 @@
-import { actions, connect, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 
 import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
 
@@ -9,7 +10,118 @@ import { projectTreeLogic } from '~/layout/panel-layout/ProjectTree/projectTreeL
 import { calculateMovePath, joinPath, splitPath } from '~/layout/panel-layout/ProjectTree/utils'
 import { FileSystemEntry } from '~/queries/schema/schema-general'
 
-import type { moveToLogicType } from './moveToLogicType'
+import type { ProjectTreeRef } from '../../../../types'
+import type { FeatureFlagsSet } from '../../../logic/featureFlagLogic'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface moveToLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    lastNewFolder: string | null // projectTreeDataLogic
+    projectTreeRef: ProjectTreeRef | null // projectTreeDataLogic
+    projectTreeRefEntry: FileSystemEntry | null // projectTreeDataLogic
+    form: {
+        folder: string | null
+    }
+    formAllErrors: Record<string, any>
+    formChanged: boolean
+    formErrors: DeepPartialMap<
+        {
+            folder: string | null
+        },
+        ValidationErrorType
+    >
+    formHasErrors: boolean
+    formManualErrors: Record<string, any>
+    formTouched: boolean
+    formTouches: Record<string, boolean>
+    formValidationErrors: DeepPartialMap<
+        {
+            folder: string | null
+        },
+        ValidationErrorType
+    >
+    isFormSubmitting: boolean
+    isFormValid: boolean
+    isOpen: boolean
+    movingItems: FileSystemEntry[]
+    showFormErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface moveToLogicActions {
+    moveItem: (
+        item: FileSystemEntry,
+        newPath: string,
+        force: boolean,
+        projectTreeLogicKey: string
+    ) => {
+        force: boolean
+        item: FileSystemEntry
+        newPath: string
+        projectTreeLogicKey: string
+    } // projectTreeDataLogic
+    setLastNewFolder: (folder: string | null) => {
+        folder: string | null
+    } // projectTreeDataLogic
+    closeMoveToModal: () => {
+        value: true
+    }
+    closedMoveToModal: () => {
+        value: true
+    }
+    openMoveToModal: (items: FileSystemEntry[]) => {
+        items: FileSystemEntry[]
+    }
+    resetForm: (values?: { folder: string | null }) => {
+        values?: {
+            folder: string | null
+        }
+    }
+    setFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setFormValues: (
+        values: DeepPartial<{
+            folder: string | null
+        }>
+    ) => {
+        values: DeepPartial<{
+            folder: string | null
+        }>
+    }
+    submitForm: () => {
+        value: boolean
+    }
+    submitFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitFormRequest: (form: { folder: string | null }) => {
+        form: {
+            folder: string | null
+        }
+    }
+    submitFormSuccess: (form: { folder: string | null }) => {
+        form: {
+            folder: string | null
+        }
+    }
+    touchFormField: (key: string) => {
+        key: string
+    }
+}
+
+export type moveToLogicType = MakeLogicType<moveToLogicValues, moveToLogicActions>
 
 export const moveToLogic = kea<moveToLogicType>([
     path(['lib', 'components', 'MoveTo', 'moveToLogic']),
diff --git a/frontend/src/lib/components/HTMLElementsDisplay/htmlElementsDisplayLogic.ts b/frontend/src/lib/components/HTMLElementsDisplay/htmlElementsDisplayLogic.ts
index 5318d3689016..2b600957ef79 100644
--- a/frontend/src/lib/components/HTMLElementsDisplay/htmlElementsDisplayLogic.ts
+++ b/frontend/src/lib/components/HTMLElementsDisplay/htmlElementsDisplayLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, key, path, props, propsChanged, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, key, path, props, propsChanged, reducers, selectors } from 'kea'
 import { subscriptions } from 'kea-subscriptions'
 
 import {
@@ -10,8 +10,6 @@ import { objectsEqual } from 'lib/utils/objects'
 
 import { ElementType } from '~/types'
 
-import type { htmlElementsDisplayLogicType } from './htmlElementsDisplayLogicType'
-
 export interface HtmlElementDisplayLogicProps {
     checkUniqueness: boolean
     onChange?: (selector: string, isUnique?: boolean) => void
@@ -25,6 +23,56 @@ export const elementsChain = (providedElements: ElementType[] | undefined): Elem
     return safeElements.reverse()
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface htmlElementsDisplayLogicValues {
+    chosenSelector: string
+    chosenSelectorMatchCount: number | null
+    elements: ElementType[]
+    elementsToShowDepth: number
+    messageStatus: 'info' | 'success' | 'warning'
+    parsedElements: ElementType[]
+    parsedSelectors: Record<number, ParsedCSSSelector>
+    parsedSelectorsRaw: Record<number, ParsedCSSSelector>
+    visibleElements: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface htmlElementsDisplayLogicActions {
+    setElements: (providedElements: ElementType[]) => {
+        providedElements: ElementType[]
+    }
+    setParsedSelectors: (selectors: Record<number, ParsedCSSSelector>) => {
+        selectors: Record<number, ParsedCSSSelector>
+    }
+    showAdditionalElements: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface htmlElementsDisplayLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        parsedSelectors: (
+            parsedSelectorsRaw: Record<number, ParsedCSSSelector>,
+            arg: any,
+            elements: ElementType[]
+        ) => Record<number, ParsedCSSSelector>
+        parsedElements: (elements: ElementType[], visibleElements: number) => ElementType[]
+        elementsToShowDepth: (elements: ElementType[], visibleElements: number) => number
+        chosenSelector: (parsedSelectors: Record<number, ParsedCSSSelector>) => string
+        chosenSelectorMatchCount: (chosenSelector: string, arg: any) => number | null
+        messageStatus: (chosenSelectorMatchCount: number | null) => 'info' | 'success' | 'warning'
+    }
+}
+
+export type htmlElementsDisplayLogicType = MakeLogicType<
+    htmlElementsDisplayLogicValues,
+    htmlElementsDisplayLogicActions,
+    HtmlElementDisplayLogicProps,
+    htmlElementsDisplayLogicMeta
+>
+
 export const htmlElementsDisplayLogic = kea<htmlElementsDisplayLogicType>([
     path(['lib', 'components', 'HtmlElementsDisplay', 'htmlElementsDisplayLogic']),
     props({ checkUniqueness: true } as HtmlElementDisplayLogicProps),
@@ -54,14 +102,18 @@ export const htmlElementsDisplayLogic = kea<htmlElementsDisplayLogicType>([
         // each element in the chain has a parsed selector it uses to track which things are selected
         parsedSelectors: [
             (s) => [s.parsedSelectorsRaw, (_, props) => props.startingSelector, s.elements],
-            (parsedSelectorsRaw, startingSelector, providedElements): Record<number, ParsedCSSSelector> =>
+            (
+                parsedSelectorsRaw: Record<number, ParsedCSSSelector>,
+                startingSelector,
+                providedElements: ElementType[]
+            ): Record<number, ParsedCSSSelector> =>
                 startingSelector && Object.keys(parsedSelectorsRaw).length === 0
                     ? preselect(providedElements, startingSelector)
                     : parsedSelectorsRaw,
         ],
         parsedElements: [
             (s) => [s.elements, s.visibleElements],
-            (elements, visibleElements) => {
+            (elements: ElementType[], visibleElements: number) => {
                 return elements.slice(Math.max(elements.length - visibleElements, 0))
             },
         ],
@@ -74,7 +126,7 @@ export const htmlElementsDisplayLogic = kea<htmlElementsDisplayLogicType>([
         // contains the selector string built from the parsed selectors
         chosenSelector: [
             (s) => [s.parsedSelectors],
-            (parsedSelectors): string => {
+            (parsedSelectors: Record<number, ParsedCSSSelector>): string => {
                 let lastKey = -2
                 let builtSelector = ''
 
@@ -102,7 +154,7 @@ export const htmlElementsDisplayLogic = kea<htmlElementsDisplayLogicType>([
         ],
         chosenSelectorMatchCount: [
             (s) => [s.chosenSelector, (_, props) => props.checkUniqueness],
-            (chosenSelector, checkUniqueness): number | null => {
+            (chosenSelector: string, checkUniqueness): number | null => {
                 let selectorMatchCount: number | null = null
                 if (checkUniqueness && chosenSelector !== 'no selectors chosen') {
                     try {
@@ -117,7 +169,7 @@ export const htmlElementsDisplayLogic = kea<htmlElementsDisplayLogicType>([
         ],
         messageStatus: [
             (s) => [s.chosenSelectorMatchCount],
-            (chosenSelectorMatchCount) => {
+            (chosenSelectorMatchCount: number | null) => {
                 return chosenSelectorMatchCount === null
                     ? 'info'
                     : chosenSelectorMatchCount === 1
diff --git a/frontend/src/lib/components/HedgehogMode/hedgehogModeLogic.ts b/frontend/src/lib/components/HedgehogMode/hedgehogModeLogic.ts
index 7316a94960db..6a6d02a99903 100644
--- a/frontend/src/lib/components/HedgehogMode/hedgehogModeLogic.ts
+++ b/frontend/src/lib/components/HedgehogMode/hedgehogModeLogic.ts
@@ -1,4 +1,15 @@
-import { actions, afterMount, beforeUnmount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    afterMount,
+    beforeUnmount,
+    connect,
+    kea,
+    listeners,
+    path,
+    reducers,
+    selectors,
+} from 'kea'
 import { loaders } from 'kea-loaders'
 import { subscriptions } from 'kea-subscriptions'
 import posthog from 'posthog-js'
@@ -11,10 +22,106 @@ import { toolbarConfigLogic } from '~/toolbar/toolbarConfigLogic'
 import { toolbarFetch } from '~/toolbar/toolbarFetch'
 import { HedgehogConfig, MinimalHedgehogConfig } from '~/types'
 
+import type { OrganizationMemberType, UserType } from '../../../types'
 import { sanitizeHedgehogConfig } from './hedgehog-mode-utils'
-import type { hedgehogModeLogicType } from './hedgehogModeLogicType'
 import { HedgehogModeInterface } from './types'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hedgehogModeLogicValues {
+    members: OrganizationMemberType[] | null // membersLogic
+    user: UserType | null // userLogic
+    hedgehogConfig: HedgehogConfig
+    hedgehogMode: HedgehogModeInterface | null
+    hedgehogModeEnabled: boolean
+    minimalHedgehogConfig: MinimalHedgehogConfig
+    remoteConfig: Partial<HedgehogConfig> | null
+    remoteConfigLoading: boolean
+    remoteConfigUpdateDisabled: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hedgehogModeLogicActions {
+    ensureAllMembersLoaded: () => {
+        value: true
+    } // membersLogic
+    loadRemoteConfig: () => {
+        value: true
+    }
+    loadRemoteConfigFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRemoteConfigSuccess: (
+        remoteConfig: Partial<HedgehogConfig> | null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        remoteConfig: Partial<HedgehogConfig> | null
+        payload?: {
+            value: true
+        }
+    }
+    setHedgehogMode: (hedgeHogMode: HedgehogModeInterface) => {
+        hedgeHogMode: HedgehogModeInterface
+    }
+    setHedgehogModeEnabled: (enabled: boolean) => {
+        enabled: boolean
+    }
+    setRemoteConfigUpdateDisabled: (disabled: boolean) => {
+        disabled: boolean
+    }
+    syncFromState: () => {
+        value: true
+    }
+    syncGame: () => {
+        value: true
+    }
+    toggleHedgehogMode: () => {
+        value: true
+    }
+    updateRemoteConfig: (config: Partial<HedgehogConfig>) => {
+        config: Partial<HedgehogConfig>
+    }
+    updateRemoteConfigFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateRemoteConfigSuccess: (
+        remoteConfig: Partial<HedgehogConfig> | null,
+        payload?: {
+            config: Partial<HedgehogConfig>
+        }
+    ) => {
+        remoteConfig: Partial<HedgehogConfig> | null
+        payload?: {
+            config: Partial<HedgehogConfig>
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hedgehogModeLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        hedgehogConfig: (remoteConfig: Partial<HedgehogConfig> | null) => HedgehogConfig
+        hedgehogModeEnabled: (hedgehogConfig: HedgehogConfig) => boolean
+        minimalHedgehogConfig: (hedgehogConfig: HedgehogConfig) => MinimalHedgehogConfig
+    }
+}
+
+export type hedgehogModeLogicType = MakeLogicType<
+    hedgehogModeLogicValues,
+    hedgehogModeLogicActions,
+    Record<string, any>,
+    hedgehogModeLogicMeta
+>
+
 export const hedgehogModeLogic = kea<hedgehogModeLogicType>([
     path(['hedgehog', 'hedgehogModeLogic']),
     connect({
@@ -106,7 +213,7 @@ export const hedgehogModeLogic = kea<hedgehogModeLogicType>([
     selectors({
         hedgehogConfig: [
             (s) => [s.remoteConfig],
-            (remoteConfig): HedgehogConfig => {
+            (remoteConfig: Partial<HedgehogConfig> | null): HedgehogConfig => {
                 return sanitizeHedgehogConfig({
                     ...remoteConfig,
                 })
@@ -115,14 +222,14 @@ export const hedgehogModeLogic = kea<hedgehogModeLogicType>([
 
         hedgehogModeEnabled: [
             (s) => [s.hedgehogConfig],
-            (hedgehogConfig): boolean => {
+            (hedgehogConfig: HedgehogConfig): boolean => {
                 return !!hedgehogConfig.enabled
             },
         ],
 
         minimalHedgehogConfig: [
             (s) => [s.hedgehogConfig],
-            (hedgehogConfig): MinimalHedgehogConfig => {
+            (hedgehogConfig: HedgehogConfig): MinimalHedgehogConfig => {
                 const forcedHedeghogProfile: MinimalHedgehogConfig = {
                     use_as_profile: true,
                     color: hedgehogConfig?.actor_options?.color,
diff --git a/frontend/src/lib/components/HelpMenu/healthSummaryLogic.tsx b/frontend/src/lib/components/HelpMenu/healthSummaryLogic.tsx
index ea9b0b08523b..dfc4ebb14f11 100644
--- a/frontend/src/lib/components/HelpMenu/healthSummaryLogic.tsx
+++ b/frontend/src/lib/components/HelpMenu/healthSummaryLogic.tsx
@@ -1,14 +1,57 @@
-import { afterMount, connect, kea, listeners, path, selectors } from 'kea'
+import { MakeLogicType, afterMount, connect, kea, listeners, path, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
 import type { HealthIssueSummary } from 'scenes/health/types'
 import { teamLogic } from 'scenes/teamLogic'
 
-import type { healthSummaryLogicType } from './healthSummaryLogicType'
-
 const REFRESH_INTERVAL = 60 * 1000 * 5
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface healthSummaryLogicValues {
+    currentTeamIdStrict: number | string // teamLogic
+    criticalCount: number
+    healthSummary: HealthIssueSummary | null
+    healthSummaryLoading: boolean
+    totalIssues: number
+    warningCount: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface healthSummaryLogicActions {
+    loadHealthSummary: () => any
+    loadHealthSummaryFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadHealthSummarySuccess: (
+        healthSummary: HealthIssueSummary | null,
+        payload?: any
+    ) => {
+        healthSummary: HealthIssueSummary | null
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface healthSummaryLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        totalIssues: (healthSummary: HealthIssueSummary | null) => number
+        criticalCount: (healthSummary: HealthIssueSummary | null) => number
+        warningCount: (healthSummary: HealthIssueSummary | null) => number
+    }
+}
+
+export type healthSummaryLogicType = MakeLogicType<
+    healthSummaryLogicValues,
+    healthSummaryLogicActions,
+    Record<string, any>,
+    healthSummaryLogicMeta
+>
+
 export const healthSummaryLogic = kea<healthSummaryLogicType>([
     path(['lib', 'components', 'HelpMenu', 'healthSummaryLogic']),
     connect(() => ({ values: [teamLogic, ['currentTeamIdStrict']] })),
diff --git a/frontend/src/lib/components/HelpMenu/helpMenuLogic.tsx b/frontend/src/lib/components/HelpMenu/helpMenuLogic.tsx
index fef45ffea20f..6d963899e8fb 100644
--- a/frontend/src/lib/components/HelpMenu/helpMenuLogic.tsx
+++ b/frontend/src/lib/components/HelpMenu/helpMenuLogic.tsx
@@ -1,10 +1,46 @@
-import { actions, connect, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, path, reducers, selectors } from 'kea'
 
 import { healthSummaryLogic } from './healthSummaryLogic'
-import type { helpMenuLogicType } from './helpMenuLogicType'
 
 export type HelpBadgeStatus = 'danger' | 'warning' | 'success'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface helpMenuLogicValues {
+    criticalCount: number // healthSummaryLogic
+    totalIssues: number // healthSummaryLogic
+    warningCount: number // healthSummaryLogic
+    hasHealthIssue: boolean
+    isHelpMenuOpen: boolean
+    triggerBadgeContent: string
+    triggerBadgeStatus: HelpBadgeStatus
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface helpMenuLogicActions {
+    setHelpMenuOpen: (isOpen: boolean) => {
+        isOpen: boolean
+    }
+    toggleHelpMenu: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface helpMenuLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        hasHealthIssue: (totalIssues: number) => boolean
+        triggerBadgeContent: (hasHealthIssue: boolean) => string
+        triggerBadgeStatus: (hasHealthIssue: boolean, criticalCount: number, warningCount: number) => HelpBadgeStatus
+    }
+}
+
+export type helpMenuLogicType = MakeLogicType<
+    helpMenuLogicValues,
+    helpMenuLogicActions,
+    Record<string, any>,
+    helpMenuLogicMeta
+>
+
 export const helpMenuLogic = kea<helpMenuLogicType>([
     path(['lib', 'components', 'HelpMenu', 'helpMenuLogic']),
     connect(() => ({
@@ -24,11 +60,14 @@ export const helpMenuLogic = kea<helpMenuLogicType>([
         ],
     }),
     selectors({
-        hasHealthIssue: [(s) => [s.totalIssues], (totalIssues): boolean => totalIssues > 0],
-        triggerBadgeContent: [(s) => [s.hasHealthIssue], (hasHealthIssue): string => (hasHealthIssue ? '!' : '')],
+        hasHealthIssue: [(s) => [s.totalIssues], (totalIssues: number): boolean => totalIssues > 0],
+        triggerBadgeContent: [
+            (s) => [s.hasHealthIssue],
+            (hasHealthIssue: boolean): string => (hasHealthIssue ? '!' : ''),
+        ],
         triggerBadgeStatus: [
             (s) => [s.hasHealthIssue, s.criticalCount, s.warningCount],
-            (hasHealthIssue, criticalCount, warningCount): HelpBadgeStatus => {
+            (hasHealthIssue: boolean, criticalCount: number, warningCount: number): HelpBadgeStatus => {
                 if (!hasHealthIssue) {
                     return 'success'
                 }
diff --git a/frontend/src/lib/components/HelpMenu/incidentStatusLogic.tsx b/frontend/src/lib/components/HelpMenu/incidentStatusLogic.tsx
index 3956efbb17ae..d8ccc5707c99 100644
--- a/frontend/src/lib/components/HelpMenu/incidentStatusLogic.tsx
+++ b/frontend/src/lib/components/HelpMenu/incidentStatusLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
@@ -8,8 +8,9 @@ import { preflightLogic } from 'lib/logic/preflightLogic'
 
 import { Region } from '~/types'
 
+import type { PreflightStatus } from '../../../types'
+import type { FakeStatusOverride } from '../Superpowers/superpowersLogic'
 import { NormalizedStatus, STATUS_PAGE_BASE, setIncidentStatus } from './incidentStatus'
-import type { incidentStatusLogicType } from './incidentStatusLogicType'
 
 // Raw status page API types
 export type ComponentStatus = 'operational' | 'degraded_performance' | 'partial_outage' | 'full_outage'
@@ -206,6 +207,69 @@ function getAiIncidentAlerts(summary: Summary | null, relevantGroupName: string
     }, [])
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface incidentStatusLogicValues {
+    preflight: PreflightStatus | null // preflightLogic
+    fakeStatusOverride: FakeStatusOverride // superpowersLogic
+    superpowersEnabled: boolean | undefined // superpowersLogic
+    aiIncidentAlerts: ComponentIncidentAlert[]
+    rawStatus: NormalizedStatus
+    relevantGroupName: string | null
+    status: NormalizedStatus
+    statusDescription: string | null
+    statusPageUrl: string
+    summary: Summary | null
+    summaryLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface incidentStatusLogicActions {
+    loadSummary: () => any
+    loadSummaryFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSummarySuccess: (
+        summary: Summary | null,
+        payload?: any
+    ) => {
+        summary: Summary | null
+        payload?: any
+    }
+    setPageVisibility: (visible: boolean) => {
+        visible: boolean
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface incidentStatusLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        relevantGroupName: (preflight: PreflightStatus | null) => string | null
+        rawStatus: (summary: Summary | null, relevantGroupName: string | null) => NormalizedStatus
+        status: (
+            rawStatus: NormalizedStatus,
+            fakeStatusOverride: FakeStatusOverride,
+            superpowersEnabled: boolean | undefined
+        ) => NormalizedStatus
+        aiIncidentAlerts: (summary: Summary | null, relevantGroupName: string | null) => ComponentIncidentAlert[]
+        statusDescription: (
+            summary: Summary | null,
+            status: NormalizedStatus,
+            relevantGroupName: string | null
+        ) => string | null
+    }
+}
+
+export type incidentStatusLogicType = MakeLogicType<
+    incidentStatusLogicValues,
+    incidentStatusLogicActions,
+    Record<string, any>,
+    incidentStatusLogicMeta
+>
+
 export const incidentStatusLogic = kea<incidentStatusLogicType>([
     path(['lib', 'components', 'HelpMenu', 'incidentStatusLogic']),
 
@@ -254,11 +318,12 @@ export const incidentStatusLogic = kea<incidentStatusLogicType>([
         statusPageUrl: [() => [], (): string => getStatusPageUrl()],
         relevantGroupName: [
             (s) => [s.preflight],
-            (preflight): string | null => getRelevantGroupName(preflight?.region),
+            (preflight: null | import('~/types').PreflightStatus): string | null =>
+                getRelevantGroupName(preflight?.region),
         ],
         rawStatus: [
             (s) => [s.summary, s.relevantGroupName],
-            (summary: Summary | null, relevantGroupName): NormalizedStatus => {
+            (summary: Summary | null, relevantGroupName: string | null): NormalizedStatus => {
                 if (!summary) {
                     return 'operational'
                 }
@@ -267,7 +332,11 @@ export const incidentStatusLogic = kea<incidentStatusLogicType>([
         ],
         status: [
             (s) => [s.rawStatus, s.fakeStatusOverride, s.superpowersEnabled],
-            (rawStatus, fakeStatusOverride, superpowersEnabled): NormalizedStatus => {
+            (
+                rawStatus: NormalizedStatus,
+                fakeStatusOverride: import('lib/components/Superpowers/superpowersLogic').FakeStatusOverride,
+                superpowersEnabled: boolean | undefined
+            ): NormalizedStatus => {
                 if (superpowersEnabled && fakeStatusOverride !== 'none') {
                     return fakeStatusOverride as NormalizedStatus
                 }
@@ -276,12 +345,12 @@ export const incidentStatusLogic = kea<incidentStatusLogicType>([
         ],
         aiIncidentAlerts: [
             (s) => [s.summary, s.relevantGroupName],
-            (summary: Summary | null, relevantGroupName): ComponentIncidentAlert[] =>
+            (summary: Summary | null, relevantGroupName: string | null): ComponentIncidentAlert[] =>
                 getAiIncidentAlerts(summary, relevantGroupName),
         ],
         statusDescription: [
             (s) => [s.summary, s.status, s.relevantGroupName],
-            (summary, status, relevantGroupName): string | null => {
+            (summary: Summary | null, status: NormalizedStatus, relevantGroupName: string | null): string | null => {
                 if (!summary) {
                     return null
                 }
diff --git a/frontend/src/lib/components/HelpMenu/posthogStatusLogic.tsx b/frontend/src/lib/components/HelpMenu/posthogStatusLogic.tsx
index 581f41c9ea4e..34889c496476 100644
--- a/frontend/src/lib/components/HelpMenu/posthogStatusLogic.tsx
+++ b/frontend/src/lib/components/HelpMenu/posthogStatusLogic.tsx
@@ -1,14 +1,51 @@
-import { connect, kea, path, selectors } from 'kea'
+import { MakeLogicType, connect, kea, path, selectors } from 'kea'
 
 import { superpowersLogic } from 'lib/components/Superpowers/superpowersLogic'
 import { capitalizeFirstLetter } from 'lib/utils/strings'
 
+import type { FakeStatusOverride } from '../Superpowers/superpowersLogic'
+import type { NormalizedStatus } from './incidentStatus'
 import { incidentStatusLogic } from './incidentStatusLogic'
-import type { posthogStatusLogicType } from './posthogStatusLogicType'
 
 export type PostHogStatusType = 'operational' | 'degraded_performance' | 'partial_outage' | 'major_outage'
 export type PostHogStatusBadgeStatus = 'success' | 'warning' | 'danger'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface posthogStatusLogicValues {
+    status: NormalizedStatus // incidentStatusLogic
+    statusDescription: string | null // incidentStatusLogic
+    statusPageUrl: string // incidentStatusLogic
+    fakeStatusOverride: FakeStatusOverride // superpowersLogic
+    superpowersEnabled: boolean | undefined // superpowersLogic
+    isFakeStatus: boolean
+    postHogStatus: PostHogStatusType
+    postHogStatusBadgeContent: string
+    postHogStatusBadgeStatus: PostHogStatusBadgeStatus
+    postHogStatusTooltip: string | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface posthogStatusLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        postHogStatus: (status: NormalizedStatus) => PostHogStatusType
+        isFakeStatus: (superpowersEnabled: boolean | undefined, fakeStatusOverride: FakeStatusOverride) => boolean
+        postHogStatusTooltip: (
+            statusDescription: string | null,
+            isFakeStatus: boolean,
+            postHogStatus: PostHogStatusType
+        ) => string | null
+        postHogStatusBadgeContent: (postHogStatus: PostHogStatusType) => string
+        postHogStatusBadgeStatus: (postHogStatus: PostHogStatusType) => PostHogStatusBadgeStatus
+    }
+}
+
+export type posthogStatusLogicType = MakeLogicType<
+    posthogStatusLogicValues,
+    {},
+    Record<string, any>,
+    posthogStatusLogicMeta
+>
+
 export const posthogStatusLogic = kea<posthogStatusLogicType>([
     path(['lib', 'components', 'HelpMenu', 'posthogStatusLogic']),
     connect({
@@ -20,14 +57,24 @@ export const posthogStatusLogic = kea<posthogStatusLogicType>([
         ],
     }),
     selectors({
-        postHogStatus: [(s) => [s.status], (status): PostHogStatusType => status],
+        postHogStatus: [
+            (s) => [s.status],
+            (status: import('./incidentStatus').NormalizedStatus): PostHogStatusType => status,
+        ],
         isFakeStatus: [
             (s) => [s.superpowersEnabled, s.fakeStatusOverride],
-            (superpowersEnabled, fakeStatusOverride): boolean => !!superpowersEnabled && fakeStatusOverride !== 'none',
+            (
+                superpowersEnabled: boolean | undefined,
+                fakeStatusOverride: import('lib/components/Superpowers/superpowersLogic').FakeStatusOverride
+            ): boolean => !!superpowersEnabled && fakeStatusOverride !== 'none',
         ],
         postHogStatusTooltip: [
             (s) => [s.statusDescription, s.isFakeStatus, s.postHogStatus],
-            (statusDescription, isFakeStatus, postHogStatus): string | null => {
+            (
+                statusDescription: string | null,
+                isFakeStatus: boolean,
+                postHogStatus: PostHogStatusType
+            ): string | null => {
                 if (isFakeStatus) {
                     return `[DRILL] ${capitalizeFirstLetter(postHogStatus.replace(/_/g, ' '))}`
                 }
@@ -36,11 +83,11 @@ export const posthogStatusLogic = kea<posthogStatusLogicType>([
         ],
         postHogStatusBadgeContent: [
             (s) => [s.postHogStatus],
-            (postHogStatus): string => (postHogStatus !== 'operational' ? '!' : '✓'),
+            (postHogStatus: PostHogStatusType): string => (postHogStatus !== 'operational' ? '!' : '✓'),
         ],
         postHogStatusBadgeStatus: [
             (s) => [s.postHogStatus],
-            (postHogStatus): PostHogStatusBadgeStatus => {
+            (postHogStatus: PostHogStatusType): PostHogStatusBadgeStatus => {
                 if (postHogStatus.includes('outage')) {
                     return 'danger'
                 }
diff --git a/frontend/src/lib/components/IframedToolbarBrowser/iframedToolbarBrowserLogic.ts b/frontend/src/lib/components/IframedToolbarBrowser/iframedToolbarBrowserLogic.ts
index 47f2dc258b35..1686f2d1b7cb 100644
--- a/frontend/src/lib/components/IframedToolbarBrowser/iframedToolbarBrowserLogic.ts
+++ b/frontend/src/lib/components/IframedToolbarBrowser/iframedToolbarBrowserLogic.ts
@@ -1,4 +1,16 @@
-import { actions, afterMount, beforeUnmount, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    afterMount,
+    beforeUnmount,
+    connect,
+    kea,
+    listeners,
+    path,
+    props,
+    reducers,
+    selectors,
+} from 'kea'
 import posthog from 'posthog-js'
 import { RefObject } from 'react'
 
@@ -18,7 +30,9 @@ import { teamLogic } from 'scenes/teamLogic'
 
 import { ToolbarUserIntent } from '~/types'
 
-import type { iframedToolbarBrowserLogicType } from './iframedToolbarBrowserLogicType'
+import type { TeamPublicType, TeamType } from '../../../types'
+import type { KeyedAppUrl } from '../AuthorizedUrlList/authorizedUrlListLogic'
+import type { HeatmapFilters } from '../heatmaps/types'
 
 export type IframedToolbarBrowserLogicProps = {
     iframeRef: RefObject<HTMLIFrameElement | null>
@@ -45,6 +59,125 @@ export const UserIntentVerb: {
     'preview-product-tour': 'preview the product tour',
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface iframedToolbarBrowserLogicValues {
+    checkUrlIsAuthorized: (url: string) => boolean // authorizedUrlListLogic
+    urlsKeyed: KeyedAppUrl[] // authorizedUrlListLogic
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    browserUrl: string | null
+    commonFilters: CommonFilters
+    currentFullUrl: string | null
+    currentPath: string
+    heatmapColorPalette: string | null
+    heatmapFilters: HeatmapFilters
+    heatmapFixedPositionMode: HeatmapFixedPositionMode
+    iframeBanner: IFrameBanner | null
+    iframeWidth: number | null
+    initialPath: string
+    isBrowserUrlAuthorized: boolean
+    isProposedBrowserUrlAuthorized: boolean
+    loading: boolean
+    proposedBrowserUrl: string | null
+    viewportRange: {
+        max: number
+        min: number
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface iframedToolbarBrowserLogicActions {
+    addUrl: (
+        url: string,
+        launch?: boolean | undefined
+    ) => {
+        launch: boolean | undefined
+        url: string
+    } // authorizedUrlListLogic
+    updateCurrentTeamSuccess: (
+        currentTeam: TeamPublicType | TeamType,
+        payload?: Partial<TeamType> | undefined
+    ) => {
+        currentTeam: TeamPublicType | TeamType
+        payload?: Partial<TeamType>
+    } // teamLogic
+    disableElementSelector: () => {
+        value: true
+    }
+    enableElementSelector: () => {
+        value: true
+    }
+    onIframeLoad: () => {
+        value: true
+    }
+    sendToolbarMessage: (
+        type: PostHogAppToolbarEvent,
+        payload?: Record<string, any>
+    ) => {
+        payload: Record<string, any> | undefined
+        type: PostHogAppToolbarEvent
+    }
+    setBrowserUrl: (url: string | null) => {
+        url: string | null
+    }
+    setCurrentPath: (path: string) => {
+        path: string
+    }
+    setIframeBanner: (banner: IFrameBanner | null) => {
+        banner: IFrameBanner | null
+    }
+    setIframeWidth: (width: number | null) => {
+        width: number | null
+    }
+    setInitialPath: (path: string) => {
+        path: string
+    }
+    setNewActionName: (name: string | null) => {
+        name: string | null
+    }
+    setProposedBrowserUrl: (url: string | null) => {
+        url: string | null
+    }
+    startTrackingLoading: () => {
+        value: true
+    }
+    stopTrackingLoading: () => {
+        value: true
+    }
+    toolbarMessageReceived: (
+        type: PostHogAppToolbarEvent,
+        payload: Record<string, any>
+    ) => {
+        payload: Record<string, any>
+        type: PostHogAppToolbarEvent
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface iframedToolbarBrowserLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        isBrowserUrlAuthorized: (browserUrl: string | null, checkUrlIsAuthorized: (url: string) => boolean) => boolean
+        isProposedBrowserUrlAuthorized: (
+            proposedBrowserUrl: string | null,
+            checkUrlIsAuthorized: (url: string) => boolean
+        ) => boolean
+        viewportRange: (
+            heatmapFilters: HeatmapFilters,
+            iframeWidth: number | null
+        ) => {
+            max: number
+            min: number
+        }
+        currentFullUrl: (browserUrl: string | null, currentPath: string) => string | null
+    }
+}
+
+export type iframedToolbarBrowserLogicType = MakeLogicType<
+    iframedToolbarBrowserLogicValues,
+    iframedToolbarBrowserLogicActions,
+    IframedToolbarBrowserLogicProps,
+    iframedToolbarBrowserLogicMeta
+>
+
 export const iframedToolbarBrowserLogic = kea<iframedToolbarBrowserLogicType>([
     path(['lib', 'components', 'iframedToolbarBrowser', 'iframedToolbarBrowserLogic']),
     props({
@@ -168,7 +301,7 @@ export const iframedToolbarBrowserLogic = kea<iframedToolbarBrowserLogicType>([
     selectors({
         isBrowserUrlAuthorized: [
             (s) => [s.browserUrl, s.checkUrlIsAuthorized],
-            (browserUrl, checkUrlIsAuthorized) => {
+            (browserUrl: string | null, checkUrlIsAuthorized: (url: string) => boolean) => {
                 if (!browserUrl) {
                     return false
                 }
@@ -177,7 +310,7 @@ export const iframedToolbarBrowserLogic = kea<iframedToolbarBrowserLogicType>([
         ],
         isProposedBrowserUrlAuthorized: [
             (s) => [s.proposedBrowserUrl, s.checkUrlIsAuthorized],
-            (proposedBrowserUrl, checkUrlIsAuthorized) => {
+            (proposedBrowserUrl: string | null, checkUrlIsAuthorized: (url: string) => boolean) => {
                 if (!proposedBrowserUrl) {
                     return false
                 }
@@ -187,13 +320,13 @@ export const iframedToolbarBrowserLogic = kea<iframedToolbarBrowserLogicType>([
 
         viewportRange: [
             (s) => [s.heatmapFilters, s.iframeWidth],
-            (heatmapFilters, iframeWidth) => {
+            (heatmapFilters: import('lib/components/heatmaps/types').HeatmapFilters, iframeWidth: number | null) => {
                 return iframeWidth ? calculateViewportRange(heatmapFilters, iframeWidth) : { min: 0, max: 1800 }
             },
         ],
         currentFullUrl: [
             (s) => [s.browserUrl, s.currentPath],
-            (browserUrl, currentPath) => {
+            (browserUrl: string | null, currentPath: string) => {
                 if (!browserUrl) {
                     return null
                 }
diff --git a/frontend/src/lib/components/IngestionControls/ingestionControlsLogic.tsx b/frontend/src/lib/components/IngestionControls/ingestionControlsLogic.tsx
index 8ff1d82848b1..c7c04394b20d 100644
--- a/frontend/src/lib/components/IngestionControls/ingestionControlsLogic.tsx
+++ b/frontend/src/lib/components/IngestionControls/ingestionControlsLogic.tsx
@@ -1,9 +1,7 @@
-import { actions, kea, key, listeners, path, props, selectors } from 'kea'
+import { MakeLogicType, actions, kea, key, listeners, path, props, selectors } from 'kea'
 
 import { AccessControlResourceType } from '~/types'
 
-import type { ingestionControlsLogicType } from './ingestionControlsLogicType'
-
 export type IngestionControlsLogicProps = {
     logicKey: string
     resourceType: AccessControlResourceType
@@ -11,6 +9,37 @@ export type IngestionControlsLogicProps = {
     onChangeMatchType: (matchType: 'any' | 'all') => void
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface ingestionControlsLogicValues {
+    logicKey: string
+    matchType: 'all' | 'any'
+    resourceType: AccessControlResourceType
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface ingestionControlsLogicActions {
+    onChangeMatchType: (matchType: 'all' | 'any') => {
+        matchType: 'all' | 'any'
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface ingestionControlsLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        logicKey: (logicKey: string) => string
+        resourceType: (resourceType: AccessControlResourceType) => AccessControlResourceType
+        matchType: (matchType: 'all' | 'any') => 'all' | 'any'
+    }
+}
+
+export type ingestionControlsLogicType = MakeLogicType<
+    ingestionControlsLogicValues,
+    ingestionControlsLogicActions,
+    IngestionControlsLogicProps,
+    ingestionControlsLogicMeta
+>
+
 export const ingestionControlsLogic = kea<ingestionControlsLogicType>([
     props({} as IngestionControlsLogicProps),
     key((props) => props.logicKey),
@@ -19,9 +48,9 @@ export const ingestionControlsLogic = kea<ingestionControlsLogicType>([
         onChangeMatchType: (matchType: 'any' | 'all') => ({ matchType }),
     }),
     selectors({
-        logicKey: [(_, p) => [p.logicKey], (logicKey) => logicKey],
-        resourceType: [(_, p) => [p.resourceType], (resourceType) => resourceType],
-        matchType: [(_, p) => [p.matchType], (matchType) => matchType],
+        logicKey: [(_, p) => [p.logicKey], (logicKey: string) => logicKey],
+        resourceType: [(_, p) => [p.resourceType], (resourceType: AccessControlResourceType) => resourceType],
+        matchType: [(_, p) => [p.matchType], (matchType: 'all' | 'any') => matchType],
     }),
     listeners(({ props }) => ({
         onChangeMatchType: ({ matchType }) => {
diff --git a/frontend/src/lib/components/IngestionControls/triggers/FlagTrigger/flagTriggerLogic.ts b/frontend/src/lib/components/IngestionControls/triggers/FlagTrigger/flagTriggerLogic.ts
index 3ea0448d0040..470370e35fde 100644
--- a/frontend/src/lib/components/IngestionControls/triggers/FlagTrigger/flagTriggerLogic.ts
+++ b/frontend/src/lib/components/IngestionControls/triggers/FlagTrigger/flagTriggerLogic.ts
@@ -1,12 +1,12 @@
-import { actions, afterMount, kea, key, listeners, path, props, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, key, listeners, path, props, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
 import { isObject } from 'lib/utils/guards'
 import { variantKeyToIndexFeatureFlagPayloads } from 'scenes/feature-flags/featureFlagLogic'
 
+import type { FeatureFlagType } from '../../../../../types'
 import { LinkedFeatureFlag } from '../../types'
-import type { flagTriggerLogicType } from './flagTriggerLogicType'
 
 export type FlagTriggerLogicProps = {
     logicKey: string
@@ -14,6 +14,56 @@ export type FlagTriggerLogicProps = {
     onChange: (flag: LinkedFeatureFlag | null) => void
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface flagTriggerLogicValues {
+    featureFlag: any
+    featureFlagLoading: boolean
+    flag: LinkedFeatureFlag | null
+    flagHasVariants: boolean
+    linkedFeatureFlagId: number | null
+    linkedFlag: any
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface flagTriggerLogicActions {
+    loadFeatureFlag: () => any
+    loadFeatureFlagFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadFeatureFlagSuccess: (
+        featureFlag: FeatureFlagType | null,
+        payload?: any
+    ) => {
+        featureFlag: FeatureFlagType | null
+        payload?: any
+    }
+    onChange: (flag: LinkedFeatureFlag | null) => {
+        flag: LinkedFeatureFlag | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface flagTriggerLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        linkedFeatureFlagId: (flag: LinkedFeatureFlag | null) => number | null
+        flag: (flag: LinkedFeatureFlag | null) => LinkedFeatureFlag | null
+        linkedFlag: (featureFlag: any, flag: LinkedFeatureFlag | null) => any
+        flagHasVariants: (linkedFlag: any) => boolean
+    }
+}
+
+export type flagTriggerLogicType = MakeLogicType<
+    flagTriggerLogicValues,
+    flagTriggerLogicActions,
+    FlagTriggerLogicProps,
+    flagTriggerLogicMeta
+>
+
 export const flagTriggerLogic = kea<flagTriggerLogicType>([
     props({} as FlagTriggerLogicProps),
     key((props) => props.logicKey),
@@ -33,15 +83,15 @@ export const flagTriggerLogic = kea<flagTriggerLogicType>([
         },
     })),
     selectors({
-        linkedFeatureFlagId: [(_, p) => [p.flag], (flag) => flag?.id || null],
-        flag: [(_, p) => [p.flag], (flag) => flag],
+        linkedFeatureFlagId: [(_, p) => [p.flag], (flag: LinkedFeatureFlag | null) => flag?.id || null],
+        flag: [(_, p) => [p.flag], (flag: LinkedFeatureFlag | null) => flag],
         linkedFlag: [
             (s, p) => [s.featureFlag, p.flag],
             // an existing linked flag is loaded from the API,
             // a newly chosen flag is selected and can be passed in
             // the original value is used to ensure that we don't
             // show stale values as people change the selection
-            (featureFlag, flag) => (flag?.id ? featureFlag : null),
+            (featureFlag, flag: LinkedFeatureFlag | null) => (flag?.id ? featureFlag : null),
         ],
         flagHasVariants: [(s) => [s.linkedFlag], (linkedFlag) => isObject(linkedFlag?.filters.multivariate)],
     }),
diff --git a/frontend/src/lib/components/IngestionControls/triggers/triggerGroups/replayTriggersV2Logic.ts b/frontend/src/lib/components/IngestionControls/triggers/triggerGroups/replayTriggersV2Logic.ts
index a63da6c0e63d..c7cd39c526e7 100644
--- a/frontend/src/lib/components/IngestionControls/triggers/triggerGroups/replayTriggersV2Logic.ts
+++ b/frontend/src/lib/components/IngestionControls/triggers/triggerGroups/replayTriggersV2Logic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { uuid } from 'lib/utils/dom'
@@ -10,7 +10,7 @@ import {
     SessionRecordingTriggerGroupsConfig,
 } from '~/lib/components/IngestionControls/types'
 
-import type { replayTriggersV2LogicType } from './replayTriggersV2LogicType'
+import type { TeamPublicType, TeamType } from '../../../../../types'
 
 /**
  * A conditionless group at 100% sample rate matches every session, so it's the explicit "record
@@ -26,6 +26,121 @@ export function buildRecordEverythingGroup(): SessionRecordingTriggerGroup {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface replayTriggersV2LogicValues {
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    _savingState: boolean | null
+    _savingStateLoading: boolean
+    deleteModalGroupId: string | null
+    editingGroupId: string | null
+    hasLegacyTriggers: boolean
+    hasV2Config: boolean
+    isAddingGroup: boolean
+    previewLegacyGroups: SessionRecordingTriggerGroup[]
+    shouldShowMigrationBanner: boolean
+    showLegacyModal: boolean
+    triggerGroups: SessionRecordingTriggerGroup[]
+    triggerGroupsConfig: SessionRecordingTriggerGroupsConfig | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface replayTriggersV2LogicActions {
+    updateCurrentTeam: (payload: Partial<TeamType>) => Partial<TeamType> // teamLogic
+    addMultipleTriggerGroups: (groups: SessionRecordingTriggerGroup[]) => {
+        groups: SessionRecordingTriggerGroup[]
+    }
+    addTriggerGroup: (group: SessionRecordingTriggerGroup) => {
+        group: SessionRecordingTriggerGroup
+    }
+    confirmCreateFromLegacy: () => {
+        value: true
+    }
+    confirmCreateFromLegacyFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    confirmCreateFromLegacySuccess: (
+        _savingState: boolean,
+        payload?: {
+            value: true
+        }
+    ) => {
+        _savingState: boolean
+        payload?: {
+            value: true
+        }
+    }
+    deleteTriggerGroup: (id: string) => {
+        id: string
+    }
+    hideCreateFromLegacyModal: () => {
+        value: true
+    }
+    saveConfig: () => any
+    saveConfigFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    saveConfigSuccess: (
+        _savingState: boolean,
+        payload?: any
+    ) => {
+        _savingState: boolean
+        payload?: any
+    }
+    setDeleteModalGroupId: (id: string | null) => {
+        id: string | null
+    }
+    setEditingGroupId: (id: string | null) => {
+        id: string | null
+    }
+    setIsAddingGroup: (isAdding: boolean) => {
+        isAdding: boolean
+    }
+    setTriggerGroupsConfig: (config: SessionRecordingTriggerGroupsConfig | null) => {
+        config: SessionRecordingTriggerGroupsConfig | null
+    }
+    showCreateFromLegacyModal: () => {
+        value: true
+    }
+    updateTriggerGroup: (
+        id: string,
+        updates: Partial<SessionRecordingTriggerGroup>
+    ) => {
+        id: string
+        updates: Partial<SessionRecordingTriggerGroup>
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface replayTriggersV2LogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        triggerGroups: (
+            triggerGroupsConfig: SessionRecordingTriggerGroupsConfig | null
+        ) => SessionRecordingTriggerGroup[]
+        hasV2Config: (triggerGroupsConfig: SessionRecordingTriggerGroupsConfig | null) => boolean
+        hasLegacyTriggers: (currentTeam: TeamPublicType | TeamType | null) => boolean
+        shouldShowMigrationBanner: (
+            triggerGroups: SessionRecordingTriggerGroup[],
+            hasLegacyTriggers: boolean
+        ) => boolean
+        previewLegacyGroups: (currentTeam: TeamPublicType | TeamType | null) => SessionRecordingTriggerGroup[]
+    }
+}
+
+export type replayTriggersV2LogicType = MakeLogicType<
+    replayTriggersV2LogicValues,
+    replayTriggersV2LogicActions,
+    Record<string, any>,
+    replayTriggersV2LogicMeta
+>
+
 export const replayTriggersV2Logic = kea<replayTriggersV2LogicType>([
     path(['lib', 'components', 'IngestionControls', 'triggers', 'triggerGroups', 'replayTriggersV2Logic']),
     connect({
@@ -155,19 +270,21 @@ export const replayTriggersV2Logic = kea<replayTriggersV2LogicType>([
     selectors({
         triggerGroups: [
             (s) => [s.triggerGroupsConfig],
-            (config): SessionRecordingTriggerGroup[] => {
+            (config: SessionRecordingTriggerGroupsConfig | null): SessionRecordingTriggerGroup[] => {
                 return config?.groups || []
             },
         ],
         hasV2Config: [
             (s) => [s.triggerGroupsConfig],
-            (config): boolean => {
+            (config: SessionRecordingTriggerGroupsConfig | null): boolean => {
                 return config !== null && config.version === 2
             },
         ],
         hasLegacyTriggers: [
             (s) => [s.currentTeam],
-            (team): boolean => {
+            (
+                team: null | import('../../../../../types').TeamPublicType | import('../../../../../types').TeamType
+            ): boolean => {
                 if (!team) {
                     return false
                 }
@@ -182,14 +299,16 @@ export const replayTriggersV2Logic = kea<replayTriggersV2LogicType>([
         ],
         shouldShowMigrationBanner: [
             (s) => [s.triggerGroups, s.hasLegacyTriggers],
-            (triggerGroups, hasLegacyTriggers): boolean => {
+            (triggerGroups: SessionRecordingTriggerGroup[], hasLegacyTriggers: boolean): boolean => {
                 // Show banner if there are legacy triggers configured but no V2 groups
                 return hasLegacyTriggers && triggerGroups.length === 0
             },
         ],
         previewLegacyGroups: [
             (s) => [s.currentTeam],
-            (team): SessionRecordingTriggerGroup[] => {
+            (
+                team: null | import('../../../../../types').TeamPublicType | import('../../../../../types').TeamType
+            ): SessionRecordingTriggerGroup[] => {
                 if (!team) {
                     return []
                 }
diff --git a/frontend/src/lib/components/IngestionControls/triggers/triggerGroups/triggerGroupFormLogic.ts b/frontend/src/lib/components/IngestionControls/triggers/triggerGroups/triggerGroupFormLogic.ts
index 8f13ff0dd93b..866fb94d63f4 100644
--- a/frontend/src/lib/components/IngestionControls/triggers/triggerGroups/triggerGroupFormLogic.ts
+++ b/frontend/src/lib/components/IngestionControls/triggers/triggerGroups/triggerGroupFormLogic.ts
@@ -1,5 +1,6 @@
-import { actions, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, kea, key, listeners, path, props, reducers } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 
 import { lemonToast } from '@posthog/lemon-ui'
 
@@ -13,8 +14,6 @@ import {
     UrlTriggerConfig,
 } from '~/lib/components/IngestionControls/types'
 
-import type { triggerGroupFormLogicType } from './triggerGroupFormLogicType'
-
 function isValidRegex(pattern: string): boolean {
     try {
         new RegExp(pattern)
@@ -35,6 +34,221 @@ export interface TriggerGroupFormLogicProps {
     onCancel: () => void
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface triggerGroupFormLogicValues {
+    expandedEvent: string | null
+    isAddingUrl: boolean
+    isTriggerGroupSubmitting: boolean
+    isTriggerGroupValid: boolean
+    newUrl: string
+    showTriggerGroupErrors: boolean
+    testUrl: string
+    triggerGroup: {
+        events: EventTriggerConfig[]
+        flag: string | null
+        matchType: 'all' | 'any'
+        minDurationMs: number | null
+        name: string
+        properties: TriggerPropertyFilter[]
+        sampleRate: number
+        urls: UrlTriggerConfig[]
+    }
+    triggerGroupAllErrors: Record<string, any>
+    triggerGroupChanged: boolean
+    triggerGroupErrors: DeepPartialMap<
+        {
+            events: EventTriggerConfig[]
+            flag: string | null
+            matchType: 'all' | 'any'
+            minDurationMs: number | null
+            name: string
+            properties: TriggerPropertyFilter[]
+            sampleRate: number
+            urls: UrlTriggerConfig[]
+        },
+        ValidationErrorType
+    >
+    triggerGroupHasErrors: boolean
+    triggerGroupManualErrors: Record<string, any>
+    triggerGroupTouched: boolean
+    triggerGroupTouches: Record<string, boolean>
+    triggerGroupValidationErrors: DeepPartialMap<
+        {
+            events: EventTriggerConfig[]
+            flag: string | null
+            matchType: 'all' | 'any'
+            minDurationMs: number | null
+            name: string
+            properties: TriggerPropertyFilter[]
+            sampleRate: number
+            urls: UrlTriggerConfig[]
+        },
+        ValidationErrorType
+    >
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface triggerGroupFormLogicActions {
+    addFlag: (
+        _id: number,
+        key: string
+    ) => {
+        key: string
+    }
+    addUrl: (url: string) => {
+        url: string
+    }
+    removeEvent: (eventName: string) => {
+        eventName: string
+    }
+    removeFlag: () => {
+        value: true
+    }
+    removeUrl: (url: string) => {
+        url: string
+    }
+    resetTriggerGroup: (values?: {
+        events: EventTriggerConfig[]
+        flag: string | null
+        matchType: 'all' | 'any'
+        minDurationMs: number | null
+        name: string
+        properties: TriggerPropertyFilter[]
+        sampleRate: number
+        urls: UrlTriggerConfig[]
+    }) => {
+        values?: {
+            events: EventTriggerConfig[]
+            flag: string | null
+            matchType: 'all' | 'any'
+            minDurationMs: number | null
+            name: string
+            properties: TriggerPropertyFilter[]
+            sampleRate: number
+            urls: UrlTriggerConfig[]
+        }
+    }
+    setEventProperties: (
+        eventName: string,
+        properties: TriggerPropertyFilter[]
+    ) => {
+        eventName: string
+        properties: TriggerPropertyFilter[]
+    }
+    setExpandedEvent: (eventName: string | null) => {
+        eventName: string | null
+    }
+    setIsAddingUrl: (isAdding: boolean) => {
+        isAdding: boolean
+    }
+    setNewUrl: (url: string) => {
+        url: string
+    }
+    setTestUrl: (url: string) => {
+        url: string
+    }
+    setTriggerGroupManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setTriggerGroupValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setTriggerGroupValues: (
+        values: DeepPartial<{
+            events: EventTriggerConfig[]
+            flag: string | null
+            matchType: 'all' | 'any'
+            minDurationMs: number | null
+            name: string
+            properties: TriggerPropertyFilter[]
+            sampleRate: number
+            urls: UrlTriggerConfig[]
+        }>
+    ) => {
+        values: DeepPartial<{
+            events: EventTriggerConfig[]
+            flag: string | null
+            matchType: 'all' | 'any'
+            minDurationMs: number | null
+            name: string
+            properties: TriggerPropertyFilter[]
+            sampleRate: number
+            urls: UrlTriggerConfig[]
+        }>
+    }
+    submitTriggerGroup: () => {
+        value: boolean
+    }
+    submitTriggerGroupFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitTriggerGroupRequest: (triggerGroup: {
+        events: EventTriggerConfig[]
+        flag: string | null
+        matchType: 'all' | 'any'
+        minDurationMs: number | null
+        name: string
+        properties: TriggerPropertyFilter[]
+        sampleRate: number
+        urls: UrlTriggerConfig[]
+    }) => {
+        triggerGroup: {
+            events: EventTriggerConfig[]
+            flag: string | null
+            matchType: 'all' | 'any'
+            minDurationMs: number | null
+            name: string
+            properties: TriggerPropertyFilter[]
+            sampleRate: number
+            urls: UrlTriggerConfig[]
+        }
+    }
+    submitTriggerGroupSuccess: (triggerGroup: {
+        events: EventTriggerConfig[]
+        flag: string | null
+        matchType: 'all' | 'any'
+        minDurationMs: number | null
+        name: string
+        properties: TriggerPropertyFilter[]
+        sampleRate: number
+        urls: UrlTriggerConfig[]
+    }) => {
+        triggerGroup: {
+            events: EventTriggerConfig[]
+            flag: string | null
+            matchType: 'all' | 'any'
+            minDurationMs: number | null
+            name: string
+            properties: TriggerPropertyFilter[]
+            sampleRate: number
+            urls: UrlTriggerConfig[]
+        }
+    }
+    touchTriggerGroupField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface triggerGroupFormLogicMeta {
+    key: string
+}
+
+export type triggerGroupFormLogicType = MakeLogicType<
+    triggerGroupFormLogicValues,
+    triggerGroupFormLogicActions,
+    TriggerGroupFormLogicProps,
+    triggerGroupFormLogicMeta
+>
+
 export const triggerGroupFormLogic = kea<triggerGroupFormLogicType>([
     path(['lib', 'components', 'IngestionControls', 'triggers', 'triggerGroups', 'triggerGroupFormLogic']),
     props({} as TriggerGroupFormLogicProps),
diff --git a/frontend/src/lib/components/IngestionControls/triggers/urlConfigLogic.ts b/frontend/src/lib/components/IngestionControls/triggers/urlConfigLogic.ts
index 6bf9d93fa1e6..1ada5f7345a3 100644
--- a/frontend/src/lib/components/IngestionControls/triggers/urlConfigLogic.ts
+++ b/frontend/src/lib/components/IngestionControls/triggers/urlConfigLogic.ts
@@ -1,10 +1,9 @@
-import { actions, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 
 import { UrlTriggerConfig } from 'lib/components/IngestionControls/types'
 
-import type { urlConfigLogicType } from './urlConfigLogicType'
-
 const NEW_URL_TRIGGER = { url: '', matching: 'regex' }
 
 export function isStringWithLength(x: unknown): x is string {
@@ -23,6 +22,139 @@ export interface UrlConfigLogicProps {
     onChange: (urlTriggerConfig: UrlTriggerConfig[]) => void
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface urlConfigLogicValues {
+    checkUrlTrigger: string
+    checkUrlTriggerResults: {
+        [key: number]: boolean
+    }
+    editUrlTriggerIndex: number | null
+    isAddUrlTriggerConfigFormVisible: boolean
+    isProposedUrlTriggerSubmitting: boolean
+    isProposedUrlTriggerValid: boolean
+    proposedUrlTrigger: UrlTriggerConfig
+    proposedUrlTriggerAllErrors: Record<string, any>
+    proposedUrlTriggerChanged: boolean
+    proposedUrlTriggerErrors: DeepPartialMap<UrlTriggerConfig, ValidationErrorType>
+    proposedUrlTriggerHasErrors: boolean
+    proposedUrlTriggerManualErrors: Record<string, any>
+    proposedUrlTriggerTouched: boolean
+    proposedUrlTriggerTouches: Record<string, boolean>
+    proposedUrlTriggerValidationErrors: DeepPartialMap<UrlTriggerConfig, ValidationErrorType>
+    showProposedUrlTriggerErrors: boolean
+    urlTriggerConfig: UrlTriggerConfig[]
+    urlTriggerInputValidationWarning: string | null
+    urlTriggerToEdit: {
+        matching: string
+        url: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface urlConfigLogicActions {
+    addUrlTrigger: (urlTriggerConfig: UrlTriggerConfig) => {
+        urlTriggerConfig: UrlTriggerConfig
+    }
+    cancelProposingUrlTrigger: () => {
+        value: true
+    }
+    newUrlTrigger: () => {
+        value: true
+    }
+    removeUrlTrigger: (index: number) => {
+        index: number
+    }
+    resetProposedUrlTrigger: (values?: UrlTriggerConfig) => {
+        values?: UrlTriggerConfig
+    }
+    setCheckUrlBlocklist: (url: string) => {
+        url: string
+    }
+    setCheckUrlTrigger: (url: string) => {
+        url: string
+    }
+    setEditUrlTriggerIndex: (originalIndex: number | null) => {
+        originalIndex: number | null
+    }
+    setProposedUrlTriggerManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setProposedUrlTriggerValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setProposedUrlTriggerValues: (values: DeepPartial<UrlTriggerConfig>) => {
+        values: DeepPartial<UrlTriggerConfig>
+    }
+    setUrlTriggerConfig: (urlTriggerConfig: UrlTriggerConfig[]) => {
+        urlTriggerConfig: UrlTriggerConfig[]
+    }
+    submitProposedUrlTrigger: () => {
+        value: boolean
+    }
+    submitProposedUrlTriggerFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitProposedUrlTriggerRequest: (proposedUrlTrigger: UrlTriggerConfig) => {
+        proposedUrlTrigger: UrlTriggerConfig
+    }
+    submitProposedUrlTriggerSuccess: (proposedUrlTrigger: UrlTriggerConfig) => {
+        proposedUrlTrigger: UrlTriggerConfig
+    }
+    touchProposedUrlTriggerField: (key: string) => {
+        key: string
+    }
+    updateUrlTrigger: (
+        index: number,
+        urlTriggerConfig: UrlTriggerConfig
+    ) => {
+        index: number
+        urlTriggerConfig: UrlTriggerConfig
+    }
+    validateUrlInput: (
+        url: string,
+        type: 'blocklist' | 'trigger'
+    ) => {
+        type: 'blocklist' | 'trigger'
+        url: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface urlConfigLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        isAddUrlTriggerConfigFormVisible: (editUrlTriggerIndex: number | null) => boolean
+        urlTriggerToEdit: (
+            urlTriggerConfig: UrlTriggerConfig[],
+            editUrlTriggerIndex: number | null
+        ) => {
+            matching: string
+            url: string
+        }
+        checkUrlTriggerResults: (
+            checkUrlTrigger: string,
+            urlTriggerConfig: UrlTriggerConfig[]
+        ) => {
+            [key: number]: boolean
+        }
+    }
+}
+
+export type urlConfigLogicType = MakeLogicType<
+    urlConfigLogicValues,
+    urlConfigLogicActions,
+    UrlConfigLogicProps,
+    urlConfigLogicMeta
+>
+
 export const urlConfigLogic = kea<urlConfigLogicType>([
     props({} as UrlConfigLogicProps),
     key((props) => props.logicKey),
@@ -99,11 +231,11 @@ export const urlConfigLogic = kea<urlConfigLogicType>([
     selectors({
         isAddUrlTriggerConfigFormVisible: [
             (s) => [s.editUrlTriggerIndex],
-            (editUrlTriggerIndex) => editUrlTriggerIndex === -1,
+            (editUrlTriggerIndex: number | null) => editUrlTriggerIndex === -1,
         ],
         urlTriggerToEdit: [
             (s) => [s.urlTriggerConfig, s.editUrlTriggerIndex],
-            (urlTriggerConfig, editUrlTriggerIndex) => {
+            (urlTriggerConfig: UrlTriggerConfig[], editUrlTriggerIndex: number | null) => {
                 if (
                     editUrlTriggerIndex === null ||
                     editUrlTriggerIndex === -1 ||
@@ -117,7 +249,7 @@ export const urlConfigLogic = kea<urlConfigLogicType>([
 
         checkUrlTriggerResults: [
             (s) => [s.checkUrlTrigger, s.urlTriggerConfig],
-            (checkUrl, urlTriggerConfig): { [key: number]: boolean } => {
+            (checkUrl: string, urlTriggerConfig: UrlTriggerConfig[]): { [key: number]: boolean } => {
                 if (!checkUrl.trim() || !urlTriggerConfig) {
                     return {}
                 }
diff --git a/frontend/src/lib/components/LiveUserCount/liveUserCountLogic.ts b/frontend/src/lib/components/LiveUserCount/liveUserCountLogic.ts
index 20fbc1d3ff4a..d7cee8da0bca 100644
--- a/frontend/src/lib/components/LiveUserCount/liveUserCountLogic.ts
+++ b/frontend/src/lib/components/LiveUserCount/liveUserCountLogic.ts
@@ -1,9 +1,9 @@
-import { actions, connect, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 
 import { liveEventsHostOrigin } from 'lib/utils/apiHost'
 import { teamLogic } from 'scenes/teamLogic'
 
-import type { liveUserCountLogicType } from './liveUserCountLogicType'
+import type { TeamPublicType, TeamType } from '../../../types'
 
 export interface LiveUserCountStats {
     users_on_product?: number
@@ -14,6 +14,61 @@ export interface LiveUserCountLogicProps {
     pollIntervalMs?: number
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface liveUserCountLogicValues {
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    activeRecordings: number | null
+    isHovering: boolean
+    liveUserCount: number | null
+    now: Date | null
+    stats: LiveUserCountStats | null
+    statsUpdatedSecondsAgo: number | null
+    statsUpdatedTime: Date | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface liveUserCountLogicActions {
+    pauseStream: () => {
+        value: true
+    }
+    pollStats: () => {
+        value: true
+    }
+    resumeStream: () => {
+        value: true
+    }
+    setIsHovering: (isHovering: boolean) => {
+        isHovering: boolean
+    }
+    setNow: (now: Date) => {
+        now: Date
+    }
+    setStats: (
+        stats: LiveUserCountStats,
+        now: Date
+    ) => {
+        now: Date
+        stats: LiveUserCountStats
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface liveUserCountLogicMeta {
+    key: number
+    __keaTypeGenInternalSelectorTypes: {
+        liveUserCount: (stats: LiveUserCountStats | null) => number | null
+        activeRecordings: (stats: LiveUserCountStats | null) => number | null
+        statsUpdatedSecondsAgo: (statsUpdatedTime: Date | null, now: Date | null) => number | null
+    }
+}
+
+export type liveUserCountLogicType = MakeLogicType<
+    liveUserCountLogicValues,
+    liveUserCountLogicActions,
+    LiveUserCountLogicProps,
+    liveUserCountLogicMeta
+>
+
 export const liveUserCountLogic = kea<liveUserCountLogicType>([
     path((key) => ['lib', 'components', 'LiveUserCount', 'liveUserCountLogic', key]),
     key((props) => props.pollIntervalMs ?? 30000),
@@ -57,8 +112,8 @@ export const liveUserCountLogic = kea<liveUserCountLogicType>([
         ],
     }),
     selectors({
-        liveUserCount: [(s) => [s.stats], (stats) => stats?.users_on_product ?? null],
-        activeRecordings: [(s) => [s.stats], (stats) => stats?.active_recordings ?? null],
+        liveUserCount: [(s) => [s.stats], (stats: LiveUserCountStats | null) => stats?.users_on_product ?? null],
+        activeRecordings: [(s) => [s.stats], (stats: LiveUserCountStats | null) => stats?.active_recordings ?? null],
         statsUpdatedSecondsAgo: [
             (s) => [s.statsUpdatedTime, s.now],
             (statsUpdatedTime: Date | null, now: Date | null) => {
diff --git a/frontend/src/lib/components/MCPHint/mcpHintLogic.tsx b/frontend/src/lib/components/MCPHint/mcpHintLogic.tsx
index b44759930f6b..4e4feb0348ec 100644
--- a/frontend/src/lib/components/MCPHint/mcpHintLogic.tsx
+++ b/frontend/src/lib/components/MCPHint/mcpHintLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { toast } from 'react-toastify'
 
@@ -12,7 +12,7 @@ import { userLogic } from 'scenes/userLogic'
 
 import { UserType } from '~/types'
 
-import type { mcpHintLogicType } from './mcpHintLogicType'
+import type { FeatureFlagsSet } from '../../logic/featureFlagLogic'
 import { MCPHintToast } from './MCPHintToast'
 import type { SurfaceKey } from './prompts'
 
@@ -41,6 +41,123 @@ export function tryShowMCPHint(surfaceKey: SurfaceKey, options: TryShowMCPHintOp
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface mcpHintLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    user: UserType | null // userLogic
+    dismissedSurfaces: Record<string, true>
+    effectiveOptOut: boolean
+    lastShownAt: number | null
+    localGlobalOptOut: boolean
+    topEvents: string[]
+    topEventsLoading: boolean
+    userRole: string | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface mcpHintLogicActions {
+    reportMCPHintDismissed: (
+        dismissType: 'all' | 'surface',
+        surfaceKey?: string | undefined
+    ) => {
+        dismissType: 'all' | 'surface'
+        surfaceKey: string | undefined
+    } // eventUsageLogic
+    reportMCPHintShown: (surfaceKey: string) => {
+        surfaceKey: string
+    } // eventUsageLogic
+    updateUser: (
+        user: Partial<UserType>,
+        successCallback?: (() => void) | undefined
+    ) => {
+        successCallback: (() => void) | undefined
+        user: Partial<UserType>
+    } // userLogic
+    dismissAll: () => {
+        value: true
+    }
+    dismissSurface: (surfaceKey: SurfaceKey) => {
+        surfaceKey:
+            | 'actions.create'
+            | 'alerts.create'
+            | 'annotations.create'
+            | 'cohorts.create'
+            | 'dashboards.create'
+            | 'data_warehouse_sources.create'
+            | 'data_warehouse_sources.update'
+            | 'early_access_features.create'
+            | 'error_tracking.assign'
+            | 'experiments.create'
+            | 'experiments.launch'
+            | 'feature_flags.create'
+            | 'feature_flags.update'
+            | 'insights.create'
+            | 'sql.execute'
+            | 'surveys.create'
+            | 'workflows.create'
+    }
+    loadTopEvents: () => any
+    loadTopEventsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadTopEventsSuccess: (
+        topEvents: string[],
+        payload?: any
+    ) => {
+        topEvents: string[]
+        payload?: any
+    }
+    recordShown: (now: number) => {
+        now: number
+    }
+    reenable: () => {
+        value: true
+    }
+    tryShowHint: (
+        surfaceKey: SurfaceKey,
+        derivedPrompt?: string
+    ) => {
+        derivedPrompt: string | undefined
+        surfaceKey:
+            | 'actions.create'
+            | 'alerts.create'
+            | 'annotations.create'
+            | 'cohorts.create'
+            | 'dashboards.create'
+            | 'data_warehouse_sources.create'
+            | 'data_warehouse_sources.update'
+            | 'early_access_features.create'
+            | 'error_tracking.assign'
+            | 'experiments.create'
+            | 'experiments.launch'
+            | 'feature_flags.create'
+            | 'feature_flags.update'
+            | 'insights.create'
+            | 'sql.execute'
+            | 'surveys.create'
+            | 'workflows.create'
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface mcpHintLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        effectiveOptOut: (localGlobalOptOut: boolean, user: UserType | null) => boolean
+        userRole: (user: UserType | null) => string | null
+    }
+}
+
+export type mcpHintLogicType = MakeLogicType<
+    mcpHintLogicValues,
+    mcpHintLogicActions,
+    Record<string, any>,
+    mcpHintLogicMeta
+>
+
 export const mcpHintLogic = kea<mcpHintLogicType>([
     path(['lib', 'components', 'MCPHint', 'mcpHintLogic']),
     connect(() => ({
diff --git a/frontend/src/lib/components/Metalytics/metalyticsLogic.ts b/frontend/src/lib/components/Metalytics/metalyticsLogic.ts
index bcd8099082d2..694329fce313 100644
--- a/frontend/src/lib/components/Metalytics/metalyticsLogic.ts
+++ b/frontend/src/lib/components/Metalytics/metalyticsLogic.ts
@@ -1,4 +1,4 @@
-import { connect, kea, path, selectors } from 'kea'
+import { MakeLogicType, connect, kea, path, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { subscriptions } from 'kea-subscriptions'
 
@@ -11,7 +11,80 @@ import { sidePanelContextLogic } from '~/layout/navigation-3000/sidepanel/sidePa
 import { SidePanelSceneContext } from '~/layout/navigation-3000/sidepanel/types'
 import { hogql } from '~/queries/utils'
 
-import type { metalyticsLogicType } from './metalyticsLogicType'
+import type { OrganizationMemberType } from '../../../types'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface metalyticsLogicValues {
+    members: OrganizationMemberType[] | null // membersLogic
+    sceneSidePanelContext: SidePanelSceneContext // sidePanelContextLogic
+    currentProjectId: number | string // teamLogic
+    instanceId: string | null
+    recentUserMembers: OrganizationMemberType[]
+    recentUsers: string[]
+    recentUsersLoading: boolean
+    scope: string | undefined
+    viewCount: {
+        users: number
+        views: number
+    } | null
+    viewCountLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface metalyticsLogicActions {
+    loadUsersLast30days: () => any
+    loadUsersLast30daysFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadUsersLast30daysSuccess: (
+        recentUsers: string[],
+        payload?: any
+    ) => {
+        recentUsers: string[]
+        payload?: any
+    }
+    loadViewCount: () => any
+    loadViewCountFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadViewCountSuccess: (
+        viewCount: {
+            users: number
+            views: number
+        },
+        payload?: any
+    ) => {
+        viewCount: {
+            users: number
+            views: number
+        }
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface metalyticsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        instanceId: (sceneSidePanelContext: SidePanelSceneContext) => string | null
+        scope: (sceneSidePanelContext: SidePanelSceneContext) => string | undefined
+        recentUserMembers: (recentUsers: string[], members: OrganizationMemberType[] | null) => OrganizationMemberType[]
+    }
+}
+
+export type metalyticsLogicType = MakeLogicType<
+    metalyticsLogicValues,
+    metalyticsLogicActions,
+    Record<string, any>,
+    metalyticsLogicMeta
+>
 
 export const metalyticsLogic = kea<metalyticsLogicType>([
     path(['lib', 'components', 'metalytics', 'metalyticsLogic']),
@@ -90,7 +163,7 @@ export const metalyticsLogic = kea<metalyticsLogicType>([
 
         recentUserMembers: [
             (s) => [s.recentUsers, s.members],
-            (recentUsers, members) => {
+            (recentUsers: string[], members: import('../../../types').OrganizationMemberType[] | null) => {
                 if (!members || !recentUsers) {
                     return []
                 }
diff --git a/frontend/src/lib/components/NavPanelAdvertisement/NavPanelAdvertisementLogic.ts b/frontend/src/lib/components/NavPanelAdvertisement/NavPanelAdvertisementLogic.ts
index f397bffe7d26..9fa1024791c8 100644
--- a/frontend/src/lib/components/NavPanelAdvertisement/NavPanelAdvertisementLogic.ts
+++ b/frontend/src/lib/components/NavPanelAdvertisement/NavPanelAdvertisementLogic.ts
@@ -1,11 +1,32 @@
-import { actions, kea, key, path, props, reducers } from 'kea'
-
-import type { navPanelAdvertisementLogicType } from './NavPanelAdvertisementLogicType'
+import { MakeLogicType, actions, kea, key, path, props, reducers } from 'kea'
 
 export type NavPanelAdvertisementLogicProps = {
     campaign: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface navPanelAdvertisementLogicValues {
+    hidden: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface navPanelAdvertisementLogicActions {
+    hideAdvertisement: () => boolean
+    showAdvertisement: () => boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface navPanelAdvertisementLogicMeta {
+    key: string
+}
+
+export type navPanelAdvertisementLogicType = MakeLogicType<
+    navPanelAdvertisementLogicValues,
+    navPanelAdvertisementLogicActions,
+    NavPanelAdvertisementLogicProps,
+    navPanelAdvertisementLogicMeta
+>
+
 export const navPanelAdvertisementLogic = kea<navPanelAdvertisementLogicType>([
     path(['lib', 'components', 'NavPanelAdvertisementLogic']),
     props({} as NavPanelAdvertisementLogicProps),
diff --git a/frontend/src/lib/components/NavPanelAdvertisement/navPanelAdvertisementRecommendedLogic.ts b/frontend/src/lib/components/NavPanelAdvertisement/navPanelAdvertisementRecommendedLogic.ts
index 497fbb589e97..bd726fdc99af 100644
--- a/frontend/src/lib/components/NavPanelAdvertisement/navPanelAdvertisementRecommendedLogic.ts
+++ b/frontend/src/lib/components/NavPanelAdvertisement/navPanelAdvertisementRecommendedLogic.ts
@@ -1,16 +1,36 @@
-import { connect, kea, path, selectors } from 'kea'
+import { MakeLogicType, connect, kea, path, selectors } from 'kea'
 
 import { customProductsLogic } from '~/layout/panel-layout/ProjectTree/customProductsLogic'
 import { type UserProductListItem, UserProductListReason } from '~/queries/schema/schema-general'
 
-import type { navPanelAdvertisementRecommendedLogicType } from './navPanelAdvertisementRecommendedLogicType'
-
 const RECOMMENDED_PRODUCT_CREATED_AT_THRESHOLD_IN_DAYS = 7
 const RECOMMENDED_PRODUCT_REASONS: UserProductListReason[] = [
     UserProductListReason.SALES_LED,
     UserProductListReason.NEW_PRODUCT,
 ]
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface navPanelAdvertisementRecommendedLogicValues {
+    customProducts: UserProductListItem[] // customProductsLogic
+    oldestRecommendedProduct: UserProductListItem | null
+    recommendedProducts: UserProductListItem[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface navPanelAdvertisementRecommendedLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        recommendedProducts: (customProducts: UserProductListItem[]) => UserProductListItem[]
+        oldestRecommendedProduct: (recommendedProducts: UserProductListItem[]) => UserProductListItem | null
+    }
+}
+
+export type navPanelAdvertisementRecommendedLogicType = MakeLogicType<
+    navPanelAdvertisementRecommendedLogicValues,
+    {},
+    Record<string, any>,
+    navPanelAdvertisementRecommendedLogicMeta
+>
+
 export const navPanelAdvertisementRecommendedLogic = kea<navPanelAdvertisementRecommendedLogicType>([
     path(['lib', 'components', 'NavPanelAdvertisement', 'navPanelAdvertisementRecommendedLogic']),
     connect(() => ({
diff --git a/frontend/src/lib/components/NavPanelAdvertisement/navPanelProductPushAdLogic.ts b/frontend/src/lib/components/NavPanelAdvertisement/navPanelProductPushAdLogic.ts
index e5447cc61f88..7bba0f2b2923 100644
--- a/frontend/src/lib/components/NavPanelAdvertisement/navPanelProductPushAdLogic.ts
+++ b/frontend/src/lib/components/NavPanelAdvertisement/navPanelProductPushAdLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, selectors } from 'kea'
 import posthog from 'posthog-js'
 
 import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
@@ -9,9 +9,9 @@ import { FileSystemImport, ProductIntentContext, ProductKey } from '~/queries/sc
 
 import type { ProductPushCampaignApi } from 'products/growth/frontend/generated/api.schemas'
 
+import type { FeatureFlagsSet } from '../../logic/featureFlagLogic'
 import type { ProductPushDisplay } from './navPanelAdShared'
 import { navPanelAdvertisementLogic } from './NavPanelAdvertisementLogic'
-import type { navPanelProductPushAdLogicType } from './navPanelProductPushAdLogicType'
 import { getProductPushDisplay } from './navPanelProductPushDisplay'
 
 export type NavPanelProductPushAdLogicProps = {
@@ -22,6 +22,47 @@ export type NavPanelProductPushAdLogicProps = {
 // card's dismiss button), so key it the same way here to read the same `hidden` flag.
 const dismissKey = (campaign: ProductPushCampaignApi): string => `product-push-${campaign.id}`
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface navPanelProductPushAdLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    hidden: boolean // navPanelAdvertisementLogic
+    display: ProductPushDisplay
+    flagGated: boolean
+    productInfo: FileSystemImport | undefined
+    shouldRender: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface navPanelProductPushAdLogicActions {
+    reportAdClicked: () => {
+        value: true
+    }
+    reportAdDismissed: () => {
+        value: true
+    }
+    reportAdShown: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface navPanelProductPushAdLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        productInfo: (arg: any) => FileSystemImport | undefined
+        display: (arg: any) => ProductPushDisplay
+        flagGated: (productInfo: FileSystemImport | undefined, featureFlags: FeatureFlagsSet) => boolean
+        shouldRender: (hidden: boolean, productInfo: FileSystemImport | undefined, flagGated: boolean) => boolean
+    }
+}
+
+export type navPanelProductPushAdLogicType = MakeLogicType<
+    navPanelProductPushAdLogicValues,
+    navPanelProductPushAdLogicActions,
+    NavPanelProductPushAdLogicProps,
+    navPanelProductPushAdLogicMeta
+>
+
 export const navPanelProductPushAdLogic = kea<navPanelProductPushAdLogicType>([
     path(['lib', 'components', 'NavPanelAdvertisement', 'navPanelProductPushAdLogic']),
     props({} as NavPanelProductPushAdLogicProps),
@@ -52,12 +93,15 @@ export const navPanelProductPushAdLogic = kea<navPanelProductPushAdLogicType>([
         // Never advertise a product this user can't open (mirrors the sidebar's flag filtering)
         flagGated: [
             (s) => [s.productInfo, s.featureFlags],
-            (productInfo, featureFlags): boolean =>
-                !!productInfo?.flag && !(featureFlags as Record<string, boolean>)[productInfo.flag],
+            (
+                productInfo: FileSystemImport | undefined,
+                featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet
+            ): boolean => !!productInfo?.flag && !(featureFlags as Record<string, boolean>)[productInfo.flag],
         ],
         shouldRender: [
             (s) => [s.hidden, s.productInfo, s.flagGated],
-            (hidden, productInfo, flagGated): boolean => !hidden && !!productInfo && !flagGated,
+            (hidden: boolean, productInfo: FileSystemImport | undefined, flagGated: boolean): boolean =>
+                !hidden && !!productInfo && !flagGated,
         ],
     }),
     listeners(({ props }) => ({
diff --git a/frontend/src/lib/components/NavPanelAdvertisement/navPanelProductPushLogic.ts b/frontend/src/lib/components/NavPanelAdvertisement/navPanelProductPushLogic.ts
index 1b55c22ee24d..dc9d00188b41 100644
--- a/frontend/src/lib/components/NavPanelAdvertisement/navPanelProductPushLogic.ts
+++ b/frontend/src/lib/components/NavPanelAdvertisement/navPanelProductPushLogic.ts
@@ -1,4 +1,4 @@
-import { afterMount, connect, kea, listeners, path } from 'kea'
+import { MakeLogicType, afterMount, connect, kea, listeners, path } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { preflightLogic } from 'lib/logic/preflightLogic'
@@ -8,7 +8,40 @@ import { teamLogic } from 'scenes/teamLogic'
 import * as api from 'products/growth/frontend/generated/api'
 import type { ProductPushCampaignApi } from 'products/growth/frontend/generated/api.schemas'
 
-import type { navPanelProductPushLogicType } from './navPanelProductPushLogicType'
+import type { OrganizationType } from '../../../types'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface navPanelProductPushLogicValues {
+    currentOrganization: OrganizationType | null // organizationLogic
+    isCloudOrDev: boolean | undefined // preflightLogic
+    currentTeamId: number | null // teamLogic
+    activeCampaign: ProductPushCampaignApi | null
+    activeCampaignLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface navPanelProductPushLogicActions {
+    loadActiveCampaign: () => any
+    loadActiveCampaignFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadActiveCampaignSuccess: (
+        activeCampaign: ProductPushCampaignApi | null,
+        payload?: any
+    ) => {
+        activeCampaign: ProductPushCampaignApi | null
+        payload?: any
+    }
+}
+
+export type navPanelProductPushLogicType = MakeLogicType<
+    navPanelProductPushLogicValues,
+    navPanelProductPushLogicActions
+>
 
 export const navPanelProductPushLogic = kea<navPanelProductPushLogicType>([
     path(['lib', 'components', 'NavPanelAdvertisement', 'navPanelProductPushLogic']),
diff --git a/frontend/src/lib/components/NotificationsMenu/notificationsMenuLogic.tsx b/frontend/src/lib/components/NotificationsMenu/notificationsMenuLogic.tsx
index 951033c01fd5..a17a9be64175 100644
--- a/frontend/src/lib/components/NotificationsMenu/notificationsMenuLogic.tsx
+++ b/frontend/src/lib/components/NotificationsMenu/notificationsMenuLogic.tsx
@@ -1,12 +1,45 @@
-import { actions, connect, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers } from 'kea'
 
 import { sidePanelNotificationsLogic } from '~/layout/navigation-3000/sidepanel/panels/activity/sidePanelNotificationsLogic'
 import { panelLayoutLogic } from '~/layout/panel-layout/panelLayoutLogic'
 
-import type { notificationsMenuLogicType } from './notificationsMenuLogicType'
+import type { PanelLayoutNavIdentifier } from '../../../layout/panel-layout/panelLayoutLogic'
 
 export type NotificationTab = 'all' | 'unread' | 'archived'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface notificationsMenuLogicValues {
+    activeTab: NotificationTab
+    isNotificationsMenuOpen: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface notificationsMenuLogicActions {
+    setActivePanelIdentifier: (identifier: PanelLayoutNavIdentifier) => {
+        identifier: PanelLayoutNavIdentifier
+    } // panelLayoutLogic
+    showLayoutPanel: (visible: boolean) => {
+        visible: boolean
+    } // panelLayoutLogic
+    loadArchivedNotifications: () => {
+        value: true
+    } // sidePanelNotificationsLogic
+    openToUnread: () => {
+        value: true
+    }
+    setActiveTab: (tab: NotificationTab) => {
+        tab: NotificationTab
+    }
+    setNotificationsMenuOpen: (isOpen: boolean) => {
+        isOpen: boolean
+    }
+    toggleNotificationsMenu: () => {
+        value: true
+    }
+}
+
+export type notificationsMenuLogicType = MakeLogicType<notificationsMenuLogicValues, notificationsMenuLogicActions>
+
 export const notificationsMenuLogic = kea<notificationsMenuLogicType>([
     path(['lib', 'components', 'NotificationsMenu', 'notificationsMenuLogic']),
     connect(() => ({
diff --git a/frontend/src/lib/components/ObjectTags/objectTagsLogic.ts b/frontend/src/lib/components/ObjectTags/objectTagsLogic.ts
index 9e1d32d792c6..e8572775f942 100644
--- a/frontend/src/lib/components/ObjectTags/objectTagsLogic.ts
+++ b/frontend/src/lib/components/ObjectTags/objectTagsLogic.ts
@@ -1,9 +1,7 @@
-import { actions, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, kea, key, listeners, path, props, reducers } from 'kea'
 
 import { uniqueBy } from 'lib/utils/arrays'
 
-import type { objectTagsLogicType } from './objectTagsLogicType'
-
 export interface ObjectTagsLogicProps {
     id: string | number
     onChange?: (tags: string[]) => void
@@ -14,6 +12,33 @@ function cleanTag(tag?: string): string {
     return (tag ?? '').trim().toLowerCase()
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface objectTagsLogicValues {
+    editingTags: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface objectTagsLogicActions {
+    setEditingTags: (editingTags: boolean) => {
+        editingTags: boolean
+    }
+    setTags: (tags: string[]) => {
+        tags: string[]
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface objectTagsLogicMeta {
+    key: number | string
+}
+
+export type objectTagsLogicType = MakeLogicType<
+    objectTagsLogicValues,
+    objectTagsLogicActions,
+    ObjectTagsLogicProps,
+    objectTagsLogicMeta
+>
+
 export const objectTagsLogic = kea<objectTagsLogicType>([
     path(['lib', 'components', 'ObjectTags', 'objectTagsLogic']),
     props({} as ObjectTagsLogicProps),
diff --git a/frontend/src/lib/components/PayGateMini/PayGateButton.tsx b/frontend/src/lib/components/PayGateMini/PayGateButton.tsx
index acbbe5305ca4..5db3b49b683a 100644
--- a/frontend/src/lib/components/PayGateMini/PayGateButton.tsx
+++ b/frontend/src/lib/components/PayGateMini/PayGateButton.tsx
@@ -9,7 +9,7 @@ import { paymentEntryLogic } from 'scenes/billing/paymentEntryLogic'
 import { BillingProductV2Type } from '~/types'
 
 import { PayGateMiniLogicProps, payGateMiniLogic } from './payGateMiniLogic'
-import { payGateMiniLogicType } from './payGateMiniLogicType'
+import type { payGateMiniLogicType } from './payGateMiniLogic'
 
 type UsePayGateButtonReturn = Pick<
     payGateMiniLogicType['values'],
diff --git a/frontend/src/lib/components/PayGateMini/payGateMiniLogic.tsx b/frontend/src/lib/components/PayGateMini/payGateMiniLogic.tsx
index 648d28ca731d..a60a37325da7 100644
--- a/frontend/src/lib/components/PayGateMini/payGateMiniLogic.tsx
+++ b/frontend/src/lib/components/PayGateMini/payGateMiniLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, path, props, reducers, selectors } from 'kea'
 
 import { preflightLogic } from 'lib/logic/preflightLogic'
 import { billingLogic } from 'scenes/billing/billingLogic'
@@ -6,7 +6,7 @@ import { userLogic } from 'scenes/userLogic'
 
 import { AvailableFeature, BillingProductV2AddonType, BillingProductV2Type } from '~/types'
 
-import type { payGateMiniLogicType } from './payGateMiniLogicType'
+import type { BillingFeatureType, BillingPlanType, BillingType, UserType } from '../../../types'
 
 export interface PayGateMiniLogicProps {
     feature: AvailableFeature
@@ -15,6 +15,100 @@ export interface PayGateMiniLogicProps {
 
 export type GateVariantType = 'add-card' | 'contact-sales' | 'move-to-cloud' | null
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface payGateMiniLogicValues {
+    billing: BillingType | null // billingLogic
+    billingLoading: boolean // billingLogic
+    isCloudOrDev: boolean | undefined // preflightLogic
+    availableFeature: (feature: AvailableFeature) => BillingFeatureType | null | undefined // userLogic
+    hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean // userLogic
+    user: UserType | null // userLogic
+    addonTrialModalOpen: boolean
+    bypassPaywall: boolean
+    ctaLabel: 'Contact sales' | 'Move to PostHog Cloud' | 'Upgrade now' | 'View plans'
+    ctaLink: string | undefined
+    featureAvailableOnOrg: BillingFeatureType | null | undefined
+    featureInfo: BillingFeatureType | undefined
+    featureInfoOnNextPlan: BillingFeatureType | undefined
+    gateVariant: 'add-card' | 'contact-sales' | 'move-to-cloud' | null
+    isAddonProduct: boolean | undefined
+    isPaymentEntryFlow: boolean
+    minimumPlanWithFeature: BillingPlanType | undefined
+    nextPlanWithFeature: BillingPlanType | null | undefined
+    productWithFeature: BillingProductV2AddonType | BillingProductV2Type | undefined
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface payGateMiniLogicActions {
+    closeAddonTrialModal: () => {
+        value: true
+    }
+    openAddonTrialModal: () => {
+        value: true
+    }
+    setBypassPaywall: (bypassPaywall: boolean) => {
+        bypassPaywall: boolean
+    }
+    setGateVariant: (gateVariant: GateVariantType) => {
+        gateVariant: GateVariantType
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface payGateMiniLogicMeta {
+    key: AvailableFeature
+    __keaTypeGenInternalSelectorTypes: {
+        productWithFeature: (
+            billing: BillingType | null
+        ) => BillingProductV2AddonType | BillingProductV2Type | undefined
+        isAddonProduct: (
+            billing: BillingType | null,
+            productWithFeature: BillingProductV2AddonType | BillingProductV2Type | undefined
+        ) => boolean | undefined
+        featureInfo: (
+            productWithFeature: BillingProductV2AddonType | BillingProductV2Type | undefined
+        ) => BillingFeatureType | undefined
+        featureAvailableOnOrg: (user: UserType | null, arg: any) => BillingFeatureType | null | undefined
+        minimumPlanWithFeature: (
+            productWithFeature: BillingProductV2AddonType | BillingProductV2Type | undefined
+        ) => BillingPlanType | undefined
+        nextPlanWithFeature: (
+            productWithFeature: BillingProductV2AddonType | BillingProductV2Type | undefined
+        ) => BillingPlanType | null | undefined
+        featureInfoOnNextPlan: (
+            nextPlanWithFeature: BillingPlanType | null | undefined
+        ) => BillingFeatureType | undefined
+        gateVariant: (
+            billingLoading: boolean,
+            hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean, // userLogic
+            minimumPlanWithFeature: BillingPlanType | undefined,
+            arg: any,
+            arg2: any
+        ) => 'add-card' | 'contact-sales' | 'move-to-cloud' | null
+        ctaLink: (
+            gateVariant: 'add-card' | 'contact-sales' | 'move-to-cloud' | null,
+            productWithFeature: BillingProductV2AddonType | BillingProductV2Type | undefined,
+            featureInfo: BillingFeatureType | undefined
+        ) => string | undefined
+        ctaLabel: (
+            gateVariant: 'add-card' | 'contact-sales' | 'move-to-cloud' | null,
+            isPaymentEntryFlow: boolean
+        ) => 'Contact sales' | 'Move to PostHog Cloud' | 'Upgrade now' | 'View plans'
+        isPaymentEntryFlow: (
+            gateVariant: 'add-card' | 'contact-sales' | 'move-to-cloud' | null,
+            isAddonProduct: boolean | undefined,
+            billing: BillingType | null
+        ) => boolean
+    }
+}
+
+export type payGateMiniLogicType = MakeLogicType<
+    payGateMiniLogicValues,
+    payGateMiniLogicActions,
+    PayGateMiniLogicProps,
+    payGateMiniLogicMeta
+>
+
 export const payGateMiniLogic = kea<payGateMiniLogicType>([
     props({} as PayGateMiniLogicProps),
     path(['lib', 'components', 'payGateMini', 'payGateMiniLogic']),
@@ -54,7 +148,7 @@ export const payGateMiniLogic = kea<payGateMiniLogicType>([
     selectors(({ values, props }) => ({
         productWithFeature: [
             (s) => [s.billing],
-            (billing) => {
+            (billing: null | import('~/types').BillingType) => {
                 // TODO(@zach): revisit this logic after subscribe to all products is released
                 // There are some features where we want to check the product first
                 const checkProductFirst = [AvailableFeature.ORGANIZATIONS_PROJECTS]
@@ -85,29 +179,33 @@ export const payGateMiniLogic = kea<payGateMiniLogicType>([
         ],
         isAddonProduct: [
             (s) => [s.billing, s.productWithFeature],
-            (billing, productWithFeature) =>
+            (
+                billing: null | import('~/types').BillingType,
+                productWithFeature: BillingProductV2AddonType | BillingProductV2Type | undefined
+            ) =>
                 billing?.products?.some((product) =>
                     product.addons?.some((addon) => addon.type === productWithFeature?.type)
                 ),
         ],
         featureInfo: [
             (s) => [s.productWithFeature],
-            (productWithFeature) => productWithFeature?.features.find((f) => f.key === props.feature),
+            (productWithFeature: BillingProductV2AddonType | BillingProductV2Type | undefined) =>
+                productWithFeature?.features.find((f) => f.key === props.feature),
         ],
         featureAvailableOnOrg: [
             (s) => [s.user, (_, props) => props.feature],
-            (_user, feature) => {
+            (_user: null | import('~/types').UserType, feature) => {
                 return values.availableFeature(feature)
             },
         ],
         minimumPlanWithFeature: [
             (s) => [s.productWithFeature],
-            (productWithFeature) =>
+            (productWithFeature: BillingProductV2AddonType | BillingProductV2Type | undefined) =>
                 productWithFeature?.plans.find((plan) => plan.features?.some((f) => f.key === props.feature)),
         ],
         nextPlanWithFeature: [
             (s) => [s.productWithFeature],
-            (productWithFeature) => {
+            (productWithFeature: BillingProductV2AddonType | BillingProductV2Type | undefined) => {
                 const currentPlanIndex = productWithFeature?.plans.findIndex((plan) => plan.current_plan)
                 if (currentPlanIndex === undefined || currentPlanIndex < 0) {
                     return null
@@ -117,7 +215,8 @@ export const payGateMiniLogic = kea<payGateMiniLogicType>([
         ],
         featureInfoOnNextPlan: [
             (s) => [s.nextPlanWithFeature],
-            (nextPlanWithFeature) => nextPlanWithFeature?.features.find((f) => f.key === props.feature),
+            (nextPlanWithFeature: null | import('~/types').BillingPlanType | undefined) =>
+                nextPlanWithFeature?.features.find((f) => f.key === props.feature),
         ],
         gateVariant: [
             (s) => [
@@ -127,7 +226,13 @@ export const payGateMiniLogic = kea<payGateMiniLogicType>([
                 (_, props) => props.feature,
                 (_, props) => props.currentUsage,
             ],
-            (billingLoading, hasAvailableFeature, minimumPlanWithFeature, feature, currentUsage) => {
+            (
+                billingLoading: boolean,
+                hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean,
+                minimumPlanWithFeature: import('~/types').BillingPlanType | undefined,
+                feature,
+                currentUsage
+            ) => {
                 if (hasAvailableFeature(feature, currentUsage)) {
                     return null
                 }
@@ -145,7 +250,11 @@ export const payGateMiniLogic = kea<payGateMiniLogicType>([
         ],
         ctaLink: [
             (s) => [s.gateVariant, s.productWithFeature, s.featureInfo],
-            (gateVariant, productWithFeature, featureInfo) => {
+            (
+                gateVariant: 'add-card' | 'contact-sales' | 'move-to-cloud' | null,
+                productWithFeature: BillingProductV2AddonType | BillingProductV2Type | undefined,
+                featureInfo: import('~/types').BillingFeatureType | undefined
+            ) => {
                 // product activation is already handled in the startPaymentEntryFlow,
                 // ctaLink is used only when isPaymentEntryFlow is false
                 if (gateVariant === 'add-card') {
@@ -160,7 +269,7 @@ export const payGateMiniLogic = kea<payGateMiniLogicType>([
         ],
         ctaLabel: [
             (s) => [s.gateVariant, s.isPaymentEntryFlow],
-            (gateVariant, isPaymentEntryFlow) => {
+            (gateVariant: 'add-card' | 'contact-sales' | 'move-to-cloud' | null, isPaymentEntryFlow: boolean) => {
                 if (gateVariant === 'contact-sales') {
                     return 'Contact sales'
                 }
@@ -178,7 +287,11 @@ export const payGateMiniLogic = kea<payGateMiniLogicType>([
         ],
         isPaymentEntryFlow: [
             (s) => [s.gateVariant, s.isAddonProduct, s.billing],
-            (gateVariant, isAddonProduct, billing): boolean => {
+            (
+                gateVariant: 'add-card' | 'contact-sales' | 'move-to-cloud' | null,
+                isAddonProduct: boolean | undefined,
+                billing: null | import('~/types').BillingType
+            ): boolean => {
                 // Show payment entry flow only for free customers trying to upgrade to a paid plan
                 // to use core features (not addons)
                 return gateVariant === 'add-card' && !isAddonProduct && billing?.subscription_level === 'free'
diff --git a/frontend/src/lib/components/ProductSetup/globalSetupLogic.ts b/frontend/src/lib/components/ProductSetup/globalSetupLogic.ts
index dfa7dfe5ccbf..2d3125146906 100644
--- a/frontend/src/lib/components/ProductSetup/globalSetupLogic.ts
+++ b/frontend/src/lib/components/ProductSetup/globalSetupLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { subscriptions } from 'kea-subscriptions'
 import posthog from 'posthog-js'
 
@@ -9,9 +9,70 @@ import { teamLogic as globalTeamLogic } from 'scenes/teamLogic'
 import { ProductKey } from '~/queries/schema/schema-general'
 import { ActivationTaskStatus } from '~/types'
 
-import type { globalSetupLogicType } from './globalSetupLogicType'
+import type { AvailableSetupTaskIdsEnumApi } from '../../../generated/core/api.schemas'
 import { PRODUCTS_WITH_SETUP } from './productSetupRegistry'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface globalSetupLogicValues {
+    activeSceneProductKey: ProductKey | null; // sceneLogic
+    availableProducts: ProductKey[];
+    highlightSelector: string | null;
+    isGlobalModalOpen: boolean;
+    isProductSelectionLocked: boolean;
+    optimisticTaskStatuses: Record<string, ActivationTaskStatus | null>;
+    sceneHasNoSetup: boolean;
+    sceneProductKey: ProductKey | null;
+    selectedProduct: ProductKey;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface globalSetupLogicActions {
+    clearHighlightSelector: () => {
+        value: true;
+    };
+    clearOptimisticTaskStatuses: (taskIds: SetupTaskId[]) => {
+        taskIds: AvailableSetupTaskIdsEnumApi[];
+    };
+    closeGlobalSetup: () => {
+        value: true;
+    };
+    markTaskAsCompleted: (taskIdOrIds: SetupTaskId | SetupTaskId[]) => {
+        taskIdOrIds: AvailableSetupTaskIdsEnumApi | AvailableSetupTaskIdsEnumApi[];
+    };
+    markTaskAsSkipped: (taskIdOrIds: SetupTaskId | SetupTaskId[]) => {
+        taskIdOrIds: AvailableSetupTaskIdsEnumApi | AvailableSetupTaskIdsEnumApi[];
+    };
+    openGlobalSetup: () => {
+        value: true;
+    };
+    setHighlightSelector: (selector: string | null) => {
+        selector: string | null;
+    };
+    setOptimisticTaskStatuses: (statuses: Record<string, ActivationTaskStatus | null>) => {
+        statuses: Record<string, ActivationTaskStatus | null>;
+    };
+    setSelectedProduct: (productKey: ProductKey) => {
+        productKey: ProductKey;
+    };
+    unmarkTaskAsCompleted: (taskIdOrIds: SetupTaskId | SetupTaskId[]) => {
+        taskIdOrIds: AvailableSetupTaskIdsEnumApi | AvailableSetupTaskIdsEnumApi[];
+    };
+    unmarkTaskAsSkipped: (taskIdOrIds: SetupTaskId | SetupTaskId[]) => {
+        taskIdOrIds: AvailableSetupTaskIdsEnumApi | AvailableSetupTaskIdsEnumApi[];
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface globalSetupLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        sceneProductKey: (activeSceneProductKey: ProductKey | null) => ProductKey | null;
+        sceneHasNoSetup: (activeSceneProductKey: ProductKey | null) => boolean;
+        isProductSelectionLocked: (sceneProductKey: ProductKey | null) => boolean;
+    };
+}
+
+export type globalSetupLogicType = MakeLogicType<globalSetupLogicValues, globalSetupLogicActions, Record<string, any>, globalSetupLogicMeta>;
+
 /**
  * Global setup logic - the single source of truth for task completion and UI state.
  *
@@ -97,7 +158,7 @@ export const globalSetupLogic = kea<globalSetupLogicType>([
         // Used for auto-selecting the product in the popover
         sceneProductKey: [
             (s) => [s.activeSceneProductKey],
-            (activeSceneProductKey): ProductKey | null => {
+            (activeSceneProductKey: ProductKey | null): ProductKey | null => {
                 if (activeSceneProductKey && PRODUCTS_WITH_SETUP.includes(activeSceneProductKey)) {
                     return activeSceneProductKey
                 }
@@ -108,12 +169,15 @@ export const globalSetupLogic = kea<globalSetupLogicType>([
         // Used to hide the Quick Start button on scenes for products without onboarding
         sceneHasNoSetup: [
             (s) => [s.activeSceneProductKey],
-            (activeSceneProductKey): boolean => {
+            (activeSceneProductKey: ProductKey | null): boolean => {
                 return activeSceneProductKey !== null && !PRODUCTS_WITH_SETUP.includes(activeSceneProductKey)
             },
         ],
         // Whether the product selection is locked to the current scene
-        isProductSelectionLocked: [(s) => [s.sceneProductKey], (sceneProductKey) => sceneProductKey !== null],
+        isProductSelectionLocked: [
+            (s) => [s.sceneProductKey],
+            (sceneProductKey: ProductKey | null) => sceneProductKey !== null,
+        ],
     }),
     // NOTE: Not using `connect` here because the teamLogic might not have mounted yet
     // by the time this logic is mounted
diff --git a/frontend/src/lib/components/ProductSetup/productSetupLogic.ts b/frontend/src/lib/components/ProductSetup/productSetupLogic.ts
index 76a6506c6e96..7bbeee5f0d51 100644
--- a/frontend/src/lib/components/ProductSetup/productSetupLogic.ts
+++ b/frontend/src/lib/components/ProductSetup/productSetupLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { router } from 'kea-router'
 import posthog from 'posthog-js'
 
@@ -11,11 +11,13 @@ import { teamLogic } from 'scenes/teamLogic'
 import { ProductKey } from '~/queries/schema/schema-general'
 import { ActivationTaskStatus } from '~/types'
 
+import type { AvailableSetupTaskIdsEnumApi } from '../../../generated/core/api.schemas'
+import type { TeamPublicType, TeamType } from '../../../types'
 import { reverseProxyCheckerLogic } from '../ReverseProxyChecker/reverseProxyCheckerLogic'
 import { globalSetupLogic } from './globalSetupLogic'
-import type { productSetupLogicType } from './productSetupLogicType'
 import { getProductSetupConfig, getTasksForProduct } from './productSetupRegistry'
 import type { SetupTaskWithState } from './types'
+import type { ProductSetupConfig, SetupTask } from './types'
 
 export interface ProductSetupLogicProps {
     productKey: ProductKey
@@ -23,6 +25,124 @@ export interface ProductSetupLogicProps {
 
 const DISMISSED_STORAGE_KEY = 'posthog_product_setup_dismissed'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface productSetupLogicValues {
+    optimisticTaskStatuses: Record<string, ActivationTaskStatus | null> // globalSetupLogic
+    isCurrentOrganizationNew: boolean // organizationLogic
+    isCloudOrDev: boolean | undefined // preflightLogic
+    hasReverseProxy: boolean | null // reverseProxyCheckerLogic
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    activeTasks: SetupTaskWithState[]
+    allTasks: SetupTask[]
+    completedCount: number
+    completedTasks: SetupTaskWithState[]
+    completionPercent: number
+    firstAvailableTask: SetupTaskWithState | null
+    isDismissed: boolean
+    isModalOpen: boolean
+    isSetupComplete: boolean
+    productConfig: ProductSetupConfig | null
+    remainingCount: number
+    savedOnboardingTasks: Record<string, ActivationTaskStatus | null>
+    shouldShowSetup: boolean
+    showCelebration: boolean
+    skippedTasks: SetupTaskWithState[]
+    tasksWithState: SetupTaskWithState[]
+    totalTasks: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface productSetupLogicActions {
+    closeGlobalSetup: () => {
+        value: true
+    } // globalSetupLogic
+    markTaskAsCompleted: (taskIdOrIds: SetupTaskId | SetupTaskId[]) => {
+        taskIdOrIds: AvailableSetupTaskIdsEnumApi | AvailableSetupTaskIdsEnumApi[]
+    } // globalSetupLogic
+    markTaskAsSkipped: (taskIdOrIds: SetupTaskId | SetupTaskId[]) => {
+        taskIdOrIds: AvailableSetupTaskIdsEnumApi | AvailableSetupTaskIdsEnumApi[]
+    } // globalSetupLogic
+    openGlobalSetup: () => {
+        value: true
+    } // globalSetupLogic
+    setHighlightSelector: (selector: string | null) => {
+        selector: string | null
+    } // globalSetupLogic
+    unmarkTaskAsCompleted: (taskIdOrIds: SetupTaskId | SetupTaskId[]) => {
+        taskIdOrIds: AvailableSetupTaskIdsEnumApi | AvailableSetupTaskIdsEnumApi[]
+    } // globalSetupLogic
+    unmarkTaskAsSkipped: (taskIdOrIds: SetupTaskId | SetupTaskId[]) => {
+        taskIdOrIds: AvailableSetupTaskIdsEnumApi | AvailableSetupTaskIdsEnumApi[]
+    } // globalSetupLogic
+    showInviteModal: () => {
+        value: true
+    } // inviteLogic
+    loadHasReverseProxy: () => any // reverseProxyCheckerLogic
+    closeSetupModal: () => {
+        value: true
+    }
+    dismissSetup: () => {
+        value: true
+    }
+    loadCompletionData: () => {
+        value: true
+    }
+    openSetupModal: () => {
+        value: true
+    }
+    runTask: (taskId: SetupTaskId) => {
+        taskId: AvailableSetupTaskIdsEnumApi
+    }
+    setExpandedTaskId: (taskId: SetupTaskId | null) => {
+        taskId: AvailableSetupTaskIdsEnumApi | null
+    }
+    setShowCelebration: (show: boolean) => {
+        show: boolean
+    }
+    undismissSetup: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface productSetupLogicMeta {
+    key: ProductKey
+    __keaTypeGenInternalSelectorTypes: {
+        productConfig: (productKey: ProductKey) => ProductSetupConfig | null
+        allTasks: (productKey: ProductKey, isCloudOrDev: boolean | undefined) => SetupTask[]
+        savedOnboardingTasks: (
+            currentTeam: TeamPublicType | TeamType | null,
+            optimisticTaskStatuses: Record<string, ActivationTaskStatus | null>
+        ) => Record<string, ActivationTaskStatus | null>
+        tasksWithState: (
+            allTasks: SetupTask[],
+            savedOnboardingTasks: Record<string, ActivationTaskStatus | null>,
+            hasReverseProxy: boolean | null
+        ) => SetupTaskWithState[]
+        activeTasks: (tasksWithState: SetupTaskWithState[]) => SetupTaskWithState[]
+        completedTasks: (tasksWithState: SetupTaskWithState[]) => SetupTaskWithState[]
+        skippedTasks: (tasksWithState: SetupTaskWithState[]) => SetupTaskWithState[]
+        totalTasks: (tasksWithState: SetupTaskWithState[]) => number
+        completedCount: (completedTasks: SetupTaskWithState[], skippedTasks: SetupTaskWithState[]) => number
+        remainingCount: (activeTasks: SetupTaskWithState[]) => number
+        completionPercent: (completedCount: number, totalTasks: number) => number
+        isSetupComplete: (remainingCount: number) => boolean
+        shouldShowSetup: (
+            isSetupComplete: boolean,
+            productConfig: ProductSetupConfig | null,
+            isCurrentOrganizationNew: boolean
+        ) => boolean
+        firstAvailableTask: (activeTasks: SetupTaskWithState[]) => SetupTaskWithState | null
+    }
+}
+
+export type productSetupLogicType = MakeLogicType<
+    productSetupLogicValues,
+    productSetupLogicActions,
+    ProductSetupLogicProps,
+    productSetupLogicMeta
+>
+
 /**
  * Product setup logic - handles product-specific state and UI for the setup experience.
  *
@@ -107,10 +227,10 @@ export const productSetupLogic = kea<productSetupLogicType>([
         ],
     })),
     selectors({
-        productConfig: [(_, p) => [p.productKey], (productKey) => getProductSetupConfig(productKey)],
+        productConfig: [(_, p) => [p.productKey], (productKey: ProductKey) => getProductSetupConfig(productKey)],
         allTasks: [
             (s, p) => [p.productKey, s.isCloudOrDev],
-            (productKey, isCloudOrDev) => {
+            (productKey: ProductKey, isCloudOrDev: boolean | undefined) => {
                 const tasks = getTasksForProduct(productKey)
                 if (!isCloudOrDev) {
                     return tasks.filter((task) => task.id !== SetupTaskId.SetUpReverseProxy)
@@ -122,14 +242,21 @@ export const productSetupLogic = kea<productSetupLogicType>([
         // null in optimistic means "unmarked" - takes priority over saved status
         savedOnboardingTasks: [
             (s) => [s.currentTeam, s.optimisticTaskStatuses],
-            (currentTeam, optimisticTaskStatuses): Record<string, ActivationTaskStatus | null> => ({
+            (
+                currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType,
+                optimisticTaskStatuses: Record<string, ActivationTaskStatus | null>
+            ): Record<string, ActivationTaskStatus | null> => ({
                 ...currentTeam?.onboarding_tasks,
                 ...optimisticTaskStatuses,
             }),
         ],
         tasksWithState: [
             (s) => [s.allTasks, s.savedOnboardingTasks, s.hasReverseProxy],
-            (allTasks, savedOnboardingTasks, hasReverseProxy): SetupTaskWithState[] => {
+            (
+                allTasks: import('lib/components/ProductSetup').SetupTask[],
+                savedOnboardingTasks: Record<string, ActivationTaskStatus | null>,
+                hasReverseProxy: boolean | null
+            ): SetupTaskWithState[] => {
                 return allTasks.map((task) => {
                     // Check for auto-completion conditions
                     let isAutoCompleted = false
@@ -166,18 +293,27 @@ export const productSetupLogic = kea<productSetupLogicType>([
                 })
             },
         ],
-        activeTasks: [(s) => [s.tasksWithState], (tasks) => tasks.filter((task) => !task.completed && !task.skipped)],
-        completedTasks: [(s) => [s.tasksWithState], (tasks) => tasks.filter((task) => task.completed)],
-        skippedTasks: [(s) => [s.tasksWithState], (tasks) => tasks.filter((task) => task.skipped)],
-        totalTasks: [(s) => [s.tasksWithState], (tasks) => tasks.length],
+        activeTasks: [
+            (s) => [s.tasksWithState],
+            (tasks: SetupTaskWithState[]) => tasks.filter((task) => !task.completed && !task.skipped),
+        ],
+        completedTasks: [
+            (s) => [s.tasksWithState],
+            (tasks: SetupTaskWithState[]) => tasks.filter((task) => task.completed),
+        ],
+        skippedTasks: [
+            (s) => [s.tasksWithState],
+            (tasks: SetupTaskWithState[]) => tasks.filter((task) => task.skipped),
+        ],
+        totalTasks: [(s) => [s.tasksWithState], (tasks: SetupTaskWithState[]) => tasks.length],
         completedCount: [
             (s) => [s.completedTasks, s.skippedTasks],
             (completed: SetupTaskWithState[], skipped: SetupTaskWithState[]) => completed.length + skipped.length,
         ],
-        remainingCount: [(s) => [s.activeTasks], (tasks) => tasks.length],
+        remainingCount: [(s) => [s.activeTasks], (tasks: SetupTaskWithState[]) => tasks.length],
         completionPercent: [
             (s) => [s.completedCount, s.totalTasks],
-            (completed, total) => {
+            (completed: number, total: number) => {
                 if (total === 0) {
                     return 100
                 }
@@ -185,10 +321,14 @@ export const productSetupLogic = kea<productSetupLogicType>([
                 return percent >= 5 ? percent : 5 // Min 5% for visibility
             },
         ],
-        isSetupComplete: [(s) => [s.remainingCount], (remaining) => remaining === 0],
+        isSetupComplete: [(s) => [s.remainingCount], (remaining: number) => remaining === 0],
         shouldShowSetup: [
             (s) => [s.isSetupComplete, s.productConfig, s.isCurrentOrganizationNew],
-            (isComplete, config, isNewOrg) => {
+            (
+                isComplete: boolean,
+                config: null | import('lib/components/ProductSetup').ProductSetupConfig,
+                isNewOrg: boolean
+            ) => {
                 // Don't show if no valid config
                 if (!config || !config.title) {
                     return false
@@ -201,7 +341,10 @@ export const productSetupLogic = kea<productSetupLogicType>([
                 return !isComplete
             },
         ],
-        firstAvailableTask: [(s) => [s.activeTasks], (tasks) => tasks.find((t) => !t.lockedReason) ?? null],
+        firstAvailableTask: [
+            (s) => [s.activeTasks],
+            (tasks: SetupTaskWithState[]) => tasks.find((t) => !t.lockedReason) ?? null,
+        ],
     }),
     listeners(({ props, actions, values }) => ({
         runTask: async ({ taskId }) => {
diff --git a/frontend/src/lib/components/PropertiesTimeline/propertiesTimelineLogic.ts b/frontend/src/lib/components/PropertiesTimeline/propertiesTimelineLogic.ts
index e9ee86d08209..70af806311f9 100644
--- a/frontend/src/lib/components/PropertiesTimeline/propertiesTimelineLogic.ts
+++ b/frontend/src/lib/components/PropertiesTimeline/propertiesTimelineLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
@@ -10,8 +10,6 @@ import { teamLogic } from 'scenes/teamLogic'
 import { Properties } from '~/legacy-plugin-scaffold'
 import { ActorType, PropertiesTimelineFilterType } from '~/types'
 
-import type { propertiesTimelineLogicType } from './propertiesTimelineLogicType'
-
 export interface PropertiesTimelinePoint {
     timestamp: Dayjs
     properties: Properties
@@ -36,6 +34,57 @@ export interface PropertiesTimelineProps {
     filter: PropertiesTimelineFilterType
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface propertiesTimelineLogicValues {
+    currentTeamId: number | null // teamLogic
+    timezone: string // teamLogic
+    crucialPropertyKeys: (keyof Properties)[]
+    dateRange: [Dayjs, Dayjs] | null
+    points: PropertiesTimelinePoint[]
+    result: RawPropertiesTimelineResult | null
+    resultLoading: boolean
+    selectedPointIndex: number | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface propertiesTimelineLogicActions {
+    loadResult: () => any
+    loadResultFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadResultSuccess: (
+        result: RawPropertiesTimelineResult,
+        payload?: any
+    ) => {
+        result: RawPropertiesTimelineResult
+        payload?: any
+    }
+    setSelectedPointIndex: (index: number | null) => {
+        index: number | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface propertiesTimelineLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        points: (result: RawPropertiesTimelineResult | null, timezone: string) => PropertiesTimelinePoint[]
+        crucialPropertyKeys: (result: RawPropertiesTimelineResult | null) => (keyof Properties)[]
+        dateRange: (result: RawPropertiesTimelineResult | null, timezone: string) => [Dayjs, Dayjs] | null
+    }
+}
+
+export type propertiesTimelineLogicType = MakeLogicType<
+    propertiesTimelineLogicValues,
+    propertiesTimelineLogicActions,
+    PropertiesTimelineProps,
+    propertiesTimelineLogicMeta
+>
+
 export const propertiesTimelineLogic = kea<propertiesTimelineLogicType>([
     path(['lib', 'components', 'PropertiesTimeline', 'propertiesTimelineLogic']),
     props({} as PropertiesTimelineProps),
@@ -90,7 +139,7 @@ export const propertiesTimelineLogic = kea<propertiesTimelineLogicType>([
     selectors({
         points: [
             (s) => [s.result, s.timezone],
-            (result, timezone) =>
+            (result: RawPropertiesTimelineResult | null, timezone: string) =>
                 result
                     ? result.points.map(
                           (point): PropertiesTimelinePoint => ({
@@ -103,11 +152,12 @@ export const propertiesTimelineLogic = kea<propertiesTimelineLogicType>([
         ],
         crucialPropertyKeys: [
             (s) => [s.result],
-            (result): (keyof Properties)[] => (result ? result.crucial_property_keys : []),
+            (result: RawPropertiesTimelineResult | null): (keyof Properties)[] =>
+                result ? result.crucial_property_keys : [],
         ],
         dateRange: [
             (s) => [s.result, s.timezone],
-            (result, timezone): [Dayjs, Dayjs] | null =>
+            (result: RawPropertiesTimelineResult | null, timezone: string): [Dayjs, Dayjs] | null =>
                 result && [
                     dayjsUtcToTimezone(result.effective_date_from, timezone),
                     dayjsUtcToTimezone(result.effective_date_to, timezone),
diff --git a/frontend/src/lib/components/PropertyFilters/components/distinctIdSelectLogic.ts b/frontend/src/lib/components/PropertyFilters/components/distinctIdSelectLogic.ts
index 7b86ead4ec49..3ccf9551909c 100644
--- a/frontend/src/lib/components/PropertyFilters/components/distinctIdSelectLogic.ts
+++ b/frontend/src/lib/components/PropertyFilters/components/distinctIdSelectLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -7,8 +7,6 @@ import { teamLogic } from 'scenes/teamLogic'
 
 import { PersonType } from '~/types'
 
-import type { distinctIdSelectLogicType } from './distinctIdSelectLogicType'
-
 export interface DistinctIdSelectLogicProps {
     /** Stable per-instance key so two pickers mounted side-by-side don't share state. */
     instanceKey: string
@@ -36,6 +34,72 @@ export async function resolveDistinctIdNames(distinctIds: string[]): Promise<Rec
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface distinctIdSelectLogicValues {
+    currentTeamId: number | null // teamLogic
+    mergedOptions: {
+        key: string
+        label: string
+    }[]
+    persons: PersonType[]
+    personsLoading: boolean
+    resolvedNames: Record<string, string>
+    searchQuery: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface distinctIdSelectLogicActions {
+    loadPersons: ({ search }: { search?: string }) => {
+        search?: string
+    }
+    loadPersonsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPersonsSuccess: (
+        persons: PersonType[],
+        payload?: {
+            search?: string
+        }
+    ) => {
+        persons: PersonType[]
+        payload?: {
+            search?: string
+        }
+    }
+    setResolvedNames: (names: Record<string, string>) => {
+        names: Record<string, string>
+    }
+    setSearchQuery: (query: string) => {
+        query: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface distinctIdSelectLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        mergedOptions: (
+            persons: PersonType[],
+            resolvedNames: Record<string, string>,
+            value: string[]
+        ) => {
+            key: string
+            label: string
+        }[]
+    }
+}
+
+export type distinctIdSelectLogicType = MakeLogicType<
+    distinctIdSelectLogicValues,
+    distinctIdSelectLogicActions,
+    DistinctIdSelectLogicProps,
+    distinctIdSelectLogicMeta
+>
+
 export const distinctIdSelectLogic = kea<distinctIdSelectLogicType>([
     props({} as DistinctIdSelectLogicProps),
     key((props) => props.instanceKey),
diff --git a/frontend/src/lib/components/PropertyFilters/components/groupKeySelectLogic.ts b/frontend/src/lib/components/PropertyFilters/components/groupKeySelectLogic.ts
index 73e875677c98..f2e09a41e68b 100644
--- a/frontend/src/lib/components/PropertyFilters/components/groupKeySelectLogic.ts
+++ b/frontend/src/lib/components/PropertyFilters/components/groupKeySelectLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
@@ -9,8 +9,6 @@ import { teamLogic } from 'scenes/teamLogic'
 
 import { Group, GroupTypeIndex } from '~/types'
 
-import type { groupKeySelectLogicType } from './groupKeySelectLogicType'
-
 export interface GroupKeySelectLogicProps {
     groupTypeIndex: GroupTypeIndex
     value: string[]
@@ -67,6 +65,58 @@ export async function resolveGroupNames(
     return names
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface groupKeySelectLogicValues {
+    currentTeamId: number | null // teamLogic
+    groups: Group[]
+    groupsLoading: boolean
+    resolvedNames: Record<string, string>
+    searchQuery: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface groupKeySelectLogicActions {
+    loadGroups: ({ search }: { search?: string }) => {
+        search?: string
+    }
+    loadGroupsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadGroupsSuccess: (
+        groups: Group[],
+        payload?: {
+            search?: string
+        }
+    ) => {
+        groups: Group[]
+        payload?: {
+            search?: string
+        }
+    }
+    setResolvedNames: (names: Record<string, string>) => {
+        names: Record<string, string>
+    }
+    setSearchQuery: (query: string) => {
+        query: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface groupKeySelectLogicMeta {
+    key: string
+}
+
+export type groupKeySelectLogicType = MakeLogicType<
+    groupKeySelectLogicValues,
+    groupKeySelectLogicActions,
+    GroupKeySelectLogicProps,
+    groupKeySelectLogicMeta
+>
+
 export const groupKeySelectLogic = kea<groupKeySelectLogicType>([
     props({} as GroupKeySelectLogicProps),
     key((props) => `${props.groupTypeIndex}`),
diff --git a/frontend/src/lib/components/PropertyFilters/components/groupKeyTooltipLogic.ts b/frontend/src/lib/components/PropertyFilters/components/groupKeyTooltipLogic.ts
index 0a536426589f..f5f27dc6e04b 100644
--- a/frontend/src/lib/components/PropertyFilters/components/groupKeyTooltipLogic.ts
+++ b/frontend/src/lib/components/PropertyFilters/components/groupKeyTooltipLogic.ts
@@ -1,4 +1,4 @@
-import { afterMount, connect, kea, key, path, props } from 'kea'
+import { MakeLogicType, afterMount, connect, kea, key, path, props } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { teamLogic } from 'scenes/teamLogic'
@@ -6,7 +6,6 @@ import { teamLogic } from 'scenes/teamLogic'
 import { Group, GroupTypeIndex } from '~/types'
 
 import { findGroups } from './groupKeySelectLogic'
-import type { groupKeyTooltipLogicType } from './groupKeyTooltipLogicType'
 
 export interface GroupKeyTooltipLogicProps {
     groupTypeIndex: GroupTypeIndex
@@ -51,6 +50,44 @@ async function cachedFindGroup(
     return null
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface groupKeyTooltipLogicValues {
+    currentTeamId: number | null // teamLogic
+    group: Group | null
+    groupLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface groupKeyTooltipLogicActions {
+    loadGroup: () => any
+    loadGroupFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadGroupSuccess: (
+        group: Group | null,
+        payload?: any
+    ) => {
+        group: Group | null
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface groupKeyTooltipLogicMeta {
+    key: string
+}
+
+export type groupKeyTooltipLogicType = MakeLogicType<
+    groupKeyTooltipLogicValues,
+    groupKeyTooltipLogicActions,
+    GroupKeyTooltipLogicProps,
+    groupKeyTooltipLogicMeta
+>
+
 export const groupKeyTooltipLogic = kea<groupKeyTooltipLogicType>([
     props({} as GroupKeyTooltipLogicProps),
     key((props) => `${props.groupTypeIndex}-${props.groupKey}`),
diff --git a/frontend/src/lib/components/PropertyFilters/components/propertyFilterBetweenLogic.ts b/frontend/src/lib/components/PropertyFilters/components/propertyFilterBetweenLogic.ts
index 413f9b77c1ef..9a59b4736b7e 100644
--- a/frontend/src/lib/components/PropertyFilters/components/propertyFilterBetweenLogic.ts
+++ b/frontend/src/lib/components/PropertyFilters/components/propertyFilterBetweenLogic.ts
@@ -1,9 +1,7 @@
-import { actions, kea, key, listeners, path, props, propsChanged, reducers } from 'kea'
+import { MakeLogicType, actions, kea, key, listeners, path, props, propsChanged, reducers } from 'kea'
 
 import { PropertyFilterBaseValue, PropertyFilterValue } from '~/types'
 
-import type { propertyFilterBetweenLogicType } from './propertyFilterBetweenLogicType'
-
 export interface PropertyFilterBetweenLogicProps {
     key: string
     value: PropertyFilterValue
@@ -23,6 +21,34 @@ function valuesMatch(a?: PropertyFilterBaseValue, b?: PropertyFilterBaseValue):
     return Number.isNaN(a) === Number.isNaN(b) ? true : a === b
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface propertyFilterBetweenLogicValues {
+    localMax: number | null
+    localMin: number | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface propertyFilterBetweenLogicActions {
+    setLocalMax: (value: number | null) => {
+        value: number | null
+    }
+    setLocalMin: (value: number | null) => {
+        value: number | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface propertyFilterBetweenLogicMeta {
+    key: string
+}
+
+export type propertyFilterBetweenLogicType = MakeLogicType<
+    propertyFilterBetweenLogicValues,
+    propertyFilterBetweenLogicActions,
+    PropertyFilterBetweenLogicProps,
+    propertyFilterBetweenLogicMeta
+>
+
 export const propertyFilterBetweenLogic = kea<propertyFilterBetweenLogicType>([
     path(['lib', 'components', 'PropertyFilters', 'components', 'propertyFilterBetweenLogic']),
     props({} as PropertyFilterBetweenLogicProps),
diff --git a/frontend/src/lib/components/PropertyFilters/components/propertyValueLogic.ts b/frontend/src/lib/components/PropertyFilters/components/propertyValueLogic.ts
index 00e005fc1d59..cd293eb7ac8f 100644
--- a/frontend/src/lib/components/PropertyFilters/components/propertyValueLogic.ts
+++ b/frontend/src/lib/components/PropertyFilters/components/propertyValueLogic.ts
@@ -1,23 +1,53 @@
-import { connect, kea, key, path, props, selectors } from 'kea'
+import { MakeLogicType, connect, kea, key, path, props, selectors } from 'kea'
 
 import { propertyDefinitionsModel } from '~/models/propertyDefinitionsModel'
 import { PropertyDefinitionType } from '~/types'
 
-import type { propertyValueLogicType } from './propertyValueLogicType'
+import type { Option } from '../../../../models/propertyDefinitionsModel'
 
 export interface PropertyValueLogicProps {
     propertyKey: string
     type: PropertyDefinitionType
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface propertyValueLogicValues {
+    options: Record<string, Option> // propertyDefinitionsModel
+    isRefreshing: boolean
+    propertyOption: Option
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface propertyValueLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        propertyOption: (options: Record<string, Option>) => Option
+        isRefreshing: (propertyOption: Option) => boolean
+    }
+}
+
+export type propertyValueLogicType = MakeLogicType<
+    propertyValueLogicValues,
+    {},
+    PropertyValueLogicProps,
+    propertyValueLogicMeta
+>
+
 export const propertyValueLogic = kea<propertyValueLogicType>([
     path(['lib', 'components', 'PropertyFilters', 'propertyValueLogic']),
     props({} as PropertyValueLogicProps),
     key((props) => `${props.type}/${props.propertyKey}`),
     connect(() => ({ values: [propertyDefinitionsModel, ['options']] })),
     selectors(({ props }) => ({
-        propertyOption: [(s) => [s.options], (options) => options[props.propertyKey]],
+        propertyOption: [
+            (s) => [s.options],
+            (options: Record<string, import('~/models/propertyDefinitionsModel').Option>) => options[props.propertyKey],
+        ],
         /** Whether a background cache refresh is currently in progress for this property. */
-        isRefreshing: [(s) => [s.propertyOption], (propertyOption): boolean => propertyOption?.refreshing ?? false],
+        isRefreshing: [
+            (s) => [s.propertyOption],
+            (propertyOption: import('~/models/propertyDefinitionsModel').Option): boolean =>
+                propertyOption?.refreshing ?? false,
+        ],
     })),
 ])
diff --git a/frontend/src/lib/components/PropertyFilters/components/taxonomicPropertyFilterLogic.ts b/frontend/src/lib/components/PropertyFilters/components/taxonomicPropertyFilterLogic.ts
index e78eb0b4a050..61d2edad2203 100644
--- a/frontend/src/lib/components/PropertyFilters/components/taxonomicPropertyFilterLogic.ts
+++ b/frontend/src/lib/components/PropertyFilters/components/taxonomicPropertyFilterLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 
 import { TaxonomicPropertyFilterLogicProps } from 'lib/components/PropertyFilters/types'
 import { isValidPropertyFilter } from 'lib/components/PropertyFilters/utils'
@@ -31,7 +31,60 @@ import {
     PropertyOperator,
 } from '~/types'
 
-import type { taxonomicPropertyFilterLogicType } from './taxonomicPropertyFilterLogicType'
+import type { PropertyDefinitionType, PropertyType } from '../../../../types'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface taxonomicPropertyFilterLogicValues {
+    describeProperty: (
+        s: TaxonomicFilterValue,
+        type: PropertyDefinitionType,
+        groupTypeIndex?: number
+    ) => PropertyType | null // propertyDefinitionsModel
+    taxonomicGroups: TaxonomicFilterGroup[] // taxonomicFilterLogic
+    activeTaxonomicGroup: TaxonomicFilterGroup | undefined
+    dropdownOpen: boolean
+    filter: AnyPropertyFilter | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface taxonomicPropertyFilterLogicActions {
+    closeDropdown: () => {
+        value: true
+    }
+    openDropdown: () => {
+        value: true
+    }
+    selectItem: (
+        taxonomicGroup: TaxonomicFilterGroup,
+        propertyKey?: TaxonomicFilterValue,
+        itemPropertyFilterType?: PropertyFilterType,
+        item?: any
+    ) => {
+        item: any
+        itemPropertyFilterType: PropertyFilterType | undefined
+        propertyKey: TaxonomicFilterValue | undefined
+        taxonomicGroup: TaxonomicFilterGroup
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface taxonomicPropertyFilterLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        filter: (filters: AnyPropertyFilter[], filterIndex: number) => AnyPropertyFilter | null
+        activeTaxonomicGroup: (
+            filter: AnyPropertyFilter | null,
+            taxonomicGroups: TaxonomicFilterGroup[]
+        ) => TaxonomicFilterGroup | undefined
+    }
+}
+
+export type taxonomicPropertyFilterLogicType = MakeLogicType<
+    taxonomicPropertyFilterLogicValues,
+    taxonomicPropertyFilterLogicActions,
+    TaxonomicPropertyFilterLogicProps,
+    taxonomicPropertyFilterLogicMeta
+>
 
 export const taxonomicPropertyFilterLogic = kea<taxonomicPropertyFilterLogicType>([
     props({} as TaxonomicPropertyFilterLogicProps),
@@ -80,12 +133,12 @@ export const taxonomicPropertyFilterLogic = kea<taxonomicPropertyFilterLogicType
     selectors({
         filter: [
             (_, p) => [p.filters, p.filterIndex],
-            (filters, filterIndex): AnyPropertyFilter | null =>
+            (filters: AnyPropertyFilter[], filterIndex: number): AnyPropertyFilter | null =>
                 filters[filterIndex] ? sanitizePropertyFilter(filters[filterIndex]) : null,
         ],
         activeTaxonomicGroup: [
             (s) => [s.filter, s.taxonomicGroups],
-            (filter, groups): TaxonomicFilterGroup | undefined => {
+            (filter: AnyPropertyFilter | null, groups: TaxonomicFilterGroup[]): TaxonomicFilterGroup | undefined => {
                 if (isAnyPropertyfilter(filter)) {
                     const taxonomicGroupType = propertyFilterTypeToTaxonomicFilterType(filter)
                     return groups.find((group) => group.type === taxonomicGroupType)
diff --git a/frontend/src/lib/components/PropertyFilters/propertyFilterLogic.ts b/frontend/src/lib/components/PropertyFilters/propertyFilterLogic.ts
index da4078161708..b987c2feb73b 100644
--- a/frontend/src/lib/components/PropertyFilters/propertyFilterLogic.ts
+++ b/frontend/src/lib/components/PropertyFilters/propertyFilterLogic.ts
@@ -1,5 +1,5 @@
 import { deepEqual as equal } from 'fast-equals'
-import { actions, kea, key, listeners, path, props, propsChanged, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, key, listeners, path, props, propsChanged, reducers, selectors } from 'kea'
 
 import { PropertyFilterLogicProps } from 'lib/components/PropertyFilters/types'
 import {
@@ -37,7 +37,6 @@ const TAXONOMIC_GROUP_TYPE_TO_DISPLAY_NAME: Partial<Record<TaxonomicFilterGroupT
     [TaxonomicFilterGroupType.RevenueAnalyticsProperties]: 'Revenue analytics',
 }
 
-import type { propertyFilterLogicType } from './propertyFilterLogicType'
 
 export interface FilterItem {
     _id: number
@@ -56,6 +55,47 @@ function initFiltersState(filters: AnyPropertyFilter[]): FiltersState {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface propertyFilterLogicValues {
+    _filtersState: FiltersState;
+    filledFilters: AnyPropertyFilter[];
+    filterIds: number[];
+    filterIdsWithNew: number[];
+    filters: AnyPropertyFilter[];
+    filtersWithNew: AnyPropertyFilter[];
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface propertyFilterLogicActions {
+    remove: (index: number) => {
+        index: number;
+    };
+    setFilter: (index: number, property: AnyPropertyFilter) => {
+        index: number;
+        property: AnyPropertyFilter;
+    };
+    setFilters: (filters: AnyPropertyFilter[]) => {
+        filters: AnyPropertyFilter[];
+    };
+    update: () => {
+        value: true;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface propertyFilterLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        filters: (_filtersState: FiltersState) => AnyPropertyFilter[];
+        filterIds: (_filtersState: FiltersState) => number[];
+        filledFilters: (filters: AnyPropertyFilter[]) => AnyPropertyFilter[];
+        filtersWithNew: (filters: AnyPropertyFilter[]) => AnyPropertyFilter[];
+        filterIdsWithNew: (filterIds: number[], _filtersState: FiltersState, filtersWithNew: AnyPropertyFilter[]) => number[];
+    };
+}
+
+export type propertyFilterLogicType = MakeLogicType<propertyFilterLogicValues, propertyFilterLogicActions, PropertyFilterLogicProps, propertyFilterLogicMeta>;
+
 export const propertyFilterLogic = kea<propertyFilterLogicType>([
     path((key) => ['lib', 'components', 'PropertyFilters', 'propertyFilterLogic', key]),
     props({} as PropertyFilterLogicProps),
@@ -165,10 +205,10 @@ export const propertyFilterLogic = kea<propertyFilterLogicType>([
             (state: FiltersState): AnyPropertyFilter[] => state.items.map((i) => i.filter),
         ],
         filterIds: [(s) => [s._filtersState], (state: FiltersState): number[] => state.items.map((i) => i._id)],
-        filledFilters: [(s) => [s.filters], (filters) => filters.filter(isValidPropertyFilter)],
+        filledFilters: [(s) => [s.filters], (filters: AnyPropertyFilter[]) => filters.filter(isValidPropertyFilter)],
         filtersWithNew: [
             (s) => [s.filters],
-            (filters) => {
+            (filters: AnyPropertyFilter[]) => {
                 if (filters.length === 0 || isValidPropertyFilter(filters[filters.length - 1])) {
                     return [...filters, {} as AnyPropertyFilter]
                 }
diff --git a/frontend/src/lib/components/PropertyFilters/utils.test.ts b/frontend/src/lib/components/PropertyFilters/utils.test.ts
index 4d377efdfba6..7f273ee49b6e 100644
--- a/frontend/src/lib/components/PropertyFilters/utils.test.ts
+++ b/frontend/src/lib/components/PropertyFilters/utils.test.ts
@@ -12,7 +12,7 @@ import {
     taxonomicFilterTypeToPropertyFilterType,
 } from 'lib/components/PropertyFilters/utils'
 
-import { propertyDefinitionsModelType } from '~/models/propertyDefinitionsModelType'
+import type { propertyDefinitionsModelType } from '~/models/propertyDefinitionsModel'
 import { BreakdownFilter } from '~/queries/schema/schema-general'
 
 import {
diff --git a/frontend/src/lib/components/PropertyFilters/utils.ts b/frontend/src/lib/components/PropertyFilters/utils.ts
index 285b56a058fc..d0f626270db9 100644
--- a/frontend/src/lib/components/PropertyFilters/utils.ts
+++ b/frontend/src/lib/components/PropertyFilters/utils.ts
@@ -9,7 +9,7 @@ import {
 } from 'lib/utils/operators'
 import { capitalizeFirstLetter } from 'lib/utils/strings'
 
-import { propertyDefinitionsModelType } from '~/models/propertyDefinitionsModelType'
+import type { propertyDefinitionsModelType } from '~/models/propertyDefinitionsModel'
 import { extractExpressionComment } from '~/queries/nodes/DataTable/utils'
 import { BreakdownFilter } from '~/queries/schema/schema-general'
 import { getCoreFilterDefinition } from '~/taxonomy/helpers'
diff --git a/frontend/src/lib/components/QuickFilters/quickFilterFormLogic.ts b/frontend/src/lib/components/QuickFilters/quickFilterFormLogic.ts
index 604a47176b96..bbc57f7d4233 100644
--- a/frontend/src/lib/components/QuickFilters/quickFilterFormLogic.ts
+++ b/frontend/src/lib/components/QuickFilters/quickFilterFormLogic.ts
@@ -1,5 +1,6 @@
-import { LogicWrapper, actions, connect, kea, key, listeners, path, props, selectors } from 'kea'
+import { MakeLogicType, LogicWrapper, actions, connect, kea, key, listeners, path, props, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 
 import { propertyFilterTypeToPropertyDefinitionType } from 'lib/components/PropertyFilters/utils'
 import { uuid } from 'lib/utils/dom'
@@ -7,7 +8,8 @@ import { uuid } from 'lib/utils/dom'
 import { propertyDefinitionsModel } from '~/models/propertyDefinitionsModel'
 import { PropertyFilterType, PropertyOperator, QuickFilter, QuickFilterOption } from '~/types'
 
-import type { quickFilterFormLogicType } from './quickFilterFormLogicType'
+import type { Option } from '../../../models/propertyDefinitionsModel'
+import type { PropertyDefinitionType } from '../../../types'
 import { quickFiltersLogic } from './quickFiltersLogic'
 import { ModalView, QuickFiltersModalLogicProps, quickFiltersModalLogic } from './quickFiltersModalLogic'
 
@@ -43,6 +45,128 @@ const trimValue = (value: string | string[] | null): string | string[] | null =>
 
 export const operatorsWithoutValues = [PropertyOperator.IsSet, PropertyOperator.IsNotSet]
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface quickFilterFormLogicValues {
+    propertyOptions: Record<string, Option> // propertyDefinitionsModel
+    isQuickFilterSubmitting: boolean
+    isQuickFilterValid: boolean
+    name: string
+    options: QuickFilterOption[]
+    propertyName: string
+    quickFilter: QuickFilterFormValues
+    quickFilterAllErrors: Record<string, any>
+    quickFilterChanged: boolean
+    quickFilterErrors: DeepPartialMap<QuickFilterFormValues, ValidationErrorType>
+    quickFilterHasErrors: boolean
+    quickFilterManualErrors: Record<string, any>
+    quickFilterTouched: boolean
+    quickFilterTouches: Record<string, boolean>
+    quickFilterValidationErrors: DeepPartialMap<QuickFilterFormValues, ValidationErrorType>
+    showQuickFilterErrors: boolean
+    suggestions: any[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface quickFilterFormLogicActions {
+    loadPropertyValues: (payload: {
+        endpoint: string | undefined
+        eventNames?: string[]
+        newInput: string | undefined
+        properties?: {
+            key: string
+            values: string | string[]
+        }[]
+        propertyKey: string
+        refresh?: string
+        type: PropertyDefinitionType
+    }) => {
+        endpoint: string | undefined
+        eventNames?: string[] | undefined
+        newInput: string | undefined
+        properties?:
+            | {
+                  key: string
+                  values: string | string[]
+              }[]
+            | undefined
+        propertyKey: string
+        refresh?: string | undefined
+        type: PropertyDefinitionType
+    } // propertyDefinitionsModel
+    closeModal: () => {
+        value: true
+    } // quickFiltersModalLogic
+    setView: (view: ModalView) => {
+        view: ModalView
+    } // quickFiltersModalLogic
+    addOption: () => {
+        value: true
+    }
+    removeOption: (index: number) => {
+        index: number
+    }
+    resetQuickFilter: (values?: QuickFilterFormValues) => {
+        values?: QuickFilterFormValues
+    }
+    setQuickFilterManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setQuickFilterValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setQuickFilterValues: (values: DeepPartial<QuickFilterFormValues>) => {
+        values: DeepPartial<QuickFilterFormValues>
+    }
+    submitQuickFilter: () => {
+        value: boolean
+    }
+    submitQuickFilterFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitQuickFilterRequest: (quickFilter: QuickFilterFormValues) => {
+        quickFilter: QuickFilterFormValues
+    }
+    submitQuickFilterSuccess: (quickFilter: QuickFilterFormValues) => {
+        quickFilter: QuickFilterFormValues
+    }
+    touchQuickFilterField: (key: string) => {
+        key: string
+    }
+    updateOption: (
+        index: number,
+        updates: Partial<QuickFilterOption>
+    ) => {
+        index: number
+        updates: Partial<QuickFilterOption>
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface quickFilterFormLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        name: (quickFilter: QuickFilterFormValues) => string
+        propertyName: (quickFilter: QuickFilterFormValues) => string
+        options: (quickFilter: QuickFilterFormValues) => QuickFilterOption[]
+        suggestions: (propertyName: string, propertyOptions: Record<string, Option>) => any[]
+    }
+}
+
+export type quickFilterFormLogicType = MakeLogicType<
+    quickFilterFormLogicValues,
+    quickFilterFormLogicActions,
+    QuickFilterFormLogicProps,
+    quickFilterFormLogicMeta
+>
+
 export const quickFilterFormLogic: LogicWrapper<quickFilterFormLogicType> = kea<quickFilterFormLogicType>([
     path(['lib', 'components', 'QuickFilters', 'quickFilterFormLogic']),
     props({} as QuickFilterFormLogicProps),
@@ -143,12 +267,15 @@ export const quickFilterFormLogic: LogicWrapper<quickFilterFormLogicType> = kea<
     })),
 
     selectors({
-        name: [(s) => [s.quickFilter], (quickFilter) => quickFilter.name],
-        propertyName: [(s) => [s.quickFilter], (quickFilter) => quickFilter.propertyName],
-        options: [(s) => [s.quickFilter], (quickFilter) => quickFilter.options],
+        name: [(s) => [s.quickFilter], (quickFilter: QuickFilterFormValues) => quickFilter.name],
+        propertyName: [(s) => [s.quickFilter], (quickFilter: QuickFilterFormValues) => quickFilter.propertyName],
+        options: [(s) => [s.quickFilter], (quickFilter: QuickFilterFormValues) => quickFilter.options],
         suggestions: [
             (s) => [s.propertyName, s.propertyOptions],
-            (propertyName, propertyOptions): any[] => {
+            (
+                propertyName: string,
+                propertyOptions: Record<string, import('~/models/propertyDefinitionsModel').Option>
+            ): any[] => {
                 return propertyName ? propertyOptions[propertyName]?.values || [] : []
             },
         ],
diff --git a/frontend/src/lib/components/QuickFilters/quickFiltersLogic.ts b/frontend/src/lib/components/QuickFilters/quickFiltersLogic.ts
index ebddc5952111..4bd28a75101d 100644
--- a/frontend/src/lib/components/QuickFilters/quickFiltersLogic.ts
+++ b/frontend/src/lib/components/QuickFilters/quickFiltersLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, key, path, props } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, key, path, props } from 'kea'
 import { loaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
@@ -10,12 +10,120 @@ import { QuickFilterContext } from '~/queries/schema/schema-general'
 import { QuickFilter } from '~/types'
 
 import { QuickFiltersEvents } from './consts'
-import type { quickFiltersLogicType } from './quickFiltersLogicType'
 
 export interface QuickFiltersLogicProps {
     context: QuickFilterContext
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface quickFiltersLogicValues {
+    quickFilters: QuickFilter[]
+    quickFiltersLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface quickFiltersLogicActions {
+    createFilter: (payload: Pick<QuickFilter, 'name' | 'options' | 'property_name' | 'type'>) => {
+        payload: Pick<QuickFilter, 'name' | 'options' | 'property_name' | 'type'>
+    }
+    createFilterFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    createFilterSuccess: (
+        quickFilters: QuickFilter[],
+        payload?: {
+            payload: Pick<QuickFilter, 'name' | 'options' | 'property_name' | 'type'>
+        }
+    ) => {
+        quickFilters: QuickFilter[]
+        payload?: {
+            payload: Pick<QuickFilter, 'name' | 'options' | 'property_name' | 'type'>
+        }
+    }
+    deleteFilter: (id: string) => {
+        id: string
+    }
+    deleteFilterFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteFilterSuccess: (
+        quickFilters: QuickFilter[],
+        payload?: {
+            id: string
+        }
+    ) => {
+        quickFilters: QuickFilter[]
+        payload?: {
+            id: string
+        }
+    }
+    filterUpdated: (filter: QuickFilter) => {
+        filter: QuickFilter
+    }
+    loadQuickFilters: () => any
+    loadQuickFiltersFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadQuickFiltersSuccess: (
+        quickFilters: QuickFilter[],
+        payload?: any
+    ) => {
+        quickFilters: QuickFilter[]
+        payload?: any
+    }
+    updateFilter: (
+        id: string,
+        payload: Partial<Pick<QuickFilter, 'name' | 'options' | 'property_name' | 'type'>>
+    ) => {
+        id: string
+        payload: Partial<Pick<QuickFilter, 'name' | 'options' | 'property_name' | 'type'>>
+    }
+    updateFilterFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateFilterSuccess: (
+        quickFilters: QuickFilter[],
+        payload?: {
+            id: string
+            payload: Partial<Pick<QuickFilter, 'name' | 'options' | 'property_name' | 'type'>>
+        }
+    ) => {
+        quickFilters: QuickFilter[]
+        payload?: {
+            id: string
+            payload: Partial<Pick<QuickFilter, 'name' | 'options' | 'property_name' | 'type'>>
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface quickFiltersLogicMeta {
+    key: QuickFilterContext
+}
+
+export type quickFiltersLogicType = MakeLogicType<
+    quickFiltersLogicValues,
+    quickFiltersLogicActions,
+    QuickFiltersLogicProps,
+    quickFiltersLogicMeta
+>
+
 export const quickFiltersLogic = kea<quickFiltersLogicType>([
     path(['lib', 'components', 'QuickFilters', 'quickFiltersLogic']),
     props({} as QuickFiltersLogicProps),
diff --git a/frontend/src/lib/components/QuickFilters/quickFiltersModalLogic.ts b/frontend/src/lib/components/QuickFilters/quickFiltersModalLogic.ts
index 03c9ccb8f27b..7f128655c09d 100644
--- a/frontend/src/lib/components/QuickFilters/quickFiltersModalLogic.ts
+++ b/frontend/src/lib/components/QuickFilters/quickFiltersModalLogic.ts
@@ -1,13 +1,25 @@
-import { LogicWrapper, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    LogicWrapper,
+    actions,
+    connect,
+    kea,
+    key,
+    listeners,
+    path,
+    props,
+    reducers,
+    selectors,
+} from 'kea'
 import posthog from 'posthog-js'
 
 import { LemonDialog } from '@posthog/lemon-ui'
 
 import { QuickFilter } from '~/types'
 
+import type { QuickFilterContext } from '../../../queries/schema/schema-general'
 import { QuickFiltersEvents } from './consts'
 import { QuickFiltersLogicProps, quickFiltersLogic } from './quickFiltersLogic'
-import type { quickFiltersModalLogicType } from './quickFiltersModalLogicType'
 
 export enum ModalView {
     List = 'list',
@@ -19,6 +31,70 @@ export interface QuickFiltersModalLogicProps extends QuickFiltersLogicProps {
     onNewFilterCreated?: (filter: QuickFilter) => void
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface quickFiltersModalLogicValues {
+    quickFilters: QuickFilter[] // quickFiltersLogic
+    editedFilter: QuickFilter | null
+    filteredQuickFilters: QuickFilter[]
+    isModalOpen: boolean
+    modalTitle: string
+    searchQuery: string
+    view: ModalView
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface quickFiltersModalLogicActions {
+    deleteFilter: (id: string) => {
+        id: string
+    } // quickFiltersLogic
+    closeModal: () => {
+        value: true
+    }
+    confirmDelete: (id: string) => {
+        id: string
+    }
+    handleFormBack: () => {
+        value: true
+    }
+    newFilterCreated: (filter: QuickFilter) => {
+        filter: QuickFilter
+    }
+    openModal: () => {
+        value: true
+    }
+    setEditingFilter: (filter: QuickFilter | null) => {
+        filter: QuickFilter | null
+    }
+    setSearchQuery: (query: string) => {
+        query: string
+    }
+    setView: (view: ModalView) => {
+        view: ModalView
+    }
+    startAddNew: () => {
+        value: true
+    }
+    startEdit: (filter: QuickFilter) => {
+        filter: QuickFilter
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface quickFiltersModalLogicMeta {
+    key: QuickFilterContext
+    __keaTypeGenInternalSelectorTypes: {
+        modalTitle: (view: ModalView, editedFilter: QuickFilter | null) => string
+        filteredQuickFilters: (quickFilters: QuickFilter[], searchQuery: string) => QuickFilter[]
+    }
+}
+
+export type quickFiltersModalLogicType = MakeLogicType<
+    quickFiltersModalLogicValues,
+    quickFiltersModalLogicActions,
+    QuickFiltersModalLogicProps,
+    quickFiltersModalLogicMeta
+>
+
 export const quickFiltersModalLogic: LogicWrapper<quickFiltersModalLogicType> = kea<quickFiltersModalLogicType>([
     path(['lib', 'components', 'QuickFilters', 'quickFiltersModalLogic']),
     props({} as QuickFiltersModalLogicProps),
diff --git a/frontend/src/lib/components/QuickFilters/quickFiltersSectionLogic.ts b/frontend/src/lib/components/QuickFilters/quickFiltersSectionLogic.ts
index a4f15d860c69..aa1542dab73b 100644
--- a/frontend/src/lib/components/QuickFilters/quickFiltersSectionLogic.ts
+++ b/frontend/src/lib/components/QuickFilters/quickFiltersSectionLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers } from 'kea'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 import posthog from 'posthog-js'
 
@@ -7,8 +7,8 @@ import { quickFiltersLogic } from 'lib/components/QuickFilters'
 import { QuickFilterContext } from '~/queries/schema/schema-general'
 import { PropertyOperator, QuickFilterOption } from '~/types'
 
+import type { QuickFilter } from '../../../types'
 import { QuickFiltersEvents } from './consts'
-import type { quickFiltersSectionLogicType } from './quickFiltersSectionLogicType'
 
 const QUICK_FILTERS_URL_PARAM = 'quick_filters'
 
@@ -77,6 +77,75 @@ const removeQuickFilter = (
     return newState
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface quickFiltersSectionLogicValues {
+    quickFilters: QuickFilter[] // quickFiltersLogic
+    selectedQuickFilters: Record<string, SelectedQuickFilter>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface quickFiltersSectionLogicActions {
+    deleteFilter: (id: string) => {
+        id: string
+    } // quickFiltersLogic
+    filterUpdated: (filter: QuickFilter) => {
+        filter: QuickFilter
+    } // quickFiltersLogic
+    loadQuickFiltersSuccess: (
+        quickFilters: QuickFilter[],
+        payload?: any
+    ) => {
+        payload?: any
+        quickFilters: QuickFilter[]
+    } // quickFiltersLogic
+    clearQuickFilter: (filterId: string) => {
+        filterId: string
+    }
+    quickFiltersChanged: () => {
+        value: true
+    }
+    quickFiltersCommitted: () => {
+        value: true
+    }
+    quickFiltersUrlRestoreComplete: () => {
+        value: true
+    }
+    restoreClearQuickFilter: (filterId: string) => {
+        filterId: string
+    }
+    restoreFiltersFromUrl: () => {}
+    restoreQuickFilterValue: (
+        filterId: string,
+        propertyName: string,
+        option: QuickFilterOption
+    ) => {
+        filterId: string
+        option: QuickFilterOption
+        propertyName: string
+    }
+    setQuickFilterValue: (
+        filterId: string,
+        propertyName: string,
+        option: QuickFilterOption
+    ) => {
+        filterId: string
+        option: QuickFilterOption
+        propertyName: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface quickFiltersSectionLogicMeta {
+    key: string
+}
+
+export type quickFiltersSectionLogicType = MakeLogicType<
+    quickFiltersSectionLogicValues,
+    quickFiltersSectionLogicActions,
+    QuickFiltersSectionLogicProps,
+    quickFiltersSectionLogicMeta
+>
+
 export const quickFiltersSectionLogic = kea<quickFiltersSectionLogicType>([
     path(['lib', 'components', 'QuickFilters', 'quickFiltersSectionLogic']),
     props({} as QuickFiltersSectionLogicProps),
diff --git a/frontend/src/lib/components/Resizer/resizerLogic.ts b/frontend/src/lib/components/Resizer/resizerLogic.ts
index a68b6cd0d660..b6118f3440ae 100644
--- a/frontend/src/lib/components/Resizer/resizerLogic.ts
+++ b/frontend/src/lib/components/Resizer/resizerLogic.ts
@@ -1,8 +1,6 @@
-import { actions, beforeUnmount, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, beforeUnmount, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import posthog from 'posthog-js'
 
-import type { resizerLogicType } from './resizerLogicType'
-
 export type ResizerEvent = {
     desiredSize: number
 }
@@ -21,6 +19,52 @@ export type ResizerLogicProps = {
     onDoubleClick?: () => void
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface resizerLogicValues {
+    desiredSize: number | null
+    isResizeInProgress: boolean
+    isStart: boolean
+    isVertical: boolean
+    resizingSize: number | null
+    size: number | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface resizerLogicActions {
+    beginResize: (startXOrY: number) => {
+        startXOrY: number
+    }
+    endResize: () => {
+        value: true
+    }
+    resetDesiredSize: () => {
+        value: true
+    }
+    setDesiredSize: (size: number | null) => {
+        size: number | null
+    }
+    setResizingSize: (size: number | null) => {
+        size: number | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface resizerLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        desiredSize: (size: number | null, resizingSize: number | null, isResizeInProgress: boolean) => number | null
+        isVertical: (placement: 'bottom' | 'left' | 'right' | 'top') => boolean
+        isStart: (placement: 'bottom' | 'left' | 'right' | 'top') => boolean
+    }
+}
+
+export type resizerLogicType = MakeLogicType<
+    resizerLogicValues,
+    resizerLogicActions,
+    ResizerLogicProps,
+    resizerLogicMeta
+>
+
 export const resizerLogic = kea<resizerLogicType>([
     props({} as ResizerLogicProps),
     key((props) => props.logicKey),
@@ -61,12 +105,18 @@ export const resizerLogic = kea<resizerLogicType>([
     selectors({
         desiredSize: [
             (s) => [s.size, s.resizingSize, s.isResizeInProgress],
-            (size, resizingSize, isResizeInProgress) => {
+            (size: number | null, resizingSize: number | null, isResizeInProgress: boolean) => {
                 return isResizeInProgress ? (resizingSize ?? size) : size
             },
         ],
-        isVertical: [(_, p) => [p.placement], (placement) => ['left', 'right'].includes(placement)],
-        isStart: [(_, p) => [p.placement], (placement) => ['left', 'top'].includes(placement)],
+        isVertical: [
+            (_, p) => [p.placement],
+            (placement: 'bottom' | 'left' | 'right' | 'top') => ['left', 'right'].includes(placement),
+        ],
+        isStart: [
+            (_, p) => [p.placement],
+            (placement: 'bottom' | 'left' | 'right' | 'top') => ['left', 'top'].includes(placement),
+        ],
     }),
     listeners(({ cache, props, actions, values }) => ({
         beginResize: ({ startXOrY }) => {
diff --git a/frontend/src/lib/components/ReverseProxyChecker/reverseProxyCheckerLogic.ts b/frontend/src/lib/components/ReverseProxyChecker/reverseProxyCheckerLogic.ts
index 44818de1ae8d..6b41c848b32a 100644
--- a/frontend/src/lib/components/ReverseProxyChecker/reverseProxyCheckerLogic.ts
+++ b/frontend/src/lib/components/ReverseProxyChecker/reverseProxyCheckerLogic.ts
@@ -1,4 +1,4 @@
-import { afterMount, kea, listeners, path } from 'kea'
+import { MakeLogicType, afterMount, kea, listeners, path } from 'kea'
 import { loaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
@@ -8,10 +8,38 @@ import { sceneLogic } from 'scenes/sceneLogic'
 
 import { hogql } from '~/queries/utils'
 
-import type { reverseProxyCheckerLogicType } from './reverseProxyCheckerLogicType'
-
 const CHECK_INTERVAL_MS = 1000 * 60 * 10 // 10 minutes
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface reverseProxyCheckerLogicValues {
+    hasReverseProxy: boolean | null
+    hasReverseProxyLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface reverseProxyCheckerLogicActions {
+    loadHasReverseProxy: () => any
+    loadHasReverseProxyFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadHasReverseProxySuccess: (
+        hasReverseProxy: boolean | null,
+        payload?: any
+    ) => {
+        hasReverseProxy: boolean | null
+        payload?: any
+    }
+}
+
+export type reverseProxyCheckerLogicType = MakeLogicType<
+    reverseProxyCheckerLogicValues,
+    reverseProxyCheckerLogicActions
+>
+
 export const reverseProxyCheckerLogic = kea<reverseProxyCheckerLogicType>([
     path(['components', 'ReverseProxyChecker', 'reverseProxyCheckerLogic']),
     loaders(({ values, cache }) => ({
diff --git a/frontend/src/lib/components/RichContentEditor/richContentEditorLogic.ts b/frontend/src/lib/components/RichContentEditor/richContentEditorLogic.ts
index df5909e3b502..2ea34cb94f33 100644
--- a/frontend/src/lib/components/RichContentEditor/richContentEditorLogic.ts
+++ b/frontend/src/lib/components/RichContentEditor/richContentEditorLogic.ts
@@ -1,6 +1,5 @@
-import { kea, key, path, props, selectors } from 'kea'
+import { MakeLogicType, kea, key, path, props, selectors } from 'kea'
 
-import type { richContentEditorLogicType } from './richContentEditorLogicType'
 import { RichContentEditorType, TTEditor } from './types'
 import { createEditor } from './utils'
 
@@ -9,12 +8,34 @@ export interface RichContentEditorLogicProps {
     editor: TTEditor
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface richContentEditorLogicValues {
+    richContentEditor: RichContentEditorType
+    ttEditor: TTEditor
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface richContentEditorLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        ttEditor: (editor: TTEditor) => TTEditor
+        richContentEditor: (ttEditor: TTEditor) => RichContentEditorType
+    }
+}
+
+export type richContentEditorLogicType = MakeLogicType<
+    richContentEditorLogicValues,
+    {},
+    RichContentEditorLogicProps,
+    richContentEditorLogicMeta
+>
+
 export const richContentEditorLogic = kea<richContentEditorLogicType>([
     path(['lib', 'components', 'RichContentEditor', 'richContentEditorLogic']),
     props({} as RichContentEditorLogicProps),
     key(({ logicKey }) => `RichContentEditor.${logicKey}`),
     selectors({
-        ttEditor: [(_, p) => [p.editor], (editor): TTEditor => editor],
-        richContentEditor: [(s) => [s.ttEditor], (ttEditor): RichContentEditorType => createEditor(ttEditor)],
+        ttEditor: [(_, p) => [p.editor], (editor: TTEditor): TTEditor => editor],
+        richContentEditor: [(s) => [s.ttEditor], (ttEditor: TTEditor): RichContentEditorType => createEditor(ttEditor)],
     }),
 ])
diff --git a/frontend/src/lib/components/SaveToCohortModalContent/saveToCohortModalContentLogic.ts b/frontend/src/lib/components/SaveToCohortModalContent/saveToCohortModalContentLogic.ts
index 515dc9c407e5..a0f86aef90ed 100644
--- a/frontend/src/lib/components/SaveToCohortModalContent/saveToCohortModalContentLogic.ts
+++ b/frontend/src/lib/components/SaveToCohortModalContent/saveToCohortModalContentLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 
@@ -13,8 +13,6 @@ import { urls } from 'scenes/urls'
 import { ActorsQuery } from '~/queries/schema/schema-general'
 import { CohortType } from '~/types'
 
-import type { saveToCohortModalContentLogicType } from './saveToCohortModalContentLogicType'
-
 const COHORTS_PER_PAGE = 100
 
 export interface CohortFilters {
@@ -29,6 +27,80 @@ const DEFAULT_COHORT_FILTERS: CohortFilters = {
     type: 'static',
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface saveToCohortModalContentLogicValues {
+    currentProjectId: number | null // projectLogic
+    cohortFilters: CohortFilters
+    cohorts: CountedPaginatedResponse<CohortType>
+    cohortsLoading: boolean
+    count: number
+    pagination: PaginationManual
+    paramsFromFilters: {
+        limit: number
+        offset: number
+        page?: number | undefined
+        search?: string | undefined
+        type: 'dynamic' | 'static'
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface saveToCohortModalContentLogicActions {
+    loadCohorts: () => any
+    loadCohortsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadCohortsSuccess: (
+        cohorts: {
+            count: number
+            results: CohortType[]
+        },
+        payload?: any
+    ) => {
+        cohorts: {
+            count: number
+            results: CohortType[]
+        }
+        payload?: any
+    }
+    saveQueryToCohort: (
+        cohort: CohortType,
+        query: ActorsQuery
+    ) => {
+        cohort: CohortType
+        query: ActorsQuery
+    }
+    setCohortFilters: (filters: Partial<CohortFilters>) => {
+        filters: Partial<CohortFilters>
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface saveToCohortModalContentLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        count: (cohorts: CountedPaginatedResponse<CohortType>) => number
+        paramsFromFilters: (cohortFilters: CohortFilters) => {
+            limit: number
+            offset: number
+            page?: number | undefined
+            search?: string | undefined
+            type: 'dynamic' | 'static'
+        }
+        pagination: (cohortFilters: CohortFilters, count: number) => PaginationManual
+    }
+}
+
+export type saveToCohortModalContentLogicType = MakeLogicType<
+    saveToCohortModalContentLogicValues,
+    saveToCohortModalContentLogicActions,
+    Record<string, any>,
+    saveToCohortModalContentLogicMeta
+>
+
 export const saveToCohortModalContentLogic = kea<saveToCohortModalContentLogicType>([
     path(['lib', 'components', 'SaveToCohortModal', 'saveToCohortModalContentLogic']),
     connect(() => ({
@@ -64,7 +136,7 @@ export const saveToCohortModalContentLogic = kea<saveToCohortModalContentLogicTy
         },
     })),
     selectors(({ actions }) => ({
-        count: [(selectors) => [selectors.cohorts], (cohorts) => cohorts.count],
+        count: [(selectors) => [selectors.cohorts], (cohorts: CountedPaginatedResponse<CohortType>) => cohorts.count],
         paramsFromFilters: [
             (s) => [s.cohortFilters],
             (filters: CohortFilters) => ({
@@ -75,7 +147,7 @@ export const saveToCohortModalContentLogic = kea<saveToCohortModalContentLogicTy
         ],
         pagination: [
             (s) => [s.cohortFilters, s.count],
-            (filters, count): PaginationManual => {
+            (filters: CohortFilters, count: number): PaginationManual => {
                 return {
                     controlled: true,
                     pageSize: COHORTS_PER_PAGE,
diff --git a/frontend/src/lib/components/SceneDashboardChoice/sceneDashboardChoiceModalLogic.ts b/frontend/src/lib/components/SceneDashboardChoice/sceneDashboardChoiceModalLogic.ts
index 49d24cafa423..63f8f19e6f2f 100644
--- a/frontend/src/lib/components/SceneDashboardChoice/sceneDashboardChoiceModalLogic.ts
+++ b/frontend/src/lib/components/SceneDashboardChoice/sceneDashboardChoiceModalLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import posthog from 'posthog-js'
 
 import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
@@ -10,7 +10,8 @@ import { userLogic } from 'scenes/userLogic'
 import { dashboardsModel } from '~/models/dashboardsModel'
 import { DashboardBasicType } from '~/types'
 
-import type { sceneDashboardChoiceModalLogicType } from './sceneDashboardChoiceModalLogicType'
+import type { Node } from '../../../queries/schema/schema-general'
+import type { DashboardType, QueryBasedInsightModel, TeamPublicType, TeamType, UserType } from '../../../types'
 
 export type DashboardCompatibleScenes = Scene.ProjectHomepage | Scene.Person | Scene.Group
 
@@ -24,6 +25,59 @@ export const sceneDescription: Record<DashboardCompatibleScenes, string> = {
     [Scene.ProjectHomepage]: 'this project',
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sceneDashboardChoiceModalLogicValues {
+    nameSortedDashboards: (DashboardBasicType | DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>>)[] // dashboardsModel
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    user: UserType | null // userLogic
+    currentDashboardId: number | null
+    dashboards: (DashboardBasicType | DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>>)[]
+    isOpen: boolean
+    searchTerm: string | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sceneDashboardChoiceModalLogicActions {
+    updateCurrentTeam: (payload: Partial<TeamType>) => Partial<TeamType> // teamLogic
+    setUserScenePersonalisation: (
+        scene: DashboardCompatibleScenes,
+        dashboard: number
+    ) => {
+        dashboard: number
+        scene: DashboardCompatibleScenes
+    } // userLogic
+    closeSceneDashboardChoiceModal: () => boolean
+    setSceneDashboardChoice: (dashboardId: number | null) => {
+        dashboardId: number | null
+    }
+    setSearchTerm: (searchTerm: string) => {
+        searchTerm: string
+    }
+    showSceneDashboardChoiceModal: () => boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sceneDashboardChoiceModalLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        currentDashboardId: (currentTeam: TeamPublicType | TeamType | null, user: UserType | null) => number | null
+        dashboards: (
+            searchTerm: string | null,
+            nameSortedDashboards: (
+                | DashboardBasicType
+                | DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>>
+            )[]
+        ) => (DashboardBasicType | DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>>)[]
+    }
+}
+
+export type sceneDashboardChoiceModalLogicType = MakeLogicType<
+    sceneDashboardChoiceModalLogicValues,
+    sceneDashboardChoiceModalLogicActions,
+    SceneDashboardChoiceModalProps,
+    sceneDashboardChoiceModalLogicMeta
+>
+
 export const sceneDashboardChoiceModalLogic = kea<sceneDashboardChoiceModalLogicType>([
     path((key) => ['lib', 'components', 'SceneDashboardChoice', 'sceneDashboardChoiceModalLogic', key || 'unknown']),
     props({} as SceneDashboardChoiceModalProps),
@@ -46,7 +100,10 @@ export const sceneDashboardChoiceModalLogic = kea<sceneDashboardChoiceModalLogic
     selectors(({ props }) => ({
         currentDashboardId: [
             (s) => [s.currentTeam, s.user],
-            (currentTeam, user) => {
+            (
+                currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType,
+                user: null | import('~/types').UserType
+            ) => {
                 let currentDashboard: number | DashboardBasicType | null =
                     user?.scene_personalisation?.find((choice) => choice.scene === props.scene)?.dashboard ?? null
 
@@ -59,7 +116,17 @@ export const sceneDashboardChoiceModalLogic = kea<sceneDashboardChoiceModalLogic
         ],
         dashboards: [
             (s) => [s.searchTerm, s.nameSortedDashboards],
-            (searchTerm, dashboards) => {
+            (
+                searchTerm: string | null,
+                dashboards: (
+                    | DashboardBasicType
+                    | import('~/types').DashboardType<
+                          import('~/types').QueryBasedInsightModel<
+                              import('../../../queries/schema').Node<Record<string, any>>
+                          >
+                      >
+                )[]
+            ) => {
                 dashboards = dashboards
                     .filter((d) => !d.deleted)
                     .sort((a, b) => (a.name ?? 'Untitled').localeCompare(b.name ?? 'Untitled'))
diff --git a/frontend/src/lib/components/Search/searchLogic.tsx b/frontend/src/lib/components/Search/searchLogic.tsx
index d619dc745dfb..e1d36c0e81cf 100644
--- a/frontend/src/lib/components/Search/searchLogic.tsx
+++ b/frontend/src/lib/components/Search/searchLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { IconBell, IconClock, IconDownload, IconLeave, IconNotification } from '@posthog/icons'
@@ -25,7 +25,10 @@ import { matchesFlagDefinition } from '~/scenes/settings/flagGating'
 import { Setting, SettingSection, SettingSectionId } from '~/scenes/settings/types'
 import { ActivityTab, FileSystemIconColor, GroupTypeIndex, PersonType, SearchResponse } from '~/types'
 
-import type { searchLogicType } from './searchLogicType'
+import type { Noun } from '../../../models/groupsModel'
+import type { FileSystemImport } from '../../../queries/schema/schema-general'
+import type { GroupType, IntegrationType, UserType } from '../../../types'
+import type { FeatureFlagsSet } from '../../logic/featureFlagLogic'
 import { filterSearchItems } from './utils'
 
 let cachedProductIconColorByType: Map<string, FileSystemIconColor> | null = null
@@ -157,6 +160,276 @@ export interface SettingsSectionSummary {
     }[]
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface searchLogicValues {
+    isCommandOpen: boolean // commandLogic
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun // groupsModel
+    groupTypes: Map<GroupTypeIndex, GroupType> // groupsModel
+    organizationIntegrations: IntegrationType[] | null // organizationIntegrationsLogic
+    isDev: boolean | undefined // preflightLogic
+    cachedStarred: FileSystemEntry[] // projectTreeDataLogic
+    shortcutDataHasLoaded: boolean // projectTreeDataLogic
+    treeGroupItems: FileSystemImport[] // projectTreeDataLogic
+    cachedRecents: FileSystemEntry[] // recentItemsModel
+    recentsHasLoaded: boolean // recentItemsModel
+    sceneLogViewsByRef: Record<string, string> // recentItemsModel
+    sceneLogViewsHasLoaded: boolean // recentItemsModel
+    user: UserType | null // userLogic
+    allCategories: SearchCategory[]
+    dataManagementItems: SearchItem[]
+    groupItems: SearchItem[]
+    groupSearchResults: Partial<Record<GroupTypeIndex, GroupQueryResult[]>>
+    groupSearchResultsLoading: boolean
+    healthItems: SearchItem[]
+    isSearching: boolean
+    loadingStates: {
+        groupSearchResultsLoading: boolean
+        isToolsLoading: boolean
+        personSearchResultsLoading: boolean
+        playlistSearchResultsLoading: boolean
+        recentsHasLoaded: boolean
+        recentsLoading: boolean
+        starredHasLoaded: boolean
+        starredLoading: boolean
+        unifiedSearchResultsLoading: boolean
+    }
+    miscItems: SearchItem[]
+    newItems: SearchItem[]
+    peopleItems: SearchItem[]
+    personItems: SearchItem[]
+    personSearchResults: PersonType[]
+    personSearchResultsLoading: boolean
+    playlistItems: SearchItem[]
+    playlistSearchResults: FileSystemEntry[]
+    playlistSearchResultsLoading: boolean
+    recentItems: SearchItem[]
+    search: string
+    searchPending: boolean
+    searchedRecents: FileSystemEntry[] | null
+    searchedRecentsLoading: boolean
+    settingsItems: SearchItem[]
+    settingsSections: SettingsSectionSummary[]
+    starredItems: SearchItem[]
+    toolsItems: SearchItem[]
+    unifiedSearchItems: Record<string, SearchItem[]>
+    unifiedSearchResults: SearchResponse | null
+    unifiedSearchResultsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface searchLogicActions {
+    loadGroupSearchResults: ({ searchTerm }: { searchTerm: string }) => {
+        searchTerm: string
+    }
+    loadGroupSearchResultsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadGroupSearchResultsSuccess: (
+        groupSearchResults: Partial<Record<GroupTypeIndex, GroupQueryResult[]>>,
+        payload?: {
+            searchTerm: string
+        }
+    ) => {
+        groupSearchResults: Partial<Record<GroupTypeIndex, GroupQueryResult[]>>
+        payload?: {
+            searchTerm: string
+        }
+    }
+    loadPersonSearchResults: ({ searchTerm }: { searchTerm: string }) => {
+        searchTerm: string
+    }
+    loadPersonSearchResultsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPersonSearchResultsSuccess: (
+        personSearchResults: PersonType[],
+        payload?: {
+            searchTerm: string
+        }
+    ) => {
+        personSearchResults: PersonType[]
+        payload?: {
+            searchTerm: string
+        }
+    }
+    loadPlaylistSearchResults: ({ searchTerm }: { searchTerm: string }) => {
+        searchTerm: string
+    }
+    loadPlaylistSearchResultsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPlaylistSearchResultsSuccess: (
+        playlistSearchResults: FileSystemEntry[],
+        payload?: {
+            searchTerm: string
+        }
+    ) => {
+        playlistSearchResults: FileSystemEntry[]
+        payload?: {
+            searchTerm: string
+        }
+    }
+    loadUnifiedSearchResults: ({ searchTerm }: { searchTerm: string }) => {
+        searchTerm: string
+    }
+    loadUnifiedSearchResultsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadUnifiedSearchResultsSuccess: (
+        unifiedSearchResults: SearchResponse | null,
+        payload?: {
+            searchTerm: string
+        }
+    ) => {
+        unifiedSearchResults: SearchResponse | null
+        payload?: {
+            searchTerm: string
+        }
+    }
+    searchRecents: ({ search }: { search: string }) => {
+        search: string
+    }
+    searchRecentsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    searchRecentsSuccess: (
+        searchedRecents: FileSystemEntry[] | null,
+        payload?: {
+            search: string
+        }
+    ) => {
+        searchedRecents: FileSystemEntry[] | null
+        payload?: {
+            search: string
+        }
+    }
+    setSearch: (search: string) => {
+        search: string
+    }
+    setSettingsSections: (sections: SettingsSectionSummary[]) => {
+        sections: SettingsSectionSummary[]
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface searchLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        isSearching: (
+            searchedRecentsLoading: boolean,
+            unifiedSearchResultsLoading: boolean,
+            groupSearchResultsLoading: boolean,
+            personSearchResultsLoading: boolean,
+            playlistSearchResultsLoading: boolean,
+            searchPending: boolean,
+            search: string
+        ) => boolean
+        recentItems: (
+            searchedRecents: FileSystemEntry[] | null,
+            cachedRecents: FileSystemEntry[],
+            search: string
+        ) => SearchItem[]
+        starredItems: (cachedStarred: FileSystemEntry[]) => SearchItem[]
+        toolsItems: (
+            featureFlags: FeatureFlagsSet,
+            isDev: boolean | undefined,
+            user: UserType | null,
+            sceneLogViewsByRef: Record<string, string>
+        ) => SearchItem[]
+        dataManagementItems: (
+            featureFlags: FeatureFlagsSet,
+            isDev: boolean | undefined,
+            user: UserType | null,
+            sceneLogViewsByRef: Record<string, string>
+        ) => SearchItem[]
+        newItems: (featureFlags: FeatureFlagsSet, isDev: boolean | undefined, user: UserType | null) => SearchItem[]
+        peopleItems: (treeGroupItems: FileSystemImport[], sceneLogViewsByRef: Record<string, string>) => SearchItem[]
+        groupItems: (
+            groupSearchResults: Partial<Record<GroupTypeIndex, GroupQueryResult[]>>,
+            aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun
+        ) => SearchItem[]
+        personItems: (personSearchResults: PersonType[]) => SearchItem[]
+        playlistItems: (playlistSearchResults: FileSystemEntry[]) => SearchItem[]
+        healthItems: (sceneLogViewsByRef: Record<string, string>) => SearchItem[]
+        miscItems: (sceneLogViewsByRef: Record<string, string>) => SearchItem[]
+        settingsItems: (
+            featureFlags: FeatureFlagsSet,
+            organizationIntegrations: IntegrationType[] | null,
+            settingsSections: SettingsSectionSummary[]
+        ) => SearchItem[]
+        unifiedSearchItems: (unifiedSearchResults: SearchResponse | null) => Record<string, SearchItem[]>
+        loadingStates: (
+            unifiedSearchResultsLoading: boolean,
+            recentsHasLoaded: boolean,
+            shortcutDataHasLoaded: boolean,
+            sceneLogViewsHasLoaded: boolean,
+            personSearchResultsLoading: boolean,
+            groupSearchResultsLoading: boolean,
+            playlistSearchResultsLoading: boolean
+        ) => {
+            groupSearchResultsLoading: boolean
+            isToolsLoading: boolean
+            personSearchResultsLoading: boolean
+            playlistSearchResultsLoading: boolean
+            recentsHasLoaded: boolean
+            recentsLoading: boolean
+            starredHasLoaded: boolean
+            starredLoading: boolean
+            unifiedSearchResultsLoading: boolean
+        }
+        allCategories: (
+            recentItems: SearchItem[],
+            starredItems: SearchItem[],
+            toolsItems: SearchItem[],
+            dataManagementItems: SearchItem[],
+            peopleItems: SearchItem[],
+            healthItems: SearchItem[],
+            miscItems: SearchItem[],
+            settingsItems: SearchItem[],
+            newItems: SearchItem[],
+            personItems: SearchItem[],
+            groupItems: SearchItem[],
+            playlistItems: SearchItem[],
+            unifiedSearchItems: Record<string, SearchItem[]>,
+            loadingStates: {
+                groupSearchResultsLoading: boolean
+                isToolsLoading: boolean
+                personSearchResultsLoading: boolean
+                playlistSearchResultsLoading: boolean
+                recentsHasLoaded: boolean
+                recentsLoading: boolean
+                starredHasLoaded: boolean
+                starredLoading: boolean
+                unifiedSearchResultsLoading: boolean
+            },
+            search: string
+        ) => SearchCategory[]
+    }
+}
+
+export type searchLogicType = MakeLogicType<searchLogicValues, searchLogicActions, SearchLogicProps, searchLogicMeta>
+
 export const searchLogic = kea<searchLogicType>([
     path((logicKey) => ['lib', 'components', 'Search', 'searchLogic', logicKey]),
     props({} as SearchLogicProps),
@@ -355,14 +628,18 @@ export const searchLogic = kea<searchLogicType>([
         ],
         recentItems: [
             (s) => [s.searchedRecents, s.cachedRecents, s.search],
-            (searchedRecents, cachedRecents, search): SearchItem[] => {
+            (
+                searchedRecents: FileSystemEntry[] | null,
+                cachedRecents: FileSystemEntry[],
+                search: string
+            ): SearchItem[] => {
                 const source = search.trim() ? (searchedRecents ?? []) : cachedRecents.slice(0, RECENTS_LIMIT)
                 return source.map((item) => fileSystemEntryToSearchItem(item, { id: item.path, category: 'recents' }))
             },
         ],
         starredItems: [
             (s) => [s.cachedStarred],
-            (cachedStarred): SearchItem[] => {
+            (cachedStarred: FileSystemEntry[]): SearchItem[] => {
                 return cachedStarred
                     .filter((e) => e.type !== 'folder')
                     .slice(0, STARRED_LIMIT)
@@ -377,7 +654,12 @@ export const searchLogic = kea<searchLogicType>([
         ],
         toolsItems: [
             (s) => [s.featureFlags, s.isDev, s.user, s.sceneLogViewsByRef],
-            (featureFlags, isDev, user, sceneLogViewsByRef): SearchItem[] => {
+            (
+                featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet,
+                isDev: boolean | undefined,
+                user: null | import('~/types').UserType,
+                sceneLogViewsByRef: Record<string, string>
+            ): SearchItem[] => {
                 const allProducts = getTreeItemsProducts()
                 const filteredProducts = allProducts.filter((product) => {
                     if (!product.href) {
@@ -444,7 +726,12 @@ export const searchLogic = kea<searchLogicType>([
         ],
         dataManagementItems: [
             (s) => [s.featureFlags, s.isDev, s.user, s.sceneLogViewsByRef],
-            (featureFlags, isDev, user, sceneLogViewsByRef): SearchItem[] => {
+            (
+                featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet,
+                isDev: boolean | undefined,
+                user: null | import('~/types').UserType,
+                sceneLogViewsByRef: Record<string, string>
+            ): SearchItem[] => {
                 const allMetadata = getTreeItemsMetadata()
                 const filteredMetadata = allMetadata.filter((item) => {
                     if (!isDev && !user?.is_staff && item.category === 'Unreleased') {
@@ -496,7 +783,11 @@ export const searchLogic = kea<searchLogicType>([
         ],
         newItems: [
             (s) => [s.featureFlags, s.isDev, s.user],
-            (featureFlags, isDev, user): SearchItem[] => {
+            (
+                featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet,
+                isDev: boolean | undefined,
+                user: null | import('~/types').UserType
+            ): SearchItem[] => {
                 const allNewItems = getTreeItemsNew()
                 const filteredItems = allNewItems.filter((item) => {
                     if (!isDev && !user?.is_staff && item.category === 'Unreleased') {
@@ -545,7 +836,10 @@ export const searchLogic = kea<searchLogicType>([
         ],
         peopleItems: [
             (s) => [s.treeGroupItems, s.sceneLogViewsByRef],
-            (treeGroupItems, sceneLogViewsByRef): SearchItem[] => {
+            (
+                treeGroupItems: import('~/queries/schema/schema-general').FileSystemImport[],
+                sceneLogViewsByRef: Record<string, string>
+            ): SearchItem[] => {
                 const combined = [...getDefaultTreePersons(), ...treeGroupItems]
                 return combined.map((item) => ({
                     id: `people-${item.path}`,
@@ -567,7 +861,13 @@ export const searchLogic = kea<searchLogicType>([
         ],
         groupItems: [
             (s) => [s.groupSearchResults, s.aggregationLabel],
-            (groupSearchResults, aggregationLabel): SearchItem[] => {
+            (
+                groupSearchResults: Partial<Record<GroupTypeIndex, GroupQueryResult[]>>,
+                aggregationLabel: (
+                    groupTypeIndex: number | null | undefined,
+                    deferToUserWording?: boolean
+                ) => import('~/models/groupsModel').Noun
+            ): SearchItem[] => {
                 const items: SearchItem[] = []
                 for (const [groupTypeIndexString, groups] of Object.entries(groupSearchResults)) {
                     const groupTypeIndex = parseInt(groupTypeIndexString, 10) as GroupTypeIndex
@@ -596,7 +896,7 @@ export const searchLogic = kea<searchLogicType>([
         ],
         personItems: [
             (s) => [s.personSearchResults],
-            (personSearchResults): SearchItem[] => {
+            (personSearchResults: PersonType[]): SearchItem[] => {
                 return personSearchResults
                     .filter((person) => person.uuid) // Skip persons without uuid to avoid invalid URLs
                     .map((person) => {
@@ -624,7 +924,7 @@ export const searchLogic = kea<searchLogicType>([
         ],
         playlistItems: [
             (s) => [s.playlistSearchResults],
-            (playlistSearchResults): SearchItem[] => {
+            (playlistSearchResults: FileSystemEntry[]): SearchItem[] => {
                 return playlistSearchResults.map((item) => {
                     const name = splitPath(item.path).pop()
                     return {
@@ -641,7 +941,7 @@ export const searchLogic = kea<searchLogicType>([
         ],
         healthItems: [
             (s) => [s.sceneLogViewsByRef],
-            (sceneLogViewsByRef): SearchItem[] => [
+            (sceneLogViewsByRef: Record<string, string>): SearchItem[] => [
                 {
                     id: 'health-pipeline-status',
                     name: 'Pipeline status',
@@ -666,7 +966,7 @@ export const searchLogic = kea<searchLogicType>([
         ],
         miscItems: [
             (s) => [s.sceneLogViewsByRef],
-            (sceneLogViewsByRef): SearchItem[] => [
+            (sceneLogViewsByRef: Record<string, string>): SearchItem[] => [
                 {
                     id: 'misc-exports',
                     name: 'Exports',
@@ -715,7 +1015,11 @@ export const searchLogic = kea<searchLogicType>([
         ],
         settingsItems: [
             (s) => [s.featureFlags, s.organizationIntegrations, s.settingsSections],
-            (featureFlags, organizationIntegrations, settingsSections): SearchItem[] => {
+            (
+                featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet,
+                organizationIntegrations: import('~/types').IntegrationType[] | null,
+                settingsSections: SettingsSectionSummary[]
+            ): SearchItem[] => {
                 const checkFlag = (flagKey: Pick<Setting, 'flag'>['flag']): boolean =>
                     matchesFlagDefinition(flagKey, featureFlags)
 
@@ -798,7 +1102,7 @@ export const searchLogic = kea<searchLogicType>([
         ],
         unifiedSearchItems: [
             (s) => [s.unifiedSearchResults],
-            (unifiedSearchResults): Record<string, SearchItem[]> => {
+            (unifiedSearchResults: SearchResponse | null): Record<string, SearchItem[]> => {
                 if (!unifiedSearchResults) {
                     return {}
                 }
diff --git a/frontend/src/lib/components/Sharing/sharePasswordsLogic.ts b/frontend/src/lib/components/Sharing/sharePasswordsLogic.ts
index 5d7a7d2030b7..5d0fe6d8d83b 100644
--- a/frontend/src/lib/components/Sharing/sharePasswordsLogic.ts
+++ b/frontend/src/lib/components/Sharing/sharePasswordsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, kea, key, listeners, path, props, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -6,8 +6,6 @@ import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
 
 import { SharePasswordType } from '~/types'
 
-import type { sharePasswordsLogicType } from './sharePasswordsLogicType'
-
 export interface SharePasswordsLogicProps {
     dashboardId?: number
     insightId?: number
@@ -15,6 +13,83 @@ export interface SharePasswordsLogicProps {
     notebookShortId?: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sharePasswordsLogicValues {
+    createdPasswordResult: {
+        created_at: string
+        created_by_email: string
+        id: string
+        note: string
+        password: string
+    } | null
+    isCreatingPassword: boolean
+    newPasswordModalOpen: boolean
+    sharePasswords: SharePasswordType[]
+    sharePasswordsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sharePasswordsLogicActions {
+    clearCreatedPasswordResult: () => {
+        value: true
+    }
+    createPassword: (
+        password?: string,
+        note?: string
+    ) => {
+        note: string | undefined
+        password: string | undefined
+    }
+    createPasswordFailure: (error: any) => {
+        error: any
+    }
+    createPasswordSuccess: (response: any) => {
+        response: any
+    }
+    deletePassword: (passwordId: string) => {
+        passwordId: string
+    }
+    loadSharePasswords: () => {
+        value: true
+    }
+    loadSharePasswordsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSharePasswordsSuccess: (
+        sharePasswords: SharePasswordType[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        sharePasswords: SharePasswordType[]
+        payload?: {
+            value: true
+        }
+    }
+    setNewPasswordModalOpen: (open: boolean) => {
+        open: boolean
+    }
+    setSharePasswords: (passwords: SharePasswordType[]) => {
+        passwords: SharePasswordType[]
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sharePasswordsLogicMeta {
+    key: string
+}
+
+export type sharePasswordsLogicType = MakeLogicType<
+    sharePasswordsLogicValues,
+    sharePasswordsLogicActions,
+    SharePasswordsLogicProps,
+    sharePasswordsLogicMeta
+>
+
 export const sharePasswordsLogic = kea<sharePasswordsLogicType>([
     path(['lib', 'components', 'Sharing', 'sharePasswordsLogic']),
     props({} as SharePasswordsLogicProps),
diff --git a/frontend/src/lib/components/Sharing/sharingLogic.ts b/frontend/src/lib/components/Sharing/sharingLogic.ts
index c13bcab25b56..571b8d4e42be 100644
--- a/frontend/src/lib/components/Sharing/sharingLogic.ts
+++ b/frontend/src/lib/components/Sharing/sharingLogic.ts
@@ -1,5 +1,6 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -13,8 +14,6 @@ import { userLogic } from 'scenes/userLogic'
 import { dashboardsModel } from '~/models/dashboardsModel'
 import { AvailableFeature, InsightShortId, OrganizationType, SharingConfigurationType } from '~/types'
 
-import type { sharingLogicType } from './sharingLogicType'
-
 export interface SharingLogicProps {
     dashboardId?: number
     insightShortId?: InsightShortId
@@ -60,6 +59,287 @@ const propsToApiParams = async (
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sharingLogicValues {
+    accessControlAvailable: boolean
+    embedCode: string
+    embedLink: string
+    iframeKey: number
+    iframeProperties: {
+        allowFullScreen: true
+        frameBorder: number
+        height: string
+        key: number
+        sandbox: string
+        src: string
+        width: string
+    }
+    isSharingSettingsSubmitting: boolean
+    isSharingSettingsValid: boolean
+    params: any
+    shareLink: string
+    sharingAllowed: boolean
+    sharingConfiguration: SharingConfigurationType | null
+    sharingConfigurationLoading: boolean
+    sharingSettings: {
+        hideExtraDetails: boolean
+        legend: boolean
+        noHeader: boolean
+        showInspector: boolean
+        theme: string
+        whitelabel: boolean
+    }
+    sharingSettingsAllErrors: Record<string, any>
+    sharingSettingsChanged: boolean
+    sharingSettingsErrors: DeepPartialMap<
+        {
+            hideExtraDetails: boolean
+            legend: boolean
+            noHeader: boolean
+            showInspector: boolean
+            theme: string
+            whitelabel: boolean
+        },
+        ValidationErrorType
+    >
+    sharingSettingsHasErrors: boolean
+    sharingSettingsManualErrors: Record<string, any>
+    sharingSettingsTouched: boolean
+    sharingSettingsTouches: Record<string, boolean>
+    sharingSettingsValidationErrors: DeepPartialMap<
+        {
+            hideExtraDetails: boolean
+            legend: boolean
+            noHeader: boolean
+            showInspector: boolean
+            theme: string
+            whitelabel: boolean
+        },
+        ValidationErrorType
+    >
+    showPreview: boolean
+    showSharingSettingsErrors: boolean
+    siteUrl: string | undefined
+    whitelabelAvailable: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sharingLogicActions {
+    loadSharingConfiguration: () => any
+    loadSharingConfigurationFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSharingConfigurationSuccess: (
+        sharingConfiguration: SharingConfigurationType | null,
+        payload?: any
+    ) => {
+        sharingConfiguration: SharingConfigurationType | null
+        payload?: any
+    }
+    reloadIframe: () => {
+        value: true
+    }
+    resetSharingSettings: (values?: {
+        hideExtraDetails: boolean
+        legend: boolean
+        noHeader: boolean
+        showInspector: boolean
+        theme: string
+        whitelabel: boolean
+    }) => {
+        values?: {
+            hideExtraDetails: boolean
+            legend: boolean
+            noHeader: boolean
+            showInspector: boolean
+            theme: string
+            whitelabel: boolean
+        }
+    }
+    setIsEnabled: (enabled: boolean) => boolean
+    setIsEnabledFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    setIsEnabledSuccess: (
+        sharingConfiguration: SharingConfigurationType | null,
+        payload?: boolean
+    ) => {
+        sharingConfiguration: SharingConfigurationType | null
+        payload?: boolean
+    }
+    setPasswordRequired: (password_required: boolean) => boolean
+    setPasswordRequiredFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    setPasswordRequiredSuccess: (
+        sharingConfiguration: SharingConfigurationType | null,
+        payload?: boolean
+    ) => {
+        sharingConfiguration: SharingConfigurationType | null
+        payload?: boolean
+    }
+    setSharingSettingsManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setSharingSettingsValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setSharingSettingsValues: (
+        values: DeepPartial<{
+            hideExtraDetails: boolean
+            legend: boolean
+            noHeader: boolean
+            showInspector: boolean
+            theme: string
+            whitelabel: boolean
+        }>
+    ) => {
+        values: DeepPartial<{
+            hideExtraDetails: boolean
+            legend: boolean
+            noHeader: boolean
+            showInspector: boolean
+            theme: string
+            whitelabel: boolean
+        }>
+    }
+    submitSharingSettings: () => {
+        value: boolean
+    }
+    submitSharingSettingsFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitSharingSettingsRequest: (sharingSettings: {
+        hideExtraDetails: boolean
+        legend: boolean
+        noHeader: boolean
+        showInspector: boolean
+        theme: string
+        whitelabel: boolean
+    }) => {
+        sharingSettings: {
+            hideExtraDetails: boolean
+            legend: boolean
+            noHeader: boolean
+            showInspector: boolean
+            theme: string
+            whitelabel: boolean
+        }
+    }
+    submitSharingSettingsSuccess: (sharingSettings: {
+        hideExtraDetails: boolean
+        legend: boolean
+        noHeader: boolean
+        showInspector: boolean
+        theme: string
+        whitelabel: boolean
+    }) => {
+        sharingSettings: {
+            hideExtraDetails: boolean
+            legend: boolean
+            noHeader: boolean
+            showInspector: boolean
+            theme: string
+            whitelabel: boolean
+        }
+    }
+    togglePreview: () => {
+        value: true
+    }
+    touchSharingSettingsField: (key: string) => {
+        key: string
+    }
+    updateSettings: (settings: Record<string, any>) => Record<string, any>
+    updateSettingsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateSettingsSuccess: (
+        sharingConfiguration: SharingConfigurationType | null,
+        payload?: Record<string, any>
+    ) => {
+        sharingConfiguration: SharingConfigurationType | null
+        payload?: Record<string, any>
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sharingLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        siteUrl: (preflight: null | import('~/types').PreflightStatus) => string | undefined
+        whitelabelAvailable: (
+            hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean
+        ) => boolean
+        accessControlAvailable: (
+            hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean
+        ) => boolean
+        sharingAllowed: (currentOrganization: OrganizationType | null) => boolean
+        params: (arg: any) => any
+        shareLink: (
+            siteUrl: string | undefined,
+            sharingConfiguration: SharingConfigurationType | null,
+            params: any
+        ) => string
+        embedLink: (
+            siteUrl: string | undefined,
+            sharingConfiguration: SharingConfigurationType | null,
+            params: any
+        ) => string
+        iframeProperties: (
+            embedLink: string,
+            iframeKey: number
+        ) => {
+            allowFullScreen: true
+            frameBorder: number
+            height: string
+            key: number
+            sandbox: string
+            src: string
+            width: string
+        }
+        embedCode: (iframeProperties: {
+            allowFullScreen: true
+            frameBorder: number
+            height: string
+            key: number
+            sandbox: string
+            src: string
+            width: string
+        }) => string
+    }
+}
+
+export type sharingLogicType = MakeLogicType<
+    sharingLogicValues,
+    sharingLogicActions,
+    SharingLogicProps,
+    sharingLogicMeta
+>
+
 export const sharingLogic = kea<sharingLogicType>([
     path(['lib', 'components', 'Sharing', 'sharingLogic']),
     props({} as SharingLogicProps),
@@ -152,15 +432,20 @@ export const sharingLogic = kea<sharingLogicType>([
         },
     }),
     selectors({
-        siteUrl: [() => [preflightLogic.selectors.preflight], (preflight) => preflight?.site_url],
+        siteUrl: [
+            () => [preflightLogic.selectors.preflight],
+            (preflight: null | import('~/types').PreflightStatus) => preflight?.site_url,
+        ],
 
         whitelabelAvailable: [
             () => [userLogic.selectors.hasAvailableFeature],
-            (hasAvailableFeature) => hasAvailableFeature(AvailableFeature.WHITE_LABELLING),
+            (hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean) =>
+                hasAvailableFeature(AvailableFeature.WHITE_LABELLING),
         ],
         accessControlAvailable: [
             () => [userLogic.selectors.hasAvailableFeature],
-            (hasAvailableFeature) => hasAvailableFeature(AvailableFeature.ACCESS_CONTROL),
+            (hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean) =>
+                hasAvailableFeature(AvailableFeature.ACCESS_CONTROL),
         ],
 
         sharingAllowed: [
@@ -177,19 +462,19 @@ export const sharingLogic = kea<sharingLogicType>([
 
         shareLink: [
             (s) => [s.siteUrl, s.sharingConfiguration, s.params],
-            (siteUrl, sharingConfiguration, params) =>
+            (siteUrl: string | undefined, sharingConfiguration: SharingConfigurationType | null, params) =>
                 sharingConfiguration ? siteUrl + urls.shared(sharingConfiguration.access_token, params) : '',
         ],
 
         embedLink: [
             (s) => [s.siteUrl, s.sharingConfiguration, s.params],
-            (siteUrl, sharingConfiguration, params) =>
+            (siteUrl: string | undefined, sharingConfiguration: SharingConfigurationType | null, params) =>
                 sharingConfiguration ? siteUrl + urls.embedded(sharingConfiguration.access_token, params) : '',
         ],
 
         iframeProperties: [
             (s) => [s.embedLink, s.iframeKey],
-            (embedLink, iframeKey) => ({
+            (embedLink: string, iframeKey: number) => ({
                 width: defaultIframeConfig.width,
                 height: defaultIframeConfig.height,
                 frameBorder: 0,
@@ -203,7 +488,15 @@ export const sharingLogic = kea<sharingLogicType>([
 
         embedCode: [
             (s) => [s.iframeProperties],
-            (iframeProperties) =>
+            (iframeProperties: {
+                allowFullScreen: true
+                frameBorder: number
+                height: string
+                key: number
+                sandbox: string
+                src: string
+                width: string
+            }) =>
                 `<iframe ${Object.entries(iframeProperties)
                     .map(([key, value]) => {
                         if (value === true) {
diff --git a/frontend/src/lib/components/Shortcuts/shortcutLogic.tsx b/frontend/src/lib/components/Shortcuts/shortcutLogic.tsx
index d74fc657f9ce..a6c40ce162fd 100644
--- a/frontend/src/lib/components/Shortcuts/shortcutLogic.tsx
+++ b/frontend/src/lib/components/Shortcuts/shortcutLogic.tsx
@@ -1,11 +1,9 @@
-import { actions, afterMount, beforeUnmount, kea, path, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, beforeUnmount, kea, path, reducers } from 'kea'
 
 import posthog from 'lib/posthog-typed'
 import { isMac } from 'lib/utils/dom'
 import { Scene } from 'scenes/sceneTypes'
 
-import type { shortcutLogicType } from './shortcutLogicType'
-
 const IS_MAC = isMac()
 const COMMAND_OR_CTRL = IS_MAC ? 'command' : 'ctrl'
 
@@ -102,6 +100,31 @@ function isEditableElement(event: KeyboardEvent): boolean {
     )
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface shortcutLogicValues {
+    disabledShortcutNames: string[]
+    registeredShortcuts: ShortcutType[]
+    shortcutMenuOpen: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface shortcutLogicActions {
+    registerShortcut: (shortcut: ShortcutType) => {
+        shortcut: ShortcutType
+    }
+    setShortcutMenuOpen: (open: boolean) => {
+        open: boolean
+    }
+    toggleShortcutDisabled: (name: string) => {
+        name: string
+    }
+    unregisterShortcut: (name: string) => {
+        name: string
+    }
+}
+
+export type shortcutLogicType = MakeLogicType<shortcutLogicValues, shortcutLogicActions>
+
 export const shortcutLogic = kea<shortcutLogicType>([
     path(['lib', 'components', 'Shortcuts', 'shortcutLogic']),
     actions({
diff --git a/frontend/src/lib/components/Shortcuts/utils/DebugCHQueriesImpl.tsx b/frontend/src/lib/components/Shortcuts/utils/DebugCHQueriesImpl.tsx
index 339d5f624d3b..20ccb1b41b90 100644
--- a/frontend/src/lib/components/Shortcuts/utils/DebugCHQueriesImpl.tsx
+++ b/frontend/src/lib/components/Shortcuts/utils/DebugCHQueriesImpl.tsx
@@ -1,6 +1,6 @@
 import ChartDataLabels from 'chartjs-plugin-datalabels'
 import ChartjsPluginStacked100 from 'chartjs-plugin-stacked100'
-import { actions, afterMount, kea, path, reducers, selectors, useActions, useValues } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, path, reducers, selectors, useActions, useValues } from 'kea'
 import { loaders } from 'kea-loaders'
 import { useMemo, useState } from 'react'
 
@@ -23,7 +23,6 @@ import { urls } from 'scenes/urls'
 import { FilterLogicalOperator, PropertyFilterType, PropertyOperator } from '~/types'
 
 import { CodeSnippet, Language } from '../../CodeSnippet'
-import type { debugCHQueriesLogicType } from './DebugCHQueriesImplType'
 
 export interface Stats {
     total_queries: number
@@ -63,6 +62,52 @@ export interface DebugResponse {
     hourly_stats: DataPoint[]
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface debugCHQueriesLogicValues {
+    debugResponse: DebugResponse
+    debugResponseLoading: boolean
+    filteredQueries: Query[]
+    pathFilter: string | null
+    paths: [string, number][] | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface debugCHQueriesLogicActions {
+    loadDebugResponse: () => any
+    loadDebugResponseFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadDebugResponseSuccess: (
+        debugResponse: DebugResponse,
+        payload?: any
+    ) => {
+        debugResponse: DebugResponse
+        payload?: any
+    }
+    setPathFilter: (path: string | null) => {
+        path: string | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface debugCHQueriesLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        paths: (debugResponse: DebugResponse) => [string, number][] | null
+        filteredQueries: (debugResponse: DebugResponse, pathFilter: string | null) => Query[]
+    }
+}
+
+export type debugCHQueriesLogicType = MakeLogicType<
+    debugCHQueriesLogicValues,
+    debugCHQueriesLogicActions,
+    Record<string, any>,
+    debugCHQueriesLogicMeta
+>
+
 const debugCHQueriesLogic = kea<debugCHQueriesLogicType>([
     path(['lib', 'components', 'CommandPalette', 'DebugCHQueries']),
     actions({
diff --git a/frontend/src/lib/components/Superpowers/superpowersLogic.ts b/frontend/src/lib/components/Superpowers/superpowersLogic.ts
index bb17e0c89ed9..c0d29d56d5ea 100644
--- a/frontend/src/lib/components/Superpowers/superpowersLogic.ts
+++ b/frontend/src/lib/components/Superpowers/superpowersLogic.ts
@@ -1,15 +1,62 @@
-import { actions, connect, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, path, reducers, selectors } from 'kea'
 
 import { mcpHintLogic } from 'lib/components/MCPHint/mcpHintLogic'
 import { preflightLogic } from 'lib/logic/preflightLogic'
 // eslint-disable-next-line import/no-cycle
 import { userLogic } from 'scenes/userLogic'
 
-import type { superpowersLogicType } from './superpowersLogicType'
+import type { PreflightStatus, UserType } from '../../../types'
 
 export type FakeStatusOverride = 'none' | 'operational' | 'degraded_performance' | 'partial_outage' | 'major_outage'
 export type FakeBillingAlert = 'none' | 'info' | 'warning' | 'error'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface superpowersLogicValues {
+    dismissedSurfaces: Record<string, true> // mcpHintLogic
+    effectiveOptOut: boolean // mcpHintLogic
+    preflight: PreflightStatus | null // preflightLogic
+    user: UserType | null // userLogic
+    fakeBillingAlert: FakeBillingAlert
+    fakeStatusOverride: FakeStatusOverride
+    isSuperpowersOpen: boolean
+    mcpHintsDismissed: boolean
+    superpowersEnabled: boolean | undefined
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface superpowersLogicActions {
+    reenableMCPHints: () => {
+        value: true
+    } // mcpHintLogic
+    closeSuperpowers: () => {
+        value: true
+    }
+    openSuperpowers: () => {
+        value: true
+    }
+    setFakeBillingAlert: (alert: FakeBillingAlert) => {
+        alert: FakeBillingAlert
+    }
+    setFakeStatusOverride: (status: FakeStatusOverride) => {
+        status: FakeStatusOverride
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface superpowersLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        superpowersEnabled: (user: UserType | null, preflight: PreflightStatus | null) => boolean | undefined
+        mcpHintsDismissed: (dismissedSurfaces: Record<string, true>, effectiveOptOut: boolean) => boolean
+    }
+}
+
+export type superpowersLogicType = MakeLogicType<
+    superpowersLogicValues,
+    superpowersLogicActions,
+    Record<string, any>,
+    superpowersLogicMeta
+>
+
 export const superpowersLogic = kea<superpowersLogicType>([
     path(['lib', 'components', 'Superpowers', 'superpowersLogic']),
     connect(() => ({
@@ -53,7 +100,10 @@ export const superpowersLogic = kea<superpowersLogicType>([
     selectors({
         superpowersEnabled: [
             (s) => [s.user, s.preflight],
-            (user, preflight) => {
+            (
+                user: null | import('../../../types').UserType,
+                preflight: null | import('../../../types').PreflightStatus
+            ) => {
                 return user?.is_staff || preflight?.is_debug || preflight?.instance_preferences?.debug_queries
             },
         ],
diff --git a/frontend/src/lib/components/Support/supportLogic.ts b/frontend/src/lib/components/Support/supportLogic.ts
index 29b754fa457c..07976fcc2377 100644
--- a/frontend/src/lib/components/Support/supportLogic.ts
+++ b/frontend/src/lib/components/Support/supportLogic.ts
@@ -1,5 +1,6 @@
-import { actions, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import posthog from 'posthog-js'
 
 import { LemonSelectOptions } from '@posthog/lemon-ui'
@@ -27,8 +28,9 @@ import {
     UserType,
 } from '~/types'
 
+import type { BillingType, PreflightStatus } from '../../../types'
+import type { FeatureFlagsSet } from '../../logic/featureFlagLogic'
 import { parseExceptionEvent } from './exceptionUtils'
-import type { supportLogicType } from './supportLogicType'
 import { openSupportModal } from './SupportModal'
 
 export function getPublicSupportSnippet(
@@ -467,6 +469,141 @@ export type SupportFormFields = {
     tags?: string[]
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface supportLogicValues {
+    billing: BillingType | null // billingLogic
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    isCurrentOrganizationNew: boolean // organizationLogic
+    preflight: PreflightStatus | null // preflightLogic
+    sidePanelAvailable: boolean // sidePanelStateLogic
+    hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean // userLogic
+    user: UserType | null // userLogic
+    conversationsFlagEnabled: boolean
+    isEmailFormOpen: boolean
+    isSendSupportRequestSubmitting: boolean
+    isSendSupportRequestValid: boolean
+    isSupportFormOpen: boolean
+    lastSubmittedTicketId: string | null
+    pendingViewTicket: {
+        created_at: string
+        id: string
+        status: string
+    } | null
+    sendSupportRequest: SupportFormFields
+    sendSupportRequestAllErrors: Record<string, any>
+    sendSupportRequestChanged: boolean
+    sendSupportRequestErrors: DeepPartialMap<SupportFormFields, ValidationErrorType>
+    sendSupportRequestHasErrors: boolean
+    sendSupportRequestManualErrors: Record<string, any>
+    sendSupportRequestTouched: boolean
+    sendSupportRequestTouches: Record<string, boolean>
+    sendSupportRequestValidationErrors: DeepPartialMap<SupportFormFields, ValidationErrorType>
+    showSendSupportRequestErrors: boolean
+    targetArea: SupportTicketTargetArea | null
+    title: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface supportLogicActions {
+    openSidePanel: (
+        tab: SidePanelTab,
+        options?: string | undefined
+    ) => {
+        options: string | undefined
+        tab: SidePanelTab
+    } // sidePanelStateLogic
+    setSidePanelOptions: (options: string | null) => {
+        options: string | null
+    } // sidePanelStateLogic
+    clearPendingViewTicket: () => {
+        value: true
+    }
+    closeEmailForm: () => {
+        value: true
+    }
+    closeSupportForm: () => {
+        value: true
+    }
+    ensureZendeskOrganization: () => {
+        value: true
+    }
+    openEmailForm: () => {
+        value: true
+    }
+    openSupportForm: (
+        values: Partial<SupportFormFields> & {
+            target?: 'modal' | 'sidePanel'
+        }
+    ) => Partial<SupportFormFields> & {
+        target?: 'modal' | 'sidePanel' | undefined
+    }
+    resetSendSupportRequest: (values?: SupportFormFields) => {
+        values?: SupportFormFields
+    }
+    setLastSubmittedTicketId: (ticketId: string | null) => {
+        ticketId: string | null
+    }
+    setSendSupportRequestManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setSendSupportRequestValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setSendSupportRequestValues: (values: DeepPartial<SupportFormFields>) => {
+        values: DeepPartial<SupportFormFields>
+    }
+    submitSendSupportRequest: () => {
+        value: boolean
+    }
+    submitSendSupportRequestFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitSendSupportRequestRequest: (sendSupportRequest: SupportFormFields) => {
+        sendSupportRequest: SupportFormFields
+    }
+    submitSendSupportRequestSuccess: (sendSupportRequest: SupportFormFields) => {
+        sendSupportRequest: SupportFormFields
+    }
+    submitSupportTicket: (form: SupportFormFields) => SupportFormFields
+    touchSendSupportRequestField: (key: string) => {
+        key: string
+    }
+    updateUrlParams: () => {
+        value: true
+    }
+    viewConversationsTicket: (ticket: { created_at: string; id: string; status: string }) => {
+        ticket: {
+            created_at: string
+            id: string
+            status: string
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface supportLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        title: (arg: SupportFormFields) => string
+        targetArea: (sendSupportRequest: SupportFormFields) => SupportTicketTargetArea | null
+        conversationsFlagEnabled: (featureFlags: FeatureFlagsSet) => boolean
+    }
+}
+
+export type supportLogicType = MakeLogicType<
+    supportLogicValues,
+    supportLogicActions,
+    SupportFormLogicProps,
+    supportLogicMeta
+>
+
 export const supportLogic = kea<supportLogicType>([
     props({} as SupportFormLogicProps),
     path(['lib', 'components', 'support', 'supportLogic']),
@@ -567,7 +704,7 @@ export const supportLogic = kea<supportLogicType>([
     selectors({
         title: [
             (s) => [s.sendSupportRequest ?? null],
-            (sendSupportRequest) =>
+            (sendSupportRequest: SupportFormFields) =>
                 sendSupportRequest.kind
                     ? SUPPORT_TICKET_KIND_TO_TITLE[sendSupportRequest.kind]
                     : 'Leave a message with PostHog',
@@ -578,7 +715,8 @@ export const supportLogic = kea<supportLogicType>([
         ],
         conversationsFlagEnabled: [
             (s) => [s.featureFlags],
-            (featureFlags): boolean => !!featureFlags[FEATURE_FLAGS.PRODUCT_SUPPORT_SIDE_PANEL],
+            (featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet): boolean =>
+                !!featureFlags[FEATURE_FLAGS.PRODUCT_SUPPORT_SIDE_PANEL],
         ],
     }),
     listeners(({ actions, props, values }) => ({
diff --git a/frontend/src/lib/components/Support/supportRouterLogic.ts b/frontend/src/lib/components/Support/supportRouterLogic.ts
index 183dcf18058e..5c2b9405bf2b 100644
--- a/frontend/src/lib/components/Support/supportRouterLogic.ts
+++ b/frontend/src/lib/components/Support/supportRouterLogic.ts
@@ -1,4 +1,4 @@
-import { kea, path } from 'kea'
+import { MakeLogicType, kea, path } from 'kea'
 import { urlToAction } from 'kea-router'
 
 import { organizationLogic } from 'scenes/organizationLogic'
@@ -13,7 +13,6 @@ import {
     supportLogic,
     TARGET_AREA_TO_NAME,
 } from './supportLogic'
-import type { supportRouterLogicType } from './supportRouterLogicType'
 
 // Mirrors navigationLogic's `mode === 'full'` (the condition that mounts <SidePanel />), derived from
 // sources supportLogic can't import without a billingLogic init cycle. Keep here, not in supportLogic.
@@ -28,6 +27,9 @@ function shouldUseSidePanel(searchParams: Record<string, any>): boolean {
     return sceneLogic.findMounted()?.values.sceneConfig?.layout !== 'plain'
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export type supportRouterLogicType = MakeLogicType<{}, {}>
+
 export const supportRouterLogic = kea<supportRouterLogicType>([
     path(['lib', 'components', 'support', 'supportRouterLogic']),
     urlToAction(() => ({
diff --git a/frontend/src/lib/components/TablePreview/databaseTablePreviewLogic.ts b/frontend/src/lib/components/TablePreview/databaseTablePreviewLogic.ts
index 08f7aed86923..6793498352e9 100644
--- a/frontend/src/lib/components/TablePreview/databaseTablePreviewLogic.ts
+++ b/frontend/src/lib/components/TablePreview/databaseTablePreviewLogic.ts
@@ -1,11 +1,10 @@
-import { afterMount, kea, key, path, props, propsChanged } from 'kea'
+import { MakeLogicType, afterMount, kea, key, path, props, propsChanged } from 'kea'
 import { loaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
 import { hogqlQuery } from '~/queries/query'
 import { hogql } from '~/queries/utils'
 
-import type { databaseTablePreviewLogicType } from './databaseTablePreviewLogicType'
 import type { TablePreviewExpressionColumn } from './types'
 
 export interface DatabaseTablePreviewLogicProps {
@@ -18,6 +17,47 @@ export interface DatabaseTablePreviewLogicProps {
 
 const DEFAULT_LIMIT = 10
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface databaseTablePreviewLogicValues {
+    previewData: Record<string, any>[]
+    previewDataLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface databaseTablePreviewLogicActions {
+    loadPreviewData: () => any
+    loadPreviewDataFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPreviewDataSuccess: (
+        previewData: {
+            [k: string]: any
+        }[],
+        payload?: any
+    ) => {
+        previewData: {
+            [k: string]: any
+        }[]
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface databaseTablePreviewLogicMeta {
+    key: string
+}
+
+export type databaseTablePreviewLogicType = MakeLogicType<
+    databaseTablePreviewLogicValues,
+    databaseTablePreviewLogicActions,
+    DatabaseTablePreviewLogicProps,
+    databaseTablePreviewLogicMeta
+>
+
 export const databaseTablePreviewLogic = kea<databaseTablePreviewLogicType>([
     path((logicKey) => ['lib', 'components', 'TablePreview', 'databaseTablePreviewLogic', logicKey]),
     props({} as DatabaseTablePreviewLogicProps),
diff --git a/frontend/src/lib/components/TakeScreenshot/takeScreenshotLogic.ts b/frontend/src/lib/components/TakeScreenshot/takeScreenshotLogic.ts
index ee6773119684..e1502d1758d7 100644
--- a/frontend/src/lib/components/TakeScreenshot/takeScreenshotLogic.ts
+++ b/frontend/src/lib/components/TakeScreenshot/takeScreenshotLogic.ts
@@ -1,10 +1,8 @@
-import { actions, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, kea, key, listeners, path, props, reducers } from 'kea'
 import posthog from 'posthog-js'
 
 import { lemonToast } from '@posthog/lemon-ui'
 
-import type { takeScreenshotLogicType } from './takeScreenshotLogicType'
-
 // Define interfaces for better type safety
 export interface Point {
     x: number
@@ -35,6 +33,105 @@ export interface TakeScreenshotLogicProps {
     screenshotKey?: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface takeScreenshotLogicValues {
+    color: string
+    currentPath: any[]
+    currentText: string
+    dragStartOffset: Point | null
+    drawings: any[]
+    fontSize: number
+    historyStack: any[]
+    imageFile: File | null
+    isDrawing: boolean
+    isLoading: boolean
+    isOpen: boolean
+    lineWidth: number
+    mode: string
+    originalImage: HTMLImageElement | null
+    selectedTextIndex: number | null
+    textInputPosition: {
+        visible: boolean
+        x: number
+        y: number
+    }
+    texts: any[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface takeScreenshotLogicActions {
+    setBlob: (blob: Blob) => {
+        blob: Blob
+    }
+    setColor: (color: string) => {
+        color: string
+    }
+    setCurrentPath: (currentPath: Point[]) => {
+        currentPath: Point[]
+    }
+    setCurrentText: (currentText: string) => {
+        currentText: string
+    }
+    setDragStartOffset: (dragStartOffset: Point | null) => {
+        dragStartOffset: Point | null
+    }
+    setDrawings: (drawings: DrawingItem[]) => {
+        drawings: DrawingItem[]
+    }
+    setFontSize: (fontSize: number) => {
+        fontSize: number
+    }
+    setHistoryStack: (historyStack: HistoryItem[]) => {
+        historyStack: HistoryItem[]
+    }
+    setImageFile: (imageFile: File | null) => {
+        imageFile: File | null
+    }
+    setIsDrawing: (isDrawing: boolean) => {
+        isDrawing: boolean
+    }
+    setIsLoading: (isLoading: boolean) => {
+        isLoading: boolean
+    }
+    setIsOpen: (isOpen: boolean) => {
+        isOpen: boolean
+    }
+    setLineWidth: (lineWidth: number) => {
+        lineWidth: number
+    }
+    setMode: (mode: 'draw' | 'moveText' | 'text') => {
+        mode: 'draw' | 'moveText' | 'text'
+    }
+    setOriginalImage: (originalImage: HTMLImageElement | null) => {
+        originalImage: HTMLImageElement | null
+    }
+    setSelectedTextIndex: (selectedTextIndex: number | null) => {
+        selectedTextIndex: number | null
+    }
+    setTextInputPosition: (textInputPosition: { visible: boolean; x: number; y: number }) => {
+        textInputPosition: {
+            visible: boolean
+            x: number
+            y: number
+        }
+    }
+    setTexts: (texts: TextItem[]) => {
+        texts: TextItem[]
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface takeScreenshotLogicMeta {
+    key: string
+}
+
+export type takeScreenshotLogicType = MakeLogicType<
+    takeScreenshotLogicValues,
+    takeScreenshotLogicActions,
+    TakeScreenshotLogicProps,
+    takeScreenshotLogicMeta
+>
+
 export const takeScreenshotLogic = kea<takeScreenshotLogicType>([
     path((key) => ['lib', 'components', 'TakeScreenshot', 'takeScreenshotLogic', key]),
     props({} as TakeScreenshotLogicProps),
diff --git a/frontend/src/lib/components/TaxonomicFilter/infiniteListLogic.ts b/frontend/src/lib/components/TaxonomicFilter/infiniteListLogic.ts
index 61ce86f6425b..ec7c87fd9519 100644
--- a/frontend/src/lib/components/TaxonomicFilter/infiniteListLogic.ts
+++ b/frontend/src/lib/components/TaxonomicFilter/infiniteListLogic.ts
@@ -1,4 +1,17 @@
-import { actions, connect, events, isBreakpoint, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    connect,
+    events,
+    isBreakpoint,
+    kea,
+    key,
+    listeners,
+    path,
+    props,
+    reducers,
+    selectors,
+} from 'kea'
 import { loaders } from 'kea-loaders'
 import { combineUrl } from 'kea-router'
 import posthog from 'posthog-js'
@@ -55,7 +68,7 @@ import { CohortType, EventDefinition, GroupTypeIndex, PropertyType } from '~/typ
 
 import { teamLogic } from '../../../scenes/teamLogic'
 import { getItemGroup } from './InfiniteList'
-import type { infiniteListLogicType } from './infiniteListLogicType'
+import type { SelectItemMeta, TopMatchItem } from './taxonomicFilterLogic'
 
 function pinnedItemMatchesSearch(
     item: TaxonomicDefinitionTypes,
@@ -228,6 +241,560 @@ async function fetchCachedListResponse(path: string, searchParams: Record<string
     return response
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface infiniteListLogicValues {
+    recentFilterItems: TaxonomicDefinitionTypes[] // recentTaxonomicFiltersLogic
+    activeTab: TaxonomicFilterGroupType // taxonomicFilterLogic
+    anyGroupLoading: boolean // taxonomicFilterLogic
+    anyGroupStale: boolean // taxonomicFilterLogic
+    groupType: any // taxonomicFilterLogic
+    includeStaleEvents: boolean // taxonomicFilterLogic
+    searchQuery: string // taxonomicFilterLogic
+    taxonomicGroupTypes: TaxonomicFilterGroupType[] // taxonomicFilterLogic
+    taxonomicGroups: TaxonomicFilterGroup[] // taxonomicFilterLogic
+    topMatchItemsWithSkeletons: (SkeletonItem | TopMatchItem)[] // taxonomicFilterLogic
+    value: any // taxonomicFilterLogic
+    pinnedFilterItems: TaxonomicDefinitionTypes[] // taxonomicFilterPinnedPropertiesLogic
+    currentTeamId: number | null // teamLogic
+    allowNonCapturedEvents: boolean
+    contextFilteredPinnedItems: TaxonomicDefinitionTypes[]
+    contextFilteredRecentItems: TaxonomicDefinitionTypes[]
+    dedupedTopMatches: (SkeletonItem | TaxonomicDefinitionTypes)[]
+    excludedProperties: string[] | undefined
+    expandedCount: number
+    fuse: ListFuse
+    group: TaxonomicFilterGroup | undefined
+    hasAppliedInitialPin: boolean
+    hasMore: boolean
+    hasRemoteDataSource: boolean
+    hasRenderFunction: boolean
+    index: number
+    initialPinnedRowIndex: number | null
+    isActiveTab: boolean
+    isExpandable: boolean
+    isExpandableButtonSelected: boolean
+    isExpanded: boolean
+    isLoading: boolean
+    isLocalDataLoading: boolean
+    isSoleSubstantiveGroup: boolean
+    isSuggestedFilters: boolean
+    items:
+        | {
+              count: number
+              expandedCount?: undefined
+              first: boolean | undefined
+              queryChanged: boolean | undefined
+              results: QuickFilterItem[]
+              searchQuery: string | undefined
+              syntheticSelectedCount: number
+          }
+        | {
+              count: number
+              expandedCount: number | undefined
+              first: boolean | undefined
+              queryChanged: boolean | undefined
+              results: (SkeletonItem | TaxonomicDefinitionTypes)[]
+              searchQuery: string | undefined
+              syntheticSelectedCount: number
+          }
+    keywordShortcutItems: QuickFilterItem[]
+    limit: number
+    listGroupType: TaxonomicFilterGroupType
+    localItems: ListStorage
+    minSearchQueryLength: any
+    needsMoreSearchCharacters: boolean
+    pinnedRowIndex: number | null
+    propertyAllowList: string[] | undefined
+    rawLocalItems: (CohortType | EventDefinition)[]
+    remoteEndpoint: string | null
+    remoteFetchFailed: string | null
+    remoteItems: ListStorage
+    remoteItemsLoading: boolean
+    remoteResultsAreFresh: boolean
+    results: QuickFilterItem[] | (SkeletonItem | TaxonomicDefinitionTypes)[]
+    rowCount: number
+    scopedRemoteEndpoint: string | null
+    selectedItem: TaxonomicDefinitionTypes | undefined
+    selectedItemInView: boolean
+    selectedItemValue: number | string | null
+    selectionPromotionContext: {
+        group: TaxonomicFilterGroup | undefined
+        groupType: TaxonomicFilterGroupType | undefined
+        value: TaxonomicFilterValue | undefined
+    }
+    showEmptyState: boolean
+    showLoadingState: boolean
+    showNonCapturedEventOption: boolean
+    showPopover: boolean
+    showSuggestedFiltersEmptyState: boolean
+    soleGroupHasGetValue: boolean
+    startIndex: number
+    stopIndex: number
+    suggestedFiltersSettling: boolean
+    suggestedPinnedMatches: TaxonomicDefinitionTypes[]
+    suggestedRecentMatches: TaxonomicDefinitionTypes[]
+    topMatchesForQuery: TaxonomicDefinitionTypes[]
+    totalExtraCount: number
+    totalListCount: number
+    totalResultCount: number
+    trimmedSearchQuery: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface infiniteListLogicActions {
+    infiniteListResultsReceived: (
+        groupType: TaxonomicFilterGroupType,
+        results: ListStorage
+    ) => {
+        groupType: TaxonomicFilterGroupType
+        results: ListStorage
+    } // taxonomicFilterLogic
+    selectItem: (
+        group: TaxonomicFilterGroup,
+        value: TaxonomicFilterValue,
+        item: any,
+        meta?: SelectItemMeta | undefined
+    ) => {
+        group: TaxonomicFilterGroup
+        item: any
+        meta: SelectItemMeta | undefined
+        value: TaxonomicFilterValue
+    } // taxonomicFilterLogic
+    setActiveTab: (activeTab: TaxonomicFilterGroupType) => {
+        activeTab: TaxonomicFilterGroupType
+    } // taxonomicFilterLogic
+    setIncludeStaleEvents: (includeStaleEvents: boolean) => {
+        includeStaleEvents: boolean
+    } // taxonomicFilterLogic
+    setSearchQuery: (searchQuery: string) => {
+        searchQuery: string
+    } // taxonomicFilterLogic
+    abortAnyRunningQuery: () => {
+        value: true
+    }
+    applyInitialPinnedRow: (rowIndex: number) => {
+        rowIndex: number
+    }
+    expand: () => {
+        value: true
+    }
+    loadRemoteItems: (options: LoaderOptions) => LoaderOptions
+    loadRemoteItemsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRemoteItemsSuccess: (
+        remoteItems:
+            | ListStorage
+            | {
+                  count: any
+                  expandedCount: any
+                  loadDurationMs: number | undefined
+                  queryChanged: boolean
+                  results: TaxonomicDefinitionTypes[]
+                  searchQuery: string
+              },
+        payload?: LoaderOptions
+    ) => {
+        remoteItems:
+            | ListStorage
+            | {
+                  count: any
+                  expandedCount: any
+                  loadDurationMs: number | undefined
+                  queryChanged: boolean
+                  results: TaxonomicDefinitionTypes[]
+                  searchQuery: string
+              }
+        payload?: LoaderOptions
+    }
+    moveDown: () => {
+        value: true
+    }
+    moveUp: () => {
+        value: true
+    }
+    onRowsRendered: (rowInfo: RowInfo) => {
+        rowInfo: RowInfo
+    }
+    reconcilePinnedRowState: () => {
+        value: true
+    }
+    remoteItemsFetchFailedForQuery: (searchQuery: string) => {
+        searchQuery: string
+    }
+    resetPinnedRowState: () => {
+        value: true
+    }
+    selectSelected: () => {
+        value: true
+    }
+    setHasMore: (hasMore: boolean) => {
+        hasMore: boolean
+    }
+    setIndex: (index: number) => {
+        index: number
+    }
+    setLimit: (limit: number) => {
+        limit: number
+    }
+    setPinnedRowIndex: (pinnedRowIndex: number | null) => {
+        pinnedRowIndex: number | null
+    }
+    togglePinnedRow: (rowIndex: number) => {
+        rowIndex: number
+    }
+    updateRemoteItem: (item: TaxonomicDefinitionTypes) => {
+        item: TaxonomicDefinitionTypes
+    }
+    updateRemoteItemFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateRemoteItemSuccess: (
+        remoteItems: {
+            count: number
+            expandedCount?: number | undefined
+            first?: boolean | undefined
+            loadDurationMs?: number | undefined
+            queryChanged?: boolean | undefined
+            results: TaxonomicDefinitionTypes[]
+            searchQuery?: string | undefined
+        },
+        payload?: {
+            item: TaxonomicDefinitionTypes
+        }
+    ) => {
+        remoteItems: {
+            count: number
+            expandedCount?: number | undefined
+            first?: boolean | undefined
+            loadDurationMs?: number | undefined
+            queryChanged?: boolean | undefined
+            results: TaxonomicDefinitionTypes[]
+            searchQuery?: string | undefined
+        }
+        payload?: {
+            item: TaxonomicDefinitionTypes
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface infiniteListLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        listGroupType: (listGroupType: TaxonomicFilterGroupType) => TaxonomicFilterGroupType
+        isSuggestedFilters: (listGroupType: TaxonomicFilterGroupType) => boolean
+        trimmedSearchQuery: (searchQuery: string) => string
+        isActiveTab: (listGroupType: TaxonomicFilterGroupType, activeTab: TaxonomicFilterGroupType) => boolean
+        contextFilteredRecentItems: (
+            recentFilterItems: TaxonomicDefinitionTypes[],
+            taxonomicGroupTypes: TaxonomicFilterGroupType[],
+            arg: ExcludedOperators | undefined,
+            arg2: import('lib/components/TaxonomicFilter/types').SelectingKeyOnly | undefined,
+            arg3: import('lib/components/TaxonomicFilter/types').TaxonomicFilterGroupValueMap | undefined
+        ) => TaxonomicDefinitionTypes[]
+        contextFilteredPinnedItems: (
+            pinnedFilterItems: TaxonomicDefinitionTypes[],
+            taxonomicGroupTypes: TaxonomicFilterGroupType[]
+        ) => TaxonomicDefinitionTypes[]
+        isSoleSubstantiveGroup: (
+            listGroupType: TaxonomicFilterGroupType,
+            taxonomicGroupTypes: TaxonomicFilterGroupType[]
+        ) => boolean
+        soleGroupHasGetValue: (
+            isSoleSubstantiveGroup: boolean,
+            listGroupType: TaxonomicFilterGroupType,
+            taxonomicGroups: TaxonomicFilterGroup[]
+        ) => boolean
+        allowNonCapturedEvents: (arg: any) => boolean
+        isLocalDataLoading: (arg: any) => boolean
+        isLoading: (remoteItemsLoading: boolean) => boolean
+        group: (
+            listGroupType: TaxonomicFilterGroupType,
+            taxonomicGroups: TaxonomicFilterGroup[]
+        ) => TaxonomicFilterGroup | undefined
+        remoteEndpoint: (group: TaxonomicFilterGroup | undefined) => string | null
+        minSearchQueryLength: (group: TaxonomicFilterGroup | undefined, arg: any) => any
+        needsMoreSearchCharacters: (minSearchQueryLength: any, searchQuery: string) => boolean
+        excludedProperties: (group: TaxonomicFilterGroup | undefined) => string[] | undefined
+        propertyAllowList: (group: TaxonomicFilterGroup | undefined) => string[] | undefined
+        scopedRemoteEndpoint: (group: TaxonomicFilterGroup | undefined) => string | null
+        hasRenderFunction: (group: TaxonomicFilterGroup | undefined) => boolean
+        isExpandable: (
+            remoteEndpoint: string | null,
+            scopedRemoteEndpoint: string | null,
+            remoteItems: ListStorage
+        ) => boolean
+        isExpandableButtonSelected: (isExpandable: boolean, index: number, totalListCount: number) => boolean
+        hasRemoteDataSource: (remoteEndpoint: string | null) => boolean
+        remoteResultsAreFresh: (
+            hasRemoteDataSource: boolean,
+            remoteItems: ListStorage,
+            searchQuery: string,
+            remoteFetchFailed: string | null
+        ) => boolean
+        showNonCapturedEventOption: (
+            allowNonCapturedEvents: boolean,
+            listGroupType: TaxonomicFilterGroupType,
+            searchQuery: string,
+            isLoading: boolean,
+            results: QuickFilterItem[] | (SkeletonItem | TaxonomicDefinitionTypes)[]
+        ) => boolean
+        suggestedFiltersSettling: (
+            isSuggestedFilters: boolean,
+            anyGroupLoading: boolean,
+            anyGroupStale: boolean,
+            searchQuery: string
+        ) => boolean
+        showEmptyState: (
+            totalListCount: number,
+            isLoading: boolean,
+            suggestedFiltersSettling: boolean,
+            searchQuery: string,
+            hasRemoteDataSource: boolean,
+            showNonCapturedEventOption: boolean,
+            needsMoreSearchCharacters: boolean,
+            remoteResultsAreFresh: boolean
+        ) => boolean
+        showLoadingState: (
+            isLoading: boolean,
+            suggestedFiltersSettling: boolean,
+            results: QuickFilterItem[] | (SkeletonItem | TaxonomicDefinitionTypes)[],
+            searchQuery: string,
+            hasRemoteDataSource: boolean,
+            remoteResultsAreFresh: boolean
+        ) => boolean
+        rawLocalItems: (
+            arg: any,
+            arg2: TaxonomicFilterGroupType,
+            arg3: boolean | undefined
+        ) => (CohortType | EventDefinition)[]
+        fuse: (
+            rawLocalItems: (CohortType | EventDefinition)[],
+            taxonomicGroups: TaxonomicFilterGroup[],
+            group: TaxonomicFilterGroup | undefined
+        ) => ListFuse
+        localItems: (
+            rawLocalItems: (CohortType | EventDefinition)[],
+            searchQuery: string,
+            fuse: ListFuse,
+            group: TaxonomicFilterGroup | undefined
+        ) => ListStorage
+        topMatchesForQuery: (
+            localItems: ListStorage,
+            remoteItems: ListStorage,
+            searchQuery: string,
+            hasRemoteDataSource: boolean,
+            keywordShortcutItems: QuickFilterItem[],
+            listGroupType: TaxonomicFilterGroupType,
+            arg: boolean | undefined
+        ) => TaxonomicDefinitionTypes[]
+        suggestedPinnedMatches: (
+            contextFilteredPinnedItems: TaxonomicDefinitionTypes[],
+            searchQuery: string,
+            listGroupType: TaxonomicFilterGroupType,
+            taxonomicGroups: TaxonomicFilterGroup[]
+        ) => TaxonomicDefinitionTypes[]
+        suggestedRecentMatches: (
+            contextFilteredRecentItems: TaxonomicDefinitionTypes[],
+            searchQuery: string,
+            listGroupType: TaxonomicFilterGroupType,
+            taxonomicGroups: TaxonomicFilterGroup[]
+        ) => TaxonomicDefinitionTypes[]
+        keywordShortcutItems: (
+            group: TaxonomicFilterGroup | undefined,
+            searchQuery: string,
+            arg: any
+        ) => QuickFilterItem[]
+        dedupedTopMatches: (
+            topMatchItemsWithSkeletons: (SkeletonItem | TopMatchItem)[],
+            listGroupType: TaxonomicFilterGroupType,
+            searchQuery: string,
+            contextFilteredRecentItems: TaxonomicDefinitionTypes[],
+            contextFilteredPinnedItems: TaxonomicDefinitionTypes[],
+            suggestedRecentMatches: TaxonomicDefinitionTypes[],
+            suggestedPinnedMatches: TaxonomicDefinitionTypes[],
+            taxonomicGroups: TaxonomicFilterGroup[]
+        ) => (SkeletonItem | TaxonomicDefinitionTypes)[]
+        selectionPromotionContext: (
+            group: TaxonomicFilterGroup | undefined,
+            groupType: any,
+            value: any
+        ) => {
+            group: TaxonomicFilterGroup | undefined
+            groupType: TaxonomicFilterGroupType | undefined
+            value: TaxonomicFilterValue | undefined
+        }
+        items: (
+            remoteItems: ListStorage,
+            localItems: ListStorage,
+            listGroupType: TaxonomicFilterGroupType,
+            dedupedTopMatches: (SkeletonItem | TaxonomicDefinitionTypes)[],
+            searchQuery: string,
+            contextFilteredRecentItems: TaxonomicDefinitionTypes[],
+            contextFilteredPinnedItems: TaxonomicDefinitionTypes[],
+            suggestedPinnedMatches: TaxonomicDefinitionTypes[],
+            suggestedRecentMatches: TaxonomicDefinitionTypes[],
+            keywordShortcutItems: QuickFilterItem[],
+            isSoleSubstantiveGroup: boolean,
+            soleGroupHasGetValue: boolean,
+            taxonomicGroups: TaxonomicFilterGroup[],
+            selectionPromotionContext: {
+                group: TaxonomicFilterGroup | undefined
+                groupType: TaxonomicFilterGroupType | undefined
+                value: TaxonomicFilterValue | undefined
+            },
+            arg: boolean | undefined
+        ) =>
+            | {
+                  count: number
+                  expandedCount?: undefined
+                  first: boolean | undefined
+                  queryChanged: boolean | undefined
+                  results: QuickFilterItem[]
+                  searchQuery: string | undefined
+                  syntheticSelectedCount: number
+              }
+            | {
+                  count: number
+                  expandedCount: number | undefined
+                  first: boolean | undefined
+                  queryChanged: boolean | undefined
+                  results: (SkeletonItem | TaxonomicDefinitionTypes)[]
+                  searchQuery: string | undefined
+                  syntheticSelectedCount: number
+              }
+        totalResultCount: (
+            items:
+                | {
+                      count: number
+                      expandedCount: number | undefined
+                      first: boolean | undefined
+                      queryChanged: boolean | undefined
+                      results: (SkeletonItem | TaxonomicDefinitionTypes)[]
+                      searchQuery: string | undefined
+                      syntheticSelectedCount: number
+                  }
+                | {
+                      count: number
+                      expandedCount?: undefined
+                      first: boolean | undefined
+                      queryChanged: boolean | undefined
+                      results: QuickFilterItem[]
+                      searchQuery: string | undefined
+                      syntheticSelectedCount: number
+                  }
+        ) => number
+        totalExtraCount: (isExpandable: boolean, hasRenderFunction: boolean) => number
+        totalListCount: (totalResultCount: number, totalExtraCount: number) => number
+        expandedCount: (
+            items:
+                | {
+                      count: number
+                      expandedCount: number | undefined
+                      first: boolean | undefined
+                      queryChanged: boolean | undefined
+                      results: (SkeletonItem | TaxonomicDefinitionTypes)[]
+                      searchQuery: string | undefined
+                      syntheticSelectedCount: number
+                  }
+                | {
+                      count: number
+                      expandedCount?: undefined
+                      first: boolean | undefined
+                      queryChanged: boolean | undefined
+                      results: QuickFilterItem[]
+                      searchQuery: string | undefined
+                      syntheticSelectedCount: number
+                  }
+        ) => number
+        results: (
+            items:
+                | {
+                      count: number
+                      expandedCount: number | undefined
+                      first: boolean | undefined
+                      queryChanged: boolean | undefined
+                      results: (SkeletonItem | TaxonomicDefinitionTypes)[]
+                      searchQuery: string | undefined
+                      syntheticSelectedCount: number
+                  }
+                | {
+                      count: number
+                      expandedCount?: undefined
+                      first: boolean | undefined
+                      queryChanged: boolean | undefined
+                      results: QuickFilterItem[]
+                      searchQuery: string | undefined
+                      syntheticSelectedCount: number
+                  }
+        ) => QuickFilterItem[] | (SkeletonItem | TaxonomicDefinitionTypes)[]
+        showSuggestedFiltersEmptyState: (
+            isSuggestedFilters: boolean,
+            trimmedSearchQuery: string,
+            results: QuickFilterItem[] | (SkeletonItem | TaxonomicDefinitionTypes)[]
+        ) => boolean
+        rowCount: (
+            showNonCapturedEventOption: boolean,
+            results: QuickFilterItem[] | (SkeletonItem | TaxonomicDefinitionTypes)[],
+            isLoading: boolean,
+            totalListCount: number,
+            showSuggestedFiltersEmptyState: boolean
+        ) => number
+        initialPinnedRowIndex: (
+            results: QuickFilterItem[] | (SkeletonItem | TaxonomicDefinitionTypes)[],
+            taxonomicGroups: TaxonomicFilterGroup[],
+            group: TaxonomicFilterGroup | undefined,
+            listGroupType: TaxonomicFilterGroupType,
+            groupType: any,
+            value: any,
+            isActiveTab: boolean
+        ) => number | null
+        selectedItem: (
+            index: number,
+            items:
+                | {
+                      count: number
+                      expandedCount: number | undefined
+                      first: boolean | undefined
+                      queryChanged: boolean | undefined
+                      results: (SkeletonItem | TaxonomicDefinitionTypes)[]
+                      searchQuery: string | undefined
+                      syntheticSelectedCount: number
+                  }
+                | {
+                      count: number
+                      expandedCount?: undefined
+                      first: boolean | undefined
+                      queryChanged: boolean | undefined
+                      results: QuickFilterItem[]
+                      searchQuery: string | undefined
+                      syntheticSelectedCount: number
+                  }
+        ) => TaxonomicDefinitionTypes | undefined
+        selectedItemValue: (
+            selectedItem: TaxonomicDefinitionTypes | undefined,
+            group: TaxonomicFilterGroup | undefined
+        ) => number | string | null
+        selectedItemInView: (index: number, startIndex: number, stopIndex: number) => boolean
+    }
+}
+
+export type infiniteListLogicType = MakeLogicType<
+    infiniteListLogicValues,
+    infiniteListLogicActions,
+    InfiniteListLogicProps,
+    infiniteListLogicMeta
+>
+
 export const infiniteListLogic = kea<infiniteListLogicType>([
     props({ showNumericalPropsOnly: false, minSearchQueryLength: undefined } as InfiniteListLogicProps),
     key((props) => `${props.taxonomicFilterLogicKey}-${props.listGroupType}`),
@@ -473,16 +1040,17 @@ export const infiniteListLogic = kea<infiniteListLogicType>([
         ],
     })),
     selectors({
-        listGroupType: [(_, p) => [p.listGroupType], (listGroupType) => listGroupType],
+        listGroupType: [(_, p) => [p.listGroupType], (listGroupType: TaxonomicFilterGroupType) => listGroupType],
         isSuggestedFilters: [
             (s) => [s.listGroupType],
             (listGroupType: TaxonomicFilterGroupType): boolean =>
                 listGroupType === TaxonomicFilterGroupType.SuggestedFilters,
         ],
-        trimmedSearchQuery: [(s) => [s.searchQuery], (searchQuery) => searchQuery.trim()],
+        trimmedSearchQuery: [(s) => [s.searchQuery], (searchQuery: string) => searchQuery.trim()],
         isActiveTab: [
             (s) => [s.listGroupType, s.activeTab],
-            (listGroupType, activeTab): boolean => listGroupType === activeTab,
+            (listGroupType: TaxonomicFilterGroupType, activeTab: TaxonomicFilterGroupType): boolean =>
+                listGroupType === activeTab,
         ],
         contextFilteredRecentItems: [
             (s) => [
@@ -548,7 +1116,7 @@ export const infiniteListLogic = kea<infiniteListLogicType>([
         // the top of its own results instead (see `items`).
         isSoleSubstantiveGroup: [
             (s) => [s.listGroupType, s.taxonomicGroupTypes],
-            (listGroupType, taxonomicGroupTypes: TaxonomicFilterGroupType[]): boolean => {
+            (listGroupType: TaxonomicFilterGroupType, taxonomicGroupTypes: TaxonomicFilterGroupType[]): boolean => {
                 const substantive = taxonomicGroupTypes.filter((t) => !META_GROUP_TYPES.has(t))
                 return substantive.length === 1 && substantive[0] === listGroupType
             },
@@ -592,20 +1160,23 @@ export const infiniteListLogic = kea<infiniteListLogicType>([
             ],
             (isLocalDataLoading: boolean) => isLocalDataLoading,
         ],
-        isLoading: [(s) => [s.remoteItemsLoading], (remoteItemsLoading) => remoteItemsLoading],
+        isLoading: [(s) => [s.remoteItemsLoading], (remoteItemsLoading: boolean) => remoteItemsLoading],
         group: [
             (s) => [s.listGroupType, s.taxonomicGroups],
-            (listGroupType, taxonomicGroups): TaxonomicFilterGroup | undefined =>
-                taxonomicGroups.find((g) => g.type === listGroupType),
+            (
+                listGroupType: TaxonomicFilterGroupType,
+                taxonomicGroups: TaxonomicFilterGroup[]
+            ): TaxonomicFilterGroup | undefined => taxonomicGroups.find((g) => g.type === listGroupType),
         ],
-        remoteEndpoint: [(s) => [s.group], (group) => group?.endpoint || null],
+        remoteEndpoint: [(s) => [s.group], (group: TaxonomicFilterGroup | undefined) => group?.endpoint || null],
         minSearchQueryLength: [
             (s) => [s.group, (_, props) => props.minSearchQueryLength],
-            (group, propsMinSearchQueryLength) => propsMinSearchQueryLength ?? group?.minSearchQueryLength ?? 0,
+            (group: TaxonomicFilterGroup | undefined, propsMinSearchQueryLength) =>
+                propsMinSearchQueryLength ?? group?.minSearchQueryLength ?? 0,
         ],
         needsMoreSearchCharacters: [
             (s) => [s.minSearchQueryLength, s.searchQuery],
-            (minSearchQueryLength, searchQuery) => {
+            (minSearchQueryLength, searchQuery: string) => {
                 if (minSearchQueryLength <= 0) {
                     return false
                 }
@@ -613,13 +1184,16 @@ export const infiniteListLogic = kea<infiniteListLogicType>([
                 return searchQuery.trim().length < minSearchQueryLength
             },
         ],
-        excludedProperties: [(s) => [s.group], (group) => group?.excludedProperties],
-        propertyAllowList: [(s) => [s.group], (group) => group?.propertyAllowList],
-        scopedRemoteEndpoint: [(s) => [s.group], (group) => group?.scopedEndpoint || null],
-        hasRenderFunction: [(s) => [s.group], (group) => !!group?.render],
+        excludedProperties: [(s) => [s.group], (group: TaxonomicFilterGroup | undefined) => group?.excludedProperties],
+        propertyAllowList: [(s) => [s.group], (group: TaxonomicFilterGroup | undefined) => group?.propertyAllowList],
+        scopedRemoteEndpoint: [
+            (s) => [s.group],
+            (group: TaxonomicFilterGroup | undefined) => group?.scopedEndpoint || null,
+        ],
+        hasRenderFunction: [(s) => [s.group], (group: TaxonomicFilterGroup | undefined) => !!group?.render],
         isExpandable: [
             (s) => [s.remoteEndpoint, s.scopedRemoteEndpoint, s.remoteItems],
-            (remoteEndpoint, scopedRemoteEndpoint, remoteItems) =>
+            (remoteEndpoint: string | null, scopedRemoteEndpoint: string | null, remoteItems: ListStorage) =>
                 !!(
                     remoteEndpoint &&
                     scopedRemoteEndpoint &&
@@ -629,9 +1203,10 @@ export const infiniteListLogic = kea<infiniteListLogicType>([
         ],
         isExpandableButtonSelected: [
             (s) => [s.isExpandable, s.index, s.totalListCount],
-            (isExpandable, index, totalListCount) => isExpandable && index === totalListCount - 1,
+            (isExpandable: boolean, index: number, totalListCount: number) =>
+                isExpandable && index === totalListCount - 1,
         ],
-        hasRemoteDataSource: [(s) => [s.remoteEndpoint], (remoteEndpoint) => !!remoteEndpoint],
+        hasRemoteDataSource: [(s) => [s.remoteEndpoint], (remoteEndpoint: string | null) => !!remoteEndpoint],
         remoteResultsAreFresh: [
             (s) => [s.hasRemoteDataSource, s.remoteItems, s.searchQuery, s.remoteFetchFailed],
             (
@@ -805,7 +1380,11 @@ export const infiniteListLogic = kea<infiniteListLogicType>([
         ],
         fuse: [
             (s) => [s.rawLocalItems, s.taxonomicGroups, s.group],
-            (rawLocalItems, taxonomicGroups, group): ListFuse => {
+            (
+                rawLocalItems: (CohortType | EventDefinition)[],
+                taxonomicGroups: TaxonomicFilterGroup[],
+                group: TaxonomicFilterGroup | undefined
+            ): ListFuse => {
                 // maps e.g. "selector" to its display value "CSS Selector"
                 // so a search of "css" matches something
                 function asPostHogName(
@@ -837,7 +1416,12 @@ export const infiniteListLogic = kea<infiniteListLogicType>([
         ],
         localItems: [
             (s) => [s.rawLocalItems, s.searchQuery, s.fuse, s.group],
-            (rawLocalItems, searchQuery, fuse, group): ListStorage => {
+            (
+                rawLocalItems: (CohortType | EventDefinition)[],
+                searchQuery: string,
+                fuse: ListFuse,
+                group: TaxonomicFilterGroup | undefined
+            ): ListStorage => {
                 if (!group) {
                     return createEmptyListStorage()
                 }
@@ -875,13 +1459,13 @@ export const infiniteListLogic = kea<infiniteListLogicType>([
                 (_, props: InfiniteListLogicProps) => props.collapseUrlsToContainsRow,
             ],
             (
-                localItems,
-                remoteItems,
-                searchQuery,
-                hasRemoteDataSource,
-                keywordShortcutItems,
-                listGroupType,
-                collapseUrlsToContainsRow
+                localItems: ListStorage,
+                remoteItems: ListStorage,
+                searchQuery: string,
+                hasRemoteDataSource: boolean,
+                keywordShortcutItems: QuickFilterItem[],
+                listGroupType: TaxonomicFilterGroupType,
+                collapseUrlsToContainsRow: boolean | undefined
             ): TaxonomicDefinitionTypes[] => {
                 if (!searchQuery) {
                     return []
@@ -963,14 +1547,17 @@ export const infiniteListLogic = kea<infiniteListLogicType>([
                 s.taxonomicGroups,
             ],
             (
-                topMatchItemsWithSkeletons,
-                listGroupType,
-                searchQuery,
-                contextFilteredRecentItems,
-                contextFilteredPinnedItems,
-                suggestedRecentMatches,
-                suggestedPinnedMatches,
-                taxonomicGroups
+                topMatchItemsWithSkeletons: (
+                    | SkeletonItem
+                    | import('lib/components/TaxonomicFilter/taxonomicFilterLogic').TopMatchItem
+                )[],
+                listGroupType: TaxonomicFilterGroupType,
+                searchQuery: string,
+                contextFilteredRecentItems: TaxonomicDefinitionTypes[],
+                contextFilteredPinnedItems: TaxonomicDefinitionTypes[],
+                suggestedRecentMatches: TaxonomicDefinitionTypes[],
+                suggestedPinnedMatches: TaxonomicDefinitionTypes[],
+                taxonomicGroups: TaxonomicFilterGroup[]
             ): (TaxonomicDefinitionTypes | SkeletonItem)[] => {
                 const isSuggested = listGroupType === TaxonomicFilterGroupType.SuggestedFilters
                 if (!isSuggested) {
@@ -1026,7 +1613,7 @@ export const infiniteListLogic = kea<infiniteListLogicType>([
         selectionPromotionContext: [
             (s) => [s.group, s.groupType, s.value],
             (
-                group,
+                group: TaxonomicFilterGroup | undefined,
                 groupType,
                 value
             ): {
@@ -1054,21 +1641,25 @@ export const infiniteListLogic = kea<infiniteListLogicType>([
                 (_, props: InfiniteListLogicProps) => props.collapseUrlsToContainsRow,
             ],
             (
-                remoteItems,
-                localItems,
-                listGroupType,
-                dedupedTopMatches,
-                searchQuery,
-                contextFilteredRecentItems,
-                contextFilteredPinnedItems,
-                suggestedPinnedMatches,
-                suggestedRecentMatches,
-                keywordShortcutItems,
-                isSoleSubstantiveGroup,
-                soleGroupHasGetValue,
-                taxonomicGroups,
-                selectionPromotionContext,
-                collapseUrlsToContainsRow
+                remoteItems: ListStorage,
+                localItems: ListStorage,
+                listGroupType: TaxonomicFilterGroupType,
+                dedupedTopMatches: (SkeletonItem | TaxonomicDefinitionTypes)[],
+                searchQuery: string,
+                contextFilteredRecentItems: TaxonomicDefinitionTypes[],
+                contextFilteredPinnedItems: TaxonomicDefinitionTypes[],
+                suggestedPinnedMatches: TaxonomicDefinitionTypes[],
+                suggestedRecentMatches: TaxonomicDefinitionTypes[],
+                keywordShortcutItems: QuickFilterItem[],
+                isSoleSubstantiveGroup: boolean,
+                soleGroupHasGetValue: boolean,
+                taxonomicGroups: TaxonomicFilterGroup[],
+                selectionPromotionContext: {
+                    group: TaxonomicFilterGroup | undefined
+                    groupType: TaxonomicFilterGroupType | undefined
+                    value: TaxonomicFilterValue | undefined
+                },
+                collapseUrlsToContainsRow: boolean | undefined
             ) => {
                 const { group, groupType, value } = selectionPromotionContext
                 // Collapse URL groups to a single "URL contains <query>" shortcut row
@@ -1288,21 +1879,93 @@ export const infiniteListLogic = kea<infiniteListLogicType>([
                 }
             },
         ],
-        totalResultCount: [(s) => [s.items], (items) => items.count || 0],
+        totalResultCount: [
+            (s) => [s.items],
+            (
+                items:
+                    | {
+                          count: number
+                          expandedCount: number | undefined
+                          first: boolean | undefined
+                          queryChanged: boolean | undefined
+                          results: (SkeletonItem | TaxonomicDefinitionTypes)[]
+                          searchQuery: string | undefined
+                          syntheticSelectedCount: number
+                      }
+                    | {
+                          count: number
+                          expandedCount?: undefined
+                          first: boolean | undefined
+                          queryChanged: boolean | undefined
+                          results: QuickFilterItem[]
+                          searchQuery: string | undefined
+                          syntheticSelectedCount: number
+                      }
+            ) => items.count || 0,
+        ],
         totalExtraCount: [
             (s) => [s.isExpandable, s.hasRenderFunction],
-            (isExpandable, hasRenderFunction) => (isExpandable ? 1 : 0) + (hasRenderFunction ? 1 : 0),
+            (isExpandable: boolean, hasRenderFunction: boolean) => (isExpandable ? 1 : 0) + (hasRenderFunction ? 1 : 0),
         ],
         totalListCount: [
             (s) => [s.totalResultCount, s.totalExtraCount],
-            (totalResultCount, totalExtraCount) => totalResultCount + totalExtraCount,
+            (totalResultCount: number, totalExtraCount: number) => totalResultCount + totalExtraCount,
+        ],
+        expandedCount: [
+            (s) => [s.items],
+            (
+                items:
+                    | {
+                          count: number
+                          expandedCount: number | undefined
+                          first: boolean | undefined
+                          queryChanged: boolean | undefined
+                          results: (SkeletonItem | TaxonomicDefinitionTypes)[]
+                          searchQuery: string | undefined
+                          syntheticSelectedCount: number
+                      }
+                    | {
+                          count: number
+                          expandedCount?: undefined
+                          first: boolean | undefined
+                          queryChanged: boolean | undefined
+                          results: QuickFilterItem[]
+                          searchQuery: string | undefined
+                          syntheticSelectedCount: number
+                      }
+            ) => items.expandedCount || 0,
+        ],
+        results: [
+            (s) => [s.items],
+            (
+                items:
+                    | {
+                          count: number
+                          expandedCount: number | undefined
+                          first: boolean | undefined
+                          queryChanged: boolean | undefined
+                          results: (SkeletonItem | TaxonomicDefinitionTypes)[]
+                          searchQuery: string | undefined
+                          syntheticSelectedCount: number
+                      }
+                    | {
+                          count: number
+                          expandedCount?: undefined
+                          first: boolean | undefined
+                          queryChanged: boolean | undefined
+                          results: QuickFilterItem[]
+                          searchQuery: string | undefined
+                          syntheticSelectedCount: number
+                      }
+            ) => items.results,
         ],
-        expandedCount: [(s) => [s.items], (items) => items.expandedCount || 0],
-        results: [(s) => [s.items], (items) => items.results],
         showSuggestedFiltersEmptyState: [
             (s) => [s.isSuggestedFilters, s.trimmedSearchQuery, s.results],
-            (isSuggestedFilters, trimmedSearchQuery, results): boolean =>
-                isSuggestedFilters && !trimmedSearchQuery && results.length > 0,
+            (
+                isSuggestedFilters: boolean,
+                trimmedSearchQuery: string,
+                results: QuickFilterItem[] | (SkeletonItem | TaxonomicDefinitionTypes)[]
+            ): boolean => isSuggestedFilters && !trimmedSearchQuery && results.length > 0,
         ],
         rowCount: [
             (s) => [
@@ -1312,7 +1975,13 @@ export const infiniteListLogic = kea<infiniteListLogicType>([
                 s.totalListCount,
                 s.showSuggestedFiltersEmptyState,
             ],
-            (showNonCapturedEventOption, results, isLoading, totalListCount, showSuggestedFiltersEmptyState): number =>
+            (
+                showNonCapturedEventOption: boolean,
+                results: QuickFilterItem[] | (SkeletonItem | TaxonomicDefinitionTypes)[],
+                isLoading: boolean,
+                totalListCount: number,
+                showSuggestedFiltersEmptyState: boolean
+            ): number =>
                 showNonCapturedEventOption
                     ? 1
                     : Math.max(results.length || (isLoading ? 7 : 0), totalListCount || 0) +
@@ -1320,7 +1989,15 @@ export const infiniteListLogic = kea<infiniteListLogicType>([
         ],
         initialPinnedRowIndex: [
             (s) => [s.results, s.taxonomicGroups, s.group, s.listGroupType, s.groupType, s.value, s.isActiveTab],
-            (results, taxonomicGroups, group, listGroupType, groupType, value, isActiveTab): number | null =>
+            (
+                results: QuickFilterItem[] | (SkeletonItem | TaxonomicDefinitionTypes)[],
+                taxonomicGroups: TaxonomicFilterGroup[],
+                group: TaxonomicFilterGroup | undefined,
+                listGroupType: TaxonomicFilterGroupType,
+                groupType,
+                value,
+                isActiveTab: boolean
+            ): number | null =>
                 getInitialPinnedRowIndex({
                     results,
                     taxonomicGroups,
@@ -1333,7 +2010,28 @@ export const infiniteListLogic = kea<infiniteListLogicType>([
         ],
         selectedItem: [
             (s) => [s.index, s.items],
-            (index, items): TaxonomicDefinitionTypes | undefined => {
+            (
+                index: number,
+                items:
+                    | {
+                          count: number
+                          expandedCount: number | undefined
+                          first: boolean | undefined
+                          queryChanged: boolean | undefined
+                          results: (SkeletonItem | TaxonomicDefinitionTypes)[]
+                          searchQuery: string | undefined
+                          syntheticSelectedCount: number
+                      }
+                    | {
+                          count: number
+                          expandedCount?: undefined
+                          first: boolean | undefined
+                          queryChanged: boolean | undefined
+                          results: QuickFilterItem[]
+                          searchQuery: string | undefined
+                          syntheticSelectedCount: number
+                      }
+            ): TaxonomicDefinitionTypes | undefined => {
                 if (index < 0) {
                     return undefined
                 }
@@ -1346,11 +2044,13 @@ export const infiniteListLogic = kea<infiniteListLogicType>([
         ],
         selectedItemValue: [
             (s) => [s.selectedItem, s.group],
-            (selectedItem, group) => (selectedItem ? group?.getValue?.(selectedItem) || null : null),
+            (selectedItem: TaxonomicDefinitionTypes | undefined, group: TaxonomicFilterGroup | undefined) =>
+                selectedItem ? group?.getValue?.(selectedItem) || null : null,
         ],
         selectedItemInView: [
             (s) => [s.index, s.startIndex, s.stopIndex],
-            (index, startIndex, stopIndex) => typeof index === 'number' && index >= startIndex && index <= stopIndex,
+            (index: number, startIndex: number, stopIndex: number) =>
+                typeof index === 'number' && index >= startIndex && index <= stopIndex,
         ],
     }),
     listeners(({ values, actions, props, cache }) => ({
diff --git a/frontend/src/lib/components/TaxonomicFilter/menu/PreviewPane.test.ts b/frontend/src/lib/components/TaxonomicFilter/menu/PreviewPane.test.ts
index 2823efa295d8..2eba1a649644 100644
--- a/frontend/src/lib/components/TaxonomicFilter/menu/PreviewPane.test.ts
+++ b/frontend/src/lib/components/TaxonomicFilter/menu/PreviewPane.test.ts
@@ -1,6 +1,6 @@
 import { urls } from 'scenes/urls'
 
-import { propertyDefinitionsModelType } from '~/models/propertyDefinitionsModelType'
+import type { propertyDefinitionsModelType } from '~/models/propertyDefinitionsModel'
 import { PropertyDefinition } from '~/types'
 
 import { TaxonomicFilterGroup, TaxonomicFilterGroupType } from '../types'
diff --git a/frontend/src/lib/components/TaxonomicFilter/recentTaxonomicFiltersLogic.ts b/frontend/src/lib/components/TaxonomicFilter/recentTaxonomicFiltersLogic.ts
index 617f907b8b74..d6edb43f97aa 100644
--- a/frontend/src/lib/components/TaxonomicFilter/recentTaxonomicFiltersLogic.ts
+++ b/frontend/src/lib/components/TaxonomicFilter/recentTaxonomicFiltersLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers, selectors } from 'kea'
 
 import { now } from 'lib/dayjs'
 import { permanentlyMount } from 'lib/utils/kea-logic-builders'
@@ -6,7 +6,6 @@ import { isOperatorFlag } from 'lib/utils/operators'
 
 import { AnyPropertyFilter } from '~/types'
 
-import type { recentTaxonomicFiltersLogicType } from './recentTaxonomicFiltersLogicType'
 import {
     isKeyOnlyForGroup,
     META_GROUP_TYPES,
@@ -152,6 +151,50 @@ function isDuplicateRecentFilter(
 
 const teamId = window.POSTHOG_APP_CONTEXT?.current_team?.id
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface recentTaxonomicFiltersLogicValues {
+    recentFilterItems: TaxonomicDefinitionTypes[]
+    recentFilters: RecentTaxonomicFilter[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface recentTaxonomicFiltersLogicActions {
+    clearRecentFilters: () => {
+        value: true
+    }
+    recordRecentFilter: (payload: {
+        groupName: string
+        groupType: TaxonomicFilterGroupType
+        item: any
+        propertyFilter?: AnyPropertyFilter
+        selectingKeyOnly?: boolean
+        teamId?: number
+        value: TaxonomicFilterValue
+    }) => {
+        groupName: string
+        groupType: TaxonomicFilterGroupType
+        item: any
+        propertyFilter?: AnyPropertyFilter | undefined
+        selectingKeyOnly?: boolean | undefined
+        teamId?: number | undefined
+        value: TaxonomicFilterValue
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface recentTaxonomicFiltersLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        recentFilterItems: (recentFilters: RecentTaxonomicFilter[]) => TaxonomicDefinitionTypes[]
+    }
+}
+
+export type recentTaxonomicFiltersLogicType = MakeLogicType<
+    recentTaxonomicFiltersLogicValues,
+    recentTaxonomicFiltersLogicActions,
+    Record<string, any>,
+    recentTaxonomicFiltersLogicMeta
+>
+
 export const recentTaxonomicFiltersLogic = kea<recentTaxonomicFiltersLogicType>([
     path(['lib', 'components', 'TaxonomicFilter', 'recentTaxonomicFiltersLogic']),
     actions({
diff --git a/frontend/src/lib/components/TaxonomicFilter/taxonomicFilterLogic.test.ts b/frontend/src/lib/components/TaxonomicFilter/taxonomicFilterLogic.test.ts
index 79f6c19ffde0..97563f4970a4 100644
--- a/frontend/src/lib/components/TaxonomicFilter/taxonomicFilterLogic.test.ts
+++ b/frontend/src/lib/components/TaxonomicFilter/taxonomicFilterLogic.test.ts
@@ -223,8 +223,14 @@ describe('taxonomicFilterLogic', () => {
         // react-window new rowProps every render, which drives its layout-effect setState past React's
         // update limit (error #185). This locks the reference in so that cascade cannot start.
         const state = getContext().store.getState()
-        const propsA = { ...logic.props, metadataSource: { kind: NodeKind.HogQLQuery, query: 'select 1' } }
-        const propsB = { ...logic.props, metadataSource: { kind: NodeKind.HogQLQuery, query: 'select 1' } }
+        const propsA = {
+            ...logic.props,
+            metadataSource: { kind: NodeKind.HogQLQuery as const, query: 'select 1' },
+        }
+        const propsB = {
+            ...logic.props,
+            metadataSource: { kind: NodeKind.HogQLQuery as const, query: 'select 1' },
+        }
 
         expect(propsA.metadataSource).not.toBe(propsB.metadataSource)
 
diff --git a/frontend/src/lib/components/TaxonomicFilter/taxonomicFilterLogic.tsx b/frontend/src/lib/components/TaxonomicFilter/taxonomicFilterLogic.tsx
index 2acd6b7840f2..3f5cf9591f2b 100644
--- a/frontend/src/lib/components/TaxonomicFilter/taxonomicFilterLogic.tsx
+++ b/frontend/src/lib/components/TaxonomicFilter/taxonomicFilterLogic.tsx
@@ -1,5 +1,6 @@
 import clsx from 'clsx'
 import {
+    MakeLogicType,
     BuiltLogic,
     actions,
     afterMount,
@@ -24,7 +25,7 @@ import {
     buildEventTypeFilterShortcuts,
 } from 'lib/components/TaxonomicFilter/eventTypeShortcuts'
 import { infiniteListLogic } from 'lib/components/TaxonomicFilter/infiniteListLogic'
-import { infiniteListLogicType } from 'lib/components/TaxonomicFilter/infiniteListLogicType'
+import type { infiniteListLogicType } from 'lib/components/TaxonomicFilter/infiniteListLogic'
 import {
     hasRecentContext,
     recentTaxonomicFiltersLogic,
@@ -118,10 +119,14 @@ import {
 import { joinsLogic } from 'products/data_warehouse/frontend/shared/logics/joinsLogic'
 import { HogFlowTaxonomicFilters } from 'products/workflows/frontend/Workflows/hogflows/filters/HogFlowTaxonomicFilters'
 
+import type { Noun } from '../../../models/groupsModel'
+import type { DatabaseSchemaDataWarehouseTable } from '../../../queries/schema/schema-general'
+import type { GroupType, GroupTypeIndex, TeamPublicType } from '../../../types'
+import type { FeatureFlagsSet } from '../../logic/featureFlagLogic'
 import { PROPERTY_FILTER_TYPE_TO_TAXONOMIC_FILTER_GROUP_TYPE } from '../PropertyFilters/utils'
 import { InlineHogQLEditor } from './InlineHogQLEditor'
 import { RECENT_PINNED_TAB_DEFINITIONS } from './recentPinnedTabDefinitions'
-import type { taxonomicFilterLogicType } from './taxonomicFilterLogicType'
+import type { TaxonomicFilterGroupValueMap } from './types'
 
 const PROPERTY_TAXONOMIC_GROUP_TYPES = new Set(Object.values(PROPERTY_FILTER_TYPE_TO_TAXONOMIC_FILTER_GROUP_TYPE))
 
@@ -333,6 +338,311 @@ export const defaultDataWarehousePopoverFields: DataWarehousePopoverField[] = [
     },
 ]
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface taxonomicFilterLogicValues {
+    dataWarehouseTables: DatabaseSchemaDataWarehouseTable[] // dataWarehouseSettingsSceneLogic
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun // groupsModel
+    groupTypes: Map<GroupTypeIndex, GroupType> // groupsModel
+    columnsJoinedToPersons: PropertyDefinition[] // joinsLogic
+    primaryProperties: Record<string, string> // primaryEventPropertiesModel
+    currentProjectId: number | null // projectLogic
+    eventMetadataPropertyDefinitions: PropertyDefinition[] // propertyDefinitionsModel
+    personMetadataPropertyDefinitions: PropertyDefinition[] // propertyDefinitionsModel
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    currentTeamId: number | null // teamLogic
+    activeTab: TaxonomicFilterGroupType
+    activeTaxonomicGroup: TaxonomicFilterGroup | undefined
+    allowNonCapturedEvents: boolean
+    anyGroupLoading: boolean
+    anyGroupStale: boolean
+    currentTabIndex: number
+    dataWarehousePopoverFields: any
+    endpointFilters: Record<string, any>
+    eventNames: any
+    eventNamesWithPrimaryProperties: {
+        eventNames: string[]
+        mcpExcludedEventProperties: string[]
+        primaryPropertiesForContextEvents: string[]
+    }
+    excludedProperties: TaxonomicFilterGroupValueMap
+    explicitActiveTab: TaxonomicFilterGroupType | null
+    groupAnalyticsTaxonomicGroupNames: TaxonomicFilterGroup[]
+    groupAnalyticsTaxonomicGroups: TaxonomicFilterGroup[]
+    groupType: any
+    hadInteraction: boolean
+    hideBehavioralCohorts: boolean
+    hogQLExpressionComponentProps: {
+        globals?: Record<string, any>
+        showBreakdownLabelHint: boolean
+    }
+    includeStaleEvents: boolean
+    infiniteListCounts: {
+        [k: string]: number
+    }
+    infiniteListLogics: Record<string, BuiltLogic<infiniteListLogicType>>
+    infiniteListResultCounts: {
+        [k: string]: number
+    }
+    loadingGroupTypes: TaxonomicFilterGroupType[]
+    maxContextOptions: any
+    metaGroupTypes: Set<string>
+    metadataPropertyDefinitionsByType: {
+        event: PropertyDefinition[]
+        person: PropertyDefinition[]
+    }
+    metadataSource: AnyDataNode
+    mouseInteractionsEnabled: boolean
+    propertyAllowList: TaxonomicFilterGroupValueMap | undefined
+    propertyFilters: {
+        excludedProperties: TaxonomicFilterGroupValueMap
+        propertyAllowList: TaxonomicFilterGroupValueMap | undefined
+    }
+    redistributedTopMatchItems: TopMatchItem[]
+    revealBarrierOpen: boolean
+    schemaColumns: any
+    searchPlaceholder: string
+    searchQuery: string
+    selectedItemMeta: any
+    selectedProperties: TaxonomicFilterGroupValueMap
+    showNumericalPropsOnly: any
+    suggestedFiltersLabel: any
+    taxonomicFilterLogicKey: string
+    taxonomicGroupTypes: TaxonomicFilterGroupType[]
+    taxonomicGroups: TaxonomicFilterGroup[]
+    topMatchItems: (TaxonomicDefinitionTypes & {
+        group: TaxonomicFilterGroupType
+    })[]
+    topMatchItemsWithSkeletons: (SkeletonItem | TopMatchItem)[]
+    value: any
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface taxonomicFilterLogicActions {
+    ensureLoadedForEvents: (eventNames: string[]) => {
+        eventNames: string[]
+    } // primaryEventPropertiesModel
+    appendTopMatches: (
+        items: (TaxonomicDefinitionTypes & {
+            group: TaxonomicFilterGroupType
+        })[]
+    ) => {
+        items: (TaxonomicDefinitionTypes & {
+            group: TaxonomicFilterGroupType
+        })[]
+    }
+    enableMouseInteractions: () => {
+        value: true
+    }
+    infiniteListResultsReceived: (
+        groupType: TaxonomicFilterGroupType,
+        results: ListStorage
+    ) => {
+        groupType: TaxonomicFilterGroupType
+        results: ListStorage
+    }
+    markUserInteraction: () => {
+        value: true
+    }
+    moveDown: () => {
+        value: true
+    }
+    moveUp: () => {
+        value: true
+    }
+    openRevealBarrier: () => {
+        value: true
+    }
+    recordPaste: (pastedLength: number) => {
+        pastedLength: number
+    }
+    selectItem: (
+        group: TaxonomicFilterGroup,
+        value: TaxonomicFilterValue | null,
+        item: any,
+        meta?: SelectItemMeta
+    ) => {
+        group: TaxonomicFilterGroup
+        item: any
+        meta: SelectItemMeta | undefined
+        value: TaxonomicFilterValue
+    }
+    selectSelected: () => {
+        value: true
+    }
+    setActiveTab: (activeTab: TaxonomicFilterGroupType) => {
+        activeTab: TaxonomicFilterGroupType
+    }
+    setIncludeStaleEvents: (includeStaleEvents: boolean) => {
+        includeStaleEvents: boolean
+    }
+    setSearchQuery: (searchQuery: string) => {
+        searchQuery: string
+    }
+    tabLeft: () => {
+        value: true
+    }
+    tabRight: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface taxonomicFilterLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        selectedItemMeta: (arg: any) => any
+        showNumericalPropsOnly: (arg: any) => any
+        taxonomicFilterLogicKey: (taxonomicFilterLogicKey: string) => string
+        eventNames: (arg: any) => any
+        eventNamesWithPrimaryProperties: (
+            eventNames: any,
+            primaryProperties: Record<string, string>,
+            arg: any
+        ) => {
+            eventNames: string[]
+            mcpExcludedEventProperties: string[]
+            primaryPropertiesForContextEvents: string[]
+        }
+        schemaColumns: (arg: any) => any
+        maxContextOptions: (arg: any) => any
+        dataWarehousePopoverFields: (arg: any) => any
+        suggestedFiltersLabel: (arg: any) => any
+        metadataSource: (arg: any) => AnyDataNode
+        excludedProperties: (arg: any) => TaxonomicFilterGroupValueMap
+        selectedProperties: (arg: any) => TaxonomicFilterGroupValueMap
+        propertyAllowList: (arg: any) => TaxonomicFilterGroupValueMap | undefined
+        propertyFilters: (
+            excludedProperties: TaxonomicFilterGroupValueMap,
+            propertyAllowList: TaxonomicFilterGroupValueMap | undefined
+        ) => {
+            excludedProperties: TaxonomicFilterGroupValueMap
+            propertyAllowList: TaxonomicFilterGroupValueMap | undefined
+        }
+        allowNonCapturedEvents: (arg: any) => boolean
+        hideBehavioralCohorts: (arg: any) => boolean
+        hogQLExpressionComponentProps: (
+            arg: any,
+            arg2: any
+        ) => {
+            globals?: Record<string, any>
+            showBreakdownLabelHint: boolean
+        }
+        endpointFilters: (arg: any) => Record<string, any>
+        metadataPropertyDefinitionsByType: (
+            eventMetadataPropertyDefinitions: PropertyDefinition[],
+            personMetadataPropertyDefinitions: PropertyDefinition[]
+        ) => {
+            event: PropertyDefinition[]
+            person: PropertyDefinition[]
+        }
+        taxonomicGroups: (
+            currentTeam: TeamPublicType | TeamType | null,
+            currentProjectId: number | null,
+            groupAnalyticsTaxonomicGroups: TaxonomicFilterGroup[],
+            groupAnalyticsTaxonomicGroupNames: TaxonomicFilterGroup[],
+            eventNamesWithPrimaryProperties: {
+                eventNames: string[]
+                mcpExcludedEventProperties: string[]
+                primaryPropertiesForContextEvents: string[]
+            },
+            schemaColumns: any,
+            arg: any,
+            metadataSource: AnyDataNode,
+            suggestedFiltersLabel: any,
+            propertyFilters: {
+                excludedProperties: TaxonomicFilterGroupValueMap
+                propertyAllowList: TaxonomicFilterGroupValueMap | undefined
+            },
+            metadataPropertyDefinitionsByType: {
+                event: PropertyDefinition[]
+                person: PropertyDefinition[]
+            },
+            maxContextOptions: any,
+            hideBehavioralCohorts: boolean,
+            endpointFilters: Record<string, any>,
+            hogQLExpressionComponentProps: {
+                globals?: Record<string, any>
+                showBreakdownLabelHint: boolean
+            },
+            featureFlags: FeatureFlagsSet
+        ) => TaxonomicFilterGroup[]
+        activeTaxonomicGroup: (
+            activeTab: TaxonomicFilterGroupType,
+            taxonomicGroups: TaxonomicFilterGroup[]
+        ) => TaxonomicFilterGroup | undefined
+        metaGroupTypes: (taxonomicGroups: TaxonomicFilterGroup[]) => Set<string>
+        taxonomicGroupTypes: (
+            taxonomicGroupTypes: TaxonomicFilterGroupType[],
+            taxonomicGroups: TaxonomicFilterGroup[],
+            eventNames: any,
+            featureFlags: FeatureFlagsSet
+        ) => TaxonomicFilterGroupType[]
+        groupAnalyticsTaxonomicGroupNames: (
+            groupTypes: Map<GroupTypeIndex, GroupType>,
+            currentTeamId: number | null,
+            aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun
+        ) => TaxonomicFilterGroup[]
+        groupAnalyticsTaxonomicGroups: (
+            groupTypes: Map<GroupTypeIndex, GroupType>,
+            currentProjectId: number | null,
+            aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun
+        ) => TaxonomicFilterGroup[]
+        infiniteListLogics: (
+            taxonomicGroupTypes: TaxonomicFilterGroupType[],
+            arg: any
+        ) => Record<string, BuiltLogic<infiniteListLogicType>>
+        anyGroupLoading: (arg: boolean) => boolean
+        anyGroupStale: (arg: boolean) => boolean
+        loadingGroupTypes: (arg: string) => TaxonomicFilterGroupType[]
+        infiniteListCounts: (arg: { [k: string]: number }) => {
+            [k: string]: number
+        }
+        infiniteListResultCounts: (arg: { [k: string]: number }) => {
+            [k: string]: number
+        }
+        value: (arg: any) => any
+        groupType: (arg: any) => any
+        activeTab: (
+            explicitActiveTab: TaxonomicFilterGroupType | null,
+            groupType: any,
+            taxonomicGroupTypes: TaxonomicFilterGroupType[],
+            metaGroupTypes: Set<string>
+        ) => TaxonomicFilterGroupType
+        currentTabIndex: (
+            taxonomicGroupTypes: TaxonomicFilterGroupType[],
+            activeTab: TaxonomicFilterGroupType
+        ) => number
+        searchPlaceholder: (
+            taxonomicGroups: TaxonomicFilterGroup[],
+            taxonomicGroupTypes: TaxonomicFilterGroupType[]
+        ) => string
+        redistributedTopMatchItems: (
+            topMatchItems: (TaxonomicDefinitionTypes & {
+                group: TaxonomicFilterGroupType
+            })[],
+            taxonomicGroupTypes: TaxonomicFilterGroupType[],
+            metaGroupTypes: Set<string>
+        ) => TopMatchItem[]
+        topMatchItemsWithSkeletons: (
+            redistributedTopMatchItems: TopMatchItem[],
+            taxonomicGroupTypes: TaxonomicFilterGroupType[],
+            loadingGroupTypes: TaxonomicFilterGroupType[],
+            taxonomicGroups: TaxonomicFilterGroup[],
+            searchQuery: string,
+            metaGroupTypes: Set<string>,
+            revealBarrierOpen: boolean
+        ) => (SkeletonItem | TopMatchItem)[]
+    }
+}
+
+export type taxonomicFilterLogicType = MakeLogicType<
+    taxonomicFilterLogicValues,
+    taxonomicFilterLogicActions,
+    TaxonomicFilterLogicProps,
+    taxonomicFilterLogicMeta
+>
+
 export const taxonomicFilterLogic = kea<taxonomicFilterLogicType>([
     props({} as TaxonomicFilterLogicProps),
     key((props) => `${props.taxonomicFilterLogicKey}`),
@@ -482,7 +792,7 @@ export const taxonomicFilterLogic = kea<taxonomicFilterLogicType>([
         ],
         taxonomicFilterLogicKey: [
             (_, p) => [p.taxonomicFilterLogicKey],
-            (taxonomicFilterLogicKey) => taxonomicFilterLogicKey,
+            (taxonomicFilterLogicKey: string) => taxonomicFilterLogicKey,
         ],
         // Prop-derived reference selectors below carry `resultEqualityCheck: objectsEqual` so that a
         // consumer passing an equal-but-freshly-allocated object/array prop on every render does not
@@ -564,7 +874,12 @@ export const taxonomicFilterLogic = kea<taxonomicFilterLogicType>([
         ],
         propertyFilters: [
             (s) => [s.excludedProperties, s.propertyAllowList],
-            (excludedProperties, propertyAllowList) => ({ excludedProperties, propertyAllowList }),
+            (
+                excludedProperties: import('lib/components/TaxonomicFilter/types').TaxonomicFilterGroupValueMap,
+                propertyAllowList:
+                    | import('lib/components/TaxonomicFilter/types').TaxonomicFilterGroupValueMap
+                    | undefined
+            ) => ({ excludedProperties, propertyAllowList }),
             { resultEqualityCheck: objectsEqual },
         ],
         allowNonCapturedEvents: [
@@ -633,7 +948,12 @@ export const taxonomicFilterLogic = kea<taxonomicFilterLogicType>([
                 schemaColumnsLoading: boolean | undefined,
                 metadataSource: AnyDataNode,
                 suggestedFiltersLabel: string | undefined,
-                propertyFilters,
+                propertyFilters: {
+                    excludedProperties: import('lib/components/TaxonomicFilter/types').TaxonomicFilterGroupValueMap
+                    propertyAllowList:
+                        | import('lib/components/TaxonomicFilter/types').TaxonomicFilterGroupValueMap
+                        | undefined
+                },
                 {
                     event: eventMetadataPropertyDefinitions,
                     person: personMetadataPropertyDefinitions,
@@ -1607,7 +1927,8 @@ export const taxonomicFilterLogic = kea<taxonomicFilterLogicType>([
         ],
         activeTaxonomicGroup: [
             (s) => [s.activeTab, s.taxonomicGroups],
-            (activeTab, taxonomicGroups) => taxonomicGroups.find((g) => g.type === activeTab),
+            (activeTab: TaxonomicFilterGroupType, taxonomicGroups: TaxonomicFilterGroup[]) =>
+                taxonomicGroups.find((g) => g.type === activeTab),
         ],
         metaGroupTypes: [
             (s) => [s.taxonomicGroups],
@@ -1616,7 +1937,12 @@ export const taxonomicFilterLogic = kea<taxonomicFilterLogicType>([
         ],
         taxonomicGroupTypes: [
             (s, p) => [p.taxonomicGroupTypes, s.taxonomicGroups, s.eventNames, s.featureFlags],
-            (groupTypes, taxonomicGroups, eventNames, featureFlags): TaxonomicFilterGroupType[] => {
+            (
+                groupTypes: TaxonomicFilterGroupType[],
+                taxonomicGroups: TaxonomicFilterGroup[],
+                eventNames,
+                featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet
+            ): TaxonomicFilterGroupType[] => {
                 const availableGroupTypes = new Set(taxonomicGroups.map((group) => group.type))
                 const resolvedGroupTypes: TaxonomicFilterGroupType[] =
                     groupTypes || taxonomicGroups.map((group) => group.type)
@@ -1721,7 +2047,14 @@ export const taxonomicFilterLogic = kea<taxonomicFilterLogicType>([
         ],
         groupAnalyticsTaxonomicGroupNames: [
             (s) => [s.groupTypes, s.currentTeamId, s.aggregationLabel],
-            (groupTypes, teamId, aggregationLabel): TaxonomicFilterGroup[] =>
+            (
+                groupTypes: Map<import('~/types').GroupTypeIndex, import('~/types').GroupType>,
+                teamId: number | null,
+                aggregationLabel: (
+                    groupTypeIndex: number | null | undefined,
+                    deferToUserWording?: boolean
+                ) => import('~/models/groupsModel').Noun
+            ): TaxonomicFilterGroup[] =>
                 Array.from(groupTypes.values()).map((type) => ({
                     name: `${capitalizeFirstLetter(aggregationLabel(type.group_type_index).plural)}`,
                     searchPlaceholder: `${aggregationLabel(type.group_type_index).plural}`,
@@ -1737,7 +2070,14 @@ export const taxonomicFilterLogic = kea<taxonomicFilterLogicType>([
         ],
         groupAnalyticsTaxonomicGroups: [
             (s) => [s.groupTypes, s.currentProjectId, s.aggregationLabel],
-            (groupTypes, projectId, aggregationLabel): TaxonomicFilterGroup[] =>
+            (
+                groupTypes: Map<import('~/types').GroupTypeIndex, import('~/types').GroupType>,
+                projectId: number | null,
+                aggregationLabel: (
+                    groupTypeIndex: number | null | undefined,
+                    deferToUserWording?: boolean
+                ) => import('~/models/groupsModel').Noun
+            ): TaxonomicFilterGroup[] =>
                 Array.from(groupTypes.values()).map((type) => ({
                     name: `${capitalizeFirstLetter(aggregationLabel(type.group_type_index).singular)} properties`,
                     searchPlaceholder: `${aggregationLabel(type.group_type_index).singular} properties`,
@@ -1762,7 +2102,10 @@ export const taxonomicFilterLogic = kea<taxonomicFilterLogicType>([
         ],
         infiniteListLogics: [
             (s) => [s.taxonomicGroupTypes, (_, props) => props],
-            (taxonomicGroupTypes, props): Record<string, BuiltLogic<infiniteListLogicType>> =>
+            (
+                taxonomicGroupTypes: TaxonomicFilterGroupType[],
+                props
+            ): Record<string, BuiltLogic<infiniteListLogicType>> =>
                 Object.fromEntries(
                     taxonomicGroupTypes.map((groupType) => [
                         groupType,
@@ -1835,7 +2178,7 @@ export const taxonomicFilterLogic = kea<taxonomicFilterLogicType>([
                         ])
                     ),
             ],
-            (infiniteListCounts) => infiniteListCounts,
+            (infiniteListCounts: { [k: string]: number }) => infiniteListCounts,
             { resultEqualityCheck: objectsEqual },
         ],
         // Like `infiniteListCounts` but counts only genuine search results (`totalResultCount`),
@@ -1852,14 +2195,19 @@ export const taxonomicFilterLogic = kea<taxonomicFilterLogicType>([
                         ])
                     ),
             ],
-            (infiniteListResultCounts) => infiniteListResultCounts,
+            (infiniteListResultCounts: { [k: string]: number }) => infiniteListResultCounts,
             { resultEqualityCheck: objectsEqual },
         ],
         value: [() => [(_, props) => props.value], (value) => value],
         groupType: [() => [(_, props) => props.groupType], (groupType) => groupType],
         activeTab: [
             (s) => [s.explicitActiveTab, s.groupType, s.taxonomicGroupTypes, s.metaGroupTypes],
-            (explicitActiveTab, propsGroupType, groupTypes, metaGroupTypes): TaxonomicFilterGroupType => {
+            (
+                explicitActiveTab: TaxonomicFilterGroupType | null,
+                propsGroupType,
+                groupTypes: TaxonomicFilterGroupType[],
+                metaGroupTypes: Set<string>
+            ): TaxonomicFilterGroupType => {
                 if (explicitActiveTab && groupTypes.includes(explicitActiveTab)) {
                     return explicitActiveTab
                 }
@@ -1887,11 +2235,12 @@ export const taxonomicFilterLogic = kea<taxonomicFilterLogicType>([
         ],
         currentTabIndex: [
             (s) => [s.taxonomicGroupTypes, s.activeTab],
-            (groupTypes, activeTab) => Math.max(groupTypes.indexOf(activeTab || ''), 0),
+            (groupTypes: TaxonomicFilterGroupType[], activeTab: TaxonomicFilterGroupType) =>
+                Math.max(groupTypes.indexOf(activeTab || ''), 0),
         ],
         searchPlaceholder: [
             (s) => [s.taxonomicGroups, s.taxonomicGroupTypes],
-            (allTaxonomicGroups, searchGroupTypes) => {
+            (allTaxonomicGroups: TaxonomicFilterGroup[], searchGroupTypes: TaxonomicFilterGroupType[]) => {
                 if (searchGroupTypes.length > 1) {
                     searchGroupTypes = searchGroupTypes.filter(
                         (type) =>
diff --git a/frontend/src/lib/components/TaxonomicFilter/taxonomicFilterPinnedPropertiesLogic.ts b/frontend/src/lib/components/TaxonomicFilter/taxonomicFilterPinnedPropertiesLogic.ts
index b3dd509f9bff..c1bb41b73cef 100644
--- a/frontend/src/lib/components/TaxonomicFilter/taxonomicFilterPinnedPropertiesLogic.ts
+++ b/frontend/src/lib/components/TaxonomicFilter/taxonomicFilterPinnedPropertiesLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
 import posthog from 'posthog-js'
 
 import { FEATURE_FLAGS } from 'lib/constants'
@@ -6,7 +6,7 @@ import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
 import { getAppContext } from 'lib/utils/getAppContext'
 import { permanentlyMount } from 'lib/utils/kea-logic-builders'
 
-import type { taxonomicFilterPinnedPropertiesLogicType } from './taxonomicFilterPinnedPropertiesLogicType'
+import type { FeatureFlagsSet } from '../../logic/featureFlagLogic'
 import { META_GROUP_TYPES, TaxonomicDefinitionTypes, TaxonomicFilterGroupType, TaxonomicFilterValue } from './types'
 
 export interface PinnedTaxonomicFilter {
@@ -130,6 +130,52 @@ function writeSeededDefaultsState(state: SeededDefaultsState): void {
     localStorage.setItem(DEFAULTS_SEEDED_KEY, JSON.stringify(state))
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface taxonomicFilterPinnedPropertiesLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    isPinned: (groupType: TaxonomicFilterGroupType, value: TaxonomicFilterValue) => boolean
+    pinnedFilterItems: TaxonomicDefinitionTypes[]
+    pinnedFilters: PinnedTaxonomicFilter[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface taxonomicFilterPinnedPropertiesLogicActions {
+    clearPinnedFilters: () => {
+        value: true
+    }
+    setPinnedFilters: (filters: PinnedTaxonomicFilter[]) => {
+        filters: PinnedTaxonomicFilter[]
+    }
+    togglePin: (
+        groupType: TaxonomicFilterGroupType,
+        groupName: string,
+        value: TaxonomicFilterValue,
+        item: any
+    ) => {
+        groupName: string
+        groupType: TaxonomicFilterGroupType
+        item: any
+        value: TaxonomicFilterValue
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface taxonomicFilterPinnedPropertiesLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        pinnedFilterItems: (pinnedFilters: PinnedTaxonomicFilter[]) => TaxonomicDefinitionTypes[]
+        isPinned: (
+            pinnedFilters: PinnedTaxonomicFilter[]
+        ) => (groupType: TaxonomicFilterGroupType, value: TaxonomicFilterValue) => boolean
+    }
+}
+
+export type taxonomicFilterPinnedPropertiesLogicType = MakeLogicType<
+    taxonomicFilterPinnedPropertiesLogicValues,
+    taxonomicFilterPinnedPropertiesLogicActions,
+    Record<string, any>,
+    taxonomicFilterPinnedPropertiesLogicMeta
+>
+
 export const taxonomicFilterPinnedPropertiesLogic = kea<taxonomicFilterPinnedPropertiesLogicType>([
     path(['lib', 'components', 'TaxonomicFilter', 'taxonomicFilterPinnedPropertiesLogic']),
     connect(() => ({
diff --git a/frontend/src/lib/components/TaxonomicPopover/taxonomicMenuPreferenceLogic.ts b/frontend/src/lib/components/TaxonomicPopover/taxonomicMenuPreferenceLogic.ts
index bc2e898b23d9..80aad75337f9 100644
--- a/frontend/src/lib/components/TaxonomicPopover/taxonomicMenuPreferenceLogic.ts
+++ b/frontend/src/lib/components/TaxonomicPopover/taxonomicMenuPreferenceLogic.ts
@@ -1,7 +1,22 @@
-import { actions, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers } from 'kea'
 import posthog from 'posthog-js'
 
-import type { taxonomicMenuPreferenceLogicType } from './taxonomicMenuPreferenceLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface taxonomicMenuPreferenceLogicValues {
+    useNewMenu: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface taxonomicMenuPreferenceLogicActions {
+    setUseNewMenu: (useNewMenu: boolean) => {
+        useNewMenu: boolean
+    }
+}
+
+export type taxonomicMenuPreferenceLogicType = MakeLogicType<
+    taxonomicMenuPreferenceLogicValues,
+    taxonomicMenuPreferenceLogicActions
+>
 
 /**
  * Global, persisted preference for which taxonomic filter UI to render
diff --git a/frontend/src/lib/components/TimeSensitiveAuthentication/modalInterruptionTrackingLogic.ts b/frontend/src/lib/components/TimeSensitiveAuthentication/modalInterruptionTrackingLogic.ts
index 416bd82e4ca9..d3d32a53ced1 100644
--- a/frontend/src/lib/components/TimeSensitiveAuthentication/modalInterruptionTrackingLogic.ts
+++ b/frontend/src/lib/components/TimeSensitiveAuthentication/modalInterruptionTrackingLogic.ts
@@ -1,10 +1,31 @@
-import { actions, connect, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers } from 'kea'
 
 import { globalModalsLogic } from '~/layout/globalModalsLogic'
 import { organizationLogic } from '~/scenes/organizationLogic'
 import { projectLogic } from '~/scenes/projectLogic'
 
-import type { modalInterruptionTrackingLogicType } from './modalInterruptionTrackingLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface modalInterruptionTrackingLogicValues {
+    isCreateOrganizationModalShown: boolean // globalModalsLogic
+    isCreateProjectModalShown: boolean // globalModalsLogic
+    interruptedForm: string | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface modalInterruptionTrackingLogicActions {
+    createOrganization: (name: string) => string // organizationLogic
+    createProject: (args_0: { name: string }) => {
+        name: string
+    } // projectLogic
+    setInterruptedForm: (form: string | null) => {
+        form: string | null
+    }
+}
+
+export type modalInterruptionTrackingLogicType = MakeLogicType<
+    modalInterruptionTrackingLogicValues,
+    modalInterruptionTrackingLogicActions
+>
 
 export const modalInterruptionTrackingLogic = kea<modalInterruptionTrackingLogicType>([
     path(['lib', 'components', 'TimeSensitiveAuthentication', 'modalInterruptionTrackingLogic']),
diff --git a/frontend/src/lib/components/TimeSensitiveAuthentication/timeSensitiveAuthenticationLogic.ts b/frontend/src/lib/components/TimeSensitiveAuthentication/timeSensitiveAuthenticationLogic.ts
index 637e9a6a5dfa..f2c964fb7076 100644
--- a/frontend/src/lib/components/TimeSensitiveAuthentication/timeSensitiveAuthenticationLogic.ts
+++ b/frontend/src/lib/components/TimeSensitiveAuthentication/timeSensitiveAuthenticationLogic.ts
@@ -3,8 +3,9 @@ import {
     type UserVerificationRequirement,
     startAuthentication,
 } from '@simplewebauthn/browser'
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { subscriptions } from 'kea-subscriptions'
 import posthog from 'posthog-js'
@@ -15,8 +16,8 @@ import { apiStatusLogic } from 'lib/logic/apiStatusLogic'
 import { PrecheckResponseType } from 'scenes/authentication/login/loginLogic'
 import { userLogic } from 'scenes/userLogic'
 
+import type { UserType } from '../../../types'
 import { modalInterruptionTrackingLogic } from './modalInterruptionTrackingLogic'
-import type { timeSensitiveAuthenticationLogicType } from './timeSensitiveAuthenticationLogicType'
 
 export interface ReauthenticationForm {
     password: string
@@ -30,6 +31,168 @@ export interface TwoFAMethodsResponse {
 
 const LOOKAHEAD_EXPIRY_SECONDS = 60 * 5
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface timeSensitiveAuthenticationLogicValues {
+    timeSensitiveAuthenticationRequired: boolean | [onSuccess: () => void, onFailure: () => void] // apiStatusLogic
+    interruptedForm: string | null // modalInterruptionTrackingLogic
+    user: UserType | null // userLogic
+    dismissedReauthentication: boolean
+    isReauthenticationSubmitting: boolean
+    isReauthenticationValid: boolean
+    passkey2FA: null
+    passkey2FALoading: boolean
+    passkeysAvailable: boolean
+    passkeysAvailableLoading: boolean
+    precheckResponse: PrecheckResponseType | null
+    precheckResponseLoading: boolean
+    reauthentication: ReauthenticationForm
+    reauthenticationAllErrors: Record<string, any>
+    reauthenticationChanged: boolean
+    reauthenticationErrors: DeepPartialMap<ReauthenticationForm, ValidationErrorType>
+    reauthenticationHasErrors: boolean
+    reauthenticationManualErrors: Record<string, any>
+    reauthenticationTouched: boolean
+    reauthenticationTouches: Record<string, boolean>
+    reauthenticationValidationErrors: DeepPartialMap<ReauthenticationForm, ValidationErrorType>
+    sensitiveSessionExpiresAt: Dayjs
+    showAuthenticationModal: boolean
+    showReauthenticationErrors: boolean
+    totpAvailable: boolean
+    twoFactorRequired: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface timeSensitiveAuthenticationLogicActions {
+    setTimeSensitiveAuthenticationRequired: (required: boolean | [onSuccess: () => void, onFailure: () => void]) => {
+        required: boolean | [onSuccess: () => void, onFailure: () => void]
+    } // apiStatusLogic
+    loadUser: (resetOnFailure?: boolean | undefined) => {
+        resetOnFailure: boolean | undefined
+    } // userLogic
+    beginPasskey2FA: () => {
+        value: true
+    }
+    beginPasskey2FAFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    beginPasskey2FASuccess: (
+        passkey2FA: null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        passkey2FA: null
+        payload?: {
+            value: true
+        }
+    }
+    checkPasskeysAvailable: () => {
+        value: true
+    }
+    checkPasskeysAvailableFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    checkPasskeysAvailableSuccess: (
+        passkeysAvailable: boolean,
+        payload?: {
+            value: true
+        }
+    ) => {
+        passkeysAvailable: boolean
+        payload?: {
+            value: true
+        }
+    }
+    checkReauthentication: () => {
+        value: true
+    }
+    precheck: () => any
+    precheckFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    precheckSuccess: (
+        precheckResponse: PrecheckResponseType | null,
+        payload?: any
+    ) => {
+        precheckResponse: PrecheckResponseType | null
+        payload?: any
+    }
+    resetReauthentication: (values?: ReauthenticationForm) => {
+        values?: ReauthenticationForm
+    }
+    setDismissedReauthentication: (value: boolean) => {
+        value: boolean
+    }
+    setReauthenticationManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setReauthenticationValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setReauthenticationValues: (values: DeepPartial<ReauthenticationForm>) => {
+        values: DeepPartial<ReauthenticationForm>
+    }
+    setRequiresTwoFactor: (value: boolean) => {
+        value: boolean
+    }
+    setTotpAvailable: (available: boolean) => {
+        available: boolean
+    }
+    submitReauthentication: () => {
+        value: boolean
+    }
+    submitReauthenticationFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitReauthenticationRequest: (reauthentication: ReauthenticationForm) => {
+        reauthentication: ReauthenticationForm
+    }
+    submitReauthenticationSuccess: (reauthentication: ReauthenticationForm) => {
+        reauthentication: ReauthenticationForm
+    }
+    touchReauthenticationField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface timeSensitiveAuthenticationLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        showAuthenticationModal: (
+            timeSensitiveAuthenticationRequired: boolean | [onSuccess: () => void, onFailure: () => void],
+            dismissedReauthentication: boolean
+        ) => boolean
+        sensitiveSessionExpiresAt: (user: UserType | null) => Dayjs
+    }
+}
+
+export type timeSensitiveAuthenticationLogicType = MakeLogicType<
+    timeSensitiveAuthenticationLogicValues,
+    timeSensitiveAuthenticationLogicActions,
+    Record<string, any>,
+    timeSensitiveAuthenticationLogicMeta
+>
+
 export const timeSensitiveAuthenticationLogic = kea<timeSensitiveAuthenticationLogicType>([
     path(['lib', 'components', 'timeSensitiveAuthenticationLogic']),
     connect(() => ({
@@ -174,14 +337,17 @@ export const timeSensitiveAuthenticationLogic = kea<timeSensitiveAuthenticationL
     selectors({
         showAuthenticationModal: [
             (s) => [s.timeSensitiveAuthenticationRequired, s.dismissedReauthentication],
-            (timeSensitiveAuthenticationRequired, dismissedReauthentication): boolean => {
+            (
+                timeSensitiveAuthenticationRequired: boolean | [onSuccess: () => void, onFailure: () => void],
+                dismissedReauthentication: boolean
+            ): boolean => {
                 return !!timeSensitiveAuthenticationRequired && !dismissedReauthentication
             },
         ],
 
         sensitiveSessionExpiresAt: [
             (s) => [s.user],
-            (user): Dayjs => {
+            (user: null | import('../../../types').UserType): Dayjs => {
                 return dayjs(user?.sensitive_session_expires_at)
             },
         ],
diff --git a/frontend/src/lib/components/UnitPicker/unitPickerModalLogic.ts b/frontend/src/lib/components/UnitPicker/unitPickerModalLogic.ts
index 0f5c34d7342f..917406d9fb2a 100644
--- a/frontend/src/lib/components/UnitPicker/unitPickerModalLogic.ts
+++ b/frontend/src/lib/components/UnitPicker/unitPickerModalLogic.ts
@@ -1,6 +1,4 @@
-import { actions, kea, listeners, path, reducers } from 'kea'
-
-import type { unitPickerModalLogicType } from './unitPickerModalLogicType'
+import { MakeLogicType, actions, kea, listeners, path, reducers } from 'kea'
 
 export interface CustomUnitModalData {
     type: 'prefix' | 'postfix'
@@ -20,6 +18,27 @@ export interface UnitPickerModalLogicType {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface unitPickerModalLogicValues {
+    customUnitModalData: CustomUnitModalData | null
+    isCustomUnitModalOpen: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface unitPickerModalLogicActions {
+    applyCustomUnit: (value: string) => {
+        value: string
+    }
+    hideCustomUnitModal: () => {
+        value: true
+    }
+    showCustomUnitModal: (data: CustomUnitModalData) => {
+        data: CustomUnitModalData
+    }
+}
+
+export type unitPickerModalLogicType = MakeLogicType<unitPickerModalLogicValues, unitPickerModalLogicActions>
+
 export const unitPickerModalLogic = kea<unitPickerModalLogicType>([
     path(['lib', 'components', 'UnitPicker', 'unitPickerModalLogic']),
     actions({
diff --git a/frontend/src/lib/components/UniversalFilters/universalFiltersLogic.ts b/frontend/src/lib/components/UniversalFilters/universalFiltersLogic.ts
index e333eddc1850..1330d0d1da35 100644
--- a/frontend/src/lib/components/UniversalFilters/universalFiltersLogic.ts
+++ b/frontend/src/lib/components/UniversalFilters/universalFiltersLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 
 import {
     createDefaultPropertyFilter,
@@ -29,6 +29,7 @@ import {
     UniversalFiltersGroupValue,
 } from '~/types'
 
+import type { PropertyDefinitionType, PropertyType } from '../../../types'
 import {
     TaxonomicFilterGroup,
     TaxonomicFilterGroupType,
@@ -37,7 +38,6 @@ import {
     quickFilterToPropertyFilters,
 } from '../TaxonomicFilter/types'
 import { DEFAULT_UNIVERSAL_GROUP_FILTER } from './constants'
-import type { universalFiltersLogicType } from './universalFiltersLogicType'
 
 function isApplicableSavedFilter(
     item: unknown
@@ -91,6 +91,84 @@ export type UniversalFiltersLogicProps = {
     endpointFilters?: Record<string, any>
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface universalFiltersLogicValues {
+    describeProperty: (
+        s: TaxonomicFilterValue,
+        type: PropertyDefinitionType,
+        groupTypeIndex?: number
+    ) => PropertyType | null // propertyDefinitionsModel
+    endpointFilters: Record<string, any> | undefined
+    filterGroup: UniversalFiltersGroup
+    rootKey: string
+    taxonomicGroupTypes: TaxonomicFilterGroupType[]
+    taxonomicPropertyFilterGroupTypes: TaxonomicFilterGroupType[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface universalFiltersLogicActions {
+    addFilterGroup: () => {
+        value: true
+    }
+    addGroupFilter: (
+        taxonomicGroup: TaxonomicFilterGroup,
+        propertyKey: TaxonomicFilterValue,
+        item: {
+            key?: string
+            matchedOn?: string
+            matchedValue?: string
+            name?: string
+            propertyFilterType?: PropertyFilterType
+        }
+    ) => {
+        item: {
+            key?: string | undefined
+            matchedOn?: string | undefined
+            matchedValue?: string | undefined
+            name?: string | undefined
+            propertyFilterType?: PropertyFilterType | undefined
+        }
+        propertyKey: TaxonomicFilterValue
+        taxonomicGroup: TaxonomicFilterGroup
+    }
+    removeGroupValue: (index: number) => {
+        index: number
+    }
+    replaceGroupValue: (
+        index: number,
+        value: UniversalFiltersGroupValue
+    ) => {
+        index: number
+        value: UniversalFiltersGroupValue
+    }
+    setGroupType: (type: FilterLogicalOperator) => {
+        type: FilterLogicalOperator
+    }
+    setGroupValues: (newValues: UniversalFiltersGroupValue[]) => {
+        newValues: UniversalFiltersGroupValue[]
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface universalFiltersLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        rootKey: (rootKey: string) => string
+        taxonomicGroupTypes: (taxonomicGroupTypes: TaxonomicFilterGroupType[]) => TaxonomicFilterGroupType[]
+        endpointFilters: (arg: Record<string, any> | undefined) => Record<string, any> | undefined
+        taxonomicPropertyFilterGroupTypes: (
+            taxonomicGroupTypes: TaxonomicFilterGroupType[]
+        ) => TaxonomicFilterGroupType[]
+    }
+}
+
+export type universalFiltersLogicType = MakeLogicType<
+    universalFiltersLogicValues,
+    universalFiltersLogicActions,
+    UniversalFiltersLogicProps,
+    universalFiltersLogicMeta
+>
+
 export const universalFiltersLogic = kea<universalFiltersLogicType>([
     path((key) => ['lib', 'components', 'UniversalFilters', 'universalFiltersLogic', key]),
     props({ endpointFilters: {} } as UniversalFiltersLogicProps),
@@ -155,15 +233,15 @@ export const universalFiltersLogic = kea<universalFiltersLogicType>([
     })),
 
     selectors({
-        rootKey: [(_, p) => [p.rootKey], (rootKey) => rootKey],
-        taxonomicGroupTypes: [(_, p) => [p.taxonomicGroupTypes], (types) => types],
+        rootKey: [(_, p) => [p.rootKey], (rootKey: string) => rootKey],
+        taxonomicGroupTypes: [(_, p) => [p.taxonomicGroupTypes], (types: TaxonomicFilterGroupType[]) => types],
         endpointFilters: [
             (_, p) => [p.endpointFilters || (() => undefined)],
             (endpointFilters?: Record<string, any>) => endpointFilters,
         ],
         taxonomicPropertyFilterGroupTypes: [
             (_, p) => [p.taxonomicGroupTypes],
-            (types) => types.filter(isPropertyEditableTaxonomicGroupType),
+            (types: TaxonomicFilterGroupType[]) => types.filter(isPropertyEditableTaxonomicGroupType),
         ],
     }),
 
diff --git a/frontend/src/lib/components/UpgradeModal/upgradeModalLogic.ts b/frontend/src/lib/components/UpgradeModal/upgradeModalLogic.ts
index b46806db446a..90a98c29fc94 100644
--- a/frontend/src/lib/components/UpgradeModal/upgradeModalLogic.ts
+++ b/frontend/src/lib/components/UpgradeModal/upgradeModalLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 
 import { preflightLogic } from 'lib/logic/preflightLogic'
 import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
@@ -7,7 +7,7 @@ import { userLogic } from 'scenes/userLogic'
 
 import { AvailableFeature } from '~/types'
 
-import type { upgradeModalLogicType } from './upgradeModalLogicType'
+import type { BillingFeatureType, BillingType, PreflightStatus } from '../../../types'
 
 export type GuardAvailableFeatureFn = (
     featureKey?: AvailableFeature,
@@ -20,6 +20,58 @@ export type GuardAvailableFeatureFn = (
     }
 ) => boolean
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface upgradeModalLogicValues {
+    billing: BillingType | null // billingLogic
+    preflight: PreflightStatus | null // preflightLogic
+    availableFeature: (feature: AvailableFeature) => BillingFeatureType | null | undefined // userLogic
+    hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean // userLogic
+    guardAvailableFeature: GuardAvailableFeatureFn
+    projectLimit: number
+    shouldShowPlatformAddonMessage: boolean
+    upgradeModalFeatureKey: AvailableFeature | null
+    upgradeModalFeatureUsage: number | null
+    upgradeModalIsGrandfathered: boolean | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface upgradeModalLogicActions {
+    hideUpgradeModal: () => {
+        value: true
+    }
+    showUpgradeModal: (
+        featureKey: AvailableFeature,
+        currentUsage?: number,
+        isGrandfathered?: boolean
+    ) => {
+        currentUsage: number | undefined
+        featureKey: AvailableFeature
+        isGrandfathered: boolean | undefined
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface upgradeModalLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        projectLimit: (availableFeature: (feature: AvailableFeature) => BillingFeatureType | null | undefined) => number
+        shouldShowPlatformAddonMessage: (
+            upgradeModalFeatureKey: AvailableFeature | null,
+            billing: BillingType | null
+        ) => boolean
+        guardAvailableFeature: (
+            preflight: PreflightStatus | null,
+            hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean
+        ) => GuardAvailableFeatureFn
+    }
+}
+
+export type upgradeModalLogicType = MakeLogicType<
+    upgradeModalLogicValues,
+    upgradeModalLogicActions,
+    Record<string, any>,
+    upgradeModalLogicMeta
+>
+
 export const upgradeModalLogic = kea<upgradeModalLogicType>([
     path(['lib', 'components', 'UpgradeModal', 'upgradeModalLogic']),
     connect(() => ({
@@ -66,11 +118,13 @@ export const upgradeModalLogic = kea<upgradeModalLogicType>([
     selectors(({ actions }) => ({
         projectLimit: [
             (s) => [s.availableFeature],
-            (availableFeature) => availableFeature(AvailableFeature.ORGANIZATIONS_PROJECTS)?.limit ?? 6,
+            (
+                availableFeature: (feature: AvailableFeature) => null | import('~/types').BillingFeatureType | undefined
+            ) => availableFeature(AvailableFeature.ORGANIZATIONS_PROJECTS)?.limit ?? 6,
         ],
         shouldShowPlatformAddonMessage: [
             (s) => [s.upgradeModalFeatureKey, s.billing],
-            (upgradeModalFeatureKey, billing) => {
+            (upgradeModalFeatureKey: AvailableFeature | null, billing: null | import('~/types').BillingType) => {
                 if (upgradeModalFeatureKey !== AvailableFeature.ORGANIZATIONS_PROJECTS) {
                     return false
                 }
@@ -85,7 +139,10 @@ export const upgradeModalLogic = kea<upgradeModalLogicType>([
         ],
         guardAvailableFeature: [
             (s) => [s.preflight, s.hasAvailableFeature],
-            (preflight, hasAvailableFeature): GuardAvailableFeatureFn => {
+            (
+                preflight: null | import('~/types').PreflightStatus,
+                hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean
+            ): GuardAvailableFeatureFn => {
                 return (featureKey, featureAvailableCallback, options): boolean => {
                     if (!featureKey) {
                         featureAvailableCallback?.()
diff --git a/frontend/src/lib/components/ViewRecordingButton/sessionRecordingInfoLogic.ts b/frontend/src/lib/components/ViewRecordingButton/sessionRecordingInfoLogic.ts
index fe89549b86c2..c87cedd26782 100644
--- a/frontend/src/lib/components/ViewRecordingButton/sessionRecordingInfoLogic.ts
+++ b/frontend/src/lib/components/ViewRecordingButton/sessionRecordingInfoLogic.ts
@@ -1,10 +1,8 @@
-import { actions, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers, selectors } from 'kea'
 
 import api from 'lib/api'
 import { permanentlyMount } from 'lib/utils/kea-logic-builders'
 
-import type { sessionRecordingInfoLogicType } from './sessionRecordingInfoLogicType'
-
 export enum RecordingExistsState {
     Loading = 'loading',
     Exists = 'exists',
@@ -40,6 +38,71 @@ export function selectOutcome<T extends { description?: string | null }>(
 
 const BATCH_SIZE = 100
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingInfoLogicValues {
+    getRecordingExists: (sessionId: string) => boolean | undefined
+    getSummaryOutcome: (sessionId: string) => SummaryOutcome | null
+    isRecordingExistsLoading: (sessionId: string) => boolean
+    outcomeBySessionId: Record<string, StoredOutcome>
+    pendingFetches: Record<string, PendingFetch>
+    recordingExistsStorage: RecordingExistsStorage
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingInfoLogicActions {
+    checkRecordingInfo: (
+        sessionId: string,
+        options?: {
+            includeOutcome?: boolean
+        }
+    ) => {
+        includeOutcome: boolean
+        sessionId: string
+    }
+    enqueuePending: (
+        sessionId: string,
+        want: keyof PendingFetch
+    ) => {
+        sessionId: string
+        want: keyof PendingFetch
+    }
+    flushPending: () => {
+        value: true
+    }
+    recordExistence: (updates: RecordingExistsStorage) => {
+        updates: RecordingExistsStorage
+    }
+    recordOutcomes: (outcomes: Record<string, StoredOutcome>) => {
+        outcomes: Record<string, StoredOutcome>
+    }
+    removePending: (sessionIds: string[]) => {
+        sessionIds: string[]
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingInfoLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        getRecordingExists: (
+            recordingExistsStorage: RecordingExistsStorage
+        ) => (sessionId: string) => boolean | undefined
+        isRecordingExistsLoading: (
+            recordingExistsStorage: RecordingExistsStorage,
+            pendingFetches: Record<string, PendingFetch>
+        ) => (sessionId: string) => boolean
+        getSummaryOutcome: (
+            outcomeBySessionId: Record<string, StoredOutcome>
+        ) => (sessionId: string) => SummaryOutcome | null
+    }
+}
+
+export type sessionRecordingInfoLogicType = MakeLogicType<
+    sessionRecordingInfoLogicValues,
+    sessionRecordingInfoLogicActions,
+    Record<string, any>,
+    sessionRecordingInfoLogicMeta
+>
+
 export const sessionRecordingInfoLogic = kea<sessionRecordingInfoLogicType>([
     path(['lib', 'components', 'ViewRecordingButton', 'sessionRecordingInfoLogic']),
     actions({
diff --git a/frontend/src/lib/components/ViewRecordingButton/sessionRecordingViewedLogic.ts b/frontend/src/lib/components/ViewRecordingButton/sessionRecordingViewedLogic.ts
index 9079b4e8c65c..da60d62c60a4 100644
--- a/frontend/src/lib/components/ViewRecordingButton/sessionRecordingViewedLogic.ts
+++ b/frontend/src/lib/components/ViewRecordingButton/sessionRecordingViewedLogic.ts
@@ -1,11 +1,9 @@
-import { connect, kea, key, path, props } from 'kea'
+import { MakeLogicType, connect, kea, key, path, props } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
 import { teamLogic } from 'scenes/teamLogic'
 
-import type { sessionRecordingViewedLogicType } from './sessionRecordingViewedLogicType'
-
 export interface SessionRecordingViewedResult {
     viewed: boolean
     otherViewers: number
@@ -15,6 +13,71 @@ export type SessionRecordingViewedProps = {
     sessionRecordingId: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingViewedLogicValues {
+    currentTeamId: number | null // teamLogic
+    recordingViewed: any
+    recordingViewedLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingViewedLogicActions {
+    loadRecordingViewed: () => any
+    loadRecordingViewedFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRecordingViewedSuccess: (
+        recordingViewed: {
+            otherViewers: number
+            viewed: boolean
+        },
+        payload?: any
+    ) => {
+        recordingViewed: {
+            otherViewers: number
+            viewed: boolean
+        }
+        payload?: any
+    }
+    userClickedThrough: () => any
+    userClickedThroughFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    userClickedThroughSuccess: (
+        recordingViewed: {
+            otherViewers: any
+            viewed: boolean
+        },
+        payload?: any
+    ) => {
+        recordingViewed: {
+            otherViewers: any
+            viewed: boolean
+        }
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingViewedLogicMeta {
+    key: string
+}
+
+export type sessionRecordingViewedLogicType = MakeLogicType<
+    sessionRecordingViewedLogicValues,
+    sessionRecordingViewedLogicActions,
+    SessionRecordingViewedProps,
+    sessionRecordingViewedLogicMeta
+>
+
 export const sessionRecordingViewedLogic = kea<sessionRecordingViewedLogicType>([
     path(['lib', 'components', 'ViewRecordingButton', 'sessionRecordingViewedLogic']),
     key((props: Record<string, unknown>) => props.sessionRecordingId as string),
diff --git a/frontend/src/lib/components/VisibilitySensor/visibilitySensorLogic.tsx b/frontend/src/lib/components/VisibilitySensor/visibilitySensorLogic.tsx
index aa66b1c4bd3f..aa78f3c72473 100644
--- a/frontend/src/lib/components/VisibilitySensor/visibilitySensorLogic.tsx
+++ b/frontend/src/lib/components/VisibilitySensor/visibilitySensorLogic.tsx
@@ -1,7 +1,43 @@
-import { actions, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { windowValues } from 'kea-window-values'
 
-import type { visibilitySensorLogicType } from './visibilitySensorLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface visibilitySensorLogicValues {
+    checkIsVisible: (element: HTMLElement) => boolean
+    innerHeight: number
+    visible: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface visibilitySensorLogicActions {
+    scrolling: (element: HTMLElement) => {
+        element: HTMLElement
+    }
+    setVisible: (visible: boolean) => {
+        visible: boolean
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface visibilitySensorLogicProps {
+    id: string
+    offset?: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface visibilitySensorLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        checkIsVisible: (innerHeight: number, arg: any) => (element: HTMLElement) => boolean
+    }
+}
+
+export type visibilitySensorLogicType = MakeLogicType<
+    visibilitySensorLogicValues,
+    visibilitySensorLogicActions,
+    visibilitySensorLogicProps,
+    visibilitySensorLogicMeta
+>
 
 export const visibilitySensorLogic = kea<visibilitySensorLogicType>([
     props(
@@ -30,7 +66,7 @@ export const visibilitySensorLogic = kea<visibilitySensorLogicType>([
     selectors(() => ({
         checkIsVisible: [
             (selectors) => [selectors.innerHeight, (_, props) => props.offset || 0],
-            (windowHeight, offset) => (element: HTMLElement) => {
+            (windowHeight: number, offset) => (element: HTMLElement) => {
                 if (!element) {
                     return false
                 }
diff --git a/frontend/src/lib/components/heatmaps/heatmapDataLogic.ts b/frontend/src/lib/components/heatmaps/heatmapDataLogic.ts
index 101ac5be65d3..a920971b4319 100644
--- a/frontend/src/lib/components/heatmaps/heatmapDataLogic.ts
+++ b/frontend/src/lib/components/heatmaps/heatmapDataLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { encodeParams } from 'kea-router'
 import { subscriptions } from 'kea-subscriptions'
@@ -31,8 +31,6 @@ import { ToolbarRequestError } from '~/toolbar/toolbarRequestError'
 import { HeatmapElement, HeatmapResponseType } from '~/toolbar/types'
 import { FilterType } from '~/types'
 
-import type { heatmapDataLogicType } from './heatmapDataLogicType'
-
 // The endpoint defaults to a bounded page for API callers; the overlay renders every point.
 const UNBOUNDED_HEATMAP_LIMIT = 0
 
@@ -139,6 +137,190 @@ export function isWithinBounds(
     return point.x >= bounds.left && point.x <= bounds.right && point.y >= bounds.top && point.y <= bounds.bottom
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface heatmapDataLogicValues {
+    areaEvents: HeatmapEventsResponse | null
+    areaEventsLoading: boolean
+    areaEventsLoadingMore: boolean
+    commonFilters: CommonFilters
+    dateRange: string | null
+    filteredHeatmapElements: HeatmapElement[]
+    heatmapBoundsFilter: HeatmapBoundsFilter | null
+    heatmapColorPalette: string | null
+    heatmapElements: HeatmapElement[]
+    heatmapEmpty: boolean
+    heatmapFilters: HeatmapFilters
+    heatmapFixedPositionMode: HeatmapFixedPositionMode
+    heatmapJsData: HeatmapJsData
+    heatmapTooltipLabel: string
+    heatmapTooltipSuppressed: boolean
+    heightOverride: number
+    href: string | null
+    hrefMatchType: HrefMatchType
+    isReady: boolean
+    maxYFromEvents: number
+    rawHeatmap: HeatmapResponseType | null
+    rawHeatmapLoading: boolean
+    selectedArea: HeatmapArea | null
+    showEventsPanel: boolean
+    viewportRange: {
+        max: number
+        min: number
+    }
+    widthOverride: number
+    windowHeight: number
+    windowWidth: number
+    windowWidthOverride: number | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface heatmapDataLogicActions {
+    clearSelectedArea: () => {
+        value: true
+    }
+    loadAreaEvents: (_: any) => any
+    loadAreaEventsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAreaEventsSuccess: (
+        areaEvents: HeatmapEventsResponse | null,
+        payload?: any
+    ) => {
+        areaEvents: HeatmapEventsResponse | null
+        payload?: any
+    }
+    loadHeatmap: () => {
+        value: true
+    }
+    loadHeatmapFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadHeatmapSuccess: (
+        rawHeatmap: HeatmapResponseType | null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        rawHeatmap: HeatmapResponseType | null
+        payload?: {
+            value: true
+        }
+    }
+    loadMoreAreaEvents: () => {
+        value: true
+    }
+    loadMoreAreaEventsSuccess: (payload: HeatmapEventsResponse) => {
+        payload: HeatmapEventsResponse
+    }
+    patchHeatmapFilters: (filters: Partial<HeatmapFilters>) => {
+        filters: Partial<HeatmapFilters>
+    }
+    resetHeatmapData: () => any
+    resetHeatmapDataFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    resetHeatmapDataSuccess: (
+        rawHeatmap: {
+            results: never[]
+        },
+        payload?: any
+    ) => {
+        rawHeatmap: {
+            results: never[]
+        }
+        payload?: any
+    }
+    setCommonFilters: (filters: CommonFilters) => {
+        filters: CommonFilters
+    }
+    setHeatmapBoundsFilter: (boundsFilter: HeatmapBoundsFilter | null) => {
+        boundsFilter: HeatmapBoundsFilter | null
+    }
+    setHeatmapColorPalette: (palette: string | null) => {
+        palette: string | null
+    }
+    setHeatmapFilters: (filters: HeatmapFilters) => {
+        filters: HeatmapFilters
+    }
+    setHeatmapFixedPositionMode: (mode: HeatmapFixedPositionMode) => {
+        mode: HeatmapFixedPositionMode
+    }
+    setHeatmapTooltipSuppressed: (suppressed: boolean) => {
+        suppressed: boolean
+    }
+    setHref: (href: string) => {
+        href: string
+    }
+    setHrefMatchType: (matchType: HrefMatchType) => {
+        matchType: HrefMatchType
+    }
+    setIsReady: (isReady: boolean) => {
+        isReady: boolean
+    }
+    setSelectedArea: (area: HeatmapArea | null) => {
+        area: HeatmapArea | null
+    }
+    setShowEventsPanel: (show: boolean) => {
+        show: boolean
+    }
+    setWindowWidthOverride: (widthOverride: number | null) => {
+        widthOverride: number | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface heatmapDataLogicMeta {
+    key: 'in-app' | 'toolbar'
+    __keaTypeGenInternalSelectorTypes: {
+        dateRange: (commonFilters: CommonFilters) => string | null
+        heatmapElements: (rawHeatmap: HeatmapResponseType | null) => HeatmapElement[]
+        viewportRange: (
+            heatmapFilters: HeatmapFilters,
+            windowWidth: number,
+            windowWidthOverride: number | null
+        ) => {
+            max: number
+            min: number
+        }
+        widthOverride: (windowWidthOverride: number | null) => number
+        heatmapTooltipLabel: (heatmapFilters: HeatmapFilters) => string
+        heatmapEmpty: (rawHeatmap: HeatmapResponseType | null, rawHeatmapLoading: boolean) => boolean
+        maxYFromEvents: (heatmapElements: HeatmapElement[]) => number
+        heightOverride: (maxYFromEvents: number, windowHeight: number) => number
+        filteredHeatmapElements: (
+            heatmapElements: HeatmapElement[],
+            windowWidth: number,
+            windowWidthOverride: number | null,
+            heatmapBoundsFilter: HeatmapBoundsFilter | null
+        ) => HeatmapElement[]
+        heatmapJsData: (
+            filteredHeatmapElements: HeatmapElement[],
+            windowWidth: number,
+            windowWidthOverride: number | null,
+            heatmapFixedPositionMode: HeatmapFixedPositionMode
+        ) => HeatmapJsData
+    }
+}
+
+export type heatmapDataLogicType = MakeLogicType<
+    heatmapDataLogicValues,
+    heatmapDataLogicActions,
+    HeatmapDataLogicProps,
+    heatmapDataLogicMeta
+>
+
 export const heatmapDataLogic = kea<heatmapDataLogicType>([
     path((key) => ['lib', 'components', 'heatmap', 'heatmapDataLogic', key]),
     props({ context: 'toolbar', exportToken: null } as HeatmapDataLogicProps),
@@ -365,7 +547,7 @@ export const heatmapDataLogic = kea<heatmapDataLogicType>([
 
         heatmapElements: [
             (s) => [s.rawHeatmap],
-            (rawHeatmap): HeatmapElement[] => {
+            (rawHeatmap: HeatmapResponseType | null): HeatmapElement[] => {
                 if (!rawHeatmap) {
                     return []
                 }
@@ -396,7 +578,7 @@ export const heatmapDataLogic = kea<heatmapDataLogicType>([
 
         viewportRange: [
             (s) => [s.heatmapFilters, s.windowWidth, s.windowWidthOverride],
-            (heatmapFilters, windowWidth, windowWidthOverride) =>
+            (heatmapFilters: HeatmapFilters, windowWidth: number, windowWidthOverride: number | null) =>
                 calculateViewportRange(heatmapFilters, windowWidthOverride ?? windowWidth),
         ],
 
@@ -408,7 +590,7 @@ export const heatmapDataLogic = kea<heatmapDataLogicType>([
 
         heatmapTooltipLabel: [
             (s) => [s.heatmapFilters],
-            (heatmapFilters) => {
+            (heatmapFilters: HeatmapFilters) => {
                 if (heatmapFilters.aggregation === 'unique_visitors') {
                     return 'visitors'
                 }
@@ -418,7 +600,7 @@ export const heatmapDataLogic = kea<heatmapDataLogicType>([
 
         heatmapEmpty: [
             (s) => [s.rawHeatmap, s.rawHeatmapLoading],
-            (rawHeatmap, rawHeatmapLoading) => {
+            (rawHeatmap: HeatmapResponseType | null, rawHeatmapLoading: boolean) => {
                 return rawHeatmap?.results.length === 0 && !rawHeatmapLoading
             },
         ],
@@ -452,7 +634,12 @@ export const heatmapDataLogic = kea<heatmapDataLogicType>([
         // click-to-view-events hit testing can't disagree about which points exist
         filteredHeatmapElements: [
             (s) => [s.heatmapElements, s.windowWidth, s.windowWidthOverride, s.heatmapBoundsFilter],
-            (heatmapElements, windowWidth, windowWidthOverride, heatmapBoundsFilter): HeatmapElement[] => {
+            (
+                heatmapElements: HeatmapElement[],
+                windowWidth: number,
+                windowWidthOverride: number | null,
+                heatmapBoundsFilter: HeatmapBoundsFilter | null
+            ): HeatmapElement[] => {
                 if (!heatmapBoundsFilter) {
                     return heatmapElements
                 }
@@ -472,7 +659,12 @@ export const heatmapDataLogic = kea<heatmapDataLogicType>([
 
         heatmapJsData: [
             (s) => [s.filteredHeatmapElements, s.windowWidth, s.windowWidthOverride, s.heatmapFixedPositionMode],
-            (filteredHeatmapElements, windowWidth, windowWidthOverride, heatmapFixedPositionMode): HeatmapJsData => {
+            (
+                filteredHeatmapElements: HeatmapElement[],
+                windowWidth: number,
+                windowWidthOverride: number | null,
+                heatmapFixedPositionMode: HeatmapFixedPositionMode
+            ): HeatmapJsData => {
                 const width = windowWidthOverride ?? windowWidth
                 const data = filteredHeatmapElements.reduce((acc, element) => {
                     if (heatmapFixedPositionMode === 'hidden' && element.targetFixed) {
diff --git a/frontend/src/lib/components/tagSelectLogic.ts b/frontend/src/lib/components/tagSelectLogic.ts
index 33c7d01b923e..7bc575365213 100644
--- a/frontend/src/lib/components/tagSelectLogic.ts
+++ b/frontend/src/lib/components/tagSelectLogic.ts
@@ -1,13 +1,44 @@
-import { actions, connect, kea, key, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, path, props, reducers, selectors } from 'kea'
 
 import { tagsModel } from '~/models/tagsModel'
 
-import type { tagSelectLogicType } from './tagSelectLogicType'
-
 export interface TagSelectLogicProps {
     logicKey: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tagSelectLogicValues {
+    tags: string[] // tagsModel
+    filteredTags: string[]
+    search: string
+    showPopover: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tagSelectLogicActions {
+    setSearch: (search: string) => {
+        search: string
+    }
+    setShowPopover: (visible: boolean) => {
+        visible: boolean
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tagSelectLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        filteredTags: (tags: string[], search: string) => string[]
+    }
+}
+
+export type tagSelectLogicType = MakeLogicType<
+    tagSelectLogicValues,
+    tagSelectLogicActions,
+    TagSelectLogicProps,
+    tagSelectLogicMeta
+>
+
 export const tagSelectLogic = kea<tagSelectLogicType>([
     props({} as TagSelectLogicProps),
     key((props) => props.logicKey),
@@ -37,7 +68,7 @@ export const tagSelectLogic = kea<tagSelectLogicType>([
     selectors(() => ({
         filteredTags: [
             (s) => [s.tags, s.search],
-            (tags, search) => {
+            (tags: string[], search: string) => {
                 if (!search) {
                     return tags || []
                 }
diff --git a/frontend/src/lib/integrations/clickupIntegrationLogic.ts b/frontend/src/lib/integrations/clickupIntegrationLogic.ts
index a5d15a4ae4fa..c585580cb3ed 100644
--- a/frontend/src/lib/integrations/clickupIntegrationLogic.ts
+++ b/frontend/src/lib/integrations/clickupIntegrationLogic.ts
@@ -1,9 +1,134 @@
-import { actions, kea, key, path, props } from 'kea'
+import { MakeLogicType, actions, kea, key, path, props } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
 
-import type { clickupIntegrationLogicType } from './clickupIntegrationLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface clickupIntegrationLogicValues {
+    clickUpLists:
+        | {
+              id: string
+              name: string
+          }[]
+        | null
+    clickUpListsLoading: boolean
+    clickUpSpaces:
+        | {
+              id: string
+              name: string
+          }[]
+        | null
+    clickUpSpacesLoading: boolean
+    clickUpWorkspaces:
+        | {
+              id: string
+              name: string
+          }[]
+        | null
+    clickUpWorkspacesLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface clickupIntegrationLogicActions {
+    loadClickUpLists: (spaceId: string) => {
+        spaceId: string
+    }
+    loadClickUpListsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadClickUpListsSuccess: (
+        clickUpLists: {
+            id: string
+            name: string
+        }[],
+        payload?: {
+            spaceId: string
+        }
+    ) => {
+        clickUpLists: {
+            id: string
+            name: string
+        }[]
+        payload?: {
+            spaceId: string
+        }
+    }
+    loadClickUpSpaces: (workspaceId: string) => {
+        workspaceId: string
+    }
+    loadClickUpSpacesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadClickUpSpacesSuccess: (
+        clickUpSpaces: {
+            id: string
+            name: string
+        }[],
+        payload?: {
+            workspaceId: string
+        }
+    ) => {
+        clickUpSpaces: {
+            id: string
+            name: string
+        }[]
+        payload?: {
+            workspaceId: string
+        }
+    }
+    loadClickUpWorkspaces: () => {
+        value: true
+    }
+    loadClickUpWorkspacesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadClickUpWorkspacesSuccess: (
+        clickUpWorkspaces: {
+            id: string
+            name: string
+        }[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        clickUpWorkspaces: {
+            id: string
+            name: string
+        }[]
+        payload?: {
+            value: true
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface clickupIntegrationLogicProps {
+    id: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface clickupIntegrationLogicMeta {
+    key: number
+}
+
+export type clickupIntegrationLogicType = MakeLogicType<
+    clickupIntegrationLogicValues,
+    clickupIntegrationLogicActions,
+    clickupIntegrationLogicProps,
+    clickupIntegrationLogicMeta
+>
 
 export const clickupIntegrationLogic = kea<clickupIntegrationLogicType>([
     props({} as { id: number }),
diff --git a/frontend/src/lib/integrations/githubBranchSearchLogic.ts b/frontend/src/lib/integrations/githubBranchSearchLogic.ts
index 4b74fd9e731f..292f6154c92c 100644
--- a/frontend/src/lib/integrations/githubBranchSearchLogic.ts
+++ b/frontend/src/lib/integrations/githubBranchSearchLogic.ts
@@ -1,9 +1,7 @@
-import { actions, afterMount, isBreakpoint, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, isBreakpoint, kea, key, listeners, path, props, reducers } from 'kea'
 
 import api from 'lib/api'
 
-import type { githubBranchSearchLogicType } from './githubBranchSearchLogicType'
-
 const PAGE_SIZE = 50
 const SEARCH_DEBOUNCE_MS = 300
 
@@ -13,6 +11,58 @@ export interface GithubBranchSearchLogicProps {
     repo: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface githubBranchSearchLogicValues {
+    branches: string[]
+    currentOffset: number
+    defaultBranch: string | null
+    hasMore: boolean
+    loading: boolean
+    searchQuery: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface githubBranchSearchLogicActions {
+    loadMore: () => {
+        value: true
+    }
+    loadPage: (offset: number) => {
+        offset: number
+    }
+    loadPageFailure: () => {
+        value: true
+    }
+    loadPageSuccess: (
+        branches: string[],
+        defaultBranch: string | null,
+        hasMore: boolean,
+        offset: number
+    ) => {
+        branches: string[]
+        defaultBranch: string | null
+        hasMore: boolean
+        offset: number
+    }
+    refresh: () => {
+        value: true
+    }
+    setSearchQuery: (searchQuery: string) => {
+        searchQuery: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface githubBranchSearchLogicMeta {
+    key: string
+}
+
+export type githubBranchSearchLogicType = MakeLogicType<
+    githubBranchSearchLogicValues,
+    githubBranchSearchLogicActions,
+    GithubBranchSearchLogicProps,
+    githubBranchSearchLogicMeta
+>
+
 /**
  * Server-side searchable, paginated GitHub branch source for a single repository. Mirrors
  * {@link githubRepositorySearchLogic} but for the `github_branches` endpoint (which is repo-scoped), and
diff --git a/frontend/src/lib/integrations/githubIntegrationLogic.ts b/frontend/src/lib/integrations/githubIntegrationLogic.ts
index 260b13f46519..9f8411e5e4af 100644
--- a/frontend/src/lib/integrations/githubIntegrationLogic.ts
+++ b/frontend/src/lib/integrations/githubIntegrationLogic.ts
@@ -1,13 +1,55 @@
-import { actions, isBreakpoint, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, isBreakpoint, kea, key, listeners, path, props, reducers } from 'kea'
 
 import api from 'lib/api'
 
 import type { GitHubRepoApi } from 'products/integrations/frontend/generated/api.schemas'
 
-import type { githubIntegrationLogicType } from './githubIntegrationLogicType'
-
 const PAGE_SIZE = 500
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface githubIntegrationLogicValues {
+    currentOffset: number
+    repositories: GitHubRepoApi[]
+    repositoriesLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface githubIntegrationLogicActions {
+    loadRepositories: () => {
+        value: true
+    }
+    loadRepositoriesPage: (offset: number) => {
+        offset: number
+    }
+    loadRepositoriesPageFailure: () => {
+        value: true
+    }
+    loadRepositoriesPageSuccess: (
+        repositories: GitHubRepoApi[],
+        hasMore: boolean
+    ) => {
+        hasMore: boolean
+        repositories: GitHubRepoApi[]
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface githubIntegrationLogicProps {
+    id: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface githubIntegrationLogicMeta {
+    key: number
+}
+
+export type githubIntegrationLogicType = MakeLogicType<
+    githubIntegrationLogicValues,
+    githubIntegrationLogicActions,
+    githubIntegrationLogicProps,
+    githubIntegrationLogicMeta
+>
+
 export const githubIntegrationLogic = kea<githubIntegrationLogicType>([
     props({} as { id: number }),
     key((props) => props.id),
diff --git a/frontend/src/lib/integrations/githubRepositorySearchLogic.ts b/frontend/src/lib/integrations/githubRepositorySearchLogic.ts
index 6c5e37072848..82f7e7c1e987 100644
--- a/frontend/src/lib/integrations/githubRepositorySearchLogic.ts
+++ b/frontend/src/lib/integrations/githubRepositorySearchLogic.ts
@@ -1,11 +1,21 @@
-import { actions, afterMount, isBreakpoint, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    afterMount,
+    isBreakpoint,
+    kea,
+    key,
+    listeners,
+    path,
+    props,
+    reducers,
+    selectors,
+} from 'kea'
 
 import api from 'lib/api'
 
 import type { GitHubRepoApi } from 'products/integrations/frontend/generated/api.schemas'
 
-import type { githubRepositorySearchLogicType } from './githubRepositorySearchLogicType'
-
 const PAGE_SIZE = 50
 const SEARCH_DEBOUNCE_MS = 300
 
@@ -13,6 +23,60 @@ export interface GithubRepositorySearchLogicProps {
     id: number
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface githubRepositorySearchLogicValues {
+    currentOffset: number
+    error: string | null
+    hasMore: boolean
+    loading: boolean
+    repositories: GitHubRepoApi[]
+    repositoryNames: string[]
+    searchQuery: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface githubRepositorySearchLogicActions {
+    loadMore: () => {
+        value: true
+    }
+    loadPage: (offset: number) => {
+        offset: number
+    }
+    loadPageFailure: (error: string) => {
+        error: string
+    }
+    loadPageSuccess: (
+        repositories: GitHubRepoApi[],
+        hasMore: boolean,
+        offset: number
+    ) => {
+        hasMore: boolean
+        offset: number
+        repositories: GitHubRepoApi[]
+    }
+    refresh: () => {
+        value: true
+    }
+    setSearchQuery: (searchQuery: string) => {
+        searchQuery: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface githubRepositorySearchLogicMeta {
+    key: number
+    __keaTypeGenInternalSelectorTypes: {
+        repositoryNames: (repositories: GitHubRepoApi[]) => string[]
+    }
+}
+
+export type githubRepositorySearchLogicType = MakeLogicType<
+    githubRepositorySearchLogicValues,
+    githubRepositorySearchLogicActions,
+    GithubRepositorySearchLogicProps,
+    githubRepositorySearchLogicMeta
+>
+
 /**
  * Server-side searchable, paginated GitHub repository source for a single integration. Unlike
  * {@link githubIntegrationLogic} — which eagerly bulk-loads every repository in 500-row pages and ignores
diff --git a/frontend/src/lib/integrations/googleAdsIntegrationLogic.ts b/frontend/src/lib/integrations/googleAdsIntegrationLogic.ts
index 9eb8b703f616..bca3b48291a2 100644
--- a/frontend/src/lib/integrations/googleAdsIntegrationLogic.ts
+++ b/frontend/src/lib/integrations/googleAdsIntegrationLogic.ts
@@ -1,11 +1,103 @@
-import { actions, kea, key, path, props } from 'kea'
+import { MakeLogicType, actions, kea, key, path, props } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
 
 import { GoogleAdsConversionActionType } from '~/types'
 
-import type { googleAdsIntegrationLogicType } from './googleAdsIntegrationLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface googleAdsIntegrationLogicValues {
+    googleAdsAccessibleAccounts:
+        | {
+              id: string
+              level: string
+              name: string
+              parent_id: string
+          }[]
+        | null
+    googleAdsAccessibleAccountsLoading: boolean
+    googleAdsConversionActions: GoogleAdsConversionActionType[] | null
+    googleAdsConversionActionsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface googleAdsIntegrationLogicActions {
+    loadGoogleAdsAccessibleAccounts: () => {
+        value: true
+    }
+    loadGoogleAdsAccessibleAccountsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadGoogleAdsAccessibleAccountsSuccess: (
+        googleAdsAccessibleAccounts: {
+            id: string
+            level: string
+            name: string
+            parent_id: string
+        }[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        googleAdsAccessibleAccounts: {
+            id: string
+            level: string
+            name: string
+            parent_id: string
+        }[]
+        payload?: {
+            value: true
+        }
+    }
+    loadGoogleAdsConversionActions: (
+        customerId: string,
+        parentId: string
+    ) => {
+        customerId: string
+        parentId: string
+    }
+    loadGoogleAdsConversionActionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadGoogleAdsConversionActionsSuccess: (
+        googleAdsConversionActions: GoogleAdsConversionActionType[],
+        payload?: {
+            customerId: string
+            parentId: string
+        }
+    ) => {
+        googleAdsConversionActions: GoogleAdsConversionActionType[]
+        payload?: {
+            customerId: string
+            parentId: string
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface googleAdsIntegrationLogicProps {
+    id: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface googleAdsIntegrationLogicMeta {
+    key: number
+}
+
+export type googleAdsIntegrationLogicType = MakeLogicType<
+    googleAdsIntegrationLogicValues,
+    googleAdsIntegrationLogicActions,
+    googleAdsIntegrationLogicProps,
+    googleAdsIntegrationLogicMeta
+>
 
 export const googleAdsIntegrationLogic = kea<googleAdsIntegrationLogicType>([
     props({} as { id: number }),
diff --git a/frontend/src/lib/integrations/integrationAccountsLogic.ts b/frontend/src/lib/integrations/integrationAccountsLogic.ts
index 164a7b7c038e..482a39cf1ccf 100644
--- a/frontend/src/lib/integrations/integrationAccountsLogic.ts
+++ b/frontend/src/lib/integrations/integrationAccountsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, kea, key, listeners, path, props, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { ApiConfig } from 'lib/api'
@@ -6,10 +6,56 @@ import { ApiConfig } from 'lib/api'
 import { externalDataSourcesOauthAccountsRetrieve } from 'products/warehouse_sources/frontend/generated/api'
 import type { IntegrationAccountApi } from 'products/warehouse_sources/frontend/generated/api.schemas'
 
-import type { integrationAccountsLogicType } from './integrationAccountsLogicType'
-
 const SEARCH_DEBOUNCE_MS = 300
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface integrationAccountsLogicValues {
+    accounts: IntegrationAccountApi[]
+    accountsError: string | null
+    accountsLoading: boolean
+    search: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface integrationAccountsLogicActions {
+    loadAccounts: () => any
+    loadAccountsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAccountsSuccess: (
+        accounts: IntegrationAccountApi[],
+        payload?: any
+    ) => {
+        accounts: IntegrationAccountApi[]
+        payload?: any
+    }
+    setSearch: (search: string) => {
+        search: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface integrationAccountsLogicProps {
+    id: number
+    sourceType: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface integrationAccountsLogicMeta {
+    key: string
+}
+
+export type integrationAccountsLogicType = MakeLogicType<
+    integrationAccountsLogicValues,
+    integrationAccountsLogicActions,
+    integrationAccountsLogicProps,
+    integrationAccountsLogicMeta
+>
+
 export const integrationAccountsLogic = kea<integrationAccountsLogicType>([
     props({} as { id: number; sourceType: string }),
     key((props) => `${props.sourceType}/${props.id}`),
diff --git a/frontend/src/lib/integrations/integrationsLogic.ts b/frontend/src/lib/integrations/integrationsLogic.ts
index 2b6a226946b7..14de044755b3 100644
--- a/frontend/src/lib/integrations/integrationsLogic.ts
+++ b/frontend/src/lib/integrations/integrationsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router, urlToAction } from 'kea-router'
 
@@ -23,7 +23,8 @@ import {
 import type { GitHubRepoApi, IntegrationKindEnumApi } from 'products/integrations/frontend/generated/api.schemas'
 import { ChannelType } from 'products/workflows/frontend/Channels/MessageChannels'
 
-import type { integrationsLogicType } from './integrationsLogicType'
+import type { AvailableSetupTaskIdsEnumApi } from '../../generated/core/api.schemas'
+import type { PreflightStatus, UserBasicType } from '../../types'
 import { ICONS } from './utils'
 
 function toastApiError(e: unknown): void {
@@ -31,6 +32,610 @@ function toastApiError(e: unknown): void {
     lemonToast.error(detail || 'Something went wrong. Please try again.')
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface integrationsLogicValues {
+    preflight: PreflightStatus | null // preflightLogic
+    siteUrlMisconfigured: boolean // preflightLogic
+    currentProjectId: number | string // teamLogic
+    accessRequest: IntegrationKind | null
+    accessRequestLoading: boolean
+    accessRequestReason: string
+    domainGroupedEmailIntegrations: EmailIntegrationDomainGroupedType[]
+    getGitHubRepositories: (integrationId: number) => string[]
+    getGitHubRepositoriesFull: (integrationId: number) => GitHubRepoApi[]
+    getIntegrationsByKind: (
+        kinds: (
+            | 'apns'
+            | 'aws-s3'
+            | 'azure-blob'
+            | 'bing-ads'
+            | 'clickup'
+            | 'customerio-app'
+            | 'customerio-track'
+            | 'customerio-webhook'
+            | 'databricks'
+            | 'email'
+            | 'firebase'
+            | 'github'
+            | 'gitlab'
+            | 'google-ads'
+            | 'google-analytics'
+            | 'google-cloud-service-account'
+            | 'google-cloud-storage'
+            | 'google-pubsub'
+            | 'google-search-console'
+            | 'google-sheets'
+            | 'hubspot'
+            | 'intercom'
+            | 'jira'
+            | 'linear'
+            | 'linkedin-ads'
+            | 'meta-ads'
+            | 'pinterest-ads'
+            | 'postgresql'
+            | 'reddit-ads'
+            | 's3-compatible'
+            | 'salesforce'
+            | 'slack'
+            | 'snapchat'
+            | 'stripe'
+            | 'tiktok-ads'
+            | 'twilio'
+            | 'vercel'
+        )[]
+    ) => IntegrationType[]
+    githubRepositories: Record<number, GitHubRepoApi[]>
+    githubRepositoriesLoading: boolean
+    integrations: IntegrationType[] | null
+    integrationsLoading: boolean
+    linkedGithubInstallation: IntegrationType | null
+    linkedGithubInstallationLoading: boolean
+    newIntegrationModalKind: IntegrationKind | null
+    requestedAccessKinds: IntegrationKind[]
+    selectedIntegration: IntegrationType | null
+    setupModalOpen: boolean
+    setupModalType: ChannelType | null
+    slackAvailable: boolean | undefined
+    slackIntegrations: IntegrationType[] | undefined
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface integrationsLogicActions {
+    markTaskAsCompleted: (taskIdOrIds: AvailableSetupTaskIdsEnumApi | AvailableSetupTaskIdsEnumApi[]) => {
+        taskIdOrIds: AvailableSetupTaskIdsEnumApi | AvailableSetupTaskIdsEnumApi[]
+    } // globalSetupLogic
+    closeNewIntegrationModal: () => {
+        value: true
+    }
+    closeSetupModal: () => {
+        value: true
+    }
+    deleteIntegration: (id: number) => {
+        id: number
+    }
+    handleOauthCallback: (
+        kind: IntegrationKind,
+        searchParams: any
+    ) => {
+        kind:
+            | 'apns'
+            | 'aws-s3'
+            | 'azure-blob'
+            | 'bing-ads'
+            | 'clickup'
+            | 'customerio-app'
+            | 'customerio-track'
+            | 'customerio-webhook'
+            | 'databricks'
+            | 'email'
+            | 'firebase'
+            | 'github'
+            | 'gitlab'
+            | 'google-ads'
+            | 'google-analytics'
+            | 'google-cloud-service-account'
+            | 'google-cloud-storage'
+            | 'google-pubsub'
+            | 'google-search-console'
+            | 'google-sheets'
+            | 'hubspot'
+            | 'intercom'
+            | 'jira'
+            | 'linear'
+            | 'linkedin-ads'
+            | 'meta-ads'
+            | 'pinterest-ads'
+            | 'postgresql'
+            | 'reddit-ads'
+            | 's3-compatible'
+            | 'salesforce'
+            | 'slack'
+            | 'snapchat'
+            | 'stripe'
+            | 'tiktok-ads'
+            | 'twilio'
+            | 'vercel'
+        searchParams: any
+    }
+    linkExistingGithubInstallation: () => any
+    linkExistingGithubInstallationFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    linkExistingGithubInstallationSuccess: (
+        linkedGithubInstallation: IntegrationType,
+        payload?: any
+    ) => {
+        linkedGithubInstallation: IntegrationType
+        payload?: any
+    }
+    loadGitHubRepositories: (integrationId: number) => {
+        integrationId: number
+    }
+    loadGitHubRepositoriesPage: (
+        integrationId: number,
+        offset: number
+    ) => {
+        integrationId: number
+        offset: number
+    }
+    loadGitHubRepositoriesPageFailure: (integrationId: number) => {
+        integrationId: number
+    }
+    loadGitHubRepositoriesPageSuccess: (
+        integrationId: number,
+        repositories: GitHubRepoApi[],
+        hasMore: boolean
+    ) => {
+        hasMore: boolean
+        integrationId: number
+        repositories: GitHubRepoApi[]
+    }
+    loadIntegrations: () => any
+    loadIntegrationsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadIntegrationsSuccess: (
+        integrations: {
+            config: any
+            created_at: string
+            created_by?: UserBasicType | null | undefined
+            display_name: string
+            errors?: string | undefined
+            icon_url: any
+            id: number
+            kind:
+                | 'apns'
+                | 'aws-s3'
+                | 'azure-blob'
+                | 'bing-ads'
+                | 'clickup'
+                | 'customerio-app'
+                | 'customerio-track'
+                | 'customerio-webhook'
+                | 'databricks'
+                | 'email'
+                | 'firebase'
+                | 'github'
+                | 'gitlab'
+                | 'google-ads'
+                | 'google-analytics'
+                | 'google-cloud-service-account'
+                | 'google-cloud-storage'
+                | 'google-pubsub'
+                | 'google-search-console'
+                | 'google-sheets'
+                | 'hubspot'
+                | 'intercom'
+                | 'jira'
+                | 'linear'
+                | 'linkedin-ads'
+                | 'meta-ads'
+                | 'pinterest-ads'
+                | 'postgresql'
+                | 'reddit-ads'
+                | 's3-compatible'
+                | 'salesforce'
+                | 'slack'
+                | 'snapchat'
+                | 'stripe'
+                | 'tiktok-ads'
+                | 'twilio'
+                | 'vercel'
+        }[],
+        payload?: any
+    ) => {
+        integrations: {
+            config: any
+            created_at: string
+            created_by?: UserBasicType | null | undefined
+            display_name: string
+            errors?: string | undefined
+            icon_url: any
+            id: number
+            kind:
+                | 'apns'
+                | 'aws-s3'
+                | 'azure-blob'
+                | 'bing-ads'
+                | 'clickup'
+                | 'customerio-app'
+                | 'customerio-track'
+                | 'customerio-webhook'
+                | 'databricks'
+                | 'email'
+                | 'firebase'
+                | 'github'
+                | 'gitlab'
+                | 'google-ads'
+                | 'google-analytics'
+                | 'google-cloud-service-account'
+                | 'google-cloud-storage'
+                | 'google-pubsub'
+                | 'google-search-console'
+                | 'google-sheets'
+                | 'hubspot'
+                | 'intercom'
+                | 'jira'
+                | 'linear'
+                | 'linkedin-ads'
+                | 'meta-ads'
+                | 'pinterest-ads'
+                | 'postgresql'
+                | 'reddit-ads'
+                | 's3-compatible'
+                | 'salesforce'
+                | 'slack'
+                | 'snapchat'
+                | 'stripe'
+                | 'tiktok-ads'
+                | 'twilio'
+                | 'vercel'
+        }[]
+        payload?: any
+    }
+    newGoogleCloudKey: (
+        kind: string,
+        key: File,
+        callback?: (integration: IntegrationType) => void
+    ) => {
+        callback: ((integration: IntegrationType) => void) | undefined
+        key: File
+        kind: string
+    }
+    newGoogleCloudKeyFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    newGoogleCloudKeySuccess: (
+        integrations: {
+            config: any
+            created_at: string
+            created_by?: UserBasicType | null | undefined
+            display_name: string
+            errors?: string | undefined
+            icon_url: any
+            id: number
+            kind:
+                | 'apns'
+                | 'aws-s3'
+                | 'azure-blob'
+                | 'bing-ads'
+                | 'clickup'
+                | 'customerio-app'
+                | 'customerio-track'
+                | 'customerio-webhook'
+                | 'databricks'
+                | 'email'
+                | 'firebase'
+                | 'github'
+                | 'gitlab'
+                | 'google-ads'
+                | 'google-analytics'
+                | 'google-cloud-service-account'
+                | 'google-cloud-storage'
+                | 'google-pubsub'
+                | 'google-search-console'
+                | 'google-sheets'
+                | 'hubspot'
+                | 'intercom'
+                | 'jira'
+                | 'linear'
+                | 'linkedin-ads'
+                | 'meta-ads'
+                | 'pinterest-ads'
+                | 'postgresql'
+                | 'reddit-ads'
+                | 's3-compatible'
+                | 'salesforce'
+                | 'slack'
+                | 'snapchat'
+                | 'stripe'
+                | 'tiktok-ads'
+                | 'twilio'
+                | 'vercel'
+        }[],
+        payload?: {
+            callback: ((integration: IntegrationType) => void) | undefined
+            key: File
+            kind: string
+        }
+    ) => {
+        integrations: {
+            config: any
+            created_at: string
+            created_by?: UserBasicType | null | undefined
+            display_name: string
+            errors?: string | undefined
+            icon_url: any
+            id: number
+            kind:
+                | 'apns'
+                | 'aws-s3'
+                | 'azure-blob'
+                | 'bing-ads'
+                | 'clickup'
+                | 'customerio-app'
+                | 'customerio-track'
+                | 'customerio-webhook'
+                | 'databricks'
+                | 'email'
+                | 'firebase'
+                | 'github'
+                | 'gitlab'
+                | 'google-ads'
+                | 'google-analytics'
+                | 'google-cloud-service-account'
+                | 'google-cloud-storage'
+                | 'google-pubsub'
+                | 'google-search-console'
+                | 'google-sheets'
+                | 'hubspot'
+                | 'intercom'
+                | 'jira'
+                | 'linear'
+                | 'linkedin-ads'
+                | 'meta-ads'
+                | 'pinterest-ads'
+                | 'postgresql'
+                | 'reddit-ads'
+                | 's3-compatible'
+                | 'salesforce'
+                | 'slack'
+                | 'snapchat'
+                | 'stripe'
+                | 'tiktok-ads'
+                | 'twilio'
+                | 'vercel'
+        }[]
+        payload?: {
+            callback: ((integration: IntegrationType) => void) | undefined
+            key: File
+            kind: string
+        }
+    }
+    openNewIntegrationModal: (kind: IntegrationKind) => {
+        kind:
+            | 'apns'
+            | 'aws-s3'
+            | 'azure-blob'
+            | 'bing-ads'
+            | 'clickup'
+            | 'customerio-app'
+            | 'customerio-track'
+            | 'customerio-webhook'
+            | 'databricks'
+            | 'email'
+            | 'firebase'
+            | 'github'
+            | 'gitlab'
+            | 'google-ads'
+            | 'google-analytics'
+            | 'google-cloud-service-account'
+            | 'google-cloud-storage'
+            | 'google-pubsub'
+            | 'google-search-console'
+            | 'google-sheets'
+            | 'hubspot'
+            | 'intercom'
+            | 'jira'
+            | 'linear'
+            | 'linkedin-ads'
+            | 'meta-ads'
+            | 'pinterest-ads'
+            | 'postgresql'
+            | 'reddit-ads'
+            | 's3-compatible'
+            | 'salesforce'
+            | 'slack'
+            | 'snapchat'
+            | 'stripe'
+            | 'tiktok-ads'
+            | 'twilio'
+            | 'vercel'
+    }
+    openSetupModal: (
+        integration?: IntegrationType,
+        channelType?: ChannelType
+    ) => {
+        channelType: 'apns' | 'email' | 'firebase' | 'slack' | 'twilio' | undefined
+        integration: IntegrationType | undefined
+    }
+    requestIntegrationAccess: ({ kind }: { kind: IntegrationKind }) => {
+        kind: IntegrationKind
+    }
+    requestIntegrationAccessFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    requestIntegrationAccessSuccess: (
+        accessRequest:
+            | 'apns'
+            | 'aws-s3'
+            | 'azure-blob'
+            | 'bing-ads'
+            | 'clickup'
+            | 'customerio-app'
+            | 'customerio-track'
+            | 'customerio-webhook'
+            | 'databricks'
+            | 'email'
+            | 'firebase'
+            | 'github'
+            | 'gitlab'
+            | 'google-ads'
+            | 'google-analytics'
+            | 'google-cloud-service-account'
+            | 'google-cloud-storage'
+            | 'google-pubsub'
+            | 'google-search-console'
+            | 'google-sheets'
+            | 'hubspot'
+            | 'intercom'
+            | 'jira'
+            | 'linear'
+            | 'linkedin-ads'
+            | 'meta-ads'
+            | 'pinterest-ads'
+            | 'postgresql'
+            | 'reddit-ads'
+            | 's3-compatible'
+            | 'salesforce'
+            | 'slack'
+            | 'snapchat'
+            | 'stripe'
+            | 'tiktok-ads'
+            | 'twilio'
+            | 'vercel',
+        payload?: {
+            kind: IntegrationKind
+        }
+    ) => {
+        accessRequest:
+            | 'apns'
+            | 'aws-s3'
+            | 'azure-blob'
+            | 'bing-ads'
+            | 'clickup'
+            | 'customerio-app'
+            | 'customerio-track'
+            | 'customerio-webhook'
+            | 'databricks'
+            | 'email'
+            | 'firebase'
+            | 'github'
+            | 'gitlab'
+            | 'google-ads'
+            | 'google-analytics'
+            | 'google-cloud-service-account'
+            | 'google-cloud-storage'
+            | 'google-pubsub'
+            | 'google-search-console'
+            | 'google-sheets'
+            | 'hubspot'
+            | 'intercom'
+            | 'jira'
+            | 'linear'
+            | 'linkedin-ads'
+            | 'meta-ads'
+            | 'pinterest-ads'
+            | 'postgresql'
+            | 'reddit-ads'
+            | 's3-compatible'
+            | 'salesforce'
+            | 'slack'
+            | 'snapchat'
+            | 'stripe'
+            | 'tiktok-ads'
+            | 'twilio'
+            | 'vercel'
+        payload?: {
+            kind: IntegrationKind
+        }
+    }
+    setAccessRequestReason: (reason: string) => {
+        reason: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface integrationsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        slackIntegrations: (integrations: IntegrationType[] | null) => IntegrationType[] | undefined
+        getIntegrationsByKind: (
+            integrations: IntegrationType[] | null
+        ) => (
+            kinds: (
+                | 'apns'
+                | 'aws-s3'
+                | 'azure-blob'
+                | 'bing-ads'
+                | 'clickup'
+                | 'customerio-app'
+                | 'customerio-track'
+                | 'customerio-webhook'
+                | 'databricks'
+                | 'email'
+                | 'firebase'
+                | 'github'
+                | 'gitlab'
+                | 'google-ads'
+                | 'google-analytics'
+                | 'google-cloud-service-account'
+                | 'google-cloud-storage'
+                | 'google-pubsub'
+                | 'google-search-console'
+                | 'google-sheets'
+                | 'hubspot'
+                | 'intercom'
+                | 'jira'
+                | 'linear'
+                | 'linkedin-ads'
+                | 'meta-ads'
+                | 'pinterest-ads'
+                | 'postgresql'
+                | 'reddit-ads'
+                | 's3-compatible'
+                | 'salesforce'
+                | 'slack'
+                | 'snapchat'
+                | 'stripe'
+                | 'tiktok-ads'
+                | 'twilio'
+                | 'vercel'
+            )[]
+        ) => IntegrationType[]
+        slackAvailable: (preflight: PreflightStatus | null) => boolean | undefined
+        getGitHubRepositories: (
+            githubRepositories: Record<number, GitHubRepoApi[]>
+        ) => (integrationId: number) => string[]
+        getGitHubRepositoriesFull: (
+            githubRepositories: Record<number, GitHubRepoApi[]>
+        ) => (integrationId: number) => GitHubRepoApi[]
+        domainGroupedEmailIntegrations: (integrations: IntegrationType[] | null) => EmailIntegrationDomainGroupedType[]
+    }
+}
+
+export type integrationsLogicType = MakeLogicType<
+    integrationsLogicValues,
+    integrationsLogicActions,
+    Record<string, any>,
+    integrationsLogicMeta
+>
+
 export const integrationsLogic = kea<integrationsLogicType>([
     path(['lib', 'integrations', 'integrationsLogic']),
     connect(() => ({
@@ -357,40 +962,40 @@ export const integrationsLogic = kea<integrationsLogicType>([
     selectors({
         slackIntegrations: [
             (s) => [s.integrations],
-            (integrations) => {
+            (integrations: IntegrationType[] | null) => {
                 return integrations?.filter((x) => x.kind == 'slack')
             },
         ],
         getIntegrationsByKind: [
             (s) => [s.integrations],
-            (integrations) => {
+            (integrations: IntegrationType[] | null) => {
                 return (kinds: IntegrationKind[]) => integrations?.filter((i) => kinds.includes(i.kind)) || []
             },
         ],
 
         slackAvailable: [
             (s) => [s.preflight],
-            (preflight) => {
+            (preflight: null | import('~/types').PreflightStatus) => {
                 // TODO: Change this to be based on preflight or something
                 return preflight?.slack_service?.available
             },
         ],
         getGitHubRepositories: [
             (s) => [s.githubRepositories],
-            (githubRepositories) => {
+            (githubRepositories: Record<number, GitHubRepoApi[]>) => {
                 return (integrationId: number) => (githubRepositories[integrationId] || []).map((r) => r.name)
             },
         ],
         getGitHubRepositoriesFull: [
             (s) => [s.githubRepositories],
-            (githubRepositories) => {
+            (githubRepositories: Record<number, GitHubRepoApi[]>) => {
                 return (integrationId: number): GitHubRepoApi[] => githubRepositories[integrationId] || []
             },
         ],
 
         domainGroupedEmailIntegrations: [
             (s) => [s.integrations],
-            (integrations): EmailIntegrationDomainGroupedType[] => {
+            (integrations: IntegrationType[] | null): EmailIntegrationDomainGroupedType[] => {
                 const domainGroupedIntegrations: Record<string, EmailIntegrationDomainGroupedType> = {}
 
                 integrations
diff --git a/frontend/src/lib/integrations/jiraIntegrationLogic.ts b/frontend/src/lib/integrations/jiraIntegrationLogic.ts
index 7d23bfed689c..d48f48ceb34c 100644
--- a/frontend/src/lib/integrations/jiraIntegrationLogic.ts
+++ b/frontend/src/lib/integrations/jiraIntegrationLogic.ts
@@ -1,11 +1,51 @@
-import { actions, kea, key, path, props } from 'kea'
+import { MakeLogicType, actions, kea, key, path, props } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
 
 import { JiraProjectType } from '~/types'
 
-import type { jiraIntegrationLogicType } from './jiraIntegrationLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface jiraIntegrationLogicValues {
+    jiraProjects: JiraProjectType[]
+    jiraProjectsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface jiraIntegrationLogicActions {
+    loadJiraProjects: () => {}
+    loadJiraProjectsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadJiraProjectsSuccess: (
+        jiraProjects: JiraProjectType[],
+        payload?: {}
+    ) => {
+        jiraProjects: JiraProjectType[]
+        payload?: {}
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface jiraIntegrationLogicProps {
+    id: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface jiraIntegrationLogicMeta {
+    key: number
+}
+
+export type jiraIntegrationLogicType = MakeLogicType<
+    jiraIntegrationLogicValues,
+    jiraIntegrationLogicActions,
+    jiraIntegrationLogicProps,
+    jiraIntegrationLogicMeta
+>
 
 export const jiraIntegrationLogic = kea<jiraIntegrationLogicType>([
     props({} as { id: number }),
diff --git a/frontend/src/lib/integrations/linearIntegrationLogic.ts b/frontend/src/lib/integrations/linearIntegrationLogic.ts
index 20cd8b3e7e33..69cd525e1f57 100644
--- a/frontend/src/lib/integrations/linearIntegrationLogic.ts
+++ b/frontend/src/lib/integrations/linearIntegrationLogic.ts
@@ -1,11 +1,51 @@
-import { actions, kea, key, path, props } from 'kea'
+import { MakeLogicType, actions, kea, key, path, props } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
 
 import { LinearTeamType } from '~/types'
 
-import type { linearIntegrationLogicType } from './linearIntegrationLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface linearIntegrationLogicValues {
+    linearTeams: LinearTeamType[]
+    linearTeamsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface linearIntegrationLogicActions {
+    loadAllLinearTeams: () => {}
+    loadAllLinearTeamsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAllLinearTeamsSuccess: (
+        linearTeams: LinearTeamType[],
+        payload?: {}
+    ) => {
+        linearTeams: LinearTeamType[]
+        payload?: {}
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface linearIntegrationLogicProps {
+    id: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface linearIntegrationLogicMeta {
+    key: number
+}
+
+export type linearIntegrationLogicType = MakeLogicType<
+    linearIntegrationLogicValues,
+    linearIntegrationLogicActions,
+    linearIntegrationLogicProps,
+    linearIntegrationLogicMeta
+>
 
 export const linearIntegrationLogic = kea<linearIntegrationLogicType>([
     props({} as { id: number }),
diff --git a/frontend/src/lib/integrations/linkedInAdsIntegrationLogic.ts b/frontend/src/lib/integrations/linkedInAdsIntegrationLogic.ts
index d0f89534d6e5..c2a1e99cf12e 100644
--- a/frontend/src/lib/integrations/linkedInAdsIntegrationLogic.ts
+++ b/frontend/src/lib/integrations/linkedInAdsIntegrationLogic.ts
@@ -1,11 +1,74 @@
-import { actions, kea, key, path, props } from 'kea'
+import { MakeLogicType, actions, kea, key, path, props } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
 
 import { LinkedInAdsAccountType, LinkedInAdsConversionRuleType } from '~/types'
 
-import type { linkedInAdsIntegrationLogicType } from './linkedInAdsIntegrationLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface linkedInAdsIntegrationLogicValues {
+    linkedInAdsAccounts: LinkedInAdsAccountType[] | null
+    linkedInAdsAccountsLoading: boolean
+    linkedInAdsConversionRules: LinkedInAdsConversionRuleType[] | null
+    linkedInAdsConversionRulesLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface linkedInAdsIntegrationLogicActions {
+    loadLinkedInAdsAccounts: () => {
+        value: true
+    }
+    loadLinkedInAdsAccountsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadLinkedInAdsAccountsSuccess: (
+        linkedInAdsAccounts: LinkedInAdsAccountType[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        linkedInAdsAccounts: LinkedInAdsAccountType[]
+        payload?: {
+            value: true
+        }
+    }
+    loadLinkedInAdsConversionRules: (accountId: string) => string
+    loadLinkedInAdsConversionRulesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadLinkedInAdsConversionRulesSuccess: (
+        linkedInAdsConversionRules: LinkedInAdsConversionRuleType[],
+        payload?: string
+    ) => {
+        linkedInAdsConversionRules: LinkedInAdsConversionRuleType[]
+        payload?: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface linkedInAdsIntegrationLogicProps {
+    id: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface linkedInAdsIntegrationLogicMeta {
+    key: number
+}
+
+export type linkedInAdsIntegrationLogicType = MakeLogicType<
+    linkedInAdsIntegrationLogicValues,
+    linkedInAdsIntegrationLogicActions,
+    linkedInAdsIntegrationLogicProps,
+    linkedInAdsIntegrationLogicMeta
+>
 
 export const linkedInAdsIntegrationLogic = kea<linkedInAdsIntegrationLogicType>([
     props({} as { id: number }),
diff --git a/frontend/src/lib/integrations/slackIntegrationLogic.ts b/frontend/src/lib/integrations/slackIntegrationLogic.ts
index 8868a95c58f0..631a291b6ad0 100644
--- a/frontend/src/lib/integrations/slackIntegrationLogic.ts
+++ b/frontend/src/lib/integrations/slackIntegrationLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -8,10 +8,131 @@ import { preflightLogic } from 'lib/logic/preflightLogic'
 
 import { SlackChannelType } from '~/types'
 
-import type { slackIntegrationLogicType } from './slackIntegrationLogicType'
+import type { PreflightStatus } from '../../types'
 
 export const SLACK_CHANNELS_MIN_REFRESH_INTERVAL_SECONDS = 30
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface slackIntegrationLogicValues {
+    preflight: PreflightStatus | null // preflightLogic
+    siteUrlMisconfigured: boolean // preflightLogic
+    _fetchedSlackChannelById: SlackChannelType | null
+    _fetchedSlackChannels: SlackChannelType[]
+    allSlackChannels: {
+        channels: SlackChannelType[]
+        has_more?: boolean
+        lastRefreshedAt: string
+    } | null
+    allSlackChannelsLoading: boolean
+    getChannelRefreshButtonDisabledReason: () => string
+    isMemberOfSlackChannel: (channel: string) => boolean | null
+    isPrivateChannelWithoutAccess: (channel: string) => boolean
+    recentlySubscribedChannelIds: string[]
+    slackChannelById: SlackChannelType | null
+    slackChannelByIdLoading: boolean
+    slackChannels: SlackChannelType[]
+    slackChannelsForPicker: SlackChannelType[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface slackIntegrationLogicActions {
+    loadAllSlackChannels: (
+        forceRefresh?: boolean,
+        search?: string
+    ) => {
+        forceRefresh: boolean
+        search: string
+    }
+    loadAllSlackChannelsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAllSlackChannelsSuccess: (
+        allSlackChannels: {
+            channels: SlackChannelType[]
+            has_more?: boolean | undefined
+            lastRefreshedAt: string
+        },
+        payload?: {
+            forceRefresh: boolean
+            search: string
+        }
+    ) => {
+        allSlackChannels: {
+            channels: SlackChannelType[]
+            has_more?: boolean | undefined
+            lastRefreshedAt: string
+        }
+        payload?: {
+            forceRefresh: boolean
+            search: string
+        }
+    }
+    loadSlackChannelById: (channelId: string) => {
+        channelId: string
+    }
+    loadSlackChannelByIdFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSlackChannelByIdSuccess: (
+        slackChannelById: SlackChannelType,
+        payload?: {
+            channelId: string
+        }
+    ) => {
+        slackChannelById: SlackChannelType
+        payload?: {
+            channelId: string
+        }
+    }
+    setRecentlySubscribedChannelIds: (channelIds: string[]) => {
+        channelIds: string[]
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface slackIntegrationLogicProps {
+    id: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface slackIntegrationLogicMeta {
+    key: number
+    __keaTypeGenInternalSelectorTypes: {
+        slackChannels: (
+            _fetchedSlackChannels: SlackChannelType[],
+            _fetchedSlackChannelById: SlackChannelType | null
+        ) => SlackChannelType[]
+        slackChannelsForPicker: (
+            slackChannels: SlackChannelType[],
+            recentlySubscribedChannelIds: string[]
+        ) => SlackChannelType[]
+        isMemberOfSlackChannel: (slackChannels: SlackChannelType[]) => (channel: string) => boolean | null
+        isPrivateChannelWithoutAccess: (slackChannels: SlackChannelType[]) => (channel: string) => boolean
+        getChannelRefreshButtonDisabledReason: (
+            allSlackChannels: {
+                channels: SlackChannelType[]
+                has_more?: boolean
+                lastRefreshedAt: string
+            } | null
+        ) => () => string
+    }
+}
+
+export type slackIntegrationLogicType = MakeLogicType<
+    slackIntegrationLogicValues,
+    slackIntegrationLogicActions,
+    slackIntegrationLogicProps,
+    slackIntegrationLogicMeta
+>
+
 export const slackIntegrationLogic = kea<slackIntegrationLogicType>([
     props({} as { id: number }),
     key((props) => props.id),
@@ -79,7 +200,10 @@ export const slackIntegrationLogic = kea<slackIntegrationLogicType>([
     selectors({
         slackChannels: [
             (s) => [s._fetchedSlackChannels, s._fetchedSlackChannelById],
-            (_fetchedSlackChannels, _fetchedSlackChannelById): SlackChannelType[] => {
+            (
+                _fetchedSlackChannels: SlackChannelType[],
+                _fetchedSlackChannelById: SlackChannelType | null
+            ): SlackChannelType[] => {
                 const channels = [..._fetchedSlackChannels]
                 if (_fetchedSlackChannelById && !channels.find((x) => x.id === _fetchedSlackChannelById.id)) {
                     channels.push(_fetchedSlackChannelById)
@@ -89,7 +213,7 @@ export const slackIntegrationLogic = kea<slackIntegrationLogicType>([
         ],
         slackChannelsForPicker: [
             (s) => [s.slackChannels, s.recentlySubscribedChannelIds],
-            (slackChannels, recentlySubscribedChannelIds): SlackChannelType[] => {
+            (slackChannels: SlackChannelType[], recentlySubscribedChannelIds: string[]): SlackChannelType[] => {
                 const recencyIndex = new Map(recentlySubscribedChannelIds.map((id, idx) => [id, idx]))
                 return [...slackChannels].sort((a, b) => {
                     const aRecency = recencyIndex.get(a.id) ?? Number.POSITIVE_INFINITY
diff --git a/frontend/src/lib/integrations/twilioIntegrationLogic.ts b/frontend/src/lib/integrations/twilioIntegrationLogic.ts
index 60c784c002a6..9ecc21c8a4ea 100644
--- a/frontend/src/lib/integrations/twilioIntegrationLogic.ts
+++ b/frontend/src/lib/integrations/twilioIntegrationLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, path, props, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, path, props, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -7,10 +7,85 @@ import { preflightLogic } from 'lib/logic/preflightLogic'
 
 import { TwilioPhoneNumberType } from '~/types'
 
-import type { twilioIntegrationLogicType } from './twilioIntegrationLogicType'
+import type { PreflightStatus } from '../../types'
 
 export const TWILIO_CHANNELS_MIN_REFRESH_INTERVAL_MINUTES = 5
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface twilioIntegrationLogicValues {
+    preflight: PreflightStatus | null // preflightLogic
+    siteUrlMisconfigured: boolean // preflightLogic
+    allTwilioPhoneNumbers: {
+        lastRefreshedAt: string
+        phone_numbers: TwilioPhoneNumberType[]
+    } | null
+    allTwilioPhoneNumbersLoading: boolean
+    getPhoneNumberRefreshButtonDisabledReason: () => string
+    twilioPhoneNumbers: TwilioPhoneNumberType[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface twilioIntegrationLogicActions {
+    loadAllTwilioPhoneNumbers: (forceRefresh?: boolean) => {
+        forceRefresh: boolean
+    }
+    loadAllTwilioPhoneNumbersFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAllTwilioPhoneNumbersSuccess: (
+        allTwilioPhoneNumbers: {
+            lastRefreshedAt: string
+            phone_numbers: TwilioPhoneNumberType[]
+        },
+        payload?: {
+            forceRefresh: boolean
+        }
+    ) => {
+        allTwilioPhoneNumbers: {
+            lastRefreshedAt: string
+            phone_numbers: TwilioPhoneNumberType[]
+        }
+        payload?: {
+            forceRefresh: boolean
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface twilioIntegrationLogicProps {
+    id: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface twilioIntegrationLogicMeta {
+    key: number
+    __keaTypeGenInternalSelectorTypes: {
+        twilioPhoneNumbers: (
+            allTwilioPhoneNumbers: {
+                lastRefreshedAt: string
+                phone_numbers: TwilioPhoneNumberType[]
+            } | null
+        ) => TwilioPhoneNumberType[]
+        getPhoneNumberRefreshButtonDisabledReason: (
+            allTwilioPhoneNumbers: {
+                lastRefreshedAt: string
+                phone_numbers: TwilioPhoneNumberType[]
+            } | null
+        ) => () => string
+    }
+}
+
+export type twilioIntegrationLogicType = MakeLogicType<
+    twilioIntegrationLogicValues,
+    twilioIntegrationLogicActions,
+    twilioIntegrationLogicProps,
+    twilioIntegrationLogicMeta
+>
+
 export const twilioIntegrationLogic = kea<twilioIntegrationLogicType>([
     props({} as { id: number }),
     key((props) => props.id),
diff --git a/frontend/src/lib/integrations/userGithubIntegrationLogic.ts b/frontend/src/lib/integrations/userGithubIntegrationLogic.ts
index 1d80870fa9ed..98e6a6601240 100644
--- a/frontend/src/lib/integrations/userGithubIntegrationLogic.ts
+++ b/frontend/src/lib/integrations/userGithubIntegrationLogic.ts
@@ -1,17 +1,54 @@
-import { actions, events, isBreakpoint, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, events, isBreakpoint, kea, key, listeners, path, props, reducers } from 'kea'
 
 import api from 'lib/api'
 
 import type { GitHubRepoApi } from 'products/integrations/frontend/generated/api.schemas'
 
-import type { userGithubIntegrationLogicType } from './userGithubIntegrationLogicType'
-
 const PAGE_SIZE = 500
 
 export interface UserGitHubIntegrationLogicProps {
     installationId: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface userGithubIntegrationLogicValues {
+    currentOffset: number
+    repositories: GitHubRepoApi[]
+    repositoriesLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface userGithubIntegrationLogicActions {
+    loadRepositories: () => {
+        value: true
+    }
+    loadRepositoriesPage: (offset: number) => {
+        offset: number
+    }
+    loadRepositoriesPageFailure: () => {
+        value: true
+    }
+    loadRepositoriesPageSuccess: (
+        repositories: GitHubRepoApi[],
+        hasMore: boolean
+    ) => {
+        hasMore: boolean
+        repositories: GitHubRepoApi[]
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface userGithubIntegrationLogicMeta {
+    key: string
+}
+
+export type userGithubIntegrationLogicType = MakeLogicType<
+    userGithubIntegrationLogicValues,
+    userGithubIntegrationLogicActions,
+    UserGitHubIntegrationLogicProps,
+    userGithubIntegrationLogicMeta
+>
+
 export const userGithubIntegrationLogic = kea<userGithubIntegrationLogicType>([
     path(['lib', 'integrations', 'userGithubIntegrationLogic']),
     props({} as UserGitHubIntegrationLogicProps),
diff --git a/frontend/src/lib/introductions/groupsAccessLogic.ts b/frontend/src/lib/introductions/groupsAccessLogic.ts
index 90944fa8b431..093a83061ab9 100644
--- a/frontend/src/lib/introductions/groupsAccessLogic.ts
+++ b/frontend/src/lib/introductions/groupsAccessLogic.ts
@@ -1,4 +1,4 @@
-import { connect, kea, path, selectors } from 'kea'
+import { MakeLogicType, connect, kea, path, selectors } from 'kea'
 
 import { preflightLogic } from 'lib/logic/preflightLogic'
 import { teamLogic } from 'scenes/teamLogic'
@@ -6,7 +6,7 @@ import { userLogic } from 'scenes/userLogic'
 
 import { AvailableFeature } from '~/types'
 
-import type { groupsAccessLogicType } from './groupsAccessLogicType'
+import type { PreflightStatus, TeamPublicType, TeamType } from '../../types'
 
 export enum GroupsAccessStatus {
     AlreadyUsing,
@@ -16,6 +16,42 @@ export enum GroupsAccessStatus {
     Hidden,
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface groupsAccessLogicValues {
+    preflight: PreflightStatus | null // preflightLogic
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean // userLogic
+    canStartUsingGroups: boolean
+    groupsAccessStatus: GroupsAccessStatus
+    groupsEnabled: boolean
+    needsUpgradeForGroups: boolean
+    shouldShowGroupsIntroduction: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface groupsAccessLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        groupsEnabled: (
+            hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean
+        ) => boolean
+        groupsAccessStatus: (
+            groupsEnabled: boolean,
+            currentTeam: TeamPublicType | TeamType | null,
+            preflight: PreflightStatus | null
+        ) => GroupsAccessStatus
+        needsUpgradeForGroups: (groupsAccessStatus: GroupsAccessStatus) => boolean
+        canStartUsingGroups: (groupsAccessStatus: GroupsAccessStatus) => boolean
+        shouldShowGroupsIntroduction: (groupsAccessStatus: GroupsAccessStatus) => boolean
+    }
+}
+
+export type groupsAccessLogicType = MakeLogicType<
+    groupsAccessLogicValues,
+    {},
+    Record<string, any>,
+    groupsAccessLogicMeta
+>
+
 export const groupsAccessLogic = kea<groupsAccessLogicType>([
     path(['lib', 'introductions', 'groupsAccessLogic']),
     connect(() => ({
@@ -24,12 +60,17 @@ export const groupsAccessLogic = kea<groupsAccessLogicType>([
     selectors({
         groupsEnabled: [
             (s) => [s.hasAvailableFeature],
-            (hasAvailableFeature) => hasAvailableFeature(AvailableFeature.GROUP_ANALYTICS),
+            (hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean) =>
+                hasAvailableFeature(AvailableFeature.GROUP_ANALYTICS),
         ],
         // Used to toggle various introduction views related to groups
         groupsAccessStatus: [
             (s) => [s.groupsEnabled, s.currentTeam, s.preflight],
-            (groupsEnabled, currentTeam, preflight): GroupsAccessStatus => {
+            (
+                groupsEnabled: boolean,
+                currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType,
+                preflight: null | import('~/types').PreflightStatus
+            ): GroupsAccessStatus => {
                 const hasGroups = currentTeam?.has_group_types
                 if (preflight?.instance_preferences?.disable_paid_fs) {
                     return GroupsAccessStatus.Hidden
@@ -45,16 +86,16 @@ export const groupsAccessLogic = kea<groupsAccessLogicType>([
         ],
         needsUpgradeForGroups: [
             (s) => [s.groupsAccessStatus],
-            (groupsAccessStatus) =>
+            (groupsAccessStatus: GroupsAccessStatus) =>
                 [GroupsAccessStatus.NoAccess, GroupsAccessStatus.HasGroupTypes].includes(groupsAccessStatus),
         ],
         canStartUsingGroups: [
             (s) => [s.groupsAccessStatus],
-            (groupsAccessStatus) => groupsAccessStatus === GroupsAccessStatus.HasAccess,
+            (groupsAccessStatus: GroupsAccessStatus) => groupsAccessStatus === GroupsAccessStatus.HasAccess,
         ],
         shouldShowGroupsIntroduction: [
             (s) => [s.groupsAccessStatus],
-            (groupsAccessStatus) =>
+            (groupsAccessStatus: GroupsAccessStatus) =>
                 [GroupsAccessStatus.HasAccess, GroupsAccessStatus.HasGroupTypes, GroupsAccessStatus.NoAccess].includes(
                     groupsAccessStatus
                 ),
diff --git a/frontend/src/lib/lemon-ui/LemonBanner/lemonBannerLogic.ts b/frontend/src/lib/lemon-ui/LemonBanner/lemonBannerLogic.ts
index 1fdf39095636..7305508b8e56 100644
--- a/frontend/src/lib/lemon-ui/LemonBanner/lemonBannerLogic.ts
+++ b/frontend/src/lib/lemon-ui/LemonBanner/lemonBannerLogic.ts
@@ -1,12 +1,37 @@
-import { actions, kea, key, path, props, reducers } from 'kea'
-
-import type { lemonBannerLogicType } from './lemonBannerLogicType'
+import { MakeLogicType, actions, kea, key, path, props, reducers } from 'kea'
 
 export type LemonBannerLogicProps = {
     /** The key to be used for persisting the fact this modal is dismissed */
     dismissKey: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface lemonBannerLogicValues {
+    isDismissed: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface lemonBannerLogicActions {
+    dismiss: () => {
+        value: true
+    }
+    resetDismissKey: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface lemonBannerLogicMeta {
+    key: string
+}
+
+export type lemonBannerLogicType = MakeLogicType<
+    lemonBannerLogicValues,
+    lemonBannerLogicActions,
+    LemonBannerLogicProps,
+    lemonBannerLogicMeta
+>
+
 export const lemonBannerLogic = kea<lemonBannerLogicType>([
     path((key) => ['components', 'lemon-banner', 'lemonBannerLogic', key]),
     key(({ dismissKey }) => dismissKey),
diff --git a/frontend/src/lib/lemon-ui/LemonDialog/lemonDialogLogic.ts b/frontend/src/lib/lemon-ui/LemonDialog/lemonDialogLogic.ts
index 28a77bf58d81..3861ef83f547 100644
--- a/frontend/src/lib/lemon-ui/LemonDialog/lemonDialogLogic.ts
+++ b/frontend/src/lib/lemon-ui/LemonDialog/lemonDialogLogic.ts
@@ -1,7 +1,6 @@
-import { kea, key, path, props } from 'kea'
+import { MakeLogicType, kea, key, path, props } from 'kea'
 import { forms } from 'kea-forms'
-
-import type { lemonDialogLogicType } from './lemonDialogLogicType'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 
 export type LemonDialogFormPropsType = {
     errors?: Record<string, (value: string) => string | undefined>
@@ -11,6 +10,73 @@ export type LemonDialogFormPropsType = {
     showErrorsOnTouch?: boolean
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface lemonDialogLogicValues {
+    form: Record<string, string>
+    formAllErrors: Record<string, any>
+    formChanged: boolean
+    formErrors: DeepPartialMap<Record<string, string>, ValidationErrorType>
+    formHasErrors: boolean
+    formManualErrors: Record<string, any>
+    formTouched: boolean
+    formTouches: Record<string, boolean>
+    formValidationErrors: DeepPartialMap<Record<string, string>, ValidationErrorType>
+    isFormSubmitting: boolean
+    isFormValid: boolean
+    showFormErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface lemonDialogLogicActions {
+    resetForm: (values?: Record<string, string>) => {
+        values?: Record<string, string>
+    }
+    setFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setFormValues: (values: DeepPartial<Record<string, string>>) => {
+        values: DeepPartial<Record<string, string>>
+    }
+    submitForm: () => {
+        value: boolean
+    }
+    submitFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitFormRequest: (form: Record<string, string>) => {
+        form: Record<string, string>
+    }
+    submitFormSuccess: (form: Record<string, string>) => {
+        form: Record<string, string>
+    }
+    touchFormField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface lemonDialogLogicMeta {
+    key: string
+}
+
+export type lemonDialogLogicType = MakeLogicType<
+    lemonDialogLogicValues,
+    lemonDialogLogicActions,
+    LemonDialogFormPropsType,
+    lemonDialogLogicMeta
+>
+
 export const lemonDialogLogic = kea<lemonDialogLogicType>([
     props({} as LemonDialogFormPropsType),
     key(({ dialogKey }) => dialogKey ?? 'default'),
diff --git a/frontend/src/lib/lemon-ui/LemonField/LemonField.stories.tsx b/frontend/src/lib/lemon-ui/LemonField/LemonField.stories.tsx
index 71d07bb30375..877f5cd499e3 100644
--- a/frontend/src/lib/lemon-ui/LemonField/LemonField.stories.tsx
+++ b/frontend/src/lib/lemon-ui/LemonField/LemonField.stories.tsx
@@ -1,11 +1,11 @@
 import type { Meta, StoryObj } from '@storybook/react'
-import { kea, path, useAllValues } from 'kea'
+import { MakeLogicType, kea, path, useAllValues } from 'kea'
 import { Form, forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 
 import { LemonButton, LemonCheckbox, LemonInput, LemonSelect, LemonTextArea } from '@posthog/lemon-ui'
 
 import { LemonField, LemonFieldProps } from './LemonField'
-import type { formLogicType } from './LemonField.storiesType'
 
 type Story = StoryObj<LemonFieldProps>
 const meta: Meta<LemonFieldProps> = {
@@ -68,6 +68,174 @@ export const _PureFields: Story = {
     },
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface formLogicValues {
+    isMyFormSubmitting: boolean
+    isMyFormValid: boolean
+    isSimpleFormSubmitting: boolean
+    isSimpleFormValid: boolean
+    myForm: {
+        email: string
+        name: string
+        pineappleOnPizza: false
+    }
+    myFormAllErrors: Record<string, any>
+    myFormChanged: boolean
+    myFormErrors: DeepPartialMap<
+        {
+            email: string
+            name: string
+            pineappleOnPizza: false
+        },
+        ValidationErrorType
+    >
+    myFormHasErrors: boolean
+    myFormManualErrors: Record<string, any>
+    myFormTouched: boolean
+    myFormTouches: Record<string, boolean>
+    myFormValidationErrors: DeepPartialMap<
+        {
+            email: string
+            name: string
+            pineappleOnPizza: false
+        },
+        ValidationErrorType
+    >
+    showMyFormErrors: boolean
+    showSimpleFormErrors: boolean
+    simpleForm: {
+        name: string
+    }
+    simpleFormAllErrors: Record<string, any>
+    simpleFormChanged: boolean
+    simpleFormErrors: DeepPartialMap<
+        {
+            name: string
+        },
+        ValidationErrorType
+    >
+    simpleFormHasErrors: boolean
+    simpleFormManualErrors: Record<string, any>
+    simpleFormTouched: boolean
+    simpleFormTouches: Record<string, boolean>
+    simpleFormValidationErrors: DeepPartialMap<
+        {
+            name: string
+        },
+        ValidationErrorType
+    >
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface formLogicActions {
+    resetMyForm: (values?: { email: string; name: string; pineappleOnPizza: false }) => {
+        values?: {
+            email: string
+            name: string
+            pineappleOnPizza: false
+        }
+    }
+    resetSimpleForm: (values?: { name: string }) => {
+        values?: {
+            name: string
+        }
+    }
+    setMyFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setMyFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setMyFormValues: (
+        values: DeepPartial<{
+            email: string
+            name: string
+            pineappleOnPizza: false
+        }>
+    ) => {
+        values: DeepPartial<{
+            email: string
+            name: string
+            pineappleOnPizza: false
+        }>
+    }
+    setSimpleFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setSimpleFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setSimpleFormValues: (
+        values: DeepPartial<{
+            name: string
+        }>
+    ) => {
+        values: DeepPartial<{
+            name: string
+        }>
+    }
+    submitMyForm: () => {
+        value: boolean
+    }
+    submitMyFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitMyFormRequest: (myForm: { email: string; name: string; pineappleOnPizza: false }) => {
+        myForm: {
+            email: string
+            name: string
+            pineappleOnPizza: false
+        }
+    }
+    submitMyFormSuccess: (myForm: { email: string; name: string; pineappleOnPizza: false }) => {
+        myForm: {
+            email: string
+            name: string
+            pineappleOnPizza: false
+        }
+    }
+    submitSimpleForm: () => {
+        value: boolean
+    }
+    submitSimpleFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitSimpleFormRequest: (simpleForm: { name: string }) => {
+        simpleForm: {
+            name: string
+        }
+    }
+    submitSimpleFormSuccess: (simpleForm: { name: string }) => {
+        simpleForm: {
+            name: string
+        }
+    }
+    touchMyFormField: (key: string) => {
+        key: string
+    }
+    touchSimpleFormField: (key: string) => {
+        key: string
+    }
+}
+
+export type formLogicType = MakeLogicType<formLogicValues, formLogicActions>
+
 const formLogic = kea<formLogicType>([
     path(['lib', 'forms', 'Field', 'stories']),
     forms(({ actions }) => ({
diff --git a/frontend/src/lib/lemon-ui/LemonField/LemonField.test.tsx b/frontend/src/lib/lemon-ui/LemonField/LemonField.test.tsx
index bf9ad1578734..0be809e68b89 100644
--- a/frontend/src/lib/lemon-ui/LemonField/LemonField.test.tsx
+++ b/frontend/src/lib/lemon-ui/LemonField/LemonField.test.tsx
@@ -1,15 +1,104 @@
 import '@testing-library/jest-dom'
 
 import { cleanup, render, screen } from '@testing-library/react'
-import { kea, path } from 'kea'
+import { MakeLogicType, kea, path } from 'kea'
 import { Form, forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 
 import { LemonInput } from 'lib/lemon-ui/LemonInput/LemonInput'
 
 import { initKeaTests } from '~/test/init'
 
 import { LemonField } from './LemonField'
-import type { lemonFieldTestLogicType } from './LemonField.testType'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface lemonFieldTestLogicValues {
+    isMyFormSubmitting: boolean
+    isMyFormValid: boolean
+    myForm: {
+        email: string
+        referral_source: string
+    }
+    myFormAllErrors: Record<string, any>
+    myFormChanged: boolean
+    myFormErrors: DeepPartialMap<
+        {
+            email: string
+            referral_source: string
+        },
+        ValidationErrorType
+    >
+    myFormHasErrors: boolean
+    myFormManualErrors: Record<string, any>
+    myFormTouched: boolean
+    myFormTouches: Record<string, boolean>
+    myFormValidationErrors: DeepPartialMap<
+        {
+            email: string
+            referral_source: string
+        },
+        ValidationErrorType
+    >
+    showMyFormErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface lemonFieldTestLogicActions {
+    resetMyForm: (values?: { email: string; referral_source: string }) => {
+        values?: {
+            email: string
+            referral_source: string
+        }
+    }
+    setMyFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setMyFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setMyFormValues: (
+        values: DeepPartial<{
+            email: string
+            referral_source: string
+        }>
+    ) => {
+        values: DeepPartial<{
+            email: string
+            referral_source: string
+        }>
+    }
+    submitMyForm: () => {
+        value: boolean
+    }
+    submitMyFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitMyFormRequest: (myForm: { email: string; referral_source: string }) => {
+        myForm: {
+            email: string
+            referral_source: string
+        }
+    }
+    submitMyFormSuccess: (myForm: { email: string; referral_source: string }) => {
+        myForm: {
+            email: string
+            referral_source: string
+        }
+    }
+    touchMyFormField: (key: string) => {
+        key: string
+    }
+}
+
+export type lemonFieldTestLogicType = MakeLogicType<lemonFieldTestLogicValues, lemonFieldTestLogicActions>
 
 const lemonFieldTestLogic = kea<lemonFieldTestLogicType>([
     path(['lib', 'lemon-ui', 'LemonField', 'test']),
diff --git a/frontend/src/lib/lemon-ui/LemonTextArea/emojiUsageLogic.ts b/frontend/src/lib/lemon-ui/LemonTextArea/emojiUsageLogic.ts
index 8411a50157b6..a24ca4e40a57 100644
--- a/frontend/src/lib/lemon-ui/LemonTextArea/emojiUsageLogic.ts
+++ b/frontend/src/lib/lemon-ui/LemonTextArea/emojiUsageLogic.ts
@@ -1,12 +1,37 @@
-import { actions, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers, selectors } from 'kea'
 
 import { now } from 'lib/dayjs'
 import { permanentlyMount } from 'lib/utils/kea-logic-builders'
 
-import type { emojiUsageLogicType } from './emojiUsageLogicType'
-
 export const defaultQuickEmojis = ['💖', '👍', '🤔', '👎', '🌶️']
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface emojiUsageLogicValues {
+    favouriteEmojis: string[]
+    usedEmojis: Record<string, number[]>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface emojiUsageLogicActions {
+    emojiUsed: (emoji: string) => {
+        emoji: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface emojiUsageLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        favouriteEmojis: (usedEmojis: Record<string, number[]>) => string[]
+    }
+}
+
+export type emojiUsageLogicType = MakeLogicType<
+    emojiUsageLogicValues,
+    emojiUsageLogicActions,
+    Record<string, any>,
+    emojiUsageLogicMeta
+>
+
 export const emojiUsageLogic = kea<emojiUsageLogicType>([
     path(['lib', 'lemon-ui', 'LemonTextArea', 'emojiUsage', 'logic']),
     actions({
@@ -43,7 +68,7 @@ export const emojiUsageLogic = kea<emojiUsageLogicType>([
     selectors({
         favouriteEmojis: [
             (s) => [s.usedEmojis],
-            (usedEmojis): string[] => {
+            (usedEmojis: Record<string, number[]>): string[] => {
                 // Get user's favorite emojis sorted by usage count
                 const userFavorites = Object.entries(usedEmojis)
                     .map(([emoji, timestamps]) => ({
diff --git a/frontend/src/lib/logic/apiStatusLogic.ts b/frontend/src/lib/logic/apiStatusLogic.ts
index 2aec00c05b6e..c0bc3193da3e 100644
--- a/frontend/src/lib/logic/apiStatusLogic.ts
+++ b/frontend/src/lib/logic/apiStatusLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers } from 'kea'
 
 import { lemonToast } from '@posthog/lemon-ui'
 
@@ -6,7 +6,34 @@ import api from 'lib/api'
 import { twoFactorLogic } from 'scenes/authentication/two-factor-setup/twoFactorLogic'
 import { userLogic } from 'scenes/userLogic'
 
-import type { apiStatusLogicType } from './apiStatusLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface apiStatusLogicValues {
+    internetConnectionIssue: boolean
+    timeSensitiveAuthenticationRequired: boolean | [onSuccess: () => void, onFailure: () => void]
+    twoFactorVerificationExpiredToastShown: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface apiStatusLogicActions {
+    onApiResponse: (
+        response?: Response,
+        error?: any
+    ) => {
+        error: any
+        response: Response | undefined
+    }
+    setInternetConnectionIssue: (issue: boolean) => {
+        issue: boolean
+    }
+    setTimeSensitiveAuthenticationRequired: (required: boolean | [onSuccess: () => void, onFailure: () => void]) => {
+        required: boolean | [onSuccess: () => void, onFailure: () => void]
+    }
+    setTwoFactorVerificationExpiredToastShown: (shown: boolean) => {
+        shown: boolean
+    }
+}
+
+export type apiStatusLogicType = MakeLogicType<apiStatusLogicValues, apiStatusLogicActions>
 
 export const apiStatusLogic = kea<apiStatusLogicType>([
     path(['lib', 'apiStatusLogic']),
diff --git a/frontend/src/lib/logic/bindModalToUrl.test.ts b/frontend/src/lib/logic/bindModalToUrl.test.ts
index 448d734c9f94..9687ac4f83cd 100644
--- a/frontend/src/lib/logic/bindModalToUrl.test.ts
+++ b/frontend/src/lib/logic/bindModalToUrl.test.ts
@@ -1,11 +1,27 @@
-import { actions, kea, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers } from 'kea'
 import { router } from 'kea-router'
 import { expectLogic } from 'kea-test-utils'
 
 import { initKeaTests } from '~/test/init'
 
 import { bindModalToUrl } from './bindModalToUrl'
-import type { testModalLogicType } from './bindModalToUrl.testType'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface testModalLogicValues {
+    isOpen: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface testModalLogicActions {
+    hideModal: () => {
+        value: true
+    }
+    showModal: () => {
+        value: true
+    }
+}
+
+export type testModalLogicType = MakeLogicType<testModalLogicValues, testModalLogicActions>
 
 // Minimal logic wired to `?modal=test-modal` for exercising bindModalToUrl
 const testModalLogic = kea<testModalLogicType>([
diff --git a/frontend/src/lib/logic/dataThemeLogic.tsx b/frontend/src/lib/logic/dataThemeLogic.tsx
index 8518df5805ab..e0b790234beb 100644
--- a/frontend/src/lib/logic/dataThemeLogic.tsx
+++ b/frontend/src/lib/logic/dataThemeLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, path, props, reducers, selectors, useValues } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, path, props, reducers, selectors, useValues } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -7,7 +7,7 @@ import { teamLogic } from 'scenes/teamLogic'
 
 import { DataColorThemeModel } from '~/types'
 
-import type { dataThemeLogicType } from './dataThemeLogicType'
+import type { TeamPublicType, TeamType } from '../../types'
 
 export function getColorFromToken(theme: DataColorTheme, colorToken: string): string {
     const colorNo = parseInt(colorToken.replace('preset-', ''))
@@ -29,6 +29,69 @@ export type DataThemeLogicProps = {
     themes?: DataColorThemeModel[]
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataThemeLogicValues {
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    defaultTheme: DataColorThemeModel | null
+    getAvailableColorTokens: (themeId: number | string | null | undefined) => DataColorToken[] | null
+    getColorFromToken: (themeId: number | string | null | undefined, colorToken: string) => string | null
+    getTheme: (themeId: number | string | null | undefined) => DataColorTheme | null
+    posthogTheme: DataColorThemeModel | null | undefined
+    themes: DataColorThemeModel[] | null
+    themesLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataThemeLogicActions {
+    loadThemes: () => any
+    loadThemesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadThemesSuccess: (
+        themes: DataColorThemeModel[],
+        payload?: any
+    ) => {
+        themes: DataColorThemeModel[]
+        payload?: any
+    }
+    setThemes: (themes: any) => {
+        themes: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataThemeLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        posthogTheme: (themes: DataColorThemeModel[] | null) => DataColorThemeModel | null | undefined
+        defaultTheme: (
+            currentTeam: TeamPublicType | TeamType | null,
+            themes: DataColorThemeModel[] | null,
+            posthogTheme: DataColorThemeModel | null | undefined
+        ) => DataColorThemeModel | null
+        getTheme: (
+            themes: DataColorThemeModel[] | null,
+            defaultTheme: DataColorThemeModel | null
+        ) => (themeId: number | string | null | undefined) => DataColorTheme | null
+        getColorFromToken: (
+            getTheme: (themeId: number | string | null | undefined) => DataColorTheme | null
+        ) => (themeId: number | string | null | undefined, colorToken: string) => string | null
+        getAvailableColorTokens: (
+            getTheme: (themeId: number | string | null | undefined) => DataColorTheme | null
+        ) => (themeId: number | string | null | undefined) => DataColorToken[] | null
+    }
+}
+
+export type dataThemeLogicType = MakeLogicType<
+    dataThemeLogicValues,
+    dataThemeLogicActions,
+    DataThemeLogicProps,
+    dataThemeLogicMeta
+>
+
 export const dataThemeLogic = kea<dataThemeLogicType>([
     props({} as DataThemeLogicProps),
     path(['scenes', 'dataThemeLogic']),
@@ -50,7 +113,7 @@ export const dataThemeLogic = kea<dataThemeLogicType>([
     selectors({
         posthogTheme: [
             (s) => [s.themes],
-            (themes) => {
+            (themes: DataColorThemeModel[] | null) => {
                 if (!themes) {
                     return null
                 }
@@ -60,7 +123,11 @@ export const dataThemeLogic = kea<dataThemeLogicType>([
         ],
         defaultTheme: [
             (s) => [s.currentTeam, s.themes, s.posthogTheme],
-            (currentTeam, themes, posthogTheme): DataColorThemeModel | null => {
+            (
+                currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType,
+                themes: DataColorThemeModel[] | null,
+                posthogTheme: DataColorThemeModel | null | undefined
+            ): DataColorThemeModel | null => {
                 if (!themes) {
                     return null
                 }
@@ -74,7 +141,7 @@ export const dataThemeLogic = kea<dataThemeLogicType>([
         ],
         getTheme: [
             (s) => [s.themes, s.defaultTheme],
-            (themes, defaultTheme) =>
+            (themes: DataColorThemeModel[] | null, defaultTheme: DataColorThemeModel | null) =>
                 (themeId: string | number | null | undefined): DataColorTheme | null => {
                     let customTheme
 
diff --git a/frontend/src/lib/logic/eventIngestionRestrictionLogic.ts b/frontend/src/lib/logic/eventIngestionRestrictionLogic.ts
index caf94154ed58..74a7e1246ec7 100644
--- a/frontend/src/lib/logic/eventIngestionRestrictionLogic.ts
+++ b/frontend/src/lib/logic/eventIngestionRestrictionLogic.ts
@@ -1,11 +1,9 @@
-import { connect, kea, path, selectors } from 'kea'
+import { MakeLogicType, connect, kea, path, selectors } from 'kea'
 import { lazyLoaders } from 'kea-loaders'
 
 import api from 'lib/api'
 import { teamLogic } from 'scenes/teamLogic'
 
-import type { eventIngestionRestrictionLogicType } from './eventIngestionRestrictionLogicType'
-
 export enum RestrictionType {
     DROP_EVENT_FROM_INGESTION = 'drop_event_from_ingestion',
     SKIP_PERSON_PROCESSING = 'skip_person_processing',
@@ -17,6 +15,47 @@ export interface EventIngestionRestriction {
     distinct_ids: string[] | null
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface eventIngestionRestrictionLogicValues {
+    currentTeamIdStrict: number | string // teamLogic
+    eventIngestionRestrictions: EventIngestionRestriction[]
+    eventIngestionRestrictionsLoading: boolean
+    hasProjectNoticeRestriction: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface eventIngestionRestrictionLogicActions {
+    loadEventIngestionRestrictions: () => any
+    loadEventIngestionRestrictionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadEventIngestionRestrictionsSuccess: (
+        eventIngestionRestrictions: any[],
+        payload?: any
+    ) => {
+        eventIngestionRestrictions: any[]
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface eventIngestionRestrictionLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        hasProjectNoticeRestriction: (eventIngestionRestrictions: EventIngestionRestriction[]) => boolean
+    }
+}
+
+export type eventIngestionRestrictionLogicType = MakeLogicType<
+    eventIngestionRestrictionLogicValues,
+    eventIngestionRestrictionLogicActions,
+    Record<string, any>,
+    eventIngestionRestrictionLogicMeta
+>
+
 export const eventIngestionRestrictionLogic = kea<eventIngestionRestrictionLogicType>([
     path(['lib', 'logic', 'eventIngestionRestrictionLogic']),
 
diff --git a/frontend/src/lib/logic/featureFlagLogic.ts b/frontend/src/lib/logic/featureFlagLogic.ts
index 41917cb9a914..03495606530e 100644
--- a/frontend/src/lib/logic/featureFlagLogic.ts
+++ b/frontend/src/lib/logic/featureFlagLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, path, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, path, reducers } from 'kea'
 import posthog from 'posthog-js'
 
 import { FeatureFlagKey } from 'lib/constants'
@@ -6,8 +6,6 @@ import { getAppContext } from 'lib/utils/getAppContext'
 
 import { AppContext } from '~/types'
 
-import type { featureFlagLogicType } from './featureFlagLogicType'
-
 export type FeatureFlagsSet = {
     [flag in FeatureFlagKey]?: boolean | string
 }
@@ -90,6 +88,25 @@ export function getFeatureFlagPayload(flag: FeatureFlagKey): any {
     return posthog.getFeatureFlagResult(flag, { send_event: false })?.payload
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface featureFlagLogicValues {
+    featureFlags: FeatureFlagsSet
+    receivedFeatureFlags: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface featureFlagLogicActions {
+    setFeatureFlags: (
+        flags: string[],
+        variants: Record<string, boolean | string>
+    ) => {
+        flags: string[]
+        variants: Record<string, boolean | string>
+    }
+}
+
+export type featureFlagLogicType = MakeLogicType<featureFlagLogicValues, featureFlagLogicActions>
+
 export const featureFlagLogic = kea<featureFlagLogicType>([
     path(['lib', 'logic', 'featureFlagLogic']),
     actions({
diff --git a/frontend/src/lib/logic/preflightLogic.tsx b/frontend/src/lib/logic/preflightLogic.tsx
index 07118062f373..3c9730c2ecff 100644
--- a/frontend/src/lib/logic/preflightLogic.tsx
+++ b/frontend/src/lib/logic/preflightLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, events, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, events, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 import posthog from 'posthog-js'
@@ -9,8 +9,6 @@ import { urls } from 'scenes/urls'
 
 import { PreflightStatus, Realm } from '~/types'
 
-import type { preflightLogicType } from './preflightLogicType'
-
 export type PreflightMode = 'experimentation' | 'live'
 
 export type PreflightCheckStatus = 'validated' | 'error' | 'warning' | 'optional'
@@ -33,6 +31,93 @@ export interface EnvironmentConfigOption {
     value: string | undefined
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface preflightLogicValues {
+    areChecksExpanded: boolean
+    areChecksManuallyExpanded: boolean | null
+    checks: PreflightItem[]
+    checksSummary: PreflightCheckSummary
+    configOptions: EnvironmentConfigOption[]
+    disableNavigationHooks: boolean | undefined
+    isCloud: boolean | undefined
+    isCloudOrDev: boolean | undefined
+    isDev: boolean | undefined
+    isHobby: boolean
+    isTest: boolean
+    objectStorageAvailable: boolean
+    preflight: PreflightStatus | null
+    preflightLoading: boolean
+    preflightMode: PreflightMode | null
+    realm: Realm | null
+    siteUrlMisconfigured: boolean
+    socialAuthAvailable: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface preflightLogicActions {
+    handlePreflightFinished: () => {
+        value: true
+    }
+    loadPreflight: () => any
+    loadPreflightFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPreflightSuccess: (
+        preflight: PreflightStatus,
+        payload?: any
+    ) => {
+        preflight: PreflightStatus
+        payload?: any
+    }
+    registerInstrumentationProps: () => {
+        value: true
+    }
+    revalidatePreflight: () => {
+        value: true
+    }
+    setChecksManuallyExpanded: (expanded: boolean | null) => {
+        expanded: boolean | null
+    }
+    setPreflightMode: (
+        mode: PreflightMode | null,
+        noReload?: boolean
+    ) => {
+        mode: PreflightMode | null
+        noReload: boolean | undefined
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface preflightLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        checks: (preflight: PreflightStatus | null, preflightMode: PreflightMode | null) => PreflightItem[]
+        checksSummary: (checks: PreflightItem[]) => PreflightCheckSummary
+        areChecksExpanded: (checksSummary: PreflightCheckSummary, areChecksManuallyExpanded: boolean | null) => boolean
+        socialAuthAvailable: (preflight: PreflightStatus | null) => boolean
+        objectStorageAvailable: (preflight: PreflightStatus | null) => boolean
+        realm: (preflight: PreflightStatus | null) => Realm | null
+        siteUrlMisconfigured: (preflight: PreflightStatus | null) => boolean
+        configOptions: (preflight: PreflightStatus | null) => EnvironmentConfigOption[]
+        isCloudOrDev: (preflight: PreflightStatus | null) => boolean | undefined
+        isTest: (preflight: PreflightStatus | null) => boolean
+        isHobby: (isCloudOrDev: boolean | undefined, isTest: boolean) => boolean
+        isCloud: (preflight: PreflightStatus | null) => boolean | undefined
+        isDev: (preflight: PreflightStatus | null) => boolean | undefined
+        disableNavigationHooks: (preflight: PreflightStatus | null) => boolean | undefined
+    }
+}
+
+export type preflightLogicType = MakeLogicType<
+    preflightLogicValues,
+    preflightLogicActions,
+    Record<string, any>,
+    preflightLogicMeta
+>
+
 export const preflightLogic = kea<preflightLogicType>([
     path(['scenes', 'PreflightCheck', 'preflightLogic']),
     loaders({
@@ -70,7 +155,7 @@ export const preflightLogic = kea<preflightLogicType>([
     selectors({
         checks: [
             (s) => [s.preflight, s.preflightMode],
-            (preflight, preflightMode) => {
+            (preflight: PreflightStatus | null, preflightMode: PreflightMode | null) => {
                 const preflightItems = [
                     {
                         id: 'database',
@@ -169,7 +254,7 @@ export const preflightLogic = kea<preflightLogicType>([
         ],
         checksSummary: [
             (s) => [s.checks],
-            (checks): PreflightCheckSummary => {
+            (checks: PreflightItem[]): PreflightCheckSummary => {
                 const statusCounts = {} as Record<PreflightCheckStatus, number>
                 if (checks.length > 0) {
                     for (const check of checks) {
@@ -200,22 +285,22 @@ export const preflightLogic = kea<preflightLogicType>([
         ],
         areChecksExpanded: [
             (s) => [s.checksSummary, s.areChecksManuallyExpanded],
-            (checksSummary, areChecksManuallyExpanded) => {
+            (checksSummary: PreflightCheckSummary, areChecksManuallyExpanded: boolean | null) => {
                 return areChecksManuallyExpanded ?? checksSummary?.summaryStatus !== 'validated'
             },
         ],
         socialAuthAvailable: [
             (s) => [s.preflight],
-            (preflight): boolean =>
+            (preflight: PreflightStatus | null): boolean =>
                 Boolean(preflight && Object.values(preflight.available_social_auth_providers).filter((i) => i).length),
         ],
         objectStorageAvailable: [
             (s) => [s.preflight],
-            (preflight): boolean => Boolean(preflight && preflight.object_storage),
+            (preflight: PreflightStatus | null): boolean => Boolean(preflight && preflight.object_storage),
         ],
         realm: [
             (s) => [s.preflight],
-            (preflight): Realm | null => {
+            (preflight: PreflightStatus | null): Realm | null => {
                 if (!preflight) {
                     return null
                 }
@@ -224,7 +309,7 @@ export const preflightLogic = kea<preflightLogicType>([
         ],
         siteUrlMisconfigured: [
             (s) => [s.preflight],
-            (preflight): boolean => {
+            (preflight: PreflightStatus | null): boolean => {
                 if (process?.env.STORYBOOK) {
                     // Disable the "site URL misconfigured" warning in Storybook. This is for consistent snapshots
                     // - when opening Storybook in the browser or when updating the snapshots in CI, the origin is
@@ -246,7 +331,7 @@ export const preflightLogic = kea<preflightLogicType>([
         ],
         configOptions: [
             (s) => [s.preflight],
-            (preflight): EnvironmentConfigOption[] => {
+            (preflight: PreflightStatus | null): EnvironmentConfigOption[] => {
                 // Returns the preflight config options to display in the /instance/status page
 
                 const RELEVANT_CONFIGS = [
@@ -268,27 +353,30 @@ export const preflightLogic = kea<preflightLogicType>([
         ],
         isCloudOrDev: [
             (s) => [s.preflight],
-            (preflight): boolean | undefined => {
+            (preflight: PreflightStatus | null): boolean | undefined => {
                 return preflight?.cloud || preflight?.is_debug
             },
         ],
-        isTest: [(s) => [s.preflight], (preflight) => !!preflight?.is_test],
-        isHobby: [(s) => [s.isCloudOrDev, s.isTest], (isCloudOrDev, isTest) => !isCloudOrDev && !isTest],
+        isTest: [(s) => [s.preflight], (preflight: PreflightStatus | null) => !!preflight?.is_test],
+        isHobby: [
+            (s) => [s.isCloudOrDev, s.isTest],
+            (isCloudOrDev: boolean | undefined, isTest: boolean) => !isCloudOrDev && !isTest,
+        ],
         isCloud: [
             (s) => [s.preflight],
-            (preflight): boolean | undefined => {
+            (preflight: PreflightStatus | null): boolean | undefined => {
                 return preflight?.cloud
             },
         ],
         isDev: [
             (s) => [s.preflight],
-            (preflight): boolean | undefined => {
+            (preflight: PreflightStatus | null): boolean | undefined => {
                 return preflight?.is_debug
             },
         ],
         disableNavigationHooks: [
             (s) => [s.preflight],
-            (preflight): boolean | undefined => {
+            (preflight: PreflightStatus | null): boolean | undefined => {
                 return preflight?.dev_disable_navigation_hooks
             },
         ],
diff --git a/frontend/src/lib/logic/scenes/useAttachedLogic.test.tsx b/frontend/src/lib/logic/scenes/useAttachedLogic.test.tsx
index 552b96586bd4..51f81f7f8582 100644
--- a/frontend/src/lib/logic/scenes/useAttachedLogic.test.tsx
+++ b/frontend/src/lib/logic/scenes/useAttachedLogic.test.tsx
@@ -1,10 +1,12 @@
 import { cleanup, renderHook } from '@testing-library/react'
-import { BuiltLogic, Logic, kea, path } from 'kea'
+import { MakeLogicType, BuiltLogic, Logic, kea, path } from 'kea'
 
 import { initKeaTests } from '~/test/init'
 
 import { useAttachedLogic } from './useAttachedLogic'
-import type { parentLogicType } from './useAttachedLogic.testType'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export type parentLogicType = MakeLogicType<{}, {}>
 
 const parentLogic = kea<parentLogicType>([path(['lib', 'logic', 'scenes', 'useAttachedLogicTestParentLogic'])])
 
diff --git a/frontend/src/lib/logic/tabUiStateLogic.ts b/frontend/src/lib/logic/tabUiStateLogic.ts
index a67c4ba8a6f3..0d6f72e14a6d 100644
--- a/frontend/src/lib/logic/tabUiStateLogic.ts
+++ b/frontend/src/lib/logic/tabUiStateLogic.ts
@@ -1,15 +1,75 @@
-import { actions, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers, selectors } from 'kea'
 
 import type { Node } from '~/queries/schema/schema-general'
 
-import type { tabUiStateLogicType } from './tabUiStateLogicType'
-
 const NO_TAB = '__no_tab__'
 
 export type ExpandedRowsByTabAndVizKey = Record<string, Record<string, number[]>>
 export type SavedQueriesByTabAndScene = Record<string, Record<string, Node>>
 export type ChatDraftsByTab = Record<string, string>
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tabUiStateLogicValues {
+    chatDraftFor: (tabId: string | undefined) => string
+    chatDraftsByTab: ChatDraftsByTab
+    expandedRowsByTabAndVizKey: ExpandedRowsByTabAndVizKey
+    expandedRowsFor: (tabId: string | undefined, vizKey: string) => number[]
+    savedQueriesByTabAndScene: SavedQueriesByTabAndScene
+    savedQueryFor: (tabId: string | undefined, sceneKey: string) => Node | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tabUiStateLogicActions {
+    clearTabUiState: (tabId: string) => {
+        tabId: string
+    }
+    setChatDraftForTab: (
+        tabId: string | undefined,
+        draft: string
+    ) => {
+        draft: string
+        tabId: string
+    }
+    setSavedQueryForTab: (
+        tabId: string | undefined,
+        sceneKey: string,
+        query: Node | null
+    ) => {
+        query: Node<Record<string, any>> | null
+        sceneKey: string
+        tabId: string
+    }
+    toggleExpandedRow: (
+        tabId: string | undefined,
+        vizKey: string,
+        rowIndex: number
+    ) => {
+        rowIndex: number
+        tabId: string
+        vizKey: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tabUiStateLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        expandedRowsFor: (
+            expandedRowsByTabAndVizKey: ExpandedRowsByTabAndVizKey
+        ) => (tabId: string | undefined, vizKey: string) => number[]
+        savedQueryFor: (
+            savedQueriesByTabAndScene: SavedQueriesByTabAndScene
+        ) => (tabId: string | undefined, sceneKey: string) => Node | null
+        chatDraftFor: (chatDraftsByTab: ChatDraftsByTab) => (tabId: string | undefined) => string
+    }
+}
+
+export type tabUiStateLogicType = MakeLogicType<
+    tabUiStateLogicValues,
+    tabUiStateLogicActions,
+    Record<string, any>,
+    tabUiStateLogicMeta
+>
+
 export const tabUiStateLogic = kea<tabUiStateLogicType>([
     path(['lib', 'logic', 'tabUiStateLogic']),
     actions({
@@ -113,19 +173,19 @@ export const tabUiStateLogic = kea<tabUiStateLogicType>([
     selectors({
         expandedRowsFor: [
             (s) => [s.expandedRowsByTabAndVizKey],
-            (state): ((tabId: string | undefined, vizKey: string) => number[]) =>
+            (state: ExpandedRowsByTabAndVizKey): ((tabId: string | undefined, vizKey: string) => number[]) =>
                 (tabId, vizKey) =>
                     state[tabId ?? NO_TAB]?.[vizKey] ?? [],
         ],
         savedQueryFor: [
             (s) => [s.savedQueriesByTabAndScene],
-            (state): ((tabId: string | undefined, sceneKey: string) => Node | null) =>
+            (state: SavedQueriesByTabAndScene): ((tabId: string | undefined, sceneKey: string) => Node | null) =>
                 (tabId, sceneKey) =>
                     state[tabId ?? NO_TAB]?.[sceneKey] ?? null,
         ],
         chatDraftFor: [
             (s) => [s.chatDraftsByTab],
-            (state): ((tabId: string | undefined) => string) =>
+            (state: ChatDraftsByTab): ((tabId: string | undefined) => string) =>
                 (tabId) =>
                     state[tabId ?? NO_TAB] ?? '',
         ],
diff --git a/frontend/src/lib/logic/themeLogic.ts b/frontend/src/lib/logic/themeLogic.ts
index 52d697061c08..5dabbec26e76 100644
--- a/frontend/src/lib/logic/themeLogic.ts
+++ b/frontend/src/lib/logic/themeLogic.ts
@@ -1,13 +1,66 @@
-import { actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
 
 import { FEATURE_FLAGS } from 'lib/constants'
 import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
 import { sceneLogic } from 'scenes/sceneLogic'
 import { userLogic } from 'scenes/userLogic'
 
-import type { themeLogicType } from './themeLogicType'
+import type { UserTheme, UserType } from '../../types'
+import type { FeatureFlagsSet } from './featureFlagLogic'
 import { Theme, themes } from './themes'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface themeLogicValues {
+    featureFlags: FeatureFlagsSet; // featureFlagLogic
+    themeMode: UserTheme; // userLogic
+    customCss: string | null;
+    customCssEnabled: boolean;
+    darkModeSystemPreference: boolean;
+    isDarkModeOn: boolean;
+    persistedCustomCss: string | null;
+    previewingCustomCss: string | null;
+    selectedTheme: string | null;
+    theme: Theme | null;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface themeLogicActions {
+    updateUser: (user: Partial<UserType>, successCallback?: (() => void) | undefined) => {
+        successCallback: (() => void) | undefined;
+        user: Partial<UserType>;
+    }; // userLogic
+    saveCustomCss: () => {
+        value: true;
+    };
+    setPersistedCustomCss: (css: string | null) => {
+        css: string | null;
+    };
+    setPreviewingCustomCss: (css: string | null) => {
+        css: string | null;
+    };
+    setTheme: (theme: string | null) => {
+        theme: string | null;
+    };
+    syncDarkModePreference: (darkModePreference: boolean) => {
+        darkModePreference: boolean;
+    };
+    toggleTheme: () => {
+        value: true;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface themeLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        theme: (selectedTheme: string | null, featureFlags: FeatureFlagsSet) => Theme | null;
+        customCssEnabled: (featureFlags: FeatureFlagsSet) => boolean;
+        customCss: (persistedCustomCss: string | null, previewingCustomCss: string | null) => string | null;
+        isDarkModeOn: (themeMode: UserTheme, darkModeSystemPreference: boolean, sceneConfig: null | import("../../scenes/sceneTypes").SceneConfig, theme: Theme | null) => boolean;
+    };
+}
+
+export type themeLogicType = MakeLogicType<themeLogicValues, themeLogicActions, Record<string, any>, themeLogicMeta>;
+
 export const themeLogic = kea<themeLogicType>([
     path(['layout', 'navigation-3000', 'themeLogic']),
     connect(() => ({
@@ -56,7 +109,10 @@ export const themeLogic = kea<themeLogicType>([
     selectors({
         theme: [
             (s) => [s.selectedTheme, s.featureFlags],
-            (selectedTheme, featureFlags): Theme | null => {
+            (
+                selectedTheme: string | null,
+                featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet
+            ): Theme | null => {
                 const flagVariant = featureFlags[FEATURE_FLAGS.THEME_OVERRIDE]
                 return (
                     (selectedTheme ? themes.find((theme) => theme.id === selectedTheme) : null) ??
@@ -67,15 +123,22 @@ export const themeLogic = kea<themeLogicType>([
         ],
         customCssEnabled: [
             (s) => [s.featureFlags],
-            (featureFlags): boolean => !!featureFlags[FEATURE_FLAGS.CUSTOM_CSS_THEMES],
+            (featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet): boolean =>
+                !!featureFlags[FEATURE_FLAGS.CUSTOM_CSS_THEMES],
         ],
         customCss: [
             (s) => [s.persistedCustomCss, s.previewingCustomCss],
-            (persistedCustomCss, previewingCustomCss): string | null => previewingCustomCss || persistedCustomCss,
+            (persistedCustomCss: string | null, previewingCustomCss: string | null): string | null =>
+                previewingCustomCss || persistedCustomCss,
         ],
         isDarkModeOn: [
             (s) => [s.themeMode, s.darkModeSystemPreference, sceneLogic.selectors.sceneConfig, s.theme],
-            (themeMode, darkModeSystemPreference, sceneConfig, theme) => {
+            (
+                themeMode: import('../../types').UserTheme,
+                darkModeSystemPreference: boolean,
+                sceneConfig: null | import('../../scenes/sceneTypes').SceneConfig,
+                theme: Theme | null
+            ) => {
                 if (
                     typeof window !== 'undefined' &&
                     window.document &&
diff --git a/frontend/src/lib/logic/userPreferencesLogic.ts b/frontend/src/lib/logic/userPreferencesLogic.ts
index 9a0dd7663e23..db73d6833f9c 100644
--- a/frontend/src/lib/logic/userPreferencesLogic.ts
+++ b/frontend/src/lib/logic/userPreferencesLogic.ts
@@ -1,9 +1,46 @@
-import { actions, connect, kea, path, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, path, reducers } from 'kea'
 
 import { PERSON_DEFAULT_DISPLAY_NAME_PROPERTIES } from 'lib/constants'
 import { teamLogic } from 'scenes/teamLogic'
 
-import type { userPreferencesLogicType } from './userPreferencesLogicType'
+import type { TeamPublicType, TeamType } from '../../types'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface userPreferencesLogicValues {
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    editorVimModeEnabled: boolean
+    hideNullValues: boolean
+    hidePostHogPropertiesInTable: boolean
+    pinnedGroupProperties: string[]
+    pinnedPersonProperties: string[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface userPreferencesLogicActions {
+    pinGroupProperty: (prop: string) => {
+        prop: string
+    }
+    pinPersonProperty: (prop: string) => {
+        prop: string
+    }
+    setEditorVimModeEnabled: (enabled: boolean) => {
+        enabled: boolean
+    }
+    setHideNullValues: (enabled: boolean) => {
+        enabled: boolean
+    }
+    setHidePostHogPropertiesInTable: (enabled: boolean) => {
+        enabled: boolean
+    }
+    unpinGroupProperty: (prop: string) => {
+        prop: string
+    }
+    unpinPersonProperty: (prop: string) => {
+        prop: string
+    }
+}
+
+export type userPreferencesLogicType = MakeLogicType<userPreferencesLogicValues, userPreferencesLogicActions>
 
 // This logic is for browser stored user preferences where it's not super important that it is persisted to the server
 export const userPreferencesLogic = kea<userPreferencesLogicType>([
diff --git a/frontend/src/lib/memory/autofillReleaseLogic.ts b/frontend/src/lib/memory/autofillReleaseLogic.ts
index bd31ba405792..a78adab7944e 100644
--- a/frontend/src/lib/memory/autofillReleaseLogic.ts
+++ b/frontend/src/lib/memory/autofillReleaseLogic.ts
@@ -1,10 +1,36 @@
-import { afterMount, connect, kea, listeners, path } from 'kea'
+import { MakeLogicType, afterMount, connect, kea, listeners, path } from 'kea'
 import { router } from 'kea-router'
-
-import type { autofillReleaseLogicType } from './autofillReleaseLogicType'
+import type { LocationChangedPayload } from 'kea-router/lib/types'
 
 const SINK_ID = 'autofill-release-sink'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface autofillReleaseLogicActions {
+    locationChanged: ({
+        method,
+        pathname,
+        search,
+        searchParams,
+        hash,
+        hashParams,
+        initial,
+        url,
+        routerState,
+    }: LocationChangedPayload) => {
+        hash: string
+        hashParams: Record<string, any>
+        initial: boolean
+        method: 'POP' | 'PUSH' | 'REPLACE'
+        pathname: string
+        routerState: Record<string, any>
+        search: string
+        searchParams: Record<string, any>
+        url: string
+    } // router
+}
+
+export type autofillReleaseLogicType = MakeLogicType<{}, autofillReleaseLogicActions>
+
 /**
  * Workaround for a Chromium AutofillAgent retention bug.
  *
diff --git a/frontend/src/lib/monaco/CodeEditorImpl.tsx b/frontend/src/lib/monaco/CodeEditorImpl.tsx
index 146ee8bcd108..4920795221ad 100644
--- a/frontend/src/lib/monaco/CodeEditorImpl.tsx
+++ b/frontend/src/lib/monaco/CodeEditorImpl.tsx
@@ -12,7 +12,7 @@ import { usePageVisibility } from 'lib/hooks/usePageVisibility'
 import { Spinner } from 'lib/lemon-ui/Spinner'
 import { themeLogic } from 'lib/logic/themeLogic'
 import { codeEditorLogic } from 'lib/monaco/codeEditorLogic'
-import { codeEditorLogicType } from 'lib/monaco/codeEditorLogicType'
+import type { codeEditorLogicType } from 'lib/monaco/codeEditorLogic'
 import { findNextFocusableElement, findPreviousFocusableElement } from 'lib/monaco/domUtils'
 import { trackFindWidgetVisibility } from 'lib/monaco/findWidgetBodyClass'
 import { initCodeownersLanguage } from 'lib/monaco/languages/codeowners'
diff --git a/frontend/src/lib/monaco/codeEditorLogic.tsx b/frontend/src/lib/monaco/codeEditorLogic.tsx
index ac592f6e1588..48db75457556 100644
--- a/frontend/src/lib/monaco/codeEditorLogic.tsx
+++ b/frontend/src/lib/monaco/codeEditorLogic.tsx
@@ -1,5 +1,5 @@
 import type { Monaco } from '@monaco-editor/react'
-import { actions, connect, kea, key, path, props, propsChanged, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, path, props, propsChanged, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { subscriptions } from 'kea-subscriptions'
 // Note: we can oly import types and not values from monaco-editor, because otherwise some Monaco code breaks
@@ -25,7 +25,7 @@ import {
 } from '~/queries/schema/schema-general'
 import { setLatestVersionsOnQuery } from '~/queries/utils'
 
-import type { codeEditorLogicType } from './codeEditorLogicType'
+import type { FeatureFlagsSet } from '../logic/featureFlagLogic'
 import { getContextSourceQuery } from './sourceQueryUtils'
 
 const METADATA_LANGUAGES = [HogLanguage.hog, HogLanguage.hogQL, HogLanguage.hogQLExpr, HogLanguage.hogTemplate]
@@ -56,6 +56,86 @@ export interface CodeEditorLogicProps {
     onFixWithAI?: (prompt: string) => void
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface codeEditorLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    error: string | null
+    hasErrors: boolean
+    metadata: [string, HogQLMetadataResponse] | null
+    metadataLoading: boolean
+    modelMarkers: ModelMarker[]
+    modelMarkersLoading: boolean
+    vimCommandHistory: string[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface codeEditorLogicActions {
+    appendVimCommand: (command: string) => {
+        command: string
+    }
+    reloadMetadata: () => {
+        value: true
+    }
+    reloadMetadataFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    reloadMetadataSuccess: (
+        metadata: [string, HogQLMetadataResponse] | null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        metadata: [string, HogQLMetadataResponse] | null
+        payload?: {
+            value: true
+        }
+    }
+    reloadMetadataSuccessFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    reloadMetadataSuccessSuccess: (
+        modelMarkers: ModelMarker[],
+        payload?: {
+            metadata: [string, HogQLMetadataResponse] | null
+            payload?: {
+                value: true
+            }
+        }
+    ) => {
+        modelMarkers: ModelMarker[]
+        payload?: {
+            metadata: [string, HogQLMetadataResponse] | null
+            payload?: {
+                value: true
+            }
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface codeEditorLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        hasErrors: (modelMarkers: ModelMarker[]) => boolean
+        error: (hasErrors: boolean, modelMarkers: ModelMarker[]) => string | null
+    }
+}
+
+export type codeEditorLogicType = MakeLogicType<
+    codeEditorLogicValues,
+    codeEditorLogicActions,
+    CodeEditorLogicProps,
+    codeEditorLogicMeta
+>
+
 export const codeEditorLogic = kea<codeEditorLogicType>([
     path(['lib', 'monaco', 'hogQLMetadataProvider']),
     props({} as CodeEditorLogicProps),
@@ -181,11 +261,12 @@ export const codeEditorLogic = kea<codeEditorLogicType>([
     selectors({
         hasErrors: [
             (s) => [s.modelMarkers],
-            (modelMarkers) => !!(modelMarkers ?? []).filter((e) => e.severity === 8 /* MarkerSeverity.Error */).length,
+            (modelMarkers: ModelMarker[]) =>
+                !!(modelMarkers ?? []).filter((e) => e.severity === 8 /* MarkerSeverity.Error */).length,
         ],
         error: [
             (s) => [s.hasErrors, s.modelMarkers],
-            (hasErrors, modelMarkers) => {
+            (hasErrors: boolean, modelMarkers: ModelMarker[]) => {
                 const firstError = modelMarkers.find((e) => e.severity === 8 /* MarkerSeverity.Error */)
                 return hasErrors && firstError
                     ? `Error on line ${firstError.startLineNumber}, column ${firstError.startColumn}`
diff --git a/frontend/src/lib/monaco/hogQLAutocompleteProvider.ts b/frontend/src/lib/monaco/hogQLAutocompleteProvider.ts
index 97ba525b6303..e4f5567a7c4e 100644
--- a/frontend/src/lib/monaco/hogQLAutocompleteProvider.ts
+++ b/frontend/src/lib/monaco/hogQLAutocompleteProvider.ts
@@ -1,7 +1,7 @@
 import { BuiltLogic } from 'kea'
 import { languages } from 'monaco-editor'
 
-import type { codeEditorLogicType } from 'lib/monaco/codeEditorLogicType'
+import type { codeEditorLogicType } from 'lib/monaco/codeEditorLogic'
 
 import { performQuery } from '~/queries/query'
 import {
diff --git a/frontend/src/lib/monaco/hogQLMetadataProvider.tsx b/frontend/src/lib/monaco/hogQLMetadataProvider.tsx
index 050aa0d70ee3..28e87a1747e4 100644
--- a/frontend/src/lib/monaco/hogQLMetadataProvider.tsx
+++ b/frontend/src/lib/monaco/hogQLMetadataProvider.tsx
@@ -1,7 +1,7 @@
 import { BuiltLogic } from 'kea'
 import { languages } from 'monaco-editor'
 
-import type { codeEditorLogicType } from './codeEditorLogicType'
+import type { codeEditorLogicType } from './codeEditorLogic'
 
 export const hogQLMetadataProvider: () => languages.CodeActionProvider = () => ({
     provideCodeActions: (model, _range, context) => {
diff --git a/frontend/src/lib/monaco/modelLogicReference.ts b/frontend/src/lib/monaco/modelLogicReference.ts
index 6042f6be3393..4ab8b8ce36d4 100644
--- a/frontend/src/lib/monaco/modelLogicReference.ts
+++ b/frontend/src/lib/monaco/modelLogicReference.ts
@@ -1,7 +1,7 @@
 import type { BuiltLogic } from 'kea'
 import type { editor } from 'monaco-editor'
 
-import type { codeEditorLogicType } from 'lib/monaco/codeEditorLogicType'
+import type { codeEditorLogicType } from 'lib/monaco/codeEditorLogic'
 
 export function initModel(model: editor.ITextModel, builtCodeEditorLogic: BuiltLogic<codeEditorLogicType>): void {
     ;(model as any).codeEditorLogic = builtCodeEditorLogic
diff --git a/frontend/src/lib/oauth/oauthLogic.ts b/frontend/src/lib/oauth/oauthLogic.ts
index 89c1ebb9cf6f..bc42ff7ad7ca 100644
--- a/frontend/src/lib/oauth/oauthLogic.ts
+++ b/frontend/src/lib/oauth/oauthLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers } from 'kea'
 import { urlToAction } from 'kea-router'
 
 import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
@@ -7,9 +7,43 @@ import { getRelativeNextPath } from 'lib/utils/url'
 import { Region } from '~/types'
 
 import { buildAuthorizeUrl, clearSession, exchangeCodeForToken, OAUTH_REGIONS, PendingAuth } from './oauthClient'
-import type { oauthLogicType } from './oauthLogicType'
 import { generateCodeVerifier, generateState } from './pkce'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface oauthLogicValues {
+    loginError: string | null
+    loginInProgress: boolean
+    pendingAuth: PendingAuth | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface oauthLogicActions {
+    beginLogin: (region: Region.US | Region.EU) => {
+        region: Region.US | Region.EU
+    }
+    clearPendingAuth: () => {
+        value: true
+    }
+    handleCallback: (
+        code: string,
+        state: string
+    ) => {
+        code: string
+        state: string
+    }
+    logout: () => {
+        value: true
+    }
+    setLoginError: (error: string | null) => {
+        error: string | null
+    }
+    setPendingAuth: (pending: PendingAuth) => {
+        pending: PendingAuth
+    }
+}
+
+export type oauthLogicType = MakeLogicType<oauthLogicValues, oauthLogicActions>
+
 export const oauthLogic = kea<oauthLogicType>([
     path(['lib', 'oauth', 'oauthLogic']),
     actions({
diff --git a/frontend/src/lib/utils/eventUsageLogic.ts b/frontend/src/lib/utils/eventUsageLogic.ts
index d8b4730d40d7..9ee8777ece61 100644
--- a/frontend/src/lib/utils/eventUsageLogic.ts
+++ b/frontend/src/lib/utils/eventUsageLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path } from 'kea'
 import posthog from 'posthog-js'
 
 import { TaxonomicFilterGroupType } from 'lib/components/TaxonomicFilter/types'
@@ -74,7 +74,8 @@ import {
     SurveyQuestionType,
 } from '~/types'
 
-import type { eventUsageLogicType } from './eventUsageLogicType'
+import type { ExperimentMetricUnion } from '../../queries/schema/schema-general'
+import type { FunnelCorrelationResultsType, Realm, UserType } from '../../types'
 
 export enum DashboardEventSource {
     LongPress = 'long_press',
@@ -347,6 +348,1608 @@ function sanitizeQuery(query: Node | null): Record<string, string | number | boo
     return objectClean(payload)
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface eventUsageLogicValues {
+    realm: Realm | null // preflightLogic
+    user: UserType | null // userLogic
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface eventUsageLogicActions {
+    reportAIChatOnboardingMessageSent: (
+        stepKey: OnboardingStepKey,
+        messageType: 'button' | 'chat'
+    ) => {
+        messageType: 'button' | 'chat'
+        stepKey: OnboardingStepKey
+    }
+    reportAIChatOnboardingStarted: (variant: string) => {
+        variant: string
+    }
+    reportAIChatOnboardingStepTime: (
+        stepKey: OnboardingStepKey,
+        timeSeconds: number
+    ) => {
+        stepKey: OnboardingStepKey
+        timeSeconds: number
+    }
+    reportAccountOwnerClicked: ({ name, email }: { email: string; name: string }) => {
+        email: string
+        name: string
+    }
+    reportActivationSideBarTaskClicked: (key: string) => {
+        key: string
+    }
+    reportActivityLogSettingToggled: (receive_org_level_activity_logs: boolean | null) => {
+        receive_org_level_activity_logs: boolean | null
+    }
+    reportAutocaptureExceptionsToggled: (autocapture_opt_in: boolean) => {
+        autocapture_opt_in: boolean
+    }
+    reportAutocaptureToggled: (autocapture_opt_out: boolean) => {
+        autocapture_opt_out: boolean
+    }
+    reportAxisUnitsChanged: (properties: Record<string, any>) => {
+        [x: string]: any
+    }
+    reportBillingAddonPlanSwitchStarted: (
+        fromProduct: string,
+        toProduct: string,
+        reason: 'downgrade' | 'upgrade'
+    ) => {
+        fromProduct: string
+        reason: 'downgrade' | 'upgrade'
+        toProduct: string
+    }
+    reportBillingCTAShown: () => {
+        value: true
+    }
+    reportBillingDowngradeClicked: (plan: string) => {
+        plan: string
+    }
+    reportBillingSpendInteraction: (properties: BillingUsageInteractionProps) => {
+        properties: BillingUsageInteractionProps
+    }
+    reportBillingUpgradeClicked: (plan: string) => {
+        plan: string
+    }
+    reportBillingUsageInteraction: (properties: BillingUsageInteractionProps) => {
+        properties: BillingUsageInteractionProps
+    }
+    reportBounceRatePageViewModeUpdated: (mode: string) => {
+        mode: string
+    }
+    reportChangeInnerPropertyGroupFiltersType: (
+        type: FilterLogicalOperator,
+        filtersLength: number
+    ) => {
+        filtersLength: number
+        type: FilterLogicalOperator
+    }
+    reportChangeOuterPropertyGroupFiltersType: (
+        type: FilterLogicalOperator,
+        groupsLength: number
+    ) => {
+        groupsLength: number
+        type: FilterLogicalOperator
+    }
+    reportCopiedDashboardTileToDashboard: (
+        fromDashboardId: number,
+        toDashboardId: number,
+        tileType: DashboardWidgetType
+    ) => {
+        fromDashboardId: number
+        tileType: DashboardWidgetType
+        toDashboardId: number
+    }
+    reportCorrelationInteraction: (
+        correlationType: FunnelCorrelation['result_type'],
+        action: string,
+        props?: Record<string, any>
+    ) => {
+        action: string
+        correlationType: FunnelCorrelationResultsType
+        props: Record<string, any> | undefined
+    }
+    reportCorrelationViewed: (
+        query: Node | null,
+        delay?: number,
+        propertiesTable?: boolean
+    ) => {
+        delay: number | undefined
+        propertiesTable: boolean | undefined
+        query: Node<Record<string, any>> | null
+    }
+    reportCreatedDashboardFromModal: () => {
+        value: true
+    }
+    reportCustomChannelTypeRulesUpdated: (numRules: number) => {
+        numRules: number
+    }
+    reportCustomerAnalyticsAddJoinButtonClicked: ({ table }: any) => {
+        table: any
+    }
+    reportCustomerAnalyticsDashboardBusinessModeChanged: ({ business_mode }: any) => {
+        business_mode: any
+    }
+    reportCustomerAnalyticsDashboardConfigurationButtonClicked: () => boolean
+    reportCustomerAnalyticsDashboardConfigurationViewed: () => boolean
+    reportCustomerAnalyticsDashboardConfigureEventWithAIClicked: ({ event }: any) => {
+        event: any
+    }
+    reportCustomerAnalyticsDashboardDateFilterApplied: ({ filter }: any) => {
+        filter: any
+    }
+    reportCustomerAnalyticsDashboardEventPickerClicked: ({ event }: any) => {
+        event: any
+    }
+    reportCustomerAnalyticsDashboardEventsSaved: () => boolean
+    reportCustomerAnalyticsViewed: (delay?: number) => {
+        delay: number | undefined
+    }
+    reportCustomerJourneyBuilderStepAdded: (
+        stepIndex: number,
+        stepCount: number
+    ) => {
+        stepCount: number
+        stepIndex: number
+    }
+    reportCustomerJourneyBuilderStepRemoved: (
+        stepIndex: number,
+        stepCount: number
+    ) => {
+        stepCount: number
+        stepIndex: number
+    }
+    reportCustomerJourneyCreated: (
+        journeyName: string,
+        stepCount: number,
+        creationSource: string | null
+    ) => {
+        creationSource: string | null
+        journeyName: string
+        stepCount: number
+    }
+    reportCustomerJourneyDeleted: (journeyId: string) => {
+        journeyId: string
+    }
+    reportCustomerJourneyExistingFunnelSelected: (insightId: number) => {
+        insightId: number
+    }
+    reportCustomerJourneyPathExpanded: (
+        pathType: string,
+        dropOff: boolean,
+        stepIndex: number
+    ) => {
+        dropOff: boolean
+        pathType: string
+        stepIndex: number
+    }
+    reportCustomerJourneyStepAddedFromPath: (
+        eventName: string,
+        pathType: string,
+        stepIndex: number
+    ) => {
+        eventName: string
+        pathType: string
+        stepIndex: number
+    }
+    reportCustomerJourneyStepsSavedFromEditor: (
+        stepsAdded: number,
+        journeyId: string | null
+    ) => {
+        journeyId: string | null
+        stepsAdded: number
+    }
+    reportCustomerJourneyTemplateSelected: (templateKey: string) => {
+        templateKey: string
+    }
+    reportCustomerJourneyUpdated: (
+        journeyId: string,
+        journeyName: string,
+        stepCount: number
+    ) => {
+        journeyId: string
+        journeyName: string
+        stepCount: number
+    }
+    reportCustomerJourneyViewed: (
+        journeyId: string,
+        journeyName: string,
+        stepCount: number,
+        delay?: number
+    ) => {
+        delay: number | undefined
+        journeyId: string
+        journeyName: string
+        stepCount: number
+    }
+    reportDashboardDateRangeChanged: (
+        dashboard: DashboardType<QueryBasedInsightModel> | null,
+        dateFrom?: string | Dayjs | null,
+        dateTo?: string | Dayjs | null
+    ) => {
+        dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>> | null
+        dateFrom: string | Dayjs | null | undefined
+        dateTo: string | Dayjs | null | undefined
+    }
+    reportDashboardEditModeDiscardPrompt: (
+        dashboard: DashboardType<QueryBasedInsightModel> | null,
+        action: 'discarded' | 'kept_editing' | 'shown'
+    ) => {
+        action: 'discarded' | 'kept_editing' | 'shown'
+        dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>> | null
+    }
+    reportDashboardEmptyAiPromptClicked: (
+        promptLabel: string,
+        dashboardId: number | undefined
+    ) => {
+        dashboardId: number | undefined
+        promptLabel: string
+    }
+    reportDashboardFiltersChanged: (
+        dashboard: DashboardType<QueryBasedInsightModel> | null,
+        changeType: DashboardFilterChangeType,
+        properties: Record<string, boolean | number | string | null | undefined>
+    ) => {
+        changeType: DashboardFilterChangeType
+        dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>> | null
+        properties: Record<string, boolean | number | string | null | undefined>
+    }
+    reportDashboardFrontEndUpdate: (
+        dashboardId: number | undefined,
+        attribute: 'description' | 'name' | 'tags',
+        originalLength: number,
+        newLength: number
+    ) => {
+        attribute: 'description' | 'name' | 'tags'
+        dashboardId: number | undefined
+        newLength: number
+        originalLength: number
+    }
+    reportDashboardInsightAnnotationsToggled: (
+        dashboardId: number | undefined,
+        insightId: number,
+        source: DashboardEventSource
+    ) => {
+        dashboardId: number | undefined
+        insightId: number
+        source: DashboardEventSource
+    }
+    reportDashboardInsightLegendToggled: (
+        dashboardId: number | undefined,
+        insightId: number,
+        source: DashboardEventSource
+    ) => {
+        dashboardId: number | undefined
+        insightId: number
+        source: DashboardEventSource
+    }
+    reportDashboardInsightMetaUpdated: (
+        dashboardId: number | undefined,
+        insightId: number,
+        attribute: 'description' | 'name'
+    ) => {
+        attribute: 'description' | 'name'
+        dashboardId: number | undefined
+        insightId: number
+    }
+    reportDashboardInsightValuesOnSeriesToggled: (
+        dashboardId: number | undefined,
+        insightId: number,
+        source: DashboardEventSource
+    ) => {
+        dashboardId: number | undefined
+        insightId: number
+        source: DashboardEventSource
+    }
+    reportDashboardLayoutEditModeEntered: (
+        dashboard: DashboardType<QueryBasedInsightModel> | null,
+        source: DashboardEventSource,
+        layoutZoom: number | null
+    ) => {
+        dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>> | null
+        layoutZoom: number | null
+        source: DashboardEventSource
+    }
+    reportDashboardLayoutZoomChanged: (
+        dashboard: DashboardType<QueryBasedInsightModel> | null,
+        layoutZoom: number,
+        source: 'button' | 'shortcut'
+    ) => {
+        dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>> | null
+        layoutZoom: number
+        source: 'button' | 'shortcut'
+    }
+    reportDashboardListSearched: (
+        searchLength: number,
+        resultsCount: number
+    ) => {
+        resultsCount: number
+        searchLength: number
+    }
+    reportDashboardLoadingTime: (
+        loadingMilliseconds: number,
+        dashboardId: number
+    ) => {
+        dashboardId: number
+        loadingMilliseconds: number
+    }
+    reportDashboardModeToggled: (
+        dashboard: DashboardType<QueryBasedInsightModel> | null,
+        mode: DashboardMode | null,
+        source: DashboardEventSource | null,
+        layoutZoom: number | null,
+        layoutEditMode?: boolean
+    ) => {
+        dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>> | null
+        layoutEditMode: boolean | undefined
+        layoutZoom: number | null
+        mode: DashboardMode | null
+        source: DashboardEventSource | null
+    }
+    reportDashboardMoveInitiated: (
+        method: 'bulk' | 'single',
+        count: number
+    ) => {
+        count: number
+        method: 'bulk' | 'single'
+    }
+    reportDashboardMovedToFolder: (props: {
+        fromDepth: number
+        fromUnfiled: boolean
+        toDepth: number
+        toUnfiled: boolean
+    }) => {
+        fromDepth: number
+        fromUnfiled: boolean
+        toDepth: number
+        toUnfiled: boolean
+    }
+    reportDashboardPinToggled: (
+        dashboardId: number,
+        pinned: boolean,
+        source: DashboardEventSource
+    ) => {
+        dashboardId: number
+        pinned: boolean
+        source: DashboardEventSource
+    }
+    reportDashboardPropertiesChanged: (dashboard: DashboardType<QueryBasedInsightModel> | null) => {
+        dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>> | null
+    }
+    reportDashboardRefreshed: (
+        dashboardId: number,
+        dashboard: DashboardType<QueryBasedInsightModel> | null,
+        filters: Record<string, any>,
+        variables: Record<string, any>,
+        lastRefreshed: string | Dayjs | null,
+        action: string,
+        forceRefresh: boolean,
+        insightsRefreshedInfo: {
+            refreshDurationMs: number
+            tilesAbortedCount: number
+            tilesErroredCount: number
+            tilesRefreshedCount: number
+            tilesStaleCount: number
+            totalTileCount: number
+        }
+    ) => {
+        action: string
+        dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>> | null
+        dashboardId: number
+        filters: Record<string, any>
+        forceRefresh: boolean
+        insightsRefreshedInfo: {
+            refreshDurationMs: number
+            tilesAbortedCount: number
+            tilesErroredCount: number
+            tilesRefreshedCount: number
+            tilesStaleCount: number
+            totalTileCount: number
+        }
+        lastRefreshed: string | Dayjs | null
+        variables: Record<string, any>
+    }
+    reportDashboardShareToggled: (
+        dashboardId: number | undefined,
+        isShared: boolean
+    ) => {
+        dashboardId: number | undefined
+        isShared: boolean
+    }
+    reportDashboardTileInsertedInline: (
+        tileType: DashboardAddTileType,
+        column: number,
+        row: number,
+        fullWidth: boolean
+    ) => {
+        column: number
+        fullWidth: boolean
+        row: number
+        tileType: DashboardAddTileType
+    }
+    reportDashboardTileRefreshed: (
+        dashboardId: number,
+        tile: DashboardTile<QueryBasedInsightModel>,
+        filters: Record<string, any>,
+        variables: Record<string, any>,
+        refreshDurationMs: number,
+        individualRefresh: boolean
+    ) => {
+        dashboardId: number
+        filters: Record<string, any>
+        individualRefresh: boolean
+        refreshDurationMs: number
+        tile: DashboardTile<QueryBasedInsightModel<Node<Record<string, any>>>>
+        variables: Record<string, any>
+    }
+    reportDashboardTileRepositioned: (
+        dashboardId: number,
+        action: 'moved' | 'resized',
+        layoutZoom: number
+    ) => {
+        action: 'moved' | 'resized'
+        dashboardId: number
+        layoutZoom: number
+    }
+    reportDashboardViewed: (
+        dashboard: DashboardType<QueryBasedInsightModel>,
+        lastRefreshed: Dayjs | null,
+        delay?: number
+    ) => {
+        dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>>
+        delay: number | undefined
+        lastRefreshed: Dayjs | null
+    }
+    reportDashboardWhitelabelToggled: (
+        dashboardId: number | undefined,
+        isWhiteLabelled: boolean
+    ) => {
+        dashboardId: number | undefined
+        isWhiteLabelled: boolean
+    }
+    reportDashboardsTreeFolderNavigated: (
+        depth: number,
+        hasSubfolders: boolean
+    ) => {
+        depth: number
+        hasSubfolders: boolean
+    }
+    reportDataManagementDefinitionCancel: (type: TaxonomicFilterGroupType) => {
+        type: TaxonomicFilterGroupType
+    }
+    reportDataManagementDefinitionClickEdit: (type: TaxonomicFilterGroupType) => {
+        type: TaxonomicFilterGroupType
+    }
+    reportDataManagementDefinitionClickView: (type: TaxonomicFilterGroupType) => {
+        type: TaxonomicFilterGroupType
+    }
+    reportDataManagementDefinitionHovered: (
+        type: TaxonomicFilterGroupType,
+        mediaPreviewCount?: number
+    ) => {
+        mediaPreviewCount: number | undefined
+        type: TaxonomicFilterGroupType
+    }
+    reportDataManagementDefinitionSaveFailed: (
+        type: TaxonomicFilterGroupType,
+        loadTime: number,
+        error: string
+    ) => {
+        error: string
+        loadTime: number
+        type: TaxonomicFilterGroupType
+    }
+    reportDataManagementDefinitionSaveSucceeded: (
+        type: TaxonomicFilterGroupType,
+        loadTime: number
+    ) => {
+        loadTime: number
+        type: TaxonomicFilterGroupType
+    }
+    reportDataManagementEventDefinitionsPageLoadFailed: (
+        loadTime: number,
+        error: string
+    ) => {
+        error: string
+        loadTime: number
+    }
+    reportDataManagementEventDefinitionsPageLoadSucceeded: (
+        loadTime: number,
+        resultsLength: number
+    ) => {
+        loadTime: number
+        resultsLength: number
+    }
+    reportDataManagementEventDefinitionsPageNestedPropertiesLoadFailed: (
+        loadTime: number,
+        error: string
+    ) => {
+        error: string
+        loadTime: number
+    }
+    reportDataManagementEventDefinitionsPageNestedPropertiesLoadSucceeded: (loadTime: number) => {
+        loadTime: number
+    }
+    reportDataManagementEventPropertyDefinitionsPageLoadFailed: (
+        loadTime: number,
+        error: string
+    ) => {
+        error: string
+        loadTime: number
+    }
+    reportDataManagementEventPropertyDefinitionsPageLoadSucceeded: (
+        loadTime: number,
+        resultsLength: number
+    ) => {
+        loadTime: number
+        resultsLength: number
+    }
+    reportDataTableColumnsUpdated: (context_type: string) => {
+        context_type: string
+    }
+    reportEntityFilterVisibilitySet: (
+        index: number,
+        visible: boolean,
+        entityName?: string
+    ) => {
+        entityName: string | undefined
+        index: number
+        visible: boolean
+    }
+    reportExperimentAiSummaryRequested: (experiment: Experiment) => {
+        experiment: Experiment
+    }
+    reportExperimentAutoRefreshToggled: (
+        experiment: Experiment,
+        enabled: boolean,
+        interval: number
+    ) => {
+        enabled: boolean
+        experiment: Experiment
+        interval: number
+    }
+    reportExperimentBiasWarningShown: (experiment: Experiment) => {
+        experiment: Experiment
+    }
+    reportExperimentCreated: (
+        experiment: Experiment,
+        metadata?: {
+            creation_source?: string
+            has_linked_flag?: boolean
+        }
+    ) => {
+        experiment: Experiment
+        metadata:
+            | {
+                  creation_source?: string | undefined
+                  has_linked_flag?: boolean | undefined
+              }
+            | undefined
+    }
+    reportExperimentDashboardCreated: (
+        experiment: Experiment,
+        dashboardId: number
+    ) => {
+        dashboardId: number
+        experiment: Experiment
+    }
+    reportExperimentEndDateChange: (
+        experiment: Experiment,
+        newEndDate: string
+    ) => {
+        experiment: Experiment
+        newEndDate: string
+    }
+    reportExperimentExposureCohortCreated: (
+        experiment: Experiment,
+        cohort: CohortType
+    ) => {
+        cohort: CohortType
+        experiment: Experiment
+    }
+    reportExperimentExposureCohortEdited: (
+        existingCohort: CohortType,
+        newCohort: CohortType
+    ) => {
+        existingCohort: CohortType
+        newCohort: CohortType
+    }
+    reportExperimentFeatureFlagModalOpened: () => {}
+    reportExperimentFeatureFlagSelected: (featureFlagKey: string) => {
+        featureFlagKey: string
+    }
+    reportExperimentHoldoutAssigned: ({
+        experimentId,
+        holdoutId,
+    }: {
+        experimentId: ExperimentIdType
+        holdoutId: ExperimentHoldoutType['id']
+    }) => {
+        experimentId: ExperimentIdType
+        holdoutId: number | null
+    }
+    reportExperimentHoldoutCreated: (holdout: ExperimentHoldoutType) => {
+        holdout: ExperimentHoldoutType
+    }
+    reportExperimentInconsistencyWarningShown: (
+        experiment: Experiment,
+        warningKey: string
+    ) => {
+        experiment: Experiment
+        warningKey: string
+    }
+    reportExperimentInsightLoadFailed: () => {
+        value: true
+    }
+    reportExperimentMetricBreakdownAdded: (
+        experiment: Experiment,
+        metricUuid: string,
+        breakdown: Breakdown,
+        isPrimary: boolean
+    ) => {
+        breakdown: Breakdown
+        experiment: Experiment
+        isPrimary: boolean
+        metricUuid: string
+    }
+    reportExperimentMetricBreakdownRemoved: (
+        experiment: Experiment,
+        metricUuid: string,
+        breakdown: Breakdown,
+        index: number,
+        isPrimary: boolean
+    ) => {
+        breakdown: Breakdown
+        experiment: Experiment
+        index: number
+        isPrimary: boolean
+        metricUuid: string
+    }
+    reportExperimentMetricFinished: (
+        experimentId: ExperimentIdType,
+        metric: ExperimentFunnelsQuery | ExperimentMetric | ExperimentTrendsQuery,
+        teamId?: number | null,
+        queryId?: string | null,
+        context?: {
+            duration_ms: number
+            execution_mode: 'async' | 'sync'
+            is_cached: boolean
+            is_primary: boolean
+            is_retry: boolean
+            metric_index: number
+            metric_kind: string
+            refresh_id: string
+        }
+    ) => {
+        context:
+            | {
+                  duration_ms: number
+                  execution_mode: 'async' | 'sync'
+                  is_cached: boolean
+                  is_primary: boolean
+                  is_retry: boolean
+                  metric_index: number
+                  metric_kind: string
+                  refresh_id: string
+              }
+            | undefined
+        experimentId: ExperimentIdType
+        metric: ExperimentFunnelsQuery | ExperimentMetricUnion | ExperimentTrendsQuery
+        queryId: string | null | undefined
+        teamId: number | null | undefined
+    }
+    reportExperimentMetricRecalculation: (
+        status: 'completed' | 'failed' | 'triggered',
+        properties: {
+            duration_ms?: number
+            experiment_id: number
+            failed?: number
+            is_existing?: boolean
+            poll_count?: number
+            recalculation_id: string | null
+            succeeded?: number
+            total_metrics?: number
+            trigger?:
+                | 'auto_refresh'
+                | 'cold_run'
+                | 'config_change'
+                | 'experiment_launch'
+                | 'experiment_stop'
+                | 'experiment_update'
+                | 'manual'
+                | 'stale_refresh'
+        }
+    ) => {
+        properties: {
+            duration_ms?: number | undefined
+            experiment_id: number
+            failed?: number | undefined
+            is_existing?: boolean | undefined
+            poll_count?: number | undefined
+            recalculation_id: string | null
+            succeeded?: number | undefined
+            total_metrics?: number | undefined
+            trigger?:
+                | 'auto_refresh'
+                | 'cold_run'
+                | 'config_change'
+                | 'experiment_launch'
+                | 'experiment_stop'
+                | 'experiment_update'
+                | 'manual'
+                | 'stale_refresh'
+                | undefined
+        }
+        status: 'completed' | 'failed' | 'triggered'
+    }
+    reportExperimentMetricsRefreshed: (
+        experiment: Experiment,
+        forceRefresh: boolean,
+        context?: {
+            auto_refresh_enabled?: boolean
+            auto_refresh_interval?: number
+            previous_refresh_age_ms?: number | null
+            previous_refresh_id?: string | null
+            previous_refresh_state?: string | null
+            previous_refresh_triggered_by?: string | null
+            triggered_by: 'auto-refresh' | 'manual'
+        }
+    ) => {
+        context:
+            | {
+                  auto_refresh_enabled?: boolean | undefined
+                  auto_refresh_interval?: number | undefined
+                  previous_refresh_age_ms?: number | null | undefined
+                  previous_refresh_id?: string | null | undefined
+                  previous_refresh_state?: string | null | undefined
+                  previous_refresh_triggered_by?: string | null | undefined
+                  triggered_by: 'auto-refresh' | 'manual'
+              }
+            | undefined
+        experiment: Experiment
+        forceRefresh: boolean
+    }
+    reportExperimentReleaseConditionsUpdated: (experimentId: ExperimentIdType) => {
+        experimentId: ExperimentIdType
+    }
+    reportExperimentReleaseConditionsViewed: (experimentId: ExperimentIdType) => {
+        experimentId: ExperimentIdType
+    }
+    reportExperimentResultsLoadingTimeout: (experimentId: ExperimentIdType) => {
+        experimentId: ExperimentIdType
+    }
+    reportExperimentResultsRefreshCompleted: (
+        experimentId: ExperimentIdType,
+        teamId: number | null | undefined,
+        context: {
+            cached_count: number
+            errored_count: number
+            execution_mode: 'async' | 'sync'
+            experiment_duration_hours: number | null
+            experiment_status: string | null
+            force_refresh: boolean
+            primary_metrics_count: number
+            refresh_id: string
+            secondary_metrics_count: number
+            successful_count: number
+            total_duration_ms: number
+            total_metrics_count: number
+            triggered_by: 'auto_refresh' | 'config_change' | 'manual' | 'page_load'
+        }
+    ) => {
+        context: {
+            cached_count: number
+            errored_count: number
+            execution_mode: 'async' | 'sync'
+            experiment_duration_hours: number | null
+            experiment_status: string | null
+            force_refresh: boolean
+            primary_metrics_count: number
+            refresh_id: string
+            secondary_metrics_count: number
+            successful_count: number
+            total_duration_ms: number
+            total_metrics_count: number
+            triggered_by: 'auto_refresh' | 'config_change' | 'manual' | 'page_load'
+        }
+        experimentId: ExperimentIdType
+        teamId: number | null | undefined
+    }
+    reportExperimentSessionReplaySummaryRequested: (experiment: Experiment) => {
+        experiment: Experiment
+    }
+    reportExperimentSharedMetricAssigned: (
+        experimentId: ExperimentIdType,
+        sharedMetric: SharedMetric
+    ) => {
+        experimentId: ExperimentIdType
+        sharedMetric: SharedMetric
+    }
+    reportExperimentSharedMetricCreated: (sharedMetric: SharedMetric) => {
+        sharedMetric: SharedMetric
+    }
+    reportExperimentStartDateChange: (
+        experiment: Experiment,
+        newStartDate: string
+    ) => {
+        experiment: Experiment
+        newStartDate: string
+    }
+    reportExperimentTimeseriesRecalculated: (
+        experimentId: ExperimentIdType,
+        metric: ExperimentMetric
+    ) => {
+        experimentId: ExperimentIdType
+        metric: ExperimentMetricUnion
+    }
+    reportExperimentTimeseriesViewed: (
+        experimentId: ExperimentIdType,
+        metric: ExperimentMetric
+    ) => {
+        experimentId: ExperimentIdType
+        metric: ExperimentMetricUnion
+    }
+    reportExperimentUpdated: (experiment: Experiment) => {
+        experiment: Experiment
+    }
+    reportExperimentVariantScreenshotUploaded: (experimentId: ExperimentIdType) => {
+        experimentId: ExperimentIdType
+    }
+    reportExperimentViewed: (
+        experiment: Experiment,
+        duration: number | null
+    ) => {
+        duration: number | null
+        experiment: Experiment
+    }
+    reportExperimentWizardGuideToggled: (
+        visible: boolean,
+        currentStep: string
+    ) => {
+        currentStep: string
+        visible: boolean
+    }
+    reportExperimentWizardStarted: (guideVisible: boolean) => {
+        guideVisible: boolean
+    }
+    reportFailedToCreateFeatureFlagWithCohort: (
+        code: string,
+        detail: string
+    ) => {
+        code: string
+        detail: string
+    }
+    reportFeatureFlagBulkCopy: (
+        flagCount: number,
+        projectCount: number,
+        failedCount: number
+    ) => {
+        failedCount: number
+        flagCount: number
+        projectCount: number
+    }
+    reportFeatureFlagCopyFailure: (error: any) => {
+        error: any
+    }
+    reportFeatureFlagCopySuccess: () => {
+        value: true
+    }
+    reportFeatureFlagScheduleFailure: (error: any) => {
+        error: any
+    }
+    reportFeatureFlagScheduleSuccess: () => {
+        value: true
+    }
+    reportFlagsCodeExampleInteraction: (optionType: string) => {
+        optionType: string
+    }
+    reportFlagsCodeExampleLanguage: (language: string) => {
+        language: string
+    }
+    reportFunnelCalculated: (
+        eventCount: number,
+        actionCount: number,
+        interval: string,
+        funnelVizType: string | undefined,
+        success: boolean,
+        error?: string
+    ) => {
+        actionCount: number
+        error: string | undefined
+        eventCount: number
+        funnelVizType: string | undefined
+        interval: string
+        success: boolean
+    }
+    reportFunnelStepReordered: () => {
+        value: true
+    }
+    reportGroupProfileViewed: (delay?: number) => {
+        delay: number | undefined
+    }
+    reportGroupPropertyUpdated: (
+        action: 'added' | 'removed' | 'updated',
+        totalProperties: number,
+        oldPropertyType?: string,
+        newPropertyType?: string
+    ) => {
+        action: 'added' | 'removed' | 'updated'
+        newPropertyType: string | undefined
+        oldPropertyType: string | undefined
+        totalProperties: number
+    }
+    reportGroupTypeDetailDashboardCreated: () => {}
+    reportGroupViewSaved: (
+        groupTypeIndex: number,
+        shortcutName: string
+    ) => {
+        groupTypeIndex: number
+        shortcutName: string
+    }
+    reportHeatmapsToggled: (heatmaps_opt_in: boolean) => {
+        heatmaps_opt_in: boolean
+    }
+    reportHelpButtonUsed: (help_type: HelpType) => {
+        help_type: HelpType
+    }
+    reportHelpButtonViewed: () => {
+        value: true
+    }
+    reportIngestionContinueWithoutVerifying: () => {
+        value: true
+    }
+    reportInsightBreakdownChanged: (queryKind: string | undefined) => {
+        queryKind: string | undefined
+    }
+    reportInsightCompareChanged: (queryKind: string | undefined) => {
+        queryKind: string | undefined
+    }
+    reportInsightDateRangeChanged: (queryKind: string | undefined) => {
+        queryKind: string | undefined
+    }
+    reportInsightDragToZoomed: (queryKind: string | undefined) => {
+        queryKind: string | undefined
+    }
+    reportInsightFilterAdded: (
+        newLength: number,
+        source: GraphSeriesAddedSource
+    ) => {
+        newLength: number
+        source: GraphSeriesAddedSource
+    }
+    reportInsightFilterRemoved: (index: number) => {
+        index: number
+    }
+    reportInsightFilterSet: (
+        filters: Array<{
+            id: number | string | null
+            type?: EntityType
+        }>
+    ) => {
+        filters: {
+            id: number | string | null
+            type?: EntityType | undefined
+        }[]
+    }
+    reportInsightMetadataAiGenerated: (queryKind: NodeKind) => {
+        queryKind: NodeKind
+    }
+    reportInsightMetadataAiGenerationFailed: (queryKind: NodeKind) => {
+        queryKind: NodeKind
+    }
+    reportInsightOpenedFromRecentInsightList: () => {
+        value: true
+    }
+    reportInsightRefreshTime: (
+        loadingMilliseconds: number,
+        insightShortId: InsightShortId
+    ) => {
+        insightShortId: InsightShortId
+        loadingMilliseconds: number
+    }
+    reportInsightSaved: (
+        insight: Partial<QueryBasedInsightModel> | null,
+        query: Node | null,
+        isNewInsight: boolean,
+        saveType: 'save' | 'save_as'
+    ) => {
+        insight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>> | null
+        isNewInsight: boolean
+        query: Node<Record<string, any>> | null
+        saveType: 'save' | 'save_as'
+    }
+    reportInsightStarted: (query: Node | null) => {
+        query: Node<Record<string, any>> | null
+    }
+    reportInsightViewed: (
+        insightModel: Partial<QueryBasedInsightModel>,
+        query: Node | null,
+        isFirstLoad: boolean,
+        delay?: number
+    ) => {
+        delay: number | undefined
+        insightModel: Partial<QueryBasedInsightModel<Node<Record<string, any>>>>
+        isFirstLoad: boolean
+        query: Node<Record<string, any>> | null
+    }
+    reportInsightWhitelabelToggled: (isWhiteLabelled: boolean) => {
+        isWhiteLabelled: boolean
+    }
+    reportInsightsTableCalcToggled: (mode: string) => {
+        mode: string
+    }
+    reportInstanceSettingChange: (
+        name: string,
+        value: boolean | number | string
+    ) => {
+        name: string
+        value: boolean | number | string
+    }
+    reportIntegrationConnectClicked: (
+        integration: string,
+        kind: string
+    ) => {
+        integration: string
+        kind: string
+    }
+    reportInviteMembersButtonClicked: () => {
+        value: true
+    }
+    reportMCPHintDismissed: (
+        dismissType: 'all' | 'surface',
+        surfaceKey?: string
+    ) => {
+        dismissType: 'all' | 'surface'
+        surfaceKey: string | undefined
+    }
+    reportMCPHintShown: (surfaceKey: string) => {
+        surfaceKey: string
+    }
+    reportMarketingAnalyticsDataSourceConnected: (sourceType: string) => {
+        sourceType: string
+    }
+    reportMarketingAnalyticsOnboardingCompleted: (hasSources: boolean) => {
+        hasSources: boolean
+    }
+    reportMarketingAnalyticsOnboardingViewed: () => {}
+    reportMediaPreviewUploaded: (source: string) => {
+        source: string
+    }
+    reportNavbarStarredItemAdded: (
+        itemType: string,
+        itemName: string
+    ) => {
+        itemName: string
+        itemType: string
+    }
+    reportNavbarStarredItemClicked: (
+        itemType: string,
+        itemName: string
+    ) => {
+        itemName: string
+        itemType: string
+    }
+    reportNavbarStarredItemRemoved: (
+        itemType: string,
+        itemName: string
+    ) => {
+        itemName: string
+        itemType: string
+    }
+    reportNavbarStarredItemsReordered: (
+        itemCount: number,
+        isAIFirst: boolean
+    ) => {
+        isAIFirst: boolean
+        itemCount: number
+    }
+    reportOnboardingCompleted: (productKey: string) => {
+        productKey: string
+    }
+    reportOnboardingProductSelectionPath: (
+        path: 'ai' | 'browsing_history' | 'manual' | 'use_case',
+        properties?: {
+            hasBrowsingHistory?: boolean
+            recommendedProducts?: string[]
+            useCase?: string
+        }
+    ) => {
+        path: 'ai' | 'browsing_history' | 'manual' | 'use_case'
+        properties:
+            | {
+                  hasBrowsingHistory?: boolean | undefined
+                  recommendedProducts?: string[] | undefined
+                  useCase?: string | undefined
+              }
+            | undefined
+    }
+    reportOnboardingProductToggled: (
+        productKey: string,
+        selected: boolean,
+        recommendationSource: string
+    ) => {
+        productKey: string
+        recommendationSource: string
+        selected: boolean
+    }
+    reportOnboardingStarted: (entrypoint: string) => {
+        entrypoint: string
+    }
+    reportOnboardingStepCompleted: (
+        stepKey: OnboardingStepKey,
+        productKey?: string
+    ) => {
+        productKey: string | undefined
+        stepKey: OnboardingStepKey
+    }
+    reportOnboardingStepSkipped: (
+        stepKey: OnboardingStepKey,
+        productKey?: string
+    ) => {
+        productKey: string | undefined
+        stepKey: OnboardingStepKey
+    }
+    reportOnboardingUseCaseSelected: (
+        useCase: string,
+        recommendedProducts: readonly string[]
+    ) => {
+        recommendedProducts: readonly string[]
+        useCase: string
+    }
+    reportOnboardingUseCaseSkipped: () => {
+        value: true
+    }
+    reportPersonDetailViewed: (person: PersonType) => {
+        person: PersonType
+    }
+    reportPersonOpenedFromNewlySeenPersonsList: () => {
+        value: true
+    }
+    reportPersonProfileViewed: (delay?: number) => {
+        delay: number | undefined
+    }
+    reportPersonPropertyUpdated: (
+        action: 'added' | 'removed' | 'updated',
+        totalProperties: number,
+        oldPropertyType?: string,
+        newPropertyType?: string
+    ) => {
+        action: 'added' | 'removed' | 'updated'
+        newPropertyType: string | undefined
+        oldPropertyType: string | undefined
+        totalProperties: number
+    }
+    reportPersonSplit: (merge_count: number) => {
+        merge_count: number
+    }
+    reportPersonsJoinModeUpdated: (mode: string) => {
+        mode: string
+    }
+    reportPersonsModalSearched: (params: { actorType?: string; teamId?: number | null }) => {
+        params: {
+            actorType?: string | undefined
+            teamId?: number | null | undefined
+        }
+    }
+    reportPersonsModalViewed: (params: any) => {
+        params: any
+    }
+    reportPoEModeUpdated: (mode: string) => {
+        mode: string
+    }
+    reportProductTourCreated: (
+        tour: ProductTour,
+        creationSource?: 'app' | 'toolbar'
+    ) => {
+        creationSource: 'app' | 'toolbar' | undefined
+        tour: ProductTour
+    }
+    reportProductTourListViewed: () => {
+        value: true
+    }
+    reportProductTourViewed: (tour: ProductTour) => {
+        tour: ProductTour
+    }
+    reportProductUnsubscribed: (product: string) => {
+        product: string
+    }
+    reportProjectCreationSubmitted: (
+        projectCount: number,
+        nameLength: number
+    ) => {
+        nameLength: number
+        projectCount: number
+    }
+    reportProjectNoticeDismissed: (key: string) => {
+        key: string
+    }
+    reportProjectNoticeShown: (variant: string) => {
+        variant: string
+    }
+    reportProjectSettingChange: (
+        name: string,
+        value: any
+    ) => {
+        name: string
+        value: any
+    }
+    reportPropertyGroupFilterAdded: () => {
+        value: true
+    }
+    reportPropertyGroupFilterDuplicated: () => {
+        value: true
+    }
+    reportPropertyGroupFilterRemoved: () => {
+        value: true
+    }
+    reportPropertySelectOpened: () => {
+        value: true
+    }
+    reportRemovedInsightFromDashboard: (
+        insight: Partial<QueryBasedInsightModel> | null,
+        dashboardId: number | null
+    ) => {
+        dashboardId: number | null
+        insight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>> | null
+    }
+    reportRevenueAnalyticsBreakdownAdded: (
+        breakdownProperty: string,
+        breakdownType: string
+    ) => {
+        breakdownProperty: string
+        breakdownType: string
+    }
+    reportRevenueAnalyticsBreakdownRemoved: (
+        breakdownProperty: string,
+        breakdownType: string
+    ) => {
+        breakdownProperty: string
+        breakdownType: string
+    }
+    reportRevenueAnalyticsDataSourceConnected: (sourceType: string) => {
+        sourceType: string
+    }
+    reportRevenueAnalyticsDataSourceDisabled: (sourceType: string) => {
+        sourceType: string
+    }
+    reportRevenueAnalyticsDataSourceEnabled: (sourceType: string) => {
+        sourceType: string
+    }
+    reportRevenueAnalyticsDateRangeChanged: (
+        dateFrom: string | null,
+        dateTo: string | null
+    ) => {
+        dateFrom: string | null
+        dateTo: string | null
+    }
+    reportRevenueAnalyticsEventCreated: (eventName: string) => {
+        eventName: string
+    }
+    reportRevenueAnalyticsEventDeleted: (eventName: string) => {
+        eventName: string
+    }
+    reportRevenueAnalyticsEventEdited: (eventName: string) => {
+        eventName: string
+    }
+    reportRevenueAnalyticsFilterApplied: (filterCount: number) => {
+        filterCount: number
+    }
+    reportRevenueAnalyticsGoalConfigured: () => {}
+    reportRevenueAnalyticsMRRBreakdownModalOpened: () => {}
+    reportRevenueAnalyticsMRRModeChanged: (mrrMode: string) => {
+        mrrMode: string
+    }
+    reportRevenueAnalyticsOnboardingCompleted: (
+        hasEvents: boolean,
+        hasSources: boolean
+    ) => {
+        hasEvents: boolean
+        hasSources: boolean
+    }
+    reportRevenueAnalyticsOnboardingViewed: () => {}
+    reportRevenueAnalyticsSettingsViewed: () => {}
+    reportRevenueAnalyticsTestAccountFilterUpdated: (filterTestAccounts: boolean) => {
+        filterTestAccounts: boolean
+    }
+    reportRevenueAnalyticsViewed: (delay?: number) => {
+        delay: number | undefined
+    }
+    reportRoleCreated: (role: string) => {
+        role: string
+    }
+    reportSDKSelected: (sdk: SDK) => {
+        sdk: SDK
+    }
+    reportSavedInsightFilterUsed: (filterKeys: string[]) => {
+        filterKeys: string[]
+    }
+    reportSavedInsightNewInsightClicked: (insightType: string) => {
+        insightType: string
+    }
+    reportSavedInsightTabChanged: (tab: string) => {
+        tab: string
+    }
+    reportSavedInsightToDashboard: (
+        insight: Partial<QueryBasedInsightModel> | null,
+        dashboardId: number | null
+    ) => {
+        dashboardId: number | null
+        insight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>> | null
+    }
+    reportSessionTableVersionUpdated: (version: string) => {
+        version: string
+    }
+    reportSubscribedDuringOnboarding: (productKey: string) => {
+        productKey: string
+    }
+    reportSurveyAiPromptSubmitted: (source: string) => {
+        source: string
+    }
+    reportSurveyArchived: (survey: Survey) => {
+        survey: Survey
+    }
+    reportSurveyConsolidatedResultsQuery: (
+        survey: Survey,
+        totalDurationMs: number,
+        queryDurations: {
+            aggregate: number
+            openEnded: number
+        }
+    ) => {
+        queryDurations: {
+            aggregate: number
+            openEnded: number
+        }
+        survey: Survey
+        totalDurationMs: number
+    }
+    reportSurveyCreated: (
+        survey: Survey,
+        isDuplicate?: boolean,
+        creationSource?: 'form_builder' | 'full_editor' | 'llm_analytics' | 'quick_create' | 'template' | 'wizard'
+    ) => {
+        creationSource:
+            | 'form_builder'
+            | 'full_editor'
+            | 'llm_analytics'
+            | 'quick_create'
+            | 'template'
+            | 'wizard'
+            | undefined
+        isDuplicate: boolean | undefined
+        survey: Survey
+    }
+    reportSurveyCycleDetected: (survey: NewSurvey | Survey) => {
+        survey: NewSurvey | Survey
+    }
+    reportSurveyEdited: (survey: Survey) => {
+        survey: Survey
+    }
+    reportSurveyEmptyStateViewed: () => {
+        value: true
+    }
+    reportSurveyTemplateClicked: (
+        template: SurveyTemplateType,
+        source?: string
+    ) => {
+        source: string | undefined
+        template: SurveyTemplateType
+    }
+    reportSurveyViewed: (survey: Survey) => {
+        survey: Survey
+    }
+    reportTaxonomicFilterAddFilterClicked: (eventName?: string) => {
+        eventName: string | undefined
+    }
+    reportTaxonomicFilterCategorySelected: (
+        groupType: TaxonomicFilterGroupType,
+        eventName?: string
+    ) => {
+        eventName: string | undefined
+        groupType: TaxonomicFilterGroupType
+    }
+    reportTeamSettingChange: (
+        name: string,
+        value: any
+    ) => {
+        name: string
+        value: any
+    }
+    reportTestAccountFiltersUpdated: (filters: Record<string, any>[]) => {
+        filters: Record<string, any>[]
+    }
+    reportTimeToSeeData: (payload: TimeToSeeDataPayload) => {
+        payload: TimeToSeeDataPayload
+    }
+    reportTimezoneComponentViewed: (
+        component: 'indicator' | 'label',
+        project_timezone?: string,
+        device_timezone?: string | null
+    ) => {
+        component: 'indicator' | 'label'
+        device_timezone: string | null | undefined
+        project_timezone: string | undefined
+    }
+    reportUpgradeModalShown: (featureName: string) => {
+        featureName: string
+    }
+    reportUsageMetricCreated: () => boolean
+    reportUsageMetricDeleted: () => boolean
+    reportUsageMetricUpdated: () => boolean
+    reportUsageMetricsCreateButtonClicked: () => boolean
+    reportUsageMetricsSettingsViewed: () => boolean
+    reportUsageMetricsUpdateButtonClicked: () => boolean
+    reportUserFeedbackButtonClicked: (
+        source: SURVEY_CREATED_SOURCE,
+        meta: Record<string, any>
+    ) => {
+        meta: Record<string, any>
+        source: SURVEY_CREATED_SOURCE
+    }
+    reportWebAnalyticsCompareToggled: (props: { enabled: boolean }) => {
+        props: {
+            enabled: boolean
+        }
+    }
+    reportWebAnalyticsConversionGoalSet: (props: { goal_type: string | null }) => {
+        props: {
+            goal_type: string | null
+        }
+    }
+    reportWebAnalyticsDateRangeChanged: (props: {
+        date_from: string | null
+        date_to: string | null
+        interval: string
+    }) => {
+        props: {
+            date_from: string | null
+            date_to: string | null
+            interval: string
+        }
+    }
+    reportWebAnalyticsFilterApplied: (props: {
+        filter_type: string
+        property_filter_category?: PropertyFilterType
+        total_filter_count: number
+    }) => {
+        props: {
+            filter_type: string
+            property_filter_category?: PropertyFilterType | undefined
+            total_filter_count: number
+        }
+    }
+    reportWebAnalyticsFilterRemoved: (props: {
+        filter_type: string
+        property_filter_category?: PropertyFilterType
+        total_filter_count: number
+    }) => {
+        props: {
+            filter_type: string
+            property_filter_category?: PropertyFilterType | undefined
+            total_filter_count: number
+        }
+    }
+    reportWebAnalyticsFocusModeOnboardingCompleted: (props: { concern_count: number }) => {
+        props: {
+            concern_count: number
+        }
+    }
+    reportWebAnalyticsFocusModeOnboardingShown: () => {
+        value: true
+    }
+    reportWebAnalyticsFocusModeOnboardingSkipped: () => {
+        value: true
+    }
+    reportWebAnalyticsFocusModeOnboardingStarted: () => {
+        value: true
+    }
+    reportWebAnalyticsHealthActionClicked: (props: {
+        category: string
+        check_id: string
+        is_urgent: boolean
+        status: string
+    }) => {
+        props: {
+            category: string
+            check_id: string
+            is_urgent: boolean
+            status: string
+        }
+    }
+    reportWebAnalyticsHealthRefreshed: (props: { overall_status: string; passed_count: number }) => {
+        props: {
+            overall_status: string
+            passed_count: number
+        }
+    }
+    reportWebAnalyticsHealthSectionToggled: (props: { category: string; is_expanded: boolean }) => {
+        props: {
+            category: string
+            is_expanded: boolean
+        }
+    }
+    reportWebAnalyticsHealthStatus: (props: {
+        has_authorized_urls: boolean
+        has_pageleaves: boolean
+        has_pageviews: boolean
+        has_reverse_proxy: boolean
+        has_scroll_depth: boolean
+        has_web_vitals: boolean
+        overall_status: string
+    }) => {
+        props: {
+            has_authorized_urls: boolean
+            has_pageleaves: boolean
+            has_pageviews: boolean
+            has_reverse_proxy: boolean
+            has_scroll_depth: boolean
+            has_web_vitals: boolean
+            overall_status: string
+        }
+    }
+    reportWebAnalyticsHealthTabViewed: (props: {
+        error_count: number
+        overall_status: string
+        passed_count: number
+        warning_count: number
+    }) => {
+        props: {
+            error_count: number
+            overall_status: string
+            passed_count: number
+            warning_count: number
+        }
+    }
+    reportWebAnalyticsPathCleaningToggled: (props: { enabled: boolean }) => {
+        props: {
+            enabled: boolean
+        }
+    }
+    reportWebDashboardCreatedFromTemplate: (payload: {
+        dashboard_id: number
+        template_id: string
+        template_name: string
+        template_scope: DashboardTemplateScope | null
+        template_variable_count: number
+    }) => {
+        dashboard_id: number
+        template_id: string
+        template_name: string
+        template_scope: DashboardTemplateScope | null
+        template_variable_count: number
+    }
+    reportWizardSyncSessionDetected: (props: {
+        runPhase: string
+        skillId: string
+        taskCount: number
+        workflowId: string
+    }) => {
+        runPhase: string
+        skillId: string
+        taskCount: number
+        workflowId: string
+    }
+    reportWizardSyncSessionFinished: (props: {
+        completedTaskCount: number
+        elapsedSeconds: number
+        outcome: string
+        skillId: string
+        taskCount: number
+        workflowId: string
+    }) => {
+        completedTaskCount: number
+        elapsedSeconds: number
+        outcome: string
+        skillId: string
+        taskCount: number
+        workflowId: string
+    }
+}
+
+export type eventUsageLogicType = MakeLogicType<eventUsageLogicValues, eventUsageLogicActions>
+
 export const eventUsageLogic = kea<eventUsageLogicType>([
     path(['lib', 'utils', 'eventUsageLogic']),
     connect(() => ({
diff --git a/frontend/src/lib/wizard-sync/wizardSyncDebugLogic.ts b/frontend/src/lib/wizard-sync/wizardSyncDebugLogic.ts
index 8574f49fada7..237e1659bf8a 100644
--- a/frontend/src/lib/wizard-sync/wizardSyncDebugLogic.ts
+++ b/frontend/src/lib/wizard-sync/wizardSyncDebugLogic.ts
@@ -1,6 +1,4 @@
-import { actions, kea, listeners, path, reducers } from 'kea'
-
-import type { wizardSyncDebugLogicType } from './wizardSyncDebugLogicType'
+import { MakeLogicType, actions, kea, listeners, path, reducers } from 'kea'
 
 export type SyncDebugKind = 'connect' | 'open' | 'poll' | 'event' | 'error' | 'complete' | 'disconnect'
 
@@ -34,6 +32,30 @@ let nextEntryId = 0
 // the reducers stay pure. Module-level is fine: this is a dev-only diagnostic, not app state.
 const lastTickAtBySource = new Map<string, number>()
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface wizardSyncDebugLogicValues {
+    entries: SyncDebugEntry[]
+    sources: Record<string, SyncDebugSourceInfo>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface wizardSyncDebugLogicActions {
+    clearSyncDebugLog: () => {
+        value: true
+    }
+    recordSyncEvent: (
+        entry: SyncDebugEntry,
+        mode?: 'polling' | 'sse',
+        intervalMs?: number
+    ) => {
+        entry: SyncDebugEntry
+        intervalMs: number | undefined
+        mode: 'polling' | 'sse' | undefined
+    }
+}
+
+export type wizardSyncDebugLogicType = MakeLogicType<wizardSyncDebugLogicValues, wizardSyncDebugLogicActions>
+
 /**
  * Dev-only in-memory event log for the wizard sync transports (task-run SSE/polling, wizard-session
  * SSE/polling). Fed by `logSyncDebug` below and rendered by `WizardSyncDebugPanel`. Never mounted in
diff --git a/frontend/src/models/actionsModel.ts b/frontend/src/models/actionsModel.ts
index ea13325fd3ce..252701040708 100644
--- a/frontend/src/models/actionsModel.ts
+++ b/frontend/src/models/actionsModel.ts
@@ -1,4 +1,4 @@
-import { connect, events, kea, path, props, selectors } from 'kea'
+import { MakeLogicType, connect, events, kea, path, props, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -7,7 +7,7 @@ import { isAuthenticatedTeam, teamLogic } from 'scenes/teamLogic'
 
 import { ActionType } from '~/types'
 
-import type { actionsModelType } from './actionsModelType'
+import type { TeamPublicType, TeamType } from '../types'
 
 export interface ActionsModelProps {
     params?: string
@@ -17,6 +17,110 @@ export function findActionName(id: number): string | null {
     return actionsModel.findMounted()?.values.actions.find((a) => a.id === id)?.name || null
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface actionsModelValues {
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    actions: ActionType[]
+    actionsById: Partial<Record<number | string, ActionType>>
+    actionsGrouped: {
+        label: string
+        options: {
+            label: string | null
+            value: number
+        }[]
+    }[]
+    actionsLoading: boolean
+    actionsSorted: ActionType[]
+    pin: any
+    pinLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface actionsModelActions {
+    loadActions: () => any
+    loadActionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadActionsSuccess: (
+        actions: ActionType[],
+        payload?: any
+    ) => {
+        actions: ActionType[]
+        payload?: any
+    }
+    pinAction: (action: ActionType) => ActionType
+    pinActionFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    pinActionSuccess: (
+        pin: void,
+        payload?: ActionType
+    ) => {
+        pin: void
+        payload?: ActionType
+    }
+    unpinAction: (action: ActionType) => ActionType
+    unpinActionFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    unpinActionSuccess: (
+        pin: void,
+        payload?: ActionType
+    ) => {
+        pin: void
+        payload?: ActionType
+    }
+    updateAction: (action: ActionType) => ActionType
+    updateActionFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateActionSuccess: (
+        actions: ActionType[],
+        payload?: ActionType
+    ) => {
+        actions: ActionType[]
+        payload?: ActionType
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface actionsModelMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        actionsGrouped: (actions: ActionType[]) => {
+            label: string
+            options: {
+                label: string | null
+                value: number
+            }[]
+        }[]
+        actionsById: (actions: ActionType[]) => Partial<Record<number | string, ActionType>>
+        actionsSorted: (actions: ActionType[]) => ActionType[]
+    }
+}
+
+export type actionsModelType = MakeLogicType<
+    actionsModelValues,
+    actionsModelActions,
+    ActionsModelProps,
+    actionsModelMeta
+>
+
 export const actionsModel = kea<actionsModelType>([
     props({} as ActionsModelProps),
     path(['models', 'actionsModel']),
@@ -65,7 +169,7 @@ export const actionsModel = kea<actionsModelType>([
         ],
         actionsById: [
             (s) => [s.actions],
-            (actions): Partial<Record<string | number, ActionType>> =>
+            (actions: ActionType[]): Partial<Record<string | number, ActionType>> =>
                 Object.fromEntries(actions.map((action) => [action.id, action])),
         ],
         actionsSorted: [
diff --git a/frontend/src/models/annotationsModel.ts b/frontend/src/models/annotationsModel.ts
index b97ba94326e4..822b45334221 100644
--- a/frontend/src/models/annotationsModel.ts
+++ b/frontend/src/models/annotationsModel.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -9,7 +9,7 @@ import { isAuthenticatedTeam, teamLogic } from 'scenes/teamLogic'
 
 import { AnnotationType, RawAnnotationType } from '~/types'
 
-import type { annotationsModelType } from './annotationsModelType'
+import type { TeamPublicType, TeamType } from '../types'
 
 export type AnnotationData = Pick<RawAnnotationType, 'date_marker' | 'scope' | 'content' | 'dashboard_item'>
 export type AnnotationDataWithoutInsight = Omit<AnnotationData, 'dashboard_item'>
@@ -30,6 +30,128 @@ export function serializeAnnotation(annotation: AnnotationType): RawAnnotationTy
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface annotationsModelValues {
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    timezone: string // teamLogic
+    annotations: AnnotationType[]
+    annotationsLoading: boolean
+    loadingNext: boolean
+    next: string | null
+    rawAnnotations: RawAnnotationType[]
+    rawAnnotationsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface annotationsModelActions {
+    appendAnnotations: (annotations: RawAnnotationType[]) => {
+        annotations: RawAnnotationType[]
+    }
+    createAnnotationGenerically: (annotationData: AnnotationData) => AnnotationData
+    createAnnotationGenericallyFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    createAnnotationGenericallySuccess: (
+        rawAnnotations: void,
+        payload?: AnnotationData
+    ) => {
+        rawAnnotations: void
+        payload?: AnnotationData
+    }
+    deleteAnnotation: (annotation: AnnotationType) => {
+        annotation: AnnotationType
+    }
+    deleteAnnotationFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteAnnotationSuccess: (
+        rawAnnotations: AnnotationType[],
+        payload?: {
+            annotation: AnnotationType
+        }
+    ) => {
+        rawAnnotations: AnnotationType[]
+        payload?: {
+            annotation: AnnotationType
+        }
+    }
+    loadAnnotations: () => any
+    loadAnnotationsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAnnotationsNext: () => boolean
+    loadAnnotationsSuccess: (
+        rawAnnotations: RawAnnotationType[],
+        payload?: any
+    ) => {
+        rawAnnotations: RawAnnotationType[]
+        payload?: any
+    }
+    replaceAnnotation: (annotation: RawAnnotationType) => {
+        annotation: RawAnnotationType
+    }
+    setNext: (next: string | null) => {
+        next: string | null
+    }
+    updateAnnotation: ({
+        annotationId,
+        annotationData,
+    }: {
+        annotationData: AnnotationDataWithoutInsight
+        annotationId: RawAnnotationType['id']
+    }) => {
+        annotationId: RawAnnotationType[]
+        annotationData: AnnotationDataWithoutInsight
+    }
+    updateAnnotationFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateAnnotationSuccess: (
+        rawAnnotations: void,
+        payload?: {
+            annotationId: RawAnnotationType[]
+            annotationData: AnnotationDataWithoutInsight
+        }
+    ) => {
+        rawAnnotations: void
+        payload?: {
+            annotationId: RawAnnotationType[]
+            annotationData: AnnotationDataWithoutInsight
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface annotationsModelMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        annotations: (rawAnnotations: RawAnnotationType[], timezone: string) => AnnotationType[]
+        annotationsLoading: (rawAnnotationsLoading: boolean) => boolean
+    }
+}
+
+export type annotationsModelType = MakeLogicType<
+    annotationsModelValues,
+    annotationsModelActions,
+    Record<string, any>,
+    annotationsModelMeta
+>
+
 export const annotationsModel = kea<annotationsModelType>([
     path(['models', 'annotationsModel']),
     connect(() => ({ values: [teamLogic, ['currentTeam', 'timezone']] })),
@@ -106,11 +228,14 @@ export const annotationsModel = kea<annotationsModelType>([
     selectors({
         annotations: [
             (s) => [s.rawAnnotations, s.timezone],
-            (rawAnnotations, timezone): AnnotationType[] => {
+            (rawAnnotations: RawAnnotationType[], timezone: string): AnnotationType[] => {
                 return rawAnnotations.map((annotation): AnnotationType => deserializeAnnotation(annotation, timezone))
             },
         ],
-        annotationsLoading: [(s) => [s.rawAnnotationsLoading], (rawAnnotationsLoading) => rawAnnotationsLoading],
+        annotationsLoading: [
+            (s) => [s.rawAnnotationsLoading],
+            (rawAnnotationsLoading: boolean) => rawAnnotationsLoading,
+        ],
     }),
     listeners(({ actions, values }) => ({
         loadAnnotationsNext: async () => {
diff --git a/frontend/src/models/cohortsModel.ts b/frontend/src/models/cohortsModel.ts
index 30d3f34a63af..fb50c627b621 100644
--- a/frontend/src/models/cohortsModel.ts
+++ b/frontend/src/models/cohortsModel.ts
@@ -1,4 +1,15 @@
-import { actions, afterMount, beforeUnmount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    afterMount,
+    beforeUnmount,
+    connect,
+    kea,
+    listeners,
+    path,
+    reducers,
+    selectors,
+} from 'kea'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 import { v4 as uuidv4 } from 'uuid'
@@ -29,7 +40,7 @@ import {
     FilterLogicalOperator,
 } from '~/types'
 
-import type { cohortsModelType } from './cohortsModelType'
+import type { TeamPublicType, TeamType } from '../types'
 
 const POLL_TIMEOUT = 5000
 
@@ -136,6 +147,94 @@ function isCohortTaxonomicListKey(key: unknown[]): boolean {
     return key[1] === TaxonomicFilterGroupType.Cohorts || key[1] === TaxonomicFilterGroupType.CohortsWithAllUsers
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface cohortsModelValues {
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    allCohorts: CountedPaginatedResponse<CohortType>
+    allCohortsLoading: boolean
+    cohorts: CountedPaginatedResponse<CohortType>
+    cohortsById: Partial<Record<number | string, CohortType>>
+    cohortsLoading: boolean
+    count: number
+    pollTimeout: number | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface cohortsModelActions {
+    cohortCreated: (cohort: CohortType) => {
+        cohort: CohortType
+    }
+    deleteCohort: (cohort: Partial<CohortType>) => {
+        cohort: Partial<CohortType>
+    }
+    hydrateAllCohortsFromExport: (cohorts: Pick<CohortType, 'id' | 'name'>[]) => {
+        cohorts: Pick<CohortType, 'id' | 'name'>[]
+    }
+    loadAllCohorts: () => any
+    loadAllCohortsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAllCohortsSuccess: (
+        allCohorts: {
+            count: number
+            results: CohortType[]
+        },
+        payload?: any
+    ) => {
+        allCohorts: {
+            count: number
+            results: CohortType[]
+        }
+        payload?: any
+    }
+    loadCohorts: () => any
+    loadCohortsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadCohortsSuccess: (
+        cohorts: {
+            count: number
+            results: CohortType[]
+        },
+        payload?: any
+    ) => {
+        cohorts: {
+            count: number
+            results: CohortType[]
+        }
+        payload?: any
+    }
+    setPollTimeout: (pollTimeout: number | null) => {
+        pollTimeout: number | null
+    }
+    updateCohort: (cohort: CohortType) => {
+        cohort: CohortType
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface cohortsModelMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        cohortsById: (allCohorts: CountedPaginatedResponse<CohortType>) => Partial<Record<number | string, CohortType>>
+        count: (cohorts: CountedPaginatedResponse<CohortType>) => number
+    }
+}
+
+export type cohortsModelType = MakeLogicType<
+    cohortsModelValues,
+    cohortsModelActions,
+    Record<string, any>,
+    cohortsModelMeta
+>
+
 export const cohortsModel = kea<cohortsModelType>([
     path(['models', 'cohortsModel']),
     connect(() => ({
@@ -269,10 +368,10 @@ export const cohortsModel = kea<cohortsModelType>([
     selectors({
         cohortsById: [
             (s) => [s.allCohorts],
-            (allCohorts): Partial<Record<string | number, CohortType>> =>
+            (allCohorts: CountedPaginatedResponse<CohortType>): Partial<Record<string | number, CohortType>> =>
                 Object.fromEntries(allCohorts.results.map((cohort) => [cohort.id, cohort])),
         ],
-        count: [(selectors) => [selectors.cohorts], (cohorts) => cohorts.count],
+        count: [(selectors) => [selectors.cohorts], (cohorts: CountedPaginatedResponse<CohortType>) => cohorts.count],
     }),
     listeners(({ actions }) => ({
         // Flush the TaxonomicFilter cohort cache whenever cohorts mutate
diff --git a/frontend/src/models/dashboardsModel.tsx b/frontend/src/models/dashboardsModel.tsx
index 860e654806aa..bef0942ad4d6 100644
--- a/frontend/src/models/dashboardsModel.tsx
+++ b/frontend/src/models/dashboardsModel.tsx
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 
@@ -18,7 +18,7 @@ import { tagsModel } from '~/models/tagsModel'
 import { getQueryBasedDashboard } from '~/queries/nodes/InsightViz/utils'
 import { DashboardBasicType, DashboardTile, DashboardType, InsightShortId, QueryBasedInsightModel } from '~/types'
 
-import type { dashboardsModelType } from './dashboardsModelType'
+import type { Node } from '../queries/schema/schema-general'
 
 export function mergeTileTextUpdatesIntoDashboard(
     dashboard: DashboardType<QueryBasedInsightModel>,
@@ -64,6 +64,277 @@ export function mergeTileTextUpdatesIntoDashboard(
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dashboardsModelValues {
+    dashboard: DashboardType<QueryBasedInsightModel> | null
+    dashboardLoading: boolean
+    dashboardsLoading: boolean
+    nameSortedDashboards: (DashboardBasicType | DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>>)[]
+    pagedDashboards: PaginatedResponse<DashboardBasicType> | null
+    pagedDashboardsLoading: boolean
+    pagingDashboardsCompleted: boolean
+    pinSortedDashboards: (DashboardBasicType | DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>>)[]
+    pinnedDashboards: (DashboardBasicType | DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>>)[]
+    rawDashboards: Record<string, DashboardBasicType | DashboardType<QueryBasedInsightModel>>
+    redirect: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dashboardsModelActions {
+    loadTags: () => any // tagsModel
+    addDashboardSuccess: (dashboard: DashboardType<QueryBasedInsightModel>) => {
+        dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>>
+    }
+    dashboardsFullyLoaded: () => {
+        value: true
+    }
+    delayedDeleteDashboard: (id: number) => {
+        id: number
+    }
+    deleteDashboard: ({ id, deleteInsights }: any) => any
+    deleteDashboardFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteDashboardSuccess: (
+        dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>>,
+        payload?: any
+    ) => {
+        dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>>
+        payload?: any
+    }
+    duplicateDashboard: ({
+        id,
+        name,
+        show,
+        duplicateTiles,
+    }: {
+        duplicateTiles?: boolean
+        id: number
+        name?: string
+        show?: boolean
+    }) => {
+        duplicateTiles: boolean
+        id: number
+        name: string
+        show: boolean
+    }
+    duplicateDashboardFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    duplicateDashboardSuccess: (
+        dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>>,
+        payload?: {
+            duplicateTiles: boolean
+            id: number
+            name: string
+            show: boolean
+        }
+    ) => {
+        dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>>
+        payload?: {
+            duplicateTiles: boolean
+            id: number
+            name: string
+            show: boolean
+        }
+    }
+    loadDashboards: (url?: string) => string
+    loadDashboardsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadDashboardsSuccess: (
+        pagedDashboards:
+            | {
+                  count: number
+                  next: null
+                  previous: null
+                  results: DashboardBasicType[]
+              }
+            | {
+                  count?: undefined
+                  next?: string | null | undefined
+                  previous?: string | null | undefined
+                  results: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>>[]
+              },
+        payload?: string
+    ) => {
+        pagedDashboards:
+            | {
+                  count: number
+                  next: null
+                  previous: null
+                  results: DashboardBasicType[]
+              }
+            | {
+                  count?: undefined
+                  next?: string | null | undefined
+                  previous?: string | null | undefined
+                  results: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>>[]
+              }
+        payload?: string
+    }
+    pinDashboard: (
+        id: number,
+        source: DashboardEventSource
+    ) => {
+        id: number
+        source: DashboardEventSource
+    }
+    pinDashboardFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    pinDashboardSuccess: (
+        dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>>,
+        payload?: {
+            id: number
+            source: DashboardEventSource
+        }
+    ) => {
+        dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>>
+        payload?: {
+            id: number
+            source: DashboardEventSource
+        }
+    }
+    restoreDashboard: ({ id }: any) => any
+    restoreDashboardFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    restoreDashboardSuccess: (
+        dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>>,
+        payload?: any
+    ) => {
+        dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>>
+        payload?: any
+    }
+    setDiveSourceId: (id: InsightShortId | null) => {
+        id: InsightShortId | null
+    }
+    tileAddedToDashboard: (dashboardId: number) => {
+        dashboardId: number
+    }
+    tileMovedToDashboard: (
+        tile: DashboardTile<QueryBasedInsightModel>,
+        dashboardId: number
+    ) => {
+        dashboardId: number
+        tile: DashboardTile<QueryBasedInsightModel<Node<Record<string, any>>>>
+    }
+    tileRemovedFromDashboard: ({
+        tile,
+        dashboardId,
+    }: {
+        dashboardId?: number
+        tile?: DashboardTile<QueryBasedInsightModel>
+    }) => {
+        dashboardId: number | undefined
+        tile: DashboardTile<QueryBasedInsightModel<Node<Record<string, any>>>> | undefined
+    }
+    unpinDashboard: (
+        id: number,
+        source: DashboardEventSource
+    ) => {
+        id: number
+        source: DashboardEventSource
+    }
+    unpinDashboardFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    unpinDashboardSuccess: (
+        dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>>,
+        payload?: {
+            id: number
+            source: DashboardEventSource
+        }
+    ) => {
+        dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>>
+        payload?: {
+            id: number
+            source: DashboardEventSource
+        }
+    }
+    updateDashboard: ({ id, allowUndo, discardResult, ...payload }: any) => any
+    updateDashboardFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateDashboardInsight: (
+        insight: QueryBasedInsightModel,
+        extraDashboardIds?: number[],
+        sourceDashboardId?: number
+    ) => {
+        extraDashboardIds: number[] | undefined
+        insight: QueryBasedInsightModel<Node<Record<string, any>>>
+        sourceDashboardId: number | undefined
+    }
+    updateDashboardSuccess: (
+        dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>> | null | undefined,
+        payload?: any
+    ) => {
+        dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>> | null | undefined
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dashboardsModelMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        nameSortedDashboards: (
+            rawDashboards: Record<
+                string,
+                DashboardBasicType | DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>>
+            >
+        ) => (DashboardBasicType | DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>>)[]
+        pinSortedDashboards: (
+            nameSortedDashboards: (
+                | DashboardBasicType
+                | DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>>
+            )[]
+        ) => (DashboardBasicType | DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>>)[]
+        dashboardsLoading: (pagedDashboardsLoading: boolean, pagingDashboardsCompleted: boolean) => boolean
+        pinnedDashboards: (
+            nameSortedDashboards: (
+                | DashboardBasicType
+                | DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>>
+            )[]
+        ) => (DashboardBasicType | DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>>)[]
+    }
+}
+
+export type dashboardsModelType = MakeLogicType<
+    dashboardsModelValues,
+    dashboardsModelActions,
+    Record<string, any>,
+    dashboardsModelMeta
+>
+
 export const dashboardsModel = kea<dashboardsModelType>([
     path(['models', 'dashboardsModel']),
     connect(() => ({
@@ -329,7 +600,7 @@ export const dashboardsModel = kea<dashboardsModelType>([
     selectors(({ selectors }) => ({
         nameSortedDashboards: [
             () => [selectors.rawDashboards],
-            (rawDashboards) => {
+            (rawDashboards: Record<string, DashboardBasicType | DashboardType<QueryBasedInsightModel>>) => {
                 return Object.values(rawDashboards)
                     .filter((dashboard) => !(dashboard.name ?? 'Untitled').startsWith(GENERATED_DASHBOARD_PREFIX))
                     .sort(nameCompareFunction)
@@ -338,7 +609,12 @@ export const dashboardsModel = kea<dashboardsModelType>([
         /** Display dashboards are additionally sorted by pin status: pinned first. */
         pinSortedDashboards: [
             () => [selectors.nameSortedDashboards],
-            (nameSortedDashboards) => {
+            (
+                nameSortedDashboards: (
+                    | DashboardBasicType
+                    | DashboardType<QueryBasedInsightModel<import('../queries/schema').Node<Record<string, any>>>>
+                )[]
+            ) => {
                 return [...nameSortedDashboards].sort(
                     (a, b) => (Number(b.pinned) - Number(a.pinned)) * 10 + nameCompareFunction(a, b)
                 )
@@ -346,11 +622,17 @@ export const dashboardsModel = kea<dashboardsModelType>([
         ],
         dashboardsLoading: [
             () => [selectors.pagedDashboardsLoading, selectors.pagingDashboardsCompleted],
-            (pagedDashboardsLoading, pagingDashboardsCompleted) => pagedDashboardsLoading || !pagingDashboardsCompleted,
+            (pagedDashboardsLoading: boolean, pagingDashboardsCompleted: boolean) =>
+                pagedDashboardsLoading || !pagingDashboardsCompleted,
         ],
         pinnedDashboards: [
             () => [selectors.nameSortedDashboards],
-            (nameSortedDashboards) => {
+            (
+                nameSortedDashboards: (
+                    | DashboardBasicType
+                    | DashboardType<QueryBasedInsightModel<import('../queries/schema').Node<Record<string, any>>>>
+                )[]
+            ) => {
                 const pinnedDashboards = nameSortedDashboards.filter((dashboard) => dashboard.pinned)
 
                 return [...pinnedDashboards].sort((a, b) => {
diff --git a/frontend/src/models/groupsModel.ts b/frontend/src/models/groupsModel.ts
index 58b32849af61..6b988446b381 100644
--- a/frontend/src/models/groupsModel.ts
+++ b/frontend/src/models/groupsModel.ts
@@ -1,4 +1,4 @@
-import { afterMount, connect, kea, listeners, path, selectors } from 'kea'
+import { MakeLogicType, afterMount, connect, kea, listeners, path, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { subscriptions } from 'kea-subscriptions'
 
@@ -10,13 +10,149 @@ import { projectLogic } from 'scenes/projectLogic'
 
 import { GroupType, GroupTypeIndex } from '~/types'
 
-import type { groupsModelType } from './groupsModelType'
-
 export interface Noun {
     singular: string
     plural: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface groupsModelValues {
+    groupsAccessStatus: GroupsAccessStatus // groupsAccessLogic
+    groupsEnabled: boolean // groupsAccessLogic
+    currentProjectId: number | null // projectLogic
+    aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun
+    groupNamesTaxonomicTypes: TaxonomicFilterGroupType[]
+    groupTypes: Map<GroupTypeIndex, GroupType>
+    groupTypesLoading: boolean
+    groupTypesRaw: Array<GroupType>
+    groupTypesRawLoading: boolean
+    groupsTaxonomicTypes: TaxonomicFilterGroupType[]
+    showGroupsOptions: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface groupsModelActions {
+    createDetailDashboard: (groupTypeIndex: number) => number
+    createDetailDashboardFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    createDetailDashboardSuccess: (
+        groupTypesRaw: any[],
+        payload?: number
+    ) => {
+        groupTypesRaw: any[]
+        payload?: number
+    }
+    deleteGroupType: (groupTypeIndex: number) => number
+    deleteGroupTypeFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteGroupTypeSuccess: (
+        groupTypesRaw: never[],
+        payload?: number
+    ) => {
+        groupTypesRaw: never[]
+        payload?: number
+    }
+    loadAllGroupTypes: () => any
+    loadAllGroupTypesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAllGroupTypesSuccess: (
+        groupTypesRaw: GroupType[],
+        payload?: any
+    ) => {
+        groupTypesRaw: GroupType[]
+        payload?: any
+    }
+    removeDetailDashboard: (dashboardId: number) => number
+    removeDetailDashboardFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    removeDetailDashboardSuccess: (
+        groupTypesRaw: GroupType[],
+        payload?: number
+    ) => {
+        groupTypesRaw: GroupType[]
+        payload?: number
+    }
+    setDefaultColumns: ({ groupTypeIndex, defaultColumns }: { defaultColumns: string[]; groupTypeIndex: number }) => {
+        groupTypeIndex: number
+        defaultColumns: string[]
+    }
+    setDefaultColumnsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    setDefaultColumnsSuccess: (
+        groupTypesRaw: any[],
+        payload?: {
+            groupTypeIndex: number
+            defaultColumns: string[]
+        }
+    ) => {
+        groupTypesRaw: any[]
+        payload?: {
+            groupTypeIndex: number
+            defaultColumns: string[]
+        }
+    }
+    updateGroupTypesMetadata: (payload: Array<GroupType>) => Array<GroupType>
+    updateGroupTypesMetadataFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateGroupTypesMetadataSuccess: (
+        groupTypesRaw: GroupType[],
+        payload?: Array<GroupType>
+    ) => {
+        groupTypesRaw: GroupType[]
+        payload?: Array<GroupType>
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface groupsModelMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        groupTypes: (groupTypesRaw: GroupType[]) => Map<GroupTypeIndex, GroupType>
+        groupTypesLoading: (groupTypesRawLoading: boolean) => boolean
+        showGroupsOptions: (
+            groupsAccessStatus: GroupsAccessStatus,
+            groupsEnabled: boolean,
+            groupTypes: Map<GroupTypeIndex, GroupType>
+        ) => boolean
+        groupsTaxonomicTypes: (groupTypes: Map<GroupTypeIndex, GroupType>) => TaxonomicFilterGroupType[]
+        groupNamesTaxonomicTypes: (groupTypes: Map<GroupTypeIndex, GroupType>) => TaxonomicFilterGroupType[]
+        aggregationLabel: (
+            groupTypes: Map<GroupTypeIndex, GroupType>
+        ) => (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun
+    }
+}
+
+export type groupsModelType = MakeLogicType<groupsModelValues, groupsModelActions, Record<string, any>, groupsModelMeta>
+
 export const groupsModel = kea<groupsModelType>([
     path(['models', 'groupsModel']),
     connect(() => ({
@@ -84,21 +220,21 @@ export const groupsModel = kea<groupsModelType>([
     selectors({
         groupTypes: [
             (s) => [s.groupTypesRaw],
-            (groupTypesRaw) =>
+            (groupTypesRaw: Array<GroupType>) =>
                 new Map<GroupTypeIndex, GroupType>(
                     (groupTypesRaw ?? []).map((groupType) => [groupType.group_type_index, groupType])
                 ),
         ],
-        groupTypesLoading: [(s) => [s.groupTypesRawLoading], (groupTypesRawLoading) => groupTypesRawLoading],
+        groupTypesLoading: [(s) => [s.groupTypesRawLoading], (groupTypesRawLoading: boolean) => groupTypesRawLoading],
 
         showGroupsOptions: [
             (s) => [s.groupsAccessStatus, s.groupsEnabled, s.groupTypes],
-            (status, enabled, groupTypes) =>
+            (status: GroupsAccessStatus, enabled: boolean, groupTypes: Map<GroupTypeIndex, GroupType>) =>
                 status !== GroupsAccessStatus.Hidden || (enabled && Array.from(groupTypes.values()).length > 0),
         ],
         groupsTaxonomicTypes: [
             (s) => [s.groupTypes],
-            (groupTypes): TaxonomicFilterGroupType[] => {
+            (groupTypes: Map<GroupTypeIndex, GroupType>): TaxonomicFilterGroupType[] => {
                 return Array.from(groupTypes.values()).map(
                     (groupType: GroupType) =>
                         `${TaxonomicFilterGroupType.GroupsPrefix}_${groupType.group_type_index}` as TaxonomicFilterGroupType
@@ -107,7 +243,7 @@ export const groupsModel = kea<groupsModelType>([
         ],
         groupNamesTaxonomicTypes: [
             (s) => [s.groupTypes],
-            (groupTypes): TaxonomicFilterGroupType[] => {
+            (groupTypes: Map<GroupTypeIndex, GroupType>): TaxonomicFilterGroupType[] => {
                 return Array.from(groupTypes.values()).map(
                     (groupType: GroupType) =>
                         `${TaxonomicFilterGroupType.GroupNamesPrefix}_${groupType.group_type_index}` as TaxonomicFilterGroupType
@@ -116,7 +252,7 @@ export const groupsModel = kea<groupsModelType>([
         ],
         aggregationLabel: [
             (s) => [s.groupTypes],
-            (groupTypes) =>
+            (groupTypes: Map<GroupTypeIndex, GroupType>) =>
                 (groupTypeIndex: number | null | undefined, deferToUserWording: boolean = false): Noun => {
                     if (groupTypeIndex != undefined) {
                         const groupType = groupTypes.get(groupTypeIndex as GroupTypeIndex)
diff --git a/frontend/src/models/insightsModel.tsx b/frontend/src/models/insightsModel.tsx
index a66a4e938eae..e3b0647edf47 100644
--- a/frontend/src/models/insightsModel.tsx
+++ b/frontend/src/models/insightsModel.tsx
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path } from 'kea'
 
 import { LemonDialog, LemonInput } from '@posthog/lemon-ui'
 
@@ -9,7 +9,36 @@ import { teamLogic } from 'scenes/teamLogic'
 
 import { QueryBasedInsightModel } from '~/types'
 
-import type { insightsModelType } from './insightsModelType'
+import type { Node } from '../queries/schema/schema-general'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightsModelActions {
+    duplicateInsight: (item: QueryBasedInsightModel) => {
+        item: QueryBasedInsightModel<Node<Record<string, any>>>
+    }
+    duplicateInsightSuccess: (item: QueryBasedInsightModel) => {
+        item: QueryBasedInsightModel<Node<Record<string, any>>>
+    }
+    insightsAddedToDashboard: ({ dashboardId, insightIds }: { dashboardId: number; insightIds: number[] }) => {
+        dashboardId: number
+        insightIds: number[]
+    }
+    renameInsight: (item: QueryBasedInsightModel) => {
+        item: QueryBasedInsightModel<Node<Record<string, any>>>
+    }
+    renameInsightSuccess: (item: QueryBasedInsightModel) => {
+        item: QueryBasedInsightModel<Node<Record<string, any>>>
+    }
+    updateInsightDirect: (
+        item: QueryBasedInsightModel,
+        updates: Partial<QueryBasedInsightModel>
+    ) => {
+        item: QueryBasedInsightModel<Node<Record<string, any>>>
+        updates: Partial<QueryBasedInsightModel<Node<Record<string, any>>>>
+    }
+}
+
+export type insightsModelType = MakeLogicType<{}, insightsModelActions>
 
 export const insightsModel = kea<insightsModelType>([
     path(['models', 'insightsModel']),
diff --git a/frontend/src/models/notebooksModel.ts b/frontend/src/models/notebooksModel.ts
index a902fcfff59d..0f846a4a5d36 100644
--- a/frontend/src/models/notebooksModel.ts
+++ b/frontend/src/models/notebooksModel.ts
@@ -1,4 +1,4 @@
-import { BuiltLogic, actions, connect, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, BuiltLogic, actions, connect, kea, listeners, path, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 import posthog from 'posthog-js'
@@ -22,7 +22,8 @@ import { deleteFromTree, getLastNewFolder, refreshTreeItem } from '~/layout/pane
 import { InsightVizNode, Node, ProductIntentContext, ProductKey } from '~/queries/schema/schema-general'
 import { DashboardType, QueryBasedInsightModel } from '~/types'
 
-import type { notebooksModelType } from './notebooksModelType'
+import type { FeatureFlagsSet } from '../lib/logic/featureFlagLogic'
+import type { NotebookType } from '../scenes/notebooks/types'
 
 // Queue for operations that arrive before the Notebook component mounts its
 // kea logic. `openNotebook` pushes here; `notebookLogic.afterMount` drains.
@@ -80,6 +81,116 @@ export const openNotebook = async (
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface notebooksModelValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    currentProjectId: number | null // projectLogic
+    notebookTemplates: NotebookType[]
+    notebookTemplatesLoading: boolean
+    notebooks: NotebookListItemType[]
+    notebooksLoading: boolean
+    scratchpadNotebook: NotebookListItemType
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface notebooksModelActions {
+    createNotebook: (
+        location: NotebookTarget,
+        title?: string,
+        content?: JSONContent[],
+        onCreate?: (notebook: BuiltLogic<notebookLogicType>) => void,
+        shortId?: string
+    ) => {
+        content: JSONContent[] | undefined
+        location: NotebookTarget
+        onCreate: ((notebook: BuiltLogic<notebookLogicType>) => void) | undefined
+        shortId: string | undefined
+        title: string | undefined
+    }
+    createNotebookFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    createNotebookFromDashboard: (dashboard: DashboardType<QueryBasedInsightModel>) => {
+        dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>>
+    }
+    createNotebookSuccess: (
+        notebooks: NotebookListItemType[],
+        payload?: {
+            content: JSONContent[] | undefined
+            location: NotebookTarget
+            onCreate: ((notebook: BuiltLogic<notebookLogicType>) => void) | undefined
+            shortId: string | undefined
+            title: string | undefined
+        }
+    ) => {
+        notebooks: NotebookListItemType[]
+        payload?: {
+            content: JSONContent[] | undefined
+            location: NotebookTarget
+            onCreate: ((notebook: BuiltLogic<notebookLogicType>) => void) | undefined
+            shortId: string | undefined
+            title: string | undefined
+        }
+    }
+    deleteNotebook: (
+        shortId: NotebookListItemType['short_id'],
+        title?: string
+    ) => {
+        shortId: string
+        title: string | undefined
+    }
+    deleteNotebookFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteNotebookSuccess: (
+        notebooks: NotebookListItemType[],
+        payload?: {
+            shortId: string
+            title: string | undefined
+        }
+    ) => {
+        notebooks: NotebookListItemType[]
+        payload?: {
+            shortId: string
+            title: string | undefined
+        }
+    }
+    loadNotebooks: () => {
+        value: true
+    }
+    receiveNotebookUpdate: (notebook: NotebookListItemType) => {
+        notebook: NotebookListItemType
+    }
+    receiveNotebookUpdateFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    receiveNotebookUpdateSuccess: (
+        notebooks: NotebookListItemType[],
+        payload?: {
+            notebook: NotebookListItemType
+        }
+    ) => {
+        notebooks: NotebookListItemType[]
+        payload?: {
+            notebook: NotebookListItemType
+        }
+    }
+}
+
+export type notebooksModelType = MakeLogicType<notebooksModelValues, notebooksModelActions>
+
 export const notebooksModel = kea<notebooksModelType>([
     path(['scenes', 'notebooks', 'Notebook', 'notebooksModel']),
     actions({
diff --git a/frontend/src/models/primaryEventPropertiesModel.ts b/frontend/src/models/primaryEventPropertiesModel.ts
index b324ed970d26..9ca5c82bf091 100644
--- a/frontend/src/models/primaryEventPropertiesModel.ts
+++ b/frontend/src/models/primaryEventPropertiesModel.ts
@@ -1,4 +1,4 @@
-import { actions, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
@@ -6,7 +6,72 @@ import api from 'lib/api'
 import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
 import { hasTaxonomyPrimaryProperty } from 'lib/utils/events'
 
-import type { primaryEventPropertiesModelType } from './primaryEventPropertiesModelType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface primaryEventPropertiesModelValues {
+    loadedEventNames: string[]
+    primaryProperties: Record<string, string>
+    primaryPropertiesLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface primaryEventPropertiesModelActions {
+    ensureLoadedForEvents: (eventNames: string[]) => {
+        eventNames: string[]
+    }
+    loadPrimaryProperties: ({ names }: { names: string[] }) => {
+        names: string[]
+    }
+    loadPrimaryPropertiesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPrimaryPropertiesSuccess: (
+        primaryProperties: Record<string, string>,
+        payload?: {
+            names: string[]
+        }
+    ) => {
+        primaryProperties: Record<string, string>
+        payload?: {
+            names: string[]
+        }
+    }
+    refreshLoadedPrimaryProperties: () => {
+        value: true
+    }
+    updatePrimaryProperty: ({ eventName, propertyKey }: { eventName: string; propertyKey: string | null }) => {
+        eventName: string
+        propertyKey: string | null
+    }
+    updatePrimaryPropertyFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updatePrimaryPropertySuccess: (
+        primaryProperties: Record<string, string>,
+        payload?: {
+            eventName: string
+            propertyKey: string | null
+        }
+    ) => {
+        primaryProperties: Record<string, string>
+        payload?: {
+            eventName: string
+            propertyKey: string | null
+        }
+    }
+}
+
+export type primaryEventPropertiesModelType = MakeLogicType<
+    primaryEventPropertiesModelValues,
+    primaryEventPropertiesModelActions
+>
 
 export const primaryEventPropertiesModel = kea<primaryEventPropertiesModelType>([
     path(['models', 'primaryEventPropertiesModel']),
diff --git a/frontend/src/models/propertyDefinitionsModel.ts b/frontend/src/models/propertyDefinitionsModel.ts
index f1f4ee183757..43ea7fa401b3 100644
--- a/frontend/src/models/propertyDefinitionsModel.ts
+++ b/frontend/src/models/propertyDefinitionsModel.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 
 import api, { ApiMethodOptions, CountedPaginatedResponse } from 'lib/api'
 import { TaxonomicFilterValue } from 'lib/components/TaxonomicFilter/types'
@@ -21,8 +21,8 @@ import {
     PropertyType,
 } from '~/types'
 
+import type { GroupType } from '../types'
 import { groupsModel } from './groupsModel'
-import type { propertyDefinitionsModelType } from './propertyDefinitionsModelType'
 
 export type PropertyDefinitionStorage = Record<string, PropertyDefinition | PropertyDefinitionState>
 
@@ -192,6 +192,137 @@ const constructValuesEndpoint = (
     )
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface propertyDefinitionsModelValues {
+    groupTypes: Map<GroupTypeIndex, GroupType> // groupsModel
+    currentTeamId: number | null // teamLogic
+    describeProperty: (
+        s: TaxonomicFilterValue,
+        type: PropertyDefinitionType,
+        groupTypeIndex?: number
+    ) => PropertyType | null
+    eventMetadataPropertyDefinitions: PropertyDefinition[]
+    formatPropertyValueForDisplay: FormatPropertyValueForDisplayFunction
+    getPropertyDefinition: (
+        s: TaxonomicFilterValue,
+        type: PropertyDefinitionType,
+        groupTypeIndex?: number
+    ) => PropertyDefinition | null
+    options: Record<string, Option>
+    pendingProperties: string[]
+    personMetadataPropertyDefinitions: PropertyDefinition[]
+    propertyDefinitionStorage: PropertyDefinitionStorage
+    propertyDefinitionsByType: (type: string, groupTypeIndex?: number | null) => PropertyDefinition[]
+    rawPropertyDefinitionStorage: PropertyDefinitionStorage
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface propertyDefinitionsModelActions {
+    abortAnyRunningQuery: () => {
+        value: true
+    }
+    fetchAllPendingDefinitions: () => {
+        value: true
+    }
+    loadPropertyDefinitions: (
+        propertyKeys: string[],
+        type: PropertyDefinitionType,
+        groupTypeIndex?: number | null
+    ) => {
+        groupTypeIndex: number | null | undefined
+        propertyKeys: string[]
+        type: PropertyDefinitionType
+    }
+    loadPropertyValues: (payload: {
+        endpoint: string | undefined
+        eventNames?: string[]
+        newInput: string | undefined
+        properties?: {
+            key: string
+            values: string | string[]
+        }[]
+        propertyKey: string
+        refresh?: string
+        type: PropertyDefinitionType
+    }) => {
+        endpoint: string | undefined
+        eventNames?: string[] | undefined
+        newInput: string | undefined
+        properties?:
+            | {
+                  key: string
+                  values: string | string[]
+              }[]
+            | undefined
+        propertyKey: string
+        refresh?: string | undefined
+        type: PropertyDefinitionType
+    }
+    setOptions: (
+        key: string,
+        values: PropValue[],
+        allowCustomValues: boolean,
+        refreshing?: boolean
+    ) => {
+        allowCustomValues: boolean
+        key: string
+        refreshing: boolean | undefined
+        values: PropValue[]
+    }
+    setOptionsError: (key: string) => {
+        key: string
+    }
+    setOptionsLoading: (key: string) => {
+        key: string
+    }
+    setOptionsSearchInput: (
+        key: string,
+        searchInput: string
+    ) => {
+        key: string
+        searchInput: string
+    }
+    updatePropertyDefinitions: (propertyDefinitions: PropertyDefinitionStorage) => {
+        propertyDefinitions: PropertyDefinitionStorage
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface propertyDefinitionsModelMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        pendingProperties: (propertyDefinitionStorage: PropertyDefinitionStorage) => string[]
+        propertyDefinitionsByType: (
+            propertyDefinitionStorage: PropertyDefinitionStorage
+        ) => (type: string, groupTypeIndex?: number | null) => PropertyDefinition[]
+        propertyDefinitionStorage: (
+            rawPropertyDefinitionStorage: PropertyDefinitionStorage,
+            eventMetadataPropertyDefinitions: PropertyDefinition[],
+            personMetadataPropertyDefinitions: PropertyDefinition[]
+        ) => PropertyDefinitionStorage
+        getPropertyDefinition: (
+            propertyDefinitionStorage: PropertyDefinitionStorage
+        ) => (
+            s: TaxonomicFilterValue,
+            type: PropertyDefinitionType,
+            groupTypeIndex?: number
+        ) => PropertyDefinition | null
+        describeProperty: (
+            propertyDefinitionStorage: PropertyDefinitionStorage
+        ) => (s: TaxonomicFilterValue, type: PropertyDefinitionType, groupTypeIndex?: number) => PropertyType | null
+        formatPropertyValueForDisplay: (
+            propertyDefinitionStorage: PropertyDefinitionStorage
+        ) => FormatPropertyValueForDisplayFunction
+        eventMetadataPropertyDefinitions: (groupTypes: Map<GroupTypeIndex, GroupType>) => PropertyDefinition[]
+    }
+}
+
+export type propertyDefinitionsModelType = MakeLogicType<
+    propertyDefinitionsModelValues,
+    propertyDefinitionsModelActions,
+    Record<string, any>,
+    propertyDefinitionsModelMeta
+>
+
 export const propertyDefinitionsModel = kea<propertyDefinitionsModelType>([
     path(['models', 'propertyDefinitionsModel']),
     connect(() => ({
@@ -508,14 +639,16 @@ export const propertyDefinitionsModel = kea<propertyDefinitionsModelType>([
     selectors({
         pendingProperties: [
             (s) => [s.propertyDefinitionStorage],
-            (propertyDefinitionStorage): string[] =>
+            (propertyDefinitionStorage: PropertyDefinitionStorage): string[] =>
                 Object.keys(propertyDefinitionStorage).filter(
                     (key) => propertyDefinitionStorage[key] === PropertyDefinitionState.Pending
                 ),
         ],
         propertyDefinitionsByType: [
             (s) => [s.propertyDefinitionStorage],
-            (propertyDefinitionStorage): ((type: string, groupTypeIndex?: number | null) => PropertyDefinition[]) => {
+            (
+                propertyDefinitionStorage: PropertyDefinitionStorage
+            ): ((type: string, groupTypeIndex?: number | null) => PropertyDefinition[]) => {
                 return (type, groupTypeIndex) => {
                     const keyPrefix = type === 'group' ? `${type}/${groupTypeIndex}/` : `${type}/`
 
@@ -532,8 +665,8 @@ export const propertyDefinitionsModel = kea<propertyDefinitionsModelType>([
                 s.personMetadataPropertyDefinitions,
             ],
             (
-                rawPropertyDefinitionStorage,
-                eventMetadataPropertyDefinitions,
+                rawPropertyDefinitionStorage: PropertyDefinitionStorage,
+                eventMetadataPropertyDefinitions: PropertyDefinition[],
                 personMetadataPropertyDefinitions: PropertyDefinition[]
             ): PropertyDefinitionStorage => {
                 const eventMetadataDefinitions = Object.fromEntries(
@@ -558,7 +691,7 @@ export const propertyDefinitionsModel = kea<propertyDefinitionsModelType>([
         getPropertyDefinition: [
             (s) => [s.propertyDefinitionStorage],
             (
-                propertyDefinitionStorage
+                propertyDefinitionStorage: PropertyDefinitionStorage
             ): ((
                 s: TaxonomicFilterValue,
                 type: PropertyDefinitionType,
@@ -582,7 +715,7 @@ export const propertyDefinitionsModel = kea<propertyDefinitionsModelType>([
         describeProperty: [
             (s) => [s.propertyDefinitionStorage],
             (
-                propertyDefinitionStorage
+                propertyDefinitionStorage: PropertyDefinitionStorage
             ): ((
                 s: TaxonomicFilterValue,
                 type: PropertyDefinitionType,
@@ -604,7 +737,7 @@ export const propertyDefinitionsModel = kea<propertyDefinitionsModelType>([
         ],
         formatPropertyValueForDisplay: [
             (s) => [s.propertyDefinitionStorage],
-            (propertyDefinitionStorage): FormatPropertyValueForDisplayFunction => {
+            (propertyDefinitionStorage: PropertyDefinitionStorage): FormatPropertyValueForDisplayFunction => {
                 return (
                     propertyName?: BreakdownKeyType,
                     valueToFormat?: PropertyFilterValue | undefined,
@@ -671,7 +804,7 @@ export const propertyDefinitionsModel = kea<propertyDefinitionsModelType>([
         ],
         eventMetadataPropertyDefinitions: [
             (s) => [s.groupTypes],
-            (groupTypes) => {
+            (groupTypes: Map<GroupTypeIndex, import('~/types').GroupType>) => {
                 const definitions = [
                     {
                         id: 'event',
diff --git a/frontend/src/models/recentItemsModel.ts b/frontend/src/models/recentItemsModel.ts
index 79f2d966c2aa..ecb33b099bc1 100644
--- a/frontend/src/models/recentItemsModel.ts
+++ b/frontend/src/models/recentItemsModel.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
@@ -9,7 +9,7 @@ import { teamLogic } from 'scenes/teamLogic'
 
 import { FileSystemEntry } from '~/queries/schema/schema-general'
 
-import type { recentItemsModelType } from './recentItemsModelType'
+import type { TeamPublicType } from '../types'
 
 const RECENTS_FETCH_LIMIT = 20
 /**
@@ -20,6 +20,66 @@ const RECENTS_FETCH_LIMIT = 20
  */
 const LOADER_TIMEOUT_MS = 10000
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface recentItemsModelValues {
+    recents: FileSystemEntry[]
+    recentsHasLoaded: boolean
+    recentsLoading: boolean
+    sceneLogViewsByRef: Record<string, string>
+    sceneLogViewsByRefLoading: boolean
+    sceneLogViewsHasLoaded: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface recentItemsModelActions {
+    loadCurrentTeamSuccess: (
+        currentTeam: TeamPublicType | null,
+        payload?: any
+    ) => {
+        currentTeam: TeamPublicType | null
+        payload?: any
+    } // teamLogic
+    loadRecents: () => any
+    loadRecentsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRecentsSuccess: (
+        recents: FileSystemEntry[],
+        payload?: any
+    ) => {
+        recents: FileSystemEntry[]
+        payload?: any
+    }
+    loadSceneLogViews: () => any
+    loadSceneLogViewsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSceneLogViewsSuccess: (
+        sceneLogViewsByRef: Record<string, string>,
+        payload?: any
+    ) => {
+        sceneLogViewsByRef: Record<string, string>
+        payload?: any
+    }
+    recordView: (
+        type: string,
+        ref: string
+    ) => {
+        ref: string
+        type: string
+    }
+}
+
+export type recentItemsModelType = MakeLogicType<recentItemsModelValues, recentItemsModelActions>
+
 export const recentItemsModel = kea<recentItemsModelType>([
     path(['models', 'recentItemsModel']),
 
diff --git a/frontend/src/models/tagsModel.ts b/frontend/src/models/tagsModel.ts
index cacfc55e4aa5..c3fe9fcbfa78 100644
--- a/frontend/src/models/tagsModel.ts
+++ b/frontend/src/models/tagsModel.ts
@@ -1,9 +1,34 @@
-import { kea, path } from 'kea'
+import { MakeLogicType, kea, path } from 'kea'
 import { lazyLoaders } from 'kea-loaders'
 
 import api from 'lib/api'
 
-import type { tagsModelType } from './tagsModelType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tagsModelValues {
+    tags: string[]
+    tagsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tagsModelActions {
+    loadTags: () => any
+    loadTagsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadTagsSuccess: (
+        tags: string[],
+        payload?: any
+    ) => {
+        tags: string[]
+        payload?: any
+    }
+}
+
+export type tagsModelType = MakeLogicType<tagsModelValues, tagsModelActions>
 
 export const tagsModel = kea<tagsModelType>([
     path(['models', 'tagsModel']),
diff --git a/frontend/src/queries/QueryEditor/queryEditorLogic.ts b/frontend/src/queries/QueryEditor/queryEditorLogic.ts
index 9ff51e2050b0..e17e56e267e2 100644
--- a/frontend/src/queries/QueryEditor/queryEditorLogic.ts
+++ b/frontend/src/queries/QueryEditor/queryEditorLogic.ts
@@ -1,12 +1,10 @@
-import { actions, kea, key, listeners, path, props, propsChanged, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, key, listeners, path, props, propsChanged, reducers, selectors } from 'kea'
 
 import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
 
 import { QueryEditorProps } from '~/queries/QueryEditor/QueryEditor'
 import { Node } from '~/queries/schema/schema-general'
 
-import type { queryEditorLogicType } from './queryEditorLogicType'
-
 function prettyJSON(source: string): string {
     try {
         return JSON.stringify(JSON.parse(source), null, 2) + '\n'
@@ -19,6 +17,49 @@ export interface QueryEditorLogicProps extends QueryEditorProps {
     key: number
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface queryEditorLogicValues {
+    JSONQuery: Node | null
+    error: string | null
+    inputChanged: boolean
+    parsedQuery: {
+        error: string | null
+        JSONQuery: Node | null
+    }
+    queryInput: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface queryEditorLogicActions {
+    saveQuery: () => {
+        value: true
+    }
+    setQueryInput: (queryInput: string) => {
+        queryInput: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface queryEditorLogicMeta {
+    key: number
+    __keaTypeGenInternalSelectorTypes: {
+        parsedQuery: (queryInput: string) => {
+            error: string | null
+            JSONQuery: Node | null
+        }
+        JSONQuery: (parsedQuery: { error: string | null; JSONQuery: Node | null }) => Node | null
+        error: (parsedQuery: { error: string | null; JSONQuery: Node | null }) => string | null
+        inputChanged: (query: string, queryInput: string) => boolean
+    }
+}
+
+export type queryEditorLogicType = MakeLogicType<
+    queryEditorLogicValues,
+    queryEditorLogicActions,
+    QueryEditorLogicProps,
+    queryEditorLogicMeta
+>
+
 export const queryEditorLogic = kea<queryEditorLogicType>([
     path(['queries', 'QueryEditor', 'queryEditorLogic']),
     props({} as QueryEditorLogicProps),
@@ -38,7 +79,7 @@ export const queryEditorLogic = kea<queryEditorLogicType>([
     selectors({
         parsedQuery: [
             (s) => [s.queryInput],
-            (query): { JSONQuery: Node | null; error: string | null } => {
+            (query: string): { JSONQuery: Node | null; error: string | null } => {
                 let JSONQuery: Node | null = null
                 let error = null
                 try {
@@ -51,7 +92,7 @@ export const queryEditorLogic = kea<queryEditorLogicType>([
         ],
         JSONQuery: [(s) => [s.parsedQuery], ({ JSONQuery }): Node | null => JSONQuery],
         error: [(s) => [s.parsedQuery], ({ error }): string | null => error],
-        inputChanged: [(s, p) => [p.query, s.queryInput], (query, queryInput) => query !== queryInput],
+        inputChanged: [(s, p) => [p.query, s.queryInput], (query: string, queryInput: string) => query !== queryInput],
     }),
     listeners(({ actions, props, values }) => ({
         saveQuery: () => {
diff --git a/frontend/src/queries/nodes/DataNode/dataNodeCollectionLogic.ts b/frontend/src/queries/nodes/DataNode/dataNodeCollectionLogic.ts
index cbf1002f46ae..6d4651e7c287 100644
--- a/frontend/src/queries/nodes/DataNode/dataNodeCollectionLogic.ts
+++ b/frontend/src/queries/nodes/DataNode/dataNodeCollectionLogic.ts
@@ -1,9 +1,7 @@
-import { actions, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 
 import { RefreshType } from '~/queries/schema/schema-general'
 
-import type { dataNodeCollectionLogicType } from './dataNodeCollectionLogicType'
-
 export interface DataNodeRegisteredProps {
     id: string
     loadData: (refresh?: RefreshType) => void
@@ -21,6 +19,53 @@ export interface DataNodeStatus {
 
 export type DataNodeStatusMap = Record<string, DataNodeStatus | undefined>
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataNodeCollectionLogicValues {
+    areAnyLoading: boolean
+    collectionNodeStatus: DataNodeStatusMap
+    mountedDataNodes: DataNodeRegisteredProps[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataNodeCollectionLogicActions {
+    cancelAllLoading: () => {}
+    collectionNodeLoadData: (id: string) => {
+        id: string
+    }
+    collectionNodeLoadDataFailure: (id: string) => {
+        id: string
+    }
+    collectionNodeLoadDataSuccess: (id: string) => {
+        id: string
+    }
+    mountDataNode: (
+        id: string,
+        props: DataNodeRegisteredProps
+    ) => {
+        id: string
+        props: DataNodeRegisteredProps
+    }
+    reloadAll: () => {}
+    unmountDataNode: (id: string) => {
+        id: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataNodeCollectionLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        areAnyLoading: (collectionNodeStatus: DataNodeStatusMap) => boolean
+    }
+}
+
+export type dataNodeCollectionLogicType = MakeLogicType<
+    dataNodeCollectionLogicValues,
+    dataNodeCollectionLogicActions,
+    DataNodeCollectionProps,
+    dataNodeCollectionLogicMeta
+>
+
 export const dataNodeCollectionLogic = kea<dataNodeCollectionLogicType>([
     path(['queries', 'nodes', 'dataNodeCollectionLogic']),
     props({} as DataNodeCollectionProps),
diff --git a/frontend/src/queries/nodes/DataNode/dataNodeLogic.ts b/frontend/src/queries/nodes/DataNode/dataNodeLogic.ts
index 50777d6d90c6..54b2e9c1be29 100644
--- a/frontend/src/queries/nodes/DataNode/dataNodeLogic.ts
+++ b/frontend/src/queries/nodes/DataNode/dataNodeLogic.ts
@@ -1,5 +1,6 @@
 import clsx from 'clsx'
 import {
+    MakeLogicType,
     actions,
     afterMount,
     beforeUnmount,
@@ -87,7 +88,21 @@ import {
 } from '~/queries/utils'
 import { TeamType } from '~/types'
 
-import type { dataNodeLogicType } from './dataNodeLogicType'
+import type { TeamPublicType, UserType } from '../../../types'
+import type {
+    HogQLAutocompleteResponse,
+    HogQLMetadataResponse,
+    HogQueryResponse,
+    LogAttributesQueryResponse,
+    LogValuesQueryResponse,
+    LogsQueryResponse,
+    MetricsQueryResponse,
+    TraceSpansAggregationQueryResponse,
+    TraceSpansAttributeBreakdownQueryResponse,
+    TraceSpansQueryResponse,
+    TraceSpansTreeQueryResponse,
+} from '../../schema/schema-general'
+import type { DataNodeRegisteredProps } from './dataNodeCollectionLogic'
 
 export interface DataNodeLogicProps {
     key: string
@@ -214,6 +229,620 @@ function addTags<T extends Record<string, any>, N extends DataNode<T> | DataVisu
     return result as N
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataNodeLogicValues {
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    currentTeamId: number | null // teamLogic
+    user: UserType | null // userLogic
+    autoLoadRunning: boolean
+    autoLoadStarted: boolean
+    autoLoadToggled: boolean
+    backToSourceQuery: InsightVizNode | null
+    canLoadNewData: boolean
+    canLoadNextData: boolean
+    dataLimit: number | null
+    dataLoading: boolean
+    elapsedTime: number | null
+    filteredCount: number | null
+    filteredCountLoading: boolean
+    filteredCountQuery: DataNode | null
+    getInsightRefreshButtonDisabledReason: () => string
+    hasActiveFilters: boolean
+    hasMoreData: boolean
+    highlightedRows: Set<any>
+    isRefresh: boolean
+    isShowingCachedResults: boolean
+    lastRefresh: string | null
+    loadingStart: number | null
+    loadingTimeSeconds: number
+    newDataLoading: boolean
+    newQuery: DataNode | null
+    nextAllowedRefresh: string | null
+    nextDataLoading: boolean
+    nextQuery: DataNode | null
+    numberOfRows: number | null
+    pollResponse: Record<string, QueryStatus | null> | null
+    query: DataNode<Record<string, any>>
+    queryCancelled: boolean
+    queryId: string | null
+    queryLog: HogQLQueryResponse | null
+    queryLogLoading: boolean
+    queryLogQueryId: string | null
+    response:
+        | ErrorTrackingQueryResponse
+        | HogQLAutocompleteResponse
+        | HogQLMetadataResponse
+        | HogQLQueryResponse<any[]>
+        | HogQueryResponse
+        | LogAttributesQueryResponse
+        | LogValuesQueryResponse
+        | MetricsQueryResponse
+        | Record<string, any>
+        | SessionsQueryResponse
+        | TraceSpansAggregationQueryResponse
+        | TraceSpansAttributeBreakdownQueryResponse
+        | TraceSpansQueryResponse
+        | null
+    responseError: string | null
+    responseErrorObject: Record<string, any> | null
+    responseLoading: boolean
+    shouldCalculateCount: boolean
+    timings: QueryTiming[] | null
+    totalCount: number | null
+    totalCountLoading: boolean
+    totalCountQuery: DataNode | null
+    variableOverridesAreSet: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataNodeLogicActions {
+    collectionNodeLoadData: (id: string) => {
+        id: string
+    } // dataNodeCollectionLogic
+    collectionNodeLoadDataFailure: (id: string) => {
+        id: string
+    } // dataNodeCollectionLogic
+    collectionNodeLoadDataSuccess: (id: string) => {
+        id: string
+    } // dataNodeCollectionLogic
+    mountDataNode: (
+        id: string,
+        props: DataNodeRegisteredProps
+    ) => {
+        id: string
+        props: DataNodeRegisteredProps
+    } // dataNodeCollectionLogic
+    unmountDataNode: (id: string) => {
+        id: string
+    } // dataNodeCollectionLogic
+    abortAnyRunningQuery: () => {
+        value: true
+    }
+    abortQuery: (payload: { queryId: string }) => {
+        queryId: string
+    }
+    cancelQuery: () => {
+        value: true
+    }
+    clearResponse: () => {
+        value: true
+    }
+    clearResponseFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    clearResponseSuccess: (
+        response: null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        response: null
+        payload?: {
+            value: true
+        }
+    }
+    highlightRows: (rows: any[]) => {
+        rows: any[]
+    }
+    loadData: (
+        refresh?: RefreshType,
+        alreadyRunningQueryId?: string,
+        overrideQuery?: DataNode<Record<string, any>>
+    ) => {
+        overrideQuery: DataNode<Record<string, any>> | undefined
+        pollOnly: boolean
+        queryId: string
+        refresh: RefreshType | undefined
+    }
+    loadDataFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadDataSuccess: (
+        response:
+            | ErrorTrackingQueryResponse
+            | HogQLAutocompleteResponse
+            | HogQLMetadataResponse
+            | HogQLQueryResponse<any[]>
+            | HogQueryResponse
+            | LogAttributesQueryResponse
+            | LogValuesQueryResponse
+            | MetricsQueryResponse
+            | Record<string, any>
+            | SessionsQueryResponse
+            | TraceSpansAggregationQueryResponse
+            | TraceSpansAttributeBreakdownQueryResponse
+            | TraceSpansQueryResponse
+            | null
+            | undefined,
+        payload?: {
+            overrideQuery: DataNode<Record<string, any>> | undefined
+            pollOnly: boolean
+            queryId: string
+            refresh: RefreshType | undefined
+        }
+    ) => {
+        response:
+            | ErrorTrackingQueryResponse
+            | HogQLAutocompleteResponse
+            | HogQLMetadataResponse
+            | HogQLQueryResponse<any[]>
+            | HogQueryResponse
+            | LogAttributesQueryResponse
+            | LogValuesQueryResponse
+            | MetricsQueryResponse
+            | Record<string, any>
+            | SessionsQueryResponse
+            | TraceSpansAggregationQueryResponse
+            | TraceSpansAttributeBreakdownQueryResponse
+            | TraceSpansQueryResponse
+            | null
+            | undefined
+        payload?: {
+            overrideQuery: DataNode<Record<string, any>> | undefined
+            pollOnly: boolean
+            queryId: string
+            refresh: RefreshType | undefined
+        }
+    }
+    loadFilteredCount: () => {
+        value: true
+    }
+    loadFilteredCountFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadFilteredCountSuccess: (
+        filteredCount: number | null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        filteredCount: number | null
+        payload?: {
+            value: true
+        }
+    }
+    loadNewData: () => any
+    loadNewDataFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadNewDataSuccess: (
+        response:
+            | ErrorTrackingQueryResponse
+            | HogQLAutocompleteResponse
+            | HogQLMetadataResponse
+            | HogQLQueryResponse<any[]>
+            | HogQueryResponse
+            | LogAttributesQueryResponse
+            | LogValuesQueryResponse
+            | MetricsQueryResponse
+            | Record<string, any>
+            | SessionsQueryResponse
+            | TraceSpansAggregationQueryResponse
+            | TraceSpansAttributeBreakdownQueryResponse
+            | TraceSpansQueryResponse
+            | null,
+        payload?: any
+    ) => {
+        response:
+            | ErrorTrackingQueryResponse
+            | HogQLAutocompleteResponse
+            | HogQLMetadataResponse
+            | HogQLQueryResponse<any[]>
+            | HogQueryResponse
+            | LogAttributesQueryResponse
+            | LogValuesQueryResponse
+            | MetricsQueryResponse
+            | Record<string, any>
+            | SessionsQueryResponse
+            | TraceSpansAggregationQueryResponse
+            | TraceSpansAttributeBreakdownQueryResponse
+            | TraceSpansQueryResponse
+            | null
+        payload?: any
+    }
+    loadNextData: () => any
+    loadNextDataFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadNextDataSuccess: (
+        response:
+            | ErrorTrackingQueryResponse
+            | HogQLAutocompleteResponse
+            | HogQLMetadataResponse
+            | HogQLQueryResponse<any[]>
+            | HogQueryResponse
+            | LogAttributesQueryResponse
+            | LogValuesQueryResponse
+            | MetricsQueryResponse
+            | Record<string, any>
+            | SessionsQueryResponse
+            | TraceSpansAggregationQueryResponse
+            | TraceSpansAttributeBreakdownQueryResponse
+            | TraceSpansQueryResponse
+            | null,
+        payload?: any
+    ) => {
+        response:
+            | ErrorTrackingQueryResponse
+            | HogQLAutocompleteResponse
+            | HogQLMetadataResponse
+            | HogQLQueryResponse<any[]>
+            | HogQueryResponse
+            | LogAttributesQueryResponse
+            | LogValuesQueryResponse
+            | MetricsQueryResponse
+            | Record<string, any>
+            | SessionsQueryResponse
+            | TraceSpansAggregationQueryResponse
+            | TraceSpansAttributeBreakdownQueryResponse
+            | TraceSpansQueryResponse
+            | null
+        payload?: any
+    }
+    loadQueryLog: (queryId: any) => any
+    loadQueryLogFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadQueryLogSuccess: (
+        queryLog: HogQLQueryResponse<any[]>,
+        payload?: any
+    ) => {
+        queryLog: HogQLQueryResponse<any[]>
+        payload?: any
+    }
+    loadTotalCount: () => any
+    loadTotalCountFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadTotalCountSuccess: (
+        totalCount: number | null,
+        payload?: any
+    ) => {
+        totalCount: number | null
+        payload?: any
+    }
+    resetLoadingTimer: () => {
+        value: true
+    }
+    setElapsedTime: (elapsedTime: number) => {
+        elapsedTime: number
+    }
+    setLoadingTime: (seconds: number) => {
+        seconds: number
+    }
+    setPollResponse: (status: QueryStatus | null) => {
+        status: QueryStatus | null
+    }
+    setQueryLogQueryId: (queryId: string) => {
+        queryId: string
+    }
+    setResponse: (
+        response: Exclude<AnyResponseType, undefined>
+    ) =>
+        | ErrorTrackingQueryResponse
+        | EventsQueryResponse
+        | HogQLAutocompleteResponse
+        | HogQLMetadataResponse
+        | HogQLQueryResponse<any[]>
+        | HogQueryResponse
+        | LogAttributesQueryResponse
+        | LogsQueryResponse
+        | LogValuesQueryResponse
+        | MetricsQueryResponse
+        | Record<string, any>
+        | SessionsQueryResponse
+        | TraceSpansAggregationQueryResponse
+        | TraceSpansAttributeBreakdownQueryResponse
+        | TraceSpansQueryResponse
+        | TraceSpansTreeQueryResponse
+    setResponseFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    setResponseSuccess: (
+        response:
+            | ErrorTrackingQueryResponse
+            | EventsQueryResponse
+            | HogQLAutocompleteResponse
+            | HogQLMetadataResponse
+            | HogQLQueryResponse<any[]>
+            | HogQueryResponse
+            | LogAttributesQueryResponse
+            | LogsQueryResponse
+            | LogValuesQueryResponse
+            | MetricsQueryResponse
+            | Record<string, any>
+            | SessionsQueryResponse
+            | TraceSpansAggregationQueryResponse
+            | TraceSpansAttributeBreakdownQueryResponse
+            | TraceSpansQueryResponse
+            | TraceSpansTreeQueryResponse,
+        payload?:
+            | ErrorTrackingQueryResponse
+            | EventsQueryResponse
+            | HogQLAutocompleteResponse
+            | HogQLMetadataResponse
+            | HogQLQueryResponse<any[]>
+            | HogQueryResponse
+            | LogAttributesQueryResponse
+            | LogsQueryResponse
+            | LogValuesQueryResponse
+            | MetricsQueryResponse
+            | Record<string, any>
+            | SessionsQueryResponse
+            | TraceSpansAggregationQueryResponse
+            | TraceSpansAttributeBreakdownQueryResponse
+            | TraceSpansQueryResponse
+            | TraceSpansTreeQueryResponse
+    ) => {
+        response:
+            | ErrorTrackingQueryResponse
+            | EventsQueryResponse
+            | HogQLAutocompleteResponse
+            | HogQLMetadataResponse
+            | HogQLQueryResponse<any[]>
+            | HogQueryResponse
+            | LogAttributesQueryResponse
+            | LogsQueryResponse
+            | LogValuesQueryResponse
+            | MetricsQueryResponse
+            | Record<string, any>
+            | SessionsQueryResponse
+            | TraceSpansAggregationQueryResponse
+            | TraceSpansAttributeBreakdownQueryResponse
+            | TraceSpansQueryResponse
+            | TraceSpansTreeQueryResponse
+        payload?:
+            | ErrorTrackingQueryResponse
+            | EventsQueryResponse
+            | HogQLAutocompleteResponse
+            | HogQLMetadataResponse
+            | HogQLQueryResponse<any[]>
+            | HogQueryResponse
+            | LogAttributesQueryResponse
+            | LogsQueryResponse
+            | LogValuesQueryResponse
+            | MetricsQueryResponse
+            | Record<string, any>
+            | SessionsQueryResponse
+            | TraceSpansAggregationQueryResponse
+            | TraceSpansAttributeBreakdownQueryResponse
+            | TraceSpansQueryResponse
+            | TraceSpansTreeQueryResponse
+    }
+    startAutoLoad: () => {
+        value: true
+    }
+    stopAutoLoad: () => {
+        value: true
+    }
+    toggleAutoLoad: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataNodeLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        variableOverridesAreSet: (arg: any) => boolean
+        isShowingCachedResults: (arg: any, arg2: any, isRefresh: boolean) => boolean
+        query: (query: DataNode<Record<string, any>>) => DataNode<Record<string, any>>
+        newQuery: (
+            query: DataNode<Record<string, any>>,
+            response:
+                | ErrorTrackingQueryResponse
+                | HogQLAutocompleteResponse
+                | HogQLMetadataResponse
+                | HogQLQueryResponse<any[]>
+                | HogQueryResponse
+                | LogAttributesQueryResponse
+                | LogValuesQueryResponse
+                | MetricsQueryResponse
+                | Record<string, any>
+                | SessionsQueryResponse
+                | TraceSpansAggregationQueryResponse
+                | TraceSpansAttributeBreakdownQueryResponse
+                | TraceSpansQueryResponse
+                | null
+        ) => DataNode | null
+        canLoadNewData: (newQuery: DataNode<Record<string, any>> | null, isShowingCachedResults: boolean) => boolean
+        nextQuery: (
+            query: DataNode<Record<string, any>>,
+            response:
+                | ErrorTrackingQueryResponse
+                | HogQLAutocompleteResponse
+                | HogQLMetadataResponse
+                | HogQLQueryResponse<any[]>
+                | HogQueryResponse
+                | LogAttributesQueryResponse
+                | LogValuesQueryResponse
+                | MetricsQueryResponse
+                | Record<string, any>
+                | SessionsQueryResponse
+                | TraceSpansAggregationQueryResponse
+                | TraceSpansAttributeBreakdownQueryResponse
+                | TraceSpansQueryResponse
+                | null,
+            responseError: string | null,
+            dataLoading: boolean,
+            isShowingCachedResults: boolean,
+            arg: any
+        ) => DataNode | null
+        canLoadNextData: (nextQuery: DataNode<Record<string, any>> | null, isShowingCachedResults: boolean) => boolean
+        hasMoreData: (
+            response:
+                | ErrorTrackingQueryResponse
+                | HogQLAutocompleteResponse
+                | HogQLMetadataResponse
+                | HogQLQueryResponse<any[]>
+                | HogQueryResponse
+                | LogAttributesQueryResponse
+                | LogValuesQueryResponse
+                | MetricsQueryResponse
+                | Record<string, any>
+                | SessionsQueryResponse
+                | TraceSpansAggregationQueryResponse
+                | TraceSpansAttributeBreakdownQueryResponse
+                | TraceSpansQueryResponse
+                | null
+        ) => boolean
+        dataLimit: (
+            response:
+                | ErrorTrackingQueryResponse
+                | HogQLAutocompleteResponse
+                | HogQLMetadataResponse
+                | HogQLQueryResponse<any[]>
+                | HogQueryResponse
+                | LogAttributesQueryResponse
+                | LogValuesQueryResponse
+                | MetricsQueryResponse
+                | Record<string, any>
+                | SessionsQueryResponse
+                | TraceSpansAggregationQueryResponse
+                | TraceSpansAttributeBreakdownQueryResponse
+                | TraceSpansQueryResponse
+                | null
+        ) => number | null
+        backToSourceQuery: (query: DataNode<Record<string, any>>) => InsightVizNode | null
+        autoLoadRunning: (autoLoadToggled: boolean, autoLoadStarted: boolean, dataLoading: boolean) => boolean
+        lastRefresh: (
+            response:
+                | ErrorTrackingQueryResponse
+                | HogQLAutocompleteResponse
+                | HogQLMetadataResponse
+                | HogQLQueryResponse<any[]>
+                | HogQueryResponse
+                | LogAttributesQueryResponse
+                | LogValuesQueryResponse
+                | MetricsQueryResponse
+                | Record<string, any>
+                | SessionsQueryResponse
+                | TraceSpansAggregationQueryResponse
+                | TraceSpansAttributeBreakdownQueryResponse
+                | TraceSpansQueryResponse
+                | null
+        ) => string | null
+        nextAllowedRefresh: (
+            query: DataNode<Record<string, any>>,
+            response:
+                | ErrorTrackingQueryResponse
+                | HogQLAutocompleteResponse
+                | HogQLMetadataResponse
+                | HogQLQueryResponse<any[]>
+                | HogQueryResponse
+                | LogAttributesQueryResponse
+                | LogValuesQueryResponse
+                | MetricsQueryResponse
+                | Record<string, any>
+                | SessionsQueryResponse
+                | TraceSpansAggregationQueryResponse
+                | TraceSpansAttributeBreakdownQueryResponse
+                | TraceSpansQueryResponse
+                | null
+        ) => string | null
+        getInsightRefreshButtonDisabledReason: (
+            nextAllowedRefresh: string | null,
+            lastRefresh: string | null
+        ) => () => string
+        timings: (
+            response:
+                | ErrorTrackingQueryResponse
+                | HogQLAutocompleteResponse
+                | HogQLMetadataResponse
+                | HogQLQueryResponse<any[]>
+                | HogQueryResponse
+                | LogAttributesQueryResponse
+                | LogValuesQueryResponse
+                | MetricsQueryResponse
+                | Record<string, any>
+                | SessionsQueryResponse
+                | TraceSpansAggregationQueryResponse
+                | TraceSpansAttributeBreakdownQueryResponse
+                | TraceSpansQueryResponse
+                | null
+        ) => QueryTiming[] | null
+        numberOfRows: (
+            response:
+                | ErrorTrackingQueryResponse
+                | HogQLAutocompleteResponse
+                | HogQLMetadataResponse
+                | HogQLQueryResponse<any[]>
+                | HogQueryResponse
+                | LogAttributesQueryResponse
+                | LogValuesQueryResponse
+                | MetricsQueryResponse
+                | Record<string, any>
+                | SessionsQueryResponse
+                | TraceSpansAggregationQueryResponse
+                | TraceSpansAttributeBreakdownQueryResponse
+                | TraceSpansQueryResponse
+                | null
+        ) => number | null
+        hasActiveFilters: (query: DataNode<Record<string, any>>) => boolean
+        totalCountQuery: (query: DataNode<Record<string, any>>) => DataNode | null
+        filteredCountQuery: (query: DataNode<Record<string, any>>, hasActiveFilters: boolean) => DataNode | null
+    }
+}
+
+export type dataNodeLogicType = MakeLogicType<
+    dataNodeLogicValues,
+    dataNodeLogicActions,
+    DataNodeLogicProps,
+    dataNodeLogicMeta
+>
+
 export const dataNodeLogic = kea<dataNodeLogicType>([
     path(['queries', 'nodes', 'dataNodeLogic']),
     key((props) => props.key),
@@ -769,7 +1398,7 @@ export const dataNodeLogic = kea<dataNodeLogicType>([
         ],
         isShowingCachedResults: [
             (s) => [(_, props) => props.cachedResults ?? null, (_, props) => props.query, s.isRefresh],
-            (cachedResults: AnyResponseType | null, query: DataNode, isRefresh): boolean => {
+            (cachedResults: AnyResponseType | null, query: DataNode, isRefresh: boolean): boolean => {
                 if (isRefresh) {
                     return false
                 }
@@ -780,10 +1409,27 @@ export const dataNodeLogic = kea<dataNodeLogicType>([
                 )
             },
         ],
-        query: [(_, p) => [p.query], (query) => query],
+        query: [(_, p) => [p.query], (query: DataNode<Record<string, any>>) => query],
         newQuery: [
             (s, p) => [p.query, s.response],
-            (query, response): DataNode | null => {
+            (
+                query: DataNode<Record<string, any>>,
+                response:
+                    | ErrorTrackingQueryResponse
+                    | HogQLQueryResponse<any[]>
+                    | Record<string, any>
+                    | SessionsQueryResponse
+                    | null
+                    | import('~/queries/schema/schema-general').HogQLAutocompleteResponse
+                    | import('~/queries/schema/schema-general').HogQLMetadataResponse
+                    | import('~/queries/schema/schema-general').HogQueryResponse
+                    | import('~/queries/schema/schema-general').LogAttributesQueryResponse
+                    | import('~/queries/schema/schema-general').LogValuesQueryResponse
+                    | import('~/queries/schema/schema-general').MetricsQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansAggregationQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansAttributeBreakdownQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansQueryResponse
+            ): DataNode | null => {
                 if (!isEventsQuery(query)) {
                     return null
                 }
@@ -809,7 +1455,8 @@ export const dataNodeLogic = kea<dataNodeLogicType>([
         ],
         canLoadNewData: [
             (s) => [s.newQuery, s.isShowingCachedResults],
-            (newQuery, isShowingCachedResults) => (isShowingCachedResults ? false : !!newQuery),
+            (newQuery: DataNode | null, isShowingCachedResults: boolean) =>
+                isShowingCachedResults ? false : !!newQuery,
         ],
         nextQuery: [
             (s, p) => [
@@ -821,11 +1468,25 @@ export const dataNodeLogic = kea<dataNodeLogicType>([
                 (_, props) => props.maxPaginationLimit,
             ],
             (
-                query,
-                response,
-                responseError,
-                dataLoading,
-                isShowingCachedResults,
+                query: DataNode<Record<string, any>>,
+                response:
+                    | ErrorTrackingQueryResponse
+                    | HogQLQueryResponse<any[]>
+                    | Record<string, any>
+                    | SessionsQueryResponse
+                    | null
+                    | import('~/queries/schema/schema-general').HogQLAutocompleteResponse
+                    | import('~/queries/schema/schema-general').HogQLMetadataResponse
+                    | import('~/queries/schema/schema-general').HogQueryResponse
+                    | import('~/queries/schema/schema-general').LogAttributesQueryResponse
+                    | import('~/queries/schema/schema-general').LogValuesQueryResponse
+                    | import('~/queries/schema/schema-general').MetricsQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansAggregationQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansAttributeBreakdownQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansQueryResponse,
+                responseError: string | null,
+                dataLoading: boolean,
+                isShowingCachedResults: boolean,
                 maxPaginationLimit
             ): DataNode | null => {
                 if (isShowingCachedResults) {
@@ -934,24 +1595,57 @@ export const dataNodeLogic = kea<dataNodeLogicType>([
         ],
         canLoadNextData: [
             (s) => [s.nextQuery, s.isShowingCachedResults],
-            (nextQuery, isShowingCachedResults) => (isShowingCachedResults ? false : !!nextQuery),
+            (nextQuery: DataNode | null, isShowingCachedResults: boolean) =>
+                isShowingCachedResults ? false : !!nextQuery,
         ],
         hasMoreData: [
             (s) => [s.response],
-            (response): boolean => {
+            (
+                response:
+                    | ErrorTrackingQueryResponse
+                    | HogQLQueryResponse<any[]>
+                    | Record<string, any>
+                    | SessionsQueryResponse
+                    | null
+                    | import('~/queries/schema/schema-general').HogQLAutocompleteResponse
+                    | import('~/queries/schema/schema-general').HogQLMetadataResponse
+                    | import('~/queries/schema/schema-general').HogQueryResponse
+                    | import('~/queries/schema/schema-general').LogAttributesQueryResponse
+                    | import('~/queries/schema/schema-general').LogValuesQueryResponse
+                    | import('~/queries/schema/schema-general').MetricsQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansAggregationQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansAttributeBreakdownQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansQueryResponse
+            ): boolean => {
                 return response && 'hasMore' in response && response.hasMore
             },
         ],
         dataLimit: [
             // get limit from response
             (s) => [s.response],
-            (response): number | null => {
+            (
+                response:
+                    | ErrorTrackingQueryResponse
+                    | HogQLQueryResponse<any[]>
+                    | Record<string, any>
+                    | SessionsQueryResponse
+                    | null
+                    | import('~/queries/schema/schema-general').HogQLAutocompleteResponse
+                    | import('~/queries/schema/schema-general').HogQLMetadataResponse
+                    | import('~/queries/schema/schema-general').HogQueryResponse
+                    | import('~/queries/schema/schema-general').LogAttributesQueryResponse
+                    | import('~/queries/schema/schema-general').LogValuesQueryResponse
+                    | import('~/queries/schema/schema-general').MetricsQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansAggregationQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansAttributeBreakdownQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansQueryResponse
+            ): number | null => {
                 return response && 'limit' in response ? (response.limit ?? null) : null
             },
         ],
         backToSourceQuery: [
             (s) => [s.query],
-            (query): InsightVizNode | null => {
+            (query: DataNode<Record<string, any>>): InsightVizNode | null => {
                 const insightSource =
                     (isActorsQuery(query) && isInsightActorsQuery(query.source) ? query.source.source : null) ??
                     (isEventsQuery(query) && isInsightActorsQuery(query.source) ? query.source.source : null)
@@ -968,17 +1662,51 @@ export const dataNodeLogic = kea<dataNodeLogicType>([
         ],
         autoLoadRunning: [
             (s) => [s.autoLoadToggled, s.autoLoadStarted, s.dataLoading],
-            (autoLoadToggled, autoLoadStarted, dataLoading) => autoLoadToggled && autoLoadStarted && !dataLoading,
+            (autoLoadToggled: boolean, autoLoadStarted: boolean, dataLoading: boolean) =>
+                autoLoadToggled && autoLoadStarted && !dataLoading,
         ],
         lastRefresh: [
             (s) => [s.response],
-            (response): string | null => {
+            (
+                response:
+                    | ErrorTrackingQueryResponse
+                    | HogQLQueryResponse<any[]>
+                    | Record<string, any>
+                    | SessionsQueryResponse
+                    | null
+                    | import('~/queries/schema/schema-general').HogQLAutocompleteResponse
+                    | import('~/queries/schema/schema-general').HogQLMetadataResponse
+                    | import('~/queries/schema/schema-general').HogQueryResponse
+                    | import('~/queries/schema/schema-general').LogAttributesQueryResponse
+                    | import('~/queries/schema/schema-general').LogValuesQueryResponse
+                    | import('~/queries/schema/schema-general').MetricsQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansAggregationQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansAttributeBreakdownQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansQueryResponse
+            ): string | null => {
                 return response && 'last_refresh' in response ? response.last_refresh : null
             },
         ],
         nextAllowedRefresh: [
             (s, p) => [p.query, s.response],
-            (query, response): string | null => {
+            (
+                query: DataNode<Record<string, any>>,
+                response:
+                    | ErrorTrackingQueryResponse
+                    | HogQLQueryResponse<any[]>
+                    | Record<string, any>
+                    | SessionsQueryResponse
+                    | null
+                    | import('~/queries/schema/schema-general').HogQLAutocompleteResponse
+                    | import('~/queries/schema/schema-general').HogQLMetadataResponse
+                    | import('~/queries/schema/schema-general').HogQueryResponse
+                    | import('~/queries/schema/schema-general').LogAttributesQueryResponse
+                    | import('~/queries/schema/schema-general').LogValuesQueryResponse
+                    | import('~/queries/schema/schema-general').MetricsQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansAggregationQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansAttributeBreakdownQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansQueryResponse
+            ): string | null => {
                 return isInsightQueryNode(query) && response && 'next_allowed_client_refresh' in response
                     ? response.next_allowed_client_refresh
                     : null
@@ -1012,13 +1740,45 @@ export const dataNodeLogic = kea<dataNodeLogicType>([
         ],
         timings: [
             (s) => [s.response],
-            (response): QueryTiming[] | null => {
+            (
+                response:
+                    | ErrorTrackingQueryResponse
+                    | HogQLQueryResponse<any[]>
+                    | Record<string, any>
+                    | SessionsQueryResponse
+                    | null
+                    | import('~/queries/schema/schema-general').HogQLAutocompleteResponse
+                    | import('~/queries/schema/schema-general').HogQLMetadataResponse
+                    | import('~/queries/schema/schema-general').HogQueryResponse
+                    | import('~/queries/schema/schema-general').LogAttributesQueryResponse
+                    | import('~/queries/schema/schema-general').LogValuesQueryResponse
+                    | import('~/queries/schema/schema-general').MetricsQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansAggregationQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansAttributeBreakdownQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansQueryResponse
+            ): QueryTiming[] | null => {
                 return response && 'timings' in response ? response.timings : null
             },
         ],
         numberOfRows: [
             (s) => [s.response],
-            (response): number | null => {
+            (
+                response:
+                    | ErrorTrackingQueryResponse
+                    | HogQLQueryResponse<any[]>
+                    | Record<string, any>
+                    | SessionsQueryResponse
+                    | null
+                    | import('~/queries/schema/schema-general').HogQLAutocompleteResponse
+                    | import('~/queries/schema/schema-general').HogQLMetadataResponse
+                    | import('~/queries/schema/schema-general').HogQueryResponse
+                    | import('~/queries/schema/schema-general').LogAttributesQueryResponse
+                    | import('~/queries/schema/schema-general').LogValuesQueryResponse
+                    | import('~/queries/schema/schema-general').MetricsQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansAggregationQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansAttributeBreakdownQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansQueryResponse
+            ): number | null => {
                 if (!response) {
                     return null
                 }
diff --git a/frontend/src/queries/nodes/DataTable/ColumnConfigurator/columnConfiguratorLogic.tsx b/frontend/src/queries/nodes/DataTable/ColumnConfigurator/columnConfiguratorLogic.tsx
index 43e6419c5e55..1a6f99ffd3f8 100644
--- a/frontend/src/queries/nodes/DataTable/ColumnConfigurator/columnConfiguratorLogic.tsx
+++ b/frontend/src/queries/nodes/DataTable/ColumnConfigurator/columnConfiguratorLogic.tsx
@@ -1,4 +1,17 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, propsChanged, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    afterMount,
+    connect,
+    kea,
+    key,
+    listeners,
+    path,
+    props,
+    propsChanged,
+    reducers,
+    selectors,
+} from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -10,8 +23,6 @@ import { groupsModel } from '~/models/groupsModel'
 import { HOGQL_COLUMNS_KEY } from '~/queries/nodes/DataTable/defaultEventsQuery'
 import { GroupTypeIndex } from '~/types'
 
-import type { columnConfiguratorLogicType } from './columnConfiguratorLogicType'
-
 export interface ColumnConfiguratorLogicProps {
     key: string
     columns: string[]
@@ -26,6 +37,102 @@ export interface ColumnConfiguratorLogicProps {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface columnConfiguratorLogicValues {
+    columns: string[]
+    context: {
+        eventDefinitionId?: string | undefined
+        groupTypeIndex?: GroupTypeIndex | undefined
+        type: 'event_definition' | 'groups' | 'team_columns'
+    }
+    modalVisible: boolean
+    saveAsDefault: boolean
+    savedColumnConfiguration: {
+        columns: string[]
+        id: string
+    } | null
+    savedColumnConfigurationLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface columnConfiguratorLogicActions {
+    reportDataTableColumnsUpdated: (context_type: string) => {
+        context_type: string
+    } // eventUsageLogic
+    setDefaultColumns: (args_0: { defaultColumns: string[]; groupTypeIndex: number }) => {
+        defaultColumns: string[]
+        groupTypeIndex: number
+    } // groupsModel
+    hideModal: () => {
+        value: true
+    }
+    loadSavedColumnConfiguration: () => any
+    loadSavedColumnConfigurationFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSavedColumnConfigurationSuccess: (
+        savedColumnConfiguration: {
+            columns: string[]
+            id: string
+        } | null,
+        payload?: any
+    ) => {
+        savedColumnConfiguration: {
+            columns: string[]
+            id: string
+        } | null
+        payload?: any
+    }
+    moveColumn: (
+        oldIndex: number,
+        newIndex: number
+    ) => {
+        newIndex: number
+        oldIndex: number
+    }
+    save: () => {
+        value: true
+    }
+    selectColumn: (column: string) => {
+        column: string
+    }
+    setColumns: (columns: string[]) => {
+        columns: string[]
+    }
+    showModal: () => {
+        value: true
+    }
+    toggleSaveAsDefault: () => {
+        value: true
+    }
+    unselectColumn: (column: string) => {
+        column: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface columnConfiguratorLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        context: (arg: any) => {
+            eventDefinitionId?: string | undefined
+            groupTypeIndex?: GroupTypeIndex | undefined
+            type: 'event_definition' | 'groups' | 'team_columns'
+        }
+    }
+}
+
+export type columnConfiguratorLogicType = MakeLogicType<
+    columnConfiguratorLogicValues,
+    columnConfiguratorLogicActions,
+    ColumnConfiguratorLogicProps,
+    columnConfiguratorLogicMeta
+>
+
 export const columnConfiguratorLogic = kea<columnConfiguratorLogicType>([
     props({} as ColumnConfiguratorLogicProps),
     path(['queries', 'nodes', 'DataTable', 'columnConfiguratorLogic']),
diff --git a/frontend/src/queries/nodes/DataTable/TableView/tableViewLogic.ts b/frontend/src/queries/nodes/DataTable/TableView/tableViewLogic.ts
index c4dbc65c6607..c1254e018550 100644
--- a/frontend/src/queries/nodes/DataTable/TableView/tableViewLogic.ts
+++ b/frontend/src/queries/nodes/DataTable/TableView/tableViewLogic.ts
@@ -1,5 +1,5 @@
 import { deepEqual as equal } from 'fast-equals'
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
 import { lazyLoaders } from 'kea-loaders'
 import posthog from 'posthog-js'
@@ -19,7 +19,8 @@ import { AnyPropertyFilter, PropertyOperator } from '~/types'
 
 import { ColumnConfigurationApi } from 'products/product_analytics/frontend/generated/api.schemas'
 
-import type { tableViewLogicType } from './tableViewLogicType'
+import type { UserType } from '../../../../types'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 
 export type TableViewSupportedQueryType = ActorsQuery | GroupsQuery | EventsQuery
 
@@ -123,6 +124,185 @@ function getQueryFromView(
     } as EventsQuery
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tableViewLogicValues {
+    user: UserType | null; // userLogic
+    canEditCurrentView: boolean;
+    currentView: ColumnConfigurationApi | null;
+    hasUnsavedChanges: boolean;
+    isCreating: boolean;
+    isNewViewFormSubmitting: boolean;
+    isNewViewFormValid: boolean;
+    newViewForm: {
+        name: string;
+        visibility: "private" | "shared";
+    };
+    newViewFormAllErrors: Record<string, any>;
+    newViewFormChanged: boolean;
+    newViewFormErrors: DeepPartialMap<{
+        name: string;
+        visibility: "private" | "shared";
+    }, ValidationErrorType>;
+    newViewFormHasErrors: boolean;
+    newViewFormManualErrors: Record<string, any>;
+    newViewFormTouched: boolean;
+    newViewFormTouches: Record<string, boolean>;
+    newViewFormValidationErrors: DeepPartialMap<{
+        name: string;
+        visibility: "private" | "shared";
+    }, ValidationErrorType>;
+    showDeleteConfirm: string | null;
+    showNewViewFormErrors: boolean;
+    views: ColumnConfigurationApi[];
+    viewsLoading: boolean;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tableViewLogicActions {
+    applyView: (view: ColumnConfigurationApi) => {
+        view: ColumnConfigurationApi;
+    };
+    deleteView: (id: string) => {
+        id: string;
+    };
+    deleteViewFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    deleteViewSuccess: (views: ColumnConfigurationApi[], payload?: {
+        id: string;
+    }) => {
+        views: ColumnConfigurationApi[];
+        payload?: {
+            id: string;
+        };
+    };
+    loadViews: () => {
+        value: true;
+    };
+    loadViewsFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadViewsSuccess: (views: ColumnConfigurationApi[], payload?: {
+        value: true;
+    }) => {
+        views: ColumnConfigurationApi[];
+        payload?: {
+            value: true;
+        };
+    };
+    resetNewViewForm: (values?: {
+        name: string;
+        visibility: "private" | "shared";
+    }) => {
+        values?: {
+            name: string;
+            visibility: "private" | "shared";
+        };
+    };
+    saveCurrentAsView: (name: string, visibility: "private" | "shared") => {
+        name: string;
+        visibility: "private" | "shared";
+    };
+    saveCurrentAsViewFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    saveCurrentAsViewSuccess: (views: ColumnConfigurationApi[], payload?: {
+        name: string;
+        visibility: "private" | "shared";
+    }) => {
+        views: ColumnConfigurationApi[];
+        payload?: {
+            name: string;
+            visibility: "private" | "shared";
+        };
+    };
+    setCurrentView: (view: ColumnConfigurationApi | null) => {
+        view: ColumnConfigurationApi | null;
+    };
+    setIsCreating: (isCreating: boolean) => {
+        isCreating: boolean;
+    };
+    setNewViewFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>;
+    };
+    setNewViewFormValue: (key: FieldName, value: any) => {
+        name: FieldName;
+        value: any;
+    };
+    setNewViewFormValues: (values: DeepPartial<{
+        name: string;
+        visibility: "private" | "shared";
+    }>) => {
+        values: DeepPartial<{
+            name: string;
+            visibility: "private" | "shared";
+        }>;
+    };
+    setShowDeleteConfirm: (viewId: string | null) => {
+        viewId: string | null;
+    };
+    submitNewViewForm: () => {
+        value: boolean;
+    };
+    submitNewViewFormFailure: (error: Error, errors: Record<string, any>) => {
+        error: Error;
+        errors: Record<string, any>;
+    };
+    submitNewViewFormRequest: (newViewForm: {
+        name: string;
+        visibility: "private" | "shared";
+    }) => {
+        newViewForm: {
+            name: string;
+            visibility: "private" | "shared";
+        };
+    };
+    submitNewViewFormSuccess: (newViewForm: {
+        name: string;
+        visibility: "private" | "shared";
+    }) => {
+        newViewForm: {
+            name: string;
+            visibility: "private" | "shared";
+        };
+    };
+    touchNewViewFormField: (key: string) => {
+        key: string;
+    };
+    updateView: (id: string, updates: Partial<ColumnConfigurationApi>) => {
+        id: string;
+        updates: Partial<ColumnConfigurationApi>;
+    };
+    updateViewFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    updateViewSuccess: (views: ColumnConfigurationApi[], payload?: {
+        id: string;
+        updates: Partial<ColumnConfigurationApi>;
+    }) => {
+        views: ColumnConfigurationApi[];
+        payload?: {
+            id: string;
+            updates: Partial<ColumnConfigurationApi>;
+        };
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tableViewLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        hasUnsavedChanges: (currentView: ColumnConfigurationApi | null, arg: any) => boolean;
+        canEditCurrentView: (currentView: ColumnConfigurationApi | null, user: UserType | null) => boolean;
+    };
+}
+
+export type tableViewLogicType = MakeLogicType<tableViewLogicValues, tableViewLogicActions, TableViewLogicProps, tableViewLogicMeta>;
+
 export const tableViewLogic = kea<tableViewLogicType>([
     props({} as TableViewLogicProps),
     // Include the team id so a team switch yields a fresh logic instance
@@ -230,7 +410,7 @@ export const tableViewLogic = kea<tableViewLogicType>([
     selectors(() => ({
         hasUnsavedChanges: [
             (s) => [s.currentView, (_, props) => props.query],
-            (currentView, query): boolean => {
+            (currentView: ColumnConfigurationApi | null, query): boolean => {
                 if (!currentView) {
                     return false
                 }
@@ -240,7 +420,7 @@ export const tableViewLogic = kea<tableViewLogicType>([
         ],
         canEditCurrentView: [
             (s) => [s.currentView, s.user],
-            (currentView, user): boolean => {
+            (currentView: ColumnConfigurationApi | null, user: UserType | null): boolean => {
                 if (!currentView || !user) {
                     return false
                 }
diff --git a/frontend/src/queries/nodes/DataTable/dataTableLogic.ts b/frontend/src/queries/nodes/DataTable/dataTableLogic.ts
index 2ca3daa9fa4e..7da2acbaf5f9 100644
--- a/frontend/src/queries/nodes/DataTable/dataTableLogic.ts
+++ b/frontend/src/queries/nodes/DataTable/dataTableLogic.ts
@@ -1,4 +1,16 @@
-import { actions, connect, kea, key, listeners, path, props, propsChanged, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    connect,
+    kea,
+    key,
+    listeners,
+    path,
+    props,
+    propsChanged,
+    reducers,
+    selectors,
+} from 'kea'
 
 import { FEATURE_FLAGS } from 'lib/constants'
 import { dayjs } from 'lib/dayjs'
@@ -22,7 +34,22 @@ import {
 import { QueryContext } from '~/queries/types'
 import { isDataTableNode, isEventsQuery } from '~/queries/utils'
 
-import type { dataTableLogicType } from './dataTableLogicType'
+import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
+import type { TeamPublicType, TeamType } from '../../../types'
+import type {
+    ErrorTrackingQueryResponse,
+    HogQLAutocompleteResponse,
+    HogQLMetadataResponse,
+    HogQLQueryResponse,
+    HogQueryResponse,
+    LogAttributesQueryResponse,
+    LogValuesQueryResponse,
+    MetricsQueryResponse,
+    SessionsQueryResponse,
+    TraceSpansAggregationQueryResponse,
+    TraceSpansAttributeBreakdownQueryResponse,
+    TraceSpansQueryResponse,
+} from '../../schema/schema-general'
 import { getColumnsForQuery, removeExpressionComment } from './utils'
 
 export interface DataTableLogicProps {
@@ -44,6 +71,133 @@ export interface DataTableRow {
 export const loadingColumn = Symbol('...')
 export const errorColumn = Symbol('Error!')
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataTableLogicValues {
+    response:
+        | ErrorTrackingQueryResponse
+        | HogQLAutocompleteResponse
+        | HogQLMetadataResponse
+        | HogQLQueryResponse<any[]>
+        | HogQueryResponse
+        | LogAttributesQueryResponse
+        | LogValuesQueryResponse
+        | MetricsQueryResponse
+        | Record<string, any>
+        | SessionsQueryResponse
+        | TraceSpansAggregationQueryResponse
+        | TraceSpansAttributeBreakdownQueryResponse
+        | TraceSpansQueryResponse
+        | null // dataNodeLogic
+    responseError: string | null // dataNodeLogic
+    responseLoading: boolean // dataNodeLogic
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    expandedRowsFor: (tabId: string | undefined, vizKey: string) => number[] // tabUiStateLogic
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    canSort: boolean
+    columnsInQuery: string[]
+    columnsInResponse: string[] | null
+    context: any
+    dataTableRows: DataTableRow[] | null
+    expandedRows: number[]
+    orderBy: string[] | null
+    queryWithDefaults: RequiredExcept<
+        Omit<DataTableNode, 'response'>,
+        'contextKey' | 'defaultColumns' | 'tags' | 'version'
+    >
+    sourceFeatures: Set<QueryFeature>
+    sourceKind: NodeKind | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataTableLogicActions {
+    toggleExpandedRow: (
+        tabId: string | undefined,
+        vizKey: string,
+        rowIndex: number
+    ) => {
+        rowIndex: number
+        tabId: string
+        vizKey: string
+    } // tabUiStateLogic
+    setColumnsInQuery: (columns: HogQLExpression[]) => {
+        columns: string[]
+    }
+    toggleRowExpanded: (rowIndex: number) => {
+        rowIndex: number
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataTableLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        context: (arg: any) => any
+        expandedRows: (expandedRowsFor: (tabId: string | undefined, vizKey: string) => number[], arg: any) => number[]
+        sourceKind: (query: DataTableNode) => NodeKind | null
+        sourceFeatures: (query: DataTableNode, arg: any) => Set<QueryFeature>
+        orderBy: (query: DataTableNode, sourceFeatures: Set<QueryFeature>) => string[] | null
+        columnsInResponse: (
+            response:
+                | ErrorTrackingQueryResponse
+                | HogQLAutocompleteResponse
+                | HogQLMetadataResponse
+                | HogQLQueryResponse<any[]>
+                | HogQueryResponse
+                | LogAttributesQueryResponse
+                | LogValuesQueryResponse
+                | MetricsQueryResponse
+                | Record<string, any>
+                | SessionsQueryResponse
+                | TraceSpansAggregationQueryResponse
+                | TraceSpansAttributeBreakdownQueryResponse
+                | TraceSpansQueryResponse
+                | null
+        ) => string[] | null
+        dataTableRows: (
+            sourceKind: NodeKind | null,
+            orderBy: string[] | null,
+            response:
+                | ErrorTrackingQueryResponse
+                | HogQLAutocompleteResponse
+                | HogQLMetadataResponse
+                | HogQLQueryResponse<any[]>
+                | HogQueryResponse
+                | LogAttributesQueryResponse
+                | LogValuesQueryResponse
+                | MetricsQueryResponse
+                | Record<string, any>
+                | SessionsQueryResponse
+                | TraceSpansAggregationQueryResponse
+                | TraceSpansAttributeBreakdownQueryResponse
+                | TraceSpansQueryResponse
+                | null,
+            columnsInResponse: string[] | null,
+            arg: any,
+            currentTeam: TeamPublicType | TeamType | null
+        ) => DataTableRow[] | null
+        queryWithDefaults: (
+            query: DataTableNode,
+            columnsInQuery: string[],
+            featureFlags: FeatureFlagsSet,
+            arg: any
+        ) => RequiredExcept<Omit<DataTableNode, 'response'>, 'contextKey' | 'defaultColumns' | 'tags' | 'version'>
+        canSort: (
+            queryWithDefaults: RequiredExcept<
+                Omit<DataTableNode, 'response'>,
+                'contextKey' | 'defaultColumns' | 'tags' | 'version'
+            >,
+            sourceFeatures: Set<QueryFeature>
+        ) => boolean
+    }
+}
+
+export type dataTableLogicType = MakeLogicType<
+    dataTableLogicValues,
+    dataTableLogicActions,
+    DataTableLogicProps,
+    dataTableLogicMeta
+>
+
 export const dataTableLogic = kea<dataTableLogicType>([
     props({} as DataTableLogicProps),
     key((props) => {
@@ -97,10 +251,10 @@ export const dataTableLogic = kea<dataTableLogicType>([
                 expandedRowsFor(undefined, vizKey),
             { resultEqualityCheck: objectsEqual },
         ],
-        sourceKind: [(_, p) => [p.query], (query): NodeKind | null => query.source?.kind],
+        sourceKind: [(_, p) => [p.query], (query: DataTableNode): NodeKind | null => query.source?.kind],
         sourceFeatures: [
             (_, p) => [p.query, (_, props) => props.context],
-            (query, context): Set<QueryFeature> => {
+            (query: DataTableNode, context): Set<QueryFeature> => {
                 const sourceFeatures = getQueryFeatures(query.source)
                 if (context?.extraDataTableQueryFeatures) {
                     for (const feature of context.extraDataTableQueryFeatures) {
@@ -112,7 +266,7 @@ export const dataTableLogic = kea<dataTableLogicType>([
         ],
         orderBy: [
             (s, p) => [p.query, s.sourceFeatures],
-            (query, sourceFeatures): string[] | null =>
+            (query: DataTableNode, sourceFeatures: Set<QueryFeature>): string[] | null =>
                 sourceFeatures.has(QueryFeature.selectAndOrderByColumns)
                     ? 'orderBy' in query.source // might not be EventsQuery, but something else with orderBy
                         ? ((query.source as EventsQuery).orderBy ?? null)
@@ -214,8 +368,8 @@ export const dataTableLogic = kea<dataTableLogicType>([
             (s, p) => [p.query, s.columnsInQuery, s.featureFlags, (_, props) => props.context],
             (
                 query: DataTableNode,
-                columnsInQuery,
-                featureFlags,
+                columnsInQuery: string[],
+                featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet,
                 context
             ): RequiredExcept<
                 Omit<DataTableNode, 'response'>,
@@ -276,7 +430,7 @@ export const dataTableLogic = kea<dataTableLogicType>([
         ],
         canSort: [
             (s) => [s.queryWithDefaults, s.sourceFeatures],
-            (query: DataTableNode, sourceFeatures): boolean =>
+            (query: DataTableNode, sourceFeatures: Set<QueryFeature>): boolean =>
                 sourceFeatures.has(QueryFeature.selectAndOrderByColumns) && !!query.allowSorting,
         ],
     }),
diff --git a/frontend/src/queries/nodes/DataTable/dataTableSavedFiltersLogic.ts b/frontend/src/queries/nodes/DataTable/dataTableSavedFiltersLogic.ts
index 53974ec60211..a52d9374e611 100644
--- a/frontend/src/queries/nodes/DataTable/dataTableSavedFiltersLogic.ts
+++ b/frontend/src/queries/nodes/DataTable/dataTableSavedFiltersLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { router } from 'kea-router'
 import { v4 as uuidv4 } from 'uuid'
 
@@ -6,8 +6,6 @@ import { getCurrentTeamId } from 'lib/utils/getAppContext'
 
 import { DataTableNode } from '~/queries/schema/schema-general'
 
-import type { dataTableSavedFiltersLogicType } from './dataTableSavedFiltersLogicType'
-
 export interface DataTableSavedFilter {
     id: string
     name: string
@@ -25,6 +23,61 @@ export interface DataTableSavedFiltersLogicProps {
 // Scope by team so saved filters don't leak across projects (e.g. after impersonation).
 const getStorageKey = (uniqueKey: string, teamId: number): string => `datatable-saved-filters.${teamId}.${uniqueKey}`
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataTableSavedFiltersLogicValues {
+    appliedSavedFilter: DataTableSavedFilter | null
+    hasUnsavedFilterChanges: boolean
+    savedFilters: DataTableSavedFilter[]
+    showSavedFilters: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataTableSavedFiltersLogicActions {
+    applySavedFilter: (filter: DataTableSavedFilter) => {
+        filter: DataTableSavedFilter
+    }
+    createSavedFilter: (name: string) => {
+        name: string
+    }
+    deleteSavedFilter: (id: string) => {
+        id: string
+    }
+    loadSavedFilterFromUrl: () => {
+        value: true
+    }
+    setAppliedSavedFilter: (filter: DataTableSavedFilter | null) => {
+        filter: DataTableSavedFilter | null
+    }
+    setShowSavedFilters: (show: boolean) => {
+        show: boolean
+    }
+    updateSavedFilter: (
+        id: string,
+        updates: Partial<DataTableSavedFilter>
+    ) => {
+        id: string
+        updates: Partial<DataTableSavedFilter>
+    }
+    updateUrlWithSavedFilter: (filterId: string | null) => {
+        filterId: string | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataTableSavedFiltersLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        hasUnsavedFilterChanges: (appliedSavedFilter: DataTableSavedFilter | null, arg: any) => boolean
+    }
+}
+
+export type dataTableSavedFiltersLogicType = MakeLogicType<
+    dataTableSavedFiltersLogicValues,
+    dataTableSavedFiltersLogicActions,
+    DataTableSavedFiltersLogicProps,
+    dataTableSavedFiltersLogicMeta
+>
+
 export const dataTableSavedFiltersLogic = kea<dataTableSavedFiltersLogicType>([
     props({} as DataTableSavedFiltersLogicProps),
     // Include the team id so a team switch yields a fresh logic instance
@@ -148,7 +201,7 @@ export const dataTableSavedFiltersLogic = kea<dataTableSavedFiltersLogicType>([
     selectors(() => ({
         hasUnsavedFilterChanges: [
             (s) => [s.appliedSavedFilter, (_, props) => props.query],
-            (appliedSavedFilter, currentQuery): boolean => {
+            (appliedSavedFilter: DataTableSavedFilter | null, currentQuery): boolean => {
                 if (!appliedSavedFilter) {
                     return false
                 }
diff --git a/frontend/src/queries/nodes/DataTable/insightActorsQueryOptionsLogic.ts b/frontend/src/queries/nodes/DataTable/insightActorsQueryOptionsLogic.ts
index ecd18b1eb550..c7dc1e50ab86 100644
--- a/frontend/src/queries/nodes/DataTable/insightActorsQueryOptionsLogic.ts
+++ b/frontend/src/queries/nodes/DataTable/insightActorsQueryOptionsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, path, props, propsChanged } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, path, props, propsChanged } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { performQuery } from '~/queries/query'
@@ -10,7 +10,48 @@ import {
 } from '~/queries/schema/schema-general'
 import { isInsightActorsQuery, setLatestVersionsOnQuery } from '~/queries/utils'
 
-import type { insightActorsQueryOptionsLogicType } from './insightActorsQueryOptionsLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightActorsQueryOptionsLogicValues {
+    insightActorsQueryOptions: InsightActorsQueryOptionsResponse | null
+    insightActorsQueryOptionsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightActorsQueryOptionsLogicActions {
+    load: () => {
+        value: true
+    }
+    loadFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSuccess: (
+        insightActorsQueryOptions: InsightActorsQueryOptionsResponse | null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        insightActorsQueryOptions: InsightActorsQueryOptionsResponse | null
+        payload?: {
+            value: true
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightActorsQueryOptionsLogicProps {
+    key: string
+    query: InsightActorsQuery
+}
+
+export type insightActorsQueryOptionsLogicType = MakeLogicType<
+    insightActorsQueryOptionsLogicValues,
+    insightActorsQueryOptionsLogicActions,
+    insightActorsQueryOptionsLogicProps
+>
 
 export const insightActorsQueryOptionsLogic = kea<insightActorsQueryOptionsLogicType>([
     path(['queries', 'nodes', 'DataTable', 'sourceQueryOptionsLogic']),
diff --git a/frontend/src/queries/nodes/DataVisualization/Components/Charts/lineGraphLogic.ts b/frontend/src/queries/nodes/DataVisualization/Components/Charts/lineGraphLogic.ts
index 89d85fce15cd..685d9cfac866 100644
--- a/frontend/src/queries/nodes/DataVisualization/Components/Charts/lineGraphLogic.ts
+++ b/frontend/src/queries/nodes/DataVisualization/Components/Charts/lineGraphLogic.ts
@@ -1,11 +1,33 @@
-import { actions, kea, key, path, props, reducers } from 'kea'
-
-import type { lineGraphLogicType } from './lineGraphLogicType'
+import { MakeLogicType, actions, kea, key, path, props, reducers } from 'kea'
 
 export interface LineGraphLogicProps {
     key: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface lineGraphLogicValues {
+    hoveredDatasetIndex: number | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface lineGraphLogicActions {
+    setHoveredDatasetIndex: (hoveredDatasetIndex: number | null) => {
+        hoveredDatasetIndex: number | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface lineGraphLogicMeta {
+    key: string
+}
+
+export type lineGraphLogicType = MakeLogicType<
+    lineGraphLogicValues,
+    lineGraphLogicActions,
+    LineGraphLogicProps,
+    lineGraphLogicMeta
+>
+
 export const lineGraphLogic = kea<lineGraphLogicType>([
     path(['queries', 'nodes', 'DataVisualization', 'Components', 'Charts', 'lineGraphLogic']),
     props({ key: '' } as LineGraphLogicProps),
diff --git a/frontend/src/queries/nodes/DataVisualization/Components/ConditionalFormatting/conditionalFormattingLogic.ts b/frontend/src/queries/nodes/DataVisualization/Components/ConditionalFormatting/conditionalFormattingLogic.ts
index 19b30633b632..3d6f62df7d8f 100644
--- a/frontend/src/queries/nodes/DataVisualization/Components/ConditionalFormatting/conditionalFormattingLogic.ts
+++ b/frontend/src/queries/nodes/DataVisualization/Components/ConditionalFormatting/conditionalFormattingLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { subscriptions } from 'kea-subscriptions'
 
@@ -8,13 +8,80 @@ import { ConditionalFormattingRule } from '~/queries/schema/schema-general'
 
 import { dataVisualizationLogic } from '../../dataVisualizationLogic'
 import { FORMATTING_TEMPLATES, FormattingTemplate } from '../../types'
-import type { conditionalFormattingLogicType } from './conditionalFormattingLogicType'
 
 export interface ConditionalFormattingLogicProps {
     rule: ConditionalFormattingRule
     key: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface conditionalFormattingLogicValues {
+    hog: any[] | null
+    hogLoading: boolean
+    rule: ConditionalFormattingRule
+    template: FormattingTemplate
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface conditionalFormattingLogicActions {
+    updateConditionalFormattingRule: (
+        rule: ConditionalFormattingRule,
+        deleteRule?: boolean | undefined
+    ) => {
+        colorMode: string
+        deleteRule: boolean | undefined
+        rule: ConditionalFormattingRule
+    } // dataVisualizationLogic
+    compileHog: ({ hog }: any) => any
+    compileHogFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    compileHogSuccess: (
+        hog: any[],
+        payload?: any
+    ) => {
+        hog: any[]
+        payload?: any
+    }
+    deleteRule: () => {
+        value: true
+    }
+    selectColor: (color: string) => {
+        color: string
+    }
+    selectColumn: (columnName: string) => {
+        columnName: string
+    }
+    selectTemplate: (templateId: string) => {
+        templateId: string
+    }
+    updateBytecode: (bytecode: any[]) => {
+        bytecode: any[]
+    }
+    updateInput: (input: string) => {
+        input: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface conditionalFormattingLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        template: (rule: ConditionalFormattingRule) => FormattingTemplate
+    }
+}
+
+export type conditionalFormattingLogicType = MakeLogicType<
+    conditionalFormattingLogicValues,
+    conditionalFormattingLogicActions,
+    ConditionalFormattingLogicProps,
+    conditionalFormattingLogicMeta
+>
+
 export const conditionalFormattingLogic = kea<conditionalFormattingLogicType>([
     key((props) => props.rule.id),
     path(['queries', 'nodes', 'DataVisualization', 'Components', 'conditionalFormattingLogic']),
@@ -55,7 +122,7 @@ export const conditionalFormattingLogic = kea<conditionalFormattingLogicType>([
     selectors({
         template: [
             (s) => [s.rule],
-            (rule): FormattingTemplate => {
+            (rule: ConditionalFormattingRule): FormattingTemplate => {
                 const template = FORMATTING_TEMPLATES.find((n) => n.id === rule.templateId)
                 if (!template) {
                     return FORMATTING_TEMPLATES[0]
diff --git a/frontend/src/queries/nodes/DataVisualization/Components/Variables/variableDataLogic.ts b/frontend/src/queries/nodes/DataVisualization/Components/Variables/variableDataLogic.ts
index ec531104e999..290a5791f84d 100644
--- a/frontend/src/queries/nodes/DataVisualization/Components/Variables/variableDataLogic.ts
+++ b/frontend/src/queries/nodes/DataVisualization/Components/Variables/variableDataLogic.ts
@@ -1,4 +1,4 @@
-import { afterMount, kea, path } from 'kea'
+import { MakeLogicType, afterMount, kea, path } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -8,7 +8,48 @@ import api from 'lib/api'
 import { isSharedView } from '~/exporter/exporterViewLogic'
 
 import { Variable } from '../../types'
-import type { variableDataLogicType } from './variableDataLogicType'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface variableDataLogicValues {
+    variables: Variable[]
+    variablesLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface variableDataLogicActions {
+    deleteVariable: (variableId: string) => string
+    deleteVariableFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteVariableSuccess: (
+        variables: Variable[],
+        payload?: string
+    ) => {
+        variables: Variable[]
+        payload?: string
+    }
+    loadVariables: () => any
+    loadVariablesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadVariablesSuccess: (
+        variables: Variable[],
+        payload?: any
+    ) => {
+        variables: Variable[]
+        payload?: any
+    }
+}
+
+export type variableDataLogicType = MakeLogicType<variableDataLogicValues, variableDataLogicActions>
 
 export const variableDataLogic = kea<variableDataLogicType>([
     path(['queries', 'nodes', 'DataVisualization', 'Components', 'Variables', 'variableDataLogic']),
diff --git a/frontend/src/queries/nodes/DataVisualization/Components/Variables/variableModalLogic.ts b/frontend/src/queries/nodes/DataVisualization/Components/Variables/variableModalLogic.ts
index 3882dee877c0..210edc500ed5 100644
--- a/frontend/src/queries/nodes/DataVisualization/Components/Variables/variableModalLogic.ts
+++ b/frontend/src/queries/nodes/DataVisualization/Components/Variables/variableModalLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers } from 'kea'
 
 import { lemonToast } from '@posthog/lemon-ui'
 
@@ -9,6 +9,7 @@ import { teamLogic } from 'scenes/teamLogic'
 
 import { QueryBasedInsightModel } from '~/types'
 
+import type { HogQLVariable, Node } from '../../../../schema/schema-general'
 import {
     BooleanVariable,
     DateVariable,
@@ -19,7 +20,6 @@ import {
     VariableType,
 } from '../../types'
 import { variableDataLogic } from './variableDataLogic'
-import type { variableModalLogicType } from './variableModalLogicType'
 import { variablesLogic } from './variablesLogic'
 
 const DEFAULT_VARIABLE: StringVariable = {
@@ -89,6 +89,71 @@ const getDefaultVariableForType = (variableType: VariableType): Variable => {
     throw new Error(`Unsupported variable type ${variableType}`)
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface variableModalLogicValues {
+    currentTeamId: number | null // teamLogic
+    insightsLoading: boolean
+    insightsUsingVariable: QueryBasedInsightModel[]
+    isModalOpen: boolean
+    isSaving: boolean
+    modalType: 'existing' | 'new'
+    variable: Variable
+    variableType: VariableType
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface variableModalLogicActions {
+    loadVariables: () => any // variableDataLogic
+    addVariable: (variable: HogQLVariable) => {
+        variable: HogQLVariable
+    } // variablesLogic
+    updateInternalSelectedVariable: (variable: HogQLVariable) => {
+        variable: HogQLVariable
+    } // variablesLogic
+    changeTypeExistingVariable: (variableType: VariableType) => {
+        variableType: VariableType
+    }
+    closeModal: () => {
+        value: true
+    }
+    openExistingVariableModal: (variable: Variable) => {
+        variable: Variable
+    }
+    openNewVariableModal: (variableType: VariableType) => {
+        variableType: VariableType
+    }
+    save: () => {
+        value: true
+    }
+    saveFailure: () => {
+        value: true
+    }
+    saveSuccess: () => {
+        value: true
+    }
+    setInsightsLoading: (loading: boolean) => {
+        loading: boolean
+    }
+    setInsightsUsingVariable: (insights: QueryBasedInsightModel[]) => {
+        insights: QueryBasedInsightModel<Node<Record<string, any>>>[]
+    }
+    updateVariable: (variable: Variable) => {
+        variable: Variable
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface variableModalLogicMeta {
+    key: string
+}
+
+export type variableModalLogicType = MakeLogicType<
+    variableModalLogicValues,
+    variableModalLogicActions,
+    AddVariableLogicProps,
+    variableModalLogicMeta
+>
+
 export const variableModalLogic = kea<variableModalLogicType>([
     path(['queries', 'nodes', 'DataVisualization', 'Components', 'Variables', 'variableLogic']),
     props({ key: '' } as AddVariableLogicProps),
diff --git a/frontend/src/queries/nodes/DataVisualization/Components/Variables/variablesLogic.ts b/frontend/src/queries/nodes/DataVisualization/Components/Variables/variablesLogic.ts
index a325e0f40dbb..113e82b492f3 100644
--- a/frontend/src/queries/nodes/DataVisualization/Components/Variables/variablesLogic.ts
+++ b/frontend/src/queries/nodes/DataVisualization/Components/Variables/variablesLogic.ts
@@ -1,4 +1,16 @@
-import { actions, connect, kea, key, listeners, path, props, propsChanged, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    connect,
+    kea,
+    key,
+    listeners,
+    path,
+    props,
+    propsChanged,
+    reducers,
+    selectors,
+} from 'kea'
 import { subscriptions } from 'kea-subscriptions'
 
 import { objectsEqual } from 'lib/utils/objects'
@@ -11,10 +23,10 @@ import {
 import { DataVisualizationNode, HogQLVariable } from '~/queries/schema/schema-general'
 import { DashboardType } from '~/types'
 
+import type { DataNode, RefreshType } from '../../../../schema/schema-general'
 import { dataVisualizationLogic } from '../../dataVisualizationLogic'
 import { Variable, VariableType } from '../../types'
 import { variableDataLogic } from './variableDataLogic'
-import type { variablesLogicType } from './variablesLogicType'
 
 export interface VariablesLogicProps {
     key: string
@@ -40,6 +52,131 @@ const convertValueToCorrectType = (value: string, type: VariableType): number |
     return value
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface variablesLogicValues {
+    query: DataVisualizationNode // dataVisualizationLogic
+    variables: Variable[] // variableDataLogic
+    variablesLoading: boolean // variableDataLogic
+    editorQuery: string | null
+    filteredVariables: (Variable & {
+        selected: boolean
+    })[]
+    internalSelectedVariables: HogQLVariable[]
+    queryVariableCodeNames: string[]
+    searchTerm: string
+    showVariablesBar: boolean
+    variablesForInsight: Variable[]
+    variablesNotInQuery: Variable[]
+    variablesUsedInQuery: Variable[]
+    variablesWithValues: Variable[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface variablesLogicActions {
+    loadData: (
+        refresh?: RefreshType | undefined,
+        alreadyRunningQueryId?: string | undefined,
+        overrideQuery?: DataNode<Record<string, any>> | undefined
+    ) => {
+        overrideQuery: DataNode<Record<string, any>> | undefined
+        pollOnly: boolean
+        queryId: string
+        refresh: RefreshType | undefined
+    } // dataVisualizationLogic
+    setQuery: (setter: (node: DataVisualizationNode) => DataVisualizationNode) => {
+        setter: (node: DataVisualizationNode) => DataVisualizationNode
+    } // dataVisualizationLogic
+    loadVariables: () => any // variableDataLogic
+    _addVariable: (variable: HogQLVariable) => {
+        variable: HogQLVariable
+    }
+    _removeVariable: (variableId: string) => {
+        variableId: string
+    }
+    addVariable: (variable: HogQLVariable) => {
+        variable: HogQLVariable
+    }
+    addVariables: (variables: HogQLVariable[]) => {
+        variables: HogQLVariable[]
+    }
+    clickVariable: (
+        variable: Variable & {
+            selected: boolean
+        }
+    ) => {
+        variable: Variable & {
+            selected: boolean
+        }
+    }
+    removeVariable: (variableId: string) => {
+        variableId: string
+    }
+    resetVariables: () => {
+        value: true
+    }
+    setEditorQuery: (query: string) => {
+        query: string
+    }
+    setSearchTerm: (search: string) => {
+        search: string
+    }
+    updateInternalSelectedVariable: (variable: HogQLVariable) => {
+        variable: HogQLVariable
+    }
+    updateSourceQuery: () => {
+        value: true
+    }
+    updateVariableValue: (
+        variableId: string,
+        value: any,
+        isNull: boolean
+    ) => {
+        allVariables: Variable[]
+        isNull: boolean
+        value: any
+        variableId: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface variablesLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        queryVariableCodeNames: (editorQuery: string | null, arg: any) => string[]
+        variablesWithValues: (variables: Variable[], internalSelectedVariables: HogQLVariable[]) => Variable[]
+        variablesForInsight: (
+            variables: Variable[],
+            internalSelectedVariables: HogQLVariable[],
+            queryVariableCodeNames: string[]
+        ) => Variable[]
+        showVariablesBar: (arg: any) => boolean
+        filteredVariables: (
+            variables: Variable[],
+            searchTerm: string,
+            internalSelectedVariables: HogQLVariable[]
+        ) => (Variable & {
+            selected: boolean
+        })[]
+        variablesUsedInQuery: (
+            variablesWithValues: Variable[],
+            queryVariableCodeNames: string[],
+            searchTerm: string
+        ) => Variable[]
+        variablesNotInQuery: (
+            variablesWithValues: Variable[],
+            queryVariableCodeNames: string[],
+            searchTerm: string
+        ) => Variable[]
+    }
+}
+
+export type variablesLogicType = MakeLogicType<
+    variablesLogicValues,
+    variablesLogicActions,
+    VariablesLogicProps,
+    variablesLogicMeta
+>
+
 export const variablesLogic = kea<variablesLogicType>([
     path(['queries', 'nodes', 'DataVisualization', 'Components', 'Variables', 'variablesLogic']),
     props({ key: '' } as VariablesLogicProps),
@@ -173,14 +310,14 @@ export const variablesLogic = kea<variablesLogicType>([
     selectors({
         queryVariableCodeNames: [
             (s) => [s.editorQuery, (_, props) => props.sourceQuery?.source?.query],
-            (editorQuery, sourceQuery): string[] => {
+            (editorQuery: string | null, sourceQuery): string[] => {
                 const matches = getVariablesFromQuery(editorQuery ?? sourceQuery ?? '')
                 return Array.from(new Set(matches.filter((match): match is string => Boolean(match))))
             },
         ],
         variablesWithValues: [
             (s) => [s.variables, s.internalSelectedVariables],
-            (variables, internalSelectedVariables): Variable[] => {
+            (variables: Variable[], internalSelectedVariables: HogQLVariable[]): Variable[] => {
                 return variables.map((variable) => {
                     const selectedVariable = internalSelectedVariables.find(
                         (selected) => selected.variableId === variable.id
@@ -199,7 +336,11 @@ export const variablesLogic = kea<variablesLogicType>([
         ],
         variablesForInsight: [
             (s) => [s.variables, s.internalSelectedVariables, s.queryVariableCodeNames],
-            (variables, internalSelectedVariables, queryVariableCodeNames): Variable[] => {
+            (
+                variables: Variable[],
+                internalSelectedVariables: HogQLVariable[],
+                queryVariableCodeNames: string[]
+            ): Variable[] => {
                 if (!variables.length || !internalSelectedVariables.length) {
                     return []
                 }
@@ -227,7 +368,11 @@ export const variablesLogic = kea<variablesLogicType>([
         ],
         filteredVariables: [
             (s) => [s.variables, s.searchTerm, s.internalSelectedVariables],
-            (variables, searchTerm, internalSelectedVariables): (Variable & { selected: boolean })[] => {
+            (
+                variables: Variable[],
+                searchTerm: string,
+                internalSelectedVariables: HogQLVariable[]
+            ): (Variable & { selected: boolean })[] => {
                 const selectedVariableIds = new Set(internalSelectedVariables.map((variable) => variable.variableId))
 
                 const trimmedSearch = searchTerm.trim().toLowerCase()
@@ -252,7 +397,7 @@ export const variablesLogic = kea<variablesLogicType>([
         ],
         variablesUsedInQuery: [
             (s) => [s.variablesWithValues, s.queryVariableCodeNames, s.searchTerm],
-            (variablesWithValues, queryVariableCodeNames, searchTerm): Variable[] => {
+            (variablesWithValues: Variable[], queryVariableCodeNames: string[], searchTerm: string): Variable[] => {
                 const queryCodeNames = new Set(queryVariableCodeNames)
                 const trimmedSearch = searchTerm.trim().toLowerCase()
 
@@ -273,7 +418,7 @@ export const variablesLogic = kea<variablesLogicType>([
         ],
         variablesNotInQuery: [
             (s) => [s.variablesWithValues, s.queryVariableCodeNames, s.searchTerm],
-            (variablesWithValues, queryVariableCodeNames, searchTerm): Variable[] => {
+            (variablesWithValues: Variable[], queryVariableCodeNames: string[], searchTerm: string): Variable[] => {
                 const queryCodeNames = new Set(queryVariableCodeNames)
                 const trimmedSearch = searchTerm.trim().toLowerCase()
 
diff --git a/frontend/src/queries/nodes/DataVisualization/Components/seriesBreakdownLogic.ts b/frontend/src/queries/nodes/DataVisualization/Components/seriesBreakdownLogic.ts
index b1957da72900..f808ed9d1420 100644
--- a/frontend/src/queries/nodes/DataVisualization/Components/seriesBreakdownLogic.ts
+++ b/frontend/src/queries/nodes/DataVisualization/Components/seriesBreakdownLogic.ts
@@ -1,10 +1,26 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, selectors } from 'kea'
 
 import { DataColorTheme } from 'lib/colors'
 import { dataThemeLogic, getColorFromToken } from 'scenes/dataThemeLogic'
 
+import type {
+    ChartSettings,
+    DataVisualizationNode,
+    ErrorTrackingQueryResponse,
+    HogQLAutocompleteResponse,
+    HogQLMetadataResponse,
+    HogQLQueryResponse,
+    HogQueryResponse,
+    LogAttributesQueryResponse,
+    LogValuesQueryResponse,
+    MetricsQueryResponse,
+    SessionsQueryResponse,
+    TraceSpansAggregationQueryResponse,
+    TraceSpansAttributeBreakdownQueryResponse,
+    TraceSpansQueryResponse,
+} from '../../../schema/schema-general'
 import { AxisSeries, AxisSeriesSettings, SelectedYAxis, dataVisualizationLogic } from '../dataVisualizationLogic'
-import type { seriesBreakdownLogicType } from './seriesBreakdownLogicType'
+import type { Column } from '../dataVisualizationLogic'
 
 /**
  * Sentinel used to key result customizations for null / undefined breakdown values.
@@ -85,6 +101,123 @@ export interface SeriesBreakdownLogicProps {
     key: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface seriesBreakdownLogicValues {
+    getTheme: (themeId: number | string | null | undefined) => DataColorTheme | null // dataThemeLogic
+    chartSettings: ChartSettings // dataVisualizationLogic
+    columns: Column[] // dataVisualizationLogic
+    query: DataVisualizationNode // dataVisualizationLogic
+    response:
+        | ErrorTrackingQueryResponse
+        | HogQLAutocompleteResponse
+        | HogQLMetadataResponse
+        | HogQLQueryResponse<any[]>
+        | HogQueryResponse
+        | LogAttributesQueryResponse
+        | LogValuesQueryResponse
+        | MetricsQueryResponse
+        | Record<string, any>
+        | SessionsQueryResponse
+        | TraceSpansAggregationQueryResponse
+        | TraceSpansAttributeBreakdownQueryResponse
+        | TraceSpansQueryResponse
+        | null // dataVisualizationLogic
+    selectedXAxis: string | null // dataVisualizationLogic
+    selectedYAxis: (SelectedYAxis | null)[] | null // dataVisualizationLogic
+    breakdownColumnValues: string[]
+    selectedSeriesBreakdownColumn: string | null | undefined
+    seriesBreakdownData: BreakdownSeriesData<number | null>
+    showSeriesBreakdown: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface seriesBreakdownLogicActions {
+    clearAxis: () => {
+        value: true
+    } // dataVisualizationLogic
+    setQuery: (setter: (node: DataVisualizationNode) => DataVisualizationNode) => {
+        setter: (node: DataVisualizationNode) => DataVisualizationNode
+    } // dataVisualizationLogic
+    addSeriesBreakdown: (columnName: string | null) => {
+        columnName: string | null
+        response:
+            | ErrorTrackingQueryResponse
+            | HogQLAutocompleteResponse
+            | HogQLMetadataResponse
+            | HogQLQueryResponse<any[]>
+            | HogQueryResponse
+            | LogAttributesQueryResponse
+            | LogValuesQueryResponse
+            | MetricsQueryResponse
+            | Record<string, any>
+            | SessionsQueryResponse
+            | TraceSpansAggregationQueryResponse
+            | TraceSpansAttributeBreakdownQueryResponse
+            | TraceSpansQueryResponse
+            | null
+    }
+    deleteSeriesBreakdown: () => {}
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface seriesBreakdownLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        selectedSeriesBreakdownColumn: (query: DataVisualizationNode) => string | null | undefined
+        showSeriesBreakdown: (selectedSeriesBreakdownColumn: string | null | undefined) => boolean
+        breakdownColumnValues: (
+            selectedSeriesBreakdownColumn: string | null | undefined,
+            response:
+                | ErrorTrackingQueryResponse
+                | HogQLAutocompleteResponse
+                | HogQLMetadataResponse
+                | HogQLQueryResponse<any[]>
+                | HogQueryResponse
+                | LogAttributesQueryResponse
+                | LogValuesQueryResponse
+                | MetricsQueryResponse
+                | Record<string, any>
+                | SessionsQueryResponse
+                | TraceSpansAggregationQueryResponse
+                | TraceSpansAttributeBreakdownQueryResponse
+                | TraceSpansQueryResponse
+                | null,
+            columns: Column[]
+        ) => string[]
+        seriesBreakdownData: (
+            selectedSeriesBreakdownColumn: string | null | undefined,
+            breakdownColumnValues: string[],
+            selectedYAxis: (SelectedYAxis | null)[] | null,
+            selectedXAxis: string | null,
+            response:
+                | ErrorTrackingQueryResponse
+                | HogQLAutocompleteResponse
+                | HogQLMetadataResponse
+                | HogQLQueryResponse<any[]>
+                | HogQueryResponse
+                | LogAttributesQueryResponse
+                | LogValuesQueryResponse
+                | MetricsQueryResponse
+                | Record<string, any>
+                | SessionsQueryResponse
+                | TraceSpansAggregationQueryResponse
+                | TraceSpansAttributeBreakdownQueryResponse
+                | TraceSpansQueryResponse
+                | null,
+            columns: Column[],
+            chartSettings: ChartSettings,
+            getTheme: (themeId: number | string | null | undefined) => DataColorTheme | null
+        ) => BreakdownSeriesData<number | null>
+    }
+}
+
+export type seriesBreakdownLogicType = MakeLogicType<
+    seriesBreakdownLogicValues,
+    seriesBreakdownLogicActions,
+    SeriesBreakdownLogicProps,
+    seriesBreakdownLogicMeta
+>
+
 export const seriesBreakdownLogic = kea<seriesBreakdownLogicType>([
     path(['queries', 'nodes', 'DataVisualization', 'Components', 'seriesBreakdownLogic']),
     key((props) => props.key),
@@ -105,17 +238,36 @@ export const seriesBreakdownLogic = kea<seriesBreakdownLogicType>([
     selectors({
         selectedSeriesBreakdownColumn: [
             (s) => [s.query],
-            (query): string | null | undefined => {
+            (query: import('../../../schema').DataVisualizationNode): string | null | undefined => {
                 return query?.chartSettings?.seriesBreakdownColumn
             },
         ],
         showSeriesBreakdown: [
             (s) => [s.selectedSeriesBreakdownColumn],
-            (selectedSeriesBreakdownColumn): boolean => selectedSeriesBreakdownColumn !== undefined,
+            (selectedSeriesBreakdownColumn: string | null | undefined): boolean =>
+                selectedSeriesBreakdownColumn !== undefined,
         ],
         breakdownColumnValues: [
             (s) => [s.selectedSeriesBreakdownColumn, s.response, s.columns],
-            (breakdownColumn, response, columns): string[] => {
+            (
+                breakdownColumn: string | null | undefined,
+                response:
+                    | Record<string, any>
+                    | null
+                    | import('../../../schema').ErrorTrackingQueryResponse
+                    | import('../../../schema').HogQLAutocompleteResponse
+                    | import('../../../schema').HogQLMetadataResponse
+                    | import('../../../schema').HogQLQueryResponse<any[]>
+                    | import('../../../schema').HogQueryResponse
+                    | import('../../../schema').LogAttributesQueryResponse
+                    | import('../../../schema').LogValuesQueryResponse
+                    | import('../../../schema').MetricsQueryResponse
+                    | import('../../../schema').SessionsQueryResponse
+                    | import('../../../schema').TraceSpansAggregationQueryResponse
+                    | import('../../../schema').TraceSpansAttributeBreakdownQueryResponse
+                    | import('../../../schema').TraceSpansQueryResponse,
+                columns: import('../dataVisualizationLogic').Column[]
+            ): string[] => {
                 if (!response || breakdownColumn === null) {
                     return []
                 }
@@ -143,13 +295,27 @@ export const seriesBreakdownLogic = kea<seriesBreakdownLogicType>([
                 s.getTheme,
             ],
             (
-                selectedBreakdownColumn,
-                breakdownColumnValues,
-                ySeries,
-                xSeries,
-                response,
-                columns,
-                chartSettings,
+                selectedBreakdownColumn: string | null | undefined,
+                breakdownColumnValues: string[],
+                ySeries: (SelectedYAxis | null)[] | null,
+                xSeries: string | null,
+                response:
+                    | Record<string, any>
+                    | null
+                    | import('../../../schema').ErrorTrackingQueryResponse
+                    | import('../../../schema').HogQLAutocompleteResponse
+                    | import('../../../schema').HogQLMetadataResponse
+                    | import('../../../schema').HogQLQueryResponse<any[]>
+                    | import('../../../schema').HogQueryResponse
+                    | import('../../../schema').LogAttributesQueryResponse
+                    | import('../../../schema').LogValuesQueryResponse
+                    | import('../../../schema').MetricsQueryResponse
+                    | import('../../../schema').SessionsQueryResponse
+                    | import('../../../schema').TraceSpansAggregationQueryResponse
+                    | import('../../../schema').TraceSpansAttributeBreakdownQueryResponse
+                    | import('../../../schema').TraceSpansQueryResponse,
+                columns: import('../dataVisualizationLogic').Column[],
+                chartSettings: import('../../../schema').ChartSettings,
                 getTheme: (themeId: string | number | null | undefined) => DataColorTheme | null
             ): BreakdownSeriesData<number | null> => {
                 if (
diff --git a/frontend/src/queries/nodes/DataVisualization/Components/ySeriesLogic.ts b/frontend/src/queries/nodes/DataVisualization/Components/ySeriesLogic.ts
index de7ce44ae990..2eb00777cd60 100644
--- a/frontend/src/queries/nodes/DataVisualization/Components/ySeriesLogic.ts
+++ b/frontend/src/queries/nodes/DataVisualization/Components/ySeriesLogic.ts
@@ -1,5 +1,6 @@
-import { actions, connect, kea, key, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, path, props, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 
 import { getSeriesColor } from 'lib/colors'
 
@@ -9,7 +10,7 @@ import {
     EmptyYAxisSeries,
     dataVisualizationLogic,
 } from '../dataVisualizationLogic'
-import type { ySeriesLogicType } from './ySeriesLogicType'
+import type { AxisSeriesSettings } from '../dataVisualizationLogic'
 
 export interface YSeriesLogicProps {
     series: AxisSeries<number | null>
@@ -22,6 +23,278 @@ export enum YSeriesSettingsTab {
     Display = 'display',
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface ySeriesLogicValues {
+    activeSettingsTab: YSeriesSettingsTab
+    canOpenSettings: boolean
+    display: {
+        color: string
+        displayType: 'area' | 'auto' | 'bar' | 'line'
+        label: string
+        trendLine: boolean
+        yAxisPosition: 'left' | 'right'
+    }
+    displayAllErrors: Record<string, any>
+    displayChanged: boolean
+    displayErrors: DeepPartialMap<
+        {
+            color: string
+            displayType: 'area' | 'auto' | 'bar' | 'line'
+            label: string
+            trendLine: boolean
+            yAxisPosition: 'left' | 'right'
+        },
+        ValidationErrorType
+    >
+    displayHasErrors: boolean
+    displayManualErrors: Record<string, any>
+    displayTouched: boolean
+    displayTouches: Record<string, boolean>
+    displayValidationErrors: DeepPartialMap<
+        {
+            color: string
+            displayType: 'area' | 'auto' | 'bar' | 'line'
+            label: string
+            trendLine: boolean
+            yAxisPosition: 'left' | 'right'
+        },
+        ValidationErrorType
+    >
+    formatting: {
+        decimalPlaces: number | undefined
+        prefix: string
+        style: 'none' | 'number' | 'percent' | 'short'
+        suffix: string
+    }
+    formattingAllErrors: Record<string, any>
+    formattingChanged: boolean
+    formattingErrors: DeepPartialMap<
+        {
+            decimalPlaces: number | undefined
+            prefix: string
+            style: 'none' | 'number' | 'percent' | 'short'
+            suffix: string
+        },
+        ValidationErrorType
+    >
+    formattingHasErrors: boolean
+    formattingManualErrors: Record<string, any>
+    formattingTouched: boolean
+    formattingTouches: Record<string, boolean>
+    formattingValidationErrors: DeepPartialMap<
+        {
+            decimalPlaces: number | undefined
+            prefix: string
+            style: 'none' | 'number' | 'percent' | 'short'
+            suffix: string
+        },
+        ValidationErrorType
+    >
+    isDisplaySubmitting: boolean
+    isDisplayValid: boolean
+    isFormattingSubmitting: boolean
+    isFormattingValid: boolean
+    isSettingsOpen: boolean
+    showDisplayErrors: boolean
+    showFormattingErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface ySeriesLogicActions {
+    updateSeriesIndex: (
+        seriesIndex: number,
+        columnName: string,
+        settings?: AxisSeriesSettings | undefined
+    ) => {
+        columnName: string
+        seriesIndex: number
+        settings: AxisSeriesSettings | undefined
+    } // dataVisualizationLogic
+    resetDisplay: (values?: {
+        color: string
+        displayType: 'area' | 'auto' | 'bar' | 'line'
+        label: string
+        trendLine: boolean
+        yAxisPosition: 'left' | 'right'
+    }) => {
+        values?: {
+            color: string
+            displayType: 'area' | 'auto' | 'bar' | 'line'
+            label: string
+            trendLine: boolean
+            yAxisPosition: 'left' | 'right'
+        }
+    }
+    resetFormatting: (values?: {
+        decimalPlaces: number | undefined
+        prefix: string
+        style: 'none' | 'number' | 'percent' | 'short'
+        suffix: string
+    }) => {
+        values?: {
+            decimalPlaces: number | undefined
+            prefix: string
+            style: 'none' | 'number' | 'percent' | 'short'
+            suffix: string
+        }
+    }
+    setDisplayManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setDisplayValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setDisplayValues: (
+        values: DeepPartial<{
+            color: string
+            displayType: 'area' | 'auto' | 'bar' | 'line'
+            label: string
+            trendLine: boolean
+            yAxisPosition: 'left' | 'right'
+        }>
+    ) => {
+        values: DeepPartial<{
+            color: string
+            displayType: 'area' | 'auto' | 'bar' | 'line'
+            label: string
+            trendLine: boolean
+            yAxisPosition: 'left' | 'right'
+        }>
+    }
+    setFormattingManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setFormattingValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setFormattingValues: (
+        values: DeepPartial<{
+            decimalPlaces: number | undefined
+            prefix: string
+            style: 'none' | 'number' | 'percent' | 'short'
+            suffix: string
+        }>
+    ) => {
+        values: DeepPartial<{
+            decimalPlaces: number | undefined
+            prefix: string
+            style: 'none' | 'number' | 'percent' | 'short'
+            suffix: string
+        }>
+    }
+    setSettingsOpen: (open: boolean) => {
+        open: boolean
+    }
+    setSettingsTab: (tab: YSeriesSettingsTab) => {
+        tab: YSeriesSettingsTab
+    }
+    submitDisplay: () => {
+        value: boolean
+    }
+    submitDisplayFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitDisplayRequest: (display: {
+        color: string
+        displayType: 'area' | 'auto' | 'bar' | 'line'
+        label: string
+        trendLine: boolean
+        yAxisPosition: 'left' | 'right'
+    }) => {
+        display: {
+            color: string
+            displayType: 'area' | 'auto' | 'bar' | 'line'
+            label: string
+            trendLine: boolean
+            yAxisPosition: 'left' | 'right'
+        }
+    }
+    submitDisplaySuccess: (display: {
+        color: string
+        displayType: 'area' | 'auto' | 'bar' | 'line'
+        label: string
+        trendLine: boolean
+        yAxisPosition: 'left' | 'right'
+    }) => {
+        display: {
+            color: string
+            displayType: 'area' | 'auto' | 'bar' | 'line'
+            label: string
+            trendLine: boolean
+            yAxisPosition: 'left' | 'right'
+        }
+    }
+    submitFormatting: () => {
+        value: boolean
+    }
+    submitFormattingFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitFormattingRequest: (formatting: {
+        decimalPlaces: number | undefined
+        prefix: string
+        style: 'none' | 'number' | 'percent' | 'short'
+        suffix: string
+    }) => {
+        formatting: {
+            decimalPlaces: number | undefined
+            prefix: string
+            style: 'none' | 'number' | 'percent' | 'short'
+            suffix: string
+        }
+    }
+    submitFormattingSuccess: (formatting: {
+        decimalPlaces: number | undefined
+        prefix: string
+        style: 'none' | 'number' | 'percent' | 'short'
+        suffix: string
+    }) => {
+        formatting: {
+            decimalPlaces: number | undefined
+            prefix: string
+            style: 'none' | 'number' | 'percent' | 'short'
+            suffix: string
+        }
+    }
+    touchDisplayField: (key: string) => {
+        key: string
+    }
+    touchFormattingField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface ySeriesLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        canOpenSettings: (series: AxisSeries<number | null>) => boolean
+    }
+}
+
+export type ySeriesLogicType = MakeLogicType<
+    ySeriesLogicValues,
+    ySeriesLogicActions,
+    YSeriesLogicProps,
+    ySeriesLogicMeta
+>
+
 export const ySeriesLogic = kea<ySeriesLogicType>([
     path(['queries', 'nodes', 'DataVisualization', 'Components', 'ySeriesLogic']),
     key((props) => `${props.series?.column?.name ?? 'new'}-${props.seriesIndex ?? 0}`),
@@ -50,7 +323,7 @@ export const ySeriesLogic = kea<ySeriesLogicType>([
     selectors({
         canOpenSettings: [
             (_s, p) => [p.series],
-            (series) => {
+            (series: AxisSeries<number | null>) => {
                 return series !== EmptyYAxisSeries
             },
         ],
diff --git a/frontend/src/queries/nodes/DataVisualization/dataVisualizationLogic.ts b/frontend/src/queries/nodes/DataVisualization/dataVisualizationLogic.ts
index 5ceac450becd..1dfdbe1b26bd 100644
--- a/frontend/src/queries/nodes/DataVisualization/dataVisualizationLogic.ts
+++ b/frontend/src/queries/nodes/DataVisualization/dataVisualizationLogic.ts
@@ -1,4 +1,5 @@
 import {
+    MakeLogicType,
     actions,
     afterMount,
     connect,
@@ -12,6 +13,7 @@ import {
     selectors,
     sharedListeners,
 } from 'kea'
+import type { BreakPointFunction } from 'kea'
 import { subscriptions } from 'kea-subscriptions'
 import mergeObject from 'lodash.merge'
 
@@ -39,9 +41,24 @@ import {
 import { QueryContext } from '~/queries/types'
 import { ChartDisplayType, DashboardType } from '~/types'
 
+import type {
+    DataNode,
+    ErrorTrackingQueryResponse,
+    HogQLAutocompleteResponse,
+    HogQLMetadataResponse,
+    HogQLQueryResponse,
+    HogQueryResponse,
+    LogAttributesQueryResponse,
+    LogValuesQueryResponse,
+    MetricsQueryResponse,
+    RefreshType,
+    SessionsQueryResponse,
+    TraceSpansAggregationQueryResponse,
+    TraceSpansAttributeBreakdownQueryResponse,
+    TraceSpansQueryResponse,
+} from '../../schema/schema-general'
 import { dataNodeLogic } from '../DataNode/dataNodeLogic'
 import { QueryFeature, getQueryFeatures } from '../DataTable/queryFeatures'
-import type { dataVisualizationLogicType } from './dataVisualizationLogicType'
 import { ColumnScalar, FORMATTING_TEMPLATES } from './types'
 
 export enum SideBarTab {
@@ -392,6 +409,173 @@ const shouldUseFirstNumericColumnAsContinuousChartXAxis = (
     return numericalColumns.every((column) => selectedYAxisNames.has(column.name))
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataVisualizationLogicValues {
+    queryCancelled: boolean; // dataNodeLogic
+    response: ErrorTrackingQueryResponse | HogQLAutocompleteResponse | HogQLMetadataResponse | HogQLQueryResponse<any[]> | HogQueryResponse | LogAttributesQueryResponse | LogValuesQueryResponse | MetricsQueryResponse | Record<string, any> | SessionsQueryResponse | TraceSpansAggregationQueryResponse | TraceSpansAttributeBreakdownQueryResponse | TraceSpansQueryResponse | null; // dataNodeLogic
+    responseError: string | null; // dataNodeLogic
+    responseLoading: boolean; // dataNodeLogic
+    activeSceneId: string | null; // sceneLogic
+    currentTeamId: number | null; // teamLogic
+    isDarkModeOn: boolean; // themeLogic
+    activeSideBarTab: SideBarTab;
+    autoVisualizationType: ChartDisplayType;
+    chartSettings: ChartSettings;
+    columns: Column[];
+    conditionalFormattingRules: ConditionalFormattingRule[];
+    conditionalFormattingRulesPanelActiveKeys: string[];
+    dashboardId: any;
+    dataVisualizationProps: DataVisualizationLogicProps;
+    effectiveVisualizationType: ChartDisplayType;
+    hasDateTimeColumns: boolean;
+    isChartSettingsPanelOpen: boolean;
+    isColumnPinned: (columnName: string) => boolean;
+    isPinningEnabled: boolean;
+    isShowingCachedResults: boolean;
+    isTableVisualization: boolean;
+    isTransposed: boolean;
+    numericalColumns: Column[];
+    pinnedColumns: string[];
+    presetChartHeight: boolean;
+    query: DataVisualizationNode;
+    selectedXAxis: string | null;
+    selectedYAxis: (SelectedYAxis | null)[] | null;
+    showEditingUI: boolean;
+    showResultControls: boolean;
+    showTableSettings: boolean;
+    sourceFeatures: Set<QueryFeature>;
+    sourceTabularColumns: AxisSeries<any>[];
+    sourceTabularData: TableDataCell<any>[][];
+    tabularColumnSettings: (SelectedYAxis | null)[] | null;
+    tabularColumns: AxisSeries<any>[];
+    tabularData: TableDataCell<any>[][];
+    visualizationType: ChartDisplayType;
+    xData: AxisSeries<string> | null;
+    yData: AxisSeries<number | null>[];
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataVisualizationLogicActions {
+    loadData: (refresh?: RefreshType | undefined, alreadyRunningQueryId?: string | undefined, overrideQuery?: DataNode<Record<string, any>> | undefined) => {
+        overrideQuery: DataNode<Record<string, any>> | undefined;
+        pollOnly: boolean;
+        queryId: string;
+        refresh: RefreshType | undefined;
+    }; // dataNodeLogic
+    _setQuery: (node: DataVisualizationNode) => {
+        node: DataVisualizationNode;
+    };
+    addConditionalFormattingRule: (rule?: ConditionalFormattingRule) => {
+        isDarkModeOn: boolean;
+        rule: ConditionalFormattingRule | {
+            id: string;
+        };
+    };
+    addSeries: (columnName?: string, settings?: AxisSeriesSettings) => {
+        allColumns: Column[];
+        columnName: string | undefined;
+        settings: AxisSeriesSettings | undefined;
+    };
+    addYSeries: (columnName?: string, settings?: AxisSeriesSettings) => {
+        allNumericalColumns: Column[];
+        columnName: string | undefined;
+        settings: AxisSeriesSettings | undefined;
+    };
+    clearAxis: () => {
+        value: true;
+    };
+    deleteYSeries: (seriesIndex: number) => {
+        seriesIndex: number;
+    };
+    setConditionalFormattingRulesPanelActiveKeys: (keys: string[]) => {
+        keys: string[];
+    };
+    setQuery: (setter: (node: DataVisualizationNode) => DataVisualizationNode) => {
+        setter: (node: DataVisualizationNode) => DataVisualizationNode;
+    };
+    setSideBarTab: (tab: SideBarTab) => {
+        tab: SideBarTab;
+    };
+    setTransposeResults: (transpose: boolean) => {
+        transpose: boolean;
+    };
+    setVisualizationType: (visualizationType: ChartDisplayType) => {
+        visualizationType: ChartDisplayType;
+    };
+    toggleChartSettingsPanel: (open?: boolean) => {
+        open: boolean | undefined;
+    };
+    toggleColumnPin: (columnName: string) => {
+        columnName: string;
+    };
+    updateChartSettings: (settings: ChartSettings) => {
+        settings: ChartSettings;
+    };
+    updateConditionalFormattingRule: (rule: ConditionalFormattingRule, deleteRule?: boolean) => {
+        colorMode: string;
+        deleteRule: boolean | undefined;
+        rule: ConditionalFormattingRule;
+    };
+    updateSeries: (columnName: string, settings?: AxisSeriesSettings) => {
+        columnName: string;
+        settings: AxisSeriesSettings | undefined;
+    };
+    updateSeriesIndex: (seriesIndex: number, columnName: string, settings?: AxisSeriesSettings) => {
+        columnName: string;
+        seriesIndex: number;
+        settings: AxisSeriesSettings | undefined;
+    };
+    updateXSeries: (columnName: string) => {
+        columnName: string;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataVisualizationLogicMeta {
+    key: string;
+    sharedListeners: {
+        "axesChanged": (payload: any, breakpoint: BreakPointFunction, action: {
+            type: string;
+            payload: any;
+        }, previousState: any) => void | Promise<void>;
+        "conditionalFormattingRules": (payload: any, breakpoint: BreakPointFunction, action: {
+            type: string;
+            payload: any;
+        }, previousState: any) => void | Promise<void>;
+        "pinnedColumnsChanged": (payload: any, breakpoint: BreakPointFunction, action: {
+            type: string;
+            payload: any;
+        }, previousState: any) => void | Promise<void>;
+    };
+    __keaTypeGenInternalSelectorTypes: {
+        columns: (response: ErrorTrackingQueryResponse | HogQLAutocompleteResponse | HogQLMetadataResponse | HogQLQueryResponse<any[]> | HogQueryResponse | LogAttributesQueryResponse | LogValuesQueryResponse | MetricsQueryResponse | Record<string, any> | SessionsQueryResponse | TraceSpansAggregationQueryResponse | TraceSpansAttributeBreakdownQueryResponse | TraceSpansQueryResponse | null) => Column[];
+        numericalColumns: (columns: Column[]) => Column[];
+        hasDateTimeColumns: (columns: Column[]) => boolean;
+        dashboardId: (arg: any) => any;
+        showEditingUI: (arg: boolean | undefined, dashboardId: any) => boolean;
+        showResultControls: (arg: boolean | undefined, dashboardId: any) => boolean;
+        presetChartHeight: (key: string, dashboardId: any, activeSceneId: string | null) => boolean;
+        sourceFeatures: (query: DataVisualizationNode) => Set<QueryFeature>;
+        isShowingCachedResults: (arg: any) => boolean;
+        isTransposed: (query: DataVisualizationNode) => boolean;
+        yData: (selectedYAxis: (SelectedYAxis | null)[] | null, response: ErrorTrackingQueryResponse | HogQLAutocompleteResponse | HogQLMetadataResponse | HogQLQueryResponse<any[]> | HogQueryResponse | LogAttributesQueryResponse | LogValuesQueryResponse | MetricsQueryResponse | Record<string, any> | SessionsQueryResponse | TraceSpansAggregationQueryResponse | TraceSpansAttributeBreakdownQueryResponse | TraceSpansQueryResponse | null, columns: Column[], chartSettings: ChartSettings) => AxisSeries<number | null>[];
+        xData: (selectedXAxis: string | null, response: ErrorTrackingQueryResponse | HogQLAutocompleteResponse | HogQLMetadataResponse | HogQLQueryResponse<any[]> | HogQueryResponse | LogAttributesQueryResponse | LogValuesQueryResponse | MetricsQueryResponse | Record<string, any> | SessionsQueryResponse | TraceSpansAggregationQueryResponse | TraceSpansAttributeBreakdownQueryResponse | TraceSpansQueryResponse | null, columns: Column[]) => AxisSeries<string> | null;
+        sourceTabularColumns: (tabularColumnSettings: (SelectedYAxis | null)[] | null, response: ErrorTrackingQueryResponse | HogQLAutocompleteResponse | HogQLMetadataResponse | HogQLQueryResponse<any[]> | HogQueryResponse | LogAttributesQueryResponse | LogValuesQueryResponse | MetricsQueryResponse | Record<string, any> | SessionsQueryResponse | TraceSpansAggregationQueryResponse | TraceSpansAttributeBreakdownQueryResponse | TraceSpansQueryResponse | null, columns: Column[]) => AxisSeries<any>[];
+        sourceTabularData: (sourceTabularColumns: AxisSeries<any>[], response: ErrorTrackingQueryResponse | HogQLAutocompleteResponse | HogQLMetadataResponse | HogQLQueryResponse<any[]> | HogQueryResponse | LogAttributesQueryResponse | LogValuesQueryResponse | MetricsQueryResponse | Record<string, any> | SessionsQueryResponse | TraceSpansAggregationQueryResponse | TraceSpansAttributeBreakdownQueryResponse | TraceSpansQueryResponse | null, chartSettings: ChartSettings) => TableDataCell<any>[][];
+        tabularColumns: (sourceTabularColumns: AxisSeries<any>[], sourceTabularData: TableDataCell<any>[][], isTransposed: boolean) => AxisSeries<any>[];
+        tabularData: (sourceTabularColumns: AxisSeries<any>[], sourceTabularData: TableDataCell<any>[][], isTransposed: boolean) => TableDataCell<any>[][];
+        dataVisualizationProps: (arg: any) => DataVisualizationLogicProps;
+        effectiveVisualizationType: (visualizationType: ChartDisplayType, autoVisualizationType: ChartDisplayType) => ChartDisplayType;
+        autoVisualizationType: (columns: Column[], response: ErrorTrackingQueryResponse | HogQLAutocompleteResponse | HogQLMetadataResponse | HogQLQueryResponse<any[]> | HogQueryResponse | LogAttributesQueryResponse | LogValuesQueryResponse | MetricsQueryResponse | Record<string, any> | SessionsQueryResponse | TraceSpansAggregationQueryResponse | TraceSpansAttributeBreakdownQueryResponse | TraceSpansQueryResponse | null) => ChartDisplayType;
+        isTableVisualization: (effectiveVisualizationType: ChartDisplayType) => boolean;
+        showTableSettings: (effectiveVisualizationType: ChartDisplayType) => boolean;
+        isColumnPinned: (pinnedColumns: string[]) => (columnName: string) => boolean;
+        isPinningEnabled: (activeSceneId: string | null, isTransposed: boolean) => boolean;
+    };
+}
+
+export type dataVisualizationLogicType = MakeLogicType<dataVisualizationLogicValues, dataVisualizationLogicActions, DataVisualizationLogicProps, dataVisualizationLogicMeta>;
+
 export const dataVisualizationLogic = kea<dataVisualizationLogicType>([
     key((props) => props.key),
     path(['queries', 'nodes', 'DataVisualization', 'dataVisualizationLogic']),
@@ -783,7 +967,23 @@ export const dataVisualizationLogic = kea<dataVisualizationLogicType>([
     selectors({
         columns: [
             (s) => [s.response],
-            (response): Column[] => {
+            (
+                response:
+                    | Record<string, any>
+                    | null
+                    | import('~/queries/schema/schema-general').ErrorTrackingQueryResponse
+                    | import('~/queries/schema/schema-general').HogQLAutocompleteResponse
+                    | import('~/queries/schema/schema-general').HogQLMetadataResponse
+                    | import('~/queries/schema/schema-general').HogQLQueryResponse<any[]>
+                    | import('~/queries/schema/schema-general').HogQueryResponse
+                    | import('~/queries/schema/schema-general').LogAttributesQueryResponse
+                    | import('~/queries/schema/schema-general').LogValuesQueryResponse
+                    | import('~/queries/schema/schema-general').MetricsQueryResponse
+                    | import('~/queries/schema/schema-general').SessionsQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansAggregationQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansAttributeBreakdownQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansQueryResponse
+            ): Column[] => {
                 if (!response) {
                     return []
                 }
@@ -811,18 +1011,18 @@ export const dataVisualizationLogic = kea<dataVisualizationLogicType>([
         ],
         numericalColumns: [
             (s) => [s.columns],
-            (columns): Column[] => {
+            (columns: Column[]): Column[] => {
                 return columns.filter((n) => n.type.isNumerical)
             },
         ],
         hasDateTimeColumns: [
             (s) => [s.columns],
-            (columns): boolean => columns.some((column) => ['DATE', 'DATETIME'].includes(column.type.name)),
+            (columns: Column[]): boolean => columns.some((column) => ['DATE', 'DATETIME'].includes(column.type.name)),
         ],
         dashboardId: [() => [(_, props) => props.dashboardId], (dashboardId) => dashboardId ?? null],
         showEditingUI: [
             (s) => [(_, props: DataVisualizationLogicProps) => props.editMode, s.dashboardId],
-            (editMode, dashboardId) => {
+            (editMode: boolean | undefined, dashboardId) => {
                 if (dashboardId) {
                     return false
                 }
@@ -831,7 +1031,7 @@ export const dataVisualizationLogic = kea<dataVisualizationLogicType>([
         ],
         showResultControls: [
             (s) => [(_, props: DataVisualizationLogicProps) => props.editMode, s.dashboardId],
-            (editMode, dashboardId) => {
+            (editMode: boolean | undefined, dashboardId) => {
                 if (editMode) {
                     return true
                 }
@@ -841,7 +1041,7 @@ export const dataVisualizationLogic = kea<dataVisualizationLogicType>([
         ],
         presetChartHeight: [
             (s, props) => [props.key, s.dashboardId, s.activeSceneId],
-            (key, dashboardId, activeSceneId) => {
+            (key: string, dashboardId, activeSceneId: string | null) => {
                 // Keys for SQL editor visualizations can render outside the SQLEditor scene,
                 // e.g. in embedded mode, so key matching keeps sizing consistent.
                 const sqlEditorVisualization =
@@ -856,15 +1056,40 @@ export const dataVisualizationLogic = kea<dataVisualizationLogicType>([
                 return !key.includes('new-SQL') && !dashboardId && !sqlEditorVisualization
             },
         ],
-        sourceFeatures: [(_, props) => [props.query], (query): Set<QueryFeature> => getQueryFeatures(query.source)],
+        sourceFeatures: [
+            (_, props) => [props.query],
+            (query: DataVisualizationNode): Set<QueryFeature> => getQueryFeatures(query.source),
+        ],
         isShowingCachedResults: [
             () => [(_, props) => props.cachedResults ?? null],
             (cachedResults: AnyResponseType | null): boolean => !!cachedResults,
         ],
-        isTransposed: [(s) => [s.query], (query): boolean => query.tableSettings?.transpose ?? false],
+        isTransposed: [
+            (s) => [s.query],
+            (query: DataVisualizationNode): boolean => query.tableSettings?.transpose ?? false,
+        ],
         yData: [
             (s) => [s.selectedYAxis, s.response, s.columns, s.chartSettings],
-            (ySeries, response, columns, chartSettings): AxisSeries<number | null>[] => {
+            (
+                ySeries: (SelectedYAxis | null)[] | null,
+                response:
+                    | Record<string, any>
+                    | null
+                    | import('~/queries/schema/schema-general').ErrorTrackingQueryResponse
+                    | import('~/queries/schema/schema-general').HogQLAutocompleteResponse
+                    | import('~/queries/schema/schema-general').HogQLMetadataResponse
+                    | import('~/queries/schema/schema-general').HogQLQueryResponse<any[]>
+                    | import('~/queries/schema/schema-general').HogQueryResponse
+                    | import('~/queries/schema/schema-general').LogAttributesQueryResponse
+                    | import('~/queries/schema/schema-general').LogValuesQueryResponse
+                    | import('~/queries/schema/schema-general').MetricsQueryResponse
+                    | import('~/queries/schema/schema-general').SessionsQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansAggregationQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansAttributeBreakdownQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansQueryResponse,
+                columns: Column[],
+                chartSettings: ChartSettings
+            ): AxisSeries<number | null>[] => {
                 if (!response || ySeries === null || ySeries.length === 0) {
                     return [EmptyYAxisSeries]
                 }
@@ -926,7 +1151,25 @@ export const dataVisualizationLogic = kea<dataVisualizationLogicType>([
         ],
         xData: [
             (s) => [s.selectedXAxis, s.response, s.columns],
-            (xSeries, response, columns): AxisSeries<string> | null => {
+            (
+                xSeries: string | null,
+                response:
+                    | Record<string, any>
+                    | null
+                    | import('~/queries/schema/schema-general').ErrorTrackingQueryResponse
+                    | import('~/queries/schema/schema-general').HogQLAutocompleteResponse
+                    | import('~/queries/schema/schema-general').HogQLMetadataResponse
+                    | import('~/queries/schema/schema-general').HogQLQueryResponse<any[]>
+                    | import('~/queries/schema/schema-general').HogQueryResponse
+                    | import('~/queries/schema/schema-general').LogAttributesQueryResponse
+                    | import('~/queries/schema/schema-general').LogValuesQueryResponse
+                    | import('~/queries/schema/schema-general').MetricsQueryResponse
+                    | import('~/queries/schema/schema-general').SessionsQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansAggregationQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansAttributeBreakdownQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansQueryResponse,
+                columns: Column[]
+            ): AxisSeries<string> | null => {
                 if (!response) {
                     return {
                         column: {
@@ -973,7 +1216,25 @@ export const dataVisualizationLogic = kea<dataVisualizationLogicType>([
         ],
         sourceTabularColumns: [
             (s) => [s.tabularColumnSettings, s.response, s.columns],
-            (tabularColumnSettings, response, columns): AxisSeries<any>[] => {
+            (
+                tabularColumnSettings: (SelectedYAxis | null)[] | null,
+                response:
+                    | Record<string, any>
+                    | null
+                    | import('~/queries/schema/schema-general').ErrorTrackingQueryResponse
+                    | import('~/queries/schema/schema-general').HogQLAutocompleteResponse
+                    | import('~/queries/schema/schema-general').HogQLMetadataResponse
+                    | import('~/queries/schema/schema-general').HogQLQueryResponse<any[]>
+                    | import('~/queries/schema/schema-general').HogQueryResponse
+                    | import('~/queries/schema/schema-general').LogAttributesQueryResponse
+                    | import('~/queries/schema/schema-general').LogValuesQueryResponse
+                    | import('~/queries/schema/schema-general').MetricsQueryResponse
+                    | import('~/queries/schema/schema-general').SessionsQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansAggregationQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansAttributeBreakdownQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansQueryResponse,
+                columns: Column[]
+            ): AxisSeries<any>[] => {
                 if (!response) {
                     return []
                 }
@@ -991,7 +1252,25 @@ export const dataVisualizationLogic = kea<dataVisualizationLogicType>([
         ],
         sourceTabularData: [
             (s) => [s.sourceTabularColumns, s.response, s.chartSettings],
-            (sourceTabularColumns, response, chartSettings): TableDataCell<any>[][] => {
+            (
+                sourceTabularColumns: AxisSeries<any>[],
+                response:
+                    | Record<string, any>
+                    | null
+                    | import('~/queries/schema/schema-general').ErrorTrackingQueryResponse
+                    | import('~/queries/schema/schema-general').HogQLAutocompleteResponse
+                    | import('~/queries/schema/schema-general').HogQLMetadataResponse
+                    | import('~/queries/schema/schema-general').HogQLQueryResponse<any[]>
+                    | import('~/queries/schema/schema-general').HogQueryResponse
+                    | import('~/queries/schema/schema-general').LogAttributesQueryResponse
+                    | import('~/queries/schema/schema-general').LogValuesQueryResponse
+                    | import('~/queries/schema/schema-general').MetricsQueryResponse
+                    | import('~/queries/schema/schema-general').SessionsQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansAggregationQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansAttributeBreakdownQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansQueryResponse,
+                chartSettings: ChartSettings
+            ): TableDataCell<any>[][] => {
                 if (!response) {
                     return []
                 }
@@ -1076,7 +1355,11 @@ export const dataVisualizationLogic = kea<dataVisualizationLogicType>([
         ],
         tabularColumns: [
             (s) => [s.sourceTabularColumns, s.sourceTabularData, s.isTransposed],
-            (sourceTabularColumns, sourceTabularData, isTransposed): AxisSeries<any>[] => {
+            (
+                sourceTabularColumns: AxisSeries<any>[],
+                sourceTabularData: TableDataCell<any>[][],
+                isTransposed: boolean
+            ): AxisSeries<any>[] => {
                 if (!isTransposed) {
                     return sourceTabularColumns
                 }
@@ -1129,7 +1412,11 @@ export const dataVisualizationLogic = kea<dataVisualizationLogicType>([
         ],
         tabularData: [
             (s) => [s.sourceTabularColumns, s.sourceTabularData, s.isTransposed],
-            (sourceTabularColumns, sourceTabularData, isTransposed): TableDataCell<any>[][] => {
+            (
+                sourceTabularColumns: AxisSeries<any>[],
+                sourceTabularData: TableDataCell<any>[][],
+                isTransposed: boolean
+            ): TableDataCell<any>[][] => {
                 if (!isTransposed) {
                     return sourceTabularData
                 }
@@ -1156,7 +1443,7 @@ export const dataVisualizationLogic = kea<dataVisualizationLogicType>([
         dataVisualizationProps: [() => [(_, props) => props], (props): DataVisualizationLogicProps => props],
         effectiveVisualizationType: [
             (s) => [s.visualizationType, s.autoVisualizationType],
-            (visualizationType, autoVisualizationType): ChartDisplayType => {
+            (visualizationType: ChartDisplayType, autoVisualizationType: ChartDisplayType): ChartDisplayType => {
                 if (visualizationType === ChartDisplayType.Auto) {
                     return autoVisualizationType
                 }
@@ -1166,24 +1453,41 @@ export const dataVisualizationLogic = kea<dataVisualizationLogicType>([
         ],
         autoVisualizationType: [
             (s) => [s.columns, s.response],
-            (columns, response): ChartDisplayType => getAutoVisualizationType(columns, response),
+            (
+                columns: Column[],
+                response:
+                    | Record<string, any>
+                    | null
+                    | import('~/queries/schema/schema-general').ErrorTrackingQueryResponse
+                    | import('~/queries/schema/schema-general').HogQLAutocompleteResponse
+                    | import('~/queries/schema/schema-general').HogQLMetadataResponse
+                    | import('~/queries/schema/schema-general').HogQLQueryResponse<any[]>
+                    | import('~/queries/schema/schema-general').HogQueryResponse
+                    | import('~/queries/schema/schema-general').LogAttributesQueryResponse
+                    | import('~/queries/schema/schema-general').LogValuesQueryResponse
+                    | import('~/queries/schema/schema-general').MetricsQueryResponse
+                    | import('~/queries/schema/schema-general').SessionsQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansAggregationQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansAttributeBreakdownQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansQueryResponse
+            ): ChartDisplayType => getAutoVisualizationType(columns, response),
         ],
         isTableVisualization: [
             (s) => [s.effectiveVisualizationType],
-            (visualizationType): boolean =>
+            (visualizationType: ChartDisplayType): boolean =>
                 // BoldNumber relies on yAxis formatting so it's considered a table visualization
                 visualizationType === ChartDisplayType.ActionsTable ||
                 visualizationType === ChartDisplayType.BoldNumber,
         ],
         showTableSettings: [
             (s) => [s.effectiveVisualizationType],
-            (visualizationType): boolean =>
+            (visualizationType: ChartDisplayType): boolean =>
                 visualizationType === ChartDisplayType.ActionsTable ||
                 visualizationType === ChartDisplayType.BoldNumber,
         ],
         isColumnPinned: [
             (s) => [s.pinnedColumns],
-            (pinnedColumns) =>
+            (pinnedColumns: string[]) =>
                 (columnName: string): boolean => {
                     return pinnedColumns.includes(columnName)
                 },
diff --git a/frontend/src/queries/nodes/DataVisualization/displayLogic.ts b/frontend/src/queries/nodes/DataVisualization/displayLogic.ts
index da023a4c3269..a45fc910d8e7 100644
--- a/frontend/src/queries/nodes/DataVisualization/displayLogic.ts
+++ b/frontend/src/queries/nodes/DataVisualization/displayLogic.ts
@@ -1,16 +1,68 @@
 import * as d3 from 'd3'
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers } from 'kea'
 import { subscriptions } from 'kea-subscriptions'
 
 import { GoalLine } from '~/queries/schema/schema-general'
 
+import type { ChartSettings, DataVisualizationNode } from '../../schema/schema-general'
 import { dataVisualizationLogic } from './dataVisualizationLogic'
-import type { displayLogicType } from './displayLogicType'
+import type { AxisSeries } from './dataVisualizationLogic'
 
 export interface DisplayLogicProps {
     key: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface displayLogicValues {
+    chartSettings: ChartSettings // dataVisualizationLogic
+    query: DataVisualizationNode // dataVisualizationLogic
+    yData: AxisSeries<number | null>[] // dataVisualizationLogic
+    goalLines: GoalLine[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface displayLogicActions {
+    _setQuery: (node: DataVisualizationNode) => {
+        node: DataVisualizationNode
+    } // dataVisualizationLogic
+    setQuery: (setter: (node: DataVisualizationNode) => DataVisualizationNode) => {
+        setter: (node: DataVisualizationNode) => DataVisualizationNode
+    } // dataVisualizationLogic
+    updateChartSettings: (settings: ChartSettings) => {
+        settings: ChartSettings
+    } // dataVisualizationLogic
+    addGoalLine: () => {
+        yData: AxisSeries<number | null>[]
+    }
+    removeGoalLine: (goalLineIndex: number) => {
+        goalLineIndex: number
+    }
+    setGoalLines: (goalLines: GoalLine[]) => {
+        goalLines: GoalLine[]
+    }
+    updateGoalLine: (
+        goalLineIndex: number,
+        key: string,
+        value: boolean | number | string
+    ) => {
+        goalLineIndex: number
+        key: string
+        value: boolean | number | string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface displayLogicMeta {
+    key: string
+}
+
+export type displayLogicType = MakeLogicType<
+    displayLogicValues,
+    displayLogicActions,
+    DisplayLogicProps,
+    displayLogicMeta
+>
+
 export const displayLogic = kea<displayLogicType>([
     key((props) => props.key),
     path(['queries', 'nodes', 'DataVisualization', 'displayLogic']),
diff --git a/frontend/src/queries/nodes/HogQLQuery/hogQLQueryEditorLogic.tsx b/frontend/src/queries/nodes/HogQLQuery/hogQLQueryEditorLogic.tsx
index b432a61c800a..68addcf725dd 100644
--- a/frontend/src/queries/nodes/HogQLQuery/hogQLQueryEditorLogic.tsx
+++ b/frontend/src/queries/nodes/HogQLQuery/hogQLQueryEditorLogic.tsx
@@ -1,5 +1,17 @@
 import type { Monaco } from '@monaco-editor/react'
-import { actions, connect, kea, key, listeners, path, props, propsChanged, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    connect,
+    kea,
+    key,
+    listeners,
+    path,
+    props,
+    propsChanged,
+    reducers,
+    selectors,
+} from 'kea'
 import { combineUrl } from 'kea-router'
 // Note: we can only import types and not values from monaco-editor, because otherwise some Monaco code breaks
 // auto reload in development. Specifically, on this line:
@@ -23,7 +35,8 @@ import { teamLogic } from 'scenes/teamLogic'
 
 import { DataNode, HogQLQuery, NodeKind } from '~/queries/schema/schema-general'
 
-import type { hogQLQueryEditorLogicType } from './hogQLQueryEditorLogicType'
+import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
+import type { DataWarehouseSavedQuery } from '../../../types'
 
 export interface HogQLQueryEditorLogicProps {
     key: string | number
@@ -36,6 +49,84 @@ export interface HogQLQueryEditorLogicProps {
     queryResponse?: Record<string, any>
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogQLQueryEditorLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    currentProjectId: number | string // teamLogic
+    aiAvailable: boolean | undefined
+    prompt: string
+    promptError: string | null
+    promptLoading: boolean
+    queryInput: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogQLQueryEditorLogicActions {
+    updateView: (
+        query: string,
+        types: string[][]
+    ) => {
+        query: string
+        types: string[][]
+    } // dataWarehouseSettingsSceneLogic
+    createDataWarehouseSavedQuery: (
+        view: Partial<DataWarehouseSavedQuery> & {
+            dag_id?: string
+            folder_id?: string | null
+            types: string[][]
+        }
+    ) => Partial<DataWarehouseSavedQuery> & {
+        dag_id?: string
+        folder_id?: string | null
+        types: string[][]
+    } // dataWarehouseViewsLogic
+    draftFromMetadataFix: (prompt: string) => {
+        prompt: string
+    }
+    draftFromPrompt: () => {
+        value: true
+    }
+    draftFromPromptComplete: () => {
+        value: true
+    }
+    onUpdateView: () => {
+        value: true
+    }
+    saveAsView: () => {
+        value: true
+    }
+    saveAsViewSuccess: (name: string) => {
+        name: string
+    }
+    saveQuery: (queryOverride?: string) => {
+        queryOverride: string | undefined
+    }
+    setPrompt: (prompt: string) => {
+        prompt: string
+    }
+    setPromptError: (error: string | null) => {
+        error: string | null
+    }
+    setQueryInput: (queryInput: string) => {
+        queryInput: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogQLQueryEditorLogicMeta {
+    key: number | string
+    __keaTypeGenInternalSelectorTypes: {
+        aiAvailable: (preflight: null | import('../../../types').PreflightStatus) => boolean | undefined
+    }
+}
+
+export type hogQLQueryEditorLogicType = MakeLogicType<
+    hogQLQueryEditorLogicValues,
+    hogQLQueryEditorLogicActions,
+    HogQLQueryEditorLogicProps,
+    hogQLQueryEditorLogicMeta
+>
+
 export const hogQLQueryEditorLogic = kea<hogQLQueryEditorLogicType>([
     path(['queries', 'nodes', 'HogQLQuery', 'hogQLQueryEditorLogic']),
     props({} as HogQLQueryEditorLogicProps),
@@ -93,7 +184,10 @@ export const hogQLQueryEditorLogic = kea<hogQLQueryEditorLogicType>([
         ],
     })),
     selectors({
-        aiAvailable: [() => [preflightLogic.selectors.preflight], (preflight) => preflight?.openai_available],
+        aiAvailable: [
+            () => [preflightLogic.selectors.preflight],
+            (preflight: null | import('../../../types').PreflightStatus) => preflight?.openai_available,
+        ],
     }),
     listeners(({ actions, props, values }) => ({
         saveQuery: ({ queryOverride }) => {
diff --git a/frontend/src/queries/nodes/InsightViz/PropertyGroupFilters/propertyGroupFilterLogic.ts b/frontend/src/queries/nodes/InsightViz/PropertyGroupFilters/propertyGroupFilterLogic.ts
index 63d68fe1dee9..21630f18dd8b 100644
--- a/frontend/src/queries/nodes/InsightViz/PropertyGroupFilters/propertyGroupFilterLogic.ts
+++ b/frontend/src/queries/nodes/InsightViz/PropertyGroupFilters/propertyGroupFilterLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, key, listeners, path, props, propsChanged, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, key, listeners, path, props, propsChanged, reducers, selectors } from 'kea'
 
 import { convertPropertiesToPropertyGroup, isValidPropertyFilter } from 'lib/components/PropertyFilters/utils'
 import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
@@ -13,14 +13,69 @@ import {
     PropertyGroupFilterValue,
 } from '~/types'
 
-import type { propertyGroupFilterLogicType } from './propertyGroupFilterLogicType'
-
 export type PropertyGroupFilterLogicProps = {
     pageKey: string
     query: ProductAnalyticsInsightQueryNode
     setQuery: (node: ProductAnalyticsInsightQueryNode) => void
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface propertyGroupFilterLogicValues {
+    filters: PropertyGroupFilter
+    propertyGroupFilter: PropertyGroupFilter
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface propertyGroupFilterLogicActions {
+    addFilterGroup: () => {
+        value: true
+    }
+    duplicateFilterGroup: (propertyGroupIndex: number) => {
+        propertyGroupIndex: number
+    }
+    removeFilterGroup: (filterGroup: number) => {
+        filterGroup: number
+    }
+    setFilters: (filters: PropertyGroupFilter) => {
+        filters: PropertyGroupFilter
+    }
+    setInnerPropertyGroupType: (
+        type: FilterLogicalOperator,
+        index: number
+    ) => {
+        index: number
+        type: FilterLogicalOperator
+    }
+    setOuterPropertyGroupsType: (type: FilterLogicalOperator) => {
+        type: FilterLogicalOperator
+    }
+    setPropertyFilters: (
+        properties: any,
+        index: number
+    ) => {
+        index: number
+        properties: any
+    }
+    update: (propertyGroupIndex?: number) => {
+        propertyGroupIndex: number | undefined
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface propertyGroupFilterLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        propertyGroupFilter: (filters: PropertyGroupFilter) => PropertyGroupFilter
+    }
+}
+
+export type propertyGroupFilterLogicType = MakeLogicType<
+    propertyGroupFilterLogicValues,
+    propertyGroupFilterLogicActions,
+    PropertyGroupFilterLogicProps,
+    propertyGroupFilterLogicMeta
+>
+
 export const propertyGroupFilterLogic = kea<propertyGroupFilterLogicType>([
     path(['queries', 'nodes', 'InsightViz', 'PropertyGroupFilters', 'propertyGroupFilterLogic']),
     props({} as PropertyGroupFilterLogicProps),
@@ -123,7 +178,7 @@ export const propertyGroupFilterLogic = kea<propertyGroupFilterLogicType>([
     })),
 
     selectors({
-        propertyGroupFilter: [(s) => [s.filters], (propertyGroupFilter) => propertyGroupFilter],
+        propertyGroupFilter: [(s) => [s.filters], (propertyGroupFilter: PropertyGroupFilter) => propertyGroupFilter],
     }),
 ])
 
diff --git a/frontend/src/queries/nodes/InsightViz/resultCustomizationsModalLogic.ts b/frontend/src/queries/nodes/InsightViz/resultCustomizationsModalLogic.ts
index 6fb7c9602221..4619243cfda3 100644
--- a/frontend/src/queries/nodes/InsightViz/resultCustomizationsModalLogic.ts
+++ b/frontend/src/queries/nodes/InsightViz/resultCustomizationsModalLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 
 import { DataColorToken } from 'lib/colors'
 import { funnelDataLogic } from 'scenes/funnels/funnelDataLogic'
@@ -16,7 +16,108 @@ import { IndexedTrendResult } from 'scenes/trends/types'
 import { ResultCustomizationBy, TrendsFilter } from '~/queries/schema/schema-general'
 import { FlattenedFunnelStepByBreakdown, InsightLogicProps } from '~/types'
 
-import type { resultCustomizationsModalLogicType } from './resultCustomizationsModalLogicType'
+import type { DataColorTheme } from '../../../lib/colors'
+import type { FunnelStepWithConversionMetrics } from '../../../types'
+import type {
+    InsightFilter,
+    ResultCustomizationByPosition,
+    ResultCustomizationByValue,
+} from '../../schema/schema-general'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface resultCustomizationsModalLogicValues {
+    funnelsResultCustomizations: Record<string, ResultCustomizationByValue> | undefined // funnelDataLogic
+    getFunnelsColorToken: (
+        dataset: FlattenedFunnelStepByBreakdown | FunnelStepWithConversionMetrics
+    ) => [DataColorTheme | null, DataColorToken | null] // funnelDataLogic
+    insightFilter: InsightFilter | null | undefined // insightVizDataLogic
+    isFunnels: boolean // insightVizDataLogic
+    isStickiness: boolean // insightVizDataLogic
+    isTrends: boolean // insightVizDataLogic
+    getTrendsColorToken: (dataset: IndexedTrendResult) => [DataColorTheme | null, DataColorToken | null] // trendsDataLogic
+    resultCustomizationBy: ResultCustomizationBy // trendsDataLogic
+    trendsResultCustomizations:
+        | Record<string, ResultCustomizationByValue>
+        | Record<number, ResultCustomizationByPosition>
+        | undefined // trendsDataLogic
+    colorToken: DataColorToken | null
+    colorTokenFromQuery: DataColorToken | null
+    dataset: FlattenedFunnelStepByBreakdown | IndexedTrendResult | null
+    localColorToken: DataColorToken | null
+    localColorTokenTouched: boolean
+    modalVisible: boolean
+    resultCustomizations:
+        | Record<string, ResultCustomizationByValue>
+        | Record<number, ResultCustomizationByPosition>
+        | null
+        | undefined
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface resultCustomizationsModalLogicActions {
+    updateInsightFilter: (insightFilter: InsightFilter) => {
+        insightFilter: InsightFilter
+    } // insightVizDataLogic
+    clearColorToken: () => {
+        value: true
+    }
+    closeModal: () => {
+        value: true
+    }
+    openModal: (dataset: FlattenedFunnelStepByBreakdown | IndexedTrendResult) => {
+        dataset: FlattenedFunnelStepByBreakdown | IndexedTrendResult
+    }
+    save: () => {
+        value: true
+    }
+    setColorToken: (token: DataColorToken) => {
+        token: DataColorToken
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface resultCustomizationsModalLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        modalVisible: (dataset: FlattenedFunnelStepByBreakdown | IndexedTrendResult | null) => boolean
+        colorToken: (
+            localColorToken: DataColorToken | null,
+            localColorTokenTouched: boolean,
+            colorTokenFromQuery: DataColorToken | null
+        ) => DataColorToken | null
+        colorTokenFromQuery: (
+            isTrends: boolean,
+            isStickiness: boolean,
+            isFunnels: boolean,
+            getTrendsColorToken: (dataset: IndexedTrendResult) => [DataColorTheme | null, DataColorToken | null],
+            getFunnelsColorToken: (
+                dataset: FlattenedFunnelStepByBreakdown | FunnelStepWithConversionMetrics
+            ) => [DataColorTheme | null, DataColorToken | null],
+            dataset: FlattenedFunnelStepByBreakdown | IndexedTrendResult | null
+        ) => DataColorToken | null
+        resultCustomizations: (
+            isTrends: boolean,
+            isStickiness: boolean,
+            isFunnels: boolean,
+            trendsResultCustomizations:
+                | Record<string, ResultCustomizationByValue>
+                | Record<number, ResultCustomizationByPosition>
+                | undefined,
+            funnelsResultCustomizations: Record<string, ResultCustomizationByValue> | undefined
+        ) =>
+            | Record<string, ResultCustomizationByValue>
+            | Record<number, ResultCustomizationByPosition>
+            | null
+            | undefined
+    }
+}
+
+export type resultCustomizationsModalLogicType = MakeLogicType<
+    resultCustomizationsModalLogicValues,
+    resultCustomizationsModalLogicActions,
+    InsightLogicProps,
+    resultCustomizationsModalLogicMeta
+>
 
 export const resultCustomizationsModalLogic = kea<resultCustomizationsModalLogicType>([
     props({} as InsightLogicProps),
@@ -72,21 +173,31 @@ export const resultCustomizationsModalLogic = kea<resultCustomizationsModalLogic
     }),
 
     selectors({
-        modalVisible: [(s) => [s.dataset], (dataset): boolean => dataset !== null],
+        modalVisible: [
+            (s) => [s.dataset],
+            (dataset: FlattenedFunnelStepByBreakdown | IndexedTrendResult | null): boolean => dataset !== null,
+        ],
         colorToken: [
             (s) => [s.localColorToken, s.localColorTokenTouched, s.colorTokenFromQuery],
-            (localColorToken, localColorTokenTouched, colorTokenFromQuery): DataColorToken | null =>
-                localColorTokenTouched ? localColorToken : colorTokenFromQuery,
+            (
+                localColorToken: DataColorToken | null,
+                localColorTokenTouched: boolean,
+                colorTokenFromQuery: DataColorToken | null
+            ): DataColorToken | null => (localColorTokenTouched ? localColorToken : colorTokenFromQuery),
         ],
         colorTokenFromQuery: [
             (s) => [s.isTrends, s.isStickiness, s.isFunnels, s.getTrendsColorToken, s.getFunnelsColorToken, s.dataset],
             (
-                isTrends,
-                isStickiness,
-                isFunnels,
-                getTrendsColorToken,
-                getFunnelsColorToken,
-                dataset
+                isTrends: boolean,
+                isStickiness: boolean,
+                isFunnels: boolean,
+                getTrendsColorToken: (
+                    dataset: IndexedTrendResult
+                ) => [null | import('lib/colors').DataColorTheme, DataColorToken | null],
+                getFunnelsColorToken: (
+                    dataset: FlattenedFunnelStepByBreakdown | import('~/types').FunnelStepWithConversionMetrics
+                ) => [null | import('lib/colors').DataColorTheme, DataColorToken | null],
+                dataset: FlattenedFunnelStepByBreakdown | IndexedTrendResult | null
             ): DataColorToken | null => {
                 if (!dataset) {
                     return null
@@ -109,7 +220,18 @@ export const resultCustomizationsModalLogic = kea<resultCustomizationsModalLogic
                 s.trendsResultCustomizations,
                 s.funnelsResultCustomizations,
             ],
-            (isTrends, isStickiness, isFunnels, trendsResultCustomizations, funnelsResultCustomizations) => {
+            (
+                isTrends: boolean,
+                isStickiness: boolean,
+                isFunnels: boolean,
+                trendsResultCustomizations:
+                    | Record<string, import('~/queries/schema/schema-general').ResultCustomizationByValue>
+                    | Record<number, import('~/queries/schema/schema-general').ResultCustomizationByPosition>
+                    | undefined,
+                funnelsResultCustomizations:
+                    | Record<string, import('~/queries/schema/schema-general').ResultCustomizationByValue>
+                    | undefined
+            ) => {
                 if (isTrends || isStickiness) {
                     return trendsResultCustomizations
                 } else if (isFunnels) {
diff --git a/frontend/src/scenes/StripeConfirmInstall/stripeConfirmInstallLogic.ts b/frontend/src/scenes/StripeConfirmInstall/stripeConfirmInstallLogic.ts
index d1de1dcd5da1..6f742a2992df 100644
--- a/frontend/src/scenes/StripeConfirmInstall/stripeConfirmInstallLogic.ts
+++ b/frontend/src/scenes/StripeConfirmInstall/stripeConfirmInstallLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { router, urlToAction } from 'kea-router'
 
 import api, { ApiError } from 'lib/api'
@@ -8,8 +8,6 @@ import { urls } from 'scenes/urls'
 
 import { IntegrationKind } from '~/types'
 
-import type { stripeConfirmInstallLogicType } from './stripeConfirmInstallLogicType'
-
 export interface StripeConfirmInstallParams {
     code: string | null
     stripe_user_id: string | null
@@ -24,6 +22,44 @@ const EMPTY_PARAMS: StripeConfirmInstallParams = {
     user_id: null,
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface stripeConfirmInstallLogicValues {
+    hasRequiredParams: boolean
+    isSubmitting: boolean
+    params: StripeConfirmInstallParams
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface stripeConfirmInstallLogicActions {
+    loadIntegrations: () => any // integrationsLogic
+    cancelInstall: () => {
+        value: true
+    }
+    confirmInstall: () => {
+        value: true
+    }
+    setParams: (params: StripeConfirmInstallParams) => {
+        params: StripeConfirmInstallParams
+    }
+    setSubmitting: (submitting: boolean) => {
+        submitting: boolean
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface stripeConfirmInstallLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        hasRequiredParams: (params: StripeConfirmInstallParams) => boolean
+    }
+}
+
+export type stripeConfirmInstallLogicType = MakeLogicType<
+    stripeConfirmInstallLogicValues,
+    stripeConfirmInstallLogicActions,
+    Record<string, any>,
+    stripeConfirmInstallLogicMeta
+>
+
 export const stripeConfirmInstallLogic = kea<stripeConfirmInstallLogicType>([
     path(['scenes', 'StripeConfirmInstall', 'stripeConfirmInstallLogic']),
     connect(() => ({
@@ -53,7 +89,10 @@ export const stripeConfirmInstallLogic = kea<stripeConfirmInstallLogicType>([
     }),
 
     selectors({
-        hasRequiredParams: [(s) => [s.params], (params): boolean => !!params.code && !!params.stripe_user_id],
+        hasRequiredParams: [
+            (s) => [s.params],
+            (params: StripeConfirmInstallParams): boolean => !!params.code && !!params.stripe_user_id,
+        ],
     }),
 
     listeners(({ actions, values }) => ({
diff --git a/frontend/src/scenes/Unsubscribe/unsubscribeLogic.ts b/frontend/src/scenes/Unsubscribe/unsubscribeLogic.ts
index 7a2bd77f57ac..7a4ed41d2420 100644
--- a/frontend/src/scenes/Unsubscribe/unsubscribeLogic.ts
+++ b/frontend/src/scenes/Unsubscribe/unsubscribeLogic.ts
@@ -1,10 +1,41 @@
-import { actions, afterMount, kea, path } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, path } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 
 import api from 'lib/api'
 
-import type { unsubscribeLogicType } from './unsubscribeLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface unsubscribeLogicValues {
+    unsubscription: boolean
+    unsubscriptionLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface unsubscribeLogicActions {
+    attemptUnsubscribe: (token: string) => {
+        token: string
+    }
+    attemptUnsubscribeFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    attemptUnsubscribeSuccess: (
+        unsubscription: boolean,
+        payload?: {
+            token: string
+        }
+    ) => {
+        unsubscription: boolean
+        payload?: {
+            token: string
+        }
+    }
+}
+
+export type unsubscribeLogicType = MakeLogicType<unsubscribeLogicValues, unsubscribeLogicActions>
 
 export const unsubscribeLogic = kea<unsubscribeLogicType>([
     path(['scenes', 'Unsubscribe', 'unsubscribeLogic']),
diff --git a/frontend/src/scenes/activity/explore/eventsSceneLogic.tsx b/frontend/src/scenes/activity/explore/eventsSceneLogic.tsx
index 0d58d52f2dd8..291538d19fba 100644
--- a/frontend/src/scenes/activity/explore/eventsSceneLogic.tsx
+++ b/frontend/src/scenes/activity/explore/eventsSceneLogic.tsx
@@ -1,5 +1,5 @@
 import { deepEqual as equal } from 'fast-equals'
-import { actions, connect, kea, key, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, reducers, selectors } from 'kea'
 import { urlToAction } from 'kea-router'
 import { UrlToActionPayload } from 'kea-router/lib/types'
 
@@ -19,7 +19,43 @@ import { getDefaultEventsQueryForTeam } from '~/queries/nodes/DataTable/defaultE
 import { DataTableNode, Node } from '~/queries/schema/schema-general'
 import { ActivityTab, Breadcrumb } from '~/types'
 
-import type { eventsSceneLogicType } from './eventsSceneLogicType'
+import type { TeamPublicType, TeamType } from '../../../types'
+import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface eventsSceneLogicValues {
+    featureFlags: FeatureFlagsSet; // featureFlagLogic
+    filterTestAccountsDefault: boolean; // filterTestAccountsDefaultsLogic
+    savedQueryFor: (tabId: string | undefined, sceneKey: string) => Node | null; // tabUiStateLogic
+    currentTeam: TeamPublicType | TeamType | null; // teamLogic
+    breadcrumbs: Breadcrumb[];
+    defaultQuery: DataTableNode;
+    query: DataTableNode | Node<Record<string, any>>;
+    savedQuery: Node | null;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface eventsSceneLogicActions {
+    setSavedQueryForTab: (tabId: string | undefined, sceneKey: string, query: Node<Record<string, any>> | null) => {
+        query: Node<Record<string, any>> | null;
+        sceneKey: string;
+        tabId: string;
+    }; // tabUiStateLogic
+    setQuery: (query: Node) => {
+        query: Node<Record<string, any>>;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface eventsSceneLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        defaultQuery: (currentTeam: TeamPublicType | TeamType | null, filterTestAccountsDefault: boolean) => DataTableNode;
+        query: (savedQuery: Node<Record<string, any>> | null, defaultQuery: DataTableNode) => DataTableNode | Node<Record<string, any>>;
+    };
+}
+
+export type eventsSceneLogicType = MakeLogicType<eventsSceneLogicValues, eventsSceneLogicActions, Record<string, any>, eventsSceneLogicMeta>;
 
 export const eventsSceneLogic = kea<eventsSceneLogicType>([
     key(() => 'scene'),
@@ -49,7 +85,7 @@ export const eventsSceneLogic = kea<eventsSceneLogicType>([
     selectors({
         defaultQuery: [
             (s) => [s.currentTeam, s.filterTestAccountsDefault],
-            (currentTeam, filterTestAccountsDefault): DataTableNode => {
+            (currentTeam: TeamPublicType | TeamType | null, filterTestAccountsDefault: boolean): DataTableNode => {
                 const defaultSourceForTeam = currentTeam && getDefaultEventsQueryForTeam(currentTeam)
                 const defaultForScene = getDefaultEventsSceneQuery()
                 const base = defaultSourceForTeam
@@ -61,7 +97,7 @@ export const eventsSceneLogic = kea<eventsSceneLogicType>([
                 }
             },
         ],
-        query: [(s) => [s.savedQuery, s.defaultQuery], (savedQuery, defaultQuery) => savedQuery || defaultQuery],
+        query: [(s) => [s.savedQuery, s.defaultQuery], (savedQuery: Node<Record<string, any>> | null, defaultQuery: DataTableNode) => savedQuery || defaultQuery],
         breadcrumbs: [
             () => [],
             (): Breadcrumb[] => [
diff --git a/frontend/src/scenes/activity/explore/sessionsSceneLogic.tsx b/frontend/src/scenes/activity/explore/sessionsSceneLogic.tsx
index 7994cbdad3f4..340b24f3deb7 100644
--- a/frontend/src/scenes/activity/explore/sessionsSceneLogic.tsx
+++ b/frontend/src/scenes/activity/explore/sessionsSceneLogic.tsx
@@ -1,5 +1,5 @@
 import { deepEqual as equal } from 'fast-equals'
-import { actions, connect, kea, key, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, reducers, selectors } from 'kea'
 import { urlToAction } from 'kea-router'
 import { UrlToActionPayload } from 'kea-router/lib/types'
 
@@ -17,7 +17,41 @@ import { urls } from 'scenes/urls'
 import { DataTableNode, Node } from '~/queries/schema/schema-general'
 import { ActivityTab, Breadcrumb } from '~/types'
 
-import type { sessionsSceneLogicType } from './sessionsSceneLogicType'
+import type { TeamPublicType, TeamType } from '../../../types'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionsSceneLogicValues {
+    filterTestAccountsDefault: boolean; // filterTestAccountsDefaultsLogic
+    savedQueryFor: (tabId: string | undefined, sceneKey: string) => Node | null; // tabUiStateLogic
+    currentTeam: TeamPublicType | TeamType | null; // teamLogic
+    breadcrumbs: Breadcrumb[];
+    defaultQuery: DataTableNode;
+    query: Node;
+    savedQuery: Node | null;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionsSceneLogicActions {
+    setSavedQueryForTab: (tabId: string | undefined, sceneKey: string, query: Node<Record<string, any>> | null) => {
+        query: Node<Record<string, any>> | null;
+        sceneKey: string;
+        tabId: string;
+    }; // tabUiStateLogic
+    setQuery: (query: Node) => {
+        query: Node<Record<string, any>>;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionsSceneLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        defaultQuery: (currentTeam: TeamPublicType | TeamType | null, filterTestAccountsDefault: boolean) => DataTableNode;
+        query: (savedQuery: Node<Record<string, any>> | null, defaultQuery: DataTableNode) => Node;
+    };
+}
+
+export type sessionsSceneLogicType = MakeLogicType<sessionsSceneLogicValues, sessionsSceneLogicActions, Record<string, any>, sessionsSceneLogicMeta>;
 
 export const sessionsSceneLogic = kea<sessionsSceneLogicType>([
     key(() => 'scene'),
@@ -45,10 +79,10 @@ export const sessionsSceneLogic = kea<sessionsSceneLogicType>([
     selectors({
         defaultQuery: [
             (s) => [s.currentTeam, s.filterTestAccountsDefault],
-            (currentTeam, filterTestAccountsDefault): DataTableNode =>
+            (currentTeam: TeamPublicType | TeamType | null, filterTestAccountsDefault: boolean): DataTableNode =>
                 applyTestAccountFilter(getDefaultSessionsSceneQuery(), currentTeam, filterTestAccountsDefault),
         ],
-        query: [(s) => [s.savedQuery, s.defaultQuery], (savedQuery, defaultQuery): Node => savedQuery || defaultQuery],
+        query: [(s) => [s.savedQuery, s.defaultQuery], (savedQuery: Node<Record<string, any>> | null, defaultQuery: DataTableNode): Node => savedQuery || defaultQuery],
         breadcrumbs: [
             () => [],
             (): Breadcrumb[] => [
diff --git a/frontend/src/scenes/activity/live/liveEventsLogic.tsx b/frontend/src/scenes/activity/live/liveEventsLogic.tsx
index e1f50a59c508..5114568951df 100644
--- a/frontend/src/scenes/activity/live/liveEventsLogic.tsx
+++ b/frontend/src/scenes/activity/live/liveEventsLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, connect, events, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, listeners, path, props, reducers, selectors } from 'kea'
 
 import { Spinner, lemonToast } from '@posthog/lemon-ui'
 
@@ -12,8 +12,9 @@ import { teamLogic } from 'scenes/teamLogic'
 
 import { AnyPropertyFilter, LiveEvent, PropertyFilterValue, PropertyOperator } from '~/types'
 
+import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
+import type { TeamPublicType, TeamType } from '../../../types'
 import { deduplicateEvents } from './deduplicateEvents'
-import type { liveEventsLogicType } from './liveEventsLogicType'
 
 const ERROR_TOAST_ID = 'live-stream-error'
 
@@ -36,6 +37,70 @@ export interface LiveEventsLogicProps {
     showLiveStreamErrorToast?: boolean
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface liveEventsLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    clientSideFilters: Record<string, any>
+    eventCount: number
+    eventHosts: string[]
+    events: LiveEvent[]
+    filteredEvents: LiveEvent[]
+    filters: {
+        eventType: string | null
+        properties: AnyPropertyFilter[]
+    }
+    lastBatchTimestamp: number | null
+    streamPaused: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface liveEventsLogicActions {
+    loadCurrentTeam: () => any // teamLogic
+    addEventHost: (eventHost: string) => {
+        eventHost: string
+    }
+    addEvents: (events: LiveEvent[]) => {
+        events: LiveEvent[]
+    }
+    clearEvents: () => {
+        value: true
+    }
+    pauseStream: () => {
+        value: true
+    }
+    resumeStream: () => {
+        value: true
+    }
+    setClientSideFilters: (clientSideFilters: Record<string, any>) => {
+        clientSideFilters: Record<string, any>
+    }
+    setFilters: (filters: { eventType?: string | null; properties?: AnyPropertyFilter[] }) => {
+        filters: {
+            eventType?: string | null | undefined
+            properties?: AnyPropertyFilter[] | undefined
+        }
+    }
+    updateEventsConnection: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface liveEventsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        eventCount: (events: LiveEvent[]) => number
+        filteredEvents: (events: LiveEvent[], clientSideFilters: Record<string, any>) => LiveEvent[]
+    }
+}
+
+export type liveEventsLogicType = MakeLogicType<
+    liveEventsLogicValues,
+    liveEventsLogicActions,
+    LiveEventsLogicProps,
+    liveEventsLogicMeta
+>
+
 export const liveEventsLogic = kea<liveEventsLogicType>([
     path(['scenes', 'activity', 'live-events', 'liveEventsLogic']),
     props({} as LiveEventsLogicProps),
diff --git a/frontend/src/scenes/activity/live/liveEventsTableSceneLogic.ts b/frontend/src/scenes/activity/live/liveEventsTableSceneLogic.ts
index 3579981a3cb7..af89e8e7c4dc 100644
--- a/frontend/src/scenes/activity/live/liveEventsTableSceneLogic.ts
+++ b/frontend/src/scenes/activity/live/liveEventsTableSceneLogic.ts
@@ -1,11 +1,26 @@
-import { kea, key, path, selectors } from 'kea'
+import { MakeLogicType, kea, key, path, selectors } from 'kea'
 
 import { sceneConfigurations } from 'scenes/scenes'
 import { Scene } from 'scenes/sceneTypes'
 
 import { Breadcrumb } from '~/types'
 
-import type { liveEventsTableSceneLogicType } from './liveEventsTableSceneLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface liveEventsTableSceneLogicValues {
+    breadcrumbs: Breadcrumb[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface liveEventsTableSceneLogicMeta {
+    key: string
+}
+
+export type liveEventsTableSceneLogicType = MakeLogicType<
+    liveEventsTableSceneLogicValues,
+    {},
+    Record<string, any>,
+    liveEventsTableSceneLogicMeta
+>
 
 export const liveEventsTableSceneLogic = kea<liveEventsTableSceneLogicType>([
     key(() => 'scene'),
diff --git a/frontend/src/scenes/agentic/agenticAuthorizeLogic.ts b/frontend/src/scenes/agentic/agenticAuthorizeLogic.ts
index 3a5ef111714d..0eb7aacfddb0 100644
--- a/frontend/src/scenes/agentic/agenticAuthorizeLogic.ts
+++ b/frontend/src/scenes/agentic/agenticAuthorizeLogic.ts
@@ -1,5 +1,6 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { urlToAction } from 'kea-router'
 
@@ -10,14 +11,154 @@ import { userLogic } from 'scenes/userLogic'
 
 import type { OrganizationBasicType, TeamBasicType, UserType } from '~/types'
 
-import type { agenticAuthorizeLogicType } from './agenticAuthorizeLogicType'
-
 export type AgenticAuthorizationFormValues = {
     scoped_organizations: string[]
     scoped_teams: number[]
     access_type: 'teams'
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface agenticAuthorizeLogicValues {
+    user: UserType | null // userLogic
+    agenticAuthorization: AgenticAuthorizationFormValues
+    agenticAuthorizationAllErrors: Record<string, any>
+    agenticAuthorizationChanged: boolean
+    agenticAuthorizationErrors: DeepPartialMap<AgenticAuthorizationFormValues, ValidationErrorType>
+    agenticAuthorizationHasErrors: boolean
+    agenticAuthorizationManualErrors: Record<string, any>
+    agenticAuthorizationTouched: boolean
+    agenticAuthorizationTouches: Record<string, boolean>
+    agenticAuthorizationValidationErrors: DeepPartialMap<AgenticAuthorizationFormValues, ValidationErrorType>
+    allOrganizations: OrganizationBasicType[]
+    allTeams: TeamBasicType[] | null
+    allTeamsLoading: boolean
+    filteredTeams: TeamBasicType[]
+    isAgenticAuthorizationSubmitting: boolean
+    isAgenticAuthorizationValid: boolean
+    partnerName: string
+    pendingAuth: {
+        partner_name: string
+        scopes: string[]
+    } | null
+    pendingAuthLoading: boolean
+    scopeDescriptions: string[]
+    scopes: string[]
+    showAgenticAuthorizationErrors: boolean
+    state: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface agenticAuthorizeLogicActions {
+    cancel: () => {
+        value: true
+    }
+    loadAllTeams: () => any
+    loadAllTeamsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAllTeamsSuccess: (
+        allTeams: TeamBasicType[],
+        payload?: any
+    ) => {
+        allTeams: TeamBasicType[]
+        payload?: any
+    }
+    loadPendingAuth: () => any
+    loadPendingAuthFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPendingAuthSuccess: (
+        pendingAuth: {
+            partner_name: string
+            scopes: string[]
+        } | null,
+        payload?: any
+    ) => {
+        pendingAuth: {
+            partner_name: string
+            scopes: string[]
+        } | null
+        payload?: any
+    }
+    resetAgenticAuthorization: (values?: AgenticAuthorizationFormValues) => {
+        values?: AgenticAuthorizationFormValues
+    }
+    setAgenticAuthorizationManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setAgenticAuthorizationValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setAgenticAuthorizationValues: (values: DeepPartial<AgenticAuthorizationFormValues>) => {
+        values: DeepPartial<AgenticAuthorizationFormValues>
+    }
+    setState: (state: string) => {
+        state: string
+    }
+    submitAgenticAuthorization: () => {
+        value: boolean
+    }
+    submitAgenticAuthorizationFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitAgenticAuthorizationRequest: (agenticAuthorization: AgenticAuthorizationFormValues) => {
+        agenticAuthorization: AgenticAuthorizationFormValues
+    }
+    submitAgenticAuthorizationSuccess: (agenticAuthorization: AgenticAuthorizationFormValues) => {
+        agenticAuthorization: AgenticAuthorizationFormValues
+    }
+    touchAgenticAuthorizationField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface agenticAuthorizeLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        allOrganizations: (user: UserType | null) => OrganizationBasicType[]
+        filteredTeams: (
+            allTeams: TeamBasicType[] | null,
+            agenticAuthorization: AgenticAuthorizationFormValues
+        ) => TeamBasicType[]
+        partnerName: (
+            pendingAuth: {
+                partner_name: string
+                scopes: string[]
+            } | null
+        ) => string
+        scopes: (
+            pendingAuth: {
+                partner_name: string
+                scopes: string[]
+            } | null
+        ) => string[]
+        scopeDescriptions: (scopes: string[]) => string[]
+    }
+}
+
+export type agenticAuthorizeLogicType = MakeLogicType<
+    agenticAuthorizeLogicValues,
+    agenticAuthorizeLogicActions,
+    Record<string, any>,
+    agenticAuthorizeLogicMeta
+>
+
 export const agenticAuthorizeLogic = kea<agenticAuthorizeLogicType>([
     path(['agentic', 'authorize']),
     connect(() => ({
diff --git a/frontend/src/scenes/annotations/annotationModalLogic.ts b/frontend/src/scenes/annotations/annotationModalLogic.ts
index 32de9cb29ea1..e727ce3a33e2 100644
--- a/frontend/src/scenes/annotations/annotationModalLogic.ts
+++ b/frontend/src/scenes/annotations/annotationModalLogic.ts
@@ -1,5 +1,6 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { urlToAction } from 'kea-router'
 
 import '@posthog/lemon-ui'
@@ -14,7 +15,7 @@ import { userLogic } from 'scenes/userLogic'
 import { annotationsModel, deserializeAnnotation } from '~/models/annotationsModel'
 import { AnnotationScope, AnnotationType, DashboardBasicType, QueryBasedInsightModel } from '~/types'
 
-import type { annotationModalLogicType } from './annotationModalLogicType'
+import type { RawAnnotationType, UserType } from '../../types'
 
 export const ANNOTATION_DAYJS_FORMAT = 'MMMM DD, YYYY h:mm A'
 
@@ -41,6 +42,124 @@ export interface AnnotationModalForm {
     dashboardId: AnnotationType['dashboard_id'] | null
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface annotationModalLogicValues {
+    annotations: AnnotationType[] // annotationsModel
+    annotationsLoading: boolean // annotationsModel
+    timezone: string // teamLogic
+    user: UserType | null // userLogic
+    annotationModal: AnnotationModalForm
+    annotationModalAllErrors: Record<string, any>
+    annotationModalChanged: boolean
+    annotationModalErrors: DeepPartialMap<AnnotationModalForm, ValidationErrorType>
+    annotationModalHasErrors: boolean
+    annotationModalManualErrors: Record<string, any>
+    annotationModalTouched: boolean
+    annotationModalTouches: Record<string, boolean>
+    annotationModalValidationErrors: DeepPartialMap<AnnotationModalForm, ValidationErrorType>
+    existingModalAnnotation: AnnotationType | null
+    isAnnotationModalSubmitting: boolean
+    isAnnotationModalValid: boolean
+    isModalOpen: boolean
+    onSavedInsight: boolean
+    scope: AnnotationType['scope'] | null
+    shouldShowEmptyState: boolean
+    showAnnotationModalErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface annotationModalLogicActions {
+    appendAnnotations: (annotations: RawAnnotationType[]) => {
+        annotations: RawAnnotationType[]
+    } // annotationsModel
+    deleteAnnotation: (annotation: AnnotationType) => {
+        annotation: AnnotationType
+    } // annotationsModel
+    loadAnnotationsSuccess: (
+        rawAnnotations: RawAnnotationType[],
+        payload?: any
+    ) => {
+        payload?: any
+        rawAnnotations: RawAnnotationType[]
+    } // annotationsModel
+    replaceAnnotation: (annotation: RawAnnotationType) => {
+        annotation: RawAnnotationType
+    } // annotationsModel
+    closeModal: () => {
+        value: true
+    }
+    openModalToCreateAnnotation: (
+        initialDate?: Dayjs | null,
+        insightId?: QueryBasedInsightModel['id'] | null,
+        dashboardId?: DashboardBasicType['id'] | null
+    ) => {
+        dashboardId: number | null | undefined
+        initialDate: Dayjs | null | undefined
+        insightId: number | null | undefined
+    }
+    openModalToEditAnnotation: (
+        annotation: AnnotationType,
+        insightId?: QueryBasedInsightModel['id'] | null,
+        dashboardId?: DashboardBasicType['id'] | null
+    ) => {
+        annotation: AnnotationType
+        dashboardId: number | null | undefined
+        insightId: number | null | undefined
+    }
+    resetAnnotationModal: (values?: AnnotationModalForm) => {
+        values?: AnnotationModalForm
+    }
+    setAnnotationModalManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setAnnotationModalValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setAnnotationModalValues: (values: DeepPartial<AnnotationModalForm>) => {
+        values: DeepPartial<AnnotationModalForm>
+    }
+    setScope: (scope: AnnotationType['scope'] | null) => {
+        scope: AnnotationScope | null
+    }
+    submitAnnotationModal: () => {
+        value: boolean
+    }
+    submitAnnotationModalFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitAnnotationModalRequest: (annotationModal: AnnotationModalForm) => {
+        annotationModal: AnnotationModalForm
+    }
+    submitAnnotationModalSuccess: (annotationModal: AnnotationModalForm) => {
+        annotationModal: AnnotationModalForm
+    }
+    touchAnnotationModalField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface annotationModalLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        shouldShowEmptyState: (annotations: AnnotationType[], annotationsLoading: boolean) => boolean
+    }
+}
+
+export type annotationModalLogicType = MakeLogicType<
+    annotationModalLogicValues,
+    annotationModalLogicActions,
+    Record<string, any>,
+    annotationModalLogicMeta
+>
+
 export const annotationModalLogic = kea<annotationModalLogicType>([
     path(['scenes', 'annotations', 'annotationModalLogic']),
     connect(() => ({
@@ -138,7 +257,7 @@ export const annotationModalLogic = kea<annotationModalLogicType>([
     selectors(() => ({
         shouldShowEmptyState: [
             (s) => [s.annotations, s.annotationsLoading],
-            (annotations, annotationsLoading): boolean => {
+            (annotations: AnnotationType[], annotationsLoading: boolean): boolean => {
                 return annotations.length === 0 && !annotationsLoading
             },
         ],
diff --git a/frontend/src/scenes/annotations/annotationsLogic.ts b/frontend/src/scenes/annotations/annotationsLogic.ts
index 0ef37414bffd..b06cc19ad932 100644
--- a/frontend/src/scenes/annotations/annotationsLogic.ts
+++ b/frontend/src/scenes/annotations/annotationsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, path, reducers, selectors } from 'kea'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 
 import { LemonSelectOption, LemonSelectOptions } from '@posthog/lemon-ui'
@@ -10,7 +10,6 @@ import { annotationsModel } from '~/models/annotationsModel'
 import { AnnotationScope, AnnotationType } from '~/types'
 
 import { annotationScopeToName } from './annotationModalLogic'
-import type { annotationsLogicType } from './annotationsLogicType'
 
 const isValidAnnotationScope = (scope: string): scope is AnnotationScope => {
     return Object.values(AnnotationScope).includes(scope as AnnotationScope)
@@ -31,6 +30,40 @@ export const annotationScopesMenuOptions = (): LemonSelectOptions<AnnotationType
     return scopeOptions
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface annotationsLogicValues {
+    annotations: AnnotationType[] // annotationsModel
+    annotationsLoading: boolean // annotationsModel
+    loadingNext: boolean // annotationsModel
+    next: string | null // annotationsModel
+    timezone: string // teamLogic
+    filteredAnnotations: AnnotationType[]
+    scope: AnnotationType['scope'] | null
+    shouldShowEmptyState: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface annotationsLogicActions {
+    setScope: (scope: AnnotationType['scope'] | null) => {
+        scope: AnnotationScope | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface annotationsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        shouldShowEmptyState: (annotations: AnnotationType[], annotationsLoading: boolean) => boolean
+        filteredAnnotations: (annotations: AnnotationType[], scope: AnnotationScope | null) => AnnotationType[]
+    }
+}
+
+export type annotationsLogicType = MakeLogicType<
+    annotationsLogicValues,
+    annotationsLogicActions,
+    Record<string, any>,
+    annotationsLogicMeta
+>
+
 export const annotationsLogic = kea<annotationsLogicType>([
     path(['scenes', 'annotations', 'annotationsLogic']),
     connect(() => ({
@@ -50,13 +83,13 @@ export const annotationsLogic = kea<annotationsLogicType>([
     selectors(() => ({
         shouldShowEmptyState: [
             (s) => [s.annotations, s.annotationsLoading],
-            (annotations, annotationsLoading): boolean => {
+            (annotations: AnnotationType[], annotationsLoading: boolean): boolean => {
                 return annotations.length === 0 && !annotationsLoading
             },
         ],
         filteredAnnotations: [
             (s) => [s.annotations, s.scope],
-            (annotations, scope): AnnotationType[] => {
+            (annotations: AnnotationType[], scope: AnnotationType['scope'] | null): AnnotationType[] => {
                 return scope
                     ? annotations.filter((annotation) => {
                           return annotation.scope === scope
diff --git a/frontend/src/scenes/appContextLogic.ts b/frontend/src/scenes/appContextLogic.ts
index a18f0714160c..82ad8c5882d1 100644
--- a/frontend/src/scenes/appContextLogic.ts
+++ b/frontend/src/scenes/appContextLogic.ts
@@ -1,4 +1,4 @@
-import { afterMount, connect, kea, path } from 'kea'
+import { MakeLogicType, afterMount, connect, kea, path } from 'kea'
 import posthog from 'posthog-js'
 
 import api from 'lib/api'
@@ -6,12 +6,40 @@ import { getAppContext } from 'lib/utils/getAppContext'
 
 import { UserType } from '~/types'
 
-import type { appContextLogicType } from './appContextLogicType'
+import type { OrganizationType } from '../types'
 import { organizationLogic } from './organizationLogic'
 import { projectLogic } from './projectLogic'
 import { teamLogic } from './teamLogic'
 import { userLogic } from './userLogic'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface appContextLogicActions {
+    loadCurrentOrganizationSuccess: (
+        currentOrganization: OrganizationType | null,
+        payload?: any
+    ) => {
+        currentOrganization: OrganizationType | null
+        payload?: any
+    } // organizationLogic
+    loadCurrentProject: () => any // projectLogic
+    loadCurrentTeam: () => any // teamLogic
+    loadUserSuccess: (
+        user: UserType | null,
+        payload?:
+            | {
+                  resetOnFailure: boolean | undefined
+              }
+            | undefined
+    ) => {
+        payload?: {
+            resetOnFailure: boolean | undefined
+        }
+        user: UserType | null
+    } // userLogic
+}
+
+export type appContextLogicType = MakeLogicType<{}, appContextLogicActions>
+
 export const appContextLogic = kea<appContextLogicType>([
     path(['scenes', 'appContextLogic']),
     connect(() => ({
diff --git a/frontend/src/scenes/appLogic.tsx b/frontend/src/scenes/appLogic.tsx
index 687b38ecb10f..5b511be4aa47 100644
--- a/frontend/src/scenes/appLogic.tsx
+++ b/frontend/src/scenes/appLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, connect, events, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, path, reducers, selectors } from 'kea'
 import { urlToAction } from 'kea-router'
 
 import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
@@ -7,7 +7,44 @@ import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
 import { teamLogic } from 'scenes/teamLogic'
 import { userLogic } from 'scenes/userLogic'
 
-import type { appLogicType } from './appLogicType'
+import type { PreflightStatus } from '../types'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface appLogicValues {
+    featureFlagsTimedOut: boolean
+    showApp: boolean | PreflightStatus | null
+    showingDelayedSpinner: boolean
+    showingDevTools: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface appLogicActions {
+    enableDelayedSpinner: () => {
+        value: true
+    }
+    ignoreFeatureFlags: () => {
+        value: true
+    }
+    showDevTools: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface appLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        showApp: (
+            userLoading: boolean,
+            user: null | import('../types').UserType,
+            receivedFeatureFlags: boolean,
+            featureFlagsTimedOut: boolean,
+            preflightLoading: boolean,
+            preflight: PreflightStatus | null
+        ) => boolean | PreflightStatus | null
+    }
+}
+
+export type appLogicType = MakeLogicType<appLogicValues, appLogicActions, Record<string, any>, appLogicMeta>
 
 export const appLogic = kea<appLogicType>([
     path(['scenes', 'App']),
@@ -33,7 +70,14 @@ export const appLogic = kea<appLogicType>([
                 preflightLogic.selectors.preflightLoading,
                 preflightLogic.selectors.preflight,
             ],
-            (userLoading, user, receivedFeatureFlags, featureFlagsTimedOut, preflightLoading, preflight) => {
+            (
+                userLoading: boolean,
+                user: null | import('../types').UserType,
+                receivedFeatureFlags: boolean,
+                featureFlagsTimedOut: boolean,
+                preflightLoading: boolean,
+                preflight: null | import('../types').PreflightStatus
+            ) => {
                 return (
                     (!userLoading || user) &&
                     (receivedFeatureFlags || featureFlagsTimedOut) &&
diff --git a/frontend/src/scenes/approvals/approvalLogic.tsx b/frontend/src/scenes/approvals/approvalLogic.tsx
index 97bd0423f277..18279b677234 100644
--- a/frontend/src/scenes/approvals/approvalLogic.tsx
+++ b/frontend/src/scenes/approvals/approvalLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router, urlToAction } from 'kea-router'
 
@@ -15,14 +15,83 @@ import { userLogic } from 'scenes/userLogic'
 
 import { AvailableFeature, Breadcrumb, ChangeRequest, ChangeRequestState } from '~/types'
 
-import type { approvalLogicType } from './approvalLogicType'
-
 export interface ApprovalLogicProps {
     id: string
 }
 
 export type ProposedChangesTab = 'gated' | 'full'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface approvalLogicValues {
+    currentTeamId: number | null // teamLogic
+    hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean // userLogic
+    breadcrumbs: Breadcrumb[]
+    changeRequest: ChangeRequest | null
+    changeRequestLoading: boolean
+    changeRequestMissing: boolean
+    isApprovalsFeatureEnabled: boolean
+    proposedChangesTab: ProposedChangesTab
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface approvalLogicActions {
+    loadAllMembers: () => {
+        value: true
+    } // membersLogic
+    loadRoles: () => any // rolesLogic
+    approveChangeRequest: (reason?: string) => {
+        reason: string | undefined
+    }
+    cancelChangeRequest: (reason?: string) => {
+        reason: string | undefined
+    }
+    loadChangeRequest: () => {
+        value: true
+    }
+    loadChangeRequestFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadChangeRequestSuccess: (
+        changeRequest: ChangeRequest | null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        changeRequest: ChangeRequest | null
+        payload?: {
+            value: true
+        }
+    }
+    rejectChangeRequest: (reason: string) => {
+        reason: string
+    }
+    setProposedChangesTab: (tab: ProposedChangesTab) => {
+        tab: ProposedChangesTab
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface approvalLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        isApprovalsFeatureEnabled: (
+            hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean
+        ) => boolean
+        breadcrumbs: (changeRequest: ChangeRequest | null) => Breadcrumb[]
+    }
+}
+
+export type approvalLogicType = MakeLogicType<
+    approvalLogicValues,
+    approvalLogicActions,
+    ApprovalLogicProps,
+    approvalLogicMeta
+>
+
 export const approvalLogic = kea<approvalLogicType>([
     path(['scenes', 'approvals', 'approvalLogic']),
     props({} as ApprovalLogicProps),
@@ -72,11 +141,12 @@ export const approvalLogic = kea<approvalLogicType>([
     selectors({
         isApprovalsFeatureEnabled: [
             (s) => [s.hasAvailableFeature],
-            (hasAvailableFeature): boolean => hasAvailableFeature(AvailableFeature.APPROVALS),
+            (hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean): boolean =>
+                hasAvailableFeature(AvailableFeature.APPROVALS),
         ],
         breadcrumbs: [
             (s) => [s.changeRequest],
-            (changeRequest): Breadcrumb[] => [
+            (changeRequest: ChangeRequest | null): Breadcrumb[] => [
                 {
                     key: Scene.Settings,
                     name: 'Approvals',
diff --git a/frontend/src/scenes/approvals/approvalsLogic.tsx b/frontend/src/scenes/approvals/approvalsLogic.tsx
index f60aff865b04..6fd0113b6555 100644
--- a/frontend/src/scenes/approvals/approvalsLogic.tsx
+++ b/frontend/src/scenes/approvals/approvalsLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -9,8 +9,6 @@ import { userLogic } from 'scenes/userLogic'
 
 import { AvailableFeature, ChangeRequest, ChangeRequestState } from '~/types'
 
-import type { approvalsLogicType } from './approvalsLogicType'
-
 export interface ApprovalsFilters {
     state?: ChangeRequestState
     action_key?: string
@@ -43,6 +41,79 @@ function mergeChangeRequestsData(
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface approvalsLogicValues {
+    currentTeamId: number | null // teamLogic
+    hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean // userLogic
+    changeRequests: ChangeRequest[]
+    changeRequestsCount: number
+    changeRequestsData: ApprovalDataState
+    changeRequestsDataLoading: boolean
+    filters: ApprovalsFilters
+    hasMore: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface approvalsLogicActions {
+    approveChangeRequest: (
+        id: string,
+        reason?: string
+    ) => {
+        id: string
+        reason: string | undefined
+    }
+    loadChangeRequests: (url?: string) => {
+        url: string | undefined
+    }
+    loadChangeRequestsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadChangeRequestsSuccess: (
+        changeRequestsData: ApprovalDataState,
+        payload?: {
+            url: string | undefined
+        }
+    ) => {
+        changeRequestsData: ApprovalDataState
+        payload?: {
+            url: string | undefined
+        }
+    }
+    loadMore: () => {
+        value: true
+    }
+    rejectChangeRequest: (
+        id: string,
+        reason: string
+    ) => {
+        id: string
+        reason: string
+    }
+    setFilters: (filters: Partial<ApprovalsFilters>) => {
+        filters: Partial<ApprovalsFilters>
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface approvalsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        changeRequests: (changeRequestsData: ApprovalDataState) => ChangeRequest[]
+        changeRequestsCount: (changeRequestsData: ApprovalDataState) => number
+        hasMore: (changeRequests: ChangeRequest[], changeRequestsCount: number) => boolean
+    }
+}
+
+export type approvalsLogicType = MakeLogicType<
+    approvalsLogicValues,
+    approvalsLogicActions,
+    Record<string, any>,
+    approvalsLogicMeta
+>
+
 export const approvalsLogic = kea<approvalsLogicType>([
     path(['scenes', 'approvals', 'approvalsLogic']),
     connect(() => ({
@@ -95,15 +166,15 @@ export const approvalsLogic = kea<approvalsLogicType>([
     selectors({
         changeRequests: [
             (s) => [s.changeRequestsData],
-            (changeRequestsData): ChangeRequest[] => changeRequestsData.changeRequests,
+            (changeRequestsData: ApprovalDataState): ChangeRequest[] => changeRequestsData.changeRequests,
         ],
         changeRequestsCount: [
             (s) => [s.changeRequestsData],
-            (changeRequestsData): number => changeRequestsData.changeRequestsCount,
+            (changeRequestsData: ApprovalDataState): number => changeRequestsData.changeRequestsCount,
         ],
         hasMore: [
             (s) => [s.changeRequests, s.changeRequestsCount],
-            (changeRequests, changeRequestsCount): boolean => {
+            (changeRequests: ChangeRequest[], changeRequestsCount: number): boolean => {
                 return changeRequests.length < changeRequestsCount
             },
         ],
diff --git a/frontend/src/scenes/approvals/changeRequestsLogic.ts b/frontend/src/scenes/approvals/changeRequestsLogic.ts
index adf0ab8a94fa..45d34baa67af 100644
--- a/frontend/src/scenes/approvals/changeRequestsLogic.ts
+++ b/frontend/src/scenes/approvals/changeRequestsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -10,7 +10,6 @@ import { userLogic } from 'scenes/userLogic'
 
 import { AvailableFeature, ChangeRequest, ChangeRequestState } from '~/types'
 
-import type { changeRequestsLogicType } from './changeRequestsLogicType'
 import type { ApprovalContext, ChangeRequestCreatedEventDetail } from './utils'
 
 export interface ChangeRequestsLogicProps {
@@ -41,6 +40,76 @@ export function getChangeRequestButtonVisibility(changeRequest: ChangeRequest):
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface changeRequestsLogicValues {
+    currentTeamId: number | null // teamLogic
+    hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean // userLogic
+    buttonVisibility: ChangeRequestButtonVisibility | null
+    changeRequests: ChangeRequest[]
+    changeRequestsLoading: boolean
+    pendingChangeRequest: ChangeRequest | null
+    shouldShowBanner: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface changeRequestsLogicActions {
+    approveRequest: (id: string) => {
+        id: string
+    }
+    cancelRequest: (
+        id: string,
+        reason?: string
+    ) => {
+        id: string
+        reason: string | undefined
+    }
+    loadChangeRequests: () => {
+        value: true
+    }
+    loadChangeRequestsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadChangeRequestsSuccess: (
+        changeRequests: ChangeRequest[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        changeRequests: ChangeRequest[]
+        payload?: {
+            value: true
+        }
+    }
+    rejectRequest: (
+        id: string,
+        reason?: string
+    ) => {
+        id: string
+        reason: string | undefined
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface changeRequestsLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        pendingChangeRequest: (changeRequests: ChangeRequest[]) => ChangeRequest | null
+        shouldShowBanner: (pendingChangeRequest: ChangeRequest | null) => boolean
+        buttonVisibility: (pendingChangeRequest: ChangeRequest | null) => ChangeRequestButtonVisibility | null
+    }
+}
+
+export type changeRequestsLogicType = MakeLogicType<
+    changeRequestsLogicValues,
+    changeRequestsLogicActions,
+    ChangeRequestsLogicProps,
+    changeRequestsLogicMeta
+>
+
 export const changeRequestsLogic = kea<changeRequestsLogicType>([
     path(['scenes', 'approvals', 'changeRequestsLogic']),
     props({} as ChangeRequestsLogicProps),
@@ -88,7 +157,7 @@ export const changeRequestsLogic = kea<changeRequestsLogicType>([
     selectors({
         pendingChangeRequest: [
             (s) => [s.changeRequests],
-            (changeRequests): ChangeRequest | null => {
+            (changeRequests: ChangeRequest[]): ChangeRequest | null => {
                 const pending = changeRequests.filter(
                     (cr) => cr.state === ChangeRequestState.Pending || cr.state === ChangeRequestState.Approved
                 )
@@ -98,14 +167,14 @@ export const changeRequestsLogic = kea<changeRequestsLogicType>([
 
         shouldShowBanner: [
             (s) => [s.pendingChangeRequest],
-            (pendingChangeRequest): boolean => {
+            (pendingChangeRequest: ChangeRequest | null): boolean => {
                 return pendingChangeRequest !== null
             },
         ],
 
         buttonVisibility: [
             (s) => [s.pendingChangeRequest],
-            (pendingChangeRequest): ChangeRequestButtonVisibility | null => {
+            (pendingChangeRequest: ChangeRequest | null): ChangeRequestButtonVisibility | null => {
                 if (!pendingChangeRequest) {
                     return null
                 }
diff --git a/frontend/src/scenes/approvals/pendingApprovalsLogic.ts b/frontend/src/scenes/approvals/pendingApprovalsLogic.ts
index 6d17367bf7af..e2e9a3607961 100644
--- a/frontend/src/scenes/approvals/pendingApprovalsLogic.ts
+++ b/frontend/src/scenes/approvals/pendingApprovalsLogic.ts
@@ -1,4 +1,4 @@
-import { afterMount, connect, kea, path, selectors } from 'kea'
+import { MakeLogicType, afterMount, connect, kea, path, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -8,7 +8,51 @@ import { userLogic } from 'scenes/userLogic'
 
 import { AvailableFeature, ChangeRequest, ChangeRequestState } from '~/types'
 
-import type { pendingApprovalsLogicType } from './pendingApprovalsLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface pendingApprovalsLogicValues {
+    currentTeamId: number | null // teamLogic
+    hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean // userLogic
+    actionableChangeRequests: ChangeRequest[]
+    actionableCount: number
+    unresolvedChangeRequests: ChangeRequest[]
+    unresolvedChangeRequestsLoading: boolean
+    unresolvedCount: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface pendingApprovalsLogicActions {
+    loadUnresolvedChangeRequests: () => any
+    loadUnresolvedChangeRequestsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadUnresolvedChangeRequestsSuccess: (
+        unresolvedChangeRequests: ChangeRequest[],
+        payload?: any
+    ) => {
+        unresolvedChangeRequests: ChangeRequest[]
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface pendingApprovalsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        actionableChangeRequests: (unresolvedChangeRequests: ChangeRequest[]) => ChangeRequest[]
+        actionableCount: (actionableChangeRequests: ChangeRequest[]) => number
+        unresolvedCount: (unresolvedChangeRequests: ChangeRequest[]) => number
+    }
+}
+
+export type pendingApprovalsLogicType = MakeLogicType<
+    pendingApprovalsLogicValues,
+    pendingApprovalsLogicActions,
+    Record<string, any>,
+    pendingApprovalsLogicMeta
+>
 
 export const pendingApprovalsLogic = kea<pendingApprovalsLogicType>([
     path(['scenes', 'approvals', 'pendingApprovalsLogic']),
@@ -39,13 +83,19 @@ export const pendingApprovalsLogic = kea<pendingApprovalsLogicType>([
     selectors({
         actionableChangeRequests: [
             (s) => [s.unresolvedChangeRequests],
-            (changeRequests): ChangeRequest[] =>
+            (changeRequests: ChangeRequest[]): ChangeRequest[] =>
                 changeRequests.filter(
                     (cr) => cr.state === ChangeRequestState.Pending && cr.can_approve && !cr.user_decision
                 ),
         ],
-        actionableCount: [(s) => [s.actionableChangeRequests], (actionable): number => actionable.length],
-        unresolvedCount: [(s) => [s.unresolvedChangeRequests], (unresolved): number => unresolved.length],
+        actionableCount: [
+            (s) => [s.actionableChangeRequests],
+            (actionable: ChangeRequest[]): number => actionable.length,
+        ],
+        unresolvedCount: [
+            (s) => [s.unresolvedChangeRequests],
+            (unresolved: ChangeRequest[]): number => unresolved.length,
+        ],
     }),
 
     afterMount(({ actions }) => {
diff --git a/frontend/src/scenes/audit-logs/advancedActivityLogsLogic.tsx b/frontend/src/scenes/audit-logs/advancedActivityLogsLogic.tsx
index 022c0d2e5ef9..84223041e478 100644
--- a/frontend/src/scenes/audit-logs/advancedActivityLogsLogic.tsx
+++ b/frontend/src/scenes/audit-logs/advancedActivityLogsLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 
@@ -16,8 +16,9 @@ import { teamLogic } from 'scenes/teamLogic'
 
 import { ActivityScope, OrganizationType, TeamBasicType } from '~/types'
 
+import type { FeatureFlagsSet } from '../../lib/logic/featureFlagLogic'
+import type { AvailableFeature } from '../../types'
 import { userLogic } from '../userLogic'
-import type { advancedActivityLogsLogicType } from './advancedActivityLogsLogicType'
 
 export type ActivityLogsView = 'project' | 'organization'
 
@@ -140,6 +141,189 @@ function parseBooleanSearchParam(raw: unknown): boolean | undefined {
     return undefined
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface advancedActivityLogsLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    currentOrganization: OrganizationType | null // organizationLogic
+    currentOrganizationId: string // organizationLogic
+    currentProjectId: number | string // teamLogic
+    currentTeamIdStrict: number | string // teamLogic
+    hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean // userLogic
+    activeAdvancedFiltersCount: number
+    activeFilters: ActiveDetailFilter[]
+    activeTab: 'exports' | 'logs'
+    advancedActivityLogs: CountedPaginatedResponse<ActivityLogItem>
+    advancedActivityLogsBaseUrl: string
+    advancedActivityLogsLoading: boolean
+    availableFilters: AvailableFilters | null
+    availableFiltersLoading: boolean
+    canViewOrganization: boolean
+    exports: ExportedAsset[]
+    exportsLoading: boolean
+    filters: AdvancedActivityLogFilters
+    hasActiveFilters: boolean
+    isOrganizationView: boolean
+    pagination: PaginationManual
+    showMoreFilters: boolean
+    teamsById: Record<number, string>
+    urlSearchParams: {
+        activities: string | undefined
+        clients: string | undefined
+        detail_filters: string | undefined
+        end_date: string | undefined
+        ip_addresses: string | undefined
+        is_system: string | undefined
+        item_ids: string | undefined
+        page: number | undefined
+        scopes: string | undefined
+        start_date: string | undefined
+        team_ids: string | undefined
+        users: string | undefined
+        view: string | undefined
+        was_impersonated: string | undefined
+    }
+    view: ActivityLogsView
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface advancedActivityLogsLogicActions {
+    addActiveFilter: (
+        fieldPath: string,
+        isCustom?: boolean
+    ) => {
+        fieldPath: string
+        isCustom: boolean
+    }
+    clearAllFilters: () => {
+        value: true
+    }
+    exportLogs: (format: 'csv' | 'xlsx') => {
+        format: 'csv' | 'xlsx'
+    }
+    loadAdvancedActivityLogs: (_: any) => any
+    loadAdvancedActivityLogsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAdvancedActivityLogsSuccess: (
+        advancedActivityLogs: CountedPaginatedResponse<ActivityLogItem>,
+        payload?: any
+    ) => {
+        advancedActivityLogs: CountedPaginatedResponse<ActivityLogItem>
+        payload?: any
+    }
+    loadAvailableFilters: () => any
+    loadAvailableFiltersFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAvailableFiltersSuccess: (
+        availableFilters: AvailableFilters | null,
+        payload?: any
+    ) => {
+        availableFilters: AvailableFilters | null
+        payload?: any
+    }
+    loadExports: () => any
+    loadExportsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadExportsSuccess: (
+        exports: ExportedAsset[],
+        payload?: any
+    ) => {
+        exports: ExportedAsset[]
+        payload?: any
+    }
+    removeActiveFilter: (key: string) => {
+        key: string
+    }
+    setActiveFilters: (activeFilters: ActiveDetailFilter[]) => {
+        activeFilters: ActiveDetailFilter[]
+    }
+    setActiveTab: (tab: 'exports' | 'logs') => {
+        tab: 'exports' | 'logs'
+    }
+    setFilters: (filters: Partial<AdvancedActivityLogFilters>) => {
+        filters: Partial<AdvancedActivityLogFilters>
+    }
+    setPage: (page: number) => {
+        page: number
+    }
+    setShowMoreFilters: (show: boolean) => {
+        show: boolean
+    }
+    setView: (view: ActivityLogsView) => {
+        view: ActivityLogsView
+    }
+    syncFiltersToAPI: () => {
+        value: true
+    }
+    updateActiveFilter: (
+        key: string,
+        updates: Partial<ActiveDetailFilter>
+    ) => {
+        key: string
+        updates: Partial<ActiveDetailFilter>
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface advancedActivityLogsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        isOrganizationView: (view: ActivityLogsView) => boolean
+        advancedActivityLogsBaseUrl: (
+            isOrganizationView: boolean,
+            currentProjectId: number | string,
+            currentOrganizationId: string
+        ) => string
+        canViewOrganization: (currentOrganization: OrganizationType | null) => boolean
+        teamsById: (currentOrganization: OrganizationType | null) => Record<number, string>
+        hasActiveFilters: (filters: AdvancedActivityLogFilters, isOrganizationView: boolean) => boolean
+        pagination: (
+            filters: AdvancedActivityLogFilters,
+            advancedActivityLogs: CountedPaginatedResponse<ActivityLogItem>
+        ) => PaginationManual
+        activeAdvancedFiltersCount: (filters: AdvancedActivityLogFilters) => number
+        urlSearchParams: (
+            filters: AdvancedActivityLogFilters,
+            isOrganizationView: boolean
+        ) => {
+            activities: string | undefined
+            clients: string | undefined
+            detail_filters: string | undefined
+            end_date: string | undefined
+            ip_addresses: string | undefined
+            is_system: string | undefined
+            item_ids: string | undefined
+            page: number | undefined
+            scopes: string | undefined
+            start_date: string | undefined
+            team_ids: string | undefined
+            users: string | undefined
+            view: string | undefined
+            was_impersonated: string | undefined
+        }
+    }
+}
+
+export type advancedActivityLogsLogicType = MakeLogicType<
+    advancedActivityLogsLogicValues,
+    advancedActivityLogsLogicActions,
+    Record<string, any>,
+    advancedActivityLogsLogicMeta
+>
+
 export const advancedActivityLogsLogic = kea<advancedActivityLogsLogicType>([
     path(['scenes', 'audit-logs', 'advancedActivityLogsLogic']),
     connect(() => ({
@@ -360,7 +544,10 @@ export const advancedActivityLogsLogic = kea<advancedActivityLogsLogicType>([
 
         pagination: [
             (s) => [s.filters, s.advancedActivityLogs],
-            (filters: AdvancedActivityLogFilters, advancedActivityLogs): PaginationManual => ({
+            (
+                filters: AdvancedActivityLogFilters,
+                advancedActivityLogs: CountedPaginatedResponse<ActivityLogItem>
+            ): PaginationManual => ({
                 controlled: true,
                 pageSize: ADVANCED_ACTIVITY_PAGE_SIZE,
                 currentPage: filters.page || 1,
diff --git a/frontend/src/scenes/authentication/account/credential-review/credentialReviewLogic.ts b/frontend/src/scenes/authentication/account/credential-review/credentialReviewLogic.ts
index 5073ef75bc65..5bcade0ce60d 100644
--- a/frontend/src/scenes/authentication/account/credential-review/credentialReviewLogic.ts
+++ b/frontend/src/scenes/authentication/account/credential-review/credentialReviewLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path } from 'kea'
 import { router } from 'kea-router'
 
 import api from 'lib/api'
@@ -8,7 +8,18 @@ import { personalAPIKeysLogic } from 'scenes/settings/user/personalAPIKeysLogic'
 import { urls } from 'scenes/urls'
 import { userLogic } from 'scenes/userLogic'
 
-import type { credentialReviewLogicType } from './credentialReviewLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface credentialReviewLogicActions {
+    loadPasskeys: () => any // passkeySettingsLogic
+    loadKeys: () => {
+        value: true
+    } // personalAPIKeysLogic
+    markComplete: () => {
+        value: true
+    }
+}
+
+export type credentialReviewLogicType = MakeLogicType<{}, credentialReviewLogicActions>
 
 export const credentialReviewLogic = kea<credentialReviewLogicType>([
     path(['scenes', 'authentication', 'account', 'credential-review', 'credentialReviewLogic']),
diff --git a/frontend/src/scenes/authentication/cli/cliAuthorizeLogic.ts b/frontend/src/scenes/authentication/cli/cliAuthorizeLogic.ts
index 029c7c083b42..164f0273addf 100644
--- a/frontend/src/scenes/authentication/cli/cliAuthorizeLogic.ts
+++ b/frontend/src/scenes/authentication/cli/cliAuthorizeLogic.ts
@@ -1,5 +1,6 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { urlToAction } from 'kea-router'
 
@@ -9,7 +10,7 @@ import { userLogic } from 'scenes/userLogic'
 
 import { OrganizationBasicType } from '~/types'
 
-import type { cliAuthorizeLogicType } from './cliAuthorizeLogicType'
+import type { UserType } from '../../../types'
 
 export type CLIUseCase = 'schema' | 'error_tracking' | 'endpoints' | 'agent-cli'
 
@@ -93,6 +94,157 @@ function parseCLIUseCase(useCase: string): CLIUseCase | null {
     return null
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface cliAuthorizeLogicValues {
+    user: UserType | null // userLogic
+    allAccessSelected: boolean
+    authorize: CLIAuthorizeForm
+    authorizeAllErrors: Record<string, any>
+    authorizeChanged: boolean
+    authorizeErrors: DeepPartialMap<CLIAuthorizeForm, ValidationErrorType>
+    authorizeHasErrors: boolean
+    authorizeManualErrors: Record<string, any>
+    authorizeTouched: boolean
+    authorizeTouches: Record<string, boolean>
+    authorizeValidationErrors: DeepPartialMap<CLIAuthorizeForm, ValidationErrorType>
+    filteredScopes: APIScope[]
+    formScopeRadioValues: Record<string, string>
+    isAuthorizeSubmitting: boolean
+    isAuthorizeValid: boolean
+    isSuccess: boolean
+    missingAgentScopes: boolean
+    missingEndpointsScopes: boolean
+    missingErrorTrackingScopes: boolean
+    missingSchemaScopes: boolean
+    organizations: OrganizationBasicType[]
+    projects: {
+        id: number
+        name: string
+    }[]
+    projectsLoading: boolean
+    requestedUseCases: CLIUseCase[]
+    scopePreset: string | null
+    searchTerm: string
+    showAuthorizeErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface cliAuthorizeLogicActions {
+    loadUserSuccess: (
+        user: UserType | null,
+        payload?:
+            | {
+                  resetOnFailure: boolean | undefined
+              }
+            | undefined
+    ) => {
+        payload?: {
+            resetOnFailure: boolean | undefined
+        }
+        user: UserType | null
+    } // userLogic
+    loadProjects: (organizationId: string) => string
+    loadProjectsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadProjectsSuccess: (
+        projects: {
+            id: number
+            name: string
+        }[],
+        payload?: string
+    ) => {
+        projects: {
+            id: number
+            name: string
+        }[]
+        payload?: string
+    }
+    resetAuthorize: (values?: CLIAuthorizeForm) => {
+        values?: CLIAuthorizeForm
+    }
+    resetScopes: () => {
+        value: true
+    }
+    setAuthorizeManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setAuthorizeValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setAuthorizeValues: (values: DeepPartial<CLIAuthorizeForm>) => {
+        values: DeepPartial<CLIAuthorizeForm>
+    }
+    setRequestedUseCases: (useCases: CLIUseCase[]) => {
+        useCases: CLIUseCase[]
+    }
+    setScopePreset: (preset: string | null) => {
+        preset: string | null
+    }
+    setScopeRadioValue: (
+        key: string,
+        action: string
+    ) => {
+        action: string
+        key: string
+    }
+    setSearchTerm: (searchTerm: string) => {
+        searchTerm: string
+    }
+    setSuccess: (success: boolean) => {
+        success: boolean
+    }
+    submitAuthorize: () => {
+        value: boolean
+    }
+    submitAuthorizeFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitAuthorizeRequest: (authorize: CLIAuthorizeForm) => {
+        authorize: CLIAuthorizeForm
+    }
+    submitAuthorizeSuccess: (authorize: CLIAuthorizeForm) => {
+        authorize: CLIAuthorizeForm
+    }
+    touchAuthorizeField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface cliAuthorizeLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        organizations: (user: UserType | null) => OrganizationBasicType[]
+        formScopeRadioValues: (authorize: CLIAuthorizeForm) => Record<string, string>
+        filteredScopes: (searchTerm: string) => APIScope[]
+        allAccessSelected: (authorize: CLIAuthorizeForm) => boolean
+        scopePreset: (authorize: CLIAuthorizeForm) => string | null
+        missingSchemaScopes: (authorize: CLIAuthorizeForm, requestedUseCases: CLIUseCase[]) => boolean
+        missingErrorTrackingScopes: (authorize: CLIAuthorizeForm, requestedUseCases: CLIUseCase[]) => boolean
+        missingEndpointsScopes: (authorize: CLIAuthorizeForm, requestedUseCases: CLIUseCase[]) => boolean
+        missingAgentScopes: (authorize: CLIAuthorizeForm, requestedUseCases: CLIUseCase[]) => boolean
+    }
+}
+
+export type cliAuthorizeLogicType = MakeLogicType<
+    cliAuthorizeLogicValues,
+    cliAuthorizeLogicActions,
+    Record<string, any>,
+    cliAuthorizeLogicMeta
+>
+
 export const cliAuthorizeLogic = kea<cliAuthorizeLogicType>([
     path(['scenes', 'authentication', 'cli', 'cliAuthorizeLogic']),
     connect(() => ({
@@ -189,10 +341,13 @@ export const cliAuthorizeLogic = kea<cliAuthorizeLogicType>([
         },
     })),
     selectors(() => ({
-        organizations: [(s) => [s.user], (user): OrganizationBasicType[] => user?.organizations ?? []],
+        organizations: [
+            (s) => [s.user],
+            (user: null | import('~/types').UserType): OrganizationBasicType[] => user?.organizations ?? [],
+        ],
         formScopeRadioValues: [
             (s) => [s.authorize],
-            (authorize): Record<string, string> => {
+            (authorize: CLIAuthorizeForm): Record<string, string> => {
                 if (!authorize || !authorize.scopes) {
                     return {}
                 }
@@ -201,7 +356,7 @@ export const cliAuthorizeLogic = kea<cliAuthorizeLogicType>([
         ],
         filteredScopes: [
             (s) => [s.searchTerm],
-            (searchTerm): APIScope[] => {
+            (searchTerm: string): APIScope[] => {
                 const search = searchTerm.trim().toLowerCase()
                 if (!search) {
                     return API_SCOPES
@@ -212,11 +367,17 @@ export const cliAuthorizeLogic = kea<cliAuthorizeLogicType>([
                 )
             },
         ],
-        allAccessSelected: [(s) => [s.authorize], (authorize): boolean => !!authorize?.scopes?.includes('*')],
-        scopePreset: [(s) => [s.authorize], (authorize): string | null => presetForScopes(authorize?.scopes ?? [])],
+        allAccessSelected: [
+            (s) => [s.authorize],
+            (authorize: CLIAuthorizeForm): boolean => !!authorize?.scopes?.includes('*'),
+        ],
+        scopePreset: [
+            (s) => [s.authorize],
+            (authorize: CLIAuthorizeForm): string | null => presetForScopes(authorize?.scopes ?? []),
+        ],
         missingSchemaScopes: [
             (s) => [s.authorize, s.requestedUseCases],
-            (authorize, requestedUseCases): boolean => {
+            (authorize: CLIAuthorizeForm, requestedUseCases: CLIUseCase[]): boolean => {
                 // Only show warning if schema use case was requested
                 if (!requestedUseCases.includes('schema')) {
                     return false
@@ -237,7 +398,7 @@ export const cliAuthorizeLogic = kea<cliAuthorizeLogicType>([
         ],
         missingErrorTrackingScopes: [
             (s) => [s.authorize, s.requestedUseCases],
-            (authorize, requestedUseCases): boolean => {
+            (authorize: CLIAuthorizeForm, requestedUseCases: CLIUseCase[]): boolean => {
                 // Only show warning if error_tracking use case was requested
                 if (!requestedUseCases.includes('error_tracking')) {
                     return false
@@ -255,7 +416,7 @@ export const cliAuthorizeLogic = kea<cliAuthorizeLogicType>([
         ],
         missingEndpointsScopes: [
             (s) => [s.authorize, s.requestedUseCases],
-            (authorize, requestedUseCases): boolean => {
+            (authorize: CLIAuthorizeForm, requestedUseCases: CLIUseCase[]): boolean => {
                 // Only show warning if endpoints use case was requested
                 if (!requestedUseCases.includes('endpoints')) {
                     return false
@@ -270,7 +431,7 @@ export const cliAuthorizeLogic = kea<cliAuthorizeLogicType>([
         ],
         missingAgentScopes: [
             (s) => [s.authorize, s.requestedUseCases],
-            (authorize, requestedUseCases): boolean => {
+            (authorize: CLIAuthorizeForm, requestedUseCases: CLIUseCase[]): boolean => {
                 // Only show warning if the agent-cli use case was requested
                 if (!requestedUseCases.includes('agent-cli')) {
                     return false
diff --git a/frontend/src/scenes/authentication/cli/cliLiveLogic.ts b/frontend/src/scenes/authentication/cli/cliLiveLogic.ts
index fe4056cabba0..a34e8d5711a3 100644
--- a/frontend/src/scenes/authentication/cli/cliLiveLogic.ts
+++ b/frontend/src/scenes/authentication/cli/cliLiveLogic.ts
@@ -1,10 +1,60 @@
-import { actions, afterMount, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, listeners, path, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 import { urlToAction } from 'kea-router'
 
 import api from 'lib/api'
 
-import type { cliLiveLogicType } from './cliLiveLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface cliLiveLogicValues {
+    error: string
+    port: string
+    projects: {
+        id: number
+        name: string
+    }[]
+    projectsLoading: boolean
+    redirected: boolean
+    selectedProjectId: number | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface cliLiveLogicActions {
+    loadProjects: () => any
+    loadProjectsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadProjectsSuccess: (
+        projects: {
+            id: number
+            name: string
+        }[],
+        payload?: any
+    ) => {
+        projects: {
+            id: number
+            name: string
+        }[]
+        payload?: any
+    }
+    selectProject: (projectId: number) => {
+        projectId: number
+    }
+    setError: (error: string) => {
+        error: string
+    }
+    setPort: (port: string) => {
+        port: string
+    }
+    setRedirected: (redirected: boolean) => {
+        redirected: boolean
+    }
+}
+
+export type cliLiveLogicType = MakeLogicType<cliLiveLogicValues, cliLiveLogicActions>
 
 export const cliLiveLogic = kea<cliLiveLogicType>([
     path(['scenes', 'authentication', 'cli', 'cliLiveLogic']),
diff --git a/frontend/src/scenes/authentication/invite-signup/inviteSignupLogic.ts b/frontend/src/scenes/authentication/invite-signup/inviteSignupLogic.ts
index afd2f19ba8f8..a2139cb0eb59 100644
--- a/frontend/src/scenes/authentication/invite-signup/inviteSignupLogic.ts
+++ b/frontend/src/scenes/authentication/invite-signup/inviteSignupLogic.ts
@@ -1,6 +1,7 @@
 import { startRegistration } from '@simplewebauthn/browser'
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { urlToAction } from 'kea-router'
 import posthog from 'posthog-js'
@@ -14,7 +15,7 @@ import type { RegistrationBeginResponse } from 'scenes/settings/user/passkeySett
 
 import { PrevalidatedInvite } from '~/types'
 
-import type { inviteSignupLogicType } from './inviteSignupLogicType'
+import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
 
 export enum ErrorCodes {
     InvalidInvite = 'invalid_invite',
@@ -34,6 +35,151 @@ export interface AcceptInvitePayloadInterface {
     role_at_organization?: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface inviteSignupLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    acceptedInvite: null
+    acceptedInviteLoading: boolean
+    challengeNonce: string | null
+    challengeRequired: boolean
+    error: ErrorInterface | null
+    invite: PrevalidatedInvite | null
+    inviteLoading: boolean
+    isPasskeyRegistering: boolean
+    isSignupSubmitting: boolean
+    isSignupValid: boolean
+    passkeyError: string | null
+    passkeyRegistered: boolean
+    passkeySignupEnabled: boolean
+    showSignupErrors: boolean
+    signup: AcceptInvitePayloadInterface
+    signupAllErrors: Record<string, any>
+    signupChanged: boolean
+    signupErrors: DeepPartialMap<AcceptInvitePayloadInterface, ValidationErrorType>
+    signupHasErrors: boolean
+    signupManualErrors: Record<string, any>
+    signupTouched: boolean
+    signupTouches: Record<string, boolean>
+    signupValidationErrors: DeepPartialMap<AcceptInvitePayloadInterface, ValidationErrorType>
+    turnstileSiteKey: string | null
+    turnstileToken: string | null
+    validatedPassword: ValidatedPasswordResult
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface inviteSignupLogicActions {
+    acceptInvite: () => any
+    acceptInviteFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    acceptInviteSuccess: (
+        acceptedInvite: Promise<null> | null,
+        payload?: any
+    ) => {
+        acceptedInvite: Promise<null> | null
+        payload?: any
+    }
+    prevalidateInvite: (id: string) => string
+    prevalidateInviteFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    prevalidateInviteSuccess: (
+        invite: PrevalidatedInvite | null,
+        payload?: string
+    ) => {
+        invite: PrevalidatedInvite | null
+        payload?: string
+    }
+    registerPasskey: () => {
+        value: true
+    }
+    resetChallenge: () => {
+        value: true
+    }
+    resetSignup: (values?: AcceptInvitePayloadInterface) => {
+        values?: AcceptInvitePayloadInterface
+    }
+    setChallengeNonce: (nonce: string | null) => {
+        nonce: string | null
+    }
+    setChallengeRequired: (required: boolean) => {
+        required: boolean
+    }
+    setError: (payload: ErrorInterface) => {
+        payload: ErrorInterface
+    }
+    setPasskeyError: (error: string | null) => {
+        error: string | null
+    }
+    setPasskeyRegistered: (registered: boolean) => {
+        registered: boolean
+    }
+    setPasskeyRegistering: (registering: boolean) => {
+        registering: boolean
+    }
+    setSignupManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setSignupValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setSignupValues: (values: DeepPartial<AcceptInvitePayloadInterface>) => {
+        values: DeepPartial<AcceptInvitePayloadInterface>
+    }
+    setTurnstileSiteKey: (siteKey: string | null) => {
+        siteKey: string | null
+    }
+    setTurnstileToken: (token: string | null) => {
+        token: string | null
+    }
+    submitSignup: () => {
+        value: boolean
+    }
+    submitSignupFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitSignupRequest: (signup: AcceptInvitePayloadInterface) => {
+        signup: AcceptInvitePayloadInterface
+    }
+    submitSignupSuccess: (signup: AcceptInvitePayloadInterface) => {
+        signup: AcceptInvitePayloadInterface
+    }
+    touchSignupField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface inviteSignupLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        validatedPassword: (signup: AcceptInvitePayloadInterface) => ValidatedPasswordResult
+        passkeySignupEnabled: (featureFlags: FeatureFlagsSet) => boolean
+    }
+}
+
+export type inviteSignupLogicType = MakeLogicType<
+    inviteSignupLogicValues,
+    inviteSignupLogicActions,
+    Record<string, any>,
+    inviteSignupLogicMeta
+>
+
 export const inviteSignupLogic = kea<inviteSignupLogicType>([
     path(['scenes', 'authentication', 'invite-signup', 'inviteSignupLogic']),
     connect(() => ({
@@ -229,7 +375,7 @@ export const inviteSignupLogic = kea<inviteSignupLogicType>([
         ],
         passkeySignupEnabled: [
             (s) => [s.featureFlags],
-            (featureFlags): boolean => {
+            (featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet): boolean => {
                 return !!featureFlags[FEATURE_FLAGS.PASSKEY_SIGNUP_ENABLED]
             },
         ],
diff --git a/frontend/src/scenes/authentication/login-2fa/login2FALogic.ts b/frontend/src/scenes/authentication/login-2fa/login2FALogic.ts
index e3bd5dcb3b8b..0711da55049f 100644
--- a/frontend/src/scenes/authentication/login-2fa/login2FALogic.ts
+++ b/frontend/src/scenes/authentication/login-2fa/login2FALogic.ts
@@ -1,6 +1,7 @@
 import { type PublicKeyCredentialRequestOptionsJSON, startAuthentication } from '@simplewebauthn/browser'
-import { actions, afterMount, connect, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 
 import api, { ApiError } from 'lib/api'
@@ -9,7 +10,8 @@ import { handleLoginRedirect } from 'scenes/authentication/login/loginLogic'
 import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
 import { getPasskeyErrorMessage, isWebAuthnCancellation } from 'scenes/settings/user/passkeys/utils'
 
-import type { login2FALogicType } from './login2FALogicType'
+import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
+import type { PreflightStatus } from '../../../types'
 
 export interface AuthenticateResponseType {
     success: boolean
@@ -35,6 +37,136 @@ export interface LoginTokenResponse {
     success: boolean
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface login2FALogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    preflight: PreflightStatus | null // preflightLogic
+    generalError: {
+        code: string
+        detail: string
+    } | null
+    isTwofactortokenSubmitting: boolean
+    isTwofactortokenValid: boolean
+    passkey2FA: null
+    passkey2FALoading: boolean
+    passkey2FAWasCancelled: boolean
+    passkeysAvailable: boolean
+    passkeysAvailableLoading: boolean
+    showTwofactortokenErrors: boolean
+    totpAvailable: boolean
+    twofactortoken: TwoFactorForm
+    twofactortokenAllErrors: Record<string, any>
+    twofactortokenChanged: boolean
+    twofactortokenErrors: DeepPartialMap<TwoFactorForm, ValidationErrorType>
+    twofactortokenHasErrors: boolean
+    twofactortokenManualErrors: Record<string, any>
+    twofactortokenTouched: boolean
+    twofactortokenTouches: Record<string, boolean>
+    twofactortokenValidationErrors: DeepPartialMap<TwoFactorForm, ValidationErrorType>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface login2FALogicActions {
+    beginPasskey2FA: () => {
+        value: true
+    }
+    beginPasskey2FAFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    beginPasskey2FASuccess: (
+        passkey2FA: null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        passkey2FA: null
+        payload?: {
+            value: true
+        }
+    }
+    checkPasskeysAvailable: () => {
+        value: true
+    }
+    checkPasskeysAvailableFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    checkPasskeysAvailableSuccess: (
+        passkeysAvailable: boolean,
+        payload?: {
+            value: true
+        }
+    ) => {
+        passkeysAvailable: boolean
+        payload?: {
+            value: true
+        }
+    }
+    clearGeneralError: () => {
+        value: true
+    }
+    passkey2FACancelled: () => {
+        value: true
+    }
+    resetTwofactortoken: (values?: TwoFactorForm) => {
+        values?: TwoFactorForm
+    }
+    setGeneralError: (
+        code: string,
+        detail: string
+    ) => {
+        code: string
+        detail: string
+    }
+    setLoginStep: (step: LoginStep) => {
+        step: LoginStep
+    }
+    setTotpAvailable: (available: boolean) => {
+        available: boolean
+    }
+    setTwofactortokenManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setTwofactortokenValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setTwofactortokenValues: (values: DeepPartial<TwoFactorForm>) => {
+        values: DeepPartial<TwoFactorForm>
+    }
+    submitTwofactortoken: () => {
+        value: boolean
+    }
+    submitTwofactortokenFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitTwofactortokenRequest: (twofactortoken: TwoFactorForm) => {
+        twofactortoken: TwoFactorForm
+    }
+    submitTwofactortokenSuccess: (twofactortoken: TwoFactorForm) => {
+        twofactortoken: TwoFactorForm
+    }
+    touchTwofactortokenField: (key: string) => {
+        key: string
+    }
+}
+
+export type login2FALogicType = MakeLogicType<login2FALogicValues, login2FALogicActions>
+
 export const login2FALogic = kea<login2FALogicType>([
     path(['scenes', 'authentication', 'login-2fa', 'login2FALogic']),
     connect(() => ({
diff --git a/frontend/src/scenes/authentication/login/loginLogic.ts b/frontend/src/scenes/authentication/login/loginLogic.ts
index 3d25d95b58c9..0852de05bf0e 100644
--- a/frontend/src/scenes/authentication/login/loginLogic.ts
+++ b/frontend/src/scenes/authentication/login/loginLogic.ts
@@ -1,6 +1,7 @@
 import type { PublicKeyCredentialDescriptorJSON } from '@simplewebauthn/browser'
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { encodeParams, urlToAction } from 'kea-router'
 import { router } from 'kea-router'
@@ -17,7 +18,9 @@ import { urls } from 'scenes/urls'
 
 import { SSOProvider } from '~/types'
 
-import type { loginLogicType } from './loginLogicType'
+import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
+import type { PreflightStatus } from '../../../types'
+import type { DevUser } from '../shared/devLoginLogic'
 
 export interface AuthenticateResponseType {
     success: boolean
@@ -80,6 +83,199 @@ export interface CodeVerificationForm {
     code: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface loginLogicValues {
+    devLoginTimeSavedLabel: string | null // devLoginLogic
+    devUsers: DevUser[] // devLoginLogic
+    devUsersLoading: boolean // devLoginLogic
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    preflight: PreflightStatus | null // preflightLogic
+    codeVerification: CodeVerificationForm
+    codeVerificationAllErrors: Record<string, any>
+    codeVerificationChanged: boolean
+    codeVerificationErrors: DeepPartialMap<CodeVerificationForm, ValidationErrorType>
+    codeVerificationHasErrors: boolean
+    codeVerificationManualErrors: Record<string, any>
+    codeVerificationRequired: boolean
+    codeVerificationTouched: boolean
+    codeVerificationTouches: Record<string, boolean>
+    codeVerificationValidationErrors: DeepPartialMap<CodeVerificationForm, ValidationErrorType>
+    generalError: {
+        code: string
+        detail: string
+    } | null
+    isCodeVerificationSubmitting: boolean
+    isCodeVerificationValid: boolean
+    isLoginSubmitting: boolean
+    isLoginValid: boolean
+    login: LoginForm
+    loginAllErrors: Record<string, any>
+    loginChanged: boolean
+    loginErrors: DeepPartialMap<LoginForm, ValidationErrorType>
+    loginHasErrors: boolean
+    loginManualErrors: Record<string, any>
+    loginTouched: boolean
+    loginTouches: Record<string, boolean>
+    loginValidationErrors: DeepPartialMap<LoginForm, ValidationErrorType>
+    precheckResponse: PrecheckResponseType
+    precheckResponseLoading: boolean
+    resendResponse: {
+        message: string
+        success: boolean
+    } | null
+    resendResponseLoading: boolean
+    showCodeVerificationErrors: boolean
+    showLoginErrors: boolean
+    signupUrl: string
+    wasSignedOutForSessionRisk: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface loginLogicActions {
+    devLogin: (email: string) => {
+        email: string
+    } // devLoginLogic
+    loadDevUsers: (_: any) => any // devLoginLogic
+    clearGeneralError: () => {
+        value: true
+    }
+    exitCodeVerification: () => {
+        value: true
+    }
+    precheck: ({ email }: { email: string }) => {
+        email: string
+    }
+    precheckFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    precheckSuccess: (
+        precheckResponse: PrecheckResponseType,
+        payload?: {
+            email: string
+        }
+    ) => {
+        precheckResponse: PrecheckResponseType
+        payload?: {
+            email: string
+        }
+    }
+    resendCodeBasedVerification: (_: any) => any
+    resendCodeBasedVerificationFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    resendCodeBasedVerificationSuccess: (
+        resendResponse: {
+            message: string
+            success: boolean
+        } | null,
+        payload?: any
+    ) => {
+        resendResponse: {
+            message: string
+            success: boolean
+        } | null
+        payload?: any
+    }
+    resetCodeVerification: (values?: CodeVerificationForm) => {
+        values?: CodeVerificationForm
+    }
+    resetLogin: (values?: LoginForm) => {
+        values?: LoginForm
+    }
+    setCodeVerificationManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setCodeVerificationRequired: () => {
+        value: true
+    }
+    setCodeVerificationValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setCodeVerificationValues: (values: DeepPartial<CodeVerificationForm>) => {
+        values: DeepPartial<CodeVerificationForm>
+    }
+    setGeneralError: (
+        code: string,
+        detail: string
+    ) => {
+        code: string
+        detail: string
+    }
+    setLoginManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setLoginValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setLoginValues: (values: DeepPartial<LoginForm>) => {
+        values: DeepPartial<LoginForm>
+    }
+    submitCodeVerification: () => {
+        value: boolean
+    }
+    submitCodeVerificationFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitCodeVerificationRequest: (codeVerification: CodeVerificationForm) => {
+        codeVerification: CodeVerificationForm
+    }
+    submitCodeVerificationSuccess: (codeVerification: CodeVerificationForm) => {
+        codeVerification: CodeVerificationForm
+    }
+    submitLogin: () => {
+        value: boolean
+    }
+    submitLoginFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitLoginRequest: (login: LoginForm) => {
+        login: LoginForm
+    }
+    submitLoginSuccess: (login: LoginForm) => {
+        login: LoginForm
+    }
+    touchCodeVerificationField: (key: string) => {
+        key: string
+    }
+    touchLoginField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface loginLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        signupUrl: (searchParams: Record<string, any>) => string
+        wasSignedOutForSessionRisk: (searchParams: Record<string, any>) => boolean
+    }
+}
+
+export type loginLogicType = MakeLogicType<loginLogicValues, loginLogicActions, Record<string, any>, loginLogicMeta>
+
 export const loginLogic = kea<loginLogicType>([
     path(['scenes', 'authentication', 'login', 'loginLogic']),
     connect(() => ({
diff --git a/frontend/src/scenes/authentication/password-reset/passwordResetLogic.ts b/frontend/src/scenes/authentication/password-reset/passwordResetLogic.ts
index 1e39eed72973..0161fc450f7c 100644
--- a/frontend/src/scenes/authentication/password-reset/passwordResetLogic.ts
+++ b/frontend/src/scenes/authentication/password-reset/passwordResetLogic.ts
@@ -1,5 +1,6 @@
-import { kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, kea, path, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { urlToAction } from 'kea-router'
 import posthog from 'posthog-js'
@@ -8,8 +9,6 @@ import api from 'lib/api'
 import { ValidatedPasswordResult, validatePassword } from 'lib/components/PasswordStrength'
 import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
 
-import type { passwordResetLogicType } from './passwordResetLogicType'
-
 export interface ResponseType {
     success: boolean
     errorCode?: string
@@ -29,6 +28,203 @@ export interface PasswordResetForm {
     passwordConfirm: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface passwordResetLogicValues {
+    isPasswordResetSubmitting: boolean
+    isPasswordResetValid: boolean
+    isRequestPasswordResetSubmitting: boolean
+    isRequestPasswordResetValid: boolean
+    passwordReset: PasswordResetForm
+    passwordResetAllErrors: Record<string, any>
+    passwordResetChanged: boolean
+    passwordResetErrors: DeepPartialMap<PasswordResetForm, ValidationErrorType>
+    passwordResetHasErrors: boolean
+    passwordResetManualErrors: Record<string, any>
+    passwordResetSucceeded: boolean
+    passwordResetTouched: boolean
+    passwordResetTouches: Record<string, boolean>
+    passwordResetValidationErrors: DeepPartialMap<PasswordResetForm, ValidationErrorType>
+    requestPasswordReset: {
+        email: string
+    }
+    requestPasswordResetAllErrors: Record<string, any>
+    requestPasswordResetChanged: boolean
+    requestPasswordResetErrors: DeepPartialMap<
+        {
+            email: string
+        },
+        ValidationErrorType
+    >
+    requestPasswordResetHasErrors: boolean
+    requestPasswordResetManualErrors: Record<string, any>
+    requestPasswordResetSucceeded: boolean
+    requestPasswordResetTouched: boolean
+    requestPasswordResetTouches: Record<string, boolean>
+    requestPasswordResetValidationErrors: DeepPartialMap<
+        {
+            email: string
+        },
+        ValidationErrorType
+    >
+    showPasswordResetErrors: boolean
+    showRequestPasswordResetErrors: boolean
+    validatedPassword: ValidatedPasswordResult
+    validatedResetToken: ValidatedTokenResponseType | null
+    validatedResetTokenLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface passwordResetLogicActions {
+    resetPasswordReset: (values?: PasswordResetForm) => {
+        values?: PasswordResetForm
+    }
+    resetRequestPasswordReset: (values?: { email: string }) => {
+        values?: {
+            email: string
+        }
+    }
+    setPasswordResetManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setPasswordResetValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setPasswordResetValues: (values: DeepPartial<PasswordResetForm>) => {
+        values: DeepPartial<PasswordResetForm>
+    }
+    setRequestPasswordResetManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setRequestPasswordResetValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setRequestPasswordResetValues: (
+        values: DeepPartial<{
+            email: string
+        }>
+    ) => {
+        values: DeepPartial<{
+            email: string
+        }>
+    }
+    submitPasswordReset: () => {
+        value: boolean
+    }
+    submitPasswordResetFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitPasswordResetRequest: (passwordReset: PasswordResetForm) => {
+        passwordReset: PasswordResetForm
+    }
+    submitPasswordResetSuccess: (passwordReset: PasswordResetForm) => {
+        passwordReset: PasswordResetForm
+    }
+    submitRequestPasswordReset: () => {
+        value: boolean
+    }
+    submitRequestPasswordResetFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitRequestPasswordResetRequest: (requestPasswordReset: { email: string }) => {
+        requestPasswordReset: {
+            email: string
+        }
+    }
+    submitRequestPasswordResetSuccess: (requestPasswordReset: { email: string }) => {
+        requestPasswordReset: {
+            email: string
+        }
+    }
+    touchPasswordResetField: (key: string) => {
+        key: string
+    }
+    touchRequestPasswordResetField: (key: string) => {
+        key: string
+    }
+    validateResetToken: ({ uuid, token }: { token: string; uuid: string }) => {
+        uuid: string
+        token: string
+    }
+    validateResetTokenFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    validateResetTokenSuccess: (
+        validatedResetToken:
+            | {
+                  errorCode: any
+                  errorDetail: any
+                  success: false
+                  token?: undefined
+                  uuid?: undefined
+              }
+            | {
+                  errorCode?: undefined
+                  errorDetail?: undefined
+                  success: true
+                  token: string
+                  uuid: string
+              },
+        payload?: {
+            uuid: string
+            token: string
+        }
+    ) => {
+        validatedResetToken:
+            | {
+                  errorCode: any
+                  errorDetail: any
+                  success: false
+                  token?: undefined
+                  uuid?: undefined
+              }
+            | {
+                  errorCode?: undefined
+                  errorDetail?: undefined
+                  success: true
+                  token: string
+                  uuid: string
+              }
+        payload?: {
+            uuid: string
+            token: string
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface passwordResetLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        validatedPassword: (passwordReset: PasswordResetForm) => ValidatedPasswordResult
+    }
+}
+
+export type passwordResetLogicType = MakeLogicType<
+    passwordResetLogicValues,
+    passwordResetLogicActions,
+    Record<string, any>,
+    passwordResetLogicMeta
+>
+
 export const passwordResetLogic = kea<passwordResetLogicType>([
     path(['scenes', 'authentication', 'password-reset', 'passwordResetLogic']),
     loaders(() => ({
diff --git a/frontend/src/scenes/authentication/shared/devLoginLogic.ts b/frontend/src/scenes/authentication/shared/devLoginLogic.ts
index 20b0a7bb61ca..be472988a90e 100644
--- a/frontend/src/scenes/authentication/shared/devLoginLogic.ts
+++ b/frontend/src/scenes/authentication/shared/devLoginLogic.ts
@@ -1,10 +1,8 @@
-import { actions, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
 
-import type { devLoginLogicType } from './devLoginLogicType'
-
 export interface DevUser {
     email: string
     is_staff: boolean
@@ -15,6 +13,50 @@ export const DEV_LOGIN_SECONDS_SAVED_PER_CLICK = 5
 
 export const DEV_LOGIN_DEFAULT_EMAIL = 'test@posthog.com'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface devLoginLogicValues {
+    devLoginCount: number
+    devLoginTimeSavedLabel: string | null
+    devUsers: DevUser[]
+    devUsersLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface devLoginLogicActions {
+    devLogin: (email: string) => {
+        email: string
+    }
+    loadDevUsers: (_: any) => any
+    loadDevUsersFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadDevUsersSuccess: (
+        devUsers: DevUser[],
+        payload?: any
+    ) => {
+        devUsers: DevUser[]
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface devLoginLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        devLoginTimeSavedLabel: (devLoginCount: number) => string | null
+    }
+}
+
+export type devLoginLogicType = MakeLogicType<
+    devLoginLogicValues,
+    devLoginLogicActions,
+    Record<string, any>,
+    devLoginLogicMeta
+>
+
 export const devLoginLogic = kea<devLoginLogicType>([
     path(['scenes', 'authentication', 'shared', 'devLoginLogic']),
     actions({
@@ -56,7 +98,7 @@ export const devLoginLogic = kea<devLoginLogicType>([
     selectors(() => ({
         devLoginTimeSavedLabel: [
             (s) => [s.devLoginCount],
-            (devLoginCount): string | null => {
+            (devLoginCount: number): string | null => {
                 if (devLoginCount === 0) {
                     return null
                 }
diff --git a/frontend/src/scenes/authentication/shared/passkeyLogic.ts b/frontend/src/scenes/authentication/shared/passkeyLogic.ts
index 431b494022d5..6fd6524a7d8a 100644
--- a/frontend/src/scenes/authentication/shared/passkeyLogic.ts
+++ b/frontend/src/scenes/authentication/shared/passkeyLogic.ts
@@ -3,7 +3,7 @@ import {
     type PublicKeyCredentialDescriptorJSON,
     startAuthentication,
 } from '@simplewebauthn/browser'
-import { actions, connect, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 
@@ -14,8 +14,6 @@ import { handleLoginRedirect, loginLogic } from 'scenes/authentication/login/log
 import { getPasskeyErrorMessage, isWebAuthnCancellation } from 'scenes/settings/user/passkeys/utils'
 import { userLogic } from 'scenes/userLogic'
 
-import type { passkeyLogicType } from './passkeyLogicType'
-
 export interface PasskeyLoginBeginResponse {
     challenge: string
     timeout: number
@@ -30,6 +28,73 @@ export interface BeginPasskeyLoginParams {
     reauth?: 'true' | 'false'
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface passkeyLogicValues {
+    allowCredentialsFromPrecheck: PublicKeyCredentialDescriptorJSON[]
+    isLoading: boolean
+    isReauth: boolean
+    loginWithPasskey: null
+    loginWithPasskeyLoading: boolean
+    redirectLink: string | undefined
+    wasCancelled: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface passkeyLogicActions {
+    setTimeSensitiveAuthenticationRequired: (required: boolean | [onSuccess: () => void, onFailure: () => void]) => {
+        required: boolean | [onSuccess: () => void, onFailure: () => void]
+    } // apiStatusLogic
+    setGeneralError: (
+        code: string,
+        detail: string
+    ) => {
+        code: string
+        detail: string
+    } // loginLogic
+    loadUser: (resetOnFailure?: boolean | undefined) => {
+        resetOnFailure: boolean | undefined
+    } // userLogic
+    beginPasskeyLogin: (
+        allowCredentials?: PublicKeyCredentialDescriptorJSON[],
+        params?: BeginPasskeyLoginParams
+    ) => {
+        allowCredentials: PublicKeyCredentialDescriptorJSON[] | undefined
+        params: BeginPasskeyLoginParams | undefined
+    }
+    passkeyAuthenticationCancelled: () => {
+        value: true
+    }
+    reset: () => {
+        value: true
+    }
+    startConditionalPasskeyLogin: () => {
+        value: true
+    }
+    startPasskeyAuthentication: () => {
+        value: true
+    }
+    startPasskeyAuthenticationFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    startPasskeyAuthenticationSuccess: (
+        loginWithPasskey: null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        loginWithPasskey: null
+        payload?: {
+            value: true
+        }
+    }
+}
+
+export type passkeyLogicType = MakeLogicType<passkeyLogicValues, passkeyLogicActions>
+
 export const passkeyLogic = kea<passkeyLogicType>([
     path(['scenes', 'authentication', 'shared', 'passkeyLogic']),
     connect(() => ({
diff --git a/frontend/src/scenes/authentication/signup/signupForm/signupLogic.ts b/frontend/src/scenes/authentication/signup/signupForm/signupLogic.ts
index dab83576fcff..9843f357fe20 100644
--- a/frontend/src/scenes/authentication/signup/signupForm/signupLogic.ts
+++ b/frontend/src/scenes/authentication/signup/signupForm/signupLogic.ts
@@ -1,6 +1,7 @@
 import { startRegistration } from '@simplewebauthn/browser'
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { router, urlToAction } from 'kea-router'
 import posthog from 'posthog-js'
 
@@ -16,7 +17,8 @@ import { getPasskeyErrorMessage, isWebAuthnCancellation } from 'scenes/settings/
 import { RegistrationBeginResponse } from 'scenes/settings/user/passkeySettingsLogic'
 import { urls } from 'scenes/urls'
 
-import type { signupLogicType } from './signupLogicType'
+import type { FeatureFlagsSet } from '../../../../lib/logic/featureFlagLogic'
+import type { PreflightStatus } from '../../../../types'
 
 export interface AccountResponse {
     success: boolean
@@ -60,6 +62,341 @@ export const emailRegex: RegExp =
     // oxlint-disable-next-line no-control-regex
     /(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])/
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface signupLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    preflight: PreflightStatus | null // preflightLogic
+    challengeNonce: string | null
+    challengeRequired: boolean
+    emailCaseNotice: string | undefined
+    emailWasNormalized: boolean
+    error: string | null
+    isPasskeyRegistering: boolean
+    isPendingInviteResending: boolean
+    isSignupPanel1Submitting: boolean
+    isSignupPanel1Valid: boolean
+    isSignupPanel2Submitting: boolean
+    isSignupPanel2Valid: boolean
+    isSignupPanelAuthSubmitting: boolean
+    isSignupPanelAuthValid: boolean
+    isSignupPanelEmailSubmitting: boolean
+    isSignupPanelEmailValid: boolean
+    isSignupPanelOnboardingSubmitting: boolean
+    isSignupPanelOnboardingValid: boolean
+    loginUrl: string
+    panel: number
+    panelTitle: string
+    passkeyError: string | null
+    passkeyRegistered: boolean
+    passkeySignupEnabled: boolean
+    pendingInvite: PendingInvite | null
+    pendingInviteResent: boolean
+    showSignupPanel1Errors: boolean
+    showSignupPanel2Errors: boolean
+    showSignupPanelAuthErrors: boolean
+    showSignupPanelEmailErrors: boolean
+    showSignupPanelOnboardingErrors: boolean
+    signupPanel1: SignupForm
+    signupPanel1AllErrors: Record<string, any>
+    signupPanel1Changed: boolean
+    signupPanel1Errors: DeepPartialMap<SignupForm, ValidationErrorType>
+    signupPanel1HasErrors: boolean
+    signupPanel1ManualErrors: Record<string, any>
+    signupPanel1Touched: boolean
+    signupPanel1Touches: Record<string, boolean>
+    signupPanel1ValidationErrors: DeepPartialMap<SignupForm, ValidationErrorType>
+    signupPanel2: SignupForm
+    signupPanel2AllErrors: Record<string, any>
+    signupPanel2Changed: boolean
+    signupPanel2Errors: DeepPartialMap<SignupForm, ValidationErrorType>
+    signupPanel2HasErrors: boolean
+    signupPanel2ManualErrors: Record<string, any>
+    signupPanel2Touched: boolean
+    signupPanel2Touches: Record<string, boolean>
+    signupPanel2ValidationErrors: DeepPartialMap<SignupForm, ValidationErrorType>
+    signupPanelAuth: SignupPanelAuthForm
+    signupPanelAuthAllErrors: Record<string, any>
+    signupPanelAuthChanged: boolean
+    signupPanelAuthErrors: DeepPartialMap<SignupPanelAuthForm, ValidationErrorType>
+    signupPanelAuthHasErrors: boolean
+    signupPanelAuthManualErrors: Record<string, any>
+    signupPanelAuthTouched: boolean
+    signupPanelAuthTouches: Record<string, boolean>
+    signupPanelAuthValidationErrors: DeepPartialMap<SignupPanelAuthForm, ValidationErrorType>
+    signupPanelEmail: SignupPanelEmailForm
+    signupPanelEmailAllErrors: Record<string, any>
+    signupPanelEmailChanged: boolean
+    signupPanelEmailErrors: DeepPartialMap<SignupPanelEmailForm, ValidationErrorType>
+    signupPanelEmailHasErrors: boolean
+    signupPanelEmailManualErrors: Record<string, any>
+    signupPanelEmailTouched: boolean
+    signupPanelEmailTouches: Record<string, boolean>
+    signupPanelEmailValidationErrors: DeepPartialMap<SignupPanelEmailForm, ValidationErrorType>
+    signupPanelOnboarding: SignupPanelOnboardingForm
+    signupPanelOnboardingAllErrors: Record<string, any>
+    signupPanelOnboardingChanged: boolean
+    signupPanelOnboardingErrors: DeepPartialMap<SignupPanelOnboardingForm, ValidationErrorType>
+    signupPanelOnboardingHasErrors: boolean
+    signupPanelOnboardingManualErrors: Record<string, any>
+    signupPanelOnboardingTouched: boolean
+    signupPanelOnboardingTouches: Record<string, boolean>
+    signupPanelOnboardingValidationErrors: DeepPartialMap<SignupPanelOnboardingForm, ValidationErrorType>
+    turnstileSiteKey: string | null
+    turnstileToken: string | null
+    validatedPassword: ValidatedPasswordResult
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface signupLogicActions {
+    dismissPendingInvite: () => {
+        value: true
+    }
+    normalizeEmailWithDelay: (email: string) => {
+        email: string
+    }
+    registerPasskey: () => {
+        value: true
+    }
+    resendPendingInvite: (email: string) => {
+        email: string
+    }
+    resetChallenge: () => {
+        value: true
+    }
+    resetSignupPanel1: (values?: SignupForm) => {
+        values?: SignupForm
+    }
+    resetSignupPanel2: (values?: SignupForm) => {
+        values?: SignupForm
+    }
+    resetSignupPanelAuth: (values?: SignupPanelAuthForm) => {
+        values?: SignupPanelAuthForm
+    }
+    resetSignupPanelEmail: (values?: SignupPanelEmailForm) => {
+        values?: SignupPanelEmailForm
+    }
+    resetSignupPanelOnboarding: (values?: SignupPanelOnboardingForm) => {
+        values?: SignupPanelOnboardingForm
+    }
+    setChallengeNonce: (nonce: string | null) => {
+        nonce: string | null
+    }
+    setChallengeRequired: (required: boolean) => {
+        required: boolean
+    }
+    setEmailNormalized: (wasNormalized: boolean) => {
+        wasNormalized: boolean
+    }
+    setError: (error: string | null) => {
+        error: string | null
+    }
+    setPanel: (panel: number) => {
+        panel: number
+    }
+    setPasskeyError: (error: string | null) => {
+        error: string | null
+    }
+    setPasskeyRegistered: (registered: boolean) => {
+        registered: boolean
+    }
+    setPasskeyRegistering: (registering: boolean) => {
+        registering: boolean
+    }
+    setPendingInvite: (invite: PendingInvite | null) => {
+        invite: PendingInvite | null
+    }
+    setPendingInviteResending: (resending: boolean) => {
+        resending: boolean
+    }
+    setPendingInviteResent: (resent: boolean) => {
+        resent: boolean
+    }
+    setSignupPanel1ManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setSignupPanel1Value: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setSignupPanel1Values: (values: DeepPartial<SignupForm>) => {
+        values: DeepPartial<SignupForm>
+    }
+    setSignupPanel2ManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setSignupPanel2Value: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setSignupPanel2Values: (values: DeepPartial<SignupForm>) => {
+        values: DeepPartial<SignupForm>
+    }
+    setSignupPanelAuthManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setSignupPanelAuthValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setSignupPanelAuthValues: (values: DeepPartial<SignupPanelAuthForm>) => {
+        values: DeepPartial<SignupPanelAuthForm>
+    }
+    setSignupPanelEmailManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setSignupPanelEmailValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setSignupPanelEmailValues: (values: DeepPartial<SignupPanelEmailForm>) => {
+        values: DeepPartial<SignupPanelEmailForm>
+    }
+    setSignupPanelOnboardingManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setSignupPanelOnboardingValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setSignupPanelOnboardingValues: (values: DeepPartial<SignupPanelOnboardingForm>) => {
+        values: DeepPartial<SignupPanelOnboardingForm>
+    }
+    setTurnstileSiteKey: (siteKey: string | null) => {
+        siteKey: string | null
+    }
+    setTurnstileToken: (token: string | null) => {
+        token: string | null
+    }
+    submitSignupPanel1: () => {
+        value: boolean
+    }
+    submitSignupPanel1Failure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitSignupPanel1Request: (signupPanel1: SignupForm) => {
+        signupPanel1: SignupForm
+    }
+    submitSignupPanel1Success: (signupPanel1: SignupForm) => {
+        signupPanel1: SignupForm
+    }
+    submitSignupPanel2: () => {
+        value: boolean
+    }
+    submitSignupPanel2Failure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitSignupPanel2Request: (signupPanel2: SignupForm) => {
+        signupPanel2: SignupForm
+    }
+    submitSignupPanel2Success: (signupPanel2: SignupForm) => {
+        signupPanel2: SignupForm
+    }
+    submitSignupPanelAuth: () => {
+        value: boolean
+    }
+    submitSignupPanelAuthFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitSignupPanelAuthRequest: (signupPanelAuth: SignupPanelAuthForm) => {
+        signupPanelAuth: SignupPanelAuthForm
+    }
+    submitSignupPanelAuthSuccess: (signupPanelAuth: SignupPanelAuthForm) => {
+        signupPanelAuth: SignupPanelAuthForm
+    }
+    submitSignupPanelEmail: () => {
+        value: boolean
+    }
+    submitSignupPanelEmailFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitSignupPanelEmailRequest: (signupPanelEmail: SignupPanelEmailForm) => {
+        signupPanelEmail: SignupPanelEmailForm
+    }
+    submitSignupPanelEmailSuccess: (signupPanelEmail: SignupPanelEmailForm) => {
+        signupPanelEmail: SignupPanelEmailForm
+    }
+    submitSignupPanelOnboarding: () => {
+        value: boolean
+    }
+    submitSignupPanelOnboardingFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitSignupPanelOnboardingRequest: (signupPanelOnboarding: SignupPanelOnboardingForm) => {
+        signupPanelOnboarding: SignupPanelOnboardingForm
+    }
+    submitSignupPanelOnboardingSuccess: (signupPanelOnboarding: SignupPanelOnboardingForm) => {
+        signupPanelOnboarding: SignupPanelOnboardingForm
+    }
+    touchSignupPanel1Field: (key: string) => {
+        key: string
+    }
+    touchSignupPanel2Field: (key: string) => {
+        key: string
+    }
+    touchSignupPanelAuthField: (key: string) => {
+        key: string
+    }
+    touchSignupPanelEmailField: (key: string) => {
+        key: string
+    }
+    touchSignupPanelOnboardingField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface signupLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        validatedPassword: (signupPanelAuth: SignupPanelAuthForm, signupPanel1: SignupForm) => ValidatedPasswordResult
+        emailCaseNotice: (emailWasNormalized: boolean) => string | undefined
+        loginUrl: (searchParams: Record<string, any>) => string
+        passkeySignupEnabled: (featureFlags: FeatureFlagsSet) => boolean
+        panelTitle: (
+            panel: number,
+            passkeySignupEnabled: boolean,
+            preflight: PreflightStatus | null,
+            pendingInvite: PendingInvite | null
+        ) => string
+    }
+}
+
+export type signupLogicType = MakeLogicType<signupLogicValues, signupLogicActions, Record<string, any>, signupLogicMeta>
+
 export const signupLogic = kea<signupLogicType>([
     path(['scenes', 'authentication', 'signupLogic']),
     connect(() => ({
@@ -493,14 +830,14 @@ export const signupLogic = kea<signupLogicType>([
     selectors({
         validatedPassword: [
             (s) => [s.signupPanelAuth, s.signupPanel1],
-            (signupPanelAuth, signupPanel1): ValidatedPasswordResult => {
+            (signupPanelAuth: SignupPanelAuthForm, signupPanel1: SignupForm): ValidatedPasswordResult => {
                 // Use new form if available, fallback to legacy
                 return validatePassword(signupPanelAuth.password || signupPanel1.password)
             },
         ],
         emailCaseNotice: [
             (s) => [s.emailWasNormalized],
-            (emailWasNormalized): string | undefined => {
+            (emailWasNormalized: boolean): string | undefined => {
                 return emailWasNormalized ? '⚠ Your email was automatically converted to lowercase' : undefined
             },
         ],
@@ -513,13 +850,18 @@ export const signupLogic = kea<signupLogicType>([
         ],
         passkeySignupEnabled: [
             (s) => [s.featureFlags],
-            (featureFlags): boolean => {
+            (featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet): boolean => {
                 return !!featureFlags[FEATURE_FLAGS.PASSKEY_SIGNUP_ENABLED]
             },
         ],
         panelTitle: [
             (s) => [s.panel, s.passkeySignupEnabled, s.preflight, s.pendingInvite],
-            (panel: number, passkeySignupEnabled: boolean, preflight, pendingInvite): string => {
+            (
+                panel: number,
+                passkeySignupEnabled: boolean,
+                preflight: null | import('../../../../types').PreflightStatus,
+                pendingInvite: PendingInvite | null
+            ): string => {
                 if (panel === 0 && pendingInvite) {
                     return ''
                 }
diff --git a/frontend/src/scenes/authentication/two-factor-reset/twoFactorResetLogic.ts b/frontend/src/scenes/authentication/two-factor-reset/twoFactorResetLogic.ts
index b4ff904b3d3b..a2f430f6fea4 100644
--- a/frontend/src/scenes/authentication/two-factor-reset/twoFactorResetLogic.ts
+++ b/frontend/src/scenes/authentication/two-factor-reset/twoFactorResetLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { urlToAction } from 'kea-router'
 
@@ -6,8 +6,6 @@ import api from 'lib/api'
 import { loginLogic } from 'scenes/authentication/login/loginLogic'
 import { urls } from 'scenes/urls'
 
-import type { twoFactorResetLogicType } from './twoFactorResetLogicType'
-
 export interface ValidatedTokenResponse {
     success: boolean
     token?: string
@@ -21,6 +19,114 @@ export interface ResetResponse {
     requires_login?: boolean
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface twoFactorResetLogicValues {
+    currentToken: string
+    currentUuid: string
+    loginRedirectUrl: string
+    requiresLogin: boolean
+    resetComplete: boolean
+    resetError: string | null
+    resetLoading: boolean
+    resetResult: ResetResponse | null
+    resetResultLoading: boolean
+    validatedResetToken: ValidatedTokenResponse | null
+    validatedResetTokenLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface twoFactorResetLogicActions {
+    confirmReset: (token: string) => {
+        token: string
+    }
+    executeReset: ({ uuid, token }: { token: string; uuid: string }) => {
+        uuid: string
+        token: string
+    }
+    executeResetFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    executeResetSuccess: (
+        resetResult: ResetResponse,
+        payload?: {
+            uuid: string
+            token: string
+        }
+    ) => {
+        resetResult: ResetResponse
+        payload?: {
+            uuid: string
+            token: string
+        }
+    }
+    resetState: () => {
+        value: true
+    }
+    setRequiresLogin: (requires: boolean) => {
+        requires: boolean
+    }
+    setResetComplete: (complete: boolean) => {
+        complete: boolean
+    }
+    setResetError: (error: string | null) => {
+        error: string | null
+    }
+    validateResetToken: ({ uuid, token }: { token: string; uuid: string }) => {
+        uuid: string
+        token: string
+    }
+    validateResetTokenFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    validateResetTokenSuccess: (
+        validatedResetToken:
+            | ValidatedTokenResponse
+            | {
+                  error: any
+                  requires_login: boolean
+                  success: false
+              },
+        payload?: {
+            uuid: string
+            token: string
+        }
+    ) => {
+        validatedResetToken:
+            | ValidatedTokenResponse
+            | {
+                  error: any
+                  requires_login: boolean
+                  success: false
+              }
+        payload?: {
+            uuid: string
+            token: string
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface twoFactorResetLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        loginRedirectUrl: (currentUuid: string, currentToken: string) => string
+    }
+}
+
+export type twoFactorResetLogicType = MakeLogicType<
+    twoFactorResetLogicValues,
+    twoFactorResetLogicActions,
+    Record<string, any>,
+    twoFactorResetLogicMeta
+>
+
 export const twoFactorResetLogic = kea<twoFactorResetLogicType>([
     path(['scenes', 'authentication', 'two-factor-reset', 'twoFactorResetLogic']),
     actions({
@@ -114,7 +220,7 @@ export const twoFactorResetLogic = kea<twoFactorResetLogicType>([
     selectors({
         loginRedirectUrl: [
             (s) => [s.currentUuid, s.currentToken],
-            (uuid, token): string => {
+            (uuid: string, token: string): string => {
                 // Redirect to login with the 2FA reset URL as the next parameter
                 const resetUrl = urls.twoFactorReset(uuid, token)
                 return `${urls.login()}?next=${encodeURIComponent(resetUrl)}`
diff --git a/frontend/src/scenes/authentication/two-factor-setup/twoFactorLogic.ts b/frontend/src/scenes/authentication/two-factor-setup/twoFactorLogic.ts
index 7dd3a638a84a..e271725b05b0 100644
--- a/frontend/src/scenes/authentication/two-factor-setup/twoFactorLogic.ts
+++ b/frontend/src/scenes/authentication/two-factor-setup/twoFactorLogic.ts
@@ -1,5 +1,6 @@
-import { actions, afterMount, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -10,7 +11,8 @@ import { membersLogic } from 'scenes/organization/membersLogic'
 import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
 import { userLogic } from 'scenes/userLogic'
 
-import type { twoFactorLogicType } from './twoFactorLogicType'
+import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
+import type { PreflightStatus, UserType } from '../../../types'
 
 export interface TwoFactorForm {
     token: number | null
@@ -29,6 +31,207 @@ export interface TwoFactorLogicProps {
     onSuccess?: () => void
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface twoFactorLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    preflight: PreflightStatus | null // preflightLogic
+    user: UserType | null // userLogic
+    canSwitchOrg: boolean
+    forceOpenTwoFactorSetupModal: boolean
+    generalError: {
+        code: string
+        detail: string
+    } | null
+    generatingCodes: {
+        backup_codes: string[]
+    } | null
+    generatingCodesLoading: boolean
+    is2FAEnabled: boolean
+    isBackupCodesModalOpen: boolean
+    isDisable2FAModalOpen: boolean
+    isTokenSubmitting: boolean
+    isTokenValid: boolean
+    isTwoFactorSetupModalOpen: boolean
+    setupCallState: {
+        isOngoing: boolean
+    }
+    showTokenErrors: boolean
+    startSetup: {
+        secret: string
+        success: boolean
+    } | null
+    startSetupLoading: boolean
+    status: TwoFactorStatus | null
+    statusLoading: boolean
+    token: TwoFactorForm
+    tokenAllErrors: Record<string, any>
+    tokenChanged: boolean
+    tokenErrors: DeepPartialMap<TwoFactorForm, ValidationErrorType>
+    tokenHasErrors: boolean
+    tokenManualErrors: Record<string, any>
+    tokenTouched: boolean
+    tokenTouches: Record<string, boolean>
+    tokenValidationErrors: DeepPartialMap<TwoFactorForm, ValidationErrorType>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface twoFactorLogicActions {
+    loadAllMembers: () => {
+        value: true
+    } // membersLogic
+    loadUser: (resetOnFailure?: boolean | undefined) => {
+        resetOnFailure: boolean | undefined
+    } // userLogic
+    clearGeneralError: () => {
+        value: true
+    }
+    closeTwoFactorSetupModal: () => {
+        value: true
+    }
+    disable2FA: () => {
+        value: true
+    }
+    generateBackupCodes: () => {
+        value: true
+    }
+    generateBackupCodesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    generateBackupCodesSuccess: (
+        generatingCodes: {
+            backup_codes: string[]
+        } | null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        generatingCodes: {
+            backup_codes: string[]
+        } | null
+        payload?: {
+            value: true
+        }
+    }
+    loadStatus: () => {
+        value: true
+    }
+    loadStatusFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadStatusSuccess: (
+        status: TwoFactorStatus | null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        status: TwoFactorStatus | null
+        payload?: {
+            value: true
+        }
+    }
+    openTwoFactorSetupModal: (forceOpen?: boolean) => {
+        forceOpen: boolean | undefined
+    }
+    openTwoFactorSetupModalFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    openTwoFactorSetupModalSuccess: (
+        startSetup: {
+            secret: string
+            success: boolean
+        } | null,
+        payload?: {
+            forceOpen: boolean | undefined
+        }
+    ) => {
+        startSetup: {
+            secret: string
+            success: boolean
+        } | null
+        payload?: {
+            forceOpen: boolean | undefined
+        }
+    }
+    resetToken: (values?: TwoFactorForm) => {
+        values?: TwoFactorForm
+    }
+    setGeneralError: (
+        code: string,
+        detail: string
+    ) => {
+        code: string
+        detail: string
+    }
+    setSetupCallOngoing: (ongoing: boolean) => {
+        ongoing: boolean
+    }
+    setTokenManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setTokenValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setTokenValues: (values: DeepPartial<TwoFactorForm>) => {
+        values: DeepPartial<TwoFactorForm>
+    }
+    submitToken: () => {
+        value: boolean
+    }
+    submitTokenFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitTokenRequest: (token: TwoFactorForm) => {
+        token: TwoFactorForm
+    }
+    submitTokenSuccess: (token: TwoFactorForm) => {
+        token: TwoFactorForm
+    }
+    toggleBackupCodesModal: (open: boolean) => {
+        open: boolean
+    }
+    toggleDisable2FAModal: (open: boolean) => {
+        open: boolean
+    }
+    touchTokenField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface twoFactorLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        is2FAEnabled: (status: TwoFactorStatus | null) => boolean
+        canSwitchOrg: (user: UserType | null) => boolean
+    }
+}
+
+export type twoFactorLogicType = MakeLogicType<
+    twoFactorLogicValues,
+    twoFactorLogicActions,
+    TwoFactorLogicProps,
+    twoFactorLogicMeta
+>
+
 export const twoFactorLogic = kea<twoFactorLogicType>([
     path(['scenes', 'authentication', 'two-factor-setup', 'twoFactorLogic']),
     props({} as TwoFactorLogicProps),
@@ -109,8 +312,11 @@ export const twoFactorLogic = kea<twoFactorLogicType>([
         ],
     }),
     selectors({
-        is2FAEnabled: [(s) => [s.status], (status): boolean => !!status?.is_enabled],
-        canSwitchOrg: [(s) => [s.user], (user): boolean => (user?.organizations || []).length > 1],
+        is2FAEnabled: [(s) => [s.status], (status: TwoFactorStatus | null): boolean => !!status?.is_enabled],
+        canSwitchOrg: [
+            (s) => [s.user],
+            (user: null | import('../../../types').UserType): boolean => (user?.organizations || []).length > 1,
+        ],
     }),
     loaders(({ values, actions }) => ({
         startSetup: [
diff --git a/frontend/src/scenes/authentication/verify-email/verifyEmailLogic.ts b/frontend/src/scenes/authentication/verify-email/verifyEmailLogic.ts
index b9c23f2edf1e..551875cbae25 100644
--- a/frontend/src/scenes/authentication/verify-email/verifyEmailLogic.ts
+++ b/frontend/src/scenes/authentication/verify-email/verifyEmailLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, path, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, path, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router, urlToAction } from 'kea-router'
 
@@ -8,7 +8,7 @@ import { getRelativeNextPath } from 'lib/utils/url'
 import { urls } from 'scenes/urls'
 import { userLogic } from 'scenes/userLogic'
 
-import type { verifyEmailLogicType } from './verifyEmailLogicType'
+import type { UserType } from '../../../types'
 
 // Must stay in sync with the `VerifyEmail__Progress` animation duration in VerifyEmail.scss.
 export const VERIFY_EMAIL_REDIRECT_DELAY_MS = 2000
@@ -35,6 +35,102 @@ export interface ValidatedTokenResponseType extends ResponseType {
     uuid?: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface verifyEmailLogicValues {
+    user: UserType | null // userLogic
+    newlyRequestedVerificationLink: boolean | null
+    newlyRequestedVerificationLinkLoading: boolean
+    uuid: string | null
+    validatedEmailToken: ValidatedTokenResponseType | null
+    validatedEmailTokenLoading: boolean
+    view: 'invalid' | 'pending' | 'success' | 'verify' | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface verifyEmailLogicActions {
+    requestVerificationLink: (uuid: string) => {
+        uuid: string
+    }
+    requestVerificationLinkFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    requestVerificationLinkSuccess: (
+        newlyRequestedVerificationLink: boolean,
+        payload?: {
+            uuid: string
+        }
+    ) => {
+        newlyRequestedVerificationLink: boolean
+        payload?: {
+            uuid: string
+        }
+    }
+    setUuid: (uuid: string | null) => {
+        uuid: string | null
+    }
+    setView: (view: 'invalid' | 'pending' | 'success' | 'verify' | null) => {
+        view: 'invalid' | 'pending' | 'success' | 'verify' | null
+    }
+    validateEmailToken: ({ uuid, token }: { token: string; uuid: string }) => {
+        uuid: string
+        token: string
+    }
+    validateEmailTokenFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    validateEmailTokenSuccess: (
+        validatedEmailToken:
+            | {
+                  errorCode: any
+                  errorDetail: any
+                  success: false
+                  token?: undefined
+                  uuid?: undefined
+              }
+            | {
+                  errorCode?: undefined
+                  errorDetail?: undefined
+                  success: true
+                  token: string
+                  uuid: string
+              },
+        payload?: {
+            uuid: string
+            token: string
+        }
+    ) => {
+        validatedEmailToken:
+            | {
+                  errorCode: any
+                  errorDetail: any
+                  success: false
+                  token?: undefined
+                  uuid?: undefined
+              }
+            | {
+                  errorCode?: undefined
+                  errorDetail?: undefined
+                  success: true
+                  token: string
+                  uuid: string
+              }
+        payload?: {
+            uuid: string
+            token: string
+        }
+    }
+}
+
+export type verifyEmailLogicType = MakeLogicType<verifyEmailLogicValues, verifyEmailLogicActions>
+
 export const verifyEmailLogic = kea<verifyEmailLogicType>([
     path(['scenes', 'authentication', 'verify-email', 'verifyEmailLogic']),
     connect(() => ({ values: [userLogic, ['user']] })),
diff --git a/frontend/src/scenes/billing/billingLogic.tsx b/frontend/src/scenes/billing/billingLogic.tsx
index 63a94bc7859b..de13ffe2002a 100644
--- a/frontend/src/scenes/billing/billingLogic.tsx
+++ b/frontend/src/scenes/billing/billingLogic.tsx
@@ -1,5 +1,6 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { FieldNamePath, capitalizeFirstLetter, forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { lazyLoaders } from 'kea-loaders'
 import { router, urlToAction } from 'kea-router'
 import posthog from 'posthog-js'
@@ -30,13 +31,14 @@ import {
     StartupProgramLabel,
 } from '~/types'
 
+import type { FeatureFlagsSet } from '../../lib/logic/featureFlagLogic'
+import type { OrganizationType, PreflightStatus } from '../../types'
 import {
     buildUsageLimitApproachingMessage,
     buildUsageLimitExceededMessage,
     canAccessBilling as canAccessBillingUtil,
     getMinimumBillingAccessLevel,
 } from './billing-utils'
-import type { billingLogicType } from './billingLogicType'
 import { DEFAULT_ESTIMATED_MONTHLY_CREDIT_AMOUNT_USD } from './CreditCTAHero'
 
 export const ALLOCATION_THRESHOLD_ALERT = 0.85 // Threshold to show warning of event usage near limit
@@ -152,6 +154,512 @@ const isBillingAlertDismissed = (
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface billingLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    currentOrganization: OrganizationType | null // organizationLogic
+    currentOrganizationId: string // organizationLogic
+    preflight: PreflightStatus | null // preflightLogic
+    accountOwner: {
+        email?: string
+        name?: string
+    } | null
+    activateLicense: {
+        license: string
+    }
+    activateLicenseAllErrors: Record<string, any>
+    activateLicenseChanged: boolean
+    activateLicenseErrors: DeepPartialMap<
+        {
+            license: string
+        },
+        ValidationErrorType
+    >
+    activateLicenseHasErrors: boolean
+    activateLicenseManualErrors: Record<string, any>
+    activateLicenseTouched: boolean
+    activateLicenseTouches: Record<string, boolean>
+    activateLicenseValidationErrors: DeepPartialMap<
+        {
+            license: string
+        },
+        ValidationErrorType
+    >
+    billing: BillingType | null
+    billingAlert: BillingAlertConfig | null
+    billingError: BillingError | null
+    billingErrorLoading: boolean
+    billingLoading: boolean
+    billingPeriodUTC: BillingPeriod
+    billingPlan: BillingPlan | null
+    canAccessBilling: boolean
+    computedDiscount: number | null
+    creditBrackets: any[]
+    creditDiscount: number
+    creditForm: {
+        collectionMethod: string
+        creditInput: string
+    }
+    creditFormAllErrors: Record<string, any>
+    creditFormChanged: boolean
+    creditFormErrors: DeepPartialMap<
+        {
+            collectionMethod: string
+            creditInput: string
+        },
+        ValidationErrorType
+    >
+    creditFormHasErrors: boolean
+    creditFormManualErrors: Record<string, any>
+    creditFormTouched: boolean
+    creditFormTouches: Record<string, boolean>
+    creditFormValidationErrors: DeepPartialMap<
+        {
+            collectionMethod: string
+            creditInput: string
+        },
+        ValidationErrorType
+    >
+    creditOverview: {
+        cc_last_four: null
+        collection_method: null
+        credit_brackets: never[]
+        eligible: false
+        email: null
+        estimated_monthly_credit_amount_usd: null
+        invoice_url: null
+        status: string
+    }
+    creditOverviewLoading: boolean
+    currentPlatformAddon: BillingProductV2AddonType | null
+    estimatedMonthlyCreditAmountUsd: number | null
+    hasSupportAddonPlan: boolean
+    isActivateLicenseSubmitting: boolean
+    isActivateLicenseValid: boolean
+    isAnnualPlanCustomer: boolean
+    isCreditCTAHeroDismissed: boolean
+    isCreditFormSubmitting: boolean
+    isCreditFormValid: boolean
+    isManagedAccount: boolean
+    isOnboarding: boolean
+    isProductOverUsageLimit: (productKey: ProductKey) => boolean
+    isPurchaseCreditsModalOpen: boolean
+    isUnlicensedDebug: boolean
+    minimumBillingAccessLevel: OrganizationMembershipLevel
+    platformAddons: BillingProductV2AddonType[]
+    productSpecificAlert: BillingAlertConfig | null
+    products: BillingProductV2Type[]
+    productsLoading: boolean
+    redirectPath: string
+    scrollToProductKey: ProductKey | null
+    showActivateLicenseErrors: boolean
+    showBillingHero: boolean
+    showBillingSummary: boolean
+    showCreditCTAHero: boolean
+    showCreditFormErrors: boolean
+    showLicenseDirectInput: boolean
+    startupProgramLabelCurrent: StartupProgramLabel | null
+    startupProgramLabelPrevious: StartupProgramLabel | null
+    supportPlans: BillingPlanType[]
+    switchPlanLoading: string | null
+    timeRemainingInSeconds: number
+    timeTotalInSeconds: number
+    unsubscribeError: UnsubscribeError | null
+    unusedPlatformAddonAmount: number
+    upgradeLink: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface billingLogicActions {
+    reportProductUnsubscribed: (product: string) => {
+        product: string
+    } // eventUsageLogic
+    resetUsageLimitApproachingKey: () => {
+        value: true
+    } // lemonBannerLogic
+    resetUsageLimitExceededKey: () => {
+        value: true
+    } // lemonBannerLogic
+    loadCurrentOrganization: () => any // organizationLogic
+    loadUser: (resetOnFailure?: boolean | undefined) => {
+        resetOnFailure: boolean | undefined
+    } // userLogic
+    deactivateProduct: (key: string) => string
+    deactivateProductFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deactivateProductSuccess: (
+        billing: BillingType | null,
+        payload?: string
+    ) => {
+        billing: BillingType | null
+        payload?: string
+    }
+    determineBillingAlert: () => {
+        value: true
+    }
+    loadBilling: () => any
+    loadBillingFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadBillingSuccess: (
+        billing: BillingType,
+        payload?: any
+    ) => {
+        billing: BillingType
+        payload?: any
+    }
+    loadCreditOverview: () => any
+    loadCreditOverviewFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadCreditOverviewSuccess: (
+        creditOverview: {
+            cc_last_four: null
+            collection_method: null
+            credit_brackets: never[]
+            eligible: false
+            email: null
+            estimated_monthly_credit_amount_usd: null
+            invoice_url: null
+            status: string
+        },
+        payload?: any
+    ) => {
+        creditOverview: {
+            cc_last_four: null
+            collection_method: null
+            credit_brackets: never[]
+            eligible: false
+            email: null
+            estimated_monthly_credit_amount_usd: null
+            invoice_url: null
+            status: string
+        }
+        payload?: any
+    }
+    loadInvoices: () => any
+    loadInvoicesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadInvoicesSuccess: (
+        billingError: {
+            action: {
+                children: string
+                targetBlank: boolean
+                to: any
+            }
+            message: string
+            status: 'warning'
+        } | null,
+        payload?: any
+    ) => {
+        billingError: {
+            action: {
+                children: string
+                targetBlank: boolean
+                to: any
+            }
+            message: string
+            status: 'warning'
+        } | null
+        payload?: any
+    }
+    loadProducts: () => any
+    loadProductsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadProductsSuccess: (
+        products: BillingProductV2Type[],
+        payload?: any
+    ) => {
+        products: BillingProductV2Type[]
+        payload?: any
+    }
+    registerInstrumentationProps: () => {
+        value: true
+    }
+    reportBillingAlertActionClicked: (alertConfig: BillingAlertConfig) => {
+        alertConfig: BillingAlertConfig
+    }
+    reportBillingAlertShown: (alertConfig: BillingAlertConfig) => {
+        alertConfig: BillingAlertConfig
+    }
+    reportBillingShown: () => {
+        value: true
+    }
+    reportCreditsCTAShown: (creditOverview: any) => {
+        creditOverview: any
+    }
+    reportCreditsFormSubmitted: (creditInput: number) => {
+        creditInput: number
+    }
+    reportCreditsModalShown: () => {
+        value: true
+    }
+    resetActivateLicense: (values?: { license: string }) => {
+        values?: {
+            license: string
+        }
+    }
+    resetCreditForm: (values?: { collectionMethod: string; creditInput: string }) => {
+        values?: {
+            collectionMethod: string
+            creditInput: string
+        }
+    }
+    resetUnsubscribeError: () => {
+        value: true
+    }
+    scrollToProduct: (productType: string) => {
+        productType: string
+    }
+    setActivateLicenseManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setActivateLicenseValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setActivateLicenseValues: (
+        values: DeepPartial<{
+            license: string
+        }>
+    ) => {
+        values: DeepPartial<{
+            license: string
+        }>
+    }
+    setBillingAlert: (billingAlert: BillingAlertConfig | null) => {
+        billingAlert: BillingAlertConfig | null
+    }
+    setComputedDiscount: (discount: number) => {
+        discount: number
+    }
+    setCreditBrackets: (creditBrackets: any[]) => {
+        creditBrackets: any[]
+    }
+    setCreditFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setCreditFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setCreditFormValues: (
+        values: DeepPartial<{
+            collectionMethod: string
+            creditInput: string
+        }>
+    ) => {
+        values: DeepPartial<{
+            collectionMethod: string
+            creditInput: string
+        }>
+    }
+    setIsOnboarding: (isOnboarding: boolean) => {
+        isOnboarding: boolean
+    }
+    setProductSpecificAlert: (productSpecificAlert: BillingAlertConfig | null) => {
+        productSpecificAlert: BillingAlertConfig | null
+    }
+    setRedirectPath: (redirectPath: string) => {
+        redirectPath: string
+    }
+    setScrollToProductKey: (scrollToProductKey: ProductKey | null) => {
+        scrollToProductKey: ProductKey | null
+    }
+    setShowLicenseDirectInput: (show: boolean) => {
+        show: boolean
+    }
+    setSwitchPlanLoading: (productKey: string | null) => {
+        productKey: string | null
+    }
+    setUnsubscribeError: (error: UnsubscribeError | null) => {
+        error: UnsubscribeError | null
+    }
+    showPurchaseCreditsModal: (isOpen: boolean) => {
+        isOpen: boolean
+    }
+    submitActivateLicense: () => {
+        value: boolean
+    }
+    submitActivateLicenseFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitActivateLicenseRequest: (activateLicense: { license: string }) => {
+        activateLicense: {
+            license: string
+        }
+    }
+    submitActivateLicenseSuccess: (activateLicense: { license: string }) => {
+        activateLicense: {
+            license: string
+        }
+    }
+    submitCreditForm: () => {
+        value: boolean
+    }
+    submitCreditFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitCreditFormRequest: (creditForm: { collectionMethod: string; creditInput: string }) => {
+        creditForm: {
+            collectionMethod: string
+            creditInput: string
+        }
+    }
+    submitCreditFormSuccess: (creditForm: { collectionMethod: string; creditInput: string }) => {
+        creditForm: {
+            collectionMethod: string
+            creditInput: string
+        }
+    }
+    switchFlatrateSubscriptionPlan: (data: SwitchPlanPayload) => SwitchPlanPayload
+    switchFlatrateSubscriptionPlanFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    switchFlatrateSubscriptionPlanSuccess: (
+        billing: BillingType,
+        payload?: SwitchPlanPayload
+    ) => {
+        billing: BillingType
+        payload?: SwitchPlanPayload
+    }
+    toggleCreditCTAHeroDismissed: (isDismissed: boolean) => {
+        isDismissed: boolean
+    }
+    touchActivateLicenseField: (key: string) => {
+        key: string
+    }
+    touchCreditFormField: (key: string) => {
+        key: string
+    }
+    updateBillingLimits: (limits: { [key: string]: number | null }) => {
+        [key: string]: number | null
+    }
+    updateBillingLimitsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateBillingLimitsSuccess: (
+        billing: BillingType,
+        payload?: {
+            [key: string]: number | null
+        }
+    ) => {
+        billing: BillingType
+        payload?: {
+            [key: string]: number | null
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface billingLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        minimumBillingAccessLevel: (featureFlags: FeatureFlagsSet) => OrganizationMembershipLevel
+        canAccessBilling: (currentOrganization: OrganizationType | null, featureFlags: FeatureFlagsSet) => boolean
+        upgradeLink: (preflight: PreflightStatus | null) => string
+        isUnlicensedDebug: (preflight: PreflightStatus | null, billing: BillingType | null) => boolean
+        supportPlans: (billing: BillingType | null) => BillingPlanType[]
+        hasSupportAddonPlan: (billing: BillingType | null) => boolean
+        platformAddons: (billing: BillingType | null) => BillingProductV2AddonType[]
+        currentPlatformAddon: (billing: BillingType | null) => BillingProductV2AddonType | null
+        unusedPlatformAddonAmount: (
+            currentPlatformAddon: BillingProductV2AddonType | null,
+            timeRemainingInSeconds: number,
+            timeTotalInSeconds: number
+        ) => number
+        creditDiscount: (computedDiscount: number | null) => number
+        billingPlan: (billing: BillingType | null) => BillingPlan | null
+        startupProgramLabelCurrent: (billing: BillingType | null) => StartupProgramLabel | null
+        startupProgramLabelPrevious: (billing: BillingType | null) => StartupProgramLabel | null
+        isAnnualPlanCustomer: (billing: BillingType | null) => boolean
+        isProductOverUsageLimit: (billing: BillingType | null) => (productKey: ProductKey) => boolean
+        billingPeriodUTC: (billing: BillingType | null) => BillingPeriod
+        showBillingSummary: (billing: BillingType | null, isOnboarding: boolean) => boolean
+        showCreditCTAHero: (creditOverview: {
+            cc_last_four: null
+            collection_method: null
+            credit_brackets: never[]
+            eligible: false
+            email: null
+            estimated_monthly_credit_amount_usd: null
+            invoice_url: null
+            status: string
+        }) => boolean
+        showBillingHero: (
+            billing: BillingType | null,
+            billingPlan: BillingPlan | null,
+            showCreditCTAHero: boolean
+        ) => boolean
+        isManagedAccount: (billing: BillingType | null) => boolean
+        accountOwner: (billing: BillingType | null) => {
+            email?: string
+            name?: string
+        } | null
+        estimatedMonthlyCreditAmountUsd: (creditOverview: {
+            cc_last_four: null
+            collection_method: null
+            credit_brackets: never[]
+            eligible: false
+            email: null
+            estimated_monthly_credit_amount_usd: null
+            invoice_url: null
+            status: string
+        }) => number | null
+    }
+}
+
+export type billingLogicType = MakeLogicType<
+    billingLogicValues,
+    billingLogicActions,
+    Record<string, any>,
+    billingLogicMeta
+>
+
 export const billingLogic = kea<billingLogicType>([
     path(['scenes', 'billing', 'billingLogic']),
     actions({
@@ -519,12 +1027,15 @@ export const billingLogic = kea<billingLogicType>([
     selectors({
         minimumBillingAccessLevel: [
             (s) => [s.featureFlags],
-            (featureFlags): OrganizationMembershipLevel =>
+            (featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet): OrganizationMembershipLevel =>
                 getMinimumBillingAccessLevel(!!featureFlags[FEATURE_FLAGS.OWNER_ONLY_BILLING]),
         ],
         canAccessBilling: [
             (s) => [s.currentOrganization, s.featureFlags],
-            (currentOrganization, featureFlags): boolean =>
+            (
+                currentOrganization: null | import('~/types').OrganizationType,
+                featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet
+            ): boolean =>
                 canAccessBillingUtil(
                     currentOrganization?.membership_level,
                     !!featureFlags[FEATURE_FLAGS.OWNER_ONLY_BILLING]
@@ -533,7 +1044,8 @@ export const billingLogic = kea<billingLogicType>([
         upgradeLink: [(s) => [s.preflight], (): string => '/organization/billing'],
         isUnlicensedDebug: [
             (s) => [s.preflight, s.billing],
-            (preflight, billing): boolean => !!preflight?.is_debug && !billing?.billing_period,
+            (preflight: null | import('~/types').PreflightStatus, billing: BillingType | null): boolean =>
+                !!preflight?.is_debug && !billing?.billing_period,
         ],
         supportPlans: [
             (s) => [s.billing],
@@ -594,7 +1106,7 @@ export const billingLogic = kea<billingLogicType>([
                 return Math.round(amount * 100) / 100
             },
         ],
-        creditDiscount: [(s) => [s.computedDiscount], (computedDiscount) => computedDiscount || 0],
+        creditDiscount: [(s) => [s.computedDiscount], (computedDiscount: number | null) => computedDiscount || 0],
         billingPlan: [
             (s) => [s.billing],
             (billing: BillingType | null): BillingPlan | null => billing?.billing_plan || null,
@@ -636,7 +1148,16 @@ export const billingLogic = kea<billingLogicType>([
         ],
         showCreditCTAHero: [
             (s) => [s.creditOverview],
-            (creditOverview): boolean => {
+            (creditOverview: {
+                cc_last_four: null
+                collection_method: null
+                credit_brackets: never[]
+                eligible: false
+                email: null
+                estimated_monthly_credit_amount_usd: null
+                invoice_url: null
+                status: string
+            }): boolean => {
                 const isEligible = creditOverview.eligible
                 return isEligible && creditOverview.status !== 'paid'
             },
@@ -662,7 +1183,16 @@ export const billingLogic = kea<billingLogicType>([
         ],
         estimatedMonthlyCreditAmountUsd: [
             (s) => [s.creditOverview],
-            (creditOverview): number | null => {
+            (creditOverview: {
+                cc_last_four: null
+                collection_method: null
+                credit_brackets: never[]
+                eligible: false
+                email: null
+                estimated_monthly_credit_amount_usd: null
+                invoice_url: null
+                status: string
+            }): number | null => {
                 if (creditOverview === null) {
                     return null
                 }
diff --git a/frontend/src/scenes/billing/billingProductLogic.ts b/frontend/src/scenes/billing/billingProductLogic.ts
index 27e5d1404cd2..816c537e299b 100644
--- a/frontend/src/scenes/billing/billingProductLogic.ts
+++ b/frontend/src/scenes/billing/billingProductLogic.ts
@@ -1,5 +1,6 @@
-import { actions, connect, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { router } from 'kea-router'
 import posthog from 'posthog-js'
 import React from 'react'
@@ -21,9 +22,11 @@ import {
     SurveyEventName,
 } from '~/types'
 
+import type { FeatureFlagsSet } from '../../lib/logic/featureFlagLogic'
+import type { ProductKey } from '../../queries/schema/schema-general'
 import { calculateFreeTier, createGaugeItems, isAddonVisible, isProductVariantPrimary } from './billing-utils'
 import { billingLogic } from './billingLogic'
-import type { billingProductLogicType } from './billingProductLogicType'
+import type { BillingAlertConfig, SwitchPlanPayload, UnsubscribeError } from './billingLogic'
 import { DATA_PIPELINES_CUTOFF_DATE } from './constants'
 import { paymentEntryLogic } from './paymentEntryLogic'
 import { BillingGaugeItemKind, BillingGaugeItemType } from './types'
@@ -80,6 +83,392 @@ export interface BillingProductLogicProps {
     hogfettiTrigger?: () => void
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface billingProductLogicValues {
+    billing: BillingType | null // billingLogic
+    currentPlatformAddon: BillingProductV2AddonType | null // billingLogic
+    isUnlicensedDebug: boolean // billingLogic
+    platformAddons: BillingProductV2AddonType[] // billingLogic
+    scrollToProductKey: ProductKey | null // billingLogic
+    timeRemainingInSeconds: number // billingLogic
+    timeTotalInSeconds: number // billingLogic
+    unsubscribeError: UnsubscribeError | null // billingLogic
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    billingGaugeItems: BillingGaugeItemType[]
+    billingLimitAsUsage: number
+    billingLimitInput: Record<string, any>
+    billingLimitInputAllErrors: Record<string, any>
+    billingLimitInputChanged: boolean
+    billingLimitInputErrors: DeepPartialMap<Record<string, any>, ValidationErrorType>
+    billingLimitInputHasErrors: boolean
+    billingLimitInputManualErrors: Record<string, any>
+    billingLimitInputTouched: boolean
+    billingLimitInputTouches: Record<string, boolean>
+    billingLimitInputValidationErrors: DeepPartialMap<Record<string, any>, ValidationErrorType>
+    billingLimitNextPeriod: number | null
+    billingProductLoading: string | null
+    combinedMonetaryData: {
+        billingLimit: number | null
+        currentTotal: number
+        discountPercent: number
+        projectedTotal: number
+        rawCurrentTotal: string
+        rawProjectedTotal: string
+    }
+    combinedMonetaryGaugeItems: BillingGaugeItemType[]
+    comparisonModalHighlightedFeatureKey: string | null
+    confirmDowngradeModalOpen: boolean
+    confirmUpgradeModalOpen: boolean
+    currentAmountTotalActual: string
+    currentAndUpgradePlans: {
+        currentPlan: BillingPlanType | null
+        upgradePlan: BillingPlanType
+    }
+    customLimitUsd: number | null
+    freeTier: number
+    hasCustomLimitSet: boolean
+    hedgehogSatisfied: boolean
+    isAddonProduct: boolean
+    isBillingLimitInputSubmitting: boolean
+    isBillingLimitInputValid: boolean
+    isDataPipelinesDeprecated: boolean
+    isEditingBillingLimit: boolean
+    isLowerTierThanCurrentAddon: boolean
+    isPlanComparisonModalOpen: boolean
+    isPricingModalOpen: boolean
+    isProductWithVariants: boolean
+    isProrated: boolean
+    isSubscribedToAnotherAddon: boolean
+    productVariants: Array<{
+        displayName: string
+        key: string
+        product: BillingProductV2AddonType | BillingProductV2Type
+    }> | null
+    projectedAmountExcludingAddons: string
+    proratedAmount: number
+    showBillingLimitInputErrors: boolean
+    showTierBreakdown: boolean
+    surveyID: string
+    surveyResponse: {
+        $survey_response: string
+        $survey_response_2: string[]
+    }
+    trialCancelReasonQuestions: string
+    trialLoading: boolean
+    unsubscribeModalStep: number
+    unsubscribeReasonQuestions: string
+    unsubscribeReasonSurvey: null
+    variantExpandedStates: Record<string, boolean>
+    visibleAddons: BillingProductV2AddonType[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface billingProductLogicActions {
+    deactivateProduct: (key: string) => string // billingLogic
+    deactivateProductSuccess: (
+        billing: BillingType | null,
+        payload?: string | undefined
+    ) => {
+        billing: BillingType | null
+        payload?: string
+    } // billingLogic
+    loadBilling: () => any // billingLogic
+    loadBillingSuccess: (
+        billing: BillingType,
+        payload?: any
+    ) => {
+        billing: BillingType
+        payload?: any
+    } // billingLogic
+    setProductSpecificAlert: (productSpecificAlert: BillingAlertConfig | null) => {
+        productSpecificAlert: BillingAlertConfig | null
+    } // billingLogic
+    setScrollToProductKey: (scrollToProductKey: ProductKey | null) => {
+        scrollToProductKey: ProductKey | null
+    } // billingLogic
+    setSwitchPlanLoading: (productKey: string | null) => {
+        productKey: string | null
+    } // billingLogic
+    switchFlatrateSubscriptionPlan: (data: SwitchPlanPayload) => SwitchPlanPayload // billingLogic
+    updateBillingLimits: (limits: { [key: string]: number | null }) => {
+        [key: string]: number | null
+    } // billingLogic
+    updateBillingLimitsSuccess: (
+        billing: BillingType,
+        payload?:
+            | {
+                  [key: string]: number | null
+              }
+            | undefined
+    ) => {
+        billing: BillingType
+        payload?: {
+            [key: string]: number | null
+        }
+    } // billingLogic
+    activateTrial: () => {
+        value: true
+    }
+    billingLoaded: () => {
+        value: true
+    }
+    cancelTrial: () => {
+        value: true
+    }
+    confirmProductDowngrade: () => {
+        value: true
+    }
+    confirmProductUpgrade: () => {
+        value: true
+    }
+    handleProductUpgrade: (
+        products: string,
+        redirectPath?: string
+    ) => {
+        products: string
+        redirectPath: string | undefined
+    }
+    hideConfirmDowngradeModal: () => {
+        value: true
+    }
+    hideConfirmUpgradeModal: () => {
+        value: true
+    }
+    initiateProductUpgrade: (
+        product: BillingProductV2AddonType | BillingProductV2Type,
+        plan: BillingPlanType,
+        redirectPath?: string
+    ) => {
+        plan: BillingPlanType
+        product: BillingProductV2AddonType | BillingProductV2Type
+        redirectPath: string | undefined
+    }
+    removeBillingLimitNextPeriod: (productType: string) => {
+        productType: string
+    }
+    reportSurveyDismissed: (surveyID: string) => {
+        surveyID: string
+    }
+    reportSurveySent: (
+        surveyID: string,
+        surveyResponse: Record<string, string | string[]>
+    ) => {
+        surveyID: string
+        surveyResponse: Record<string, string | string[]>
+    }
+    reportSurveyShown: (
+        surveyID: string,
+        productType: string
+    ) => {
+        productType: string
+        surveyID: string
+    }
+    resetBillingLimitInput: (values?: Record<string, any>) => {
+        values?: Record<string, any>
+    }
+    resetUnsubscribeModalStep: () => {
+        value: true
+    }
+    setBillingLimitInput: (billingLimitInput: number | null) => {
+        billingLimitInput: number | null
+    }
+    setBillingLimitInputManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setBillingLimitInputValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setBillingLimitInputValues: (values: DeepPartial<Record<string, any>>) => {
+        values: DeepPartial<Record<string, any>>
+    }
+    setBillingProductLoading: (productKey: string | null) => {
+        productKey: string | null
+    }
+    setHedgehogSatisfied: (satisfied: boolean) => {
+        satisfied: boolean
+    }
+    setIsEditingBillingLimit: (isEditingBillingLimit: boolean) => {
+        isEditingBillingLimit: boolean
+    }
+    setShowTierBreakdown: (showTierBreakdown: boolean) => {
+        showTierBreakdown: boolean
+    }
+    setSurveyID: (surveyID: string) => {
+        surveyID: string
+    }
+    setSurveyResponse: (
+        key: string,
+        value: string | string[]
+    ) => {
+        key: string
+        value: string | string[]
+    }
+    setTrialLoading: (loading: boolean) => {
+        loading: boolean
+    }
+    setUnsubscribeModalStep: (step: number) => {
+        step: number
+    }
+    showConfirmDowngradeModal: () => {
+        value: true
+    }
+    showConfirmUpgradeModal: () => {
+        value: true
+    }
+    submitBillingLimitInput: () => {
+        value: boolean
+    }
+    submitBillingLimitInputFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitBillingLimitInputRequest: (billingLimitInput: Record<string, any>) => {
+        billingLimitInput: Record<string, any>
+    }
+    submitBillingLimitInputSuccess: (billingLimitInput: Record<string, any>) => {
+        billingLimitInput: Record<string, any>
+    }
+    toggleIsPlanComparisonModalOpen: (highlightedFeatureKey?: string) => {
+        highlightedFeatureKey: string | undefined
+    }
+    toggleIsPricingModalOpen: () => {
+        value: true
+    }
+    toggleSurveyReason: (reason: string) => {
+        reason: string
+    }
+    toggleVariantExpanded: (variantKey: string) => {
+        variantKey: string
+    }
+    touchBillingLimitInputField: (key: string) => {
+        key: string
+    }
+    triggerMoreHedgehogs: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface billingProductLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        proratedAmount: (
+            currentAndUpgradePlans: {
+                currentPlan: BillingPlanType | null
+                upgradePlan: BillingPlanType
+            },
+            timeRemainingInSeconds: number,
+            timeTotalInSeconds: number
+        ) => number
+        isProrated: (
+            billing: BillingType | null,
+            currentAndUpgradePlans: {
+                currentPlan: BillingPlanType | null
+                upgradePlan: BillingPlanType
+            },
+            proratedAmount: number
+        ) => boolean
+        isLowerTierThanCurrentAddon: (
+            product: BillingProductV2AddonType | BillingProductV2Type,
+            currentPlatformAddon: BillingProductV2AddonType | null,
+            platformAddons: BillingProductV2AddonType[]
+        ) => boolean
+        isSubscribedToAnotherAddon: (
+            billing: BillingType | null,
+            product: BillingProductV2AddonType | BillingProductV2Type
+        ) => boolean
+        customLimitUsd: (
+            billing: BillingType | null,
+            product: BillingProductV2AddonType | BillingProductV2Type
+        ) => number | null
+        visibleAddons: (
+            featureFlags: FeatureFlagsSet,
+            product: BillingProductV2AddonType | BillingProductV2Type
+        ) => BillingProductV2AddonType[]
+        hasCustomLimitSet: (customLimitUsd: number | null) => boolean
+        isDataPipelinesDeprecated: (product: BillingProductV2AddonType | BillingProductV2Type) => boolean
+        currentAndUpgradePlans: (product: BillingProductV2AddonType | BillingProductV2Type) => {
+            currentPlan: BillingPlanType | null
+            upgradePlan: BillingPlanType
+        }
+        freeTier: (product: BillingProductV2AddonType | BillingProductV2Type) => number
+        billingLimitAsUsage: (product: BillingProductV2AddonType | BillingProductV2Type) => number
+        billingLimitNextPeriod: (
+            billing: BillingType | null,
+            product: BillingProductV2AddonType | BillingProductV2Type
+        ) => number | null
+        billingGaugeItems: (
+            product: BillingProductV2AddonType | BillingProductV2Type,
+            billing: BillingType | null,
+            billingLimitAsUsage: number
+        ) => BillingGaugeItemType[]
+        isAddonProduct: (
+            billing: BillingType | null,
+            product: BillingProductV2AddonType | BillingProductV2Type
+        ) => boolean
+        unsubscribeReasonQuestions: (surveyResponse: {
+            $survey_response: string
+            $survey_response_2: string[]
+        }) => string
+        trialCancelReasonQuestions: (surveyResponse: {
+            $survey_response: string
+            $survey_response_2: string[]
+        }) => string
+        isProductWithVariants: (product: BillingProductV2AddonType | BillingProductV2Type) => boolean
+        projectedAmountExcludingAddons: (
+            isProductWithVariants: boolean,
+            product: BillingProductV2AddonType | BillingProductV2Type
+        ) => string
+        productVariants: (
+            isProductWithVariants: boolean,
+            product: BillingProductV2AddonType | BillingProductV2Type
+        ) => Array<{
+            displayName: string
+            key: string
+            product: BillingProductV2AddonType | BillingProductV2Type
+        }> | null
+        combinedMonetaryData: (
+            customLimitUsd: number | null,
+            product: BillingProductV2AddonType | BillingProductV2Type,
+            billing: BillingType | null
+        ) => {
+            billingLimit: number | null
+            currentTotal: number
+            discountPercent: number
+            projectedTotal: number
+            rawCurrentTotal: string
+            rawProjectedTotal: string
+        }
+        combinedMonetaryGaugeItems: (combinedMonetaryData: {
+            billingLimit: number | null
+            currentTotal: number
+            discountPercent: number
+            projectedTotal: number
+            rawCurrentTotal: string
+            rawProjectedTotal: string
+        }) => BillingGaugeItemType[]
+        currentAmountTotalActual: (
+            isProductWithVariants: boolean,
+            product: BillingProductV2AddonType | BillingProductV2Type,
+            visibleAddons: BillingProductV2AddonType[]
+        ) => string
+    }
+}
+
+export type billingProductLogicType = MakeLogicType<
+    billingProductLogicValues,
+    billingProductLogicActions,
+    BillingProductLogicProps,
+    billingProductLogicMeta
+>
+
 export const billingProductLogic = kea<billingProductLogicType>([
     props({} as BillingProductLogicProps),
     key((props) => props.product.type),
@@ -284,7 +673,14 @@ export const billingProductLogic = kea<billingProductLogicType>([
     selectors(({ values }) => ({
         proratedAmount: [
             (s) => [s.currentAndUpgradePlans, s.timeRemainingInSeconds, s.timeTotalInSeconds],
-            (currentAndUpgradePlans, timeRemainingInSeconds, timeTotalInSeconds): number => {
+            (
+                currentAndUpgradePlans: {
+                    currentPlan: BillingPlanType | null
+                    upgradePlan: BillingPlanType
+                },
+                timeRemainingInSeconds: number,
+                timeTotalInSeconds: number
+            ): number => {
                 if (!timeTotalInSeconds) {
                     return 0
                 }
@@ -296,7 +692,14 @@ export const billingProductLogic = kea<billingProductLogicType>([
         ],
         isProrated: [
             (s) => [s.billing, s.currentAndUpgradePlans, s.proratedAmount],
-            (billing, currentAndUpgradePlans, proratedAmount): boolean => {
+            (
+                billing: BillingType | null,
+                currentAndUpgradePlans: {
+                    currentPlan: BillingPlanType | null
+                    upgradePlan: BillingPlanType
+                },
+                proratedAmount: number
+            ): boolean => {
                 const hasActiveSubscription = billing?.has_active_subscription
                 const amountUsd = currentAndUpgradePlans.upgradePlan?.unit_amount_usd
                 if (!hasActiveSubscription || !amountUsd) {
@@ -307,7 +710,11 @@ export const billingProductLogic = kea<billingProductLogicType>([
         ],
         isLowerTierThanCurrentAddon: [
             (s, p) => [p.product, s.currentPlatformAddon, s.platformAddons],
-            (product, currentPlatformAddon, platformAddons): boolean => {
+            (
+                product: BillingProductV2AddonType | BillingProductV2Type,
+                currentPlatformAddon: BillingProductV2AddonType | null,
+                platformAddons: BillingProductV2AddonType[]
+            ): boolean => {
                 if (!currentPlatformAddon || platformAddons.length === 0) {
                     return false
                 }
@@ -345,7 +752,7 @@ export const billingProductLogic = kea<billingProductLogicType>([
         ],
         customLimitUsd: [
             (s, p) => [s.billing, p.product],
-            (billing, product) => {
+            (billing: BillingType | null, product: BillingProductV2AddonType | BillingProductV2Type) => {
                 const customLimit = billing?.custom_limits_usd?.[product.type]
                 if (customLimit === 0 || customLimit) {
                     return Number(customLimit)
@@ -368,7 +775,7 @@ export const billingProductLogic = kea<billingProductLogicType>([
         ],
         hasCustomLimitSet: [
             (s) => [s.customLimitUsd],
-            (customLimitUsd) => (!!customLimitUsd || customLimitUsd === 0) && customLimitUsd >= 0,
+            (customLimitUsd: number | null) => (!!customLimitUsd || customLimitUsd === 0) && customLimitUsd >= 0,
         ],
         isDataPipelinesDeprecated: [
             (_s, p) => [p.product],
@@ -378,7 +785,7 @@ export const billingProductLogic = kea<billingProductLogicType>([
         ],
         currentAndUpgradePlans: [
             (_s, p) => [p.product],
-            (product) => {
+            (product: BillingProductV2AddonType | BillingProductV2Type) => {
                 const currentPlanIndex = product.plans.findIndex((plan: BillingPlanType) => plan.current_plan)
                 const currentPlan = currentPlanIndex >= 0 ? product.plans?.[currentPlanIndex] : null
                 const upgradePlan =
@@ -390,16 +797,19 @@ export const billingProductLogic = kea<billingProductLogicType>([
                 return { currentPlan, upgradePlan }
             },
         ],
-        freeTier: [(_s, p) => [p.product], (product) => calculateFreeTier(product)],
+        freeTier: [
+            (_s, p) => [p.product],
+            (product: BillingProductV2AddonType | BillingProductV2Type) => calculateFreeTier(product),
+        ],
         billingLimitAsUsage: [
             (_, p) => [p.product],
-            (product) => {
+            (product: BillingProductV2AddonType | BillingProductV2Type) => {
                 return product.usage_limit || 0
             },
         ],
         billingLimitNextPeriod: [
             (s, p) => [s.billing, p.product],
-            (billing, product) => {
+            (billing: BillingType | null, product: BillingProductV2AddonType | BillingProductV2Type) => {
                 const nextPeriodLimit = billing?.next_period_custom_limits_usd?.[product.type]
                 if (nextPeriodLimit === 0 || nextPeriodLimit) {
                     return nextPeriodLimit
@@ -409,7 +819,11 @@ export const billingProductLogic = kea<billingProductLogicType>([
         ],
         billingGaugeItems: [
             (s, p) => [p.product, s.billing, s.billingLimitAsUsage],
-            (product, billing, billingLimitAsUsage): BillingGaugeItemType[] => {
+            (
+                product: BillingProductV2AddonType | BillingProductV2Type,
+                billing: BillingType | null,
+                billingLimitAsUsage: number
+            ): BillingGaugeItemType[] => {
                 return createGaugeItems(product, {
                     billing,
                     billingLimitAsUsage,
@@ -418,12 +832,12 @@ export const billingProductLogic = kea<billingProductLogicType>([
         ],
         isAddonProduct: [
             (s, p) => [s.billing, p.product],
-            (billing, product): boolean =>
+            (billing: BillingType | null, product: BillingProductV2AddonType | BillingProductV2Type): boolean =>
                 !!billing?.products?.some((p) => p.addons?.some((addon) => addon.type === product?.type)),
         ],
         unsubscribeReasonQuestions: [
             (s) => [s.surveyResponse],
-            (surveyResponse): string => {
+            (surveyResponse: { $survey_response: string; $survey_response_2: string[] }): string => {
                 return surveyResponse['$survey_response_2']
                     .map((reason) => {
                         const reasonObject = UNSUBSCRIBE_REASONS.find((r) => r.reason === reason)
@@ -434,7 +848,7 @@ export const billingProductLogic = kea<billingProductLogicType>([
         ],
         trialCancelReasonQuestions: [
             (s) => [s.surveyResponse],
-            (surveyResponse): string => {
+            (surveyResponse: { $survey_response: string; $survey_response_2: string[] }): string => {
                 return surveyResponse['$survey_response_2']
                     .map((reason) => {
                         const reasonObject = TRIAL_CANCEL_REASONS.find((r) => r.reason === reason)
@@ -445,12 +859,12 @@ export const billingProductLogic = kea<billingProductLogicType>([
         ],
         isProductWithVariants: [
             (_s, p) => [p.product],
-            (product): boolean =>
+            (product: BillingProductV2AddonType | BillingProductV2Type): boolean =>
                 isProductVariantPrimary(product.type) && 'addons' in product && product.addons?.length > 0,
         ],
         projectedAmountExcludingAddons: [
             (s, p) => [s.isProductWithVariants, p.product],
-            (isProductWithVariants, product): string => {
+            (isProductWithVariants: boolean, product: BillingProductV2AddonType | BillingProductV2Type): string => {
                 if (!isProductWithVariants) {
                     return product.projected_amount_usd || '0'
                 }
@@ -565,7 +979,11 @@ export const billingProductLogic = kea<billingProductLogicType>([
         ],
         currentAmountTotalActual: [
             (s, p) => [s.isProductWithVariants, p.product, s.visibleAddons],
-            (isProductWithVariants, product, visibleAddons): string => {
+            (
+                isProductWithVariants: boolean,
+                product: BillingProductV2AddonType | BillingProductV2Type,
+                visibleAddons: BillingProductV2AddonType[]
+            ): string => {
                 if (!product.tiers) {
                     return '0.00'
                 }
diff --git a/frontend/src/scenes/billing/billingSpendLogic.ts b/frontend/src/scenes/billing/billingSpendLogic.ts
index 32e3062f31fe..b3eaec9fbbc1 100644
--- a/frontend/src/scenes/billing/billingSpendLogic.ts
+++ b/frontend/src/scenes/billing/billingSpendLogic.ts
@@ -1,5 +1,5 @@
 import { deepEqual as equal } from 'fast-equals'
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 import difference from 'lodash.difference'
@@ -25,8 +25,8 @@ import {
 } from './billing-utils'
 import type { BillingPeriodMarker } from './BillingLineGraph'
 import { billingLogic } from './billingLogic'
-import type { billingSpendLogicType } from './billingSpendLogicType'
 import type { BillingFilters } from './types'
+import type { BillingPeriod, BillingType } from '../../types'
 
 export enum BillingSpendResponseBreakdownType {
     TYPE = 'type',
@@ -68,6 +68,138 @@ export interface BillingSpendLogicProps {
     syncWithUrl?: boolean // Default false - only intended on usage and spend pages
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface billingSpendLogicValues {
+    billing: BillingType | null; // billingLogic
+    billingPeriodUTC: BillingPeriod; // billingLogic
+    canAccessBilling: boolean; // billingLogic
+    currentOrganization: OrganizationType | null; // billingLogic
+    isHobby: boolean; // preflightLogic
+    billingPeriodMarkers: BillingPeriodMarker[];
+    billingSpendResponse: BillingSpendResponse | null;
+    billingSpendResponseLoading: boolean;
+    dateFrom: string;
+    dateOptions: DateMappingOption[];
+    dateTo: string;
+    dates: string[];
+    emptySeriesIDs: number[];
+    excludeEmptySeries: boolean;
+    filters: {
+        breakdowns?: ("team" | "type")[] | undefined;
+        interval?: "day" | "month" | "week" | undefined;
+        team_ids?: number[] | undefined;
+        usage_types?: string[] | undefined;
+    };
+    finalHiddenSeries: number[];
+    heading: string;
+    headingTooltip: string | null;
+    series: {
+        breakdown_type: BillingSpendResponseBreakdownType | null;
+        breakdown_value: string | string[] | null;
+        data: number[];
+        dates: string[];
+        id: number;
+        label: string;
+    }[];
+    showEmptyState: boolean;
+    showSeries: boolean;
+    teamOptions: {
+        key: string;
+        label: string;
+    }[];
+    userHiddenSeries: number[];
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface billingSpendLogicActions {
+    reportBillingSpendInteraction: (properties: import("./types").BillingUsageInteractionProps) => {
+        properties: import("./types").BillingUsageInteractionProps;
+    }; // eventUsageLogic
+    loadBillingSpend: () => any;
+    loadBillingSpendFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadBillingSpendSuccess: (billingSpendResponse: BillingSpendResponse | null, payload?: any) => {
+        billingSpendResponse: BillingSpendResponse | null;
+        payload?: any;
+    };
+    resetFilters: () => {
+        value: true;
+    };
+    setDateRange: (dateFrom: string | null, dateTo: string | null, shouldDebounce?: boolean) => {
+        dateFrom: string | null;
+        dateTo: string | null;
+        shouldDebounce: boolean;
+    };
+    setExcludeEmptySeries: (exclude: boolean, shouldDebounce?: boolean) => {
+        exclude: boolean;
+        shouldDebounce: boolean;
+    };
+    setFilters: (filters: Partial<BillingFilters>, shouldDebounce?: boolean) => {
+        filters: Partial<BillingFilters>;
+        shouldDebounce: boolean;
+    };
+    toggleAllSeries: () => {
+        value: true;
+    };
+    toggleBreakdown: (dimension: "team" | "type") => {
+        dimension: "team" | "type";
+    };
+    toggleSeries: (id: number) => {
+        id: number;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface billingSpendLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        series: (billingSpendResponse: BillingSpendResponse | null) => {
+            breakdown_type: BillingSpendResponseBreakdownType | null;
+            breakdown_value: string | string[] | null;
+            data: number[];
+            dates: string[];
+            id: number;
+            label: string;
+        }[];
+        dates: (billingSpendResponse: BillingSpendResponse | null) => string[];
+        dateOptions: (billingPeriodUTC: BillingPeriod) => DateMappingOption[];
+        billingPeriodMarkers: (billingPeriodUTC: BillingPeriod, dateFrom: string, dateTo: string) => BillingPeriodMarker[];
+        emptySeriesIDs: (series: {
+            breakdown_type: BillingSpendResponseBreakdownType | null;
+            breakdown_value: string | string[] | null;
+            data: number[];
+            dates: string[];
+            id: number;
+            label: string;
+        }[]) => number[];
+        finalHiddenSeries: (userHiddenSeries: number[], excludeEmptySeries: boolean, emptySeriesIDs: number[]) => number[];
+        showSeries: (billingSpendResponseLoading: boolean, series: {
+            breakdown_type: BillingSpendResponseBreakdownType | null;
+            breakdown_value: string | string[] | null;
+            data: number[];
+            dates: string[];
+            id: number;
+            label: string;
+        }[]) => boolean;
+        showEmptyState: (showSeries: boolean, billingSpendResponse: BillingSpendResponse | null) => boolean;
+        heading: (filters: {
+            breakdowns?: ("team" | "type")[] | undefined;
+            interval?: "day" | "month" | "week" | undefined;
+            team_ids?: number[] | undefined;
+            usage_types?: string[] | undefined;
+        }) => string;
+        headingTooltip: (dateTo: string) => string | null;
+        teamOptions: (currentOrganization: OrganizationType | null, billingSpendResponse: BillingSpendResponse | null) => {
+            key: string;
+            label: string;
+        }[];
+    };
+}
+
+export type billingSpendLogicType = MakeLogicType<billingSpendLogicValues, billingSpendLogicActions, BillingSpendLogicProps, billingSpendLogicMeta>;
+
 export const billingSpendLogic = kea<billingSpendLogicType>([
     path(['scenes', 'billing', 'billingSpendLogic']),
     props({} as BillingSpendLogicProps),
@@ -186,7 +318,7 @@ export const billingSpendLogic = kea<billingSpendLogicType>([
         ],
         dateOptions: [
             (s) => [s.billingPeriodUTC],
-            (currentPeriod): DateMappingOption[] => {
+            (currentPeriod: BillingPeriod): DateMappingOption[] => {
                 const currentBillingPeriodStart = currentPeriod.start
                 const currentBillingPeriodEnd = currentPeriod.end
                 const currentBillingPeriodOption: DateMappingOption = {
@@ -210,7 +342,7 @@ export const billingSpendLogic = kea<billingSpendLogicType>([
         ],
         billingPeriodMarkers: [
             (s) => [s.billingPeriodUTC, s.dateFrom, s.dateTo],
-            (currentPeriod, dateFrom: string, dateTo: string): BillingPeriodMarker[] => {
+            (currentPeriod: BillingPeriod, dateFrom: string, dateTo: string): BillingPeriodMarker[] => {
                 return calculateBillingPeriodMarkers(currentPeriod, dateFrom, dateTo)
             },
         ],
diff --git a/frontend/src/scenes/billing/billingUsageLogic.ts b/frontend/src/scenes/billing/billingUsageLogic.ts
index 3d00eaecb545..2e9876bb03ae 100644
--- a/frontend/src/scenes/billing/billingUsageLogic.ts
+++ b/frontend/src/scenes/billing/billingUsageLogic.ts
@@ -1,5 +1,5 @@
 import { deepEqual as equal } from 'fast-equals'
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 import difference from 'lodash.difference'
@@ -25,8 +25,8 @@ import {
 } from './billing-utils'
 import type { BillingPeriodMarker } from './BillingLineGraph'
 import { billingLogic } from './billingLogic'
-import type { billingUsageLogicType } from './billingUsageLogicType'
 import type { BillingFilters } from './types'
+import type { BillingPeriod, BillingType } from '../../types'
 
 // These date filters return correct data but there's an issue with filter label after selecting it, showing 'No date range override' instead
 const TEMPORARILY_EXCLUDED_DATE_FILTER_OPTIONS = ['This month', 'Year to date', 'All time']
@@ -71,6 +71,138 @@ export interface BillingUsageLogicProps {
     syncWithUrl?: boolean // Default false - only intended on usage and spend pages
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface billingUsageLogicValues {
+    billing: BillingType | null; // billingLogic
+    billingPeriodUTC: BillingPeriod; // billingLogic
+    canAccessBilling: boolean; // billingLogic
+    currentOrganization: OrganizationType | null; // billingLogic
+    isHobby: boolean; // preflightLogic
+    billingPeriodMarkers: BillingPeriodMarker[];
+    billingUsageResponse: BillingUsageResponse | null;
+    billingUsageResponseLoading: boolean;
+    dateFrom: string;
+    dateOptions: DateMappingOption[];
+    dateTo: string;
+    dates: string[];
+    emptySeriesIDs: number[];
+    excludeEmptySeries: boolean;
+    filters: {
+        breakdowns?: ("team" | "type")[] | undefined;
+        interval?: "day" | "month" | "week" | undefined;
+        team_ids?: number[] | undefined;
+        usage_types?: string[] | undefined;
+    };
+    finalHiddenSeries: number[];
+    heading: string;
+    headingTooltip: string | null;
+    series: {
+        breakdown_type: BillingUsageResponseBreakdownType | null;
+        breakdown_value: string | string[] | null;
+        data: number[];
+        dates: string[];
+        id: number;
+        label: string;
+    }[];
+    showEmptyState: boolean;
+    showSeries: boolean;
+    teamOptions: {
+        key: string;
+        label: string;
+    }[];
+    userHiddenSeries: number[];
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface billingUsageLogicActions {
+    reportBillingUsageInteraction: (properties: import("./types").BillingUsageInteractionProps) => {
+        properties: import("./types").BillingUsageInteractionProps;
+    }; // eventUsageLogic
+    loadBillingUsage: () => any;
+    loadBillingUsageFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadBillingUsageSuccess: (billingUsageResponse: BillingUsageResponse | null, payload?: any) => {
+        billingUsageResponse: BillingUsageResponse | null;
+        payload?: any;
+    };
+    resetFilters: () => {
+        value: true;
+    };
+    setDateRange: (dateFrom: string | null, dateTo: string | null, shouldDebounce?: boolean) => {
+        dateFrom: string | null;
+        dateTo: string | null;
+        shouldDebounce: boolean;
+    };
+    setExcludeEmptySeries: (exclude: boolean, shouldDebounce?: boolean) => {
+        exclude: boolean;
+        shouldDebounce: boolean;
+    };
+    setFilters: (filters: Partial<BillingFilters>, shouldDebounce?: boolean) => {
+        filters: Partial<BillingFilters>;
+        shouldDebounce: boolean;
+    };
+    toggleAllSeries: () => {
+        value: true;
+    };
+    toggleSeries: (id: number) => {
+        id: number;
+    };
+    toggleTeamBreakdown: () => {
+        value: true;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface billingUsageLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        dateOptions: (billingPeriodUTC: BillingPeriod) => DateMappingOption[];
+        billingPeriodMarkers: (billingPeriodUTC: BillingPeriod, dateFrom: string, dateTo: string) => BillingPeriodMarker[];
+        series: (billingUsageResponse: BillingUsageResponse | null) => {
+            breakdown_type: BillingUsageResponseBreakdownType | null;
+            breakdown_value: string | string[] | null;
+            data: number[];
+            dates: string[];
+            id: number;
+            label: string;
+        }[];
+        dates: (billingUsageResponse: BillingUsageResponse | null) => string[];
+        emptySeriesIDs: (series: {
+            breakdown_type: BillingUsageResponseBreakdownType | null;
+            breakdown_value: string | string[] | null;
+            data: number[];
+            dates: string[];
+            id: number;
+            label: string;
+        }[]) => number[];
+        finalHiddenSeries: (userHiddenSeries: number[], excludeEmptySeries: boolean, emptySeriesIDs: number[]) => number[];
+        showSeries: (billingUsageResponseLoading: boolean, series: {
+            breakdown_type: BillingUsageResponseBreakdownType | null;
+            breakdown_value: string | string[] | null;
+            data: number[];
+            dates: string[];
+            id: number;
+            label: string;
+        }[]) => boolean;
+        showEmptyState: (showSeries: boolean, billingUsageResponse: BillingUsageResponse | null) => boolean;
+        heading: (filters: {
+            breakdowns?: ("team" | "type")[] | undefined;
+            interval?: "day" | "month" | "week" | undefined;
+            team_ids?: number[] | undefined;
+            usage_types?: string[] | undefined;
+        }) => string;
+        headingTooltip: (dateTo: string) => string | null;
+        teamOptions: (currentOrganization: OrganizationType | null, billingUsageResponse: BillingUsageResponse | null) => {
+            key: string;
+            label: string;
+        }[];
+    };
+}
+
+export type billingUsageLogicType = MakeLogicType<billingUsageLogicValues, billingUsageLogicActions, BillingUsageLogicProps, billingUsageLogicMeta>;
+
 export const billingUsageLogic = kea<billingUsageLogicType>([
     path(['scenes', 'billing', 'billingUsageLogic']),
     props({} as BillingUsageLogicProps),
@@ -176,7 +308,7 @@ export const billingUsageLogic = kea<billingUsageLogicType>([
     selectors({
         dateOptions: [
             (s) => [s.billingPeriodUTC],
-            (currentPeriod): DateMappingOption[] => {
+            (currentPeriod: BillingPeriod): DateMappingOption[] => {
                 const currentBillingPeriodStart = currentPeriod.start
                 const currentBillingPeriodEnd = currentPeriod.end
                 const currentBillingPeriodOption: DateMappingOption = {
@@ -202,7 +334,7 @@ export const billingUsageLogic = kea<billingUsageLogicType>([
         ],
         billingPeriodMarkers: [
             (s) => [s.billingPeriodUTC, s.dateFrom, s.dateTo],
-            (currentPeriod, dateFrom: string, dateTo: string): BillingPeriodMarker[] => {
+            (currentPeriod: BillingPeriod, dateFrom: string, dateTo: string): BillingPeriodMarker[] => {
                 return calculateBillingPeriodMarkers(currentPeriod, dateFrom, dateTo)
             },
         ],
diff --git a/frontend/src/scenes/billing/paymentEntryLogic.ts b/frontend/src/scenes/billing/paymentEntryLogic.ts
index 05eafc30bbf7..9bca3b39cfd2 100644
--- a/frontend/src/scenes/billing/paymentEntryLogic.ts
+++ b/frontend/src/scenes/billing/paymentEntryLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers } from 'kea'
 import { router } from 'kea-router'
 import posthog from 'posthog-js'
 
@@ -12,7 +12,67 @@ import { BillingProductV2Type } from '~/types'
 
 import { billingLogic } from './billingLogic'
 import { billingProductLogic } from './billingProductLogic'
-import type { paymentEntryLogicType } from './paymentEntryLogicType'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface paymentEntryLogicValues {
+    apiError: null
+    authorizationStatus: string | null
+    clientSecret: null
+    isLoading: boolean
+    paymentEntryModalOpen: boolean
+    redirectPath: string | null
+    stripeError: null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface paymentEntryLogicActions {
+    loadCurrentOrganization: () => any // organizationLogic
+    loadUser: (resetOnFailure?: boolean | undefined) => {
+        resetOnFailure: boolean | undefined
+    } // userLogic
+    clearErrors: () => {
+        value: true
+    }
+    hidePaymentEntryModal: () => {
+        value: true
+    }
+    initiateAuthorization: () => {
+        value: true
+    }
+    pollAuthorizationStatus: (paymentIntentId?: string) => {
+        paymentIntentId: string | undefined
+    }
+    setApiError: (error: any) => {
+        error: any
+    }
+    setAuthorizationStatus: (status: string | null) => {
+        status: string | null
+    }
+    setClientSecret: (clientSecret: any) => {
+        clientSecret: any
+    }
+    setLoading: (loading: any) => {
+        loading: any
+    }
+    setRedirectPath: (redirectPath: string | null) => {
+        redirectPath: string | null
+    }
+    setStripeError: (error: any) => {
+        error: any
+    }
+    showPaymentEntryModal: () => {
+        value: true
+    }
+    startPaymentEntryFlow: (
+        product?: BillingProductV2Type | null,
+        redirectPath?: string | null
+    ) => {
+        product: BillingProductV2Type | null | undefined
+        redirectPath: string | null | undefined
+    }
+}
+
+export type paymentEntryLogicType = MakeLogicType<paymentEntryLogicValues, paymentEntryLogicActions>
 
 export const paymentEntryLogic = kea<paymentEntryLogicType>([
     path(['scenes', 'billing', 'PaymentEntryLogic']),
diff --git a/frontend/src/scenes/billing/seatBillingLogic.ts b/frontend/src/scenes/billing/seatBillingLogic.ts
index 62bb1139e320..ba1da116e709 100644
--- a/frontend/src/scenes/billing/seatBillingLogic.ts
+++ b/frontend/src/scenes/billing/seatBillingLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -9,8 +9,9 @@ import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
 import { membersLogic } from 'scenes/organization/membersLogic'
 import { organizationLogic } from 'scenes/organizationLogic'
 
+import type { FeatureFlagsSet } from '../../lib/logic/featureFlagLogic'
+import type { OrganizationMemberType, OrganizationType } from '../../types'
 import { CODE_FREE_PLAN_PREFIX, CODE_PLAN_ALPHA_PRO, CODE_PRO_PLAN_PREFIX, CODE_PRODUCT_KEY } from './constants'
-import type { seatBillingLogicType } from './seatBillingLogicType'
 import type { SeatData } from './types'
 
 export function isProPlanKey(planKey: string | null | undefined): boolean {
@@ -45,6 +46,63 @@ function seatErrorMessage(e: unknown, fallback: string): string {
     return fallback
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface seatBillingLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    members: OrganizationMemberType[] | null // membersLogic
+    currentOrganization: OrganizationType | null // organizationLogic
+    activeCount: number
+    cancelingCount: number
+    displaySeats: SeatData[]
+    isAdmin: boolean
+    monthlyTotal: number
+    orgSeats: SeatData[]
+    orgSeatsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface seatBillingLogicActions {
+    ensureAllMembersLoaded: () => {
+        value: true
+    } // membersLogic
+    adminCancelSeat: (userDistinctId: string) => {
+        userDistinctId: string
+    }
+    loadOrgSeats: () => any
+    loadOrgSeatsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadOrgSeatsSuccess: (
+        orgSeats: SeatData[],
+        payload?: any
+    ) => {
+        orgSeats: SeatData[]
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface seatBillingLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        isAdmin: (currentOrganization: OrganizationType | null) => boolean
+        displaySeats: (orgSeats: SeatData[]) => SeatData[]
+        activeCount: (displaySeats: SeatData[]) => number
+        cancelingCount: (displaySeats: SeatData[]) => number
+        monthlyTotal: (displaySeats: SeatData[]) => number
+    }
+}
+
+export type seatBillingLogicType = MakeLogicType<
+    seatBillingLogicValues,
+    seatBillingLogicActions,
+    Record<string, any>,
+    seatBillingLogicMeta
+>
+
 export const seatBillingLogic = kea<seatBillingLogicType>([
     path(['scenes', 'billing', 'seatBillingLogic']),
     connect(() => ({
@@ -83,7 +141,7 @@ export const seatBillingLogic = kea<seatBillingLogicType>([
     selectors({
         isAdmin: [
             (s) => [s.currentOrganization],
-            (currentOrganization): boolean =>
+            (currentOrganization: null | import('../../types').OrganizationType): boolean =>
                 !!(
                     currentOrganization?.membership_level &&
                     currentOrganization.membership_level >= OrganizationMembershipLevel.Admin
@@ -91,7 +149,7 @@ export const seatBillingLogic = kea<seatBillingLogicType>([
         ],
         displaySeats: [
             (s) => [s.orgSeats],
-            (orgSeats): SeatData[] => {
+            (orgSeats: SeatData[]): SeatData[] => {
                 const STATUS_PRIORITY: Record<string, number> = {
                     active: 0,
                     canceling: 1,
@@ -116,15 +174,15 @@ export const seatBillingLogic = kea<seatBillingLogicType>([
         ],
         activeCount: [
             (s) => [s.displaySeats],
-            (displaySeats): number => displaySeats.filter((s: SeatData) => s.status === 'active').length,
+            (displaySeats: SeatData[]): number => displaySeats.filter((s: SeatData) => s.status === 'active').length,
         ],
         cancelingCount: [
             (s) => [s.displaySeats],
-            (displaySeats): number => displaySeats.filter((s: SeatData) => s.status === 'canceling').length,
+            (displaySeats: SeatData[]): number => displaySeats.filter((s: SeatData) => s.status === 'canceling').length,
         ],
         monthlyTotal: [
             (s) => [s.displaySeats],
-            (displaySeats): number =>
+            (displaySeats: SeatData[]): number =>
                 displaySeats
                     .filter((s: SeatData) => s.status === 'active')
                     .reduce((sum: number, s: SeatData) => sum + seatPriceFromPlanKey(s.plan_key), 0),
diff --git a/frontend/src/scenes/cohorts/CohortFilters/cohortFieldLogic.ts b/frontend/src/scenes/cohorts/CohortFilters/cohortFieldLogic.ts
index d230ecbd8735..3de1c9021158 100644
--- a/frontend/src/scenes/cohorts/CohortFilters/cohortFieldLogic.ts
+++ b/frontend/src/scenes/cohorts/CohortFilters/cohortFieldLogic.ts
@@ -1,4 +1,16 @@
-import { actions, connect, kea, key, listeners, path, props, propsChanged, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    connect,
+    kea,
+    key,
+    listeners,
+    path,
+    props,
+    propsChanged,
+    reducers,
+    selectors,
+} from 'kea'
 
 import { TaxonomicFilterGroupType } from 'lib/components/TaxonomicFilter/types'
 import { objectsEqual } from 'lib/utils/objects'
@@ -12,7 +24,8 @@ import { cohortsModel } from '~/models/cohortsModel'
 import { groupsModel } from '~/models/groupsModel'
 import { ActorGroupType, AnyCohortCriteriaType, AvailableFeature } from '~/types'
 
-import type { cohortFieldLogicType } from './cohortFieldLogicType'
+import type { Noun } from '../../../models/groupsModel'
+import type { AnyPropertyFilter, GroupType, GroupTypeIndex, PropertyFilterValue } from '../../../types'
 
 export interface CohortFieldLogicProps {
     cohortFilterLogicKey: string
@@ -23,6 +36,69 @@ export interface CohortFieldLogicProps {
     fieldOptionGroupTypes?: FieldOptionsType[]
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface cohortFieldLogicValues {
+    aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun // groupsModel
+    groupTypes: Map<GroupTypeIndex, GroupType> // groupsModel
+    hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean // userLogic
+    calculatedValue: (
+        taxonomicGroupType: TaxonomicFilterGroupType
+    ) => PropertyFilterValue | AnyPropertyFilter[] | undefined
+    calculatedValueLoading: (taxonomicGroupType: TaxonomicFilterGroupType) => boolean
+    currentOption: any
+    fieldOptionGroups: FieldValues[]
+    hasBehavioralCohortFiltering: boolean
+    value: PropertyFilterValue | AnyPropertyFilter[] | undefined
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface cohortFieldLogicActions {
+    onChange: (newField: AnyCohortCriteriaType) => {
+        newField: AnyCohortCriteriaType
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface cohortFieldLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        hasBehavioralCohortFiltering: (
+            hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean
+        ) => boolean
+        fieldOptionGroups: (
+            arg: any,
+            groupTypes: Map<GroupTypeIndex, GroupType>,
+            aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun,
+            hasBehavioralCohortFiltering: boolean
+        ) => FieldValues[]
+        currentOption: (
+            fieldOptionGroups: FieldValues[],
+            value: PropertyFilterValue | AnyPropertyFilter[] | undefined
+        ) => any
+        calculatedValueLoading: (
+            value: PropertyFilterValue | AnyPropertyFilter[] | undefined,
+            criteria: AnyCohortCriteriaType,
+            fieldKey: keyof import('~/types').CohortCriteriaType,
+            allCohortsLoading: boolean,
+            actionsLoading: boolean
+        ) => (taxonomicGroupType: TaxonomicFilterGroupType) => boolean
+        calculatedValue: (
+            value: PropertyFilterValue | AnyPropertyFilter[] | undefined,
+            criteria: AnyCohortCriteriaType,
+            fieldKey: keyof import('~/types').CohortCriteriaType,
+            allCohortsLoading: boolean,
+            actionsLoading: boolean
+        ) => (taxonomicGroupType: TaxonomicFilterGroupType) => PropertyFilterValue | AnyPropertyFilter[] | undefined
+    }
+}
+
+export type cohortFieldLogicType = MakeLogicType<
+    cohortFieldLogicValues,
+    cohortFieldLogicActions,
+    CohortFieldLogicProps,
+    cohortFieldLogicMeta
+>
+
 export const cohortFieldLogic = kea<cohortFieldLogicType>([
     path(['scenes', 'cohorts', 'CohortFilters', 'cohortFieldLogic']),
     key((props) => `${props.cohortFilterLogicKey}`),
@@ -50,7 +126,8 @@ export const cohortFieldLogic = kea<cohortFieldLogicType>([
     selectors({
         hasBehavioralCohortFiltering: [
             (s) => [s.hasAvailableFeature],
-            (hasAvailableFeature) => hasAvailableFeature(AvailableFeature.BEHAVIORAL_COHORT_FILTERING),
+            (hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean) =>
+                hasAvailableFeature(AvailableFeature.BEHAVIORAL_COHORT_FILTERING),
         ],
         fieldOptionGroups: [
             (s) => [
@@ -59,7 +136,15 @@ export const cohortFieldLogic = kea<cohortFieldLogicType>([
                 s.aggregationLabel,
                 s.hasBehavioralCohortFiltering,
             ],
-            (fieldOptionGroupTypes, groupTypes, aggregationLabel, hasBehavioralCohortFiltering): FieldValues[] => {
+            (
+                fieldOptionGroupTypes,
+                groupTypes: Map<import('~/types').GroupTypeIndex, import('~/types').GroupType>,
+                aggregationLabel: (
+                    groupTypeIndex: number | null | undefined,
+                    deferToUserWording?: boolean
+                ) => import('~/models/groupsModel').Noun,
+                hasBehavioralCohortFiltering: boolean
+            ): FieldValues[] => {
                 const fieldOptions = hasBehavioralCohortFiltering
                     ? { ...FIELD_VALUES, ...SCALE_FIELD_VALUES }
                     : FIELD_VALUES
@@ -89,7 +174,10 @@ export const cohortFieldLogic = kea<cohortFieldLogicType>([
         ],
         currentOption: [
             (s) => [s.fieldOptionGroups, s.value],
-            (fieldOptionGroups, value) =>
+            (
+                fieldOptionGroups: FieldValues[],
+                value: import('~/types').AnyPropertyFilter[] | import('~/types').PropertyFilterValue | undefined
+            ) =>
                 value && typeof value === 'string'
                     ? fieldOptionGroups.reduce(
                           (accumulator, group) => {
@@ -108,7 +196,13 @@ export const cohortFieldLogic = kea<cohortFieldLogicType>([
                 cohortsModel.selectors.allCohortsLoading,
                 actionsModel.selectors.actionsLoading,
             ],
-            (value, criteria, fieldKey, cohortsModelLoading, actionsModelLoading) =>
+            (
+                value: import('~/types').AnyPropertyFilter[] | import('~/types').PropertyFilterValue | undefined,
+                criteria: AnyCohortCriteriaType,
+                fieldKey: keyof import('~/types').CohortCriteriaType,
+                cohortsModelLoading: boolean,
+                actionsModelLoading: boolean
+            ) =>
                 (taxonomicGroupType: TaxonomicFilterGroupType) => {
                     return (
                         (criteria.type === BehavioralFilterKey.Cohort &&
@@ -129,7 +223,13 @@ export const cohortFieldLogic = kea<cohortFieldLogicType>([
                 cohortsModel.selectors.allCohortsLoading,
                 actionsModel.selectors.actionsLoading,
             ],
-            (value, criteria, fieldKey, cohortsModelLoading, actionsModelLoading) =>
+            (
+                value: import('~/types').AnyPropertyFilter[] | import('~/types').PropertyFilterValue | undefined,
+                criteria: AnyCohortCriteriaType,
+                fieldKey: keyof import('~/types').CohortCriteriaType,
+                cohortsModelLoading: boolean,
+                actionsModelLoading: boolean
+            ) =>
                 (taxonomicGroupType: TaxonomicFilterGroupType) => {
                     // Only used by taxonomic filter field to determine label name
                     if (
diff --git a/frontend/src/scenes/cohorts/addPersonToCohortModalLogic.ts b/frontend/src/scenes/cohorts/addPersonToCohortModalLogic.ts
index b36679c21f9c..03509cab803e 100644
--- a/frontend/src/scenes/cohorts/addPersonToCohortModalLogic.ts
+++ b/frontend/src/scenes/cohorts/addPersonToCohortModalLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, kea, key, listeners, path, props, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api, { PaginatedResponse } from 'lib/api'
@@ -8,7 +8,6 @@ import { dataNodeLogic } from '~/queries/nodes/DataNode/dataNodeLogic'
 import { ActorsQuery, NodeKind } from '~/queries/schema/schema-general'
 import { CohortType, PersonType } from '~/types'
 
-import type { addPersonToCohortModalLogicType } from './addPersonToCohortModalLogicType'
 import { cohortEditLogic } from './cohortEditLogic'
 import { createCohortDataNodeLogicKey } from './cohortUtils'
 
@@ -22,6 +21,67 @@ const DEFAULT_QUERY: ActorsQuery = {
     select: ['id', 'person_display_name -- Person'],
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface addPersonToCohortModalLogicValues {
+    addPersonToCohortModalVisible: boolean
+    cohortPersons: PaginatedResponse<PersonType>
+    cohortPersonsLoading: boolean
+    isCohortUpdating: boolean
+    personsToAddToCohort: Record<string, boolean>
+    query: ActorsQuery
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface addPersonToCohortModalLogicActions {
+    addPerson: (personId: string) => {
+        personId: string
+    }
+    addPersonsToCohort: () => boolean
+    hideAddPersonToCohortModal: () => {
+        value: true
+    }
+    loadCohortPersons: () => any
+    loadCohortPersonsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadCohortPersonsSuccess: (
+        cohortPersons: PaginatedResponse<PersonType>,
+        payload?: any
+    ) => {
+        cohortPersons: PaginatedResponse<PersonType>
+        payload?: any
+    }
+    removePerson: (personId: string) => {
+        personId: string
+    }
+    resetPersons: () => boolean
+    setCohortUpdating: (updating: boolean) => {
+        updating: boolean
+    }
+    setQuery: (query: ActorsQuery) => {
+        query: ActorsQuery
+    }
+    showAddPersonToCohortModal: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface addPersonToCohortModalLogicMeta {
+    key: string
+}
+
+export type addPersonToCohortModalLogicType = MakeLogicType<
+    addPersonToCohortModalLogicValues,
+    addPersonToCohortModalLogicActions,
+    AddPersonToCohortModalProps,
+    addPersonToCohortModalLogicMeta
+>
+
 export const addPersonToCohortModalLogic = kea<addPersonToCohortModalLogicType>([
     props({} as AddPersonToCohortModalProps),
     path(['scenes', 'cohorts', 'addPersonToCohortModalLogic']),
diff --git a/frontend/src/scenes/cohorts/cohortCalculationHistorySceneLogic.ts b/frontend/src/scenes/cohorts/cohortCalculationHistorySceneLogic.ts
index bcf00bd6b1df..c45991ba6641 100644
--- a/frontend/src/scenes/cohorts/cohortCalculationHistorySceneLogic.ts
+++ b/frontend/src/scenes/cohorts/cohortCalculationHistorySceneLogic.ts
@@ -1,9 +1,9 @@
-import { actions, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
 
-import type { cohortCalculationHistorySceneLogicType } from './cohortCalculationHistorySceneLogicType'
+import type { CohortType } from '../../types'
 
 export interface CohortCalculationHistorySceneLogicProps {
     cohortId: number
@@ -41,6 +41,80 @@ export interface CohortCalculationHistoryResponse {
     previous: string | null
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface cohortCalculationHistorySceneLogicValues {
+    calculationHistory: CohortCalculationHistoryRecord[]
+    calculationHistoryResponse: CohortCalculationHistoryResponse
+    calculationHistoryResponseLoading: boolean
+    cohort: any
+    cohortLoading: boolean
+    cohortMissing: boolean
+    limit: number
+    page: number
+    totalRecords: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface cohortCalculationHistorySceneLogicActions {
+    loadCalculationHistory: (_: any) => any
+    loadCalculationHistoryFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadCalculationHistorySuccess: (
+        calculationHistoryResponse: CohortCalculationHistoryResponse,
+        payload?: any
+    ) => {
+        calculationHistoryResponse: CohortCalculationHistoryResponse
+        payload?: any
+    }
+    loadCohort: (_: any) => any
+    loadCohortFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadCohortSuccess: (
+        cohort: CohortType | null,
+        payload?: any
+    ) => {
+        cohort: CohortType | null
+        payload?: any
+    }
+    setCohortMissing: () => {
+        value: true
+    }
+    setLimit: (limit: number) => {
+        limit: number
+    }
+    setPage: (page: number) => {
+        page: number
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface cohortCalculationHistorySceneLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        calculationHistory: (
+            calculationHistoryResponse: CohortCalculationHistoryResponse
+        ) => CohortCalculationHistoryRecord[]
+        totalRecords: (calculationHistoryResponse: CohortCalculationHistoryResponse) => number
+    }
+}
+
+export type cohortCalculationHistorySceneLogicType = MakeLogicType<
+    cohortCalculationHistorySceneLogicValues,
+    cohortCalculationHistorySceneLogicActions,
+    CohortCalculationHistorySceneLogicProps,
+    cohortCalculationHistorySceneLogicMeta
+>
+
 export const cohortCalculationHistorySceneLogic = kea<cohortCalculationHistorySceneLogicType>([
     props({} as CohortCalculationHistorySceneLogicProps),
     key(({ cohortId }) => String(cohortId)),
diff --git a/frontend/src/scenes/cohorts/cohortCountWarningLogic.test.ts b/frontend/src/scenes/cohorts/cohortCountWarningLogic.test.ts
index 8089e37aa36d..8aacde3ce2de 100644
--- a/frontend/src/scenes/cohorts/cohortCountWarningLogic.test.ts
+++ b/frontend/src/scenes/cohorts/cohortCountWarningLogic.test.ts
@@ -9,7 +9,7 @@ import { mockCohort } from '~/test/mocks'
 import { CohortType, FilterLogicalOperator, PropertyFilterType, PropertyOperator } from '~/types'
 
 import { CohortCountWarningLogicProps, cohortCountWarningLogic } from './cohortCountWarningLogic'
-import type { cohortCountWarningLogicType } from './cohortCountWarningLogicType'
+import type { cohortCountWarningLogicType } from './cohortCountWarningLogic'
 
 const createMockQuery = (cohortId: number, overrides: Partial<ActorsQuery> = {}): DataTableNode => ({
     kind: NodeKind.DataTableNode,
@@ -116,7 +116,7 @@ describe('cohortCountWarningLogic', () => {
             })
             mockDataNodeLogic.mount()
             mockDataNodeLogic.actions.loadDataSuccess({
-                results: new Array(50),
+                results: Array.from({ length: 50 }),
                 hasMore: true,
             })
 
@@ -134,7 +134,7 @@ describe('cohortCountWarningLogic', () => {
             })
             mockDataNodeLogic.mount()
             mockDataNodeLogic.actions.loadDataSuccess({
-                results: new Array(100),
+                results: Array.from({ length: 100 }),
                 hasMore: false,
             })
 
@@ -152,7 +152,7 @@ describe('cohortCountWarningLogic', () => {
             })
             mockDataNodeLogic.mount()
             mockDataNodeLogic.actions.loadDataSuccess({
-                results: new Array(85),
+                results: Array.from({ length: 85 }),
                 hasMore: false,
             })
 
@@ -205,7 +205,7 @@ describe('cohortCountWarningLogic', () => {
             })
             mockDataNodeLogic.mount()
             mockDataNodeLogic.actions.loadDataSuccess({
-                results: new Array(120),
+                results: Array.from({ length: 120 }),
                 hasMore: false,
             })
 
@@ -224,7 +224,7 @@ describe('cohortCountWarningLogic', () => {
             })
             mockDataNodeLogic.mount()
             mockDataNodeLogic.actions.loadDataSuccess({
-                results: new Array(50),
+                results: Array.from({ length: 50 }),
                 hasMore: false,
             })
 
@@ -252,7 +252,7 @@ describe('cohortCountWarningLogic', () => {
             })
             mockDataNodeLogic.mount()
             mockDataNodeLogic.actions.loadDataSuccess({
-                results: new Array(50),
+                results: Array.from({ length: 50 }),
                 hasMore: false,
             })
 
@@ -281,7 +281,7 @@ describe('cohortCountWarningLogic', () => {
             })
             mockDataNodeLogic.mount()
             mockDataNodeLogic.actions.loadDataSuccess({
-                results: new Array(25),
+                results: Array.from({ length: 25 }),
                 hasMore: false,
             })
 
@@ -312,7 +312,7 @@ describe('cohortCountWarningLogic', () => {
             })
             mockDataNodeLogic.mount()
             mockDataNodeLogic.actions.loadDataSuccess({
-                results: new Array(50),
+                results: Array.from({ length: 50 }),
                 hasMore: false,
             })
 
diff --git a/frontend/src/scenes/cohorts/cohortCountWarningLogic.ts b/frontend/src/scenes/cohorts/cohortCountWarningLogic.ts
index 7337fe00edad..2907a18a3875 100644
--- a/frontend/src/scenes/cohorts/cohortCountWarningLogic.ts
+++ b/frontend/src/scenes/cohorts/cohortCountWarningLogic.ts
@@ -1,10 +1,23 @@
-import { connect, kea, key, path, props, selectors } from 'kea'
+import { MakeLogicType, connect, kea, key, path, props, selectors } from 'kea'
 
 import { dataNodeLogic } from '~/queries/nodes/DataNode/dataNodeLogic'
 import { ActorsQuery, ActorsQueryResponse, DataTableNode } from '~/queries/schema/schema-general'
 import { CohortType } from '~/types'
 
-import type { cohortCountWarningLogicType } from './cohortCountWarningLogicType'
+import type {
+    ErrorTrackingQueryResponse,
+    HogQLAutocompleteResponse,
+    HogQLMetadataResponse,
+    HogQLQueryResponse,
+    HogQueryResponse,
+    LogAttributesQueryResponse,
+    LogValuesQueryResponse,
+    MetricsQueryResponse,
+    SessionsQueryResponse,
+    TraceSpansAggregationQueryResponse,
+    TraceSpansAttributeBreakdownQueryResponse,
+    TraceSpansQueryResponse,
+} from '../../queries/schema/schema-general'
 
 export type CohortCountWarningLogicProps = {
     cohort: CohortType
@@ -12,6 +25,58 @@ export type CohortCountWarningLogicProps = {
     dataNodeLogicKey: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface cohortCountWarningLogicValues {
+    response:
+        | ErrorTrackingQueryResponse
+        | HogQLAutocompleteResponse
+        | HogQLMetadataResponse
+        | HogQLQueryResponse<any[]>
+        | HogQueryResponse
+        | LogAttributesQueryResponse
+        | LogValuesQueryResponse
+        | MetricsQueryResponse
+        | Record<string, any>
+        | SessionsQueryResponse
+        | TraceSpansAggregationQueryResponse
+        | TraceSpansAttributeBreakdownQueryResponse
+        | TraceSpansQueryResponse
+        | null // dataNodeLogic
+    shouldShowCountWarning: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface cohortCountWarningLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        shouldShowCountWarning: (
+            response:
+                | ErrorTrackingQueryResponse
+                | HogQLAutocompleteResponse
+                | HogQLMetadataResponse
+                | HogQLQueryResponse<any[]>
+                | HogQueryResponse
+                | LogAttributesQueryResponse
+                | LogValuesQueryResponse
+                | MetricsQueryResponse
+                | Record<string, any>
+                | SessionsQueryResponse
+                | TraceSpansAggregationQueryResponse
+                | TraceSpansAttributeBreakdownQueryResponse
+                | TraceSpansQueryResponse
+                | null,
+            query: DataTableNode
+        ) => boolean
+    }
+}
+
+export type cohortCountWarningLogicType = MakeLogicType<
+    cohortCountWarningLogicValues,
+    {},
+    CohortCountWarningLogicProps,
+    cohortCountWarningLogicMeta
+>
+
 export const cohortCountWarningLogic = kea<cohortCountWarningLogicType>([
     props({} as CohortCountWarningLogicProps),
     key((props) => `cohort-count-warning-${props.cohort.id}-${props.dataNodeLogicKey}`),
diff --git a/frontend/src/scenes/cohorts/cohortEditLogic.ts b/frontend/src/scenes/cohorts/cohortEditLogic.ts
index 2cab4788bfaf..bd8a733be982 100644
--- a/frontend/src/scenes/cohorts/cohortEditLogic.ts
+++ b/frontend/src/scenes/cohorts/cohortEditLogic.ts
@@ -1,4 +1,5 @@
 import {
+    MakeLogicType,
     actions,
     afterMount,
     beforeUnmount,
@@ -13,6 +14,7 @@ import {
     selectors,
 } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 import posthog from 'posthog-js'
@@ -66,7 +68,7 @@ import {
 import { cohortsUsedInRetrieve } from 'products/cohorts/frontend/generated/api'
 import type { CohortUsedInResponseApi } from 'products/cohorts/frontend/generated/api.schemas'
 
-import type { cohortEditLogicType } from './cohortEditLogicType'
+import type { UserBasicType } from '../../types'
 
 export type CohortLogicProps = {
     id?: CohortType['id']
@@ -97,6 +99,413 @@ const inferStaticCohortMode = (cohort: CohortType): StaticCohortMode =>
           ? 'criteria'
           : 'people'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface cohortEditLogicValues {
+    currentProjectId: number | string // teamLogic
+    activeTab: CohortEditTab
+    canRemovePersonFromCohort: boolean | undefined
+    cohort: CohortType
+    cohortAllErrors: Record<string, any>
+    cohortChanged: boolean
+    cohortErrors: DeepPartialMap<CohortType, ValidationErrorType>
+    cohortHasErrors: boolean
+    cohortLoading: boolean
+    cohortManualErrors: Record<string, any>
+    cohortMissing: boolean
+    cohortTouched: boolean
+    cohortTouches: Record<string, boolean>
+    cohortValidationErrors: DeepPartialMap<CohortType, ValidationErrorType>
+    creationPersonQuery: ActorsQuery
+    duplicatedCohort: CohortType | null
+    duplicatedCohortLoading: boolean
+    effectiveQuery: DataTableNode
+    isCalculatingOrPending: boolean
+    isCohortSubmitting: boolean
+    isCohortValid: boolean
+    isPendingCalculation: boolean
+    persistedColumns: string[] | null
+    personsToCreateStaticCohort: Record<string, boolean>
+    pollTimeout: number | null
+    query: DataTableNode
+    removePersonFromCohort: any
+    removePersonFromCohortLoading: boolean
+    showCohortErrors: boolean
+    staticCohortMode: StaticCohortMode
+    usedIn: CohortUsedInResponseApi | null
+    usedInLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface cohortEditLogicActions {
+    reportExperimentExposureCohortEdited: (
+        existingCohort: CohortType,
+        newCohort: CohortType
+    ) => {
+        existingCohort: CohortType
+        newCohort: CohortType
+    } // eventUsageLogic
+    addFilter: (groupIndex?: number) => {
+        groupIndex: number | undefined
+    }
+    addPersonToCreateStaticCohort: (personId: string) => {
+        personId: string
+    }
+    checkIfFinishedCalculating: (cohort: CohortType) => {
+        cohort: CohortType
+    }
+    deleteCohort: () => {
+        value: true
+    }
+    duplicateCohort: (asStatic: boolean) => {
+        asStatic: boolean
+    }
+    duplicateCohortFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    duplicateCohortSuccess: (
+        duplicatedCohort: CohortType | null,
+        payload?: {
+            asStatic: boolean
+        }
+    ) => {
+        duplicatedCohort: CohortType | null
+        payload?: {
+            asStatic: boolean
+        }
+    }
+    duplicateFilter: (
+        groupIndex: number,
+        criteriaIndex?: number
+    ) => {
+        criteriaIndex: number | undefined
+        groupIndex: number
+    }
+    fetchCohort: (id: CohortType['id']) => {
+        id: number | 'new'
+    }
+    fetchCohortFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    fetchCohortSuccess: (
+        cohort: CohortType,
+        payload?: {
+            id: number | 'new'
+        }
+    ) => {
+        cohort: CohortType
+        payload?: {
+            id: number | 'new'
+        }
+    }
+    loadUsedIn: () => any
+    loadUsedInFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadUsedInSuccess: (
+        usedIn: CohortUsedInResponseApi | null,
+        payload?: any
+    ) => {
+        usedIn: CohortUsedInResponseApi | null
+        payload?: any
+    }
+    onCriteriaChange: (
+        newGroup: Partial<CohortGroupType>,
+        id: string
+    ) => {
+        id: string
+        newGroup: Partial<CohortGroupType>
+    }
+    onCriteriaChangeFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    onCriteriaChangeSuccess: (
+        cohort: CohortType,
+        payload?: {
+            id: string
+            newGroup: Partial<CohortGroupType>
+        }
+    ) => {
+        cohort: CohortType
+        payload?: {
+            id: string
+            newGroup: Partial<CohortGroupType>
+        }
+    }
+    refreshPersonsData: () => {
+        value: true
+    }
+    removeFilter: (
+        groupIndex: number,
+        criteriaIndex?: number
+    ) => {
+        criteriaIndex: number | undefined
+        groupIndex: number
+    }
+    removePersonFromCohort: (personId: string) => {
+        personId: string
+    }
+    removePersonFromCohortFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    removePersonFromCohortSuccess: (
+        removePersonFromCohort: void,
+        payload?: {
+            personId: string
+        }
+    ) => {
+        removePersonFromCohort: void
+        payload?: {
+            personId: string
+        }
+    }
+    removePersonFromCreateStaticCohort: (personId: string) => {
+        personId: string
+    }
+    resetCohort: (values?: CohortType) => {
+        values?: CohortType
+    }
+    resetPersonsToCreateStaticCohort: () => {
+        value: true
+    }
+    restoreCohort: () => {
+        value: true
+    }
+    restoreCohortFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    restoreCohortSuccess: (
+        cohort: CohortType,
+        payload?: {
+            value: true
+        }
+    ) => {
+        cohort: CohortType
+        payload?: {
+            value: true
+        }
+    }
+    saveCohort: (cohortParams?: any) => {
+        cohortParams: any
+    }
+    saveCohortFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    saveCohortSuccess: (
+        cohort: CohortType,
+        payload?: {
+            cohortParams: any
+        }
+    ) => {
+        cohort: CohortType
+        payload?: {
+            cohortParams: any
+        }
+    }
+    setActiveTab: (tab: CohortEditTab) => {
+        tab: CohortEditTab
+    }
+    setCohort: (cohort: CohortType) => {
+        cohort: CohortType
+    }
+    setCohortFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    setCohortManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setCohortMissing: () => {
+        value: true
+    }
+    setCohortSuccess: (
+        cohort: CohortType,
+        payload?: {
+            cohort: CohortType
+        }
+    ) => {
+        cohort: CohortType
+        payload?: {
+            cohort: CohortType
+        }
+    }
+    setCohortValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setCohortValues: (values: DeepPartial<CohortType>) => {
+        values: DeepPartial<CohortType>
+    }
+    setCreationPersonQuery: (query: ActorsQuery) => {
+        query: ActorsQuery
+    }
+    setCriteria: (
+        newCriteria: AnyCohortCriteriaType,
+        groupIndex: number,
+        criteriaIndex: number
+    ) => {
+        criteriaIndex: number
+        groupIndex: number
+        newCriteria: AnyCohortCriteriaType
+    }
+    setInnerGroupType: (
+        type: FilterLogicalOperator,
+        groupIndex: number
+    ) => {
+        groupIndex: number
+        type: FilterLogicalOperator
+    }
+    setOuterGroupsType: (type: FilterLogicalOperator) => {
+        type: FilterLogicalOperator
+    }
+    setPollTimeout: (pollTimeout: number | null) => {
+        pollTimeout: number | null
+    }
+    setQuery: (query: Node) => {
+        query: Node<Record<string, any>>
+    }
+    setStaticCohortMode: (mode: StaticCohortMode) => {
+        mode: StaticCohortMode
+    }
+    submitCohort: () => {
+        value: boolean
+    }
+    submitCohortFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitCohortRequest: (cohort: CohortType) => {
+        cohort: CohortType
+    }
+    submitCohortSuccess: (cohort: CohortType) => {
+        cohort: CohortType
+    }
+    touchCohortField: (key: string) => {
+        key: string
+    }
+    updateCohortCount: () => {
+        value: true
+    }
+    updateCohortCountFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateCohortCountSuccess: (
+        cohort: {
+            _create_in_folder?: string | null | undefined
+            _create_static_person_ids?: string[] | undefined
+            count: number | undefined
+            created_at?: string | undefined
+            created_by?: UserBasicType | null | undefined
+            csv?: File | undefined
+            deleted?: boolean | undefined
+            description?: string | undefined
+            errors_calculating?: number | undefined
+            experiment_set?: number[] | undefined
+            filters: {
+                properties: CohortCriteriaGroupFilter
+            }
+            groups: CohortGroupType[]
+            id: number | 'new'
+            is_calculating?: boolean | undefined
+            is_static?: boolean | undefined
+            last_calculation?: string | undefined
+            last_error_message?: string | null | undefined
+            name?: string | undefined
+            pending_version?: number | null | undefined
+            version?: number | null | undefined
+        },
+        payload?: {
+            value: true
+        }
+    ) => {
+        cohort: {
+            _create_in_folder?: string | null | undefined
+            _create_static_person_ids?: string[] | undefined
+            count: number | undefined
+            created_at?: string | undefined
+            created_by?: UserBasicType | null | undefined
+            csv?: File | undefined
+            deleted?: boolean | undefined
+            description?: string | undefined
+            errors_calculating?: number | undefined
+            experiment_set?: number[] | undefined
+            filters: {
+                properties: CohortCriteriaGroupFilter
+            }
+            groups: CohortGroupType[]
+            id: number | 'new'
+            is_calculating?: boolean | undefined
+            is_static?: boolean | undefined
+            last_calculation?: string | undefined
+            last_error_message?: string | null | undefined
+            name?: string | undefined
+            pending_version?: number | null | undefined
+            version?: number | null | undefined
+        }
+        payload?: {
+            value: true
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface cohortEditLogicMeta {
+    key: number | 'new'
+    __keaTypeGenInternalSelectorTypes: {
+        effectiveQuery: (query: DataTableNode, persistedColumns: string[] | null) => DataTableNode
+        canRemovePersonFromCohort: (cohort: CohortType) => boolean | undefined
+        isPendingCalculation: (cohort: CohortType) => boolean
+        isCalculatingOrPending: (cohort: CohortType, isPendingCalculation: boolean) => boolean
+    }
+}
+
+export type cohortEditLogicType = MakeLogicType<
+    cohortEditLogicValues,
+    cohortEditLogicActions,
+    CohortLogicProps,
+    cohortEditLogicMeta
+>
+
 export const cohortEditLogic = kea<cohortEditLogicType>([
     props({} as CohortLogicProps),
     key((props) => (props.id === 'new' || !props.id ? 'new' : props.id)),
diff --git a/frontend/src/scenes/cohorts/cohortSceneLogic.ts b/frontend/src/scenes/cohorts/cohortSceneLogic.ts
index 3b28bc30a37d..76076a47064f 100644
--- a/frontend/src/scenes/cohorts/cohortSceneLogic.ts
+++ b/frontend/src/scenes/cohorts/cohortSceneLogic.ts
@@ -1,4 +1,4 @@
-import { kea, path, props, selectors } from 'kea'
+import { MakeLogicType, kea, path, props, selectors } from 'kea'
 
 import { Scene } from 'scenes/sceneTypes'
 import { urls } from 'scenes/urls'
@@ -8,7 +8,27 @@ import { cohortsModel } from '~/models/cohortsModel'
 import { ActivityScope, Breadcrumb, ProjectTreeRef } from '~/types'
 
 import { CohortLogicProps } from './cohortEditLogic'
-import type { cohortSceneLogicType } from './cohortSceneLogicType'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface cohortSceneLogicValues {
+    breadcrumbs: Breadcrumb[]
+    projectTreeRef: ProjectTreeRef
+    sidePanelContext: SidePanelSceneContext | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface cohortSceneLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        breadcrumbs: (
+            cohortsById: Partial<Record<number | string, import('~/types').CohortType>>,
+            arg: CohortLogicProps['id']
+        ) => Breadcrumb[]
+        sidePanelContext: (arg: number | 'new' | undefined) => SidePanelSceneContext | null
+        projectTreeRef: (arg: number | 'new' | undefined) => ProjectTreeRef
+    }
+}
+
+export type cohortSceneLogicType = MakeLogicType<cohortSceneLogicValues, {}, CohortLogicProps, cohortSceneLogicMeta>
 
 export const cohortSceneLogic = kea<cohortSceneLogicType>([
     props({} as CohortLogicProps),
@@ -17,7 +37,10 @@ export const cohortSceneLogic = kea<cohortSceneLogicType>([
     selectors({
         breadcrumbs: [
             () => [cohortsModel.selectors.cohortsById, (_, props) => props.id as CohortLogicProps['id']],
-            (cohortsById, cohortId): Breadcrumb[] => {
+            (
+                cohortsById: Partial<Record<number | string, import('~/types').CohortType>>,
+                cohortId: CohortLogicProps['id']
+            ): Breadcrumb[] => {
                 return [
                     {
                         key: 'cohorts',
@@ -46,7 +69,10 @@ export const cohortSceneLogic = kea<cohortSceneLogicType>([
         ],
         projectTreeRef: [
             () => [(_, props: CohortLogicProps) => props.id],
-            (id): ProjectTreeRef => ({ type: 'cohort', ref: id === 'new' ? null : String(id) }),
+            (id: number | 'new' | undefined): ProjectTreeRef => ({
+                type: 'cohort',
+                ref: id === 'new' ? null : String(id),
+            }),
         ],
     }),
 ])
diff --git a/frontend/src/scenes/cohorts/cohortsSceneLogic.ts b/frontend/src/scenes/cohorts/cohortsSceneLogic.ts
index 4f7233f33fa2..07add017252d 100644
--- a/frontend/src/scenes/cohorts/cohortsSceneLogic.ts
+++ b/frontend/src/scenes/cohorts/cohortsSceneLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router, urlToAction } from 'kea-router'
 import posthog from 'posthog-js'
@@ -18,7 +18,7 @@ import { deleteFromTree, refreshTreeItem } from '~/layout/panel-layout/ProjectTr
 import { processCohort } from '~/models/cohortsModel'
 import { ActivityScope, Breadcrumb, CohortType, ExporterFormat } from '~/types'
 
-import type { cohortsSceneLogicType } from './cohortsSceneLogicType'
+import type { TriggerExportProps } from '../../lib/components/ExportButton/exporter'
 
 export interface CohortFilters {
     search?: string
@@ -38,6 +38,104 @@ const DEFAULT_COHORT_FILTERS: CohortFilters = {
 
 const COHORTS_PER_PAGE = 100
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface cohortsSceneLogicValues {
+    breadcrumbs: Breadcrumb[]
+    cohortFilters: CohortFilters
+    cohortSorting: Sorting | null
+    cohorts: CountedPaginatedResponse<CohortType>
+    cohortsLoadError: string | null
+    cohortsLoading: boolean
+    count: number
+    pagination: PaginationManual
+    paramsFromFilters: {
+        created_by_id?: number | undefined
+        limit: number
+        offset: number
+        page?: number | undefined
+        search?: string | undefined
+        type?: 'dynamic' | 'static' | undefined
+    }
+    shouldShowEmptyState: boolean
+    sidePanelContext: SidePanelSceneContext
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface cohortsSceneLogicActions {
+    startExport: (exportData: TriggerExportProps) => {
+        exportData: TriggerExportProps
+    } // exportsLogic
+    deleteCohort: (cohort: Partial<CohortType>) => {
+        cohort: Partial<CohortType>
+    }
+    exportCohortPersons: (
+        id: CohortType['id'],
+        columns?: string[]
+    ) => {
+        columns: string[] | undefined
+        id: number | 'new'
+    }
+    loadCohorts: () => any
+    loadCohortsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadCohortsSuccess: (
+        cohorts: {
+            count: number
+            results: CohortType[]
+        },
+        payload?: any
+    ) => {
+        cohorts: {
+            count: number
+            results: CohortType[]
+        }
+        payload?: any
+    }
+    setCohortFilters: (
+        filters: Partial<CohortFilters>,
+        replace?: boolean
+    ) => {
+        filters: Partial<CohortFilters>
+        replace: boolean | undefined
+    }
+    setCohortSorting: (sorting: Sorting | null) => {
+        sorting: Sorting | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface cohortsSceneLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        count: (cohorts: CountedPaginatedResponse<CohortType>) => number
+        paramsFromFilters: (cohortFilters: CohortFilters) => {
+            created_by_id?: number | undefined
+            limit: number
+            offset: number
+            page?: number | undefined
+            search?: string | undefined
+            type?: 'dynamic' | 'static' | undefined
+        }
+        pagination: (cohortFilters: CohortFilters, count: number) => PaginationManual
+        shouldShowEmptyState: (
+            cohorts: CountedPaginatedResponse<CohortType>,
+            cohortFilters: CohortFilters,
+            cohortsLoadError: string | null
+        ) => boolean
+    }
+}
+
+export type cohortsSceneLogicType = MakeLogicType<
+    cohortsSceneLogicValues,
+    cohortsSceneLogicActions,
+    Record<string, any>,
+    cohortsSceneLogicMeta
+>
+
 export const cohortsSceneLogic = kea<cohortsSceneLogicType>([
     path(['scenes', 'cohorts', 'cohortsSceneLogic']),
     connect(() => ({
@@ -141,7 +239,7 @@ export const cohortsSceneLogic = kea<cohortsSceneLogicType>([
                 activity_scope: ActivityScope.COHORT,
             }),
         ],
-        count: [(selectors) => [selectors.cohorts], (cohorts) => cohorts.count],
+        count: [(selectors) => [selectors.cohorts], (cohorts: CountedPaginatedResponse<CohortType>) => cohorts.count],
         paramsFromFilters: [
             (s) => [s.cohortFilters],
             (filters: CohortFilters) => ({
@@ -152,7 +250,7 @@ export const cohortsSceneLogic = kea<cohortsSceneLogicType>([
         ],
         pagination: [
             (s) => [s.cohortFilters, s.count],
-            (filters, count): PaginationManual => {
+            (filters: CohortFilters, count: number): PaginationManual => {
                 return {
                     controlled: true,
                     pageSize: COHORTS_PER_PAGE,
diff --git a/frontend/src/scenes/comments/commentsLogic.ts b/frontend/src/scenes/comments/commentsLogic.ts
index 29804a1cd3ba..fd5c76ba3967 100644
--- a/frontend/src/scenes/comments/commentsLogic.ts
+++ b/frontend/src/scenes/comments/commentsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { subscriptions } from 'kea-subscriptions'
 
@@ -13,7 +13,7 @@ import { userLogic } from 'scenes/userLogic'
 import { sidePanelDiscussionLogic } from '~/layout/navigation-3000/sidepanel/panels/discussion/sidePanelDiscussionLogic'
 import { CommentType } from '~/types'
 
-import type { commentsLogicType } from './commentsLogicType'
+import type { OrganizationMemberType, UserType } from '../../types'
 import { discussionsSlug, getTextContent } from './utils'
 
 export type CommentsLogicProps = {
@@ -34,6 +34,255 @@ export type CommentContext = {
     callback?: (event: { sent: boolean }) => void
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface commentsLogicValues {
+    meFirstMembers: OrganizationMemberType[] // membersLogic
+    currentProjectId: number | string // teamLogic
+    user: UserType | null // userLogic
+    commentContexts: Record<string, string>
+    comments: CommentType[] | null
+    commentsLoading: boolean
+    commentsWithReplies: CommentWithRepliesType[]
+    disabledReasonFor: (comment: CommentType) => string | null
+    editingComment: CommentType | null
+    editingCommentExistingMentions: number[] | null
+    editingCommentRichContentEditor: RichContentEditorType | null
+    emojiReactionsByComment: Record<string, Record<string, CommentType[]>>
+    isEditingCommentEmpty: boolean
+    isEmpty: boolean
+    isMyComment: (comment: CommentType) => boolean
+    itemContext: CommentContext | null
+    key: string
+    replyingCommentId: string | null
+    richContentEditor: RichContentEditorType | null
+    selectedCommentId: string | null
+    sortedComments: CommentType[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface commentsLogicActions {
+    ensureAllMembersLoaded: () => {
+        value: true
+    } // membersLogic
+    incrementCommentCount: () => any // sidePanelDiscussionLogic
+    scrollToLastComment: () => {
+        value: true
+    } // sidePanelDiscussionLogic
+    clearItemContext: () => {
+        value: true
+    }
+    completeComment: (comment: CommentType) => {
+        comment: CommentType
+    }
+    completeCommentFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    completeCommentSuccess: (
+        comments: CommentType[],
+        payload?: {
+            comment: CommentType
+        }
+    ) => {
+        comments: CommentType[]
+        payload?: {
+            comment: CommentType
+        }
+    }
+    deleteComment: (comment: CommentType) => {
+        comment: CommentType
+    }
+    deleteCommentFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteCommentSuccess: (
+        comments: CommentType[] | null,
+        payload?: {
+            comment: CommentType
+        }
+    ) => {
+        comments: CommentType[] | null
+        payload?: {
+            comment: CommentType
+        }
+    }
+    focusComposer: () => {
+        value: true
+    }
+    loadComments: () => {
+        value: true
+    }
+    loadCommentsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadCommentsSuccess: (
+        comments: CommentType[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        comments: CommentType[]
+        payload?: {
+            value: true
+        }
+    }
+    maybeLoadComments: () => {
+        value: true
+    }
+    onEditingCommentRichContentEditorUpdate: (isEmpty: boolean) => {
+        isEmpty: boolean
+    }
+    onRichContentEditorUpdate: (isEmpty: boolean) => {
+        isEmpty: boolean
+    }
+    persistEditedComment: () => {
+        value: true
+    }
+    persistEditedCommentFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    persistEditedCommentSuccess: (
+        comments: CommentType[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        comments: CommentType[]
+        payload?: {
+            value: true
+        }
+    }
+    reopenComment: (comment: CommentType) => {
+        comment: CommentType
+    }
+    reopenCommentFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    reopenCommentSuccess: (
+        comments: CommentType[],
+        payload?: {
+            comment: CommentType
+        }
+    ) => {
+        comments: CommentType[]
+        payload?: {
+            comment: CommentType
+        }
+    }
+    sendComposedContent: (asTask?: boolean) => {
+        asTask: boolean
+    }
+    sendComposedContentFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    sendComposedContentSuccess: (
+        comments: CommentType[],
+        payload?: {
+            asTask: boolean
+        }
+    ) => {
+        comments: CommentType[]
+        payload?: {
+            asTask: boolean
+        }
+    }
+    sendEmojiReaction: (
+        emoji: string,
+        sourceCommentId: string
+    ) => {
+        emoji: string
+        sourceCommentId: string
+    }
+    sendEmojiReactionFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    sendEmojiReactionSuccess: (
+        comments: CommentType[],
+        payload?: {
+            emoji: string
+            sourceCommentId: string
+        }
+    ) => {
+        comments: CommentType[]
+        payload?: {
+            emoji: string
+            sourceCommentId: string
+        }
+    }
+    setCommentContexts: (contexts: Record<string, string>) => {
+        contexts: Record<string, string>
+    }
+    setEditingComment: (comment: CommentType | null) => {
+        comment: CommentType | null
+    }
+    setEditingCommentRichContentEditor: (editor: RichContentEditorType | null) => {
+        editor: RichContentEditorType | null
+    }
+    setItemContext: (
+        context: Record<string, any> | null,
+        callback?: (event: { sent: boolean }) => void
+    ) => {
+        callback: ((event: { sent: boolean }) => void) | undefined
+        context: Record<string, any> | null
+    }
+    setReplyingComment: (commentId: string | null) => {
+        commentId: string | null
+    }
+    setRichContentEditor: (editor: RichContentEditorType) => {
+        editor: RichContentEditorType
+    }
+    setSelectedComment: (commentId: string | null) => {
+        commentId: string | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface commentsLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        key: (arg: any) => string
+        sortedComments: (comments: CommentType[] | null) => CommentType[]
+        commentsWithReplies: (sortedComments: CommentType[]) => CommentWithRepliesType[]
+        emojiReactionsByComment: (sortedComments: CommentType[]) => Record<string, Record<string, CommentType[]>>
+        isMyComment: (user: UserType | null) => (comment: CommentType) => boolean
+        disabledReasonFor: (user: UserType | null) => (comment: CommentType) => string | null
+    }
+}
+
+export type commentsLogicType = MakeLogicType<
+    commentsLogicValues,
+    commentsLogicActions,
+    CommentsLogicProps,
+    commentsLogicMeta
+>
+
 export const commentsLogic = kea<commentsLogicType>([
     path(() => ['scenes', 'notebooks', 'Notebook', 'commentsLogic']),
     props({} as CommentsLogicProps),
@@ -328,14 +577,14 @@ export const commentsLogic = kea<commentsLogicType>([
         key: [() => [(_, props) => props], (props): string => `${props.scope}-${props.item_id || ''}`],
         sortedComments: [
             (s) => [s.comments],
-            (comments) => {
+            (comments: CommentType[] | null) => {
                 return comments?.sort((a, b) => (a.created_at > b.created_at ? 1 : -1)) ?? []
             },
         ],
 
         commentsWithReplies: [
             (s) => [s.sortedComments],
-            (sortedComments) => {
+            (sortedComments: CommentType[]) => {
                 // NOTE: We build a tree of comments and replies here.
                 // Comments may have been deleted so if we have a reply to a comment that no longer exists,
                 // we still create the CommentWithRepliesType but with a null comment.
@@ -394,14 +643,14 @@ export const commentsLogic = kea<commentsLogicType>([
 
         isMyComment: [
             (s) => [s.user],
-            (user) => {
+            (user: null | import('~/types').UserType) => {
                 return (comment: CommentType): boolean => comment.created_by?.uuid === user?.uuid
             },
         ],
 
         disabledReasonFor: [
             (s) => [s.user],
-            (user) => {
+            (user: null | import('~/types').UserType) => {
                 return (comment: CommentType): string | null =>
                     comment.created_by?.uuid === user?.uuid ? null : 'You can only delete your own comments'
             },
diff --git a/frontend/src/scenes/coupons/couponLogic.ts b/frontend/src/scenes/coupons/couponLogic.ts
index 461ffc24089b..bf9f3e802d43 100644
--- a/frontend/src/scenes/coupons/couponLogic.ts
+++ b/frontend/src/scenes/coupons/couponLogic.ts
@@ -1,5 +1,6 @@
-import { actions, afterMount, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
@@ -12,7 +13,7 @@ import { userLogic } from 'scenes/userLogic'
 
 import { ClaimedCouponInfo, CouponsOverview } from '~/types'
 
-import type { couponLogicType } from './couponLogicType'
+import type { BillingType, OrganizationType, UserType } from '../../types'
 
 export interface CouponLogicProps {
     campaign?: string
@@ -23,6 +24,119 @@ export interface CouponFormValues {
     organization_name: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface couponLogicValues {
+    billing: BillingType | null // billingLogic
+    billingLoading: boolean // billingLogic
+    currentOrganization: OrganizationType | null // organizationLogic
+    isAdminOrOwner: boolean | null // organizationLogic
+    user: UserType | null // userLogic
+    activeCoupons: ClaimedCouponInfo[]
+    claimed: boolean
+    claimedDetails: any
+    coupon: CouponFormValues
+    couponAllErrors: Record<string, any>
+    couponChanged: boolean
+    couponErrors: DeepPartialMap<CouponFormValues, ValidationErrorType>
+    couponHasErrors: boolean
+    couponManualErrors: Record<string, any>
+    couponTouched: boolean
+    couponTouches: Record<string, boolean>
+    couponValidationErrors: DeepPartialMap<CouponFormValues, ValidationErrorType>
+    couponsOverview: CouponsOverview | null
+    couponsOverviewLoading: boolean
+    getClaimedCouponForCampaign: (campaignSlug: string) => ClaimedCouponInfo | null
+    isCouponSubmitting: boolean
+    isCouponValid: boolean
+    showCouponErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface couponLogicActions {
+    loadBillingSuccess: (
+        billing: BillingType,
+        payload?: any
+    ) => {
+        billing: BillingType
+        payload?: any
+    } // billingLogic
+    loadCurrentOrganizationSuccess: (
+        currentOrganization: OrganizationType | null,
+        payload?: any
+    ) => {
+        currentOrganization: OrganizationType | null
+        payload?: any
+    } // organizationLogic
+    loadCouponsOverview: () => any
+    loadCouponsOverviewFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadCouponsOverviewSuccess: (
+        couponsOverview: CouponsOverview | null,
+        payload?: any
+    ) => {
+        couponsOverview: CouponsOverview | null
+        payload?: any
+    }
+    resetCoupon: (values?: CouponFormValues) => {
+        values?: CouponFormValues
+    }
+    setClaimed: (claimed: boolean) => {
+        claimed: boolean
+    }
+    setClaimedDetails: (details: any) => {
+        details: any
+    }
+    setCouponManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setCouponValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setCouponValues: (values: DeepPartial<CouponFormValues>) => {
+        values: DeepPartial<CouponFormValues>
+    }
+    submitCoupon: () => {
+        value: boolean
+    }
+    submitCouponFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitCouponRequest: (coupon: CouponFormValues) => {
+        coupon: CouponFormValues
+    }
+    submitCouponSuccess: (coupon: CouponFormValues) => {
+        coupon: CouponFormValues
+    }
+    touchCouponField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface couponLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        getClaimedCouponForCampaign: (
+            couponsOverview: CouponsOverview | null
+        ) => (campaignSlug: string) => ClaimedCouponInfo | null
+        activeCoupons: (couponsOverview: CouponsOverview | null) => ClaimedCouponInfo[]
+    }
+}
+
+export type couponLogicType = MakeLogicType<couponLogicValues, couponLogicActions, CouponLogicProps, couponLogicMeta>
+
 export const couponLogic = kea<couponLogicType>([
     path(['scenes', 'coupons', 'couponLogic']),
     props({} as CouponLogicProps),
@@ -61,14 +175,14 @@ export const couponLogic = kea<couponLogicType>([
     selectors({
         getClaimedCouponForCampaign: [
             (s) => [s.couponsOverview],
-            (couponsOverview) =>
+            (couponsOverview: CouponsOverview | null) =>
                 (campaignSlug: string): ClaimedCouponInfo | null => {
                     return couponsOverview?.claimed_coupons?.find((c) => c.campaign_slug === campaignSlug) || null
                 },
         ],
         activeCoupons: [
             (s) => [s.couponsOverview],
-            (couponsOverview): ClaimedCouponInfo[] => {
+            (couponsOverview: CouponsOverview | null): ClaimedCouponInfo[] => {
                 return couponsOverview?.claimed_coupons?.filter((c) => c.status === 'claimed') ?? []
             },
         ],
diff --git a/frontend/src/scenes/dashboard/addInsightToDashboardModalLogic.ts b/frontend/src/scenes/dashboard/addInsightToDashboardModalLogic.ts
index 3a84c291b4fa..473c06e0964c 100644
--- a/frontend/src/scenes/dashboard/addInsightToDashboardModalLogic.ts
+++ b/frontend/src/scenes/dashboard/addInsightToDashboardModalLogic.ts
@@ -1,6 +1,28 @@
-import { actions, kea, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers } from 'kea'
 
-import type { addInsightToDashboardLogicType } from './addInsightToDashboardModalLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface addInsightToDashboardLogicValues {
+    addInsightToDashboardModalVisible: boolean
+    showMoreInsightTypes: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface addInsightToDashboardLogicActions {
+    hideAddInsightToDashboardModal: () => {
+        value: true
+    }
+    showAddInsightToDashboardModal: () => {
+        value: true
+    }
+    toggleShowMoreInsightTypes: () => {
+        value: true
+    }
+}
+
+export type addInsightToDashboardLogicType = MakeLogicType<
+    addInsightToDashboardLogicValues,
+    addInsightToDashboardLogicActions
+>
 
 export const addInsightToDashboardLogic = kea<addInsightToDashboardLogicType>([
     path(['scenes', 'dashboard', 'addInsightToDashboardLogic']),
diff --git a/frontend/src/scenes/dashboard/dashboardFiltersLogic.ts b/frontend/src/scenes/dashboard/dashboardFiltersLogic.ts
index 502df1141f6c..a959f71ba690 100644
--- a/frontend/src/scenes/dashboard/dashboardFiltersLogic.ts
+++ b/frontend/src/scenes/dashboard/dashboardFiltersLogic.ts
@@ -1,11 +1,36 @@
-import { actions, kea, key, path, props, reducers } from 'kea'
-
-import type { dashboardFiltersLogicType } from './dashboardFiltersLogicType'
+import { MakeLogicType, actions, kea, key, path, props, reducers } from 'kea'
 
 export interface DashboardFiltersLogicProps {
     dashboardId: number
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dashboardFiltersLogicValues {
+    showAdvancedFilters: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dashboardFiltersLogicActions {
+    setShowAdvancedFilters: (show: boolean) => {
+        show: boolean
+    }
+    toggleAdvancedFilters: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dashboardFiltersLogicMeta {
+    key: number
+}
+
+export type dashboardFiltersLogicType = MakeLogicType<
+    dashboardFiltersLogicValues,
+    dashboardFiltersLogicActions,
+    DashboardFiltersLogicProps,
+    dashboardFiltersLogicMeta
+>
+
 export const dashboardFiltersLogic = kea<dashboardFiltersLogicType>([
     path(['scenes', 'dashboard', 'dashboardFiltersLogic']),
     props({} as DashboardFiltersLogicProps),
diff --git a/frontend/src/scenes/dashboard/dashboardInsightColorsModalLogic.ts b/frontend/src/scenes/dashboard/dashboardInsightColorsModalLogic.ts
index 93f82ab42279..345ac255b9d6 100644
--- a/frontend/src/scenes/dashboard/dashboardInsightColorsModalLogic.ts
+++ b/frontend/src/scenes/dashboard/dashboardInsightColorsModalLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, path, reducers, selectors } from 'kea'
 
 import { getFunnelDatasetKey, getTrendDatasetKey, sortCohorts } from 'scenes/insights/utils'
 
@@ -6,8 +6,8 @@ import { cohortsModel } from '~/models/cohortsModel'
 import { isFunnelsQuery, isInsightVizNode, isTrendsQuery } from '~/queries/utils'
 import { CohortType, DashboardTile, FunnelVizType, QueryBasedInsightModel } from '~/types'
 
+import type { CountedPaginatedResponse } from '../../lib/api'
 import { BreakdownColorConfig } from './DashboardInsightColorsModal'
-import type { dashboardInsightColorsModalLogicType } from './dashboardInsightColorsModalLogicType'
 import { dashboardLogic } from './dashboardLogic'
 
 export type BreakdownValueAndType = Omit<BreakdownColorConfig, 'colorToken'>
@@ -83,6 +83,52 @@ export function extractBreakdownValues(
         })
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dashboardInsightColorsModalLogicValues {
+    allCohorts: CountedPaginatedResponse<CohortType> // cohortsModel
+    breakdownValues: BreakdownValueAndType[]
+    dashboardId: number | null
+    insightTiles: DashboardTile<QueryBasedInsightModel>[] | null
+    insightTilesLoading: boolean | null
+    isOpen: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dashboardInsightColorsModalLogicActions {
+    hideInsightColorsModal: () => {
+        value: true
+    }
+    showInsightColorsModal: (id: number) => {
+        id: number
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dashboardInsightColorsModalLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        isOpen: (dashboardId: number | null) => boolean
+        insightTiles: (
+            arg:
+                | DashboardTile<QueryBasedInsightModel<import('../../queries/schema').Node<Record<string, any>>>>[]
+                | null
+        ) => DashboardTile<QueryBasedInsightModel>[] | null
+        insightTilesLoading: (arg: null | true) => boolean | null
+        breakdownValues: (
+            insightTiles:
+                | DashboardTile<QueryBasedInsightModel<import('../../queries/schema').Node<Record<string, any>>>>[]
+                | null,
+            allCohorts: CountedPaginatedResponse<CohortType>
+        ) => BreakdownValueAndType[]
+    }
+}
+
+export type dashboardInsightColorsModalLogicType = MakeLogicType<
+    dashboardInsightColorsModalLogicValues,
+    dashboardInsightColorsModalLogicActions,
+    Record<string, any>,
+    dashboardInsightColorsModalLogicMeta
+>
+
 export const dashboardInsightColorsModalLogic = kea<dashboardInsightColorsModalLogicType>([
     path(['scenes', 'dashboard', 'dashboardInsightColorsModalLogic']),
     connect(() => ({
@@ -102,19 +148,26 @@ export const dashboardInsightColorsModalLogic = kea<dashboardInsightColorsModalL
         ],
     }),
     selectors({
-        isOpen: [(s) => [s.dashboardId], (dashboardId) => dashboardId != null],
+        isOpen: [(s) => [s.dashboardId], (dashboardId: number | null) => dashboardId != null],
         insightTiles: [
             (s) => [(state) => dashboardLogic.findMounted({ id: s.dashboardId(state) })?.values.insightTiles || null],
-            (insightTiles): DashboardTile<QueryBasedInsightModel>[] | null => insightTiles,
+            (
+                insightTiles:
+                    | DashboardTile<QueryBasedInsightModel<import('../../queries/schema').Node<Record<string, any>>>>[]
+                    | null
+            ): DashboardTile<QueryBasedInsightModel>[] | null => insightTiles,
         ],
         insightTilesLoading: [
             (s) => [(state) => dashboardLogic.findMounted({ id: s.dashboardId(state) })?.values.itemsLoading || null],
-            (itemsLoading): boolean | null => itemsLoading,
+            (itemsLoading: null | true): boolean | null => itemsLoading,
             { resultEqualityCheck: () => false },
         ],
         breakdownValues: [
             (s) => [s.insightTiles, s.allCohorts],
-            (insightTiles, allCohorts) => extractBreakdownValues(insightTiles, allCohorts?.results),
+            (
+                insightTiles: DashboardTile<QueryBasedInsightModel>[] | null,
+                allCohorts: import('../../lib/api').CountedPaginatedResponse<CohortType>
+            ) => extractBreakdownValues(insightTiles, allCohorts?.results),
         ],
     }),
 ])
diff --git a/frontend/src/scenes/dashboard/dashboardLogic.tsx b/frontend/src/scenes/dashboard/dashboardLogic.tsx
index 9036349e771a..5438b622acf8 100644
--- a/frontend/src/scenes/dashboard/dashboardLogic.tsx
+++ b/frontend/src/scenes/dashboard/dashboardLogic.tsx
@@ -1,5 +1,6 @@
 import { deepEqual as equal } from 'fast-equals'
 import {
+    MakeLogicType,
     BindLogic,
     actions,
     connect,
@@ -13,11 +14,13 @@ import {
     selectors,
     sharedListeners,
 } from 'kea'
+import type { BreakPointFunction } from 'kea'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, beforeUnload, router, urlToAction } from 'kea-router'
 import { CombinedLocation } from 'kea-router/lib/utils'
 import uniqBy from 'lodash.uniqby'
 import { ResponsiveLayouts } from 'react-grid-layout'
+import type { Layout } from 'react-grid-layout'
 
 import { LemonDialog, lemonToast } from '@posthog/lemon-ui'
 import type { DashboardWidgetRunResultApi } from '@posthog/products-dashboards/frontend/generated/api.schemas'
@@ -107,12 +110,13 @@ import {
     TileLayout,
 } from '~/types'
 
+import type { FeatureFlagsSet } from '../../lib/logic/featureFlagLogic'
+import type { Node } from '../../queries/schema/schema-general'
 import { getResponseBytes, sortDayJsDates } from '../insights/utils'
 import { filterVariablesReferencedInQuery } from '../insights/utils/queryUtils'
 import { teamLogic } from '../teamLogic'
 import { AUTO_REFRESH_INITIAL_INTERVAL_SECONDS } from './dashboardConstants'
 import { BreakdownColorConfig } from './DashboardInsightColorsModal'
-import type { dashboardLogicType } from './dashboardLogicType'
 import { dashboardQuickFiltersLogic } from './dashboardQuickFiltersLogic'
 import {
     BREAKPOINT_COLUMN_COUNTS,
@@ -219,6 +223,899 @@ function mergeUpdatedWidgetTileIntoDashboard(
     } as DashboardType<InsightModel>)
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dashboardLogicValues {
+    quickFilterPropertyFiltersById: Record<string, AnyPropertyFilter> // dashboardQuickFiltersLogic
+    getTheme: (themeId: number | string | null | undefined) => DataColorTheme | null // dataThemeLogic
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    currentTeamId: number | null // teamLogic
+    variables: Variable[] // variableDataLogic
+    accessDeniedToDashboard: boolean
+    addWidgetCollapsedGroups: string[]
+    addWidgetModalOpen: boolean
+    addWidgetSelectedTypes: string[]
+    addWidgetTileLoading: boolean
+    apiUrl: (
+        refresh?: RefreshType | undefined,
+        filtersOverride?: DashboardFilter | undefined,
+        variablesOverride?: Record<string, HogQLVariable> | undefined,
+        layoutSize?: 'sm' | 'xs' | undefined
+    ) => string
+    asDashboardTemplate: DashboardTemplateEditorType | undefined
+    autoRefresh: {
+        enabled: boolean
+        interval: number
+    }
+    blockRefresh: boolean
+    breadcrumbs: Breadcrumb[]
+    buttonTileId: number | 'new' | null
+    canAutoPreview: boolean
+    canEditDashboard: boolean
+    canRestrictDashboard: boolean
+    canSaveProjectDashboardTemplate: boolean
+    cancellingPreview: boolean
+    columns: number | null
+    containerWidth: number | null
+    currentLayoutSize: 'sm' | 'xs'
+    dashboard: DashboardType<QueryBasedInsightModel> | null
+    dashboardFailedToLoad: boolean
+    dashboardFiltersEnabled: boolean
+    dashboardLayouts: Record<DashboardTile['id'], DashboardTile['layouts']>
+    dashboardLoadData: {
+        action: DashboardLoadAction | undefined
+        dashboardQueryId: string
+        responseBytes: number
+        startTime: number
+    }
+    dashboardLoading: boolean
+    dashboardMode: DashboardMode | null
+    dashboardStreaming: boolean
+    dashboardWidgetsEnabled: boolean
+    dataColorTheme: DataColorTheme | null
+    dataColorThemeId: number | null
+    effectiveDashboardVariableOverrides: {
+        [x: string]: HogQLVariable
+    }
+    effectiveEditBarFilters: DashboardFilter
+    effectiveLastRefresh: Dayjs | null
+    effectiveRefreshFilters: DashboardFilter
+    effectiveVariablesAndAssociatedInsights: {
+        insightNames: string[]
+        variable: Variable
+    }[]
+    error404: boolean
+    externalFilters: DashboardFilter
+    filtersOverrideForLoad: DashboardFilter
+    hasIntermittentFilters: boolean
+    hasUnsavedLayoutChanges: boolean
+    hasUrlFilters: boolean
+    hasVariables: boolean
+    highlightedInsightId: any
+    initialQuickFiltersLoaded: boolean
+    initialVariablesLoaded: boolean
+    inlineTileInsertionEnabled: boolean
+    insightTiles: DashboardTile<QueryBasedInsightModel<Node<Record<string, any>>>>[]
+    intermittentFilters: DashboardFilter
+    isPinned: boolean
+    isRefreshing: (id: string) => boolean
+    isRefreshingQueued: (id: string) => boolean
+    isSavingTags: boolean
+    itemsLoading: boolean
+    lastDashboardRefresh: Dayjs | null
+    layout: Layout | undefined
+    layoutEditMode: boolean
+    layoutForItem: Record<string, TileLayout>
+    layoutZoom: number
+    layouts: Partial<Record<DashboardLayoutSize, Layout>>
+    loadLayoutFromServerOnPreview: boolean
+    loadTimer: Date | null
+    loadingPreview: boolean
+    maxContext: MaxContextInput[]
+    nextAllowedDashboardRefresh: Dayjs | null
+    oldestRefreshed: Dayjs | null
+    pageVisibility: boolean
+    pendingInsertion: PendingInsertion | null
+    placement: DashboardPlacement
+    projectTreeRef: ProjectTreeRef
+    refreshMetrics: {
+        completed: number
+        total: number
+    }
+    refreshStatus: Record<string, RefreshStatus>
+    refreshTilesTotal: number | null
+    scopedQuickFiltersAsPropertyFilters: AnyPropertyFilter[]
+    scrollToBottomSignal: number
+    shouldReportOnAPILoad: boolean
+    shouldUseStreaming: boolean
+    showApplyFiltersBanner: boolean
+    showButtonTileModal: boolean
+    showSubscriptions: boolean
+    showTextTileModal: boolean
+    sidePanelContext: SidePanelSceneContext | null
+    sizeKey: DashboardLayoutSize | undefined
+    sortedDates: Dayjs[]
+    subscriptionId: number | 'new' | null
+    temporaryBreakdownColors: BreakdownColorConfig[]
+    terraformModalOpen: boolean
+    textTileId: number | 'new' | null
+    textTiles: DashboardTile<QueryBasedInsightModel<Node<Record<string, any>>>>[]
+    tiles: DashboardTile<QueryBasedInsightModel<Node<Record<string, any>>>>[]
+    totalAdvancedFilters: number
+    urlFilters: DashboardFilter
+    urlSearchParamsAtEditModeEntry: {
+        filters?: unknown
+        variables?: unknown
+    } | null
+    urlVariables: Record<string, HogQLVariable>
+    widgetRefreshStatus: Record<
+        number,
+        {
+            error?: string | null
+            fetchedAt?: number
+            loading?: boolean
+        }
+    >
+    widgetResultsByTileId: Record<number, DashboardWidgetRunResultApi>
+    widgetTileUpdate: null
+    widgetTileUpdateLoading: boolean
+    widgetTiles: DashboardTile<QueryBasedInsightModel<Node<Record<string, any>>>>[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dashboardLogicActions {
+    quickFiltersCommitted: () => {
+        value: true
+    } // quickFiltersSectionLogic
+    quickFiltersUrlRestoreComplete: () => {
+        value: true
+    } // quickFiltersSectionLogic
+    abortAnyRunningQuery: () => {
+        value: true
+    }
+    abortQuery: (payload: { queryId: string; queryStartTime: number; shortId: InsightShortId }) => {
+        queryId: string
+        queryStartTime: number
+        shortId: InsightShortId
+    }
+    addWidgetTileFinished: () => {
+        value: true
+    }
+    addWidgetTiles: (payload: {
+        dashboardId: number
+        widgets: {
+            config: Record<string, unknown>
+            widgetType: string
+        }[]
+    }) => {
+        dashboardId: number
+        widgets: {
+            config: Record<string, unknown>
+            widgetType: string
+        }[]
+    }
+    applyFilters: () => {
+        value: true
+    }
+    applyPendingInsertion: () => {
+        value: true
+    }
+    applyWidgetIssueMetadataChange: (payload: {
+        context: WidgetIssueMetadataContext
+        delta: WidgetIssueMetadataDelta
+        issueId: string
+        tileId: number
+    }) => {
+        context: WidgetIssueMetadataContext
+        delta: WidgetIssueMetadataDelta
+        issueId: string
+        tileId: number
+    }
+    cancelDashboardRefresh: () => {
+        value: true
+    }
+    cancelEditMode: () => {
+        value: true
+    }
+    clearAddWidgetSelectedTypes: () => {
+        value: true
+    }
+    copyToDashboard: (
+        tile: DashboardTile<QueryBasedInsightModel>,
+        fromDashboard: number,
+        toDashboard: number,
+        toDashboardName: string
+    ) => {
+        fromDashboard: number
+        tile: DashboardTile<QueryBasedInsightModel<Node<Record<string, any>>>>
+        toDashboard: number
+        toDashboardName: string
+    }
+    copyToDashboardFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    copyToDashboardSuccess: (
+        dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>> | null,
+        payload?: {
+            fromDashboard: number
+            tile: DashboardTile<QueryBasedInsightModel<Node<Record<string, any>>>>
+            toDashboard: number
+            toDashboardName: string
+        }
+    ) => {
+        dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>> | null
+        payload?: {
+            fromDashboard: number
+            tile: DashboardTile<QueryBasedInsightModel<Node<Record<string, any>>>>
+            toDashboard: number
+            toDashboardName: string
+        }
+    }
+    dashboardNotFound: () => {
+        value: true
+    }
+    duplicateTile: (tile: DashboardTile<QueryBasedInsightModel>) => {
+        tile: DashboardTile<QueryBasedInsightModel<Node<Record<string, any>>>>
+    }
+    duplicateTileFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    duplicateTileSuccess: (
+        dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>> | null,
+        payload?: {
+            tile: DashboardTile<QueryBasedInsightModel<Node<Record<string, any>>>>
+        }
+    ) => {
+        dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>> | null
+        payload?: {
+            tile: DashboardTile<QueryBasedInsightModel<Node<Record<string, any>>>>
+        }
+    }
+    forceRefreshIfStale: () => {
+        value: true
+    }
+    loadDashboard: (payload: { action: DashboardLoadAction }) => {
+        action: DashboardLoadAction
+    }
+    loadDashboardFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadDashboardMetadataSuccess: (dashboard: DashboardType<QueryBasedInsightModel> | null) => {
+        dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>> | null
+    }
+    loadDashboardStreaming: (payload: { action: DashboardLoadAction; manualDashboardRefresh?: boolean }) => {
+        action: DashboardLoadAction
+        manualDashboardRefresh?: boolean | undefined
+    }
+    loadDashboardStreamingFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadDashboardStreamingSuccess: (
+        dashboard: null,
+        payload?: {
+            action: DashboardLoadAction
+            manualDashboardRefresh?: boolean | undefined
+        }
+    ) => {
+        dashboard: null
+        payload?: {
+            action: DashboardLoadAction
+            manualDashboardRefresh?: boolean | undefined
+        }
+    }
+    loadDashboardSuccess: (
+        dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>> | null,
+        payload?: {
+            action: DashboardLoadAction
+        }
+    ) => {
+        dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>> | null
+        payload?: {
+            action: DashboardLoadAction
+        }
+    }
+    loadingDashboardItemsStarted: (action: DashboardLoadAction) => {
+        action: DashboardLoadAction
+    }
+    moveToDashboard: (
+        tile: DashboardTile<QueryBasedInsightModel>,
+        fromDashboard: number,
+        toDashboard: number,
+        toDashboardName: string,
+        allowUndo?: boolean
+    ) => {
+        allowUndo: boolean
+        fromDashboard: number
+        tile: DashboardTile<QueryBasedInsightModel<Node<Record<string, any>>>>
+        toDashboard: number
+        toDashboardName: string
+    }
+    moveToDashboardFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    moveToDashboardSuccess: (
+        dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>> | null,
+        payload?: {
+            allowUndo: boolean
+            fromDashboard: number
+            tile: DashboardTile<QueryBasedInsightModel<Node<Record<string, any>>>>
+            toDashboard: number
+            toDashboardName: string
+        }
+    ) => {
+        dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>> | null
+        payload?: {
+            allowUndo: boolean
+            fromDashboard: number
+            tile: DashboardTile<QueryBasedInsightModel<Node<Record<string, any>>>>
+            toDashboard: number
+            toDashboardName: string
+        }
+    }
+    overrideVariableValue: (
+        variableId: string,
+        value: any,
+        isNull: boolean
+    ) => {
+        isNull: boolean
+        value: any
+        variableId: string
+    }
+    receiveTileFromStream: (data: { order: number; tile: any }) => {
+        order: number
+        tile: any
+    }
+    refreshDashboardItem: (payload: { tile: DashboardTile<QueryBasedInsightModel> }) => {
+        tile: DashboardTile<QueryBasedInsightModel<Node<Record<string, any>>>>
+    }
+    refreshDashboardItems: (payload: {
+        action: DashboardLoadAction | RefreshDashboardItemsAction
+        forceRefresh?: boolean
+    }) => {
+        action: DashboardLoadAction | RefreshDashboardItemsAction
+        forceRefresh?: boolean | undefined
+    }
+    refreshDashboardWidgets: (payload: { forceRefresh?: boolean; tileIds: number[] }) => {
+        forceRefresh?: boolean | undefined
+        tileIds: number[]
+    }
+    removeTile: (tile: DashboardTile<QueryBasedInsightModel>) => {
+        tile: DashboardTile<QueryBasedInsightModel<Node<Record<string, any>>>>
+    }
+    removeTileFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    removeTileSuccess: (
+        dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>> | null,
+        payload?: {
+            tile: DashboardTile<QueryBasedInsightModel<Node<Record<string, any>>>>
+        }
+    ) => {
+        dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>> | null
+        payload?: {
+            tile: DashboardTile<QueryBasedInsightModel<Node<Record<string, any>>>>
+        }
+    }
+    reportDashboardViewed: () => {
+        value: true
+    }
+    reportInsightsViewed: (insights: QueryBasedInsightModel[]) => {
+        insights: QueryBasedInsightModel<Node<Record<string, any>>>[]
+    }
+    requestScrollToBottom: () => {
+        value: true
+    }
+    resetIntermittentFilters: () => boolean
+    resetInterval: () => {
+        value: true
+    }
+    resetUrlFilters: () => boolean
+    resetUrlVariables: () => {
+        value: true
+    }
+    restoreUrlStateAtEditModeEntry: (
+        snapshot: {
+            filters?: unknown
+            variables?: unknown
+        } | null
+    ) => {
+        snapshot: {
+            filters?: unknown
+            variables?: unknown
+        } | null
+    }
+    saveEditModeChanges: () => boolean
+    saveEditModeChangesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    saveEditModeChangesSuccess: (
+        dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>> | null,
+        payload?: boolean
+    ) => {
+        dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>> | null
+        payload?: boolean
+    }
+    scheduleRefreshDashboardWidgets: (tileId: number) => {
+        tileId: number
+    }
+    setAccessDeniedToDashboard: () => {
+        value: true
+    }
+    setAddWidgetModalOpen: (open: boolean) => {
+        open: boolean
+    }
+    setAutoRefresh: (
+        enabled: boolean,
+        interval: number
+    ) => {
+        enabled: boolean
+        interval: number
+    }
+    setBreakdownColorConfig: (config: BreakdownColorConfig) => {
+        config: BreakdownColorConfig
+    }
+    setBreakdownFilter: (breakdown_filter: BreakdownFilter | null) => {
+        breakdown_filter: BreakdownFilter | null
+    }
+    setButtonTileId: (buttonTileId: number | 'new' | null) => {
+        buttonTileId: number | 'new' | null
+    }
+    setDashboardMode: (
+        mode: DashboardMode | null,
+        source: DashboardEventSource
+    ) => {
+        mode: DashboardMode | null
+        source: DashboardEventSource
+    }
+    setDashboardModeFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    setDashboardModeSuccess: (
+        dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>> | null,
+        payload?: {
+            mode: DashboardMode | null
+            source: DashboardEventSource
+        }
+    ) => {
+        dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>> | null
+        payload?: {
+            mode: DashboardMode | null
+            source: DashboardEventSource
+        }
+    }
+    setDataColorThemeId: (dataColorThemeId: number | null) => {
+        dataColorThemeId: number | null
+    }
+    setDates: (
+        date_from: string | null,
+        date_to: string | null | undefined,
+        explicitDate?: boolean
+    ) => {
+        date_from: string | null
+        date_to: string | null | undefined
+        explicitDate: boolean | undefined
+    }
+    setExternalFilters: (filters: DashboardFilter) => {
+        filters: DashboardFilter
+    }
+    setInitialLoadResponseBytes: (responseBytes: number) => {
+        responseBytes: number
+    }
+    setInitialQuickFiltersLoaded: (initialQuickFiltersLoaded: boolean) => {
+        initialQuickFiltersLoaded: boolean
+    }
+    setInitialVariablesLoaded: (initialVariablesLoaded: boolean) => {
+        initialVariablesLoaded: boolean
+    }
+    setLayoutZoom: (layoutZoom: number) => {
+        layoutZoom: number
+    }
+    setLoadLayoutFromServerOnPreview: (loadLayoutFromServerOnPreview: boolean) => {
+        loadLayoutFromServerOnPreview: boolean
+    }
+    setPageVisibility: (visible: boolean) => {
+        visible: boolean
+    }
+    setPendingInsertion: (pendingInsertion: PendingInsertion | null) => {
+        pendingInsertion: PendingInsertion | null
+    }
+    setProperties: (properties: AnyPropertyFilter[] | null) => {
+        properties: AnyPropertyFilter[] | null
+    }
+    setRefreshError: (
+        shortId: InsightShortId,
+        error?: Error
+    ) => {
+        error: Error | undefined
+        shortId: InsightShortId
+    }
+    setRefreshStatus: (
+        shortId: InsightShortId,
+        loading?: any,
+        queued?: any
+    ) => {
+        loading: any
+        queued: any
+        shortId: InsightShortId
+    }
+    setRefreshStatuses: (
+        shortIds: InsightShortId[],
+        loading?: any,
+        queued?: any
+    ) => {
+        loading: any
+        queued: any
+        shortIds: InsightShortId[]
+    }
+    setRefreshTilesTotal: (total: number) => {
+        total: number
+    }
+    setShouldReportOnAPILoad: (shouldReport: boolean) => {
+        shouldReport: boolean
+    }
+    setSubscriptionMode: (
+        enabled: boolean,
+        id?: number | 'new'
+    ) => {
+        enabled: boolean
+        id: number | 'new' | undefined
+    }
+    setTerraformModalOpen: (open: boolean) => {
+        open: boolean
+    }
+    setTextTileId: (textTileId: number | 'new' | null) => {
+        textTileId: number | 'new' | null
+    }
+    setTileOverride: (tile: DashboardTile<QueryBasedInsightModel>) => {
+        tile: DashboardTile<QueryBasedInsightModel<Node<Record<string, any>>>>
+    }
+    setTileProperty: (
+        tileId: number,
+        properties: Partial<Pick<DashboardTile, 'color' | 'show_description'>>
+    ) => {
+        properties: Partial<Pick<DashboardTile<InsightModel>, 'color' | 'show_description'>>
+        tileId: number
+    }
+    setUrlSearchParamsAtEditModeEntry: (snapshot: { filters?: unknown; variables?: unknown }) => {
+        snapshot: {
+            filters?: unknown
+            variables?: unknown
+        }
+    }
+    setWidgetRefreshStatuses: (
+        tileIds: number[],
+        loading: boolean,
+        error?: string | null
+    ) => {
+        error: string | null | undefined
+        loading: boolean
+        tileIds: number[]
+    }
+    setWidgetRunResults: (results: Record<number, DashboardWidgetRunResultApi>) => {
+        results: Record<number, DashboardWidgetRunResultApi>
+    }
+    tileStreamingComplete: () => {
+        value: true
+    }
+    tileStreamingFailure: (error: any) => {
+        error: any
+    }
+    toggleAddWidgetCollapsedGroup: (groupId: string) => {
+        groupId: string
+    }
+    toggleAddWidgetSelectedType: (widgetType: string) => {
+        widgetType: string
+    }
+    togglePinned: () => {
+        value: true
+    }
+    toggleTileDescription: (tileId: number) => {
+        tileId: number
+    }
+    triggerDashboardRefresh: () => {
+        value: true
+    }
+    triggerDashboardUpdate: (payload: any) => {
+        payload: any
+    }
+    updateContainerWidth: (
+        containerWidth: number,
+        columns: number
+    ) => {
+        columns: number
+        containerWidth: number
+    }
+    updateDashboardLastRefresh: (lastDashboardRefresh: Dayjs) => {
+        lastDashboardRefresh: Dayjs
+    }
+    updateDashboardTags: (tags: string[]) => {
+        tags: string[]
+    }
+    updateLayouts: (layouts: ResponsiveLayouts) => {
+        layouts: Partial<Record<string, Layout>>
+    }
+    updateTileColor: (
+        tileId: number,
+        color: InsightColor | null
+    ) => {
+        color: InsightColor | null
+        tileId: number
+    }
+    updateWidgetTile: ({
+        tile,
+        config,
+        name,
+        description,
+    }: {
+        config?: Record<string, unknown>
+        description?: string
+        name?: string | null
+        tile: DashboardTile<QueryBasedInsightModel>
+    }) => {
+        tile: DashboardTile<QueryBasedInsightModel>
+        config?: Record<string, unknown>
+        name?: string | null
+        description?: string
+    }
+    updateWidgetTileFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateWidgetTileSuccess: (
+        widgetTileUpdate: null,
+        payload?: {
+            tile: DashboardTile<QueryBasedInsightModel>
+            config?: Record<string, unknown>
+            name?: string | null
+            description?: string
+        }
+    ) => {
+        widgetTileUpdate: null
+        payload?: {
+            tile: DashboardTile<QueryBasedInsightModel>
+            config?: Record<string, unknown>
+            name?: string | null
+            description?: string
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dashboardLogicMeta {
+    key: number
+    sharedListeners: {
+        reportRefreshTiming: (
+            payload: any,
+            breakpoint: BreakPointFunction,
+            action: {
+                type: string
+                payload: any
+            },
+            previousState: any
+        ) => void | Promise<void>
+        reportLoadTiming: (
+            payload: any,
+            breakpoint: BreakPointFunction,
+            action: {
+                type: string
+                payload: any
+            },
+            previousState: any
+        ) => void | Promise<void>
+        handleDashboardLoadComplete: (
+            payload: any,
+            breakpoint: BreakPointFunction,
+            action: {
+                type: string
+                payload: any
+            },
+            previousState: any
+        ) => void | Promise<void>
+    }
+    __keaTypeGenInternalSelectorTypes: {
+        shouldUseStreaming: (featureFlags: FeatureFlagsSet) => boolean
+        canAutoPreview: (insightTiles: DashboardTile<QueryBasedInsightModel<Node<Record<string, any>>>>[]) => boolean
+        hasIntermittentFilters: (intermittentFilters: DashboardFilter) => boolean
+        hasUrlFilters: (urlFilters: DashboardFilter) => boolean
+        showApplyFiltersBanner: (canAutoPreview: boolean, hasIntermittentFilters: boolean) => boolean
+        urlFilters: (searchParams: Record<string, any>) => DashboardFilter
+        scopedQuickFiltersAsPropertyFilters: (
+            dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>> | null,
+            quickFilterPropertyFiltersById: Record<string, AnyPropertyFilter>
+        ) => AnyPropertyFilter[]
+        filtersOverrideForLoad: (
+            externalFilters: DashboardFilter,
+            urlFilters: DashboardFilter,
+            scopedQuickFiltersAsPropertyFilters: AnyPropertyFilter[],
+            dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>> | null,
+            quickFilterPropertyFiltersById: Record<string, AnyPropertyFilter>
+        ) => DashboardFilter
+        effectiveEditBarFilters: (
+            dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>> | null,
+            externalFilters: DashboardFilter,
+            urlFilters: DashboardFilter,
+            intermittentFilters: DashboardFilter
+        ) => DashboardFilter
+        effectiveRefreshFilters: (
+            dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>> | null,
+            externalFilters: DashboardFilter,
+            urlFilters: DashboardFilter,
+            scopedQuickFiltersAsPropertyFilters: AnyPropertyFilter[]
+        ) => DashboardFilter
+        effectiveDashboardVariableOverrides: (
+            dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>> | null,
+            urlVariables: Record<string, HogQLVariable>
+        ) => {
+            [x: string]: HogQLVariable
+        }
+        hasUnsavedLayoutChanges: (
+            dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>> | null,
+            dashboardLayouts: Record<
+                number,
+                Record<string, never> | Record<DashboardLayoutSize, TileLayout> | undefined
+            >
+        ) => boolean
+        effectiveVariablesAndAssociatedInsights: (
+            dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>> | null,
+            variables: Variable[],
+            urlVariables: Record<string, HogQLVariable>
+        ) => {
+            insightNames: string[]
+            variable: Variable
+        }[]
+        urlVariables: (
+            searchParams: Record<string, any>,
+            variables: Variable[],
+            initialVariablesLoaded: boolean
+        ) => Record<string, HogQLVariable>
+        hasVariables: (
+            effectiveVariablesAndAssociatedInsights: {
+                insightNames: string[]
+                variable: Variable
+            }[]
+        ) => boolean
+        asDashboardTemplate: (
+            dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>> | null
+        ) => DashboardTemplateEditorType | undefined
+        placement: (arg: any) => DashboardPlacement
+        apiUrl: (
+            id: number
+        ) => (
+            refresh?: RefreshType | undefined,
+            filtersOverride?: DashboardFilter | undefined,
+            variablesOverride?: Record<string, HogQLVariable> | undefined,
+            layoutSize?: 'sm' | 'xs' | undefined
+        ) => string
+        currentLayoutSize: (containerWidth: number | null) => 'sm' | 'xs'
+        tiles: (
+            dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>> | null
+        ) => DashboardTile<QueryBasedInsightModel<Node<Record<string, any>>>>[]
+        widgetTiles: (
+            tiles: DashboardTile<QueryBasedInsightModel<Node<Record<string, any>>>>[]
+        ) => DashboardTile<QueryBasedInsightModel<Node<Record<string, any>>>>[]
+        dashboardWidgetsEnabled: (
+            featureFlags: FeatureFlagsSet,
+            tiles: DashboardTile<QueryBasedInsightModel<Node<Record<string, any>>>>[],
+            placement: DashboardPlacement
+        ) => boolean
+        inlineTileInsertionEnabled: (featureFlags: FeatureFlagsSet) => boolean
+        insightTiles: (
+            tiles: DashboardTile<QueryBasedInsightModel<Node<Record<string, any>>>>[]
+        ) => DashboardTile<QueryBasedInsightModel<Node<Record<string, any>>>>[]
+        textTiles: (
+            tiles: DashboardTile<QueryBasedInsightModel<Node<Record<string, any>>>>[]
+        ) => DashboardTile<QueryBasedInsightModel<Node<Record<string, any>>>>[]
+        itemsLoading: (
+            dashboardLoading: boolean,
+            dashboardStreaming: boolean,
+            refreshStatus: Record<string, RefreshStatus>,
+            initialVariablesLoaded: boolean,
+            initialQuickFiltersLoaded: boolean,
+            dashboardFiltersEnabled: boolean
+        ) => boolean
+        isRefreshingQueued: (refreshStatus: Record<string, RefreshStatus>) => (id: string) => boolean
+        isRefreshing: (refreshStatus: Record<string, RefreshStatus>) => (id: string) => boolean
+        highlightedInsightId: (searchParams: Record<string, any>) => any
+        sortedDates: (insightTiles: DashboardTile<QueryBasedInsightModel<Node<Record<string, any>>>>[]) => Dayjs[]
+        oldestRefreshed: (sortedDates: Dayjs[], pageVisibility: boolean) => Dayjs | null
+        effectiveLastRefresh: (lastDashboardRefresh: Dayjs | null, oldestRefreshed: Dayjs | null) => Dayjs | null
+        nextAllowedDashboardRefresh: (lastDashboardRefresh: Dayjs | null) => Dayjs | null
+        blockRefresh: (
+            nextAllowedDashboardRefresh: Dayjs | null,
+            placement: DashboardPlacement,
+            pageVisibility: boolean
+        ) => boolean
+        dashboardFiltersEnabled: (placement: DashboardPlacement, featureFlags: FeatureFlagsSet) => boolean
+        totalAdvancedFilters: (effectiveEditBarFilters: DashboardFilter) => number
+        canEditDashboard: (
+            dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>> | null
+        ) => boolean
+        canSaveProjectDashboardTemplate: (
+            canEditDashboard: boolean,
+            asDashboardTemplate: DashboardTemplateEditorType | undefined
+        ) => boolean
+        canRestrictDashboard: (
+            dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>> | null,
+            user: null | import('~/types').UserType,
+            currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType
+        ) => boolean
+        sizeKey: (columns: number | null) => DashboardLayoutSize | undefined
+        layouts: (
+            tiles: DashboardTile<QueryBasedInsightModel<Node<Record<string, any>>>>[]
+        ) => Partial<Record<DashboardLayoutSize, Layout>>
+        layout: (
+            layouts: Partial<Record<DashboardLayoutSize, Layout>>,
+            sizeKey: DashboardLayoutSize | undefined
+        ) => Layout | undefined
+        layoutForItem: (layout: Layout | undefined) => Record<string, TileLayout>
+        refreshMetrics: (
+            refreshStatus: Record<string, RefreshStatus>,
+            refreshTilesTotal: number | null
+        ) => {
+            completed: number
+            total: number
+        }
+        breadcrumbs: (
+            dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>> | null,
+            error404: boolean,
+            dashboardFailedToLoad: boolean,
+            searchParams: Record<string, any>
+        ) => Breadcrumb[]
+        projectTreeRef: (arg: number) => ProjectTreeRef
+        sidePanelContext: (
+            dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>> | null
+        ) => SidePanelSceneContext | null
+        dataColorTheme: (
+            dataColorThemeId: number | null,
+            getTheme: (themeId: number | string | null | undefined) => DataColorTheme | null
+        ) => DataColorTheme | null
+        maxContext: (
+            dashboard: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>> | null
+        ) => MaxContextInput[]
+    }
+}
+
+export type dashboardLogicType = MakeLogicType<
+    dashboardLogicValues,
+    dashboardLogicActions,
+    DashboardLogicProps,
+    dashboardLogicMeta
+>
+
 export const dashboardLogic = kea<dashboardLogicType>([
     path(['scenes', 'dashboard', 'dashboardLogic']),
     connect(() => ({
@@ -918,7 +1815,7 @@ export const dashboardLogic = kea<dashboardLogicType>([
                     } as DashboardType<QueryBasedInsightModel>
                 },
                 [dashboardsModel.actionTypes.tileMovedToDashboard]: (state, { tile, dashboardId }) => {
-                    if (state?.id === dashboardId) {
+                    if (state && state.id === dashboardId) {
                         return {
                             ...state,
                             tiles: [...state.tiles, tile],
@@ -935,7 +1832,7 @@ export const dashboardLogic = kea<dashboardLogicType>([
                         return state
                     }
                     const targetDashboards = (insight.dashboard_tiles || [])
-                        .map((tile) => tile.dashboard_id)
+                        .map((tile: { dashboard_id: number }) => tile.dashboard_id)
                         .concat(extraDashboardIds || [])
                     if (!targetDashboards.includes(props.id)) {
                         // this update is not for this dashboard
@@ -1428,7 +2325,7 @@ export const dashboardLogic = kea<dashboardLogicType>([
     selectors(() => ({
         shouldUseStreaming: [
             (s) => [s.featureFlags],
-            (featureFlags): boolean => {
+            (featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet): boolean => {
                 const hasFeatureFlag = !!featureFlags[FEATURE_FLAGS.SSE_DASHBOARDS]
                 const hasSSESupport = typeof EventSource !== 'undefined'
                 return hasFeatureFlag && hasSSESupport
@@ -1436,7 +2333,11 @@ export const dashboardLogic = kea<dashboardLogicType>([
         ],
         canAutoPreview: [
             (s) => [s.insightTiles],
-            (insightTiles) => {
+            (
+                insightTiles: DashboardTile<
+                    QueryBasedInsightModel<import('~/queries/schema/schema-general').Node<Record<string, any>>>
+                >[]
+            ) => {
                 const payload = getFeatureFlagPayload(FEATURE_FLAGS.DASHBOARD_AUTO_PREVIEW_LIMIT)
                 const limit = typeof payload === 'number' ? payload : DEFAULT_AUTO_PREVIEW_TILE_LIMIT
                 // The limit is about the number of insights on a dashboard (per the flag's intent),
@@ -1446,17 +2347,21 @@ export const dashboardLogic = kea<dashboardLogicType>([
         ],
         hasIntermittentFilters: [
             (s) => [s.intermittentFilters],
-            (intermittentFilters) => Object.values(intermittentFilters).some((filter) => filter !== undefined),
+            (intermittentFilters: DashboardFilter) =>
+                Object.values(intermittentFilters).some((filter) => filter !== undefined),
         ],
         hasUrlFilters: [
             (s) => [s.urlFilters],
-            (urlFilters) => Object.values(urlFilters).some((filter) => filter !== undefined),
+            (urlFilters: DashboardFilter) => Object.values(urlFilters).some((filter) => filter !== undefined),
         ],
         showApplyFiltersBanner: [
             (s) => [s.canAutoPreview, s.hasIntermittentFilters],
-            (canAutoPreview, hasIntermittentFilters) => !canAutoPreview && hasIntermittentFilters,
+            (canAutoPreview: boolean, hasIntermittentFilters: boolean) => !canAutoPreview && hasIntermittentFilters,
+        ],
+        urlFilters: [
+            () => [router.selectors.searchParams],
+            (searchParams: Record<string, any>) => parseURLFilters(searchParams),
         ],
-        urlFilters: [() => [router.selectors.searchParams], (searchParams) => parseURLFilters(searchParams)],
         scopedQuickFiltersAsPropertyFilters: [
             (s) => [s.dashboard, s.quickFilterPropertyFiltersById],
             (
@@ -1480,7 +2385,13 @@ export const dashboardLogic = kea<dashboardLogicType>([
                 s.dashboard,
                 s.quickFilterPropertyFiltersById,
             ],
-            (externalFilters, urlFilters, scopedQuickFilters, dashboard, quickFilterPropertyFiltersById) => {
+            (
+                externalFilters: DashboardFilter,
+                urlFilters: DashboardFilter,
+                scopedQuickFilters: AnyPropertyFilter[],
+                dashboard: DashboardType<QueryBasedInsightModel> | null,
+                quickFilterPropertyFiltersById: Record<string, AnyPropertyFilter>
+            ) => {
                 const combined = combineDashboardFilters(externalFilters, urlFilters)
                 // Before the dashboard loads, scopedQuickFiltersAsPropertyFilters is
                 // empty because scoping needs dashboard.quick_filter_ids. Fall back to
@@ -1500,7 +2411,12 @@ export const dashboardLogic = kea<dashboardLogicType>([
         ],
         effectiveEditBarFilters: [
             (s) => [s.dashboard, s.externalFilters, s.urlFilters, s.intermittentFilters],
-            (dashboard, externalFilters, urlFilters, intermittentFilters) => {
+            (
+                dashboard: DashboardType<QueryBasedInsightModel> | null,
+                externalFilters: DashboardFilter,
+                urlFilters: DashboardFilter,
+                intermittentFilters: DashboardFilter
+            ) => {
                 const effectiveEditBarFilters = combineDashboardFilters(
                     dashboard?.persisted_filters || {},
                     externalFilters,
@@ -1531,7 +2447,10 @@ export const dashboardLogic = kea<dashboardLogicType>([
         ],
         effectiveDashboardVariableOverrides: [
             (s) => [s.dashboard, s.urlVariables],
-            (dashboard, urlVariables) => ({ ...dashboard?.persisted_variables, ...urlVariables }),
+            (dashboard: DashboardType<QueryBasedInsightModel> | null, urlVariables: Record<string, HogQLVariable>) => ({
+                ...dashboard?.persisted_variables,
+                ...urlVariables,
+            }),
         ],
         hasUnsavedLayoutChanges: [
             (s) => [s.dashboard, s.dashboardLayouts],
@@ -1616,7 +2535,11 @@ export const dashboardLogic = kea<dashboardLogicType>([
         ],
         urlVariables: [
             (s) => [router.selectors.searchParams, s.variables, s.initialVariablesLoaded],
-            (searchParams, variables, initialVariablesLoaded): Record<string, HogQLVariable> => {
+            (
+                searchParams: Record<string, any>,
+                variables: Variable[],
+                initialVariablesLoaded: boolean
+            ): Record<string, HogQLVariable> => {
                 if (!initialVariablesLoaded) {
                     // if initial variables are not loaded yet, we can't map the variables in the url
                     return {}
@@ -1643,8 +2566,12 @@ export const dashboardLogic = kea<dashboardLogicType>([
         ],
         hasVariables: [
             (s) => [s.effectiveVariablesAndAssociatedInsights],
-            (effectiveVariablesAndAssociatedInsights) =>
-                Object.keys(effectiveVariablesAndAssociatedInsights).length > 0,
+            (
+                effectiveVariablesAndAssociatedInsights: {
+                    insightNames: string[]
+                    variable: Variable
+                }[]
+            ) => Object.keys(effectiveVariablesAndAssociatedInsights).length > 0,
         ],
         asDashboardTemplate: [
             (s) => [s.dashboard],
@@ -1657,7 +2584,7 @@ export const dashboardLogic = kea<dashboardLogicType>([
         ],
         apiUrl: [
             (_, p) => [p.id],
-            (id) => {
+            (id: number) => {
                 return (
                     refresh?: RefreshType,
                     filtersOverride?: DashboardFilter,
@@ -1674,7 +2601,7 @@ export const dashboardLogic = kea<dashboardLogicType>([
         ],
         currentLayoutSize: [
             (s) => [s.containerWidth],
-            (containerWidth): 'sm' | 'xs' => {
+            (containerWidth: number | null): 'sm' | 'xs' => {
                 // Use precise container width when available, otherwise estimate from window width
                 if (containerWidth !== null) {
                     return containerWidth > BREAKPOINTS.sm ? 'sm' : 'xs'
@@ -1685,11 +2612,28 @@ export const dashboardLogic = kea<dashboardLogicType>([
                 return estimatedContainerWidth > BREAKPOINTS.sm ? 'sm' : 'xs'
             },
         ],
-        tiles: [(s) => [s.dashboard], (dashboard) => dashboard?.tiles?.filter((t) => !t.deleted) || []],
-        widgetTiles: [(s) => [s.tiles], (tiles) => tiles.filter((t) => !!t.widget)],
+        tiles: [
+            (s) => [s.dashboard],
+            (dashboard: DashboardType<QueryBasedInsightModel> | null) =>
+                dashboard?.tiles?.filter((t) => !t.deleted) || [],
+        ],
+        widgetTiles: [
+            (s) => [s.tiles],
+            (
+                tiles: DashboardTile<
+                    QueryBasedInsightModel<import('~/queries/schema/schema-general').Node<Record<string, any>>>
+                >[]
+            ) => tiles.filter((t) => !!t.widget),
+        ],
         dashboardWidgetsEnabled: [
             (s) => [s.featureFlags, s.tiles, s.placement],
-            (featureFlags, tiles, placement): boolean => {
+            (
+                featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet,
+                tiles: DashboardTile<
+                    QueryBasedInsightModel<import('~/queries/schema/schema-general').Node<Record<string, any>>>
+                >[],
+                placement: DashboardPlacement
+            ): boolean => {
                 // Shared dashboards don't receive team feature flags; render widget tiles when
                 // metadata is already present on the exported dashboard payload.
                 if (placement === DashboardPlacement.Public && tiles.some((tile) => !!tile.widget)) {
@@ -1700,13 +2644,25 @@ export const dashboardLogic = kea<dashboardLogicType>([
         ],
         inlineTileInsertionEnabled: [
             (s) => [s.featureFlags],
-            (featureFlags): boolean => !!featureFlags[FEATURE_FLAGS.DASHBOARD_INLINE_TILE_INSERTION],
+            (featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet): boolean =>
+                !!featureFlags[FEATURE_FLAGS.DASHBOARD_INLINE_TILE_INSERTION],
         ],
         insightTiles: [
             (s) => [s.tiles],
-            (tiles) => tiles.filter((t) => !!t.insight).filter((i) => !i.insight?.deleted),
+            (
+                tiles: DashboardTile<
+                    QueryBasedInsightModel<import('~/queries/schema/schema-general').Node<Record<string, any>>>
+                >[]
+            ) => tiles.filter((t) => !!t.insight).filter((i) => !i.insight?.deleted),
+        ],
+        textTiles: [
+            (s) => [s.tiles],
+            (
+                tiles: DashboardTile<
+                    QueryBasedInsightModel<import('~/queries/schema/schema-general').Node<Record<string, any>>>
+                >[]
+            ) => tiles.filter((t) => !!t.text),
         ],
-        textTiles: [(s) => [s.tiles], (tiles) => tiles.filter((t) => !!t.text)],
         itemsLoading: [
             (s) => [
                 s.dashboardLoading,
@@ -1717,12 +2673,12 @@ export const dashboardLogic = kea<dashboardLogicType>([
                 s.dashboardFiltersEnabled,
             ],
             (
-                dashboardLoading,
-                dashboardStreaming,
-                refreshStatus,
-                initialVariablesLoaded,
-                initialQuickFiltersLoaded,
-                dashboardFiltersEnabled
+                dashboardLoading: boolean,
+                dashboardStreaming: boolean,
+                refreshStatus: Record<string, RefreshStatus>,
+                initialVariablesLoaded: boolean,
+                initialQuickFiltersLoaded: boolean,
+                dashboardFiltersEnabled: boolean
             ) => {
                 return (
                     dashboardLoading ||
@@ -1735,15 +2691,25 @@ export const dashboardLogic = kea<dashboardLogicType>([
                 )
             },
         ],
-        isRefreshingQueued: [(s) => [s.refreshStatus], (refreshStatus) => (id: string) => !!refreshStatus[id]?.queued],
-        isRefreshing: [(s) => [s.refreshStatus], (refreshStatus) => (id: string) => !!refreshStatus[id]?.loading],
+        isRefreshingQueued: [
+            (s) => [s.refreshStatus],
+            (refreshStatus: Record<string, RefreshStatus>) => (id: string) => !!refreshStatus[id]?.queued,
+        ],
+        isRefreshing: [
+            (s) => [s.refreshStatus],
+            (refreshStatus: Record<string, RefreshStatus>) => (id: string) => !!refreshStatus[id]?.loading,
+        ],
         highlightedInsightId: [
             () => [router.selectors.searchParams],
-            (searchParams) => searchParams.highlightInsightId,
+            (searchParams: Record<string, any>) => searchParams.highlightInsightId,
         ],
         sortedDates: [
             (s) => [s.insightTiles],
-            (insightTiles): Dayjs[] => {
+            (
+                insightTiles: DashboardTile<
+                    QueryBasedInsightModel<import('~/queries/schema/schema-general').Node<Record<string, any>>>
+                >[]
+            ): Dayjs[] => {
                 if (!insightTiles || !insightTiles.length) {
                     return []
                 }
@@ -1757,7 +2723,7 @@ export const dashboardLogic = kea<dashboardLogicType>([
         oldestRefreshed: [
             // selecting page visibility to update the refresh when a page comes back into view
             (s) => [s.sortedDates, s.pageVisibility],
-            (sortedDates): Dayjs | null => {
+            (sortedDates: Dayjs[]): Dayjs | null => {
                 if (!sortedDates.length) {
                     return null
                 }
@@ -1767,7 +2733,7 @@ export const dashboardLogic = kea<dashboardLogicType>([
         ],
         effectiveLastRefresh: [
             (s) => [s.lastDashboardRefresh, s.oldestRefreshed],
-            (lastDashboardRefresh, oldestRefreshed): Dayjs | null => {
+            (lastDashboardRefresh: Dayjs | null, oldestRefreshed: Dayjs | null): Dayjs | null => {
                 // Pessimistic: the banner must not claim the dashboard is fresher than the stalest insight
                 // tile (per-tile menus use insight.last_refresh). `last_dashboard.last_refresh` and client
                 // `updateDashboardLastRefresh(dayjs())` can otherwise run ahead of embedded tile metadata.
@@ -1777,7 +2743,7 @@ export const dashboardLogic = kea<dashboardLogicType>([
 
         nextAllowedDashboardRefresh: [
             (s) => [s.lastDashboardRefresh],
-            (lastDashboardRefresh): Dayjs | null => {
+            (lastDashboardRefresh: Dayjs | null): Dayjs | null => {
                 if (!lastDashboardRefresh) {
                     return null
                 }
@@ -1826,7 +2792,7 @@ export const dashboardLogic = kea<dashboardLogicType>([
         ],
         canEditDashboard: [
             (s) => [s.dashboard],
-            (dashboard) => {
+            (dashboard: DashboardType<QueryBasedInsightModel> | null) => {
                 return dashboard?.user_access_level
                     ? accessLevelSatisfied(
                           AccessControlResourceType.Dashboard,
@@ -1839,13 +2805,17 @@ export const dashboardLogic = kea<dashboardLogicType>([
         /** Save-as-project-template from dashboard scene: editor on dashboard and payload has tiles. Staff use the same modal, with an optional JSON editor entry inside. */
         canSaveProjectDashboardTemplate: [
             (s) => [s.canEditDashboard, s.asDashboardTemplate],
-            (canEditDashboard, asDashboardTemplate): boolean =>
+            (canEditDashboard: boolean, asDashboardTemplate: DashboardTemplateEditorType | undefined): boolean =>
                 canEditDashboard && !!(asDashboardTemplate?.tiles?.length ?? 0),
         ],
         canRestrictDashboard: [
             // Sync conditions with backend can_user_restrict
             (s) => [s.dashboard, userLogic.selectors.user, teamLogic.selectors.currentTeam],
-            (dashboard, user, currentTeam): boolean =>
+            (
+                dashboard: DashboardType<QueryBasedInsightModel> | null,
+                user: null | import('~/types').UserType,
+                currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType
+            ): boolean =>
                 !!dashboard &&
                 !!user &&
                 (user.uuid === dashboard.created_by?.uuid ||
@@ -1854,7 +2824,7 @@ export const dashboardLogic = kea<dashboardLogicType>([
         ],
         sizeKey: [
             (s) => [s.columns],
-            (columns): DashboardLayoutSize | undefined => {
+            (columns: number | null): DashboardLayoutSize | undefined => {
                 const [size] = (Object.entries(BREAKPOINT_COLUMN_COUNTS).find(([, value]) => value === columns) ||
                     []) as [DashboardLayoutSize, number]
                 return size
@@ -1862,7 +2832,11 @@ export const dashboardLogic = kea<dashboardLogicType>([
         ],
         layouts: [
             (s) => [s.tiles],
-            (tiles) => calculateLayouts(tiles),
+            (
+                tiles: DashboardTile<
+                    QueryBasedInsightModel<import('~/queries/schema/schema-general').Node<Record<string, any>>>
+                >[]
+            ) => calculateLayouts(tiles),
             // Tile refreshes replace `tiles` once per insight response without touching geometry;
             // keeping the result reference stable stops react-grid-layout re-laying-out every tile
             // N times per dashboard refresh cycle.
@@ -1889,7 +2863,7 @@ export const dashboardLogic = kea<dashboardLogicType>([
         ],
         refreshMetrics: [
             (s) => [s.refreshStatus, s.refreshTilesTotal],
-            (refreshStatus, refreshTilesTotal) => {
+            (refreshStatus: Record<string, RefreshStatus>, refreshTilesTotal: number | null) => {
                 const inFlight = Object.values(refreshStatus).filter((s) => s.loading || s.queued).length
                 // Pinned batch size keeps Y fixed for the cycle; fall back to the live map for single-insight refreshes.
                 const total = refreshTilesTotal ?? Object.keys(refreshStatus).length
@@ -1939,13 +2913,13 @@ export const dashboardLogic = kea<dashboardLogicType>([
         ],
         projectTreeRef: [
             () => [(_, props: DashboardLogicProps) => props.id],
-            (id): ProjectTreeRef => {
+            (id: number): ProjectTreeRef => {
                 return { type: 'dashboard', ref: String(id) }
             },
         ],
         [SIDE_PANEL_CONTEXT_KEY]: [
             (s) => [s.dashboard],
-            (dashboard): SidePanelSceneContext | null => {
+            (dashboard: DashboardType<QueryBasedInsightModel> | null): SidePanelSceneContext | null => {
                 return dashboard
                     ? {
                           activity_scope: ActivityScope.DASHBOARD,
@@ -1958,11 +2932,14 @@ export const dashboardLogic = kea<dashboardLogicType>([
         ],
         dataColorTheme: [
             (s) => [s.dataColorThemeId, s.getTheme],
-            (dataColorThemeId, getTheme): DataColorTheme | null => getTheme(dataColorThemeId),
+            (
+                dataColorThemeId: number | null,
+                getTheme: (themeId: number | string | null | undefined) => DataColorTheme | null
+            ): DataColorTheme | null => getTheme(dataColorThemeId),
         ],
         maxContext: [
             (s) => [s.dashboard],
-            (dashboard): MaxContextInput[] => {
+            (dashboard: DashboardType<QueryBasedInsightModel> | null): MaxContextInput[] => {
                 if (!dashboard) {
                     return []
                 }
@@ -2252,7 +3229,7 @@ export const dashboardLogic = kea<dashboardLogicType>([
                 return
             }
             const targetDashboards = (insight.dashboard_tiles || [])
-                .map((tile) => tile.dashboard_id)
+                .map((tile: { dashboard_id: number }) => tile.dashboard_id)
                 .concat(extraDashboardIds || [])
             if (!targetDashboards.includes(props.id)) {
                 // this update is not for this dashboard
diff --git a/frontend/src/scenes/dashboard/dashboardQuickFiltersLogic.ts b/frontend/src/scenes/dashboard/dashboardQuickFiltersLogic.ts
index 5900f8b5a0b0..91a8f95ffee2 100644
--- a/frontend/src/scenes/dashboard/dashboardQuickFiltersLogic.ts
+++ b/frontend/src/scenes/dashboard/dashboardQuickFiltersLogic.ts
@@ -1,11 +1,31 @@
-import { connect, kea, path, selectors } from 'kea'
+import { MakeLogicType, connect, kea, path, selectors } from 'kea'
 
 import { SelectedQuickFilter, quickFiltersSectionLogic } from 'lib/components/QuickFilters'
 
 import { QuickFilterContext } from '~/queries/schema/schema-general'
 import { AnyPropertyFilter, PropertyFilterType } from '~/types'
 
-import type { dashboardQuickFiltersLogicType } from './dashboardQuickFiltersLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dashboardQuickFiltersLogicValues {
+    selectedQuickFilters: Record<string, SelectedQuickFilter> // quickFiltersSectionLogic
+    quickFilterPropertyFiltersById: Record<string, AnyPropertyFilter>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dashboardQuickFiltersLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        quickFilterPropertyFiltersById: (
+            selectedQuickFilters: Record<string, SelectedQuickFilter>
+        ) => Record<string, AnyPropertyFilter>
+    }
+}
+
+export type dashboardQuickFiltersLogicType = MakeLogicType<
+    dashboardQuickFiltersLogicValues,
+    {},
+    Record<string, any>,
+    dashboardQuickFiltersLogicMeta
+>
 
 export const dashboardQuickFiltersLogic = kea<dashboardQuickFiltersLogicType>([
     path(['scenes', 'dashboard', 'dashboardQuickFiltersLogic']),
diff --git a/frontend/src/scenes/dashboard/dashboardQuickFiltersSelectionLogic.ts b/frontend/src/scenes/dashboard/dashboardQuickFiltersSelectionLogic.ts
index 2684a5a16e92..c27fdaf4e58f 100644
--- a/frontend/src/scenes/dashboard/dashboardQuickFiltersSelectionLogic.ts
+++ b/frontend/src/scenes/dashboard/dashboardQuickFiltersSelectionLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 
 import { lemonToast } from '@posthog/lemon-ui'
 
@@ -7,13 +7,77 @@ import { quickFiltersModalLogic } from 'lib/components/QuickFilters/quickFilters
 import { QuickFilterContext } from '~/queries/schema/schema-general'
 import { DashboardType } from '~/types'
 
+import type { QueryBasedInsightModel, QuickFilter } from '../../types'
 import { dashboardLogic } from './dashboardLogic'
-import type { dashboardQuickFiltersSelectionLogicType } from './dashboardQuickFiltersSelectionLogicType'
 
 export interface DashboardQuickFiltersSelectionLogicProps {
     dashboard: DashboardType<any>
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dashboardQuickFiltersSelectionLogicValues {
+    dashboard: DashboardType<QueryBasedInsightModel> | null // dashboardLogic
+    hasDashboardSelectionChanges: boolean
+    selectedDashboardFilterIds: string[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dashboardQuickFiltersSelectionLogicActions {
+    triggerDashboardUpdate: (payload: any) => {
+        payload: any
+    } // dashboardLogic
+    closeModal: () => {
+        value: true
+    } // quickFiltersModalLogic
+    newFilterCreated: (filter: QuickFilter) => {
+        filter: QuickFilter
+    } // quickFiltersModalLogic
+    openModal: () => {
+        value: true
+    } // quickFiltersModalLogic
+    addNewFilter: (filterId: string) => {
+        filterId: string
+    }
+    cancelModal: () => {
+        value: true
+    }
+    openConfigureModal: () => {
+        value: true
+    }
+    saveAndCloseModal: () => {
+        value: true
+    }
+    setSelectedDashboardFilterIds: (filterIds: string[]) => {
+        filterIds: string[]
+    }
+    syncFromDashboard: () => {
+        value: true
+    }
+    toggleDashboardFilter: (filterId: string) => {
+        filterId: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dashboardQuickFiltersSelectionLogicMeta {
+    key: number
+    __keaTypeGenInternalSelectorTypes: {
+        hasDashboardSelectionChanges: (
+            selectedDashboardFilterIds: string[],
+            dashboard: DashboardType<
+                QueryBasedInsightModel<import('~/queries/schema/schema-general').Node<Record<string, any>>>
+            > | null
+        ) => boolean
+    }
+}
+
+export type dashboardQuickFiltersSelectionLogicType = MakeLogicType<
+    dashboardQuickFiltersSelectionLogicValues,
+    dashboardQuickFiltersSelectionLogicActions,
+    DashboardQuickFiltersSelectionLogicProps,
+    dashboardQuickFiltersSelectionLogicMeta
+>
+
 export const dashboardQuickFiltersSelectionLogic = kea<dashboardQuickFiltersSelectionLogicType>([
     path(['scenes', 'dashboard', 'dashboardQuickFiltersSelectionLogic']),
     props({} as DashboardQuickFiltersSelectionLogicProps),
diff --git a/frontend/src/scenes/dashboard/dashboardTemplateEditorLogic.ts b/frontend/src/scenes/dashboard/dashboardTemplateEditorLogic.ts
index 177d3a779989..68265c58167c 100644
--- a/frontend/src/scenes/dashboard/dashboardTemplateEditorLogic.ts
+++ b/frontend/src/scenes/dashboard/dashboardTemplateEditorLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 import { createElement, Fragment } from 'react'
 
@@ -9,8 +9,8 @@ import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
 
 import { DashboardTemplateEditorType, DashboardTemplateType, MonacoMarker, NonPortableReferences } from '~/types'
 
+import type { FeatureFlagsSet } from '../../lib/logic/featureFlagLogic'
 import { dashboardTemplatesLogic } from './dashboards/templates/dashboardTemplatesLogic'
-import type { dashboardTemplateEditorLogicType } from './dashboardTemplateEditorLogicType'
 
 /**
  * Refresh every mounted `dashboardTemplatesLogic` slice we use in-product:
@@ -64,6 +64,157 @@ function parseDashboardTemplateEditorPayload(raw: string | undefined): Dashboard
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dashboardTemplateEditorLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    dashboardTemplate: DashboardTemplateEditorType | null | undefined
+    dashboardTemplateLoading: boolean
+    editorValue: string
+    id: string | null
+    isOpenNewDashboardTemplateModal: boolean
+    templateSchema: Record<string, any> | null
+    templateSchemaLoading: boolean
+    validationErrors: string[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dashboardTemplateEditorLogicActions {
+    clear: () => {
+        value: true
+    }
+    closeDashboardTemplateEditor: () => {
+        value: true
+    }
+    createDashboardTemplate: () => any
+    createDashboardTemplateFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    createDashboardTemplateSuccess: (
+        dashboardTemplate: DashboardTemplateEditorType | undefined,
+        payload?: any
+    ) => {
+        dashboardTemplate: DashboardTemplateEditorType | undefined
+        payload?: any
+    }
+    deleteDashboardTemplate: ({ id, templateName }: { id: string; templateName: string }) => {
+        id: string
+        templateName: string
+    }
+    deleteDashboardTemplateFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteDashboardTemplateSuccess: (
+        dashboardTemplate: null,
+        payload?: {
+            id: string
+            templateName: string
+        }
+    ) => {
+        dashboardTemplate: null
+        payload?: {
+            id: string
+            templateName: string
+        }
+    }
+    getDashboardTemplate: (id: string) => string
+    getDashboardTemplateFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    getDashboardTemplateSuccess: (
+        dashboardTemplate: DashboardTemplateType,
+        payload?: string
+    ) => {
+        dashboardTemplate: DashboardTemplateType
+        payload?: string
+    }
+    getTemplateSchema: () => any
+    getTemplateSchemaFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    getTemplateSchemaSuccess: (
+        templateSchema: Record<string, any>,
+        payload?: any
+    ) => {
+        templateSchema: Record<string, any>
+        payload?: any
+    }
+    openDashboardTemplateEditor: () => {
+        value: true
+    }
+    setDashboardTemplate: (dashboardTemplate: DashboardTemplateEditorType) => {
+        dashboardTemplate: DashboardTemplateEditorType
+    }
+    setDashboardTemplateId: (
+        id: string | null,
+        options?: {
+            hydrateEditorFromApi?: boolean
+        }
+    ) => {
+        hydrateEditorFromApi: boolean
+        id: string | null
+    }
+    setEditorValue: (value: string) => {
+        value: string
+    }
+    toggleTemplateOrganizationScope: (template: DashboardTemplateType) => {
+        template: DashboardTemplateType
+    }
+    updateDashboardTemplate: ({
+        id,
+        dashboardTemplateUpdates,
+    }: {
+        dashboardTemplateUpdates?: Partial<DashboardTemplateType>
+        id: string
+    }) => {
+        id: string
+        dashboardTemplateUpdates?: Partial<DashboardTemplateType>
+    }
+    updateDashboardTemplateFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateDashboardTemplateSuccess: (
+        dashboardTemplate: DashboardTemplateEditorType | undefined,
+        payload?: {
+            id: string
+            dashboardTemplateUpdates?: Partial<DashboardTemplateType>
+        }
+    ) => {
+        dashboardTemplate: DashboardTemplateEditorType | undefined
+        payload?: {
+            id: string
+            dashboardTemplateUpdates?: Partial<DashboardTemplateType>
+        }
+    }
+    updateValidationErrors: (markers: MonacoMarker[] | undefined) => {
+        markers: MonacoMarker[] | undefined
+    }
+}
+
+export type dashboardTemplateEditorLogicType = MakeLogicType<
+    dashboardTemplateEditorLogicValues,
+    dashboardTemplateEditorLogicActions
+>
+
 export const dashboardTemplateEditorLogic = kea<dashboardTemplateEditorLogicType>([
     path(['scenes', 'dashboard', 'dashboardTemplateEditorLogic']),
     connect(() => ({
diff --git a/frontend/src/scenes/dashboard/dashboardTemplateVariablesLogic.ts b/frontend/src/scenes/dashboard/dashboardTemplateVariablesLogic.ts
index 057f57ffcb31..a72e4bcfed81 100644
--- a/frontend/src/scenes/dashboard/dashboardTemplateVariablesLogic.ts
+++ b/frontend/src/scenes/dashboard/dashboardTemplateVariablesLogic.ts
@@ -1,4 +1,16 @@
-import { actions, afterMount, connect, kea, listeners, path, props, propsChanged, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    afterMount,
+    connect,
+    kea,
+    listeners,
+    path,
+    props,
+    propsChanged,
+    reducers,
+    selectors,
+} from 'kea'
 
 import { iframedToolbarBrowserLogic } from 'lib/components/IframedToolbarBrowser/iframedToolbarBrowserLogic'
 import { PostHogAppToolbarEvent } from 'lib/components/IframedToolbarBrowser/utils'
@@ -14,8 +26,6 @@ import {
     TemplateVariableStep,
 } from '~/types'
 
-import type { dashboardTemplateVariablesLogicType } from './dashboardTemplateVariablesLogicType'
-
 export interface DashboardTemplateVariablesLogicProps {
     variables: DashboardTemplateVariableType[]
 }
@@ -26,6 +36,101 @@ const FALLBACK_EVENT = {
     type: EntityTypes.EVENTS,
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dashboardTemplateVariablesLogicValues {
+    activeVariable: DashboardTemplateVariableType
+    activeVariableCustomEventName: string | null | undefined
+    activeVariableIndex: number
+    allVariablesAreTouched: boolean
+    hasTouchedAnyVariable: boolean
+    isCurrentlySelectingElement: boolean
+    variables: DashboardTemplateVariableType[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dashboardTemplateVariablesLogicActions {
+    disableElementSelector: () => {
+        value: true
+    } // iframedToolbarBrowserLogic
+    toolbarMessageReceived: (
+        type: PostHogAppToolbarEvent,
+        payload: Record<string, any>
+    ) => {
+        payload: Record<string, any>
+        type: PostHogAppToolbarEvent
+    } // iframedToolbarBrowserLogic
+    goToNextUntouchedActiveVariableIndex: () => {
+        value: true
+    }
+    incrementActiveVariableIndex: () => {
+        value: true
+    }
+    maybeResetActiveVariableCustomEventName: () => {
+        value: true
+    }
+    possiblyIncrementActiveVariableIndex: () => {
+        value: true
+    }
+    resetVariable: (variableId: string) => {
+        variableId: string
+    }
+    setActiveVariableCustomEventName: (customEventName?: string | null) => {
+        customEventName: string | null | undefined
+    }
+    setActiveVariableIndex: (index: number) => {
+        index: number
+    }
+    setIsCurrentlySelectingElement: (isSelecting: boolean) => {
+        isSelecting: boolean
+    }
+    setVariable: (
+        variableName: string,
+        filterGroup: FilterType
+    ) => {
+        filterGroup: FilterType
+        variable_name: string
+    }
+    setVariableForPageview: (
+        variableName: string,
+        url: string
+    ) => {
+        url: string
+        variableName: string
+    }
+    setVariableForScreenview: (variableName: string) => {
+        variableName: string
+    }
+    setVariableFromAction: (
+        variableName: string,
+        action: ActionType
+    ) => {
+        action: ActionType
+        variableName: string
+    }
+    setVariables: (variables: DashboardTemplateVariableType[]) => {
+        variables: DashboardTemplateVariableType[]
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dashboardTemplateVariablesLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        activeVariable: (
+            variables: DashboardTemplateVariableType[],
+            activeVariableIndex: number
+        ) => DashboardTemplateVariableType
+        allVariablesAreTouched: (variables: DashboardTemplateVariableType[]) => boolean
+        hasTouchedAnyVariable: (variables: DashboardTemplateVariableType[]) => boolean
+    }
+}
+
+export type dashboardTemplateVariablesLogicType = MakeLogicType<
+    dashboardTemplateVariablesLogicValues,
+    dashboardTemplateVariablesLogicActions,
+    DashboardTemplateVariablesLogicProps,
+    dashboardTemplateVariablesLogicMeta
+>
+
 export const dashboardTemplateVariablesLogic = kea<dashboardTemplateVariablesLogicType>([
     path(['scenes', 'dashboard', 'DashboardTemplateVariablesLogic']),
     props({ variables: [] } as DashboardTemplateVariablesLogicProps),
diff --git a/frontend/src/scenes/dashboard/dashboards/dashboardsLogic.ts b/frontend/src/scenes/dashboard/dashboards/dashboardsLogic.ts
index fbc10ff41465..4313d53c9578 100644
--- a/frontend/src/scenes/dashboard/dashboards/dashboardsLogic.ts
+++ b/frontend/src/scenes/dashboard/dashboards/dashboardsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router, urlToAction } from 'kea-router'
 
@@ -16,7 +16,8 @@ import { dashboardsModel } from '~/models/dashboardsModel'
 import { tagsModel } from '~/models/tagsModel'
 import { ActivityScope, Breadcrumb, DashboardBasicType } from '~/types'
 
-import type { dashboardsLogicType } from './dashboardsLogicType'
+import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
+import type { UserType } from '../../../types'
 
 export enum DashboardsTab {
     All = 'all',
@@ -51,6 +52,112 @@ function urlSearchParamToString(value: unknown): string {
     return `${value ?? ''}`
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dashboardsLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    tags: string[] // tagsModel
+    user: UserType | null // userLogic
+    breadcrumbs: Breadcrumb[]
+    currentTab: DashboardsTab
+    dashboards: DashboardBasicType[]
+    filteredTags: string[]
+    filters: DashboardsFilters
+    isFiltering: boolean
+    searchedDashboards: DashboardBasicType[] | null
+    searchedDashboardsLoading: boolean
+    showTagPopover: boolean
+    sidePanelContext: SidePanelSceneContext
+    tableSorting: Sorting
+    tagSearch: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dashboardsLogicActions {
+    loadSearchedDashboards: ({ search, tags, folder }: { folder: string | null; search: string; tags: string[] }) => {
+        search: string
+        tags: string[]
+        folder: string | null
+    }
+    loadSearchedDashboardsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSearchedDashboardsSuccess: (
+        searchedDashboards: DashboardBasicType[] | null,
+        payload?: {
+            search: string
+            tags: string[]
+            folder: string | null
+        }
+    ) => {
+        searchedDashboards: DashboardBasicType[] | null
+        payload?: {
+            search: string
+            tags: string[]
+            folder: string | null
+        }
+    }
+    setCurrentTab: (tab: DashboardsTab) => {
+        tab: DashboardsTab
+    }
+    setFilters: (filters: Partial<DashboardsFilters>) => {
+        filters: Partial<DashboardsFilters>
+    }
+    setSearch: (search: string) => {
+        search: string
+    }
+    setShowTagPopover: (visible: boolean) => {
+        visible: boolean
+    }
+    setTagSearch: (search: string) => {
+        search: string
+    }
+    tableSortingChanged: (sorting: Sorting | null) => {
+        sorting: Sorting | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dashboardsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        isFiltering: (filters: DashboardsFilters) => boolean
+        filteredTags: (tags: string[], tagSearch: string) => string[]
+        dashboards: (
+            nameSortedDashboards: (
+                | DashboardBasicType
+                | import('~/types').DashboardType<
+                      import('~/types').QueryBasedInsightModel<
+                          import('../../../queries/schema').Node<Record<string, any>>
+                      >
+                  >
+            )[],
+            rawDashboards: Record<
+                string,
+                | DashboardBasicType
+                | import('~/types').DashboardType<
+                      import('~/types').QueryBasedInsightModel<
+                          import('../../../queries/schema').Node<Record<string, any>>
+                      >
+                  >
+            >,
+            searchedDashboards: DashboardBasicType[] | null,
+            filters: DashboardsFilters,
+            currentTab: DashboardsTab,
+            user: UserType | null
+        ) => DashboardBasicType[]
+    }
+}
+
+export type dashboardsLogicType = MakeLogicType<
+    dashboardsLogicValues,
+    dashboardsLogicActions,
+    Record<string, any>,
+    dashboardsLogicMeta
+>
+
 export const dashboardsLogic = kea<dashboardsLogicType>([
     path(['scenes', 'dashboard', 'dashboardsLogic']),
     connect(() => ({
@@ -166,7 +273,7 @@ export const dashboardsLogic = kea<dashboardsLogicType>([
     selectors({
         isFiltering: [
             (s) => [s.filters],
-            (filters) => {
+            (filters: DashboardsFilters) => {
                 return Object.keys(filters).some((key) => {
                     const filterKey = key as keyof DashboardsFilters
                     return filters[filterKey] !== DEFAULT_FILTERS[filterKey]
@@ -175,7 +282,7 @@ export const dashboardsLogic = kea<dashboardsLogicType>([
         ],
         filteredTags: [
             (s) => [s.tags, s.tagSearch],
-            (tags, search) => {
+            (tags: string[], search: string) => {
                 if (!search) {
                     return tags || []
                 }
@@ -191,7 +298,24 @@ export const dashboardsLogic = kea<dashboardsLogicType>([
                 s.currentTab,
                 s.user,
             ],
-            (allDashboards, rawDashboards, searchedDashboards, filters, currentTab, user) => {
+            (
+                allDashboards: (
+                    | DashboardBasicType
+                    | import('~/types').DashboardType<
+                          import('~/types').QueryBasedInsightModel<
+                              import('../../../queries/schema').Node<Record<string, any>>
+                          >
+                      >
+                )[],
+                rawDashboards: Record<
+                    string,
+                    DashboardBasicType | import('~/types').DashboardType<import('~/types').QueryBasedInsightModel>
+                >,
+                searchedDashboards: DashboardBasicType[] | null,
+                filters: DashboardsFilters,
+                currentTab: DashboardsTab,
+                user: null | import('~/types').UserType
+            ) => {
                 // When a search term is active we trust the server's trigram word similarity
                 // ranking; otherwise we use the model's alphabetised list. This keeps the exact
                 // match at the top.
diff --git a/frontend/src/scenes/dashboard/dashboards/templates/dashboardTemplateChooserLogic.ts b/frontend/src/scenes/dashboard/dashboards/templates/dashboardTemplateChooserLogic.ts
index 37ff28644a4a..90806fda1fd9 100644
--- a/frontend/src/scenes/dashboard/dashboards/templates/dashboardTemplateChooserLogic.ts
+++ b/frontend/src/scenes/dashboard/dashboards/templates/dashboardTemplateChooserLogic.ts
@@ -1,11 +1,12 @@
-import { actions, connect, kea, key, listeners, path, props, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, selectors } from 'kea'
 import posthog from 'posthog-js'
 
 import { newDashboardLogic } from 'scenes/dashboard/newDashboardLogic'
 
 import { DashboardTemplateType, TemplateAvailabilityContext } from '~/types'
 
-import type { dashboardTemplateChooserLogicType } from './dashboardTemplateChooserLogicType'
+import type { DashboardTemplateVariableType } from '../../../../types'
+import type { NewDashboardForm } from '../../newDashboardLogic'
 import { runBlankDashboardFlow, runDashboardTemplateClickFlow } from './dashboardTemplateCreationFlows'
 import { DashboardTemplateProps, dashboardTemplatesLogic } from './dashboardTemplatesLogic'
 
@@ -46,6 +47,85 @@ function computeShowBlankTile(availabilityContexts: DashboardTemplateProps['avai
     )
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dashboardTemplateChooserLogicValues {
+    allTemplates: DashboardTemplateType[] // dashboardTemplatesLogic
+    allTemplatesLoading: boolean // dashboardTemplatesLogic
+    templateFilter: string // dashboardTemplatesLogic
+    isLoading: boolean // newDashboardLogic
+    newDashboardModalVisible: boolean // newDashboardLogic
+    allMatchesInFeaturedSection: boolean
+    featuredTemplates: DashboardTemplateType[]
+    hasActiveFilter: boolean
+    nonFeaturedOfficial: DashboardTemplateType[]
+    showBlankTile: boolean
+    showDashedEmptyState: boolean
+    showOfficialSection: boolean
+    teamTemplates: DashboardTemplateType[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dashboardTemplateChooserLogicActions {
+    setTemplateFilter: (search: string) => {
+        search: string
+    } // dashboardTemplatesLogic
+    addDashboard: (form: Partial<NewDashboardForm>) => {
+        form: Partial<NewDashboardForm>
+    } // newDashboardLogic
+    createDashboardFromTemplate: (
+        template: DashboardTemplateType,
+        variables: DashboardTemplateVariableType[],
+        redirectAfterCreation?: boolean | undefined,
+        creationContext?: string | null | undefined
+    ) => {
+        creationContext: string | null
+        redirectAfterCreation: boolean | undefined
+        template: DashboardTemplateType
+        variables: DashboardTemplateVariableType[]
+    } // newDashboardLogic
+    setActiveDashboardTemplate: (template: DashboardTemplateType) => {
+        template: DashboardTemplateType
+    } // newDashboardLogic
+    setIsLoading: (isLoading: boolean) => {
+        isLoading: boolean
+    } // newDashboardLogic
+    showVariableSelectModal: (template: DashboardTemplateType) => {
+        template: DashboardTemplateType
+    } // newDashboardLogic
+    blankTileClicked: (tileLocation: 'featured_row' | 'main_grid' | 'modal_toolbar') => {
+        tileLocation: 'featured_row' | 'main_grid' | 'modal_toolbar'
+    }
+    templateTileClicked: (
+        template: DashboardTemplateType,
+        tileLocation: 'featured_row' | 'main_grid' | 'team_section'
+    ) => {
+        template: DashboardTemplateType
+        tileLocation: 'featured_row' | 'main_grid' | 'team_section'
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dashboardTemplateChooserLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        showBlankTile: (arg: any) => boolean
+        teamTemplates: (allTemplates: DashboardTemplateType[], arg: any) => DashboardTemplateType[]
+        featuredTemplates: (allTemplates: DashboardTemplateType[], arg: any) => DashboardTemplateType[]
+        nonFeaturedOfficial: (allTemplates: DashboardTemplateType[], arg: any) => DashboardTemplateType[]
+        hasActiveFilter: (templateFilter: string) => boolean
+        showDashedEmptyState: (allTemplatesLoading: boolean, allTemplates: DashboardTemplateType[], arg: any) => boolean
+        allMatchesInFeaturedSection: (allTemplates: DashboardTemplateType[], arg: any) => boolean
+        showOfficialSection: (allTemplatesLoading: boolean, allTemplates: DashboardTemplateType[], arg: any) => boolean
+    }
+}
+
+export type dashboardTemplateChooserLogicType = MakeLogicType<
+    dashboardTemplateChooserLogicValues,
+    dashboardTemplateChooserLogicActions,
+    DashboardTemplateChooserLogicProps,
+    dashboardTemplateChooserLogicMeta
+>
+
 export const dashboardTemplateChooserLogic = kea<dashboardTemplateChooserLogicType>([
     path(['scenes', 'dashboard', 'dashboards', 'templates', 'dashboardTemplateChooserLogic']),
     props({} as DashboardTemplateChooserLogicProps),
diff --git a/frontend/src/scenes/dashboard/dashboards/templates/dashboardTemplateCopyLogic.ts b/frontend/src/scenes/dashboard/dashboards/templates/dashboardTemplateCopyLogic.ts
index ed202c90b82d..4693c1e71426 100644
--- a/frontend/src/scenes/dashboard/dashboards/templates/dashboardTemplateCopyLogic.ts
+++ b/frontend/src/scenes/dashboard/dashboards/templates/dashboardTemplateCopyLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 import { subscriptions } from 'kea-subscriptions'
@@ -12,7 +12,7 @@ import { urls } from 'scenes/urls'
 
 import type { DashboardTemplateType } from '~/types'
 
-import type { dashboardTemplateCopyLogicType } from './dashboardTemplateCopyLogicType'
+import type { OrganizationType } from '../../../../types'
 import { dashboardTemplatesLogic } from './dashboardTemplatesLogic'
 
 export interface DashboardTemplateCopyLogicProps {
@@ -30,6 +30,80 @@ function maybeReplaceUrlWithSourceTeam(props: DashboardTemplateCopyLogicProps, c
     router.actions.replace(urls.dashboardTemplateCopyToProject(props.sourceTemplateId, currentTeamId))
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dashboardTemplateCopyLogicValues {
+    currentOrganization: OrganizationType | null // organizationLogic
+    currentTeamId: number | null // teamLogic
+    copyResult: DashboardTemplateType | null
+    copyResultLoading: boolean
+    destinationTeamId: number | null
+    sourceTemplate: DashboardTemplateType | null
+    sourceTemplateLoadFailed: boolean
+    sourceTemplateLoading: boolean
+    teamOptions: {
+        label: string
+        value: number
+    }[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dashboardTemplateCopyLogicActions {
+    loadSourceTemplate: () => any
+    loadSourceTemplateFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSourceTemplateSuccess: (
+        sourceTemplate: DashboardTemplateType,
+        payload?: any
+    ) => {
+        sourceTemplate: DashboardTemplateType
+        payload?: any
+    }
+    setDestinationTeamId: (teamId: number | null) => {
+        teamId: number | null
+    }
+    submitCopy: () => any
+    submitCopyFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    submitCopySuccess: (
+        copyResult: DashboardTemplateType,
+        payload?: any
+    ) => {
+        copyResult: DashboardTemplateType
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dashboardTemplateCopyLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        teamOptions: (
+            currentOrganization: OrganizationType | null,
+            currentTeamId: number | null
+        ) => {
+            label: string
+            value: number
+        }[]
+    }
+}
+
+export type dashboardTemplateCopyLogicType = MakeLogicType<
+    dashboardTemplateCopyLogicValues,
+    dashboardTemplateCopyLogicActions,
+    DashboardTemplateCopyLogicProps,
+    dashboardTemplateCopyLogicMeta
+>
+
 export const dashboardTemplateCopyLogic = kea<dashboardTemplateCopyLogicType>([
     path(['scenes', 'dashboard', 'dashboards', 'templates', 'dashboardTemplateCopyLogic']),
     props({} as DashboardTemplateCopyLogicProps),
@@ -86,7 +160,7 @@ export const dashboardTemplateCopyLogic = kea<dashboardTemplateCopyLogicType>([
     selectors({
         teamOptions: [
             (s) => [s.currentOrganization, s.currentTeamId],
-            (currentOrganization, currentTeamId) =>
+            (currentOrganization: null | import('~/types').OrganizationType, currentTeamId: number | null) =>
                 (currentOrganization?.teams ?? [])
                     .filter((team) => team.id !== currentTeamId)
                     .sort((a, b) => a.name.localeCompare(b.name))
diff --git a/frontend/src/scenes/dashboard/dashboards/templates/dashboardTemplateModalLogic.ts b/frontend/src/scenes/dashboard/dashboards/templates/dashboardTemplateModalLogic.ts
index e4ed3960229a..a052616a00cd 100644
--- a/frontend/src/scenes/dashboard/dashboards/templates/dashboardTemplateModalLogic.ts
+++ b/frontend/src/scenes/dashboard/dashboards/templates/dashboardTemplateModalLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -7,12 +7,64 @@ import api from 'lib/api'
 
 import { DashboardTemplateEditorType, DashboardTemplateType } from '~/types'
 
-import type { dashboardTemplateModalLogicType } from './dashboardTemplateModalLogicType'
 import { dashboardTemplatesLogic } from './dashboardTemplatesLogic'
 
 /** Non-empty payload so Kea `ActionDefinitions` does not treat `payload.value` as `never extends true` (which forces `closeModal: true`). */
 export type CloseModalActionPayload = { readonly kind: 'closeModal' }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dashboardTemplateModalLogicValues {
+    createPayload: DashboardTemplateEditorType | null
+    dashboardDescription: string
+    editingTemplate: DashboardTemplateType | null
+    isOpen: boolean
+    mode: 'create' | 'edit'
+    projectTemplateSave: boolean | null
+    projectTemplateSaveLoading: boolean
+    templateName: string
+    templateTags: string[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dashboardTemplateModalLogicActions {
+    closeModal: () => CloseModalActionPayload
+    openCreate: (payload: DashboardTemplateEditorType) => {
+        payload: DashboardTemplateEditorType
+    }
+    openEdit: (template: DashboardTemplateType) => {
+        template: DashboardTemplateType
+    }
+    saveProjectTemplate: () => any
+    saveProjectTemplateFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    saveProjectTemplateSuccess: (
+        projectTemplateSave: null | true,
+        payload?: any
+    ) => {
+        projectTemplateSave: null | true
+        payload?: any
+    }
+    setDashboardDescription: (dashboardDescription: string) => {
+        dashboardDescription: string
+    }
+    setTemplateName: (name: string) => {
+        name: string
+    }
+    setTemplateTags: (templateTags: string[]) => {
+        templateTags: string[]
+    }
+}
+
+export type dashboardTemplateModalLogicType = MakeLogicType<
+    dashboardTemplateModalLogicValues,
+    dashboardTemplateModalLogicActions
+>
+
 export const dashboardTemplateModalLogic = kea<dashboardTemplateModalLogicType>([
     path(['scenes', 'dashboard', 'dashboards', 'templates', 'dashboardTemplateModalLogic']),
     actions({
diff --git a/frontend/src/scenes/dashboard/dashboards/templates/dashboardTemplatesLogic.tsx b/frontend/src/scenes/dashboard/dashboards/templates/dashboardTemplatesLogic.tsx
index 246c0a87949e..0c62ed2cac93 100644
--- a/frontend/src/scenes/dashboard/dashboards/templates/dashboardTemplatesLogic.tsx
+++ b/frontend/src/scenes/dashboard/dashboards/templates/dashboardTemplatesLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers } from 'kea'
 import { lazyLoaders } from 'kea-loaders'
 import { router } from 'kea-router'
 import { actionToUrl } from 'kea-router'
@@ -15,7 +15,7 @@ import {
     TemplateAvailabilityContext,
 } from '~/types'
 
-import type { dashboardTemplatesLogicType } from './dashboardTemplatesLogicType'
+import type { FeatureFlagsSet } from '../../../../lib/logic/featureFlagLogic'
 
 export interface DashboardTemplateProps {
     // default is to present global templates _and_ those visible only in the current team
@@ -84,6 +84,60 @@ function listQueryFeaturedKeySegment(p: DashboardTemplatesLogicProps): 'featured
     return 'all'
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dashboardTemplatesLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    allTemplates: DashboardTemplateType[]
+    allTemplatesLoaded: boolean
+    allTemplatesLoading: boolean
+    templateFilter: string
+    templateNameOrdering: DashboardTemplateTableOrdering
+    templatesTabVisibility: DashboardTemplatesTabVisibility
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dashboardTemplatesLogicActions {
+    getAllTemplates: () => any
+    getAllTemplatesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    getAllTemplatesSuccess: (
+        allTemplates: DashboardTemplateType[],
+        payload?: any
+    ) => {
+        allTemplates: DashboardTemplateType[]
+        payload?: any
+    }
+    setTemplateFilter: (search: string) => {
+        search: string
+    }
+    setTemplateNameOrdering: (ordering: DashboardTemplateTableOrdering) => {
+        ordering: DashboardTemplateTableOrdering
+    }
+    setTemplates: (allTemplates: DashboardTemplateType[]) => {
+        allTemplates: DashboardTemplateType[]
+    }
+    setTemplatesTabVisibility: (visibility: DashboardTemplatesTabVisibility) => {
+        visibility: DashboardTemplatesTabVisibility
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dashboardTemplatesLogicMeta {
+    key: string
+}
+
+export type dashboardTemplatesLogicType = MakeLogicType<
+    dashboardTemplatesLogicValues,
+    dashboardTemplatesLogicActions,
+    DashboardTemplatesLogicProps,
+    dashboardTemplatesLogicMeta
+>
+
 export const dashboardTemplatesLogic = kea<dashboardTemplatesLogicType>([
     path(['scenes', 'dashboard', 'dashboards', 'templates', 'dashboardTemplatesLogic']),
     props({} as DashboardTemplatesLogicProps),
diff --git a/frontend/src/scenes/dashboard/deleteDashboardLogic.ts b/frontend/src/scenes/dashboard/deleteDashboardLogic.ts
index 8faccd0584fc..f4543bc3da0a 100644
--- a/frontend/src/scenes/dashboard/deleteDashboardLogic.ts
+++ b/frontend/src/scenes/dashboard/deleteDashboardLogic.ts
@@ -1,5 +1,6 @@
-import { actions, connect, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { router } from 'kea-router'
 
 import { urls } from 'scenes/urls'
@@ -7,8 +8,6 @@ import { urls } from 'scenes/urls'
 import { dashboardsModel } from '~/models/dashboardsModel'
 import { groupsModel } from '~/models/groupsModel'
 
-import type { deleteDashboardLogicType } from './deleteDashboardLogicType'
-
 export interface DeleteDashboardForm {
     dashboardId: number | null
     deleteInsights: boolean
@@ -19,6 +18,71 @@ const defaultFormValues: DeleteDashboardForm = {
     deleteInsights: false,
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface deleteDashboardLogicValues {
+    deleteDashboard: DeleteDashboardForm
+    deleteDashboardAllErrors: Record<string, any>
+    deleteDashboardChanged: boolean
+    deleteDashboardErrors: DeepPartialMap<DeleteDashboardForm, ValidationErrorType>
+    deleteDashboardHasErrors: boolean
+    deleteDashboardManualErrors: Record<string, any>
+    deleteDashboardModalVisible: boolean
+    deleteDashboardTouched: boolean
+    deleteDashboardTouches: Record<string, boolean>
+    deleteDashboardValidationErrors: DeepPartialMap<DeleteDashboardForm, ValidationErrorType>
+    isDeleteDashboardSubmitting: boolean
+    isDeleteDashboardValid: boolean
+    showDeleteDashboardErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface deleteDashboardLogicActions {
+    removeDetailDashboard: (dashboardId: number) => number // groupsModel
+    hideDeleteDashboardModal: () => {
+        value: true
+    }
+    resetDeleteDashboard: (values?: DeleteDashboardForm) => {
+        values?: DeleteDashboardForm
+    }
+    setDeleteDashboardManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setDeleteDashboardValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setDeleteDashboardValues: (values: DeepPartial<DeleteDashboardForm>) => {
+        values: DeepPartial<DeleteDashboardForm>
+    }
+    showDeleteDashboardModal: (id: number) => {
+        id: number
+    }
+    submitDeleteDashboard: () => {
+        value: boolean
+    }
+    submitDeleteDashboardFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitDeleteDashboardRequest: (deleteDashboard: DeleteDashboardForm) => {
+        deleteDashboard: DeleteDashboardForm
+    }
+    submitDeleteDashboardSuccess: (deleteDashboard: DeleteDashboardForm) => {
+        deleteDashboard: DeleteDashboardForm
+    }
+    touchDeleteDashboardField: (key: string) => {
+        key: string
+    }
+}
+
+export type deleteDashboardLogicType = MakeLogicType<deleteDashboardLogicValues, deleteDashboardLogicActions>
+
 export const deleteDashboardLogic = kea<deleteDashboardLogicType>([
     path(['scenes', 'dashboard', 'deleteDashboardLogic']),
     connect(() => ({
diff --git a/frontend/src/scenes/dashboard/duplicateDashboardLogic.ts b/frontend/src/scenes/dashboard/duplicateDashboardLogic.ts
index 7694911e5bd5..ad488a046868 100644
--- a/frontend/src/scenes/dashboard/duplicateDashboardLogic.ts
+++ b/frontend/src/scenes/dashboard/duplicateDashboardLogic.ts
@@ -1,13 +1,13 @@
-import { actions, connect, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { router } from 'kea-router'
 
 import { urls } from 'scenes/urls'
 
 import { dashboardsModel } from '~/models/dashboardsModel'
 import { insightsModel } from '~/models/insightsModel'
-
-import type { duplicateDashboardLogicType } from './duplicateDashboardLogicType'
+import type { DashboardTile, QueryBasedInsightModel } from '~/types'
 
 export interface DuplicateDashboardForm {
     dashboardId: number | null
@@ -23,6 +23,81 @@ const defaultFormValues: DuplicateDashboardForm = {
     show: false,
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface duplicateDashboardLogicValues {
+    duplicateDashboard: DuplicateDashboardForm
+    duplicateDashboardAllErrors: Record<string, any>
+    duplicateDashboardChanged: boolean
+    duplicateDashboardErrors: DeepPartialMap<DuplicateDashboardForm, ValidationErrorType>
+    duplicateDashboardHasErrors: boolean
+    duplicateDashboardManualErrors: Record<string, any>
+    duplicateDashboardModalVisible: boolean
+    duplicateDashboardTouched: boolean
+    duplicateDashboardTouches: Record<string, boolean>
+    duplicateDashboardValidationErrors: DeepPartialMap<DuplicateDashboardForm, ValidationErrorType>
+    isDuplicateDashboardSubmitting: boolean
+    isDuplicateDashboardValid: boolean
+    showDuplicateDashboardErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface duplicateDashboardLogicActions {
+    insightsAddedToDashboard: (args_0: { dashboardId: number; insightIds: number[] }) => {
+        dashboardId: number
+        insightIds: number[]
+    } // insightsModel
+    duplicateAndGoToDashboard: () => {
+        value: true
+    }
+    hideDuplicateDashboardModal: () => {
+        value: true
+    }
+    resetDuplicateDashboard: (values?: DuplicateDashboardForm) => {
+        values?: DuplicateDashboardForm
+    }
+    setDuplicateDashboardManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setDuplicateDashboardValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setDuplicateDashboardValues: (values: DeepPartial<DuplicateDashboardForm>) => {
+        values: DeepPartial<DuplicateDashboardForm>
+    }
+    showDuplicateDashboardModal: (
+        id: number,
+        name: string
+    ) => {
+        id: number
+        name: string
+    }
+    submitDuplicateDashboard: () => {
+        value: boolean
+    }
+    submitDuplicateDashboardFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitDuplicateDashboardRequest: (duplicateDashboard: DuplicateDashboardForm) => {
+        duplicateDashboard: DuplicateDashboardForm
+    }
+    submitDuplicateDashboardSuccess: (duplicateDashboard: DuplicateDashboardForm) => {
+        duplicateDashboard: DuplicateDashboardForm
+    }
+    touchDuplicateDashboardField: (key: string) => {
+        key: string
+    }
+}
+
+export type duplicateDashboardLogicType = MakeLogicType<duplicateDashboardLogicValues, duplicateDashboardLogicActions>
+
 export const duplicateDashboardLogic = kea<duplicateDashboardLogicType>([
     path(['scenes', 'dashboard', 'duplicateDashboardLogic']),
     connect(() => ({ actions: [insightsModel, ['insightsAddedToDashboard']] })),
@@ -69,8 +144,8 @@ export const duplicateDashboardLogic = kea<duplicateDashboardLogicType>([
             if (!payload?.duplicateTiles) {
                 // any existing mounted insight will need to increment its dashboard count to update turbo mode
                 const insightsOnDuplicatedDashboard = dashboard.tiles
-                    .map((t) => t.insight?.id)
-                    .filter((id): id is number => !!id)
+                    .map((tile: DashboardTile<QueryBasedInsightModel>) => tile.insight?.id)
+                    .filter((id: number | undefined): id is number => !!id)
                 actions.insightsAddedToDashboard({
                     dashboardId: dashboard.id,
                     insightIds: insightsOnDuplicatedDashboard,
diff --git a/frontend/src/scenes/dashboard/newDashboardLogic.ts b/frontend/src/scenes/dashboard/newDashboardLogic.ts
index 77a29bca3acd..43dfcf3eeac4 100644
--- a/frontend/src/scenes/dashboard/newDashboardLogic.ts
+++ b/frontend/src/scenes/dashboard/newDashboardLogic.ts
@@ -1,5 +1,18 @@
-import { actions, connect, isBreakpoint, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    connect,
+    isBreakpoint,
+    kea,
+    key,
+    listeners,
+    path,
+    props,
+    reducers,
+    selectors,
+} from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 
 import api from 'lib/api'
@@ -25,8 +38,9 @@ import {
     JsonType,
 } from '~/types'
 
+import type { FeatureFlagsSet } from '../../lib/logic/featureFlagLogic'
+import type { InsightModel } from '../../types'
 import { UNFILED_DASHBOARDS_FOLDER } from './dashboardConstants'
-import type { newDashboardLogicType } from './newDashboardLogicType'
 
 export interface NewDashboardForm {
     name: string
@@ -112,6 +126,122 @@ function makeTilesUsingVariables(
     })
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface newDashboardLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    activeDashboardTemplate: DashboardTemplateType | null
+    isFeatureFlagDashboard: number | undefined
+    isLoading: boolean
+    isNewDashboardSubmitting: boolean
+    isNewDashboardValid: boolean
+    newDashboard: NewDashboardForm
+    newDashboardAllErrors: Record<string, any>
+    newDashboardChanged: boolean
+    newDashboardErrors: DeepPartialMap<NewDashboardForm, ValidationErrorType>
+    newDashboardHasErrors: boolean
+    newDashboardManualErrors: Record<string, any>
+    newDashboardModalVisible: boolean
+    newDashboardTouched: boolean
+    newDashboardTouches: Record<string, boolean>
+    newDashboardValidationErrors: DeepPartialMap<NewDashboardForm, ValidationErrorType>
+    redirectAfterCreation: boolean
+    showNewDashboardErrors: boolean
+    variableSelectModalVisible: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface newDashboardLogicActions {
+    addDashboard: (form: Partial<NewDashboardForm>) => {
+        form: Partial<NewDashboardForm>
+    }
+    clearActiveDashboardTemplate: () => {
+        value: true
+    }
+    createDashboardFromTemplate: (
+        template: DashboardTemplateType,
+        variables: DashboardTemplateVariableType[],
+        redirectAfterCreation?: boolean,
+        creationContext?: string | null
+    ) => {
+        creationContext: string | null
+        redirectAfterCreation: boolean | undefined
+        template: DashboardTemplateType
+        variables: DashboardTemplateVariableType[]
+    }
+    hideNewDashboardModal: () => {
+        value: true
+    }
+    resetNewDashboard: (values?: NewDashboardForm) => {
+        values?: NewDashboardForm
+    }
+    setActiveDashboardTemplate: (template: DashboardTemplateType) => {
+        template: DashboardTemplateType
+    }
+    setIsLoading: (isLoading: boolean) => {
+        isLoading: boolean
+    }
+    setNewDashboardManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setNewDashboardValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setNewDashboardValues: (values: DeepPartial<NewDashboardForm>) => {
+        values: DeepPartial<NewDashboardForm>
+    }
+    setRedirectAfterCreation: (redirect: boolean) => {
+        redirect: boolean
+    }
+    showNewDashboardModal: () => {
+        value: true
+    }
+    showVariableSelectModal: (template: DashboardTemplateType) => {
+        template: DashboardTemplateType
+    }
+    submitNewDashboard: () => {
+        value: boolean
+    }
+    submitNewDashboardFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitNewDashboardRequest: (newDashboard: NewDashboardForm) => {
+        newDashboard: NewDashboardForm
+    }
+    submitNewDashboardSuccess: (newDashboard: NewDashboardForm) => {
+        newDashboard: NewDashboardForm
+    }
+    submitNewDashboardSuccessWithResult: (
+        result: DashboardType,
+        variables?: DashboardTemplateVariableType[]
+    ) => {
+        result: DashboardType<InsightModel>
+        variables: DashboardTemplateVariableType[] | undefined
+    }
+    touchNewDashboardField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface newDashboardLogicMeta {
+    key: number | 'new'
+}
+
+export type newDashboardLogicType = MakeLogicType<
+    newDashboardLogicValues,
+    newDashboardLogicActions,
+    NewDashboardLogicProps,
+    newDashboardLogicMeta
+>
+
 export const newDashboardLogic = kea<newDashboardLogicType>([
     props({} as NewDashboardLogicProps),
     key(({ featureFlagId }) => featureFlagId ?? 'new'),
diff --git a/frontend/src/scenes/dashboard/tileLogic.tsx b/frontend/src/scenes/dashboard/tileLogic.tsx
index 4425481dfdd9..fb722ff24560 100644
--- a/frontend/src/scenes/dashboard/tileLogic.tsx
+++ b/frontend/src/scenes/dashboard/tileLogic.tsx
@@ -1,16 +1,48 @@
-import { actions, kea, key, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, kea, key, path, props, reducers } from 'kea'
 
 import { BreakdownFilter, TileFilters } from '~/queries/schema/schema-general'
 import { AnyPropertyFilter } from '~/types'
 
-import type { tileLogicType } from './tileLogicType'
-
 export interface TileLogicProps {
     dashboardId: number
     tileId: number
     filtersOverrides?: TileFilters
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tileLogicValues {
+    overrides: TileFilters
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tileLogicActions {
+    resetOverrides: () => {
+        value: true
+    }
+    setBreakdown: (breakdown_filter: BreakdownFilter | null | undefined) => {
+        breakdown_filter: BreakdownFilter | null | undefined
+    }
+    setDates: (
+        date_from: string | null | undefined,
+        date_to: string | null | undefined,
+        explicitDate?: boolean
+    ) => {
+        date_from: string | null | undefined
+        date_to: string | null | undefined
+        explicitDate: boolean | undefined
+    }
+    setProperties: (properties: AnyPropertyFilter[] | null | undefined) => {
+        properties: AnyPropertyFilter[] | null | undefined
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tileLogicMeta {
+    key: string
+}
+
+export type tileLogicType = MakeLogicType<tileLogicValues, tileLogicActions, TileLogicProps, tileLogicMeta>
+
 export const tileLogic = kea<tileLogicType>([
     path(['scenes', 'dashboard', 'tileLogic']),
     props({} as TileLogicProps),
diff --git a/frontend/src/scenes/data-management/DataManagementScene.tsx b/frontend/src/scenes/data-management/DataManagementScene.tsx
index 57e647fd0327..07587ef83687 100644
--- a/frontend/src/scenes/data-management/DataManagementScene.tsx
+++ b/frontend/src/scenes/data-management/DataManagementScene.tsx
@@ -1,4 +1,4 @@
-import { actions, connect, kea, path, reducers, selectors, useValues } from 'kea'
+import { MakeLogicType, actions, connect, kea, path, reducers, selectors, useValues } from 'kea'
 import { actionToUrl, combineUrl, router, urlToAction } from 'kea-router'
 import React from 'react'
 
@@ -27,7 +27,7 @@ import { ActionsTable } from 'products/actions/frontend/components/ActionsTable'
 import { NewActionButton } from 'products/actions/frontend/components/NewActionButton'
 import { RevenueAnalyticsSettings } from 'products/revenue_analytics/frontend/settings/RevenueAnalyticsSettings'
 
-import type { dataManagementSceneLogicType } from './DataManagementSceneType'
+import type { FeatureFlagsSet } from '../../lib/logic/featureFlagLogic'
 import { EventDefinitionsTable } from './events/EventDefinitionsTable'
 import { IngestionWarningsV2View } from './ingestion-warnings-v2/IngestionWarningsV2View'
 import { IngestionWarningsView } from './ingestion-warnings/IngestionWarningsView'
@@ -201,6 +201,38 @@ const tabs: Record<DataManagementTab, TabConfig> = {
     },
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataManagementSceneLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    breadcrumbs: Breadcrumb[]
+    enabledTabs: DataManagementTab[]
+    sidePanelContext: SidePanelSceneContext | null
+    tab: DataManagementTab
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataManagementSceneLogicActions {
+    setTab: (tab: DataManagementTab) => {
+        tab: DataManagementTab
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataManagementSceneLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        breadcrumbs: (tab: DataManagementTab) => Breadcrumb[]
+        enabledTabs: (featureFlags: FeatureFlagsSet) => DataManagementTab[]
+        sidePanelContext: (tab: DataManagementTab) => SidePanelSceneContext | null
+    }
+}
+
+export type dataManagementSceneLogicType = MakeLogicType<
+    dataManagementSceneLogicValues,
+    dataManagementSceneLogicActions,
+    Record<string, any>,
+    dataManagementSceneLogicMeta
+>
+
 const dataManagementSceneLogic = kea<dataManagementSceneLogicType>([
     path(['scenes', 'events', 'dataManagementSceneLogic']),
     connect(() => ({
@@ -220,7 +252,7 @@ const dataManagementSceneLogic = kea<dataManagementSceneLogicType>([
     selectors({
         breadcrumbs: [
             (s) => [s.tab],
-            (tab): Breadcrumb[] => {
+            (tab: DataManagementTab): Breadcrumb[] => {
                 if (tab === DataManagementTab.EventDefinitions) {
                     return [
                         {
@@ -297,7 +329,7 @@ const dataManagementSceneLogic = kea<dataManagementSceneLogicType>([
         ],
         enabledTabs: [
             (s) => [s.featureFlags],
-            (featureFlags): DataManagementTab[] => {
+            (featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet): DataManagementTab[] => {
                 const allTabs = Object.entries(tabs)
 
                 return allTabs
diff --git a/frontend/src/scenes/data-management/MaterializedColumns/materializedColumnsLogic.ts b/frontend/src/scenes/data-management/MaterializedColumns/materializedColumnsLogic.ts
index d347c2ddbf61..3db79bd3b7c5 100644
--- a/frontend/src/scenes/data-management/MaterializedColumns/materializedColumnsLogic.ts
+++ b/frontend/src/scenes/data-management/MaterializedColumns/materializedColumnsLogic.ts
@@ -1,11 +1,11 @@
-import { actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
 import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
 import { teamLogic } from 'scenes/teamLogic'
 
-import type { materializedColumnsLogicType } from './materializedColumnsLogicType'
+import type { TeamPublicType, TeamType } from '../../../types'
 
 export enum MaterializedColumnSlotState {
     PENDING = 'PENDING',
@@ -51,6 +51,108 @@ export interface AutoMaterializedColumn {
     is_nullable: boolean
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface materializedColumnsLogicValues {
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    autoMaterializedColumns: AutoMaterializedColumn[]
+    autoMaterializedColumnsLoading: boolean
+    availableProperties: PropertyDefinition[]
+    availablePropertiesLoading: boolean
+    canAssignMoreSlots: boolean
+    showCreateModal: boolean
+    slotUsage: SlotUsageSummary | null
+    slotUsageLoading: boolean
+    slots: MaterializedColumnSlot[]
+    slotsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface materializedColumnsLogicActions {
+    deleteSlot: (slotId: string) => {
+        slotId: string
+    }
+    loadAutoMaterializedColumns: () => any
+    loadAutoMaterializedColumnsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAutoMaterializedColumnsSuccess: (
+        autoMaterializedColumns: AutoMaterializedColumn[],
+        payload?: any
+    ) => {
+        autoMaterializedColumns: AutoMaterializedColumn[]
+        payload?: any
+    }
+    loadAvailableProperties: () => any
+    loadAvailablePropertiesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAvailablePropertiesSuccess: (
+        availableProperties: PropertyDefinition[],
+        payload?: any
+    ) => {
+        availableProperties: PropertyDefinition[]
+        payload?: any
+    }
+    loadSlotUsage: () => any
+    loadSlotUsageFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSlotUsageSuccess: (
+        slotUsage: SlotUsageSummary | null,
+        payload?: any
+    ) => {
+        slotUsage: SlotUsageSummary | null
+        payload?: any
+    }
+    loadSlots: () => any
+    loadSlotsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSlotsSuccess: (
+        slots: MaterializedColumnSlot[],
+        payload?: any
+    ) => {
+        slots: MaterializedColumnSlot[]
+        payload?: any
+    }
+    retrySlot: (slotId: string) => {
+        slotId: string
+    }
+    setShowCreateModal: (show: boolean) => {
+        show: boolean
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface materializedColumnsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        canAssignMoreSlots: (slotUsage: SlotUsageSummary | null) => boolean
+    }
+}
+
+export type materializedColumnsLogicType = MakeLogicType<
+    materializedColumnsLogicValues,
+    materializedColumnsLogicActions,
+    Record<string, any>,
+    materializedColumnsLogicMeta
+>
+
 export const materializedColumnsLogic = kea<materializedColumnsLogicType>([
     path(['scenes', 'data-management', 'MaterializedColumns', 'materializedColumnsLogic']),
     connect(() => ({
@@ -127,7 +229,7 @@ export const materializedColumnsLogic = kea<materializedColumnsLogicType>([
     selectors({
         canAssignMoreSlots: [
             (s) => [s.slotUsage],
-            (slotUsage): boolean => {
+            (slotUsage: SlotUsageSummary | null): boolean => {
                 if (!slotUsage) {
                     return false
                 }
diff --git a/frontend/src/scenes/data-management/comments/commentsLogic.ts b/frontend/src/scenes/data-management/comments/commentsLogic.ts
index 5ba011d46f9b..4e26a98fb69e 100644
--- a/frontend/src/scenes/data-management/comments/commentsLogic.ts
+++ b/frontend/src/scenes/data-management/comments/commentsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
@@ -13,7 +13,7 @@ import { userLogic } from 'scenes/userLogic'
 
 import { ActivityScope, CommentType, InsightShortId } from '~/types'
 
-import type { commentsLogicType } from './commentsLogicType'
+import type { TeamPublicType, TeamType, UserType } from '../../../types'
 
 export const SCOPE_OPTIONS: LemonSelectOption<ActivityScope | null>[] = Object.values(ActivityScope).map((scope) => ({
     value: scope,
@@ -75,6 +75,145 @@ export const openURLFor = (c: CommentType): string | null => {
 export type CommentKindFilter = 'any' | 'comment' | 'task'
 export type CommentCompletedFilter = 'any' | 'open' | 'completed'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface commentsLogicValues {
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    user: UserType | null // userLogic
+    comments: CommentType[]
+    commentsLoading: boolean
+    completedFilter: CommentCompletedFilter
+    filterCreatedBy: string | null
+    hasAnySearch: boolean
+    kind: CommentKindFilter
+    scope: ActivityScope | null
+    searchText: string
+    shouldShowEmptyState: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface commentsLogicActions {
+    completeComment: (comment: CommentType) => {
+        comment: CommentType
+    }
+    completeCommentFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    completeCommentSuccess: (
+        comments: CommentType[],
+        payload?: {
+            comment: CommentType
+        }
+    ) => {
+        comments: CommentType[]
+        payload?: {
+            comment: CommentType
+        }
+    }
+    deleteComment: (id: string) => {
+        id: string
+    }
+    deleteCommentFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteCommentSuccess: (
+        comments: CommentType[],
+        payload?: {
+            id: string
+        }
+    ) => {
+        comments: CommentType[]
+        payload?: {
+            id: string
+        }
+    }
+    loadComments: () => {
+        value: true
+    }
+    loadCommentsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadCommentsSuccess: (
+        comments: CommentType[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        comments: CommentType[]
+        payload?: {
+            value: true
+        }
+    }
+    reopenComment: (comment: CommentType) => {
+        comment: CommentType
+    }
+    reopenCommentFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    reopenCommentSuccess: (
+        comments: CommentType[],
+        payload?: {
+            comment: CommentType
+        }
+    ) => {
+        comments: CommentType[]
+        payload?: {
+            comment: CommentType
+        }
+    }
+    setCompletedFilter: (completed: CommentCompletedFilter) => {
+        completed: CommentCompletedFilter
+    }
+    setFilterCreatedBy: (createdBy: string | null) => {
+        createdBy: string | null
+    }
+    setKind: (kind: CommentKindFilter) => {
+        kind: CommentKindFilter
+    }
+    setScope: (scope: ActivityScope | null) => {
+        scope: ActivityScope | null
+    }
+    setSearchText: (searchText: string) => {
+        searchText: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface commentsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        hasAnySearch: (
+            searchText: string,
+            scope: ActivityScope | null,
+            filterCreatedBy: string | null,
+            kind: CommentKindFilter,
+            completedFilter: CommentCompletedFilter
+        ) => boolean
+        shouldShowEmptyState: (comments: CommentType[], commentsLoading: boolean, hasAnySearch: boolean) => boolean
+    }
+}
+
+export type commentsLogicType = MakeLogicType<
+    commentsLogicValues,
+    commentsLogicActions,
+    Record<string, any>,
+    commentsLogicMeta
+>
+
 export const commentsLogic = kea<commentsLogicType>([
     path(['scenes', 'data-management', 'comments', 'commentsLogic']),
     connect(() => ({
@@ -156,13 +295,19 @@ export const commentsLogic = kea<commentsLogicType>([
     selectors(() => ({
         hasAnySearch: [
             (s) => [s.searchText, s.scope, s.filterCreatedBy, s.kind, s.completedFilter],
-            (searchText, scope, filterCreatedBy, kind, completedFilter) => {
+            (
+                searchText: string,
+                scope: ActivityScope | null,
+                filterCreatedBy: string | null,
+                kind: CommentKindFilter,
+                completedFilter: CommentCompletedFilter
+            ) => {
                 return !!searchText || !!scope || !!filterCreatedBy || kind !== 'any' || completedFilter !== 'any'
             },
         ],
         shouldShowEmptyState: [
             (s) => [s.comments, s.commentsLoading, s.hasAnySearch],
-            (comments, commentsLoading, hasAnySearch): boolean => {
+            (comments: CommentType[], commentsLoading: boolean, hasAnySearch: boolean): boolean => {
                 return comments.length === 0 && !commentsLoading && !hasAnySearch
             },
         ],
diff --git a/frontend/src/scenes/data-management/database/databaseTableListLogic.ts b/frontend/src/scenes/data-management/database/databaseTableListLogic.ts
index 027e10c2198e..a74b5d643a87 100644
--- a/frontend/src/scenes/data-management/database/databaseTableListLogic.ts
+++ b/frontend/src/scenes/data-management/database/databaseTableListLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { objectsEqual } from 'lib/utils/objects'
@@ -16,8 +16,6 @@ import {
 } from '~/queries/schema/schema-general'
 import { setLatestVersionsOnQuery } from '~/queries/utils'
 
-import type { databaseTableListLogicType } from './databaseTableListLogicType'
-
 const toMapByName = <T extends { name: string }>(items: T[]): Record<string, T> =>
     items.reduce(
         (acc, cur) => {
@@ -47,6 +45,116 @@ let inFlightDatabaseLoadPromise: Promise<Required<DatabaseSchemaQueryResponse> |
 let latestDatabaseLoadEpoch = 0
 let inFlightDatabaseLoadEpoch = 0
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface databaseTableListLogicValues {
+    allPosthogTables: DatabaseSchemaTable[]
+    allTables: DatabaseSchemaTable[]
+    allTablesMap: Record<string, DatabaseSchemaTable>
+    connectionId: string | null
+    dataWarehouseTables: DatabaseSchemaDataWarehouseTable[]
+    dataWarehouseTablesMap: Record<string, DatabaseSchemaDataWarehouseTable | DatabaseSchemaViewTable>
+    dataWarehouseTablesMapById: Record<string, DatabaseSchemaDataWarehouseTable | DatabaseSchemaViewTable>
+    database: Required<DatabaseSchemaQueryResponse> | null
+    databaseLoading: boolean
+    endpointTables: DatabaseSchemaEndpointTable[]
+    externalDataSourceTables: DatabaseSchemaDataWarehouseTable[]
+    filteredTables: DatabaseSchemaTable[]
+    latestEndpointTables: DatabaseSchemaEndpointTable[]
+    managedViews: DatabaseSchemaManagedViewTable[]
+    posthogTables: DatabaseSchemaTable[]
+    posthogTablesMap: Record<string, DatabaseSchemaTable>
+    searchTerm: string
+    systemTables: DatabaseSchemaTable[]
+    systemTablesMap: Record<string, DatabaseSchemaTable>
+    views: DatabaseSchemaViewTable[]
+    viewsMap: Record<string, DatabaseSchemaEndpointTable | DatabaseSchemaManagedViewTable | DatabaseSchemaViewTable>
+    viewsMapById: Record<string, DatabaseSchemaEndpointTable | DatabaseSchemaManagedViewTable | DatabaseSchemaViewTable>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface databaseTableListLogicActions {
+    loadDatabase: ({ force }?: { force?: boolean }) => {
+        force?: boolean
+    }
+    loadDatabaseFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadDatabaseSuccess: (
+        database: Required<DatabaseSchemaQueryResponse> | null,
+        payload?: {
+            force?: boolean
+        }
+    ) => {
+        database: Required<DatabaseSchemaQueryResponse> | null
+        payload?: {
+            force?: boolean
+        }
+    }
+    refreshDatabaseSchema: () => {
+        value: true
+    }
+    setConnection: (connectionId: string | null) => {
+        connectionId: string | null
+    }
+    setSearchTerm: (searchTerm: string) => {
+        searchTerm: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface databaseTableListLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        allPosthogTables: (allTables: DatabaseSchemaTable[]) => DatabaseSchemaTable[]
+        filteredTables: (allTables: DatabaseSchemaTable[], searchTerm: string) => DatabaseSchemaTable[]
+        allTables: (
+            database: Required<DatabaseSchemaQueryResponse> | null,
+            databaseLoading: boolean
+        ) => DatabaseSchemaTable[]
+        allTablesMap: (allTables: DatabaseSchemaTable[]) => Record<string, DatabaseSchemaTable>
+        posthogTables: (allPosthogTables: DatabaseSchemaTable[], connectionId: string | null) => DatabaseSchemaTable[]
+        posthogTablesMap: (posthogTables: DatabaseSchemaTable[]) => Record<string, DatabaseSchemaTable>
+        systemTables: (allTables: DatabaseSchemaTable[], connectionId: string | null) => DatabaseSchemaTable[]
+        systemTablesMap: (systemTables: DatabaseSchemaTable[]) => Record<string, DatabaseSchemaTable>
+        dataWarehouseTables: (allTables: DatabaseSchemaTable[]) => DatabaseSchemaDataWarehouseTable[]
+        externalDataSourceTables: (
+            dataWarehouseTables: DatabaseSchemaDataWarehouseTable[]
+        ) => DatabaseSchemaDataWarehouseTable[]
+        dataWarehouseTablesMap: (
+            dataWarehouseTables: DatabaseSchemaDataWarehouseTable[],
+            views: DatabaseSchemaViewTable[]
+        ) => Record<string, DatabaseSchemaDataWarehouseTable | DatabaseSchemaViewTable>
+        dataWarehouseTablesMapById: (
+            dataWarehouseTables: DatabaseSchemaDataWarehouseTable[],
+            views: DatabaseSchemaViewTable[]
+        ) => Record<string, DatabaseSchemaDataWarehouseTable | DatabaseSchemaViewTable>
+        views: (allTables: DatabaseSchemaTable[]) => DatabaseSchemaViewTable[]
+        managedViews: (allTables: DatabaseSchemaTable[]) => DatabaseSchemaManagedViewTable[]
+        endpointTables: (allTables: DatabaseSchemaTable[]) => DatabaseSchemaEndpointTable[]
+        latestEndpointTables: (endpointTables: DatabaseSchemaEndpointTable[]) => DatabaseSchemaEndpointTable[]
+        viewsMap: (
+            views: DatabaseSchemaViewTable[],
+            managedViews: DatabaseSchemaManagedViewTable[],
+            endpointTables: DatabaseSchemaEndpointTable[]
+        ) => Record<string, DatabaseSchemaEndpointTable | DatabaseSchemaManagedViewTable | DatabaseSchemaViewTable>
+        viewsMapById: (
+            views: DatabaseSchemaViewTable[],
+            managedViews: DatabaseSchemaManagedViewTable[],
+            endpointTables: DatabaseSchemaEndpointTable[]
+        ) => Record<string, DatabaseSchemaEndpointTable | DatabaseSchemaManagedViewTable | DatabaseSchemaViewTable>
+    }
+}
+
+export type databaseTableListLogicType = MakeLogicType<
+    databaseTableListLogicValues,
+    databaseTableListLogicActions,
+    Record<string, any>,
+    databaseTableListLogicMeta
+>
+
 export const databaseTableListLogic = kea<databaseTableListLogicType>([
     path(['scenes', 'data-management', 'database', 'databaseTableListLogic']),
     actions({
@@ -140,7 +248,7 @@ export const databaseTableListLogic = kea<databaseTableListLogicType>([
         ],
         filteredTables: [
             (s) => [s.allTables, s.searchTerm],
-            (allTables, searchTerm): DatabaseSchemaTable[] => {
+            (allTables: DatabaseSchemaTable[], searchTerm: string): DatabaseSchemaTable[] => {
                 return allTables
                     .filter(({ name }) => name.toLowerCase().includes(searchTerm.toLowerCase()))
                     .sort((a, b) => a.name.localeCompare(b.name))
@@ -149,7 +257,10 @@ export const databaseTableListLogic = kea<databaseTableListLogicType>([
         ],
         allTables: [
             (s) => [s.database, s.databaseLoading],
-            (database, databaseLoading): DatabaseSchemaTable[] => {
+            (
+                database: Required<DatabaseSchemaQueryResponse> | null,
+                databaseLoading: boolean
+            ): DatabaseSchemaTable[] => {
                 if (databaseLoading || !database || !database.tables) {
                     return []
                 }
diff --git a/frontend/src/scenes/data-management/definition/definitionEditLogic.ts b/frontend/src/scenes/data-management/definition/definitionEditLogic.ts
index 6c04556ea412..526cc472c33f 100644
--- a/frontend/src/scenes/data-management/definition/definitionEditLogic.ts
+++ b/frontend/src/scenes/data-management/definition/definitionEditLogic.ts
@@ -1,5 +1,6 @@
-import { connect, kea, key, path, props } from 'kea'
+import { MakeLogicType, connect, kea, key, path, props } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { beforeUnload, router } from 'kea-router'
 import { subscriptions } from 'kea-subscriptions'
@@ -19,7 +20,205 @@ import { updatePropertyDefinitions } from '~/models/propertyDefinitionsModel'
 import { tagsModel } from '~/models/tagsModel'
 import { Definition, EventDefinition, PropertyDefinition } from '~/types'
 
-import type { definitionEditLogicType } from './definitionEditLogicType'
+import type {
+    PropertyDefinitionType,
+    PropertyType,
+    SchemaEnforcementMode,
+    UserBasicType,
+    WarehousePropertyOrigin,
+} from '../../../types'
+import type { SetDefinitionProps } from './definitionLogic'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface definitionEditLogicValues {
+    definition: Definition // definitionLogic
+    isEvent: boolean // definitionLogic
+    singular: string // definitionLogic
+    editDefinition: Definition
+    editDefinitionAllErrors: Record<string, any>
+    editDefinitionChanged: boolean
+    editDefinitionErrors: DeepPartialMap<Definition, ValidationErrorType>
+    editDefinitionHasErrors: boolean
+    editDefinitionLoading: boolean
+    editDefinitionManualErrors: Record<string, any>
+    editDefinitionTouched: boolean
+    editDefinitionTouches: Record<string, boolean>
+    editDefinitionValidationErrors: DeepPartialMap<Definition, ValidationErrorType>
+    isEditDefinitionSubmitting: boolean
+    isEditDefinitionValid: boolean
+    showEditDefinitionErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface definitionEditLogicActions {
+    setDefinition: (
+        definition: Partial<Definition>,
+        options?: SetDefinitionProps | undefined
+    ) => {
+        definition: Partial<Definition>
+        options: SetDefinitionProps
+    } // definitionLogic
+    setLocalEventDefinition: (definition: EventDefinition) => {
+        definition: EventDefinition
+    } // eventDefinitionsTableLogic
+    refreshLoadedPrimaryProperties: () => {
+        value: true
+    } // primaryEventPropertiesModel
+    setLocalPropertyDefinition: (definition: PropertyDefinition) => {
+        definition: PropertyDefinition
+    } // propertyDefinitionsTableLogic
+    loadTags: () => any // tagsModel
+    resetEditDefinition: (values?: Definition) => {
+        values?: Definition
+    }
+    saveDefinition: (_: any) => any
+    saveDefinitionFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    saveDefinitionSuccess: (
+        editDefinition:
+            | {
+                  created_at?: string | undefined
+                  default_columns?: string[] | undefined
+                  description?: string | undefined
+                  enforcement_mode?: SchemaEnforcementMode | undefined
+                  hidden?: boolean | undefined
+                  id: string
+                  is_action?: boolean | undefined
+                  is_data_warehouse?: boolean | undefined
+                  last_seen_at?: string | undefined
+                  last_updated_at?: string | undefined
+                  media_preview_urls?: string[] | undefined
+                  name: string
+                  owner?: UserBasicType | null | undefined
+                  primary_property?: string | null | undefined
+                  tags?: string[] | undefined
+                  updated_at?: string | undefined
+                  updated_by?: UserBasicType | null | undefined
+                  verified?: boolean | undefined
+                  verified_at?: string | undefined
+                  verified_by?: string | undefined
+              }
+            | {
+                  created_at?: string | undefined
+                  description?: string | undefined
+                  example?: string | undefined
+                  hidden?: boolean | undefined
+                  id: string
+                  is_action?: boolean | undefined
+                  is_numerical?: boolean | undefined
+                  is_seen_on_filtered_events?: boolean | undefined
+                  last_seen_at?: string | undefined
+                  name: string
+                  property_type?: PropertyType | undefined
+                  tags?: string[] | undefined
+                  type?: PropertyDefinitionType | undefined
+                  updated_at?: string | undefined
+                  updated_by?: UserBasicType | null | undefined
+                  verified?: boolean | undefined
+                  verified_at?: string | undefined
+                  verified_by?: string | undefined
+                  virtual?: boolean | undefined
+                  warehouse_origin?: WarehousePropertyOrigin | null | undefined
+              },
+        payload?: any
+    ) => {
+        editDefinition:
+            | {
+                  created_at?: string | undefined
+                  default_columns?: string[] | undefined
+                  description?: string | undefined
+                  enforcement_mode?: SchemaEnforcementMode | undefined
+                  hidden?: boolean | undefined
+                  id: string
+                  is_action?: boolean | undefined
+                  is_data_warehouse?: boolean | undefined
+                  last_seen_at?: string | undefined
+                  last_updated_at?: string | undefined
+                  media_preview_urls?: string[] | undefined
+                  name: string
+                  owner?: UserBasicType | null | undefined
+                  primary_property?: string | null | undefined
+                  tags?: string[] | undefined
+                  updated_at?: string | undefined
+                  updated_by?: UserBasicType | null | undefined
+                  verified?: boolean | undefined
+                  verified_at?: string | undefined
+                  verified_by?: string | undefined
+              }
+            | {
+                  created_at?: string | undefined
+                  description?: string | undefined
+                  example?: string | undefined
+                  hidden?: boolean | undefined
+                  id: string
+                  is_action?: boolean | undefined
+                  is_numerical?: boolean | undefined
+                  is_seen_on_filtered_events?: boolean | undefined
+                  last_seen_at?: string | undefined
+                  name: string
+                  property_type?: PropertyType | undefined
+                  tags?: string[] | undefined
+                  type?: PropertyDefinitionType | undefined
+                  updated_at?: string | undefined
+                  updated_by?: UserBasicType | null | undefined
+                  verified?: boolean | undefined
+                  verified_at?: string | undefined
+                  verified_by?: string | undefined
+                  virtual?: boolean | undefined
+                  warehouse_origin?: WarehousePropertyOrigin | null | undefined
+              }
+        payload?: any
+    }
+    setEditDefinitionManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setEditDefinitionValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setEditDefinitionValues: (values: DeepPartial<Definition>) => {
+        values: DeepPartial<Definition>
+    }
+    submitEditDefinition: () => {
+        value: boolean
+    }
+    submitEditDefinitionFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitEditDefinitionRequest: (editDefinition: Definition) => {
+        editDefinition: Definition
+    }
+    submitEditDefinitionSuccess: (editDefinition: Definition) => {
+        editDefinition: Definition
+    }
+    touchEditDefinitionField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface definitionEditLogicMeta {
+    key: string
+}
+
+export type definitionEditLogicType = MakeLogicType<
+    definitionEditLogicValues,
+    definitionEditLogicActions,
+    DefinitionLogicProps,
+    definitionEditLogicMeta
+>
 
 export const definitionEditLogic = kea<definitionEditLogicType>([
     path(['scenes', 'data-management', 'definition', 'definitionDetailLogic']),
diff --git a/frontend/src/scenes/data-management/definition/definitionLogic.ts b/frontend/src/scenes/data-management/definition/definitionLogic.ts
index 8adde4b47084..82971854aacc 100644
--- a/frontend/src/scenes/data-management/definition/definitionLogic.ts
+++ b/frontend/src/scenes/data-management/definition/definitionLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 
@@ -12,10 +12,16 @@ import { updatePropertyDefinitions } from '~/models/propertyDefinitionsModel'
 import { getFilterLabel } from '~/taxonomy/helpers'
 import { Breadcrumb, Definition, EventDefinitionMetrics, ObjectMediaPreview, PropertyDefinition } from '~/types'
 
+import type {
+    PropertyDefinitionType,
+    PropertyType,
+    SchemaEnforcementMode,
+    UserBasicType,
+    WarehousePropertyOrigin,
+} from '../../../types'
 import { DataManagementTab } from '../DataManagementScene'
 import { eventDefinitionsTableLogic } from '../events/eventDefinitionsTableLogic'
 import { propertyDefinitionsTableLogic } from '../properties/propertyDefinitionsTableLogic'
-import type { definitionLogicType } from './definitionLogicType'
 
 export const createNewDefinition = (isEvent: boolean): Definition => ({
     id: 'new',
@@ -32,6 +38,287 @@ export interface DefinitionLogicProps {
     id?: Definition['id']
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface definitionLogicValues {
+    breadcrumbs: Breadcrumb[]
+    definition: Definition
+    definitionLoading: boolean
+    definitionMissing: boolean
+    isEvent: boolean
+    isProperty: boolean
+    metrics: EventDefinitionMetrics | null
+    metricsLoading: boolean
+    previews: ObjectMediaPreview[]
+    previewsLoading: boolean
+    singular: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface definitionLogicActions {
+    createMediaPreview: (
+        uploadedMediaId: string,
+        metadata?: Record<string, any>
+    ) => {
+        metadata: Record<string, any> | undefined
+        uploadedMediaId: string
+    }
+    createMediaPreviewFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    createMediaPreviewSuccess: (
+        previews: ObjectMediaPreview[],
+        payload?: {
+            metadata: Record<string, any> | undefined
+            uploadedMediaId: string
+        }
+    ) => {
+        previews: ObjectMediaPreview[]
+        payload?: {
+            metadata: Record<string, any> | undefined
+            uploadedMediaId: string
+        }
+    }
+    deleteDefinition: () => any
+    deleteDefinitionFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteDefinitionSuccess: (
+        definition: Definition,
+        payload?: any
+    ) => {
+        definition: Definition
+        payload?: any
+    }
+    deleteMediaPreview: (previewId: string) => {
+        previewId: string
+    }
+    deleteMediaPreviewFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteMediaPreviewSuccess: (
+        previews: ObjectMediaPreview[],
+        payload?: {
+            previewId: string
+        }
+    ) => {
+        previews: ObjectMediaPreview[]
+        payload?: {
+            previewId: string
+        }
+    }
+    loadDefinition: (id: Definition['id']) => {
+        id: string
+    }
+    loadDefinitionFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadDefinitionSuccess: (
+        definition:
+            | {
+                  created_at?: string | undefined
+                  default_columns?: string[] | undefined
+                  description?: string | undefined
+                  enforcement_mode?: SchemaEnforcementMode | undefined
+                  hidden?: boolean | undefined
+                  id: string
+                  is_action?: boolean | undefined
+                  is_data_warehouse?: boolean | undefined
+                  last_seen_at?: string | undefined
+                  last_updated_at?: string | undefined
+                  media_preview_urls?: string[] | undefined
+                  name: string
+                  owner?: UserBasicType | null | undefined
+                  primary_property?: string | null | undefined
+                  tags?: string[] | undefined
+                  updated_at?: string | undefined
+                  updated_by?: UserBasicType | null | undefined
+                  verified?: boolean | undefined
+                  verified_at?: string | undefined
+                  verified_by?: string | undefined
+              }
+            | {
+                  created_at?: string | undefined
+                  description?: string | undefined
+                  example?: string | undefined
+                  hidden?: boolean | undefined
+                  id: string
+                  is_action?: boolean | undefined
+                  is_numerical?: boolean | undefined
+                  is_seen_on_filtered_events?: boolean | undefined
+                  last_seen_at?: string | undefined
+                  name: string
+                  property_type?: PropertyType | undefined
+                  tags?: string[] | undefined
+                  type?: PropertyDefinitionType | undefined
+                  updated_at?: string | undefined
+                  updated_by?: UserBasicType | null | undefined
+                  verified?: boolean | undefined
+                  verified_at?: string | undefined
+                  verified_by?: string | undefined
+                  virtual?: boolean | undefined
+                  warehouse_origin?: WarehousePropertyOrigin | null | undefined
+              },
+        payload?: {
+            id: string
+        }
+    ) => {
+        definition:
+            | {
+                  created_at?: string | undefined
+                  default_columns?: string[] | undefined
+                  description?: string | undefined
+                  enforcement_mode?: SchemaEnforcementMode | undefined
+                  hidden?: boolean | undefined
+                  id: string
+                  is_action?: boolean | undefined
+                  is_data_warehouse?: boolean | undefined
+                  last_seen_at?: string | undefined
+                  last_updated_at?: string | undefined
+                  media_preview_urls?: string[] | undefined
+                  name: string
+                  owner?: UserBasicType | null | undefined
+                  primary_property?: string | null | undefined
+                  tags?: string[] | undefined
+                  updated_at?: string | undefined
+                  updated_by?: UserBasicType | null | undefined
+                  verified?: boolean | undefined
+                  verified_at?: string | undefined
+                  verified_by?: string | undefined
+              }
+            | {
+                  created_at?: string | undefined
+                  description?: string | undefined
+                  example?: string | undefined
+                  hidden?: boolean | undefined
+                  id: string
+                  is_action?: boolean | undefined
+                  is_numerical?: boolean | undefined
+                  is_seen_on_filtered_events?: boolean | undefined
+                  last_seen_at?: string | undefined
+                  name: string
+                  property_type?: PropertyType | undefined
+                  tags?: string[] | undefined
+                  type?: PropertyDefinitionType | undefined
+                  updated_at?: string | undefined
+                  updated_by?: UserBasicType | null | undefined
+                  verified?: boolean | undefined
+                  verified_at?: string | undefined
+                  verified_by?: string | undefined
+                  virtual?: boolean | undefined
+                  warehouse_origin?: WarehousePropertyOrigin | null | undefined
+              }
+        payload?: {
+            id: string
+        }
+    }
+    loadMetrics: (id: Definition['id']) => {
+        id: string
+    }
+    loadMetricsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadMetricsSuccess: (
+        metrics: EventDefinitionMetrics | null,
+        payload?: {
+            id: string
+        }
+    ) => {
+        metrics: EventDefinitionMetrics | null
+        payload?: {
+            id: string
+        }
+    }
+    loadPreviews: () => {
+        value: true
+    }
+    loadPreviewsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPreviewsSuccess: (
+        previews: ObjectMediaPreview[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        previews: ObjectMediaPreview[]
+        payload?: {
+            value: true
+        }
+    }
+    setDefinition: (
+        definition: Partial<Definition>,
+        options?: SetDefinitionProps
+    ) => {
+        definition: Partial<Definition>
+        options: SetDefinitionProps
+    }
+    setDefinitionFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    setDefinitionMissing: () => {
+        value: true
+    }
+    setDefinitionSuccess: (
+        definition: Definition,
+        payload?: {
+            definition: Partial<Definition>
+            options: SetDefinitionProps
+        }
+    ) => {
+        definition: Definition
+        payload?: {
+            definition: Partial<Definition>
+            options: SetDefinitionProps
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface definitionLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        isEvent: (location: { hash: string; pathname: string; search: string }) => boolean
+        isProperty: (isEvent: boolean) => boolean
+        singular: (isEvent: boolean) => string
+        breadcrumbs: (definition: Definition, isEvent: boolean) => Breadcrumb[]
+    }
+}
+
+export type definitionLogicType = MakeLogicType<
+    definitionLogicValues,
+    definitionLogicActions,
+    DefinitionLogicProps,
+    definitionLogicMeta
+>
+
 export const definitionLogic = kea<definitionLogicType>([
     path(['scenes', 'data-management', 'definition', 'definitionViewLogic']),
     props({} as DefinitionLogicProps),
@@ -147,11 +434,11 @@ export const definitionLogic = kea<definitionLogicType>([
     })),
     selectors({
         isEvent: [() => [router.selectors.location], ({ pathname }) => pathname.includes(urls.eventDefinitions())],
-        isProperty: [(s) => [s.isEvent], (isEvent) => !isEvent],
-        singular: [(s) => [s.isEvent], (isEvent): string => (isEvent ? 'event' : 'property')],
+        isProperty: [(s) => [s.isEvent], (isEvent: boolean) => !isEvent],
+        singular: [(s) => [s.isEvent], (isEvent: boolean): string => (isEvent ? 'event' : 'property')],
         breadcrumbs: [
             (s) => [s.definition, s.isEvent],
-            (definition, isEvent): Breadcrumb[] => {
+            (definition: Definition, isEvent: boolean): Breadcrumb[] => {
                 return [
                     {
                         key: Scene.DataManagement,
diff --git a/frontend/src/scenes/data-management/definition/propertyAccessControlLogic.ts b/frontend/src/scenes/data-management/definition/propertyAccessControlLogic.ts
index 2cce9b601855..335a2eb9ef67 100644
--- a/frontend/src/scenes/data-management/definition/propertyAccessControlLogic.ts
+++ b/frontend/src/scenes/data-management/definition/propertyAccessControlLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { captureAccessControlEvent } from 'lib/utils/accessControlUtils'
@@ -15,8 +15,6 @@ import type {
     PropertyAccessControlStateApi,
 } from 'products/access_control/frontend/generated/api.schemas'
 
-import type { propertyAccessControlLogicType } from './propertyAccessControlLogicType'
-
 export interface PropertyAccessControlLogicProps {
     propertyDefinitionId: string
     teamId: number
@@ -30,6 +28,106 @@ export interface LocalAccessControlState {
     roleOverrides: Record<string, AccessLevelEnumApi | null>
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface propertyAccessControlLogicValues {
+    activeTab: string
+    allMembers: {
+        email: string
+        first_name: string
+        id: string
+        last_name: string
+    }[]
+    allRoles: {
+        id: string
+        members: any[]
+        name: string
+    }[]
+    defaultLevel: AccessLevelEnumApi
+    hasChanges: boolean
+    localState: LocalAccessControlState | null
+    memberOverrides: Record<string, AccessLevelEnumApi | null>
+    remoteState: PropertyAccessControlStateApi | null
+    remoteStateLoading: boolean
+    roleOverrides: Record<string, AccessLevelEnumApi | null>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface propertyAccessControlLogicActions {
+    loadRemoteState: () => any
+    loadRemoteStateFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRemoteStateSuccess: (
+        remoteState: PropertyAccessControlStateApi,
+        payload?: any
+    ) => {
+        remoteState: PropertyAccessControlStateApi
+        payload?: any
+    }
+    resetLocalState: () => {
+        value: true
+    }
+    saveAccessControls: () => {
+        value: true
+    }
+    setActiveTab: (tab: string) => {
+        tab: string
+    }
+    setLocalDefaultLevel: (level: AccessLevelEnumApi) => {
+        level: AccessLevelEnumApi
+    }
+    setLocalMemberOverride: (
+        memberId: string,
+        level: AccessLevelEnumApi | null
+    ) => {
+        level: AccessLevelEnumApi | null
+        memberId: string
+    }
+    setLocalRoleOverride: (
+        roleId: string,
+        level: AccessLevelEnumApi | null
+    ) => {
+        level: AccessLevelEnumApi | null
+        roleId: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface propertyAccessControlLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        defaultLevel: (localState: LocalAccessControlState | null) => AccessLevelEnumApi
+        memberOverrides: (localState: LocalAccessControlState | null) => Record<string, AccessLevelEnumApi | null>
+        roleOverrides: (localState: LocalAccessControlState | null) => Record<string, AccessLevelEnumApi | null>
+        allMembers: (members: import('../../../types').OrganizationMemberType[] | null) => {
+            email: string
+            first_name: string
+            id: string
+            last_name: string
+        }[]
+        allRoles: (roles: import('../../../types').RoleType[]) => {
+            id: string
+            members: any[]
+            name: string
+        }[]
+        hasChanges: (
+            localState: LocalAccessControlState | null,
+            remoteState: PropertyAccessControlStateApi | null
+        ) => boolean
+    }
+}
+
+export type propertyAccessControlLogicType = MakeLogicType<
+    propertyAccessControlLogicValues,
+    propertyAccessControlLogicActions,
+    PropertyAccessControlLogicProps,
+    propertyAccessControlLogicMeta
+>
+
 export const propertyAccessControlLogic = kea<propertyAccessControlLogicType>([
     path(['scenes', 'data-management', 'definition', 'propertyAccessControlLogic']),
     props({} as PropertyAccessControlLogicProps),
@@ -99,19 +197,24 @@ export const propertyAccessControlLogic = kea<propertyAccessControlLogicType>([
     selectors({
         defaultLevel: [
             (s) => [s.localState],
-            (localState): AccessLevelEnumApi => localState?.defaultLevel ?? 'read_write',
+            (localState: LocalAccessControlState | null): AccessLevelEnumApi =>
+                localState?.defaultLevel ?? 'read_write',
         ],
         memberOverrides: [
             (s) => [s.localState],
-            (localState): Record<string, AccessLevelEnumApi | null> => localState?.memberOverrides ?? {},
+            (localState: LocalAccessControlState | null): Record<string, AccessLevelEnumApi | null> =>
+                localState?.memberOverrides ?? {},
         ],
         roleOverrides: [
             (s) => [s.localState],
-            (localState): Record<string, AccessLevelEnumApi | null> => localState?.roleOverrides ?? {},
+            (localState: LocalAccessControlState | null): Record<string, AccessLevelEnumApi | null> =>
+                localState?.roleOverrides ?? {},
         ],
         allMembers: [
             () => [membersLogic.selectors.members],
-            (members): { id: string; first_name: string; last_name: string; email: string }[] =>
+            (
+                members: import('../../../types').OrganizationMemberType[] | null
+            ): { id: string; first_name: string; last_name: string; email: string }[] =>
                 (members ?? []).map((member: any) => ({
                     id: member.id,
                     first_name: member.user?.first_name ?? '',
@@ -121,7 +224,7 @@ export const propertyAccessControlLogic = kea<propertyAccessControlLogicType>([
         ],
         allRoles: [
             () => [rolesLogic.selectors.roles],
-            (roles): { id: string; name: string; members: any[] }[] =>
+            (roles: import('../../../types').RoleType[]): { id: string; name: string; members: any[] }[] =>
                 (roles ?? []).map((role: any) => ({
                     id: role.id,
                     name: role.name,
@@ -135,7 +238,10 @@ export const propertyAccessControlLogic = kea<propertyAccessControlLogicType>([
         ],
         hasChanges: [
             (s) => [s.localState, s.remoteState],
-            (localState, remoteState): boolean => {
+            (
+                localState: LocalAccessControlState | null,
+                remoteState: PropertyAccessControlStateApi | null
+            ): boolean => {
                 if (!localState || !remoteState) {
                     return false
                 }
diff --git a/frontend/src/scenes/data-management/events/eventDefinitionModalLogic.ts b/frontend/src/scenes/data-management/events/eventDefinitionModalLogic.ts
index bc5985e4794e..3daaeadf073a 100644
--- a/frontend/src/scenes/data-management/events/eventDefinitionModalLogic.ts
+++ b/frontend/src/scenes/data-management/events/eventDefinitionModalLogic.ts
@@ -1,5 +1,6 @@
-import { actions, kea, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, props, reducers } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 
@@ -10,8 +11,6 @@ import { urls } from 'scenes/urls'
 
 import { EventDefinition } from '~/types'
 
-import type { eventDefinitionModalLogicType } from './eventDefinitionModalLogicType'
-
 export interface EventDefinitionModalLogicProps {
     onClose: () => void
 }
@@ -23,6 +22,90 @@ export interface EventDefinitionFormType {
     tags?: string[]
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface eventDefinitionModalLogicValues {
+    eventDefinitionForm: EventDefinitionFormType
+    eventDefinitionFormAllErrors: Record<string, any>
+    eventDefinitionFormChanged: boolean
+    eventDefinitionFormErrors: DeepPartialMap<EventDefinitionFormType, ValidationErrorType>
+    eventDefinitionFormHasErrors: boolean
+    eventDefinitionFormManualErrors: Record<string, any>
+    eventDefinitionFormTouched: boolean
+    eventDefinitionFormTouches: Record<string, boolean>
+    eventDefinitionFormValidationErrors: DeepPartialMap<EventDefinitionFormType, ValidationErrorType>
+    existingEvent: EventDefinition | null
+    existingEventLoading: boolean
+    isEventDefinitionFormSubmitting: boolean
+    isEventDefinitionFormValid: boolean
+    showEventDefinitionFormErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface eventDefinitionModalLogicActions {
+    checkEventNameExists: (name: string) => {
+        name: string
+    }
+    checkEventNameExistsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    checkEventNameExistsSuccess: (
+        existingEvent: EventDefinition | null,
+        payload?: {
+            name: string
+        }
+    ) => {
+        existingEvent: EventDefinition | null
+        payload?: {
+            name: string
+        }
+    }
+    resetEventDefinitionForm: (values?: EventDefinitionFormType) => {
+        values?: EventDefinitionFormType
+    }
+    setEventDefinitionFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setEventDefinitionFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setEventDefinitionFormValues: (values: DeepPartial<EventDefinitionFormType>) => {
+        values: DeepPartial<EventDefinitionFormType>
+    }
+    submitEventDefinitionForm: () => {
+        value: boolean
+    }
+    submitEventDefinitionFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitEventDefinitionFormRequest: (eventDefinitionForm: EventDefinitionFormType) => {
+        eventDefinitionForm: EventDefinitionFormType
+    }
+    submitEventDefinitionFormSuccess: (eventDefinitionForm: EventDefinitionFormType) => {
+        eventDefinitionForm: EventDefinitionFormType
+    }
+    touchEventDefinitionFormField: (key: string) => {
+        key: string
+    }
+}
+
+export type eventDefinitionModalLogicType = MakeLogicType<
+    eventDefinitionModalLogicValues,
+    eventDefinitionModalLogicActions,
+    EventDefinitionModalLogicProps
+>
+
 export const eventDefinitionModalLogic = kea<eventDefinitionModalLogicType>([
     path(['scenes', 'data-management', 'events', 'eventDefinitionModalLogic']),
     props({} as EventDefinitionModalLogicProps),
diff --git a/frontend/src/scenes/data-management/events/eventDefinitionSchemaLogic.ts b/frontend/src/scenes/data-management/events/eventDefinitionSchemaLogic.ts
index 9c21999c665c..a82b207882ac 100644
--- a/frontend/src/scenes/data-management/events/eventDefinitionSchemaLogic.ts
+++ b/frontend/src/scenes/data-management/events/eventDefinitionSchemaLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -6,9 +6,10 @@ import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
 
 import { EventDefinition, SchemaEnforcementMode } from '~/types'
 
+import type { Definition } from '../../../types'
 import { definitionLogic } from '../definition/definitionLogic'
+import type { SetDefinitionProps } from '../definition/definitionLogic'
 import { type SchemaPropertyGroup, schemaManagementLogic } from '../schema/schemaManagementLogic'
-import type { eventDefinitionSchemaLogicType } from './eventDefinitionSchemaLogicType'
 
 export type { SchemaPropertyGroup }
 
@@ -60,6 +61,112 @@ export interface EventDefinitionSchemaLogicProps {
     eventDefinitionId: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface eventDefinitionSchemaLogicValues {
+    definition: Definition // definitionLogic
+    allPropertyGroups: SchemaPropertyGroup[]
+    allPropertyGroupsLoading: boolean
+    availablePropertyGroups: SchemaPropertyGroup[]
+    eventSchemas: EventSchema[]
+    eventSchemasLoading: boolean
+    schemaEnforcementMode: SchemaEnforcementMode
+    schemaEnforcementModeUpdating: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface eventDefinitionSchemaLogicActions {
+    setDefinition: (
+        definition: Partial<Definition>,
+        options?: SetDefinitionProps | undefined
+    ) => {
+        definition: Partial<Definition>
+        options: SetDefinitionProps
+    } // definitionLogic
+    createPropertyGroupSuccess: (
+        propertyGroups: any[],
+        payload?: Partial<SchemaPropertyGroup> | undefined
+    ) => {
+        payload?: Partial<SchemaPropertyGroup>
+        propertyGroups: any[]
+    } // schemaManagementLogic
+    updatePropertyGroupSuccess: (
+        propertyGroups: any[],
+        payload?:
+            | {
+                  data: Partial<SchemaPropertyGroup>
+                  id: string
+              }
+            | undefined
+    ) => {
+        payload?: {
+            data: Partial<SchemaPropertyGroup>
+            id: string
+        }
+        propertyGroups: any[]
+    } // schemaManagementLogic
+    addPropertyGroup: (propertyGroupId: string) => {
+        propertyGroupId: string
+    }
+    loadAllPropertyGroups: () => any
+    loadAllPropertyGroupsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAllPropertyGroupsSuccess: (
+        allPropertyGroups: SchemaPropertyGroup[],
+        payload?: any
+    ) => {
+        allPropertyGroups: SchemaPropertyGroup[]
+        payload?: any
+    }
+    loadEventSchemas: () => any
+    loadEventSchemasFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadEventSchemasSuccess: (
+        eventSchemas: EventSchema[],
+        payload?: any
+    ) => {
+        eventSchemas: EventSchema[]
+        payload?: any
+    }
+    removePropertyGroup: (eventSchemaId: string) => {
+        eventSchemaId: string
+    }
+    setSchemaEnforcementModeUpdating: (updating: boolean) => {
+        updating: boolean
+    }
+    updateSchemaEnforcementMode: (mode: SchemaEnforcementMode) => {
+        mode: SchemaEnforcementMode
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface eventDefinitionSchemaLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        schemaEnforcementMode: (definition: Definition) => SchemaEnforcementMode
+        availablePropertyGroups: (
+            allPropertyGroups: SchemaPropertyGroup[],
+            eventSchemas: EventSchema[]
+        ) => SchemaPropertyGroup[]
+    }
+}
+
+export type eventDefinitionSchemaLogicType = MakeLogicType<
+    eventDefinitionSchemaLogicValues,
+    eventDefinitionSchemaLogicActions,
+    EventDefinitionSchemaLogicProps,
+    eventDefinitionSchemaLogicMeta
+>
+
 export const eventDefinitionSchemaLogic = kea<eventDefinitionSchemaLogicType>([
     path(['scenes', 'data-management', 'events', 'eventDefinitionSchemaLogic']),
     props({} as EventDefinitionSchemaLogicProps),
@@ -113,7 +220,7 @@ export const eventDefinitionSchemaLogic = kea<eventDefinitionSchemaLogicType>([
     selectors({
         schemaEnforcementMode: [
             (s) => [s.definition],
-            (definition): SchemaEnforcementMode =>
+            (definition: import('~/types').Definition): SchemaEnforcementMode =>
                 (definition as EventDefinition).enforcement_mode ?? SchemaEnforcementMode.Allow,
         ],
         availablePropertyGroups: [
diff --git a/frontend/src/scenes/data-management/events/eventDefinitionsTableLogic.ts b/frontend/src/scenes/data-management/events/eventDefinitionsTableLogic.ts
index 42678bcdbf60..9b400a1eaa5a 100644
--- a/frontend/src/scenes/data-management/events/eventDefinitionsTableLogic.ts
+++ b/frontend/src/scenes/data-management/events/eventDefinitionsTableLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, combineUrl, router, urlToAction } from 'kea-router'
 
@@ -11,8 +11,6 @@ import { parseTagsFilter } from 'lib/utils/url'
 
 import { AnyPropertyFilter, EventDefinition, EventDefinitionType, PropertyDefinition } from '~/types'
 
-import type { eventDefinitionsTableLogicType } from './eventDefinitionsTableLogicType'
-
 export interface EventDefinitionsPaginatedResponse extends PaginatedResponse<EventDefinition> {
     current?: string
     count?: number
@@ -91,6 +89,182 @@ export interface EventDefinitionsTableLogicProps {
     key: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface eventDefinitionsTableLogicValues {
+    eventDefinitionPropertiesLoading: string[]
+    eventDefinitions: EventDefinitionsPaginatedResponse
+    eventDefinitionsLoading: boolean
+    eventPropertiesCacheMap: Record<string, PropertyDefinitionsPaginatedResponse>
+    eventPropertiesCacheMapLoading: boolean
+    filters: Filters
+    paramsFromFilters: Record<string, any>
+    showVerifiedFilter: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface eventDefinitionsTableLogicActions {
+    applyBulkTagUpdates: (
+        updates: {
+            id: number | string
+            tags: string[]
+        }[]
+    ) => {
+        updates: {
+            id: number | string
+            tags: string[]
+        }[]
+    }
+    applyBulkTagUpdatesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    applyBulkTagUpdatesSuccess: (
+        eventDefinitions: EventDefinitionsPaginatedResponse,
+        payload?: {
+            updates: {
+                id: number | string
+                tags: string[]
+            }[]
+        }
+    ) => {
+        eventDefinitions: EventDefinitionsPaginatedResponse
+        payload?: {
+            updates: {
+                id: number | string
+                tags: string[]
+            }[]
+        }
+    }
+    loadEventDefinitions: (url?: string | null) => {
+        url: string | null
+    }
+    loadEventDefinitionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadEventDefinitionsSuccess: (
+        eventDefinitions: EventDefinitionsPaginatedResponse,
+        payload?: {
+            url: string | null
+        }
+    ) => {
+        eventDefinitions: EventDefinitionsPaginatedResponse
+        payload?: {
+            url: string | null
+        }
+    }
+    loadEventExample: (definition: EventDefinition) => {
+        definition: EventDefinition
+    }
+    loadPropertiesForEvent: (
+        definition: EventDefinition,
+        url?: string | null
+    ) => {
+        definition: EventDefinition
+        url: string | null
+    }
+    loadPropertiesForEventFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPropertiesForEventSuccess: (
+        eventPropertiesCacheMap: {
+            [x: string]: any
+        },
+        payload?: {
+            definition: EventDefinition
+            url: string | null
+        }
+    ) => {
+        eventPropertiesCacheMap: {
+            [x: string]: any
+        }
+        payload?: {
+            definition: EventDefinition
+            url: string | null
+        }
+    }
+    setEventDefinitionPropertiesLoading: (ids: string[]) => {
+        ids: string[]
+    }
+    setFilters: (filters: Partial<Filters>) => {
+        filters: Partial<Filters>
+    }
+    setLocalEventDefinition: (definition: EventDefinition) => {
+        definition: EventDefinition
+    }
+    setLocalEventDefinitionFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    setLocalEventDefinitionSuccess: (
+        eventDefinitions: EventDefinitionsPaginatedResponse,
+        payload?: {
+            definition: EventDefinition
+        }
+    ) => {
+        eventDefinitions: EventDefinitionsPaginatedResponse
+        payload?: {
+            definition: EventDefinition
+        }
+    }
+    setLocalPropertyDefinition: (
+        event: EventDefinition,
+        definition: PropertyDefinition
+    ) => {
+        definition: PropertyDefinition
+        event: EventDefinition
+    }
+    setLocalPropertyDefinitionFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    setLocalPropertyDefinitionSuccess: (
+        eventPropertiesCacheMap: Record<string, PropertyDefinitionsPaginatedResponse>,
+        payload?: {
+            definition: PropertyDefinition
+            event: EventDefinition
+        }
+    ) => {
+        eventPropertiesCacheMap: Record<string, PropertyDefinitionsPaginatedResponse>
+        payload?: {
+            definition: PropertyDefinition
+            event: EventDefinition
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface eventDefinitionsTableLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        showVerifiedFilter: (eventDefinitions: EventDefinitionsPaginatedResponse, filters: Filters) => boolean
+        paramsFromFilters: (filters: Filters) => Record<string, any>
+    }
+}
+
+export type eventDefinitionsTableLogicType = MakeLogicType<
+    eventDefinitionsTableLogicValues,
+    eventDefinitionsTableLogicActions,
+    EventDefinitionsTableLogicProps,
+    eventDefinitionsTableLogicMeta
+>
+
 export const eventDefinitionsTableLogic = kea<eventDefinitionsTableLogicType>([
     path((key) => ['scenes', 'data-management', 'events', 'eventDefinitionsTableLogic', key]),
     props({} as EventDefinitionsTableLogicProps),
diff --git a/frontend/src/scenes/data-management/events/eventExperimentsLogic.ts b/frontend/src/scenes/data-management/events/eventExperimentsLogic.ts
index db207f258a9b..c74a99338215 100644
--- a/frontend/src/scenes/data-management/events/eventExperimentsLogic.ts
+++ b/frontend/src/scenes/data-management/events/eventExperimentsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { teamLogic } from 'scenes/teamLogic'
@@ -9,8 +9,6 @@ import type {
     PaginatedExperimentBasicListApi,
 } from 'products/experiments/frontend/generated/api.schemas'
 
-import type { eventExperimentsLogicType } from './eventExperimentsLogicType'
-
 export interface EventExperimentsLogicProps {
     event: string
 }
@@ -19,6 +17,48 @@ export const EXPERIMENTS_PER_PAGE = 10
 
 const EMPTY_RESULT: PaginatedExperimentBasicListApi = { count: 0, next: null, previous: null, results: [] }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface eventExperimentsLogicValues {
+    currentProjectId: number | string // teamLogic
+    experiments: PaginatedExperimentBasicListApi
+    experimentsLoading: boolean
+    page: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface eventExperimentsLogicActions {
+    loadExperiments: () => any
+    loadExperimentsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadExperimentsSuccess: (
+        experiments: PaginatedExperimentBasicListApi,
+        payload?: any
+    ) => {
+        experiments: PaginatedExperimentBasicListApi
+        payload?: any
+    }
+    setPage: (page: number) => {
+        page: number
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface eventExperimentsLogicMeta {
+    key: string
+}
+
+export type eventExperimentsLogicType = MakeLogicType<
+    eventExperimentsLogicValues,
+    eventExperimentsLogicActions,
+    EventExperimentsLogicProps,
+    eventExperimentsLogicMeta
+>
+
 export const eventExperimentsLogic = kea<eventExperimentsLogicType>([
     path(['scenes', 'data-management', 'events', 'eventExperimentsLogic']),
     props({} as EventExperimentsLogicProps),
diff --git a/frontend/src/scenes/data-management/events/eventInsightsLogic.ts b/frontend/src/scenes/data-management/events/eventInsightsLogic.ts
index bc723f7808ff..e888575cdf7f 100644
--- a/frontend/src/scenes/data-management/events/eventInsightsLogic.ts
+++ b/frontend/src/scenes/data-management/events/eventInsightsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -11,14 +11,75 @@ import { teamLogic } from 'scenes/teamLogic'
 
 import { getQueryBasedInsightModel } from '~/queries/nodes/InsightViz/utils'
 
-import type { eventInsightsLogicType } from './eventInsightsLogicType'
-
 export interface EventInsightsLogicProps {
     event: string
 }
 
 export const INSIGHTS_PER_PAGE = 10
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface eventInsightsLogicValues {
+    currentTeamId: number | null // teamLogic
+    count: number
+    filters: SavedInsightFilters
+    insights: InsightsResult
+    insightsLoading: boolean
+    page: number
+    rawFilters: Partial<SavedInsightFilters> | null
+    sorting: Sorting | null
+    usingFilters: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface eventInsightsLogicActions {
+    loadInsights: () => {
+        value: true
+    }
+    loadInsightsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadInsightsSuccess: (
+        insights: InsightsResult,
+        payload?: {
+            value: true
+        }
+    ) => {
+        insights: InsightsResult
+        payload?: {
+            value: true
+        }
+    }
+    setFilters: (filters: Partial<SavedInsightFilters>) => {
+        filters: Partial<SavedInsightFilters>
+    }
+    setPage: (page: number) => {
+        page: number
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface eventInsightsLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        filters: (rawFilters: Partial<SavedInsightFilters> | null) => SavedInsightFilters
+        count: (insights: InsightsResult) => number
+        sorting: (filters: SavedInsightFilters) => Sorting | null
+        page: (filters: SavedInsightFilters) => number
+        usingFilters: (filters: SavedInsightFilters) => boolean
+    }
+}
+
+export type eventInsightsLogicType = MakeLogicType<
+    eventInsightsLogicValues,
+    eventInsightsLogicActions,
+    EventInsightsLogicProps,
+    eventInsightsLogicMeta
+>
+
 export const eventInsightsLogic = kea<eventInsightsLogicType>([
     path(['scenes', 'data-management', 'events', 'eventInsightsLogic']),
     props({} as EventInsightsLogicProps),
@@ -79,20 +140,21 @@ export const eventInsightsLogic = kea<eventInsightsLogicType>([
     }),
     selectors({
         filters: [(s) => [s.rawFilters], (rawFilters: object): SavedInsightFilters => cleanFilters(rawFilters || {})],
-        count: [(s) => [s.insights], (insights) => insights.count],
+        count: [(s) => [s.insights], (insights: InsightsResult) => insights.count],
         sorting: [
             (s) => [s.filters],
-            (filters): Sorting | null =>
+            (filters: SavedInsightFilters): Sorting | null =>
                 filters.order
                     ? filters.order.startsWith('-')
                         ? { columnKey: filters.order.slice(1), order: -1 }
                         : { columnKey: filters.order, order: 1 }
                     : null,
         ],
-        page: [(s) => [s.filters], (filters) => filters.page],
+        page: [(s) => [s.filters], (filters: SavedInsightFilters) => filters.page],
         usingFilters: [
             (s) => [s.filters],
-            (filters) => !objectsEqual(cleanFilters({ ...filters, events: undefined }), cleanFilters({})),
+            (filters: SavedInsightFilters) =>
+                !objectsEqual(cleanFilters({ ...filters, events: undefined }), cleanFilters({})),
         ],
     }),
     listeners(({ actions, values, selectors }) => ({
diff --git a/frontend/src/scenes/data-management/ingestion-warnings-v2/ingestionWarningsV2Logic.ts b/frontend/src/scenes/data-management/ingestion-warnings-v2/ingestionWarningsV2Logic.ts
index 3154f2eb42a9..fe32d10178d1 100644
--- a/frontend/src/scenes/data-management/ingestion-warnings-v2/ingestionWarningsV2Logic.ts
+++ b/frontend/src/scenes/data-management/ingestion-warnings-v2/ingestionWarningsV2Logic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 
@@ -10,7 +10,6 @@ import { projectLogic } from 'scenes/projectLogic'
 import { urls } from 'scenes/urls'
 
 import { teamLogic } from '../../teamLogic'
-import type { ingestionWarningsV2LogicType } from './ingestionWarningsV2LogicType'
 
 // No generated types for this endpoint yet: it is attributed to `data_management`,
 // which has no products/ frontend module, so these mirror IngestionWarningsV2SummarySerializer.
@@ -105,6 +104,68 @@ function paramsFromFilters(filters: IngestionWarningsFilters): Record<string, an
     return searchParams
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface ingestionWarningsV2LogicValues {
+    currentProjectId: number | null // projectLogic
+    timezone: string // teamLogic
+    bucketLabels: string[]
+    filters: IngestionWarningsFilters
+    hasActiveFilters: boolean
+    showProductIntro: boolean
+    summaryDatasets: Record<string, number[]>
+    summaryStats: IngestionWarningsSummaryStats
+    warnings: IngestionWarningV2Summary[]
+    warningsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface ingestionWarningsV2LogicActions {
+    loadWarnings: (_: void) => void
+    loadWarningsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadWarningsSuccess: (
+        warnings: IngestionWarningV2Summary[],
+        payload?: void
+    ) => {
+        warnings: IngestionWarningV2Summary[]
+        payload?: void
+    }
+    setFilters: (filters: Partial<IngestionWarningsFilters>) => {
+        filters: Partial<IngestionWarningsFilters>
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface ingestionWarningsV2LogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        bucketLabels: (filters: IngestionWarningsFilters) => string[]
+        summaryDatasets: (
+            warnings: IngestionWarningV2Summary[],
+            filters: IngestionWarningsFilters,
+            timezone: string
+        ) => Record<string, number[]>
+        summaryStats: (warnings: IngestionWarningV2Summary[]) => IngestionWarningsSummaryStats
+        hasActiveFilters: (filters: IngestionWarningsFilters) => boolean
+        showProductIntro: (
+            warnings: IngestionWarningV2Summary[],
+            warningsLoading: boolean,
+            hasActiveFilters: boolean
+        ) => boolean
+    }
+}
+
+export type ingestionWarningsV2LogicType = MakeLogicType<
+    ingestionWarningsV2LogicValues,
+    ingestionWarningsV2LogicActions,
+    Record<string, any>,
+    ingestionWarningsV2LogicMeta
+>
+
 export const ingestionWarningsV2Logic = kea<ingestionWarningsV2LogicType>([
     path(['scenes', 'data-management', 'ingestion-warnings-v2', 'ingestionWarningsV2Logic']),
 
diff --git a/frontend/src/scenes/data-management/ingestion-warnings/ingestionWarningsLogic.ts b/frontend/src/scenes/data-management/ingestion-warnings/ingestionWarningsLogic.ts
index 2fb8a070b889..2f25a700086f 100644
--- a/frontend/src/scenes/data-management/ingestion-warnings/ingestionWarningsLogic.ts
+++ b/frontend/src/scenes/data-management/ingestion-warnings/ingestionWarningsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -12,7 +12,6 @@ import { Breadcrumb } from '~/types'
 
 import { teamLogic } from '../../teamLogic'
 import { DataManagementTab } from '../DataManagementScene'
-import type { ingestionWarningsLogicType } from './ingestionWarningsLogicType'
 
 export interface IngestionWarningSummary {
     type: string
@@ -29,6 +28,56 @@ export interface IngestionWarning {
     details: Record<string, any>
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface ingestionWarningsLogicValues {
+    currentProjectId: number | null // projectLogic
+    timezone: string // teamLogic
+    breadcrumbs: Breadcrumb[]
+    data: IngestionWarningSummary[]
+    dataLoading: boolean
+    dates: string[]
+    searchQuery: string
+    showProductIntro: boolean
+    summaryDatasets: Record<string, number[]>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface ingestionWarningsLogicActions {
+    loadData: () => any
+    loadDataFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadDataSuccess: (
+        data: IngestionWarningSummary[],
+        payload?: any
+    ) => {
+        data: IngestionWarningSummary[]
+        payload?: any
+    }
+    setSearchQuery: (search: string) => {
+        search: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface ingestionWarningsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        summaryDatasets: (data: IngestionWarningSummary[], timezone: string) => Record<string, number[]>
+        showProductIntro: (data: IngestionWarningSummary[], dataLoading: boolean, searchQuery: string) => boolean
+    }
+}
+
+export type ingestionWarningsLogicType = MakeLogicType<
+    ingestionWarningsLogicValues,
+    ingestionWarningsLogicActions,
+    Record<string, any>,
+    ingestionWarningsLogicMeta
+>
+
 export const ingestionWarningsLogic = kea<ingestionWarningsLogicType>([
     path(['scenes', 'data-management', 'ingestion-warnings', 'ingestionWarningsLogic']),
 
@@ -95,7 +144,7 @@ export const ingestionWarningsLogic = kea<ingestionWarningsLogicType>([
             (data: IngestionWarningSummary[], timezone: string): Record<string, number[]> => {
                 const summaryDatasets: Record<string, number[]> = {}
                 data.forEach((summary) => {
-                    const result = new Array(30).fill(0)
+                    const result = Array<number>(30).fill(0)
                     for (const spark of summary.sparkline) {
                         const date = dayjsUtcToTimezone(spark[1], timezone)
                         const dayIndex = dayjs().diff(date, 'days')
@@ -108,7 +157,7 @@ export const ingestionWarningsLogic = kea<ingestionWarningsLogicType>([
         ],
         showProductIntro: [
             (s) => [s.data, s.dataLoading, s.searchQuery],
-            (data: IngestionWarningSummary[], dataLoading: boolean, searchQuery) =>
+            (data: IngestionWarningSummary[], dataLoading: boolean, searchQuery: string) =>
                 data.length === 0 && !dataLoading && !searchQuery.trim().length,
         ],
     }),
diff --git a/frontend/src/scenes/data-management/managed-viewsets/dataWarehouseManagedViewsetsLogic.ts b/frontend/src/scenes/data-management/managed-viewsets/dataWarehouseManagedViewsetsLogic.ts
index a83708d01b65..abd279da56e7 100644
--- a/frontend/src/scenes/data-management/managed-viewsets/dataWarehouseManagedViewsetsLogic.ts
+++ b/frontend/src/scenes/data-management/managed-viewsets/dataWarehouseManagedViewsetsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, path, props, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -7,7 +7,7 @@ import { teamLogic } from 'scenes/teamLogic'
 
 import { DataWarehouseManagedViewsetKind } from '~/queries/schema/schema-general'
 
-import type { dataWarehouseManagedViewsetsLogicType } from './dataWarehouseManagedViewsetsLogicType'
+import type { TeamPublicType, TeamType } from '../../../types'
 import {
     DisableDataWarehouseManagedViewsetModalLogicProps,
     disableDataWarehouseManagedViewsetModalLogic,
@@ -17,6 +17,61 @@ export interface DataWarehouseManagedViewsetsLogicProps {
     type: DisableDataWarehouseManagedViewsetModalLogicProps['type']
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataWarehouseManagedViewsetsLogicValues {
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    toggleResult: void | null
+    toggleResultLoading: boolean
+    togglingViewset: DataWarehouseManagedViewsetKind | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataWarehouseManagedViewsetsLogicActions {
+    openModal: (kind: 'revenue_analytics') => {
+        kind: 'revenue_analytics'
+    } // disableDataWarehouseManagedViewsetModalLogic
+    loadCurrentTeam: () => any // teamLogic
+    toggleViewset: (
+        kind: DataWarehouseManagedViewsetKind,
+        enabled: boolean
+    ) => {
+        enabled: boolean
+        kind: 'revenue_analytics'
+    }
+    toggleViewsetFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    toggleViewsetSuccess: (
+        toggleResult: void,
+        payload?: {
+            enabled: boolean
+            kind: 'revenue_analytics'
+        }
+    ) => {
+        toggleResult: void
+        payload?: {
+            enabled: boolean
+            kind: 'revenue_analytics'
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataWarehouseManagedViewsetsLogicMeta {
+    key: string
+}
+
+export type dataWarehouseManagedViewsetsLogicType = MakeLogicType<
+    dataWarehouseManagedViewsetsLogicValues,
+    dataWarehouseManagedViewsetsLogicActions,
+    DataWarehouseManagedViewsetsLogicProps,
+    dataWarehouseManagedViewsetsLogicMeta
+>
+
 export const dataWarehouseManagedViewsetsLogic = kea<dataWarehouseManagedViewsetsLogicType>([
     props({ type: 'root' } as DataWarehouseManagedViewsetsLogicProps),
     key(({ type }) => `dataWarehouseManagedViewsetsLogic-${type}`),
diff --git a/frontend/src/scenes/data-management/managed-viewsets/disableDataWarehouseManagedViewsetModalLogic.ts b/frontend/src/scenes/data-management/managed-viewsets/disableDataWarehouseManagedViewsetModalLogic.ts
index 4aa75bbdd08c..93e9740ad2cb 100644
--- a/frontend/src/scenes/data-management/managed-viewsets/disableDataWarehouseManagedViewsetModalLogic.ts
+++ b/frontend/src/scenes/data-management/managed-viewsets/disableDataWarehouseManagedViewsetModalLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, key, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, kea, key, path, props, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -6,8 +6,6 @@ import api from 'lib/api'
 import { DataWarehouseManagedViewsetKind } from '~/queries/schema/schema-general'
 import { DataWarehouseManagedViewsetSavedQuery } from '~/types'
 
-import type { disableDataWarehouseManagedViewsetModalLogicType } from './disableDataWarehouseManagedViewsetModalLogicType'
-
 export const VIEWSET_TITLES: Record<DataWarehouseManagedViewsetKind, string> = {
     revenue_analytics: 'Revenue analytics',
 }
@@ -16,6 +14,62 @@ export interface DisableDataWarehouseManagedViewsetModalLogicProps {
     type: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface disableDataWarehouseManagedViewsetModalLogicValues {
+    confirmationInput: string
+    isDeleting: boolean
+    isOpen: boolean
+    kind: DataWarehouseManagedViewsetKind | null
+    views: DataWarehouseManagedViewsetSavedQuery[]
+    viewsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface disableDataWarehouseManagedViewsetModalLogicActions {
+    closeModal: () => {
+        value: true
+    }
+    openModal: (kind: DataWarehouseManagedViewsetKind) => {
+        kind: 'revenue_analytics'
+    }
+    openModalFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    openModalSuccess: (
+        views: DataWarehouseManagedViewsetSavedQuery[],
+        payload?: {
+            kind: 'revenue_analytics'
+        }
+    ) => {
+        views: DataWarehouseManagedViewsetSavedQuery[]
+        payload?: {
+            kind: 'revenue_analytics'
+        }
+    }
+    setConfirmationInput: (confirmationInput: string) => {
+        confirmationInput: string
+    }
+    setIsDeleting: (isDeleting: boolean) => {
+        isDeleting: boolean
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface disableDataWarehouseManagedViewsetModalLogicMeta {
+    key: string
+}
+
+export type disableDataWarehouseManagedViewsetModalLogicType = MakeLogicType<
+    disableDataWarehouseManagedViewsetModalLogicValues,
+    disableDataWarehouseManagedViewsetModalLogicActions,
+    DisableDataWarehouseManagedViewsetModalLogicProps,
+    disableDataWarehouseManagedViewsetModalLogicMeta
+>
+
 export const disableDataWarehouseManagedViewsetModalLogic = kea<disableDataWarehouseManagedViewsetModalLogicType>([
     props({ type: 'root' } as DisableDataWarehouseManagedViewsetModalLogicProps),
     key(({ type }) => `disableDataWarehouseManagedViewsetModalLogic-${type}`),
diff --git a/frontend/src/scenes/data-management/properties/propertyDefinitionsTableLogic.ts b/frontend/src/scenes/data-management/properties/propertyDefinitionsTableLogic.ts
index ca89eabf364e..49f8db5cd73a 100644
--- a/frontend/src/scenes/data-management/properties/propertyDefinitionsTableLogic.ts
+++ b/frontend/src/scenes/data-management/properties/propertyDefinitionsTableLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, combineUrl, router, urlToAction } from 'kea-router'
 
@@ -17,7 +17,8 @@ import { urls } from 'scenes/urls'
 import { PropertyDefinition } from '~/types'
 
 import { groupsModel } from '../../../models/groupsModel'
-import type { propertyDefinitionsTableLogicType } from './propertyDefinitionsTableLogicType'
+import type { Noun } from '../../../models/groupsModel'
+import type { GroupType, GroupTypeIndex } from '../../../types'
 
 export interface Filters {
     property: string
@@ -49,6 +50,95 @@ export interface PropertyDefinitionsTableLogicProps {
     key: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface propertyDefinitionsTableLogicValues {
+    aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun // groupsModel
+    groupTypes: Map<GroupTypeIndex, GroupType> // groupsModel
+    filters: Filters
+    hoveredDefinition: string | null
+    propertyDefinitions: PropertyDefinitionsPaginatedResponse
+    propertyDefinitionsLoading: boolean
+    propertyTypeOptions: LemonSelectOption<string>[]
+    showVerifiedFilter: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface propertyDefinitionsTableLogicActions {
+    loadPropertyDefinitions: (url?: string | null) => {
+        url: string | null
+    }
+    loadPropertyDefinitionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPropertyDefinitionsSuccess: (
+        propertyDefinitions: PropertyDefinitionsPaginatedResponse,
+        payload?: {
+            url: string | null
+        }
+    ) => {
+        propertyDefinitions: PropertyDefinitionsPaginatedResponse
+        payload?: {
+            url: string | null
+        }
+    }
+    setFilters: (filters: Partial<Filters>) => {
+        filters: Partial<Filters>
+    }
+    setHoveredDefinition: (definitionKey: string | null) => {
+        definitionKey: string | null
+    }
+    setLocalPropertyDefinition: (definition: PropertyDefinition) => {
+        definition: PropertyDefinition
+    }
+    setLocalPropertyDefinitionFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    setLocalPropertyDefinitionSuccess: (
+        propertyDefinitions: PropertyDefinitionsPaginatedResponse,
+        payload?: {
+            definition: PropertyDefinition
+        }
+    ) => {
+        propertyDefinitions: PropertyDefinitionsPaginatedResponse
+        payload?: {
+            definition: PropertyDefinition
+        }
+    }
+    setOpenedDefinition: (id: string | null) => {
+        id: string | null
+    }
+    setPropertyType: (propertyType: string) => {
+        propertyType: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface propertyDefinitionsTableLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        propertyTypeOptions: (
+            groupTypes: Map<GroupTypeIndex, GroupType>,
+            aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun
+        ) => LemonSelectOption<string>[]
+        showVerifiedFilter: (propertyDefinitions: PropertyDefinitionsPaginatedResponse) => boolean
+    }
+}
+
+export type propertyDefinitionsTableLogicType = MakeLogicType<
+    propertyDefinitionsTableLogicValues,
+    propertyDefinitionsTableLogicActions,
+    PropertyDefinitionsTableLogicProps,
+    propertyDefinitionsTableLogicMeta
+>
+
 export const propertyDefinitionsTableLogic = kea<propertyDefinitionsTableLogicType>([
     path(['scenes', 'data-management', 'properties', 'propertyDefinitionsTableLogic']),
     props({} as PropertyDefinitionsTableLogicProps),
@@ -89,7 +179,13 @@ export const propertyDefinitionsTableLogic = kea<propertyDefinitionsTableLogicTy
     selectors({
         propertyTypeOptions: [
             (s) => [s.groupTypes, s.aggregationLabel],
-            (groupTypes, aggregationLabel) => {
+            (
+                groupTypes: Map<import('~/types').GroupTypeIndex, import('~/types').GroupType>,
+                aggregationLabel: (
+                    groupTypeIndex: number | null | undefined,
+                    deferToUserWording?: boolean
+                ) => import('../../../models/groupsModel').Noun
+            ) => {
                 const groupChoices: Array<LemonSelectOption<string>> = Array.from(groupTypes.values()).map((type) => ({
                     label: `${capitalizeFirstLetter(aggregationLabel(type.group_type_index).singular)} properties`,
                     value: `group::${type.group_type_index}`,
diff --git a/frontend/src/scenes/data-management/schema/schemaManagementLogic.ts b/frontend/src/scenes/data-management/schema/schemaManagementLogic.ts
index 265364499790..42e3b75af066 100644
--- a/frontend/src/scenes/data-management/schema/schemaManagementLogic.ts
+++ b/frontend/src/scenes/data-management/schema/schemaManagementLogic.ts
@@ -1,13 +1,12 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
 import { lemonToast } from 'lib/lemon-ui/LemonToast'
 import { teamLogic } from 'scenes/teamLogic'
 
-import type { schemaManagementLogicType } from './schemaManagementLogicType'
-
 export type PropertyType = 'String' | 'Numeric' | 'Boolean' | 'DateTime' | 'Object'
 
 export const MAX_PROPERTY_NAME_LENGTH = 200
@@ -98,6 +97,164 @@ export interface PropertyGroupFormType {
     properties: SchemaPropertyGroupProperty[]
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface schemaManagementLogicValues {
+    currentProjectId: number | string // teamLogic
+    editingPropertyGroup: SchemaPropertyGroup | null
+    filteredPropertyGroups: SchemaPropertyGroup[]
+    isPropertyGroupFormSubmitting: boolean
+    isPropertyGroupFormValid: boolean
+    propertyGroupForm: PropertyGroupFormType
+    propertyGroupFormAllErrors: Record<string, any>
+    propertyGroupFormChanged: boolean
+    propertyGroupFormErrors: DeepPartialMap<PropertyGroupFormType, ValidationErrorType>
+    propertyGroupFormHasErrors: boolean
+    propertyGroupFormManualErrors: Record<string, any>
+    propertyGroupFormTouched: boolean
+    propertyGroupFormTouches: Record<string, boolean>
+    propertyGroupFormValidationError: string | null
+    propertyGroupFormValidationErrors: DeepPartialMap<PropertyGroupFormType, ValidationErrorType>
+    propertyGroupModalOpen: boolean
+    propertyGroups: SchemaPropertyGroup[]
+    propertyGroupsLoading: boolean
+    searchTerm: string
+    showPropertyGroupFormErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface schemaManagementLogicActions {
+    addPropertyToForm: () => {
+        value: true
+    }
+    createPropertyGroup: (data: Partial<SchemaPropertyGroup>) => Partial<SchemaPropertyGroup>
+    createPropertyGroupFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    createPropertyGroupSuccess: (
+        propertyGroups: any[],
+        payload?: Partial<SchemaPropertyGroup>
+    ) => {
+        propertyGroups: any[]
+        payload?: Partial<SchemaPropertyGroup>
+    }
+    deletePropertyGroup: (id: string) => {
+        id: string
+    }
+    loadPropertyGroups: () => any
+    loadPropertyGroupsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPropertyGroupsSuccess: (
+        propertyGroups: SchemaPropertyGroup[],
+        payload?: any
+    ) => {
+        propertyGroups: SchemaPropertyGroup[]
+        payload?: any
+    }
+    removePropertyFromForm: (index: number) => {
+        index: number
+    }
+    resetPropertyGroupForm: (values?: PropertyGroupFormType) => {
+        values?: PropertyGroupFormType
+    }
+    setEditingPropertyGroup: (propertyGroup: SchemaPropertyGroup | null) => {
+        propertyGroup: SchemaPropertyGroup | null
+    }
+    setPropertyGroupFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setPropertyGroupFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setPropertyGroupFormValues: (values: DeepPartial<PropertyGroupFormType>) => {
+        values: DeepPartial<PropertyGroupFormType>
+    }
+    setPropertyGroupModalOpen: (open: boolean) => {
+        open: boolean
+    }
+    setSearchTerm: (searchTerm: string) => {
+        searchTerm: string
+    }
+    submitPropertyGroupForm: () => {
+        value: boolean
+    }
+    submitPropertyGroupFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitPropertyGroupFormRequest: (propertyGroupForm: PropertyGroupFormType) => {
+        propertyGroupForm: PropertyGroupFormType
+    }
+    submitPropertyGroupFormSuccess: (propertyGroupForm: PropertyGroupFormType) => {
+        propertyGroupForm: PropertyGroupFormType
+    }
+    touchPropertyGroupFormField: (key: string) => {
+        key: string
+    }
+    updatePropertyGroup: ({ id, data }: { data: Partial<SchemaPropertyGroup>; id: string }) => {
+        id: string
+        data: Partial<SchemaPropertyGroup>
+    }
+    updatePropertyGroupFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updatePropertyGroupSuccess: (
+        propertyGroups: any[],
+        payload?: {
+            id: string
+            data: Partial<SchemaPropertyGroup>
+        }
+    ) => {
+        propertyGroups: any[]
+        payload?: {
+            id: string
+            data: Partial<SchemaPropertyGroup>
+        }
+    }
+    updatePropertyInForm: (
+        index: number,
+        updates: Partial<SchemaPropertyGroupProperty>
+    ) => {
+        index: number
+        updates: Partial<SchemaPropertyGroupProperty>
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface schemaManagementLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        filteredPropertyGroups: (propertyGroups: SchemaPropertyGroup[], searchTerm: string) => SchemaPropertyGroup[]
+        propertyGroupFormValidationError: (propertyGroupForm: PropertyGroupFormType) => string | null
+    }
+}
+
+export type schemaManagementLogicType = MakeLogicType<
+    schemaManagementLogicValues,
+    schemaManagementLogicActions,
+    SchemaManagementLogicProps,
+    schemaManagementLogicMeta
+>
+
 export const schemaManagementLogic = kea<schemaManagementLogicType>([
     path(['scenes', 'data-management', 'schema', 'schemaManagementLogic']),
     props({} as SchemaManagementLogicProps),
@@ -246,7 +403,7 @@ export const schemaManagementLogic = kea<schemaManagementLogicType>([
     selectors({
         filteredPropertyGroups: [
             (s) => [s.propertyGroups, s.searchTerm],
-            (propertyGroups, searchTerm): SchemaPropertyGroup[] => {
+            (propertyGroups: SchemaPropertyGroup[], searchTerm: string): SchemaPropertyGroup[] => {
                 if (!searchTerm) {
                     return propertyGroups
                 }
@@ -261,7 +418,7 @@ export const schemaManagementLogic = kea<schemaManagementLogicType>([
         ],
         propertyGroupFormValidationError: [
             (s) => [s.propertyGroupForm],
-            (form): string | null => {
+            (form: PropertyGroupFormType): string | null => {
                 if (form.properties.length === 0) {
                     return null
                 }
diff --git a/frontend/src/scenes/data-management/variables/sqlVariableEditSceneLogic.ts b/frontend/src/scenes/data-management/variables/sqlVariableEditSceneLogic.ts
index ad4eb04e3285..0c0c943b9ad4 100644
--- a/frontend/src/scenes/data-management/variables/sqlVariableEditSceneLogic.ts
+++ b/frontend/src/scenes/data-management/variables/sqlVariableEditSceneLogic.ts
@@ -1,5 +1,6 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 
@@ -12,8 +13,8 @@ import { urls } from 'scenes/urls'
 import { Variable, VariableType } from '~/queries/nodes/DataVisualization/types'
 import { QueryBasedInsightModel } from '~/types'
 
+import type { Node } from '../../../queries/schema/schema-general'
 import { fetchInsightsUsingVariable } from './insightsLoader'
-import type { sqlVariableEditSceneLogicType } from './sqlVariableEditSceneLogicType'
 
 export interface SqlVariableEditSceneLogicProps {
     id: string
@@ -26,6 +27,150 @@ const NEW_VARIABLE_DEFAULTS: Partial<Variable> = {
     code_name: '',
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sqlVariableEditSceneLogicValues {
+    currentTeamId: number | null // teamLogic
+    breadcrumbs: (
+        | {
+              key: string
+              name: string
+              path: string
+          }
+        | {
+              key: string
+              name: string
+              path?: undefined
+          }
+    )[]
+    hasChanges: boolean
+    insightsUsingVariable: QueryBasedInsightModel[]
+    insightsUsingVariableLoading: boolean
+    isNew: boolean
+    isVariableFormSubmitting: boolean
+    isVariableFormValid: boolean
+    showVariableFormErrors: boolean
+    variable: Variable | null
+    variableForm: Partial<Variable>
+    variableFormAllErrors: Record<string, any>
+    variableFormChanged: boolean
+    variableFormErrors: DeepPartialMap<Partial<Variable>, ValidationErrorType>
+    variableFormHasErrors: boolean
+    variableFormManualErrors: Record<string, any>
+    variableFormTouched: boolean
+    variableFormTouches: Record<string, boolean>
+    variableFormValidationErrors: DeepPartialMap<Partial<Variable>, ValidationErrorType>
+    variableLoading: boolean
+    variableType: VariableType
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sqlVariableEditSceneLogicActions {
+    loadInsightsUsingVariable: () => any
+    loadInsightsUsingVariableFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadInsightsUsingVariableSuccess: (
+        insightsUsingVariable: QueryBasedInsightModel<Node<Record<string, any>>>[],
+        payload?: any
+    ) => {
+        insightsUsingVariable: QueryBasedInsightModel<Node<Record<string, any>>>[]
+        payload?: any
+    }
+    loadVariable: () => any
+    loadVariableFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadVariableSuccess: (
+        variable: Variable | null,
+        payload?: any
+    ) => {
+        variable: Variable | null
+        payload?: any
+    }
+    resetVariableForm: (values?: Partial<Variable>) => {
+        values?: Partial<Variable>
+    }
+    setVariableFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setVariableFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setVariableFormValues: (values: DeepPartial<Partial<Variable>>) => {
+        values: DeepPartial<Partial<Variable>>
+    }
+    setVariableType: (type: VariableType) => {
+        type: VariableType
+    }
+    submitVariableForm: () => {
+        value: boolean
+    }
+    submitVariableFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitVariableFormRequest: (variableForm: Partial<Variable>) => {
+        variableForm: Partial<Variable>
+    }
+    submitVariableFormSuccess: (variableForm: Partial<Variable>) => {
+        variableForm: Partial<Variable>
+    }
+    touchVariableFormField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sqlVariableEditSceneLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        isNew: (id: string) => boolean
+        hasChanges: (
+            variableForm: Partial<Variable>,
+            variableType: VariableType,
+            variable: Variable | null,
+            variableLoading: boolean
+        ) => boolean
+        breadcrumbs: (
+            variable: Variable | null,
+            id: string
+        ) => (
+            | {
+                  key: string
+                  name: string
+                  path: string
+              }
+            | {
+                  key: string
+                  name: string
+                  path?: undefined
+              }
+        )[]
+    }
+}
+
+export type sqlVariableEditSceneLogicType = MakeLogicType<
+    sqlVariableEditSceneLogicValues,
+    sqlVariableEditSceneLogicActions,
+    SqlVariableEditSceneLogicProps,
+    sqlVariableEditSceneLogicMeta
+>
+
 export const sqlVariableEditSceneLogic = kea<sqlVariableEditSceneLogicType>([
     props({} as SqlVariableEditSceneLogicProps),
     path(['scenes', 'data-management', 'variables', 'sqlVariableEditSceneLogic']),
diff --git a/frontend/src/scenes/data-management/variables/sqlVariablesLogic.ts b/frontend/src/scenes/data-management/variables/sqlVariablesLogic.ts
index af762c66ca6b..8d5870783e6d 100644
--- a/frontend/src/scenes/data-management/variables/sqlVariablesLogic.ts
+++ b/frontend/src/scenes/data-management/variables/sqlVariablesLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -7,7 +7,73 @@ import api from 'lib/api'
 
 import { Variable } from '~/queries/nodes/DataVisualization/types'
 
-import type { sqlVariablesLogicType } from './sqlVariablesLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sqlVariablesLogicValues {
+    filteredVariables: Variable[]
+    searchTerm: string
+    variables: Variable[]
+    variablesLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sqlVariablesLogicActions {
+    deleteVariable: (variableId: string) => {
+        variableId: string
+    }
+    deleteVariableSuccess: ({ variableId }: { variableId: string }) => {
+        variableId: string
+    }
+    deleteVariableSuccessFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteVariableSuccessSuccess: (
+        variables: Variable[],
+        payload?: {
+            variableId: string
+        }
+    ) => {
+        variables: Variable[]
+        payload?: {
+            variableId: string
+        }
+    }
+    loadVariables: () => any
+    loadVariablesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadVariablesSuccess: (
+        variables: Variable[],
+        payload?: any
+    ) => {
+        variables: Variable[]
+        payload?: any
+    }
+    setSearchTerm: (searchTerm: string) => {
+        searchTerm: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sqlVariablesLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        filteredVariables: (variables: Variable[], searchTerm: string) => Variable[]
+    }
+}
+
+export type sqlVariablesLogicType = MakeLogicType<
+    sqlVariablesLogicValues,
+    sqlVariablesLogicActions,
+    Record<string, any>,
+    sqlVariablesLogicMeta
+>
 
 export const sqlVariablesLogic = kea<sqlVariablesLogicType>([
     path(['scenes', 'data-management', 'variables', 'sqlVariablesLogic']),
diff --git a/frontend/src/scenes/data-pipelines/DataPipelinesNewScene.tsx b/frontend/src/scenes/data-pipelines/DataPipelinesNewScene.tsx
index c16b11321a68..bb32407d8aa9 100644
--- a/frontend/src/scenes/data-pipelines/DataPipelinesNewScene.tsx
+++ b/frontend/src/scenes/data-pipelines/DataPipelinesNewScene.tsx
@@ -1,4 +1,4 @@
-import { BindLogic, kea, path, props, selectors, useValues } from 'kea'
+import { MakeLogicType, BindLogic, kea, path, props, selectors, useValues } from 'kea'
 
 import { LemonSkeleton } from '@posthog/lemon-ui'
 
@@ -17,7 +17,6 @@ import { availableSourcesLogic } from 'products/data_warehouse/frontend/scenes/N
 import { SourceCatalog } from 'products/data_warehouse/frontend/scenes/NewSourceScene/SourceCatalog'
 import { sourceWizardLogic } from 'products/data_warehouse/frontend/scenes/NewSourceScene/sourceWizardLogic'
 
-import type { dataPipelinesNewSceneLogicType } from './DataPipelinesNewSceneType'
 import { nonHogFunctionTemplatesLogic } from './utils/nonHogFunctionTemplatesLogic'
 
 export type DataPipelinesNewSceneKind = 'transformation' | 'destination' | 'source' | 'site_app'
@@ -26,6 +25,27 @@ export type DataPipelinesNewSceneProps = {
     kind: DataPipelinesNewSceneKind
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataPipelinesNewSceneLogicValues {
+    breadcrumbs: Breadcrumb[]
+    logicProps: any
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataPipelinesNewSceneLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        logicProps: (arg: any) => any
+        breadcrumbs: (arg: any) => Breadcrumb[]
+    }
+}
+
+export type dataPipelinesNewSceneLogicType = MakeLogicType<
+    dataPipelinesNewSceneLogicValues,
+    {},
+    DataPipelinesNewSceneProps,
+    dataPipelinesNewSceneLogicMeta
+>
+
 export const dataPipelinesNewSceneLogic = kea<dataPipelinesNewSceneLogicType>([
     props({} as DataPipelinesNewSceneProps),
     path(() => ['scenes', 'data-pipelines', 'dataPipelinesNewSceneLogic']),
diff --git a/frontend/src/scenes/data-pipelines/batch-exports/BatchExportScene.tsx b/frontend/src/scenes/data-pipelines/batch-exports/BatchExportScene.tsx
index a9ac15e7bf0b..f54f70c02528 100644
--- a/frontend/src/scenes/data-pipelines/batch-exports/BatchExportScene.tsx
+++ b/frontend/src/scenes/data-pipelines/batch-exports/BatchExportScene.tsx
@@ -1,4 +1,5 @@
 import {
+    MakeLogicType,
     BindLogic,
     actions,
     kea,
@@ -39,13 +40,43 @@ import {
     BatchExportConfigurationSaveButton,
 } from './BatchExportConfigurationButtons'
 import { RenderBatchExportIcon } from './BatchExportIcon'
-import type { batchExportSceneLogicType } from './BatchExportSceneType'
 import { BatchExportsMetrics } from './BatchExportsMetrics'
 import { humanizeBatchExportName, normalizeBatchExportService } from './utils'
 
 const BATCH_EXPORT_SCENE_TABS = ['configuration', 'metrics', 'logs', 'runs', 'backfills', 'history'] as const
 export type BatchExportSceneTab = (typeof BATCH_EXPORT_SCENE_TABS)[number]
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface batchExportSceneLogicValues {
+    breadcrumbs: Breadcrumb[]
+    currentTab: BatchExportSceneTab
+    logicProps: any
+    sidePanelContext: SidePanelSceneContext | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface batchExportSceneLogicActions {
+    setCurrentTab: (tab: BatchExportSceneTab) => {
+        tab: 'backfills' | 'configuration' | 'history' | 'logs' | 'metrics' | 'runs'
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface batchExportSceneLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        logicProps: (arg: any) => any
+        sidePanelContext: (arg: any) => SidePanelSceneContext | null
+    }
+}
+
+export type batchExportSceneLogicType = MakeLogicType<
+    batchExportSceneLogicValues,
+    batchExportSceneLogicActions,
+    BatchExportConfigFormLogicProps,
+    batchExportSceneLogicMeta
+>
+
 export const batchExportSceneLogic = kea<batchExportSceneLogicType>([
     props({} as BatchExportConfigFormLogicProps),
     key(({ id }: BatchExportConfigFormLogicProps) => id ?? 'new'),
diff --git a/frontend/src/scenes/data-pipelines/batch-exports/batchExportBackfillModalLogic.tsx b/frontend/src/scenes/data-pipelines/batch-exports/batchExportBackfillModalLogic.tsx
index 69d30698be71..ea2446c0e82b 100644
--- a/frontend/src/scenes/data-pipelines/batch-exports/batchExportBackfillModalLogic.tsx
+++ b/frontend/src/scenes/data-pipelines/batch-exports/batchExportBackfillModalLogic.tsx
@@ -1,6 +1,7 @@
 // Form logic for the backfill creation modal — date range selection, schedule display, and submission.
-import { actions, connect, kea, key, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, path, props, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 
 import { lemonToast } from '@posthog/lemon-ui'
 
@@ -12,7 +13,6 @@ import { teamLogic } from 'scenes/teamLogic'
 import { ProductIntentContext, ProductKey } from '~/queries/schema/schema-general'
 import { BatchExportConfiguration } from '~/types'
 
-import type { batchExportBackfillModalLogicType } from './batchExportBackfillModalLogicType'
 import { batchExportDataLogic } from './batchExportDataLogic'
 import { BatchExportContext } from './types'
 import { dayOptions } from './utils'
@@ -118,6 +118,164 @@ export function getMostRecentIntervalBoundary(
     return now.minute(0).second(0).millisecond(0)
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface batchExportBackfillModalLogicValues {
+    batchExportConfig: BatchExportConfiguration | null // batchExportDataLogic
+    backfillForm: {
+        earliest_backfill: boolean
+        end_at?: Dayjs | undefined
+        start_at?: Dayjs | undefined
+    }
+    backfillFormAllErrors: Record<string, any>
+    backfillFormChanged: boolean
+    backfillFormErrors: DeepPartialMap<
+        {
+            earliest_backfill: boolean
+            end_at?: Dayjs | undefined
+            start_at?: Dayjs | undefined
+        },
+        ValidationErrorType
+    >
+    backfillFormHasErrors: boolean
+    backfillFormManualErrors: Record<string, any>
+    backfillFormTouched: boolean
+    backfillFormTouches: Record<string, boolean>
+    backfillFormValidationErrors: DeepPartialMap<
+        {
+            earliest_backfill: boolean
+            end_at?: Dayjs | undefined
+            start_at?: Dayjs | undefined
+        },
+        ValidationErrorType
+    >
+    dayOfWeek: number | null
+    dayOfWeekName: string | null
+    defaultEndAt: Dayjs
+    hourOffset: number | null
+    interval: string | undefined
+    isBackfillFormSubmitting: boolean
+    isBackfillFormValid: boolean
+    isBackfillModalOpen: boolean
+    isEarliestBackfill: boolean
+    isHogFunction: boolean
+    showBackfillFormErrors: boolean
+    timezone: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface batchExportBackfillModalLogicActions {
+    backfillCreated: (backfillId: string) => {
+        backfillId: string
+    }
+    closeBackfillModal: () => {
+        value: true
+    }
+    openBackfillModal: () => {
+        value: true
+    }
+    resetBackfillForm: (values?: {
+        earliest_backfill: boolean
+        end_at?: Dayjs | undefined
+        start_at?: Dayjs | undefined
+    }) => {
+        values?: {
+            earliest_backfill: boolean
+            end_at?: Dayjs | undefined
+            start_at?: Dayjs | undefined
+        }
+    }
+    setBackfillFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setBackfillFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setBackfillFormValues: (
+        values: DeepPartial<{
+            earliest_backfill: boolean
+            end_at?: Dayjs | undefined
+            start_at?: Dayjs | undefined
+        }>
+    ) => {
+        values: DeepPartial<{
+            earliest_backfill: boolean
+            end_at?: Dayjs | undefined
+            start_at?: Dayjs | undefined
+        }>
+    }
+    setEarliestBackfill: () => {
+        value: true
+    }
+    submitBackfillForm: () => {
+        value: boolean
+    }
+    submitBackfillFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitBackfillFormRequest: (backfillForm: {
+        earliest_backfill: boolean
+        end_at?: Dayjs | undefined
+        start_at?: Dayjs | undefined
+    }) => {
+        backfillForm: {
+            earliest_backfill: boolean
+            end_at?: Dayjs | undefined
+            start_at?: Dayjs | undefined
+        }
+    }
+    submitBackfillFormSuccess: (backfillForm: {
+        earliest_backfill: boolean
+        end_at?: Dayjs | undefined
+        start_at?: Dayjs | undefined
+    }) => {
+        backfillForm: {
+            earliest_backfill: boolean
+            end_at?: Dayjs | undefined
+            start_at?: Dayjs | undefined
+        }
+    }
+    touchBackfillFormField: (key: string) => {
+        key: string
+    }
+    unsetEarliestBackfill: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface batchExportBackfillModalLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        isHogFunction: (arg: any) => boolean
+        interval: (batchExportConfig: BatchExportConfiguration | null) => string | undefined
+        timezone: (batchExportConfig: BatchExportConfiguration | null, timezone: string) => string
+        dayOfWeek: (batchExportConfig: BatchExportConfiguration | null) => number | null
+        dayOfWeekName: (dayOfWeek: number | null) => string | null
+        hourOffset: (batchExportConfig: BatchExportConfiguration | null) => number | null
+        defaultEndAt: (
+            interval: string | undefined,
+            timezone: string,
+            hourOffset: number | null,
+            dayOfWeek: number | null
+        ) => Dayjs
+    }
+}
+
+export type batchExportBackfillModalLogicType = MakeLogicType<
+    batchExportBackfillModalLogicValues,
+    batchExportBackfillModalLogicActions,
+    BatchExportBackfillModalLogicProps,
+    batchExportBackfillModalLogicMeta
+>
+
 export const batchExportBackfillModalLogic = kea<batchExportBackfillModalLogicType>([
     props({} as BatchExportBackfillModalLogicProps),
     key(({ id }) => id),
diff --git a/frontend/src/scenes/data-pipelines/batch-exports/batchExportBackfillsLogic.tsx b/frontend/src/scenes/data-pipelines/batch-exports/batchExportBackfillsLogic.tsx
index 968dfe4282ca..692ebee085a6 100644
--- a/frontend/src/scenes/data-pipelines/batch-exports/batchExportBackfillsLogic.tsx
+++ b/frontend/src/scenes/data-pipelines/batch-exports/batchExportBackfillsLogic.tsx
@@ -1,5 +1,5 @@
 // Loads and manages batch export backfills — listing, cancellation, and polling for estimates.
-import { actions, afterMount, connect, kea, key, listeners, path, props, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api, { PaginatedResponse } from 'lib/api'
@@ -9,8 +9,9 @@ import { teamLogic } from 'scenes/teamLogic'
 
 import { BatchExportBackfill, RawBatchExportBackfill } from '~/types'
 
+import type { Dayjs } from '../../../lib/dayjs'
+import type { BatchExportConfiguration } from '../../../types'
 import { batchExportBackfillModalLogic } from './batchExportBackfillModalLogic'
-import type { batchExportBackfillsLogicType } from './batchExportBackfillsLogicType'
 import { batchExportDataLogic } from './batchExportDataLogic'
 import { BatchExportContext } from './types'
 
@@ -19,6 +20,101 @@ export interface BatchExportBackfillsLogicProps {
     context?: BatchExportContext
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface batchExportBackfillsLogicValues {
+    batchExportConfig: BatchExportConfiguration | null // batchExportDataLogic
+    batchExportConfigLoading: boolean // batchExportDataLogic
+    currentTeamId: number | null // teamLogic
+    backfillsPaginatedResponse: PaginatedResponse<RawBatchExportBackfill> | null
+    backfillsPaginatedResponseLoading: boolean
+    hasMoreBackfillsToLoad: boolean
+    latestBackfills: BatchExportBackfill[]
+    loading: boolean
+    recordLabel: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface batchExportBackfillsLogicActions {
+    backfillCreated: (backfillId: string) => {
+        backfillId: string
+    } // batchExportBackfillModalLogic
+    openBackfillModal: () => {
+        value: true
+    } // batchExportBackfillModalLogic
+    submitBackfillFormSuccess: (backfillForm: {
+        earliest_backfill: boolean
+        end_at?: Dayjs | undefined
+        start_at?: Dayjs | undefined
+    }) => {
+        backfillForm: {
+            earliest_backfill: boolean
+            end_at?: Dayjs | undefined
+            start_at?: Dayjs | undefined
+        }
+    } // batchExportBackfillModalLogic
+    cancelBackfill: (backfill: BatchExportBackfill) => {
+        backfill: BatchExportBackfill
+    }
+    loadBackfills: () => {
+        value: true
+    }
+    loadBackfillsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadBackfillsSuccess: (
+        backfillsPaginatedResponse: PaginatedResponse<RawBatchExportBackfill>,
+        payload?: {
+            value: true
+        }
+    ) => {
+        backfillsPaginatedResponse: PaginatedResponse<RawBatchExportBackfill>
+        payload?: {
+            value: true
+        }
+    }
+    loadOlderBackfills: () => any
+    loadOlderBackfillsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadOlderBackfillsSuccess: (
+        backfillsPaginatedResponse: PaginatedResponse<RawBatchExportBackfill> | null,
+        payload?: any
+    ) => {
+        backfillsPaginatedResponse: PaginatedResponse<RawBatchExportBackfill> | null
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface batchExportBackfillsLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        recordLabel: (arg: any) => string
+        hasMoreBackfillsToLoad: (
+            backfillsPaginatedResponse: PaginatedResponse<RawBatchExportBackfill> | null
+        ) => boolean
+        loading: (backfillsPaginatedResponseLoading: boolean) => boolean
+        latestBackfills: (
+            backfillsPaginatedResponse: PaginatedResponse<RawBatchExportBackfill> | null
+        ) => BatchExportBackfill[]
+    }
+}
+
+export type batchExportBackfillsLogicType = MakeLogicType<
+    batchExportBackfillsLogicValues,
+    batchExportBackfillsLogicActions,
+    BatchExportBackfillsLogicProps,
+    batchExportBackfillsLogicMeta
+>
+
 export const batchExportBackfillsLogic = kea<batchExportBackfillsLogicType>([
     props({} as BatchExportBackfillsLogicProps),
     key(({ id }) => id),
@@ -79,15 +175,16 @@ export const batchExportBackfillsLogic = kea<batchExportBackfillsLogicType>([
         ],
         hasMoreBackfillsToLoad: [
             (s) => [s.backfillsPaginatedResponse],
-            (backfillsPaginatedResponse) => !!backfillsPaginatedResponse?.next,
+            (backfillsPaginatedResponse: PaginatedResponse<RawBatchExportBackfill> | null) =>
+                !!backfillsPaginatedResponse?.next,
         ],
         loading: [
             (s) => [s.backfillsPaginatedResponseLoading],
-            (backfillsPaginatedResponseLoading) => backfillsPaginatedResponseLoading,
+            (backfillsPaginatedResponseLoading: boolean) => backfillsPaginatedResponseLoading,
         ],
         latestBackfills: [
             (s) => [s.backfillsPaginatedResponse],
-            (backfillsPaginatedResponse): BatchExportBackfill[] => {
+            (backfillsPaginatedResponse: PaginatedResponse<RawBatchExportBackfill> | null): BatchExportBackfill[] => {
                 const backfills = backfillsPaginatedResponse?.results ?? []
                 return backfills.map((backfill) => {
                     const parseDateSafely = (date: string | null | undefined): dayjs.Dayjs | undefined => {
diff --git a/frontend/src/scenes/data-pipelines/batch-exports/batchExportConfigFormLogic.tsx b/frontend/src/scenes/data-pipelines/batch-exports/batchExportConfigFormLogic.tsx
index ede81ac05cdb..d20d11399b15 100644
--- a/frontend/src/scenes/data-pipelines/batch-exports/batchExportConfigFormLogic.tsx
+++ b/frontend/src/scenes/data-pipelines/batch-exports/batchExportConfigFormLogic.tsx
@@ -1,5 +1,6 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { beforeUnload, router } from 'kea-router'
 
@@ -18,7 +19,6 @@ import {
     BatchExportService,
 } from '~/types'
 
-import type { batchExportConfigFormLogicType } from './batchExportConfigFormLogicType'
 import { batchExportDataLogic } from './batchExportDataLogic'
 import { DESTINATIONS } from './destinations'
 import { genericPersonEventFields, isSelectedCompressionOptionValid } from './destinations/common'
@@ -531,6 +531,233 @@ const sessionsTable: DatabaseSchemaBatchExportTable = {
     },
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface batchExportConfigFormLogicValues {
+    batchExportConfig: BatchExportConfiguration | null // batchExportDataLogic
+    batchExportConfigLoading: boolean // batchExportDataLogic
+    teamTimezone: string // teamLogic
+    teamWeekStartDay: number // teamLogic
+    batchExportConfigTest: BatchExportConfigurationTest | null
+    batchExportConfigTestLoading: boolean
+    batchExportConfigTestStep: BatchExportConfigurationTestStep | null
+    batchExportConfigTestStepLoading: boolean
+    configuration: Record<string, any>
+    configurationAllErrors: Record<string, any>
+    configurationChanged: boolean
+    configurationErrors: DeepPartialMap<Record<string, any>, ValidationErrorType>
+    configurationHasErrors: boolean
+    configurationManualErrors: Record<string, any>
+    configurationTouched: boolean
+    configurationTouches: Record<string, boolean>
+    configurationValidationErrors: DeepPartialMap<Record<string, any>, ValidationErrorType>
+    isConfigurationSubmitting: boolean
+    isConfigurationValid: boolean
+    isDatabaseDestination: boolean
+    isNew: boolean
+    loading: boolean
+    logicProps: any
+    requiredFields: string[]
+    runningStep: number | null
+    savedConfiguration: Record<string, any>
+    selectedModel: string
+    service:
+        | 'AwsS3'
+        | 'AzureBlob'
+        | 'BigQuery'
+        | 'Databricks'
+        | 'HTTP'
+        | 'Postgres'
+        | 'Redshift'
+        | 'S3'
+        | 'S3Compatible'
+        | 'Snowflake'
+        | null
+    showConfigurationErrors: boolean
+    tables: DatabaseSchemaBatchExportTable[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface batchExportConfigFormLogicActions {
+    loadBatchExportConfig: () => any // batchExportDataLogic
+    loadBatchExportConfigSuccess: (
+        batchExportConfig: BatchExportConfiguration | null,
+        payload?: any
+    ) => {
+        batchExportConfig: BatchExportConfiguration | null
+        payload?: any
+    } // batchExportDataLogic
+    setBatchExportConfig: (config: BatchExportConfiguration) => BatchExportConfiguration // batchExportDataLogic
+    deleteBatchExport: () => boolean
+    loadBatchExportConfigTest: () => any
+    loadBatchExportConfigTestFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadBatchExportConfigTestSuccess: (
+        batchExportConfigTest: BatchExportConfigurationTest | null,
+        payload?: any
+    ) => {
+        batchExportConfigTest: BatchExportConfigurationTest | null
+        payload?: any
+    }
+    resetConfiguration: (values?: Record<string, any>) => {
+        values?: Record<string, any>
+    }
+    runBatchExportConfigTestStep: (step: any) => any
+    runBatchExportConfigTestStepFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    runBatchExportConfigTestStepSuccess: (
+        batchExportConfigTestStep: BatchExportConfigurationTestStep | null,
+        payload?: any
+    ) => {
+        batchExportConfigTestStep: BatchExportConfigurationTestStep | null
+        payload?: any
+    }
+    setConfigurationManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setConfigurationValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setConfigurationValues: (values: DeepPartial<Record<string, any>>) => {
+        values: DeepPartial<Record<string, any>>
+    }
+    setRunningStep: (step: number | null) => {
+        step: number | null
+    }
+    setSavedConfiguration: (configuration: Record<string, any>) => {
+        configuration: Record<string, any>
+    }
+    setSelectedModel: (model: string) => {
+        model: string
+    }
+    submitConfiguration: () => {
+        value: boolean
+    }
+    submitConfigurationFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitConfigurationRequest: (configuration: Record<string, any>) => {
+        configuration: Record<string, any>
+    }
+    submitConfigurationSuccess: (configuration: Record<string, any>) => {
+        configuration: Record<string, any>
+    }
+    touchConfigurationField: (key: string) => {
+        key: string
+    }
+    updateBatchExportConfig: (formdata: Record<string, any>) => {
+        formdata: Record<string, any>
+    }
+    updateBatchExportConfigSuccess: (batchExportConfig: BatchExportConfiguration) => {
+        batchExportConfig: BatchExportConfiguration
+    }
+    updateBatchExportConfigTest: (service: any) => any
+    updateBatchExportConfigTestFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateBatchExportConfigTestSuccess: (
+        batchExportConfigTest: BatchExportConfigurationTest | null,
+        payload?: any
+    ) => {
+        batchExportConfigTest: BatchExportConfigurationTest | null
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface batchExportConfigFormLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        logicProps: (arg: any) => any
+        service: (
+            batchExportConfig: BatchExportConfiguration | null,
+            service:
+                | 'AwsS3'
+                | 'AzureBlob'
+                | 'BigQuery'
+                | 'Databricks'
+                | 'HTTP'
+                | 'Postgres'
+                | 'Redshift'
+                | 'S3'
+                | 'S3Compatible'
+                | 'Snowflake'
+                | null
+        ) =>
+            | 'AwsS3'
+            | 'AzureBlob'
+            | 'BigQuery'
+            | 'Databricks'
+            | 'HTTP'
+            | 'Postgres'
+            | 'Redshift'
+            | 'S3'
+            | 'S3Compatible'
+            | 'Snowflake'
+            | null
+        isNew: (id: string | null) => boolean
+        loading: (batchExportConfigLoading: boolean, batchExportConfigTestLoading: boolean) => boolean
+        isDatabaseDestination: (
+            service:
+                | 'AwsS3'
+                | 'AzureBlob'
+                | 'BigQuery'
+                | 'Databricks'
+                | 'HTTP'
+                | 'Postgres'
+                | 'Redshift'
+                | 'S3'
+                | 'S3Compatible'
+                | 'Snowflake'
+                | null
+        ) => boolean
+        requiredFields: (
+            service:
+                | 'AwsS3'
+                | 'AzureBlob'
+                | 'BigQuery'
+                | 'Databricks'
+                | 'HTTP'
+                | 'Postgres'
+                | 'Redshift'
+                | 'S3'
+                | 'S3Compatible'
+                | 'Snowflake'
+                | null,
+            isNew: boolean,
+            configuration: Record<string, any>
+        ) => string[]
+    }
+}
+
+export type batchExportConfigFormLogicType = MakeLogicType<
+    batchExportConfigFormLogicValues,
+    batchExportConfigFormLogicActions,
+    BatchExportConfigFormLogicProps,
+    batchExportConfigFormLogicMeta
+>
+
 // Form logic for creating and editing batch export configurations.
 // Owns form state, validation, dirty-checking, test steps, and save/delete actions.
 // Reads the underlying config data from batchExportDataLogic.
@@ -717,21 +944,66 @@ export const batchExportConfigFormLogic = kea<batchExportConfigFormLogicType>([
     })),
     selectors(() => ({
         logicProps: [() => [(_, props) => props], (props) => props],
-        service: [(s, p) => [s.batchExportConfig, p.service], (config, service) => config?.destination.type || service],
-        isNew: [(_, p) => [p.id], (id): boolean => !id],
+        service: [
+            (s, p) => [s.batchExportConfig, p.service],
+            (
+                config: BatchExportConfiguration | null,
+                service:
+                    | 'AwsS3'
+                    | 'AzureBlob'
+                    | 'BigQuery'
+                    | 'Databricks'
+                    | 'HTTP'
+                    | 'Postgres'
+                    | 'Redshift'
+                    | 'S3'
+                    | 'S3Compatible'
+                    | 'Snowflake'
+                    | null
+            ) => config?.destination.type || service,
+        ],
+        isNew: [(_, p) => [p.id], (id: string | null): boolean => !id],
         loading: [
             (s) => [s.batchExportConfigLoading, s.batchExportConfigTestLoading],
-            (batchExportConfigLoading, batchExportConfigTestLoading) =>
+            (batchExportConfigLoading: boolean, batchExportConfigTestLoading: boolean) =>
                 batchExportConfigLoading || batchExportConfigTestLoading,
         ],
         isDatabaseDestination: [
             (s) => [s.service],
-            (service): boolean =>
+            (
+                service:
+                    | 'AwsS3'
+                    | 'AzureBlob'
+                    | 'BigQuery'
+                    | 'Databricks'
+                    | 'HTTP'
+                    | 'Postgres'
+                    | 'Redshift'
+                    | 'S3'
+                    | 'S3Compatible'
+                    | 'Snowflake'
+                    | null
+            ): boolean =>
                 !!service && ['Postgres', 'Redshift', 'Snowflake', 'Databricks', 'BigQuery'].includes(service),
         ],
         requiredFields: [
             (s) => [s.service, s.isNew, s.configuration],
-            (service, isNew, config): string[] => {
+            (
+                service:
+                    | 'AwsS3'
+                    | 'AzureBlob'
+                    | 'BigQuery'
+                    | 'Databricks'
+                    | 'HTTP'
+                    | 'Postgres'
+                    | 'Redshift'
+                    | 'S3'
+                    | 'S3Compatible'
+                    | 'Snowflake'
+                    | null,
+                isNew: boolean,
+                config: Record<string, any>
+            ): string[] => {
                 const generalRequiredFields = ['interval', 'name', 'model']
                 if (!service) {
                     return generalRequiredFields
diff --git a/frontend/src/scenes/data-pipelines/batch-exports/batchExportDataLogic.ts b/frontend/src/scenes/data-pipelines/batch-exports/batchExportDataLogic.ts
index 5154a152fdde..4fe168e411dd 100644
--- a/frontend/src/scenes/data-pipelines/batch-exports/batchExportDataLogic.ts
+++ b/frontend/src/scenes/data-pipelines/batch-exports/batchExportDataLogic.ts
@@ -1,19 +1,69 @@
 // Lightweight logic that loads and caches a batch export's configuration.
 // Child logics (runs, backfills, modal) connect here instead of the heavyweight form logic,
 // so they can be mounted independently (e.g. from the hog function backfills tab).
-import { afterMount, kea, key, path, props } from 'kea'
+import { MakeLogicType, afterMount, kea, key, path, props } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
 
 import { BatchExportConfiguration } from '~/types'
 
-import type { batchExportDataLogicType } from './batchExportDataLogicType'
-
 export interface BatchExportConfigLogicProps {
     id: string | null
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface batchExportDataLogicValues {
+    batchExportConfig: BatchExportConfiguration | null
+    batchExportConfigLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface batchExportDataLogicActions {
+    loadBatchExportConfig: () => any
+    loadBatchExportConfigFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadBatchExportConfigSuccess: (
+        batchExportConfig: BatchExportConfiguration | null,
+        payload?: any
+    ) => {
+        batchExportConfig: BatchExportConfiguration | null
+        payload?: any
+    }
+    setBatchExportConfig: (config: BatchExportConfiguration) => BatchExportConfiguration
+    setBatchExportConfigFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    setBatchExportConfigSuccess: (
+        batchExportConfig: BatchExportConfiguration,
+        payload?: BatchExportConfiguration
+    ) => {
+        batchExportConfig: BatchExportConfiguration
+        payload?: BatchExportConfiguration
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface batchExportDataLogicMeta {
+    key: string
+}
+
+export type batchExportDataLogicType = MakeLogicType<
+    batchExportDataLogicValues,
+    batchExportDataLogicActions,
+    BatchExportConfigLogicProps,
+    batchExportDataLogicMeta
+>
+
 export const batchExportDataLogic = kea<batchExportDataLogicType>([
     props({} as BatchExportConfigLogicProps),
     key(({ id }) => id ?? 'new'),
diff --git a/frontend/src/scenes/data-pipelines/batch-exports/batchExportRunsLogic.tsx b/frontend/src/scenes/data-pipelines/batch-exports/batchExportRunsLogic.tsx
index 676a4978bc89..0b8c3d7128bb 100644
--- a/frontend/src/scenes/data-pipelines/batch-exports/batchExportRunsLogic.tsx
+++ b/frontend/src/scenes/data-pipelines/batch-exports/batchExportRunsLogic.tsx
@@ -1,5 +1,5 @@
 // Loads and manages batch export runs — grouping by date, retry, cancel, and pagination logic.
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -9,9 +9,10 @@ import { dayjs } from 'lib/dayjs'
 
 import { BatchExportRun, GroupedBatchExportRuns, RawBatchExportRun } from '~/types'
 
+import type { Dayjs } from '../../../lib/dayjs'
+import type { BatchExportConfiguration } from '../../../types'
 import { batchExportBackfillModalLogic } from './batchExportBackfillModalLogic'
 import { batchExportDataLogic } from './batchExportDataLogic'
-import type { batchExportRunsLogicType } from './batchExportRunsLogicType'
 import { BatchExportContext } from './types'
 
 const DEFAULT_DATE_FROM = '-2d'
@@ -20,6 +21,116 @@ export interface BatchExportRunsLogicProps {
     context?: BatchExportContext
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface batchExportRunsLogicValues {
+    batchExportConfig: BatchExportConfiguration | null // batchExportDataLogic
+    batchExportConfigLoading: boolean // batchExportDataLogic
+    dateRange: {
+        from: string
+        to: string | null
+    }
+    groupedRuns: GroupedBatchExportRuns[]
+    hasMoreRunsToLoad: boolean
+    latestRuns: BatchExportRun[]
+    loading: boolean
+    recordLabel: string
+    runsPaginatedResponse: PaginatedResponse<RawBatchExportRun> | null
+    runsPaginatedResponseLoading: boolean
+    usingLatestRuns: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface batchExportRunsLogicActions {
+    openBackfillModal: () => {
+        value: true
+    } // batchExportBackfillModalLogic
+    submitBackfillFormSuccess: (backfillForm: {
+        earliest_backfill: boolean
+        end_at?: Dayjs | undefined
+        start_at?: Dayjs | undefined
+    }) => {
+        backfillForm: {
+            earliest_backfill: boolean
+            end_at?: Dayjs | undefined
+            start_at?: Dayjs | undefined
+        }
+    } // batchExportBackfillModalLogic
+    cancelRun: (run: BatchExportRun) => {
+        run: BatchExportRun
+    }
+    loadOlderRuns: () => any
+    loadOlderRunsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadOlderRunsSuccess: (
+        runsPaginatedResponse: PaginatedResponse<RawBatchExportRun> | null,
+        payload?: any
+    ) => {
+        runsPaginatedResponse: PaginatedResponse<RawBatchExportRun> | null
+        payload?: any
+    }
+    loadRuns: () => {
+        value: true
+    }
+    loadRunsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRunsSuccess: (
+        runsPaginatedResponse: PaginatedResponse<RawBatchExportRun>,
+        payload?: {
+            value: true
+        }
+    ) => {
+        runsPaginatedResponse: PaginatedResponse<RawBatchExportRun>
+        payload?: {
+            value: true
+        }
+    }
+    retryRun: (run: BatchExportRun) => {
+        run: BatchExportRun
+    }
+    setDateRange: (
+        from: string | null,
+        to: string | null
+    ) => {
+        from: string | null
+        to: string | null
+    }
+    switchLatestRuns: (enabled: boolean) => {
+        enabled: boolean
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface batchExportRunsLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        recordLabel: (arg: any) => string
+        hasMoreRunsToLoad: (runsPaginatedResponse: PaginatedResponse<RawBatchExportRun> | null) => boolean
+        loading: (runsPaginatedResponseLoading: boolean) => boolean
+        latestRuns: (runsPaginatedResponse: PaginatedResponse<RawBatchExportRun> | null) => BatchExportRun[]
+        groupedRuns: (
+            runsPaginatedResponse: PaginatedResponse<RawBatchExportRun> | null,
+            usingLatestRuns: boolean
+        ) => GroupedBatchExportRuns[]
+    }
+}
+
+export type batchExportRunsLogicType = MakeLogicType<
+    batchExportRunsLogicValues,
+    batchExportRunsLogicActions,
+    BatchExportRunsLogicProps,
+    batchExportRunsLogicMeta
+>
+
 export const batchExportRunsLogic = kea<batchExportRunsLogicType>([
     props({} as BatchExportRunsLogicProps),
     key(({ id }) => id),
@@ -84,15 +195,18 @@ export const batchExportRunsLogic = kea<batchExportRunsLogicType>([
             () => [(_, props) => props],
             (props: BatchExportRunsLogicProps): string => (props.context === 'hog_function' ? 'events' : 'rows'),
         ],
-        hasMoreRunsToLoad: [(s) => [s.runsPaginatedResponse], (runsPaginatedResponse) => !!runsPaginatedResponse?.next],
+        hasMoreRunsToLoad: [
+            (s) => [s.runsPaginatedResponse],
+            (runsPaginatedResponse: PaginatedResponse<RawBatchExportRun> | null) => !!runsPaginatedResponse?.next,
+        ],
         loading: [
             (s) => [s.runsPaginatedResponseLoading],
-            (runsPaginatedResponseLoading) => runsPaginatedResponseLoading,
+            (runsPaginatedResponseLoading: boolean) => runsPaginatedResponseLoading,
         ],
         latestRuns: [
             // These aren't grouped because they might not include all runs for a time interval
             (s) => [s.runsPaginatedResponse],
-            (runsPaginatedResponse): BatchExportRun[] => {
+            (runsPaginatedResponse: PaginatedResponse<RawBatchExportRun> | null): BatchExportRun[] => {
                 const runs = runsPaginatedResponse?.results ?? []
                 return runs.map((run) => {
                     return {
@@ -107,7 +221,10 @@ export const batchExportRunsLogic = kea<batchExportRunsLogicType>([
         ],
         groupedRuns: [
             (s) => [s.runsPaginatedResponse, s.usingLatestRuns],
-            (runsPaginatedResponse, usingLatestRuns): GroupedBatchExportRuns[] => {
+            (
+                runsPaginatedResponse: PaginatedResponse<RawBatchExportRun> | null,
+                usingLatestRuns: boolean
+            ): GroupedBatchExportRuns[] => {
                 if (usingLatestRuns) {
                     return []
                 }
diff --git a/frontend/src/scenes/data-pipelines/destinationsSceneLogic.ts b/frontend/src/scenes/data-pipelines/destinationsSceneLogic.ts
index 462d3a560576..b7ed5f133965 100644
--- a/frontend/src/scenes/data-pipelines/destinationsSceneLogic.ts
+++ b/frontend/src/scenes/data-pipelines/destinationsSceneLogic.ts
@@ -1,9 +1,21 @@
-import { actions, kea, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers } from 'kea'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 
 import { Breadcrumb } from '~/types'
 
-import type { destinationsSceneLogicType } from './destinationsSceneLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface destinationsSceneLogicValues {
+    activeTab: 'all' | 'history'
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface destinationsSceneLogicActions {
+    setActiveTab: (tab: 'all' | 'history') => {
+        tab: 'all' | 'history'
+    }
+}
+
+export type destinationsSceneLogicType = MakeLogicType<destinationsSceneLogicValues, destinationsSceneLogicActions>
 
 export const destinationsSceneLogic = kea<destinationsSceneLogicType>([
     path(['scenes', 'data-pipelines', 'destinationsSceneLogic']),
diff --git a/frontend/src/scenes/data-pipelines/event-filtering/eventFilterLogic.ts b/frontend/src/scenes/data-pipelines/event-filtering/eventFilterLogic.ts
index e17a542ec47d..3ee018cc883f 100644
--- a/frontend/src/scenes/data-pipelines/event-filtering/eventFilterLogic.ts
+++ b/frontend/src/scenes/data-pipelines/event-filtering/eventFilterLogic.ts
@@ -51,8 +51,9 @@
  * implementations exist in the Django model (validation on save) and
  * the Node.js ingestion pipeline (runtime filtering).
  */
-import { actions, afterMount, kea, listeners, path, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, listeners, path, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 
 import api from 'lib/api'
 import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
@@ -60,8 +61,6 @@ import { teamLogic } from 'scenes/teamLogic'
 
 import { Breadcrumb } from '~/types'
 
-import type { eventFilterLogicType } from './eventFilterLogicType'
-
 // Limits — must match MAX_CONDITIONS and MAX_TREE_DEPTH in posthog/models/event_filter_config.py
 export const EVENT_FILTER_MAX_CONDITIONS = 20
 export const EVENT_FILTER_MAX_DEPTH = 5
@@ -244,6 +243,126 @@ export function updateAtPath(node: FilterNode, path: TreePath, updater: (node: F
     return node
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface eventFilterLogicValues {
+    allTestsPass: boolean
+    breadcrumbs: Breadcrumb[]
+    conditionCount: number
+    currentTeamId: number
+    filterForm: EventFilterFormValues
+    filterFormAllErrors: Record<string, any>
+    filterFormChanged: boolean
+    filterFormErrors: DeepPartialMap<EventFilterFormValues, ValidationErrorType>
+    filterFormHasErrors: boolean
+    filterFormManualErrors: Record<string, any>
+    filterFormTouched: boolean
+    filterFormTouches: Record<string, boolean>
+    filterFormValidationErrors: DeepPartialMap<EventFilterFormValues, ValidationErrorType>
+    isFilterFormSubmitting: boolean
+    isFilterFormValid: boolean
+    showFilterFormErrors: boolean
+    testResults: TestResult[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface eventFilterLogicActions {
+    addChild: (pathKeys: TreePath) => {
+        pathKeys: TreePath
+    }
+    addTestCase: () => {
+        value: true
+    }
+    convertToGroup: (
+        pathKeys: TreePath,
+        groupType: 'and' | 'or'
+    ) => {
+        groupType: 'and' | 'or'
+        pathKeys: TreePath
+    }
+    removeChild: (
+        pathKeys: TreePath,
+        childIndex: number
+    ) => {
+        childIndex: number
+        pathKeys: TreePath
+    }
+    removeTestCase: (index: number) => {
+        index: number
+    }
+    resetFilterForm: (values?: EventFilterFormValues) => {
+        values?: EventFilterFormValues
+    }
+    setFilterFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setFilterFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setFilterFormValues: (values: DeepPartial<EventFilterFormValues>) => {
+        values: DeepPartial<EventFilterFormValues>
+    }
+    submitFilterForm: () => {
+        value: boolean
+    }
+    submitFilterFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitFilterFormRequest: (filterForm: EventFilterFormValues) => {
+        filterForm: EventFilterFormValues
+    }
+    submitFilterFormSuccess: (filterForm: EventFilterFormValues) => {
+        filterForm: EventFilterFormValues
+    }
+    touchFilterFormField: (key: string) => {
+        key: string
+    }
+    unwrapNot: (pathKeys: TreePath) => {
+        pathKeys: TreePath
+    }
+    updateTestCase: (
+        index: number,
+        updates: Partial<TestCase>
+    ) => {
+        index: number
+        updates: Partial<TestCase>
+    }
+    updateTreeNode: (
+        pathKeys: TreePath,
+        node: FilterNode
+    ) => {
+        node: FilterNode
+        pathKeys: TreePath
+    }
+    wrapInNot: (pathKeys: TreePath) => {
+        pathKeys: TreePath
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface eventFilterLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        currentTeamId: (currentTeamId: number | null) => number
+        conditionCount: (filterForm: EventFilterFormValues) => number
+        testResults: (filterForm: EventFilterFormValues) => TestResult[]
+        allTestsPass: (testResults: TestResult[], filterForm: EventFilterFormValues) => boolean
+    }
+}
+
+export type eventFilterLogicType = MakeLogicType<
+    eventFilterLogicValues,
+    eventFilterLogicActions,
+    Record<string, any>,
+    eventFilterLogicMeta
+>
+
 // --- Kea logic ---
 
 export const eventFilterLogic = kea<eventFilterLogicType>([
diff --git a/frontend/src/scenes/data-pipelines/legacy-plugins/LegacyPluginScene.tsx b/frontend/src/scenes/data-pipelines/legacy-plugins/LegacyPluginScene.tsx
index d8acf319e122..fecabe7ae4ab 100644
--- a/frontend/src/scenes/data-pipelines/legacy-plugins/LegacyPluginScene.tsx
+++ b/frontend/src/scenes/data-pipelines/legacy-plugins/LegacyPluginScene.tsx
@@ -1,4 +1,4 @@
-import { actions, kea, key, path, props, reducers, selectors, useActions, useValues } from 'kea'
+import { MakeLogicType, actions, kea, key, path, props, reducers, selectors, useActions, useValues } from 'kea'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 
 import { ActivityLog } from 'lib/components/ActivityLog/ActivityLog'
@@ -9,7 +9,6 @@ import { urls } from 'scenes/urls'
 
 import { ActivityScope, Breadcrumb } from '~/types'
 
-import type { legacyPluginSceneLogicType } from './LegacyPluginSceneType'
 import { PipelineNodeLogs } from './PipelineNodeLogs'
 import { PipelineNodeMetrics } from './PipelineNodeMetrics'
 
@@ -20,6 +19,35 @@ export interface LegacyPluginSceneLogicProps {
     id: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface legacyPluginSceneLogicValues {
+    breadcrumbs: Breadcrumb[]
+    currentTab: LegacyPluginSceneTab
+    logicProps: any
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface legacyPluginSceneLogicActions {
+    setCurrentTab: (tab: LegacyPluginSceneTab) => {
+        tab: 'configuration' | 'history' | 'logs' | 'metrics'
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface legacyPluginSceneLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        logicProps: (arg: any) => any
+    }
+}
+
+export type legacyPluginSceneLogicType = MakeLogicType<
+    legacyPluginSceneLogicValues,
+    legacyPluginSceneLogicActions,
+    LegacyPluginSceneLogicProps,
+    legacyPluginSceneLogicMeta
+>
+
 export const legacyPluginSceneLogic = kea<legacyPluginSceneLogicType>([
     props({} as LegacyPluginSceneLogicProps),
     key(({ id }: LegacyPluginSceneLogicProps) => id ?? 'new'),
diff --git a/frontend/src/scenes/data-pipelines/legacy-plugins/pipelineNodeLogsLogic.tsx b/frontend/src/scenes/data-pipelines/legacy-plugins/pipelineNodeLogsLogic.tsx
index 3c25ddf9477f..a52debd7ea9d 100644
--- a/frontend/src/scenes/data-pipelines/legacy-plugins/pipelineNodeLogsLogic.tsx
+++ b/frontend/src/scenes/data-pipelines/legacy-plugins/pipelineNodeLogsLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, connect, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { LemonTableColumns, Link } from '@posthog/lemon-ui'
@@ -11,8 +11,6 @@ import { teamLogic } from 'scenes/teamLogic'
 import api from '~/lib/api'
 import { LogEntry, LogEntryLevel, LogEntryRequestParams } from '~/types'
 
-import type { pipelineNodeLogsLogicType } from './pipelineNodeLogsLogicType'
-
 export function LogLevelDisplay(level: LogEntryLevel): JSX.Element {
     let color: string | undefined
     switch (level) {
@@ -61,6 +59,122 @@ type BatchExportNodeId = {
 
 export type PipelineNodeLimitedType = PluginNodeId | BatchExportNodeId
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface pipelineNodeLogsLogicValues {
+    currentTeamId: number | null // teamLogic
+    backgroundLogs: LogEntry[]
+    backgroundLogsLoading: boolean
+    columns: LemonTableColumns<LogEntry>
+    instanceId: string | null
+    isThereMoreToLoad: boolean
+    leadingEntry: LogEntry | null
+    logs: LogEntry[]
+    logsLoading: boolean
+    node: PipelineNodeLimitedType
+    searchTerm: string
+    selectedLogLevels: LogEntryLevel[]
+    selectedLogLevelsForAPI: LogEntryLevel[]
+    trailingEntry: LogEntry | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface pipelineNodeLogsLogicActions {
+    clearBackgroundLogs: () => {
+        value: true
+    }
+    loadLogs: () => any
+    loadLogsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadLogsSuccess: (
+        logs: LogEntry[],
+        payload?: any
+    ) => {
+        logs: LogEntry[]
+        payload?: any
+    }
+    loadMoreLogs: () => any
+    loadMoreLogsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadMoreLogsSuccess: (
+        logs: LogEntry[],
+        payload?: any
+    ) => {
+        logs: LogEntry[]
+        payload?: any
+    }
+    markLogsEnd: () => {
+        value: true
+    }
+    pollBackgroundLogs: () => any
+    pollBackgroundLogsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    pollBackgroundLogsSuccess: (
+        backgroundLogs: LogEntry[],
+        payload?: any
+    ) => {
+        backgroundLogs: LogEntry[]
+        payload?: any
+    }
+    revealBackground: () => any
+    revealBackgroundFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    revealBackgroundSuccess: (
+        logs: LogEntry[],
+        payload?: any
+    ) => {
+        logs: LogEntry[]
+        payload?: any
+    }
+    setInstanceId: (instanceId: string | null) => {
+        instanceId: string | null
+    }
+    setSearchTerm: (searchTerm: string) => {
+        searchTerm: string
+    }
+    setSelectedLogLevels: (levels: LogEntryLevel[]) => {
+        levels: LogEntryLevel[]
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface pipelineNodeLogsLogicMeta {
+    key: number | string
+    __keaTypeGenInternalSelectorTypes: {
+        node: (id: number | string) => PipelineNodeLimitedType
+        leadingEntry: (logs: LogEntry[], backgroundLogs: LogEntry[]) => LogEntry | null
+        trailingEntry: (logs: LogEntry[], backgroundLogs: LogEntry[]) => LogEntry | null
+        columns: (node: PipelineNodeLimitedType) => LemonTableColumns<LogEntry>
+        selectedLogLevelsForAPI: (selectedLogLevels: LogEntryLevel[]) => LogEntryLevel[]
+    }
+}
+
+export type pipelineNodeLogsLogicType = MakeLogicType<
+    pipelineNodeLogsLogicValues,
+    pipelineNodeLogsLogicActions,
+    PipelineNodeLogsLogicProps,
+    pipelineNodeLogsLogicMeta
+>
+
 export const pipelineNodeLogsLogic = kea<pipelineNodeLogsLogicType>([
     props({} as PipelineNodeLogsLogicProps),
     key(({ id }) => id),
@@ -199,7 +313,7 @@ export const pipelineNodeLogsLogic = kea<pipelineNodeLogsLogicType>([
     selectors(({ actions, values }) => ({
         node: [
             (_, p) => [p.id],
-            (id): PipelineNodeLimitedType => {
+            (id: number | string): PipelineNodeLimitedType => {
                 if (typeof id === 'string') {
                     return { backend: PipelineBackend.BatchExport, id }
                 }
@@ -233,7 +347,7 @@ export const pipelineNodeLogsLogic = kea<pipelineNodeLogsLogicType>([
         ],
         columns: [
             (s) => [s.node],
-            (node): LemonTableColumns<LogEntry> => {
+            (node: PipelineNodeLimitedType): LemonTableColumns<LogEntry> => {
                 return [
                     {
                         title: 'Timestamp',
@@ -288,7 +402,7 @@ export const pipelineNodeLogsLogic = kea<pipelineNodeLogsLogicType>([
 
         selectedLogLevelsForAPI: [
             (s) => [s.selectedLogLevels],
-            (logLevels): LogEntryLevel[] => {
+            (logLevels: LogEntryLevel[]): LogEntryLevel[] => {
                 const uniqueLevels = new Set(logLevels)
                 if (uniqueLevels.has('WARN')) {
                     uniqueLevels.add('WARNING')
diff --git a/frontend/src/scenes/data-pipelines/legacy-plugins/pipelinePluginConfigurationLogic.tsx b/frontend/src/scenes/data-pipelines/legacy-plugins/pipelinePluginConfigurationLogic.tsx
index 911e2c7ac55f..7dc8f9e5d3fb 100644
--- a/frontend/src/scenes/data-pipelines/legacy-plugins/pipelinePluginConfigurationLogic.tsx
+++ b/frontend/src/scenes/data-pipelines/legacy-plugins/pipelinePluginConfigurationLogic.tsx
@@ -1,5 +1,6 @@
-import { afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { beforeUnload, router } from 'kea-router'
 
@@ -11,13 +12,13 @@ import { urls } from 'scenes/urls'
 
 import { PluginConfigWithPluginInfoNew, PluginType } from '~/types'
 
+import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
 import {
     defaultConfigForPlugin,
     determineInvisibleFields,
     determineRequiredFields,
     getPluginConfigFormData,
 } from './configUtils'
-import type { pipelinePluginConfigurationLogicType } from './pipelinePluginConfigurationLogicType'
 
 export interface PipelinePluginConfigurationLogicProps {
     pluginId: number | null
@@ -43,6 +44,160 @@ function getDefaultConfiguration(plugin: PluginType): Record<string, any> {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface pipelinePluginConfigurationLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    currentOrganizationId: string // organizationLogic
+    currentTeamId: number | null // teamLogic
+    configuration: Record<string, any>
+    configurationAllErrors: Record<string, any>
+    configurationChanged: boolean
+    configurationErrors: DeepPartialMap<Record<string, any>, ValidationErrorType>
+    configurationHasErrors: boolean
+    configurationManualErrors: Record<string, any>
+    configurationTouched: boolean
+    configurationTouches: Record<string, boolean>
+    configurationValidationErrors: DeepPartialMap<Record<string, any>, ValidationErrorType>
+    hiddenFields: string[]
+    isConfigurationSubmitting: boolean
+    isConfigurationValid: boolean
+    isNew: boolean
+    loading: boolean
+    plugin: PluginType | null
+    pluginConfig: PluginConfigWithPluginInfoNew | null
+    pluginConfigLoading: boolean
+    pluginFromPluginId: PluginType | null
+    pluginFromPluginIdLoading: boolean
+    requiredFields: string[]
+    savedConfiguration: Record<string, any> | undefined
+    showConfigurationErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface pipelinePluginConfigurationLogicActions {
+    loadPlugin: () => any
+    loadPluginConfig: () => any
+    loadPluginConfigFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPluginConfigSuccess: (
+        pluginConfig: PluginConfigWithPluginInfoNew | null,
+        payload?: any
+    ) => {
+        pluginConfig: PluginConfigWithPluginInfoNew | null
+        payload?: any
+    }
+    loadPluginFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPluginSuccess: (
+        pluginFromPluginId: PluginType | null,
+        payload?: any
+    ) => {
+        pluginFromPluginId: PluginType | null
+        payload?: any
+    }
+    migrateToHogFunction: () => any
+    migrateToHogFunctionFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    migrateToHogFunctionSuccess: (
+        pluginConfig: PluginConfigWithPluginInfoNew | null,
+        payload?: any
+    ) => {
+        pluginConfig: PluginConfigWithPluginInfoNew | null
+        payload?: any
+    }
+    resetConfiguration: (values?: Record<string, any>) => {
+        values?: Record<string, any>
+    }
+    setConfigurationManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setConfigurationValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setConfigurationValues: (values: DeepPartial<Record<string, any>>) => {
+        values: DeepPartial<Record<string, any>>
+    }
+    submitConfiguration: () => {
+        value: boolean
+    }
+    submitConfigurationFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitConfigurationRequest: (configuration: Record<string, any>) => {
+        configuration: Record<string, any>
+    }
+    submitConfigurationSuccess: (configuration: Record<string, any>) => {
+        configuration: Record<string, any>
+    }
+    touchConfigurationField: (key: string) => {
+        key: string
+    }
+    updatePluginConfig: (formdata: Record<string, any>) => Record<string, any>
+    updatePluginConfigFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updatePluginConfigSuccess: (
+        pluginConfig: PluginConfigWithPluginInfoNew | null,
+        payload?: Record<string, any>
+    ) => {
+        pluginConfig: PluginConfigWithPluginInfoNew | null
+        payload?: Record<string, any>
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface pipelinePluginConfigurationLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        plugin: (
+            pluginFromPluginId: PluginType | null,
+            pluginConfig: PluginConfigWithPluginInfoNew | null
+        ) => PluginType | null
+        loading: (pluginFromPluginIdLoading: boolean, pluginConfigLoading: boolean) => boolean
+        savedConfiguration: (
+            pluginConfig: PluginConfigWithPluginInfoNew | null,
+            plugin: PluginType | null
+        ) => Record<string, any> | undefined
+        requiredFields: (plugin: PluginType | null, configuration: Record<string, any>) => string[]
+        hiddenFields: (plugin: PluginType | null, configuration: Record<string, any>) => string[]
+        isNew: (pluginConfigId: number | null) => boolean
+    }
+}
+
+export type pipelinePluginConfigurationLogicType = MakeLogicType<
+    pipelinePluginConfigurationLogicValues,
+    pipelinePluginConfigurationLogicActions,
+    PipelinePluginConfigurationLogicProps,
+    pipelinePluginConfigurationLogicMeta
+>
+
 export const pipelinePluginConfigurationLogic = kea<pipelinePluginConfigurationLogicType>([
     props({} as PipelinePluginConfigurationLogicProps),
     key(({ pluginId, pluginConfigId }: PipelinePluginConfigurationLogicProps) => {
@@ -170,15 +325,16 @@ export const pipelinePluginConfigurationLogic = kea<pipelinePluginConfigurationL
     selectors(() => ({
         plugin: [
             (s) => [s.pluginFromPluginId, s.pluginConfig],
-            (pluginFromId, pluginConfig) => pluginConfig?.plugin_info || pluginFromId,
+            (pluginFromId: PluginType | null, pluginConfig: PluginConfigWithPluginInfoNew | null) =>
+                pluginConfig?.plugin_info || pluginFromId,
         ],
         loading: [
             (s) => [s.pluginFromPluginIdLoading, s.pluginConfigLoading],
-            (pluginLoading, pluginConfigLoading) => pluginLoading || pluginConfigLoading,
+            (pluginLoading: boolean, pluginConfigLoading: boolean) => pluginLoading || pluginConfigLoading,
         ],
         savedConfiguration: [
             (s) => [s.pluginConfig, s.plugin],
-            (pluginConfig, plugin) => {
+            (pluginConfig: PluginConfigWithPluginInfoNew | null, plugin: PluginType | null) => {
                 if (!pluginConfig || !plugin) {
                     return {}
                 }
@@ -192,7 +348,7 @@ export const pipelinePluginConfigurationLogic = kea<pipelinePluginConfigurationL
         ],
         requiredFields: [
             (s) => [s.plugin, s.configuration],
-            (plugin, configuration): string[] => {
+            (plugin: PluginType | null, configuration: Record<string, any>): string[] => {
                 if (!plugin || !configuration) {
                     return []
                 }
@@ -201,14 +357,14 @@ export const pipelinePluginConfigurationLogic = kea<pipelinePluginConfigurationL
         ],
         hiddenFields: [
             (s) => [s.plugin, s.configuration],
-            (plugin, configuration): string[] => {
+            (plugin: PluginType | null, configuration: Record<string, any>): string[] => {
                 if (!plugin || !configuration) {
                     return []
                 }
                 return determineInvisibleFields((fieldName) => configuration[fieldName], plugin)
             },
         ],
-        isNew: [(_, p) => [p.pluginConfigId], (pluginConfigId): boolean => !pluginConfigId],
+        isNew: [(_, p) => [p.pluginConfigId], (pluginConfigId: number | null): boolean => !pluginConfigId],
     })),
     forms(({ asyncActions, values }) => ({
         configuration: {
diff --git a/frontend/src/scenes/data-pipelines/transformationsSceneLogic.ts b/frontend/src/scenes/data-pipelines/transformationsSceneLogic.ts
index c98379d8abd6..f3db6749cf0e 100644
--- a/frontend/src/scenes/data-pipelines/transformationsSceneLogic.ts
+++ b/frontend/src/scenes/data-pipelines/transformationsSceneLogic.ts
@@ -1,8 +1,9 @@
-import { kea, path } from 'kea'
+import { MakeLogicType, kea, path } from 'kea'
 
 import { Breadcrumb } from '~/types'
 
-import type { transformationsSceneLogicType } from './transformationsSceneLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export type transformationsSceneLogicType = MakeLogicType<{}, {}>
 
 export const transformationsSceneLogic = kea<transformationsSceneLogicType>([
     path(['scenes', 'data-pipelines', 'transformationsSceneLogic']),
diff --git a/frontend/src/scenes/data-pipelines/utils/nonHogFunctionTemplatesLogic.tsx b/frontend/src/scenes/data-pipelines/utils/nonHogFunctionTemplatesLogic.tsx
index cb9dab9c43b7..bd5517dc8808 100644
--- a/frontend/src/scenes/data-pipelines/utils/nonHogFunctionTemplatesLogic.tsx
+++ b/frontend/src/scenes/data-pipelines/utils/nonHogFunctionTemplatesLogic.tsx
@@ -1,4 +1,4 @@
-import { connect, kea, path, props, selectors } from 'kea'
+import { MakeLogicType, connect, kea, path, props, selectors } from 'kea'
 
 import { Link } from '@posthog/lemon-ui'
 
@@ -13,8 +13,9 @@ import { BATCH_EXPORT_SERVICE_NAMES, HogFunctionTemplateStatus, HogFunctionTempl
 import { sourceWizardLogic } from 'products/data_warehouse/frontend/scenes/NewSourceScene/sourceWizardLogic'
 import { DATA_WAREHOUSE_SOURCE_ICON_MAP } from 'products/data_warehouse/frontend/shared/components/SourceIcon'
 
+import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
+import type { ManualLinkSourceType, UserType } from '../../../types'
 import { BATCH_EXPORT_ICON_MAP } from '../batch-exports/BatchExportIcon'
-import type { nonHogFunctionTemplatesLogicType } from './nonHogFunctionTemplatesLogicType'
 
 export interface NonHogFunctionTemplatesLogicProps {
     availableSources: Record<string, SourceConfig>
@@ -54,6 +55,44 @@ export function getSourceDisplayStatus(unreleased: boolean, featureFlag: boolean
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface nonHogFunctionTemplatesLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    connectors: SourceConfig[] // sourceWizardLogic
+    manualConnectors: {
+        name: string
+        type: ManualLinkSourceType
+    }[] // sourceWizardLogic
+    user: UserType | null // userLogic
+    hogFunctionTemplatesBatchExports: HogFunctionTemplateType[]
+    hogFunctionTemplatesDataWarehouseSources: HogFunctionTemplateType[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface nonHogFunctionTemplatesLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        hogFunctionTemplatesDataWarehouseSources: (
+            connectors: SourceConfig[],
+            manualConnectors: {
+                name: string
+                type: ManualLinkSourceType
+            }[],
+            featureFlags: FeatureFlagsSet
+        ) => HogFunctionTemplateType[]
+        hogFunctionTemplatesBatchExports: (
+            featureFlags: FeatureFlagsSet,
+            user: UserType | null
+        ) => HogFunctionTemplateType[]
+    }
+}
+
+export type nonHogFunctionTemplatesLogicType = MakeLogicType<
+    nonHogFunctionTemplatesLogicValues,
+    {},
+    NonHogFunctionTemplatesLogicProps,
+    nonHogFunctionTemplatesLogicMeta
+>
+
 export const nonHogFunctionTemplatesLogic = kea<nonHogFunctionTemplatesLogicType>([
     props({} as NonHogFunctionTemplatesLogicProps),
     path((key) => ['scenes', 'data-pipelines', 'utils', 'nonHogFunctionTemplatesLogic', key]),
@@ -72,7 +111,14 @@ export const nonHogFunctionTemplatesLogic = kea<nonHogFunctionTemplatesLogicType
     selectors({
         hogFunctionTemplatesDataWarehouseSources: [
             (s) => [s.connectors, s.manualConnectors, s.featureFlags],
-            (connectors, manualConnectors, featureFlags): HogFunctionTemplateType[] => {
+            (
+                connectors: SourceConfig[],
+                manualConnectors: {
+                    name: string
+                    type: import('~/types').ManualLinkSourceType
+                }[],
+                featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet
+            ): HogFunctionTemplateType[] => {
                 const managed = connectors.map((connector: SourceConfig): HogFunctionTemplateType => {
                     const featureFlagDefined = !!connector.featureFlag
                     const featureFlagRaw = featureFlags[connector.featureFlag as FeatureFlagKey]
@@ -137,7 +183,10 @@ export const nonHogFunctionTemplatesLogic = kea<nonHogFunctionTemplatesLogicType
 
         hogFunctionTemplatesBatchExports: [
             (s) => [s.featureFlags, s.user],
-            (featureFlags, user): HogFunctionTemplateType[] => {
+            (
+                featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet,
+                user: null | import('~/types').UserType
+            ): HogFunctionTemplateType[] => {
                 // HTTP is currently only used for Cloud to Cloud migrations and shouldn't be accessible to users
                 const httpEnabled =
                     featureFlags[FEATURE_FLAGS.BATCH_EXPORTS_POSTHOG_HTTP] || user?.is_impersonated || user?.is_staff
diff --git a/frontend/src/scenes/data-pipelines/utils/nonHogFunctionsLogic.tsx b/frontend/src/scenes/data-pipelines/utils/nonHogFunctionsLogic.tsx
index 76e230eb3b6b..4e343ba311cc 100644
--- a/frontend/src/scenes/data-pipelines/utils/nonHogFunctionsLogic.tsx
+++ b/frontend/src/scenes/data-pipelines/utils/nonHogFunctionsLogic.tsx
@@ -1,4 +1,4 @@
-import { connect, kea, path } from 'kea'
+import { MakeLogicType, connect, kea, path } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -12,9 +12,77 @@ import { HogFunctionType, PluginConfigTypeNew, PluginType } from '~/types'
 
 import { sourceWizardLogic } from 'products/data_warehouse/frontend/scenes/NewSourceScene/sourceWizardLogic'
 
+import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
+import type { SourceConfig } from '../../../queries/schema/schema-general'
+import type { UserType } from '../../../types'
 import { BATCH_EXPORT_ICON_MAP } from '../batch-exports/BatchExportIcon'
 import { humanizeBatchExportDescription } from '../batch-exports/utils'
-import type { nonHogFunctionsLogicType } from './nonHogFunctionsLogicType'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface nonHogFunctionsLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    currentOrganizationId: string // organizationLogic
+    connectors: SourceConfig[] // sourceWizardLogic
+    currentProjectId: number | string // teamLogic
+    user: UserType | null // userLogic
+    hogFunctionBatchExports: HogFunctionType[] | null
+    hogFunctionBatchExportsLoading: boolean
+    hogFunctionPluginsDestinations: HogFunctionType[] | null
+    hogFunctionPluginsDestinationsLoading: boolean
+    hogFunctionPluginsSiteApps: HogFunctionType[] | null
+    hogFunctionPluginsSiteAppsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface nonHogFunctionsLogicActions {
+    loadHogFunctionBatchExports: () => any
+    loadHogFunctionBatchExportsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadHogFunctionBatchExportsSuccess: (
+        hogFunctionBatchExports: HogFunctionType[],
+        payload?: any
+    ) => {
+        hogFunctionBatchExports: HogFunctionType[]
+        payload?: any
+    }
+    loadHogFunctionPluginsDestinations: () => any
+    loadHogFunctionPluginsDestinationsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadHogFunctionPluginsDestinationsSuccess: (
+        hogFunctionPluginsDestinations: HogFunctionType[],
+        payload?: any
+    ) => {
+        hogFunctionPluginsDestinations: HogFunctionType[]
+        payload?: any
+    }
+    loadHogFunctionPluginsSiteApps: () => any
+    loadHogFunctionPluginsSiteAppsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadHogFunctionPluginsSiteAppsSuccess: (
+        hogFunctionPluginsSiteApps: HogFunctionType[],
+        payload?: any
+    ) => {
+        hogFunctionPluginsSiteApps: HogFunctionType[]
+        payload?: any
+    }
+}
+
+export type nonHogFunctionsLogicType = MakeLogicType<nonHogFunctionsLogicValues, nonHogFunctionsLogicActions>
 
 export const nonHogFunctionsLogic = kea<nonHogFunctionsLogicType>([
     path((key) => ['scenes', 'data-pipelines', 'utils', 'nonHogFunctionsLogic', key]),
diff --git a/frontend/src/scenes/data-pipelines/webScriptsSceneLogic.ts b/frontend/src/scenes/data-pipelines/webScriptsSceneLogic.ts
index 996d12231e0b..7eb5713f777d 100644
--- a/frontend/src/scenes/data-pipelines/webScriptsSceneLogic.ts
+++ b/frontend/src/scenes/data-pipelines/webScriptsSceneLogic.ts
@@ -1,9 +1,21 @@
-import { actions, kea, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers } from 'kea'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 
 import { Breadcrumb } from '~/types'
 
-import type { webScriptsSceneLogicType } from './webScriptsSceneLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface webScriptsSceneLogicValues {
+    activeTab: 'all' | 'history'
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface webScriptsSceneLogicActions {
+    setActiveTab: (tab: 'all' | 'history') => {
+        tab: 'all' | 'history'
+    }
+}
+
+export type webScriptsSceneLogicType = MakeLogicType<webScriptsSceneLogicValues, webScriptsSceneLogicActions>
 
 export const webScriptsSceneLogic = kea<webScriptsSceneLogicType>([
     path(['scenes', 'data-pipelines', 'webScriptsSceneLogic']),
diff --git a/frontend/src/scenes/data-warehouse/dataWarehouseSceneLogic.ts b/frontend/src/scenes/data-warehouse/dataWarehouseSceneLogic.ts
index 2d9d3f93460f..209b79d4ae6e 100644
--- a/frontend/src/scenes/data-warehouse/dataWarehouseSceneLogic.ts
+++ b/frontend/src/scenes/data-warehouse/dataWarehouseSceneLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, path, reducers, selectors } from 'kea'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 
 import { FEATURE_FLAGS } from 'lib/constants'
@@ -7,7 +7,8 @@ import { urls } from 'scenes/urls'
 
 import { SIDE_PANEL_CONTEXT_KEY, SidePanelSceneContext } from '~/layout/navigation-3000/sidepanel/types'
 
-import type { dataWarehouseSceneLogicType } from './dataWarehouseSceneLogicType'
+import type { WarehouseStatusResponseApi } from '../../../../products/data_warehouse/frontend/generated/api.schemas'
+import type { FeatureFlagsSet } from '../../lib/logic/featureFlagLogic'
 import { warehouseProvisioningLogic } from './scene/warehouseProvisioningLogic'
 
 export enum DataWarehouseTab {
@@ -20,6 +21,55 @@ function isDataWarehouseTab(tab: unknown): tab is DataWarehouseTab {
     return typeof tab === 'string' && (Object.values(DataWarehouseTab) as string[]).includes(tab)
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataWarehouseSceneLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    warehouseStatus: WarehouseStatusResponseApi | null // warehouseProvisioningLogic
+    activeTab: DataWarehouseTab | null
+    availableTabs: DataWarehouseTab[]
+    selectedTab: DataWarehouseTab | null
+    sidePanelContext: SidePanelSceneContext
+    warehouseReady: boolean
+    warehouseStatusResolved: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataWarehouseSceneLogicActions {
+    loadWarehouseStatusFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    } // warehouseProvisioningLogic
+    loadWarehouseStatusSuccess: (
+        warehouseStatus: WarehouseStatusResponseApi | null,
+        payload?: any
+    ) => {
+        payload?: any
+        warehouseStatus: WarehouseStatusResponseApi | null
+    } // warehouseProvisioningLogic
+    setActiveTab: (tab: DataWarehouseTab | null) => {
+        tab: DataWarehouseTab | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataWarehouseSceneLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        warehouseReady: (warehouseStatus: WarehouseStatusResponseApi | null) => boolean
+        availableTabs: (featureFlags: FeatureFlagsSet, warehouseReady: boolean) => DataWarehouseTab[]
+        activeTab: (selectedTab: DataWarehouseTab | null, availableTabs: DataWarehouseTab[]) => DataWarehouseTab | null
+    }
+}
+
+export type dataWarehouseSceneLogicType = MakeLogicType<
+    dataWarehouseSceneLogicValues,
+    dataWarehouseSceneLogicActions,
+    Record<string, any>,
+    dataWarehouseSceneLogicMeta
+>
+
 // Single source of truth for which tabs the Data ops scene exposes. The scene, the URL
 // state, and the default tab all derive from availableTabs / activeTab below.
 export const dataWarehouseSceneLogic = kea<dataWarehouseSceneLogicType>([
@@ -52,10 +102,20 @@ export const dataWarehouseSceneLogic = kea<dataWarehouseSceneLogicType>([
     selectors({
         // A warehouse that isn't serving yet has nothing to report on, so Overview stays hidden
         // until it's ready and the scene shows the setup form on its own.
-        warehouseReady: [(s) => [s.warehouseStatus], (warehouseStatus): boolean => warehouseStatus?.state === 'ready'],
+        warehouseReady: [
+            (s) => [s.warehouseStatus],
+            (
+                warehouseStatus:
+                    | null
+                    | import('products/data_warehouse/frontend/generated/api.schemas').WarehouseStatusResponseApi
+            ): boolean => warehouseStatus?.state === 'ready',
+        ],
         availableTabs: [
             (s) => [s.featureFlags, s.warehouseReady],
-            (featureFlags, warehouseReady): DataWarehouseTab[] => {
+            (
+                featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet,
+                warehouseReady: boolean
+            ): DataWarehouseTab[] => {
                 const tabs: DataWarehouseTab[] = []
                 if (featureFlags[FEATURE_FLAGS.DATA_WAREHOUSE_SCENE] && warehouseReady) {
                     tabs.push(DataWarehouseTab.OVERVIEW)
@@ -73,7 +133,7 @@ export const dataWarehouseSceneLogic = kea<dataWarehouseSceneLogicType>([
         // lives here rather than in urlToAction so it re-derives when the warehouse status lands.
         activeTab: [
             (s) => [s.selectedTab, s.availableTabs],
-            (selectedTab, availableTabs): DataWarehouseTab | null =>
+            (selectedTab: DataWarehouseTab | null, availableTabs: DataWarehouseTab[]): DataWarehouseTab | null =>
                 selectedTab && availableTabs.includes(selectedTab) ? selectedTab : (availableTabs[0] ?? null),
         ],
         [SIDE_PANEL_CONTEXT_KEY]: [
diff --git a/frontend/src/scenes/data-warehouse/editor/connectionSelectorLogic.ts b/frontend/src/scenes/data-warehouse/editor/connectionSelectorLogic.ts
index 14d128d43ab4..31cc7a627032 100644
--- a/frontend/src/scenes/data-warehouse/editor/connectionSelectorLogic.ts
+++ b/frontend/src/scenes/data-warehouse/editor/connectionSelectorLogic.ts
@@ -1,4 +1,4 @@
-import { afterMount, connect, kea, listeners, path, selectors } from 'kea'
+import { MakeLogicType, afterMount, connect, kea, listeners, path, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -15,7 +15,8 @@ import IconSnowflake from 'public/services/snowflake.png'
 
 import { sourcesDataLogic } from 'products/data_warehouse/frontend/shared/logics/sourcesDataLogic'
 
-import type { connectionSelectorLogicType } from './connectionSelectorLogicType'
+import type { PaginatedResponse } from '../../../lib/api'
+import type { ExternalDataSource } from '../../../types'
 
 export const POSTHOG_WAREHOUSE = '__posthog_warehouse__'
 export const LOADING_CONNECTIONS = '__loading_connections__'
@@ -85,6 +86,76 @@ export function getConnectionSelectorValue(
     return POSTHOG_WAREHOUSE
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface connectionSelectorLogicValues {
+    connectionOptions: ExternalDataSourceConnectionOption[] | null
+    connectionOptionsLoading: boolean
+    connectionSelectOptions: ConnectionSelectOptionGroup[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface connectionSelectorLogicActions {
+    loadSourcesSuccess: (
+        dataWarehouseSources:
+            | PaginatedResponse<ExternalDataSource>
+            | {
+                  count: number
+                  next: null
+                  previous: null
+                  results: never[]
+              },
+        payload?:
+            | {
+                  value: true
+              }
+            | undefined
+    ) => {
+        dataWarehouseSources:
+            | PaginatedResponse<ExternalDataSource>
+            | {
+                  count: number
+                  next: null
+                  previous: null
+                  results: never[]
+              }
+        payload?: {
+            value: true
+        }
+    } // sourcesDataLogic
+    loadConnectionOptions: () => any
+    loadConnectionOptionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadConnectionOptionsSuccess: (
+        connectionOptions: ExternalDataSourceConnectionOption[],
+        payload?: any
+    ) => {
+        connectionOptions: ExternalDataSourceConnectionOption[]
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface connectionSelectorLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        connectionSelectOptions: (
+            connectionOptions: ExternalDataSourceConnectionOption[] | null,
+            connectionOptionsLoading: boolean
+        ) => ConnectionSelectOptionGroup[]
+    }
+}
+
+export type connectionSelectorLogicType = MakeLogicType<
+    connectionSelectorLogicValues,
+    connectionSelectorLogicActions,
+    Record<string, any>,
+    connectionSelectorLogicMeta
+>
+
 export const connectionSelectorLogic = kea<connectionSelectorLogicType>([
     path(['scenes', 'data-warehouse', 'editor', 'connectionSelectorLogic']),
     connect(() => ({
diff --git a/frontend/src/scenes/data-warehouse/editor/draftsLogic.tsx b/frontend/src/scenes/data-warehouse/editor/draftsLogic.tsx
index 72305437459c..9dd8f9f683ed 100644
--- a/frontend/src/scenes/data-warehouse/editor/draftsLogic.tsx
+++ b/frontend/src/scenes/data-warehouse/editor/draftsLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
@@ -9,9 +9,113 @@ import api, { ApiError, PaginatedResponse } from 'lib/api'
 import { HogQLQuery } from '~/queries/schema/schema-general'
 import { DataWarehouseSavedQueryDraft } from '~/types'
 
-import type { draftsLogicType } from './draftsLogicType'
 import { QueryTab } from './sqlEditorLogic'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface draftsLogicValues {
+    drafts: DataWarehouseSavedQueryDraft[]
+    draftsResponse: PaginatedResponse<DataWarehouseSavedQueryDraft>
+    draftsResponseLoading: boolean
+    hasMoreDrafts: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface draftsLogicActions {
+    deleteDraft: (
+        draftId: string,
+        viewName?: string
+    ) => {
+        draftId: string
+        viewName: string | undefined
+    }
+    deleteDraftSuccess: (
+        draftId: string,
+        viewName?: string
+    ) => {
+        draftId: string
+        viewName: string | undefined
+    }
+    loadDrafts: () => any
+    loadDraftsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadDraftsSuccess: (
+        draftsResponse: PaginatedResponse<DataWarehouseSavedQueryDraft>,
+        payload?: any
+    ) => {
+        draftsResponse: PaginatedResponse<DataWarehouseSavedQueryDraft>
+        payload?: any
+    }
+    loadMoreDrafts: () => any
+    loadMoreDraftsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadMoreDraftsSuccess: (
+        draftsResponse: PaginatedResponse<DataWarehouseSavedQueryDraft>,
+        payload?: any
+    ) => {
+        draftsResponse: PaginatedResponse<DataWarehouseSavedQueryDraft>
+        payload?: any
+    }
+    renameDraft: (
+        draftId: string,
+        name: string
+    ) => {
+        draftId: string
+        name: string
+    }
+    saveAsDraft: (
+        query: HogQLQuery,
+        viewId: string,
+        tab: QueryTab
+    ) => {
+        query: HogQLQuery
+        tab: QueryTab
+        viewId: string
+    }
+    saveAsDraftSuccess: (
+        draft: DataWarehouseSavedQueryDraft,
+        tab: QueryTab
+    ) => {
+        draft: DataWarehouseSavedQueryDraft
+        tab: QueryTab
+    }
+    saveOrUpdateDraft: (
+        query: HogQLQuery,
+        viewId?: string,
+        draftId?: string,
+        activeTab?: QueryTab
+    ) => {
+        activeTab: QueryTab | undefined
+        draftId: string | undefined
+        query: HogQLQuery
+        viewId: string | undefined
+    }
+    setDrafts: (drafts: DataWarehouseSavedQueryDraft[]) => {
+        drafts: DataWarehouseSavedQueryDraft[]
+    }
+    updateDraft: (draft: DataWarehouseSavedQueryDraft) => {
+        draft: DataWarehouseSavedQueryDraft
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface draftsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        hasMoreDrafts: (draftsResponse: PaginatedResponse<DataWarehouseSavedQueryDraft>) => boolean
+    }
+}
+
+export type draftsLogicType = MakeLogicType<draftsLogicValues, draftsLogicActions, Record<string, any>, draftsLogicMeta>
+
 export const draftsLogic = kea<draftsLogicType>([
     path(['scenes', 'data-warehouse', 'editor', 'draftsLogic']),
 
@@ -70,7 +174,10 @@ export const draftsLogic = kea<draftsLogicType>([
         ],
     }),
     selectors({
-        hasMoreDrafts: [(s) => [s.draftsResponse], (draftsResponse) => draftsResponse.next !== null],
+        hasMoreDrafts: [
+            (s) => [s.draftsResponse],
+            (draftsResponse: PaginatedResponse<DataWarehouseSavedQueryDraft>) => draftsResponse.next !== null,
+        ],
     }),
     listeners(({ values, actions }) => ({
         loadDraftsSuccess: ({ draftsResponse }) => {
diff --git a/frontend/src/scenes/data-warehouse/editor/editorSceneLogic.tsx b/frontend/src/scenes/data-warehouse/editor/editorSceneLogic.tsx
index a88d9d174c9e..1a34dea2e78f 100644
--- a/frontend/src/scenes/data-warehouse/editor/editorSceneLogic.tsx
+++ b/frontend/src/scenes/data-warehouse/editor/editorSceneLogic.tsx
@@ -1,5 +1,5 @@
 import { deepEqual as equal } from 'fast-equals'
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 
 import { FEATURE_FLAGS } from 'lib/constants'
 import { copyToClipboard } from 'lib/utils/copyToClipboard'
@@ -11,8 +11,10 @@ import { SIDE_PANEL_CONTEXT_KEY, SidePanelSceneContext } from '~/layout/navigati
 import { DataVisualizationNode, FileSystemIconType, HogQLFilters, NodeKind } from '~/queries/schema/schema-general'
 import { Breadcrumb } from '~/types'
 
-import type { editorSceneLogicType } from './editorSceneLogicType'
 import { normalizeFiltersForUrl, sqlEditorLogic, toDataVisualizationNode } from './sqlEditorLogic'
+import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
+import type { QueryTab, SqlEditorSource } from './sqlEditorLogic'
+import type { DataWarehouseSavedQuery, LinkBreadcrumb, QueryBasedInsightModel } from '../../../types'
 
 export interface SaveAsMenuItem {
     action: 'insight' | 'endpoint' | 'view'
@@ -52,6 +54,101 @@ export interface EditorSceneLogicProps {
     tabId: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface editorSceneLogicValues {
+    activeTab: QueryTab | null; // sqlEditorLogic
+    dashboardId: number | null; // sqlEditorLogic
+    dataLogicKey: string; // sqlEditorLogic
+    editingInsight: QueryBasedInsightModel | null; // sqlEditorLogic
+    editingView: DataWarehouseSavedQuery | undefined; // sqlEditorLogic
+    editorSource: SqlEditorSource; // sqlEditorLogic
+    featureFlags: FeatureFlagsSet; // sqlEditorLogic
+    insightLoading: boolean; // sqlEditorLogic
+    queryInput: string | null; // sqlEditorLogic
+    sourceQuery: DataVisualizationNode; // sqlEditorLogic
+    viewLoading: boolean; // sqlEditorLogic
+    breadcrumbs: Breadcrumb[];
+    isHistoryModalOpen: boolean;
+    saveAsMenuItems: {
+        primary: SaveAsMenuItem;
+        secondary: SaveAsMenuItem[];
+    };
+    sidePanelContext: SidePanelSceneContext;
+    titleSectionProps: {
+        description: string;
+        forceBackTo: LinkBreadcrumb;
+        name: string;
+        resourceType: {
+            type: string;
+        };
+    } | {
+        description?: undefined;
+        forceBackTo: LinkBreadcrumb;
+        name: string;
+        resourceType: {
+            type: string;
+        };
+    } | {
+        description?: undefined;
+        forceBackTo?: undefined;
+        name: string;
+        resourceType: {
+            type: string;
+        };
+    };
+    updateInsightButtonEnabled: boolean;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface editorSceneLogicActions {
+    closeHistoryModal: () => {
+        value: true;
+    };
+    openHistoryModal: () => {
+        value: true;
+    };
+    shareTab: () => {
+        value: true;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface editorSceneLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        breadcrumbs: (activeTab: QueryTab | null) => Breadcrumb[];
+        titleSectionProps: (editingInsight: QueryBasedInsightModel<import("~/queries/schema/schema-general").Node<Record<string, any>>> | null, insightLoading: boolean, editingView: DataWarehouseSavedQuery | undefined, viewLoading: boolean, editorSource: SqlEditorSource, dashboardId: number | null, activeTab: QueryTab | null) => {
+            description: string;
+            forceBackTo: LinkBreadcrumb;
+            name: string;
+            resourceType: {
+                type: string;
+            };
+        } | {
+            description?: undefined;
+            forceBackTo: LinkBreadcrumb;
+            name: string;
+            resourceType: {
+                type: string;
+            };
+        } | {
+            description?: undefined;
+            forceBackTo?: undefined;
+            name: string;
+            resourceType: {
+                type: string;
+            };
+        };
+        saveAsMenuItems: (editorSource: SqlEditorSource, dashboardId: number | null, featureFlags: FeatureFlagsSet) => {
+            primary: SaveAsMenuItem;
+            secondary: SaveAsMenuItem[];
+        };
+        updateInsightButtonEnabled: (sourceQuery: DataVisualizationNode, activeTab: QueryTab | null, editingInsight: QueryBasedInsightModel<import("~/queries/schema/schema-general").Node<Record<string, any>>> | null) => boolean;
+    };
+}
+
+export type editorSceneLogicType = MakeLogicType<editorSceneLogicValues, editorSceneLogicActions, EditorSceneLogicProps, editorSceneLogicMeta>;
+
 export const editorSceneLogic = kea<editorSceneLogicType>([
     path(['data-warehouse', 'editor', 'editorSceneLogic']),
     props({} as EditorSceneLogicProps),
@@ -91,7 +188,7 @@ export const editorSceneLogic = kea<editorSceneLogicType>([
     selectors({
         breadcrumbs: [
             (s) => [s.activeTab],
-            (activeTab): Breadcrumb[] => {
+            (activeTab: QueryTab | null): Breadcrumb[] => {
                 const { draft, insight, view } = activeTab || {}
                 const first = {
                     key: Scene.SQLEditor,
@@ -144,7 +241,7 @@ export const editorSceneLogic = kea<editorSceneLogicType>([
                 s.dashboardId,
                 s.activeTab,
             ],
-            (editingInsight, insightLoading, editingView, viewLoading, editorSource, dashboardId, activeTab) => {
+            (editingInsight: QueryBasedInsightModel<import("~/queries/schema/schema-general").Node<Record<string, any>>> | null, insightLoading: boolean, editingView: DataWarehouseSavedQuery | undefined, viewLoading: boolean, editorSource: SqlEditorSource, dashboardId: number | null, activeTab: QueryTab | null) => {
                 if (editingInsight) {
                     const forceBackTo: Breadcrumb = dashboardId
                         ? {
@@ -262,7 +359,7 @@ export const editorSceneLogic = kea<editorSceneLogicType>([
         ],
         saveAsMenuItems: [
             (s) => [s.editorSource, s.dashboardId, s.featureFlags],
-            (editorSource, dashboardId, featureFlags): { primary: SaveAsMenuItem; secondary: SaveAsMenuItem[] } => {
+            (editorSource: SqlEditorSource, dashboardId: number | null, featureFlags: FeatureFlagsSet): { primary: SaveAsMenuItem; secondary: SaveAsMenuItem[] } => {
                 const endpointsEnabled = !!featureFlags[FEATURE_FLAGS.ENDPOINTS]
                 const saveAsInsightItem: SaveAsMenuItem = {
                     action: 'insight',
@@ -300,7 +397,7 @@ export const editorSceneLogic = kea<editorSceneLogicType>([
         ],
         updateInsightButtonEnabled: [
             (s) => [s.sourceQuery, s.activeTab, s.editingInsight],
-            (sourceQuery, activeTab, editingInsight) => {
+            (sourceQuery: DataVisualizationNode, activeTab: QueryTab | null, editingInsight: QueryBasedInsightModel<import("~/queries/schema/schema-general").Node<Record<string, any>>> | null) => {
                 if (!editingInsight?.query) {
                     return false
                 }
diff --git a/frontend/src/scenes/data-warehouse/editor/editorSizingLogic.tsx b/frontend/src/scenes/data-warehouse/editor/editorSizingLogic.tsx
index 841ea63a0517..32e56376d309 100644
--- a/frontend/src/scenes/data-warehouse/editor/editorSizingLogic.tsx
+++ b/frontend/src/scenes/data-warehouse/editor/editorSizingLogic.tsx
@@ -1,9 +1,7 @@
-import { actions, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
 
 import { ResizerLogicProps, resizerLogic } from 'lib/components/Resizer/resizerLogic'
 
-import type { editorSizingLogicType } from './editorSizingLogicType'
-
 export interface EditorSizingLogicProps {
     editorSceneRef: React.RefObject<HTMLDivElement>
     navigatorRef: React.RefObject<HTMLDivElement>
@@ -29,6 +27,75 @@ const DATABASE_TREE_DEFAULT_WIDTH = 300
 const MAXIMUM_DATABASE_TREE_WIDTH = 600
 const DATABASE_TREE_COLLAPSED_WIDTH = 48
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface editorSizingLogicValues {
+    databaseTreeDesiredSize: number | null // resizerLogic
+    databaseTreeIsResizing: boolean // resizerLogic
+    queryPaneDesiredSize: number | null // resizerLogic
+    sidebarDesiredSize: number | null // resizerLogic
+    sourceNavigatorDesiredSize: number | null // resizerLogic
+    databaseTreeResizerProps: ResizerLogicProps
+    databaseTreeWidth: number
+    databaseTreeWillCollapse: boolean
+    editorSceneRef: any
+    isDatabaseTreeCollapsed: boolean
+    queryPaneHeight: number
+    queryPaneResizerProps: ResizerLogicProps
+    queryTabsWidth: number
+    sidebarResizerProps: ResizerLogicProps
+    sidebarWidth: number
+    sourceNavigatorResizerProps: ResizerLogicProps
+    sourceNavigatorWidth: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface editorSizingLogicActions {
+    databaseTreeEndResize: () => {
+        value: true
+    } // resizerLogic
+    databaseTreeSetDesiredSize: (size: number | null) => {
+        size: number | null
+    } // resizerLogic
+    sidebarSetDesiredSize: (size: number | null) => {
+        size: number | null
+    } // resizerLogic
+    resetDefaultSidebarWidth: () => {
+        value: true
+    }
+    setDatabaseTreeCollapsed: (collapsed: boolean) => {
+        collapsed: boolean
+    }
+    setDatabaseTreeWillCollapse: (willCollapse: boolean) => {
+        willCollapse: boolean
+    }
+    toggleDatabaseTreeCollapsed: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface editorSizingLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        editorSceneRef: (editorSceneRef: any) => any
+        sourceNavigatorWidth: (sourceNavigatorDesiredSize: number | null) => number
+        queryPaneHeight: (queryPaneDesiredSize: number | null, arg: number | undefined) => number
+        queryTabsWidth: (queryPaneDesiredSize: number | null) => number
+        sourceNavigatorResizerProps: (sourceNavigatorResizerProps: ResizerLogicProps) => ResizerLogicProps
+        queryPaneResizerProps: (queryPaneResizerProps: ResizerLogicProps) => ResizerLogicProps
+        sidebarWidth: (sidebarDesiredSize: number | null) => number
+        sidebarResizerProps: (sidebarResizerProps: ResizerLogicProps) => ResizerLogicProps
+        databaseTreeWidth: (databaseTreeDesiredSize: number | null, isDatabaseTreeCollapsed: boolean) => number
+        databaseTreeResizerProps: (databaseTreeResizerProps: ResizerLogicProps) => ResizerLogicProps
+    }
+}
+
+export type editorSizingLogicType = MakeLogicType<
+    editorSizingLogicValues,
+    editorSizingLogicActions,
+    EditorSizingLogicProps,
+    editorSizingLogicMeta
+>
+
 export const editorSizingLogic = kea<editorSizingLogicType>([
     path(['scenes', 'data-warehouse', 'editor', 'editorSizingLogic']),
     props({} as EditorSizingLogicProps),
@@ -97,22 +164,28 @@ export const editorSizingLogic = kea<editorSizingLogicType>([
         editorSceneRef: [(p) => [p.editorSceneRef], (editorSceneRef) => editorSceneRef],
         sourceNavigatorWidth: [
             (s) => [s.sourceNavigatorDesiredSize],
-            (desiredSize) => Math.max(desiredSize || NAVIGATOR_DEFAULT_WIDTH, MINIMUM_NAVIGATOR_WIDTH),
+            (desiredSize: number | null) => Math.max(desiredSize || NAVIGATOR_DEFAULT_WIDTH, MINIMUM_NAVIGATOR_WIDTH),
         ],
         queryPaneHeight: [
             (s) => [s.queryPaneDesiredSize, (_, props: EditorSizingLogicProps) => props.queryPaneDefaultHeight],
-            (queryPaneDesiredSize, queryPaneDefaultHeight) =>
+            (queryPaneDesiredSize: number | null, queryPaneDefaultHeight: number | undefined) =>
                 Math.max(
                     queryPaneDesiredSize || queryPaneDefaultHeight || DEFAULT_QUERY_PANE_HEIGHT,
                     MINIMUM_QUERY_PANE_HEIGHT
                 ),
         ],
-        queryTabsWidth: [(s) => [s.queryPaneDesiredSize], (desiredSize) => desiredSize || NAVIGATOR_DEFAULT_WIDTH],
+        queryTabsWidth: [
+            (s) => [s.queryPaneDesiredSize],
+            (desiredSize: number | null) => desiredSize || NAVIGATOR_DEFAULT_WIDTH,
+        ],
         sourceNavigatorResizerProps: [
             (_, p) => [p.sourceNavigatorResizerProps],
-            (sourceNavigatorResizerProps) => sourceNavigatorResizerProps,
+            (sourceNavigatorResizerProps: ResizerLogicProps) => sourceNavigatorResizerProps,
+        ],
+        queryPaneResizerProps: [
+            (_, p) => [p.queryPaneResizerProps],
+            (queryPaneResizerProps: ResizerLogicProps) => queryPaneResizerProps,
         ],
-        queryPaneResizerProps: [(_, p) => [p.queryPaneResizerProps], (queryPaneResizerProps) => queryPaneResizerProps],
         sidebarWidth: [
             (s) => [s.sidebarDesiredSize],
             (desiredSize: number | null) => {
@@ -125,7 +198,10 @@ export const editorSizingLogic = kea<editorSizingLogicType>([
                 )
             },
         ],
-        sidebarResizerProps: [(_, p) => [p.sidebarResizerProps], (sidebarResizerProps) => sidebarResizerProps],
+        sidebarResizerProps: [
+            (_, p) => [p.sidebarResizerProps],
+            (sidebarResizerProps: ResizerLogicProps) => sidebarResizerProps,
+        ],
         databaseTreeWidth: [
             (s) => [s.databaseTreeDesiredSize, s.isDatabaseTreeCollapsed],
             (desiredSize: number | null, isCollapsed: boolean) => {
@@ -140,7 +216,7 @@ export const editorSizingLogic = kea<editorSizingLogicType>([
         ],
         databaseTreeResizerProps: [
             (_, p) => [p.databaseTreeResizerProps],
-            (databaseTreeResizerProps) => databaseTreeResizerProps,
+            (databaseTreeResizerProps: ResizerLogicProps) => databaseTreeResizerProps,
         ],
     }),
 ])
diff --git a/frontend/src/scenes/data-warehouse/editor/fixSQLErrorsLogic.ts b/frontend/src/scenes/data-warehouse/editor/fixSQLErrorsLogic.ts
index 1c19b47a6d52..f72ec33db0da 100644
--- a/frontend/src/scenes/data-warehouse/editor/fixSQLErrorsLogic.ts
+++ b/frontend/src/scenes/data-warehouse/editor/fixSQLErrorsLogic.ts
@@ -1,16 +1,53 @@
-import { actions, kea, path } from 'kea'
+import { MakeLogicType, actions, kea, path } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
 
-import type { fixSQLErrorsLogicType } from './fixSQLErrorsLogicType'
-
 export interface Response {
     query: string
     trace_id: string
     error?: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface fixSQLErrorsLogicValues {
+    response: Response | null
+    responseLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface fixSQLErrorsLogicActions {
+    fixErrors: (
+        query: string,
+        error?: string
+    ) => {
+        error: string | undefined
+        query: string
+    }
+    fixErrorsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    fixErrorsSuccess: (
+        response: Response,
+        payload?: {
+            error: string | undefined
+            query: string
+        }
+    ) => {
+        response: Response
+        payload?: {
+            error: string | undefined
+            query: string
+        }
+    }
+}
+
+export type fixSQLErrorsLogicType = MakeLogicType<fixSQLErrorsLogicValues, fixSQLErrorsLogicActions>
+
 export const fixSQLErrorsLogic = kea<fixSQLErrorsLogicType>([
     path(['scenes', 'data-warehouse', 'editor', 'fixSQLErrorsLogic']),
     actions({
diff --git a/frontend/src/scenes/data-warehouse/editor/output-pane-tabs/infoTabLogic.ts b/frontend/src/scenes/data-warehouse/editor/output-pane-tabs/infoTabLogic.ts
index 8c3a0dd579d6..20889f86ee30 100644
--- a/frontend/src/scenes/data-warehouse/editor/output-pane-tabs/infoTabLogic.ts
+++ b/frontend/src/scenes/data-warehouse/editor/output-pane-tabs/infoTabLogic.ts
@@ -1,11 +1,17 @@
-import { afterMount, connect, kea, key, path, props, selectors } from 'kea'
+import { MakeLogicType, afterMount, connect, kea, key, path, props, selectors } from 'kea'
 
 import { databaseTableListLogic } from 'scenes/data-management/database/databaseTableListLogic'
 import { dataWarehouseViewsLogic } from 'scenes/data-warehouse/saved_queries/dataWarehouseViewsLogic'
 import { materializationJobsLogic } from 'scenes/data-warehouse/saved_queries/materializationJobsLogic'
 
+import type {
+    DatabaseSchemaDataWarehouseTable,
+    DatabaseSchemaTable,
+    DatabaseSchemaViewTable,
+    HogQLMetadataResponse,
+} from '../../../../queries/schema/schema-general'
+import type { DataWarehouseSavedQuery } from '../../../../types'
 import { sqlEditorLogic } from '../sqlEditorLogic'
-import type { infoTabLogicType } from './infoTabLogicType'
 
 export interface InfoTableRow {
     name: string
@@ -20,6 +26,70 @@ export interface InfoTabLogicProps {
     viewId?: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface infoTabLogicValues {
+    dataWarehouseSavedQueryMap: Record<string, DataWarehouseSavedQuery> // dataWarehouseViewsLogic
+    dataWarehouseTablesMap: Record<string, DatabaseSchemaDataWarehouseTable | DatabaseSchemaViewTable> // databaseTableListLogic
+    posthogTablesMap: Record<string, DatabaseSchemaTable> // databaseTableListLogic
+    metadata: HogQLMetadataResponse | null // sqlEditorLogic
+    sourceTableItems: (
+        | {
+              last_run_at: undefined
+              name: string
+              status: undefined
+              type: string
+              view_id?: undefined
+          }
+        | {
+              last_run_at: string
+              name: string
+              status: string | undefined
+              type: string
+              view_id: string
+          }
+    )[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface infoTabLogicActions {
+    loadUpstream: (modelId: string) => {
+        modelId: string
+    } // sqlEditorLogic
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface infoTabLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        sourceTableItems: (
+            metadata: HogQLMetadataResponse | null,
+            dataWarehouseSavedQueryMap: Record<string, DataWarehouseSavedQuery>
+        ) => (
+            | {
+                  last_run_at: undefined
+                  name: string
+                  status: undefined
+                  type: string
+                  view_id?: undefined
+              }
+            | {
+                  last_run_at: string
+                  name: string
+                  status: string | undefined
+                  type: string
+                  view_id: string
+              }
+        )[]
+    }
+}
+
+export type infoTabLogicType = MakeLogicType<
+    infoTabLogicValues,
+    infoTabLogicActions,
+    InfoTabLogicProps,
+    infoTabLogicMeta
+>
+
 export const infoTabLogic = kea<infoTabLogicType>([
     path(['data-warehouse', 'editor', 'sidebar', 'infoTabLogic']),
     props({} as InfoTabLogicProps),
@@ -39,7 +109,10 @@ export const infoTabLogic = kea<infoTabLogicType>([
     selectors({
         sourceTableItems: [
             (s) => [s.metadata, s.dataWarehouseSavedQueryMap],
-            (metadata, dataWarehouseSavedQueryMap) => {
+            (
+                metadata: null | import('../../../../queries/schema').HogQLMetadataResponse,
+                dataWarehouseSavedQueryMap: Record<string, import('../../../../types').DataWarehouseSavedQuery>
+            ) => {
                 if (!metadata) {
                     return []
                 }
diff --git a/frontend/src/scenes/data-warehouse/editor/outputPaneLogic.ts b/frontend/src/scenes/data-warehouse/editor/outputPaneLogic.ts
index ae7c28ab39db..c3bbbb9ffb2a 100644
--- a/frontend/src/scenes/data-warehouse/editor/outputPaneLogic.ts
+++ b/frontend/src/scenes/data-warehouse/editor/outputPaneLogic.ts
@@ -1,6 +1,4 @@
-import { actions, kea, key, path, props, reducers } from 'kea'
-
-import type { outputPaneLogicType } from './outputPaneLogicType'
+import { MakeLogicType, actions, kea, key, path, props, reducers } from 'kea'
 
 export enum OutputTab {
     Results = 'results',
@@ -12,6 +10,30 @@ export interface OutputTabProps {
     tabId: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface outputPaneLogicValues {
+    activeTab: OutputTab
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface outputPaneLogicActions {
+    setActiveTab: (tab: OutputTab) => {
+        tab: OutputTab
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface outputPaneLogicMeta {
+    key: string
+}
+
+export type outputPaneLogicType = MakeLogicType<
+    outputPaneLogicValues,
+    outputPaneLogicActions,
+    OutputTabProps,
+    outputPaneLogicMeta
+>
+
 export const outputPaneLogic = kea<outputPaneLogicType>([
     path(['data-warehouse', 'editor', 'outputPaneLogic']),
     props({} as OutputTabProps),
diff --git a/frontend/src/scenes/data-warehouse/editor/queryHistoryLogic.ts b/frontend/src/scenes/data-warehouse/editor/queryHistoryLogic.ts
index 3c9da583a59e..ef5fa68e3bbc 100644
--- a/frontend/src/scenes/data-warehouse/editor/queryHistoryLogic.ts
+++ b/frontend/src/scenes/data-warehouse/editor/queryHistoryLogic.ts
@@ -1,15 +1,25 @@
-import { connect, kea, path, props } from 'kea'
+import { MakeLogicType, connect, kea, path, props } from 'kea'
 
 import { activityLogLogic } from 'lib/components/ActivityLog/activityLogLogic'
 
 import { ActivityScope } from '~/types'
 
-import type { queryHistoryLogicType } from './queryHistoryLogicType'
+import type { HumanizedActivityLogItem } from '../../../lib/components/ActivityLog/humanizeActivity'
+import type { PaginationManual } from '../../../lib/lemon-ui/PaginationControl/index'
 
 export type QueryHistoryLogicProps = {
     id: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface queryHistoryLogicValues {
+    activityLoading: boolean // activityLogLogic
+    humanizedActivity: HumanizedActivityLogItem[] // activityLogLogic
+    pagination: PaginationManual // activityLogLogic
+}
+
+export type queryHistoryLogicType = MakeLogicType<queryHistoryLogicValues, {}, QueryHistoryLogicProps>
+
 export const queryHistoryLogic = kea<queryHistoryLogicType>([
     path(['scenes', 'data-warehouse', 'editor', 'queryHistoryLogic']),
     props({} as QueryHistoryLogicProps),
diff --git a/frontend/src/scenes/data-warehouse/editor/sidebar/queryDatabaseLogic.tsx b/frontend/src/scenes/data-warehouse/editor/sidebar/queryDatabaseLogic.tsx
index 00c42c9a0772..e45bc85f560d 100644
--- a/frontend/src/scenes/data-warehouse/editor/sidebar/queryDatabaseLogic.tsx
+++ b/frontend/src/scenes/data-warehouse/editor/sidebar/queryDatabaseLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { subscriptions } from 'kea-subscriptions'
 
@@ -37,10 +37,12 @@ import { SourceIcon, mapUrlToProvider } from 'products/data_warehouse/frontend/s
 import { joinsLogic } from 'products/data_warehouse/frontend/shared/logics/joinsLogic'
 import { sourceManagementLogic } from 'products/data_warehouse/frontend/shared/logics/sourceManagementLogic'
 
+import type { PaginatedResponse } from '../../../../lib/api'
+import type { DatabaseSchemaViewTable } from '../../../../queries/schema/schema-general'
+import type { ExternalDataSource, UserType } from '../../../../types'
 import { dataWarehouseViewsLogic } from '../../saved_queries/dataWarehouseViewsLogic'
 import { viewLinkLogic } from '../../viewLinkLogic'
 import { draftsLogic } from '../draftsLogic'
-import type { queryDatabaseLogicType } from './queryDatabaseLogicType'
 
 export type EditorSidebarTreeRef = React.RefObject<LemonTreeRef> | null
 
@@ -1327,6 +1329,442 @@ const getFolderIdFromDropTarget = (items: TreeDataItem[], dropTargetId: string |
     return undefined
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface queryDatabaseLogicValues {
+    dataWarehouseSavedQueries: DataWarehouseSavedQuery[] // dataWarehouseViewsLogic
+    dataWarehouseSavedQueriesLoading: boolean // dataWarehouseViewsLogic
+    dataWarehouseSavedQueryFolders: DataWarehouseSavedQueryFolder[] // dataWarehouseViewsLogic
+    dataWarehouseSavedQueryMapById: Record<string, DataWarehouseSavedQuery> // dataWarehouseViewsLogic
+    materializingViewIds: string[] // dataWarehouseViewsLogic
+    allPosthogTables: DatabaseSchemaTable[] // databaseTableListLogic
+    allTablesMap: Record<string, DatabaseSchemaTable> // databaseTableListLogic
+    connectionId: string | null // databaseTableListLogic
+    dataWarehouseTables: DatabaseSchemaDataWarehouseTable[] // databaseTableListLogic
+    dataWarehouseTablesMap: Record<string, DatabaseSchemaDataWarehouseTable | DatabaseSchemaViewTable> // databaseTableListLogic
+    databaseLoading: boolean // databaseTableListLogic
+    latestEndpointTables: DatabaseSchemaEndpointTable[] // databaseTableListLogic
+    managedViews: DatabaseSchemaManagedViewTable[] // databaseTableListLogic
+    posthogTables: DatabaseSchemaTable[] // databaseTableListLogic
+    posthogTablesMap: Record<string, DatabaseSchemaTable> // databaseTableListLogic
+    systemTables: DatabaseSchemaTable[] // databaseTableListLogic
+    systemTablesMap: Record<string, DatabaseSchemaTable> // databaseTableListLogic
+    viewsMapById: Record<string, DatabaseSchemaEndpointTable | DatabaseSchemaManagedViewTable | DatabaseSchemaViewTable> // databaseTableListLogic
+    drafts: DataWarehouseSavedQueryDraft[] // draftsLogic
+    draftsResponseLoading: boolean // draftsLogic
+    hasMoreDrafts: boolean // draftsLogic
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    joins: DataWarehouseViewLink[] // joinsLogic
+    joinsLoading: boolean // joinsLogic
+    dataWarehouseSources: PaginatedResponse<ExternalDataSource> | null // sourceManagementLogic
+    user: UserType | null // userLogic
+    activeDraggedViewId: string | null
+    activeExpandedFolderIds: string[]
+    defaultExpandedRootIds: string[]
+    displayedTreeData: TreeDataItem[]
+    editingDraftId: string | null
+    effectiveDataWarehouseSavedQueries: DataWarehouseSavedQuery[]
+    expandedFolders: string[]
+    expandedFoldersByConnection: Record<string, string[]>
+    expandedItemIds: string[]
+    expandedSearchFolders: string[]
+    hasNonPosthogSources: boolean
+    highlightViewsSectionDrop: boolean
+    highlightedDropFolderId: string | null
+    joinsByFieldName: Record<string, DataWarehouseViewLink>
+    pendingViewFolderOverrides: Record<string, string | null>
+    queryTabState: QueryTabState | null
+    queryTabStateLoading: boolean
+    relevantDataWarehouseTables: [DatabaseSchemaDataWarehouseTable, FuseSearchMatch[] | null][]
+    relevantDrafts: [DataWarehouseSavedQueryDraft, FuseSearchMatch[] | null][]
+    relevantEndpointTables: [DatabaseSchemaEndpointTable, FuseSearchMatch[] | null][]
+    relevantManagedViews: [DatabaseSchemaManagedViewTable, FuseSearchMatch[] | null][]
+    relevantPosthogTables: [DatabaseSchemaTable, FuseSearchMatch[] | null][]
+    relevantSavedQueries: [DataWarehouseSavedQuery, FuseSearchMatch[] | null][]
+    relevantSavedQueryFolders: [DataWarehouseSavedQueryFolder, FuseSearchMatch[] | null][]
+    relevantSystemTables: [DatabaseSchemaTable, FuseSearchMatch[] | null][]
+    searchTerm: string
+    searchTreeData: TreeDataItem[]
+    searchTreeMatches: SearchTreeMatches
+    searchTreeSourceContext: SearchTreeSourceContext
+    selectedDirectSource:
+        | {
+              job_inputs?: Record<string, any>
+          }
+        | undefined
+    selectedSchema: DatabaseSchemaDataWarehouseTable | DatabaseSchemaTable | DataWarehouseSavedQuery | null
+    sidebarOverlayTreeItems: TreeItem[]
+    syncMoreNoticeDismissed: boolean
+    treeData: TreeDataItem[]
+    treeDataContext: TreeDataContext
+    treeRef: EditorSidebarTreeRef
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface queryDatabaseLogicActions {
+    createDataWarehouseSavedQuerySuccess: (
+        dataWarehouseSavedQueries: DataWarehouseSavedQuery[],
+        payload?:
+            | (Partial<DataWarehouseSavedQuery> & {
+                  dag_id?: string
+                  folder_id?: string | null
+                  types: string[][]
+              })
+            | undefined
+    ) => {
+        dataWarehouseSavedQueries: DataWarehouseSavedQuery[]
+        payload?: Partial<DataWarehouseSavedQuery> & {
+            dag_id?: string
+            folder_id?: string | null
+            types: string[][]
+        }
+    } // dataWarehouseViewsLogic
+    updateDataWarehouseSavedQuery: (
+        view: Partial<DataWarehouseSavedQuery> & {
+            edited_history_id?: string
+            folder_id?: string | null
+            id: string
+            lifecycle?: string
+            shouldRematerialize?: boolean
+            soft_update?: boolean
+            sync_frequency?: string
+            types?: string[][]
+        }
+    ) => Partial<DataWarehouseSavedQuery> & {
+        edited_history_id?: string
+        folder_id?: string | null
+        id: string
+        lifecycle?: string
+        shouldRematerialize?: boolean
+        soft_update?: boolean
+        sync_frequency?: string
+        types?: string[][]
+    } // dataWarehouseViewsLogic
+    updateDataWarehouseSavedQueryFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    } // dataWarehouseViewsLogic
+    updateDataWarehouseSavedQuerySuccess: (
+        dataWarehouseSavedQueries: DataWarehouseSavedQuery[],
+        payload?:
+            | (Partial<DataWarehouseSavedQuery> & {
+                  edited_history_id?: string
+                  folder_id?: string | null
+                  id: string
+                  lifecycle?: string
+                  shouldRematerialize?: boolean
+                  soft_update?: boolean
+                  sync_frequency?: string
+                  types?: string[][]
+              })
+            | undefined
+    ) => {
+        dataWarehouseSavedQueries: DataWarehouseSavedQuery[]
+        payload?: Partial<DataWarehouseSavedQuery> & {
+            edited_history_id?: string
+            folder_id?: string | null
+            id: string
+            lifecycle?: string
+            shouldRematerialize?: boolean
+            soft_update?: boolean
+            sync_frequency?: string
+            types?: string[][]
+        }
+    } // dataWarehouseViewsLogic
+    loadDrafts: () => any // draftsLogic
+    loadMoreDrafts: () => any // draftsLogic
+    renameDraft: (
+        draftId: string,
+        name: string
+    ) => {
+        draftId: string
+        name: string
+    } // draftsLogic
+    deleteJoin: (join: DataWarehouseViewLink) => {
+        join: DataWarehouseViewLink
+    } // sourceManagementLogic
+    toggleEditJoinModal: (join: DataWarehouseViewLink) => {
+        join: DataWarehouseViewLink
+    } // viewLinkLogic
+    toggleJoinTableModal: () => {
+        value: true
+    } // viewLinkLogic
+    clearDraggedViewState: () => {
+        value: true
+    }
+    clearPendingViewFolderOverride: (viewId: string) => {
+        viewId: string
+    }
+    clearPendingViewFolderOverrides: () => {
+        value: true
+    }
+    clearSearch: () => {
+        value: true
+    }
+    deleteUnsavedQuery: (record: Record<string, any>) => {
+        record: Record<string, any>
+    }
+    deleteUnsavedQueryFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteUnsavedQuerySuccess: (
+        queryTabState:
+            | QueryTabState
+            | {
+                  id: string
+                  state: {
+                      editorModelsStateKey: string
+                  }
+              }
+            | null,
+        payload?: {
+            record: Record<string, any>
+        }
+    ) => {
+        queryTabState:
+            | QueryTabState
+            | {
+                  id: string
+                  state: {
+                      editorModelsStateKey: string
+                  }
+              }
+            | null
+        payload?: {
+            record: Record<string, any>
+        }
+    }
+    loadQueryTabState: () => any
+    loadQueryTabStateFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadQueryTabStateSuccess: (
+        queryTabState: QueryTabState | null,
+        payload?: any
+    ) => {
+        queryTabState: QueryTabState | null
+        payload?: any
+    }
+    moveDraggedViewToDropTarget: (
+        viewId: string,
+        dropTargetId: string | null
+    ) => {
+        dropTargetId: string | null
+        viewId: string
+    }
+    openUnsavedQuery: (record: Record<string, any>) => {
+        record: Record<string, any>
+    }
+    selectSchema: (schema: DatabaseSchemaDataWarehouseTable | DatabaseSchemaTable | DataWarehouseSavedQuery) => {
+        schema: DatabaseSchemaTable | DataWarehouseSavedQuery
+    }
+    selectSourceTable: (tableName: string) => {
+        tableName: string
+    }
+    setDraggedViewDropState: (
+        folderId: string | null,
+        isViewsSectionDrop: boolean
+    ) => {
+        folderId: string | null
+        isViewsSectionDrop: boolean
+    }
+    setEditingDraft: (draftId: string) => {
+        draftId: string
+    }
+    setExpandedFolders: (
+        folderIds: string[],
+        connectionId?: string | null
+    ) => {
+        connectionId: string | null | undefined
+        folderIds: string[]
+    }
+    setExpandedSearchFolders: (folderIds: string[]) => {
+        folderIds: string[]
+    }
+    setPendingViewFolderOverride: (
+        viewId: string,
+        folderId: string | null
+    ) => {
+        folderId: string | null
+        viewId: string
+    }
+    setSearchTerm: (searchTerm: string) => {
+        searchTerm: string
+    }
+    setSyncMoreNoticeDismissed: (dismissed: boolean) => {
+        dismissed: boolean
+    }
+    setTreeRef: (ref: EditorSidebarTreeRef | null) => {
+        ref: EditorSidebarTreeRef
+    }
+    startDraggingView: (viewId: string) => {
+        viewId: string
+    }
+    toggleFolderOpen: (
+        folderId: string,
+        isExpanded: boolean
+    ) => {
+        folderId: string
+        isExpanded: boolean
+    }
+    updateDraggedViewDropTarget: (dropTargetId: string | null) => {
+        dropTargetId: string | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface queryDatabaseLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        hasNonPosthogSources: (dataWarehouseTables: DatabaseSchemaDataWarehouseTable[]) => boolean
+        relevantPosthogTables: (
+            posthogTables: DatabaseSchemaTable[],
+            searchTerm: string
+        ) => [DatabaseSchemaTable, FuseSearchMatch[] | null][]
+        relevantSystemTables: (
+            systemTables: DatabaseSchemaTable[],
+            searchTerm: string
+        ) => [DatabaseSchemaTable, FuseSearchMatch[] | null][]
+        relevantDataWarehouseTables: (
+            dataWarehouseTables: DatabaseSchemaDataWarehouseTable[],
+            searchTerm: string
+        ) => [DatabaseSchemaDataWarehouseTable, FuseSearchMatch[] | null][]
+        relevantSavedQueries: (
+            effectiveDataWarehouseSavedQueries: DataWarehouseSavedQuery[],
+            searchTerm: string
+        ) => [DataWarehouseSavedQuery, FuseSearchMatch[] | null][]
+        relevantSavedQueryFolders: (
+            dataWarehouseSavedQueryFolders: DataWarehouseSavedQueryFolder[],
+            searchTerm: string
+        ) => [DataWarehouseSavedQueryFolder, FuseSearchMatch[] | null][]
+        effectiveDataWarehouseSavedQueries: (
+            dataWarehouseSavedQueries: DataWarehouseSavedQuery[],
+            pendingViewFolderOverrides: Record<string, string | null>
+        ) => DataWarehouseSavedQuery[]
+        relevantManagedViews: (
+            managedViews: DatabaseSchemaManagedViewTable[],
+            searchTerm: string
+        ) => [DatabaseSchemaManagedViewTable, FuseSearchMatch[] | null][]
+        relevantDrafts: (
+            drafts: DataWarehouseSavedQueryDraft[],
+            searchTerm: string
+        ) => [DataWarehouseSavedQueryDraft, FuseSearchMatch[] | null][]
+        relevantEndpointTables: (
+            latestEndpointTables: DatabaseSchemaEndpointTable[],
+            searchTerm: string
+        ) => [DatabaseSchemaEndpointTable, FuseSearchMatch[] | null][]
+        selectedDirectSource: (
+            dataWarehouseSources: PaginatedResponse<ExternalDataSource> | null,
+            connectionId: string | null
+        ) =>
+            | {
+                  job_inputs?: Record<string, any>
+              }
+            | undefined
+        searchTreeSourceContext: (
+            allPosthogTables: DatabaseSchemaTable[],
+            systemTables: DatabaseSchemaTable[],
+            dataWarehouseTables: DatabaseSchemaDataWarehouseTable[],
+            effectiveDataWarehouseSavedQueries: DataWarehouseSavedQuery[],
+            dataWarehouseSavedQueryFolders: DataWarehouseSavedQueryFolder[],
+            managedViews: DatabaseSchemaManagedViewTable[],
+            allTablesMap: Record<string, DatabaseSchemaTable>
+        ) => SearchTreeSourceContext
+        searchTreeMatches: (
+            relevantPosthogTables: [DatabaseSchemaTable, FuseSearchMatch[] | null][],
+            relevantSystemTables: [DatabaseSchemaTable, FuseSearchMatch[] | null][],
+            relevantDataWarehouseTables: [DatabaseSchemaDataWarehouseTable, FuseSearchMatch[] | null][],
+            relevantSavedQueries: [DataWarehouseSavedQuery, FuseSearchMatch[] | null][],
+            relevantSavedQueryFolders: [DataWarehouseSavedQueryFolder, FuseSearchMatch[] | null][],
+            relevantManagedViews: [DatabaseSchemaManagedViewTable, FuseSearchMatch[] | null][],
+            relevantDrafts: [DataWarehouseSavedQueryDraft, FuseSearchMatch[] | null][],
+            relevantEndpointTables: [DatabaseSchemaEndpointTable, FuseSearchMatch[] | null][]
+        ) => SearchTreeMatches
+        searchTreeData: (
+            searchTreeSourceContext: SearchTreeSourceContext,
+            searchTreeMatches: SearchTreeMatches,
+            searchTerm: string,
+            featureFlags: FeatureFlagsSet,
+            expandedSearchFolders: string[],
+            materializingViewIds: string[]
+        ) => TreeDataItem[]
+        treeDataContext: (
+            allPosthogTables: DatabaseSchemaTable[],
+            posthogTables: DatabaseSchemaTable[],
+            systemTables: DatabaseSchemaTable[],
+            dataWarehouseTables: DatabaseSchemaDataWarehouseTable[],
+            effectiveDataWarehouseSavedQueries: DataWarehouseSavedQuery[],
+            dataWarehouseSavedQueryFolders: DataWarehouseSavedQueryFolder[],
+            managedViews: DatabaseSchemaManagedViewTable[],
+            latestEndpointTables: DatabaseSchemaEndpointTable[],
+            allTablesMap: Record<string, DatabaseSchemaTable>
+        ) => TreeDataContext
+        treeData: (
+            treeDataContext: TreeDataContext,
+            databaseLoading: boolean,
+            dataWarehouseSavedQueriesLoading: boolean,
+            drafts: DataWarehouseSavedQueryDraft[],
+            draftsResponseLoading: boolean,
+            hasMoreDrafts: boolean,
+            featureFlags: FeatureFlagsSet,
+            queryTabState: QueryTabState | null,
+            expandedFolders: string[],
+            materializingViewIds: string[]
+        ) => TreeDataItem[]
+        displayedTreeData: (
+            searchTerm: string,
+            searchTreeData: TreeDataItem[],
+            treeData: TreeDataItem[],
+            connectionId: string | null,
+            selectedDirectSource:
+                | {
+                      job_inputs?: Record<string, any>
+                  }
+                | undefined
+        ) => TreeDataItem[]
+        activeExpandedFolderIds: (
+            searchTerm: string,
+            expandedSearchFolders: string[],
+            expandedFolders: string[]
+        ) => string[]
+        expandedFolders: (
+            connectionId: string | null,
+            expandedFoldersByConnection: Record<string, string[]>
+        ) => string[]
+        defaultExpandedRootIds: (connectionId: string | null, displayedTreeData: TreeDataItem[]) => string[]
+        expandedItemIds: (activeExpandedFolderIds: string[], defaultExpandedRootIds: string[]) => string[]
+        joinsByFieldName: (joins: DataWarehouseViewLink[]) => Record<string, DataWarehouseViewLink>
+        sidebarOverlayTreeItems: (
+            selectedSchema: DatabaseSchemaTable | DataWarehouseSavedQuery | null,
+            posthogTablesMap: Record<string, DatabaseSchemaTable>,
+            systemTablesMap: Record<string, DatabaseSchemaTable>,
+            dataWarehouseTablesMap: Record<string, DatabaseSchemaDataWarehouseTable | DatabaseSchemaViewTable>,
+            dataWarehouseSavedQueryMapById: Record<string, DataWarehouseSavedQuery>,
+            viewsMapById: Record<
+                string,
+                DatabaseSchemaEndpointTable | DatabaseSchemaManagedViewTable | DatabaseSchemaViewTable
+            >,
+            joinsByFieldName: Record<string, DataWarehouseViewLink>
+        ) => TreeItem[]
+    }
+}
+
+export type queryDatabaseLogicType = MakeLogicType<
+    queryDatabaseLogicValues,
+    queryDatabaseLogicActions,
+    Record<string, any>,
+    queryDatabaseLogicMeta
+>
+
 export const queryDatabaseLogic = kea<queryDatabaseLogicType>([
     path(['scenes', 'data-warehouse', 'editor', 'queryDatabaseLogic']),
     actions({
@@ -1727,7 +2165,10 @@ export const queryDatabaseLogic = kea<queryDatabaseLogicType>([
         ],
         selectedDirectSource: [
             (s) => [s.dataWarehouseSources, s.connectionId],
-            (dataWarehouseSources, connectionId): { job_inputs?: Record<string, any> } | undefined => {
+            (
+                dataWarehouseSources: null | import('lib/api').PaginatedResponse<import('~/types').ExternalDataSource>,
+                connectionId: string | null
+            ): { job_inputs?: Record<string, any> } | undefined => {
                 return dataWarehouseSources?.results.find((source) => source.id === connectionId)
             },
         ],
@@ -2404,13 +2845,21 @@ export const queryDatabaseLogic = kea<queryDatabaseLogicType>([
                 s.joinsByFieldName,
             ],
             (
-                selectedSchema,
-                posthogTablesMap,
-                systemTablesMap,
-                dataWarehouseTablesMap,
-                dataWarehouseSavedQueryMapById,
-                viewsMapById,
-                joinsByFieldName
+                selectedSchema: DatabaseSchemaDataWarehouseTable | DatabaseSchemaTable | DataWarehouseSavedQuery | null,
+                posthogTablesMap: Record<string, DatabaseSchemaTable>,
+                systemTablesMap: Record<string, DatabaseSchemaTable>,
+                dataWarehouseTablesMap: Record<
+                    string,
+                    DatabaseSchemaDataWarehouseTable | import('~/queries/schema/schema-general').DatabaseSchemaViewTable
+                >,
+                dataWarehouseSavedQueryMapById: Record<string, DataWarehouseSavedQuery>,
+                viewsMapById: Record<
+                    string,
+                    | DatabaseSchemaEndpointTable
+                    | DatabaseSchemaManagedViewTable
+                    | import('~/queries/schema/schema-general').DatabaseSchemaViewTable
+                >,
+                joinsByFieldName: Record<string, DataWarehouseViewLink>
             ): TreeItem[] => {
                 if (selectedSchema === null) {
                     return []
diff --git a/frontend/src/scenes/data-warehouse/editor/sqlEditorLogic.tsx b/frontend/src/scenes/data-warehouse/editor/sqlEditorLogic.tsx
index e1ff3363f3d4..9e2979f1e7af 100644
--- a/frontend/src/scenes/data-warehouse/editor/sqlEditorLogic.tsx
+++ b/frontend/src/scenes/data-warehouse/editor/sqlEditorLogic.tsx
@@ -1,6 +1,7 @@
 import { Monaco } from '@monaco-editor/react'
 import { deepEqual as equal } from 'fast-equals'
 import {
+    MakeLogicType,
     actions,
     afterMount,
     beforeUnmount,
@@ -83,15 +84,19 @@ import { DagSelector, openCreateDagDialog } from 'products/data_modeling/fronten
 import { sourcesDataLogic } from 'products/data_warehouse/frontend/shared/logics/sourcesDataLogic'
 import { validateEndpointName } from 'products/endpoints/frontend/common'
 
+import type { PaginatedResponse } from '../../../lib/api'
+import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
+import type { DatabaseSchemaQueryResponse, Node } from '../../../queries/schema/schema-general'
+import type { DataModelingDAG, DataWarehouseSavedQueryFolder, UserType } from '../../../types'
 import { dataWarehouseViewsLogic } from '../saved_queries/dataWarehouseViewsLogic'
 import { validateSavedQueryName } from '../saved_queries/savedQueryNameValidation'
 import { dataModelingLogic } from '../scene/dataModelingLogic'
 import { draftsLogic } from './draftsLogic'
 import { fixSQLErrorsLogic } from './fixSQLErrorsLogic'
+import type { Response } from './fixSQLErrorsLogic'
 import { findInnermostSelectAtOffset, findQueryAtCursor, type QueryRange, splitQueries } from './multiQueryUtils'
 import { OutputTab, outputPaneLogic } from './outputPaneLogic'
 import { resolveSaveCandidates as resolveSaveCandidatesPure, SaveTargetCycler } from './SaveTargetCycler'
-import type { sqlEditorLogicType } from './sqlEditorLogicType'
 import { SQLEditorMode, isEmbeddedSQLEditorMode } from './sqlEditorModes'
 import {
     aiSuggestionOnAccept,
@@ -453,6 +458,459 @@ const LazyQuery = lazyWithRetry(() =>
     import('~/queries/Query/Query').then((m) => ({ default: m.Query<DataVisualizationNode> }))
 )
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sqlEditorLogicValues {
+    dags: DataModelingDAG[]; // dataModelingLogic
+    selectedDagId: string | null; // dataModelingLogic
+    dataWarehouseSavedQueries: DataWarehouseSavedQuery[]; // dataWarehouseViewsLogic
+    dataWarehouseSavedQueryFolders: DataWarehouseSavedQueryFolder[]; // dataWarehouseViewsLogic
+    dataWarehouseSavedQueryMapById: Record<string, DataWarehouseSavedQuery>; // dataWarehouseViewsLogic
+    database: Required<DatabaseSchemaQueryResponse> | null; // databaseTableListLogic
+    databaseConnectionId: string | null; // databaseTableListLogic
+    databaseLoading: boolean; // databaseTableListLogic
+    drafts: DataWarehouseSavedQueryDraft[]; // draftsLogic
+    featureFlags: FeatureFlagsSet; // featureFlagLogic
+    outputActiveTab: OutputTab; // outputPaneLogic
+    dataWarehouseSources: PaginatedResponse<ExternalDataSource> | null; // sourcesDataLogic
+    user: UserType | null; // userLogic
+    acceptText: string;
+    accessControlModalOpen: boolean;
+    activeQueryOffset: number;
+    activeQueryText: string | null;
+    activeTab: QueryTab | null;
+    changesToSave: boolean;
+    currentDraft: DataWarehouseSavedQueryDraft | null | undefined;
+    dashboardId: number | null;
+    dataLogicKey: string;
+    diffShowRunButton: boolean | undefined;
+    editingAccessControlObject: DataWarehouseAccessControlModalProps | null;
+    editingInsight: QueryBasedInsightModel | null;
+    editingView: DataWarehouseSavedQuery | undefined;
+    editorKey: string;
+    editorSource: SqlEditorSource;
+    error: string | null;
+    exportContext: ExportContext;
+    finishedLoading: boolean;
+    fixErrorsError: string | null;
+    hasFiltersPlaceholder: boolean;
+    hasQueryInput: boolean;
+    hoveredNode: string | null;
+    inProgressDraftEdits: Record<string, string>;
+    inProgressViewEdits: Record<string, string>;
+    insightLoading: boolean;
+    isDraft: boolean;
+    isEditingMaterializedView: boolean;
+    isEmbeddedMode: boolean;
+    isMultiQuery: boolean;
+    isSourceQueryLastRun: boolean;
+    lastRunQuery: DataVisualizationNode | null;
+    materializationModalOpen: boolean;
+    materializationModalView: DataWarehouseSavedQuery | null;
+    metadata: HogQLMetadataResponse | null;
+    metadataLoading: boolean;
+    originalQueryInput: string | null | undefined;
+    queryInput: string | null;
+    rejectText: string;
+    selectedConnectionId: string | undefined;
+    selectedDirectSource: ExternalDataSource | undefined;
+    selectedQueryColumns: Record<string, boolean>;
+    selectedQueryTablesAndColumns: Record<string, Record<string, boolean>>;
+    sendRawQueryEnabled: boolean;
+    sourceQuery: DataVisualizationNode;
+    splitQueryRanges: QueryRange[];
+    suggestedQueryInput: string;
+    suggestedSource: "hogql_fixer" | "materialization_fix" | "max_ai" | null;
+    suggestionPayload: SuggestionPayload | null;
+    upstream: {
+        edges: DataModelingEdge[];
+        nodes: DataModelingNode[];
+    } | null;
+    upstreamLoading: boolean;
+    upstreamViewMode: "graph" | "table";
+    viewLoading: boolean;
+    viewQueryLoading: boolean;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sqlEditorLogicActions {
+    createDataWarehouseSavedQuerySuccess: (dataWarehouseSavedQueries: DataWarehouseSavedQuery[], payload?: (Partial<DataWarehouseSavedQuery> & {
+        dag_id?: string;
+        folder_id?: string | null;
+        types: string[][];
+    }) | undefined) => {
+        dataWarehouseSavedQueries: DataWarehouseSavedQuery[];
+        payload?: Partial<DataWarehouseSavedQuery> & {
+            dag_id?: string;
+            folder_id?: string | null;
+            types: string[][];
+        };
+    }; // dataWarehouseViewsLogic
+    deleteDataWarehouseSavedQuerySuccess: (dataWarehouseSavedQueries: DataWarehouseSavedQuery[], payload?: string | undefined) => {
+        dataWarehouseSavedQueries: DataWarehouseSavedQuery[];
+        payload?: string;
+    }; // dataWarehouseViewsLogic
+    loadDataWarehouseSavedQueriesSuccess: (dataWarehouseSavedQueries: DataWarehouseSavedQuery[], payload?: any) => {
+        dataWarehouseSavedQueries: DataWarehouseSavedQuery[];
+        payload?: any;
+    }; // dataWarehouseViewsLogic
+    loadDataWarehouseSavedQueryFolders: () => any; // dataWarehouseViewsLogic
+    materializeDataWarehouseSavedQuery: (viewId: string) => {
+        viewId: string;
+    }; // dataWarehouseViewsLogic
+    runDataWarehouseSavedQuery: (viewId: string) => {
+        viewId: string;
+    }; // dataWarehouseViewsLogic
+    updateDataWarehouseSavedQuery: (view: Partial<DataWarehouseSavedQuery> & {
+        edited_history_id?: string;
+        folder_id?: string | null;
+        id: string;
+        lifecycle?: string;
+        shouldRematerialize?: boolean;
+        soft_update?: boolean;
+        sync_frequency?: string;
+        types?: string[][];
+    }) => Partial<DataWarehouseSavedQuery> & {
+        edited_history_id?: string;
+        folder_id?: string | null;
+        id: string;
+        lifecycle?: string;
+        shouldRematerialize?: boolean;
+        soft_update?: boolean;
+        sync_frequency?: string;
+        types?: string[][];
+    }; // dataWarehouseViewsLogic
+    updateDataWarehouseSavedQueryFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    }; // dataWarehouseViewsLogic
+    updateDataWarehouseSavedQuerySuccess: (dataWarehouseSavedQueries: DataWarehouseSavedQuery[], payload?: (Partial<DataWarehouseSavedQuery> & {
+        edited_history_id?: string;
+        folder_id?: string | null;
+        id: string;
+        lifecycle?: string;
+        shouldRematerialize?: boolean;
+        soft_update?: boolean;
+        sync_frequency?: string;
+        types?: string[][];
+    }) | undefined) => {
+        dataWarehouseSavedQueries: DataWarehouseSavedQuery[];
+        payload?: Partial<DataWarehouseSavedQuery> & {
+            edited_history_id?: string;
+            folder_id?: string | null;
+            id: string;
+            lifecycle?: string;
+            shouldRematerialize?: boolean;
+            soft_update?: boolean;
+            sync_frequency?: string;
+            types?: string[][];
+        };
+    }; // dataWarehouseViewsLogic
+    loadDatabase: (args_0?: {
+        force?: boolean;
+    } | undefined) => {
+        force?: boolean;
+    }; // databaseTableListLogic
+    setConnection: (connectionId: string | null) => {
+        connectionId: string | null;
+    }; // databaseTableListLogic
+    deleteDraft: (draftId: string, viewName?: string | undefined) => {
+        draftId: string;
+        viewName: string | undefined;
+    }; // draftsLogic
+    deleteDraftSuccess: (draftId: string, viewName?: string | undefined) => {
+        draftId: string;
+        viewName: string | undefined;
+    }; // draftsLogic
+    saveAsDraft: (query: HogQLQuery, viewId: string, tab: QueryTab) => {
+        query: HogQLQuery;
+        tab: QueryTab;
+        viewId: string;
+    }; // draftsLogic
+    saveAsDraftSuccess: (draft: DataWarehouseSavedQueryDraft, tab: QueryTab) => {
+        draft: DataWarehouseSavedQueryDraft;
+        tab: QueryTab;
+    }; // draftsLogic
+    fixErrors: (query: string, error?: string | undefined) => {
+        error: string | undefined;
+        query: string;
+    }; // fixSQLErrorsLogic
+    fixErrorsFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    }; // fixSQLErrorsLogic
+    fixErrorsSuccess: (response: Response, payload?: {
+        error: string | undefined;
+        query: string;
+    } | undefined) => {
+        payload?: {
+            error: string | undefined;
+            query: string;
+        };
+        response: Response;
+    }; // fixSQLErrorsLogic
+    setActiveTab: (tab: OutputTab) => {
+        tab: OutputTab;
+    }; // outputPaneLogic
+    _setSuggestionPayload: (payload: SuggestionPayload | null) => {
+        payload: SuggestionPayload | null;
+    };
+    closeAccessControlModal: () => {
+        value: true;
+    };
+    closeEditingObject: () => {
+        value: true;
+    };
+    closeMaterializationModal: () => {
+        value: true;
+    };
+    createTab: (query?: string, view?: DataWarehouseSavedQuery, insight?: QueryBasedInsightModel, draft?: DataWarehouseSavedQueryDraft) => {
+        draft: DataWarehouseSavedQueryDraft | undefined;
+        insight: QueryBasedInsightModel<Node<Record<string, any>>> | undefined;
+        query: string | undefined;
+        view: DataWarehouseSavedQuery | undefined;
+    };
+    deleteInProgressDraftEdit: (draftId: string) => {
+        draftId: string;
+    };
+    deleteInProgressViewEdit: (viewId: string) => {
+        viewId: string;
+    };
+    editInsight: (query: string, insight: QueryBasedInsightModel) => {
+        insight: QueryBasedInsightModel<Node<Record<string, any>>>;
+        query: string;
+    };
+    editView: (query: string, view: DataWarehouseSavedQuery) => {
+        query: string;
+        view: DataWarehouseSavedQuery;
+    };
+    initialize: () => {
+        value: true;
+    };
+    insertTextAtCursor: (text: string) => {
+        text: string;
+    };
+    loadUpstream: (modelId: string) => {
+        modelId: string;
+    };
+    loadUpstreamFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadUpstreamSuccess: (upstream: {
+        edges: DataModelingEdge[];
+        nodes: DataModelingNode[];
+    }, payload?: {
+        modelId: string;
+    }) => {
+        upstream: {
+            edges: DataModelingEdge[];
+            nodes: DataModelingNode[];
+        };
+        payload?: {
+            modelId: string;
+        };
+    };
+    onAcceptSuggestedQueryInput: (shouldRunQuery?: boolean) => {
+        shouldRunQuery: boolean | undefined;
+    };
+    onRejectSuggestedQueryInput: () => {
+        value: true;
+    };
+    openAccessControlModal: (editingAccessControlObject: DataWarehouseAccessControlModalProps) => {
+        editingAccessControlObject: DataWarehouseAccessControlModalProps;
+    };
+    openMaterializationModal: (view?: DataWarehouseSavedQuery) => {
+        view: DataWarehouseSavedQuery | undefined;
+    };
+    reportAIQueryAccepted: () => {
+        value: true;
+    };
+    reportAIQueryPromptOpen: () => {
+        value: true;
+    };
+    reportAIQueryPrompted: () => {
+        value: true;
+    };
+    reportAIQueryRejected: () => {
+        value: true;
+    };
+    runQuery: (queryOverride?: string, switchTab?: boolean) => {
+        queryOverride: string | undefined;
+        switchTab: boolean | undefined;
+    };
+    runSubquery: () => {
+        value: true;
+    };
+    saveAsEndpoint: () => {
+        value: true;
+    };
+    saveAsEndpointSubmit: (name: string, description?: string, queryOverride?: string, dagId?: string) => {
+        dagId: string | undefined;
+        description: string | undefined;
+        name: string;
+        queryOverride: string | undefined;
+    };
+    saveAsInsight: () => {
+        value: true;
+    };
+    saveAsInsightSubmit: (name: string, queryOverride?: string) => {
+        name: string;
+        queryOverride: string | undefined;
+    };
+    saveAsView: (materializeAfterSave?: any, fromDraft?: string) => {
+        fromDraft: string | undefined;
+        materializeAfterSave: any;
+    };
+    saveAsViewSubmit: (name: string, materializeAfterSave?: any, fromDraft?: string, dagId?: string, folderId?: string | null, isTest?: any, queryOverride?: string) => {
+        dagId: string | undefined;
+        folderId: string | null | undefined;
+        fromDraft: string | undefined;
+        isTest: any;
+        materializeAfterSave: any;
+        name: string;
+        queryOverride: string | undefined;
+    };
+    saveDraft: (activeTab: QueryTab, queryInput: string, viewId: string) => {
+        activeTab: QueryTab;
+        queryInput: string;
+        viewId: string;
+    };
+    setActiveQueryText: (activeQueryText: string | null, activeQueryOffset: number) => {
+        activeQueryOffset: number;
+        activeQueryText: string | null;
+    };
+    setDashboardId: (dashboardId: number | null) => {
+        dashboardId: number | null;
+    };
+    setDataError: (error: string | null) => {
+        error: string | null;
+    };
+    setEditingInsightDescription: (description: string) => {
+        description: string;
+    };
+    setEditingInsightName: (name: string) => {
+        name: string;
+    };
+    setEditorSource: (source: SqlEditorSource) => {
+        source: SqlEditorSource;
+    };
+    setError: (error: string | null) => {
+        error: string | null;
+    };
+    setFinishedLoading: (loading: boolean) => {
+        loading: boolean;
+    };
+    setHoveredNode: (nodeId: string | null) => {
+        nodeId: string | null;
+    };
+    setInProgressDraftEdit: (draftId: string, historyId: string) => {
+        draftId: string;
+        historyId: string;
+    };
+    setInProgressDraftEdits: (inProgressDraftEdits: Record<string, string>) => {
+        inProgressDraftEdits: Record<string, string>;
+    };
+    setInProgressViewEdit: (viewId: string, historyId: string) => {
+        historyId: string;
+        viewId: string;
+    };
+    setInProgressViewEdits: (inProgressViewEdits: Record<string, string>) => {
+        inProgressViewEdits: Record<string, string>;
+    };
+    setInsightLoading: (loading: boolean) => {
+        loading: boolean;
+    };
+    setLastRunQuery: (lastRunQuery: DataVisualizationNode | null) => {
+        lastRunQuery: DataVisualizationNode | null;
+    };
+    setMaterializationModalOpen: (open: boolean) => {
+        open: boolean;
+    };
+    setMaterializationModalView: (view: DataWarehouseSavedQuery | null) => {
+        view: DataWarehouseSavedQuery | null;
+    };
+    setMetadata: (metadata: HogQLMetadataResponse | null) => {
+        metadata: HogQLMetadataResponse | null;
+    };
+    setMetadataLoading: (loading: boolean) => {
+        loading: boolean;
+    };
+    setQueryInput: (queryInput: string | null) => {
+        queryInput: string | null;
+    };
+    setSelectedQueryTablesAndColumns: (tablesAndColumns: Record<string, Record<string, boolean>>) => {
+        tablesAndColumns: Record<string, Record<string, boolean>>;
+    };
+    setSendRawQuery: (sendRawQuery: boolean) => {
+        sendRawQuery: boolean;
+    };
+    setSourceQuery: (sourceQuery: DataVisualizationNode) => {
+        sourceQuery: DataVisualizationNode;
+    };
+    setSuggestedQueryInput: (suggestedQueryInput: string, source?: SuggestionPayload["source"]) => {
+        source: "hogql_fixer" | "materialization_fix" | "max_ai" | undefined;
+        suggestedQueryInput: string;
+    };
+    setUpstreamViewMode: (mode: "graph" | "table") => {
+        mode: "graph" | "table";
+    };
+    setViewLoading: (loading: boolean) => {
+        loading: boolean;
+    };
+    setViewQueryLoading: (loading: boolean) => {
+        loading: boolean;
+    };
+    syncUrlWithQuery: () => {
+        value: true;
+    };
+    updateInsight: () => {
+        value: true;
+    };
+    updateTab: (tab: QueryTab) => {
+        tab: QueryTab;
+    };
+    updateView: (view: UpdateViewPayload, draftId?: string) => {
+        draftId: string | undefined;
+        view: UpdateViewPayload;
+    };
+    updateViewSuccess: (view: UpdateViewPayload, draftId?: string) => {
+        draftId: string | undefined;
+        view: UpdateViewPayload;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sqlEditorLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        suggestedSource: (suggestionPayload: SuggestionPayload | null) => "hogql_fixer" | "materialization_fix" | "max_ai" | null;
+        diffShowRunButton: (suggestionPayload: SuggestionPayload | null) => boolean | undefined;
+        acceptText: (suggestionPayload: SuggestionPayload | null) => string;
+        rejectText: (suggestionPayload: SuggestionPayload | null) => string;
+        suggestedQueryInput: (suggestionPayload: SuggestionPayload | null, queryInput: string | null) => string;
+        originalQueryInput: (suggestionPayload: SuggestionPayload | null, queryInput: string | null) => string | null | undefined;
+        editingView: (activeTab: QueryTab | null) => DataWarehouseSavedQuery | undefined;
+        changesToSave: (editingView: DataWarehouseSavedQuery | undefined, queryInput: string | null) => boolean;
+        exportContext: (sourceQuery: DataVisualizationNode) => ExportContext;
+        selectedConnectionId: (sourceQuery: DataVisualizationNode) => string | undefined;
+        selectedDirectSource: (dataWarehouseSources: PaginatedResponse<ExternalDataSource> | null, selectedConnectionId: string | undefined) => ExternalDataSource | undefined;
+        sendRawQueryEnabled: (sourceQuery: DataVisualizationNode, selectedConnectionId: string | undefined) => boolean;
+        isEditingMaterializedView: (editingView: DataWarehouseSavedQuery | undefined) => boolean;
+        splitQueryRanges: (queryInput: string | null) => QueryRange[];
+        isMultiQuery: (splitQueryRanges: QueryRange[]) => boolean;
+        isSourceQueryLastRun: (queryInput: string | null, lastRunQuery: DataVisualizationNode | null, sourceQuery: DataVisualizationNode, splitQueryRanges: QueryRange[]) => boolean;
+        hasFiltersPlaceholder: (queryInput: string | null) => boolean;
+        hasQueryInput: (queryInput: string | null) => boolean;
+        isEmbeddedMode: (arg: SQLEditorMode | undefined) => boolean;
+        dataLogicKey: (tabId: string) => string;
+        isDraft: (activeTab: QueryTab | null) => boolean;
+        currentDraft: (activeTab: QueryTab | null) => DataWarehouseSavedQueryDraft | null | undefined;
+        selectedQueryColumns: (selectedQueryTablesAndColumns: Record<string, Record<string, boolean>>) => Record<string, boolean>;
+    };
+}
+
+export type sqlEditorLogicType = MakeLogicType<sqlEditorLogicValues, sqlEditorLogicActions, SqlEditorLogicProps, sqlEditorLogicMeta>;
+
 export const sqlEditorLogic = kea<sqlEditorLogicType>([
     path(['data-warehouse', 'editor', 'sqlEditorLogic']),
     props({ mode: SQLEditorMode.FullScene } as SqlEditorLogicProps),
@@ -2129,32 +2587,32 @@ export const sqlEditorLogic = kea<sqlEditorLogicType>([
     selectors({
         suggestedSource: [
             (s) => [s.suggestionPayload],
-            (suggestionPayload) => {
+            (suggestionPayload: SuggestionPayload | null) => {
                 return suggestionPayload?.source ?? null
             },
         ],
         diffShowRunButton: [
             (s) => [s.suggestionPayload],
-            (suggestionPayload) => {
+            (suggestionPayload: SuggestionPayload | null) => {
                 return suggestionPayload?.diffShowRunButton
             },
         ],
         acceptText: [
             (s) => [s.suggestionPayload],
-            (suggestionPayload) => {
+            (suggestionPayload: SuggestionPayload | null) => {
                 return suggestionPayload?.acceptText ?? 'Accept'
             },
         ],
         rejectText: [
             (s) => [s.suggestionPayload],
-            (suggestionPayload) => {
+            (suggestionPayload: SuggestionPayload | null) => {
                 return suggestionPayload?.rejectText ?? 'Reject'
             },
         ],
 
         suggestedQueryInput: [
             (s) => [s.suggestionPayload, s.queryInput],
-            (suggestionPayload, queryInput) => {
+            (suggestionPayload: SuggestionPayload | null, queryInput: string | null) => {
                 if (suggestionPayload?.suggestedValue && suggestionPayload?.suggestedValue !== queryInput) {
                     return suggestionPayload?.suggestedValue ?? ''
                 }
@@ -2164,7 +2622,7 @@ export const sqlEditorLogic = kea<sqlEditorLogicType>([
         ],
         originalQueryInput: [
             (s) => [s.suggestionPayload, s.queryInput],
-            (suggestionPayload, queryInput) => {
+            (suggestionPayload: SuggestionPayload | null, queryInput: string | null) => {
                 // If we have a suggestion payload, always show diff mode
                 if (suggestionPayload?.suggestedValue) {
                     // Prefer the stored originalValue if available, otherwise use current queryInput
@@ -2176,19 +2634,19 @@ export const sqlEditorLogic = kea<sqlEditorLogicType>([
         ],
         editingView: [
             (s) => [s.activeTab],
-            (activeTab) => {
+            (activeTab: QueryTab | null) => {
                 return activeTab?.view
             },
         ],
         changesToSave: [
             (s) => [s.editingView, s.queryInput],
-            (editingView, queryInput) => {
+            (editingView: DataWarehouseSavedQuery | undefined, queryInput: string | null) => {
                 return editingView?.query?.query !== queryInput
             },
         ],
         exportContext: [
             (s) => [s.sourceQuery],
-            (sourceQuery) => {
+            (sourceQuery: DataVisualizationNode) => {
                 // TODO: use active tab at some point
                 const filename = 'export'
 
@@ -2200,7 +2658,7 @@ export const sqlEditorLogic = kea<sqlEditorLogicType>([
         ],
         selectedConnectionId: [
             (s) => [s.sourceQuery],
-            (sourceQuery) => {
+            (sourceQuery: DataVisualizationNode) => {
                 return sourceQuery.source && 'connectionId' in sourceQuery.source
                     ? sourceQuery.source.connectionId
                     : undefined
@@ -2208,25 +2666,37 @@ export const sqlEditorLogic = kea<sqlEditorLogicType>([
         ],
         selectedDirectSource: [
             (s) => [s.dataWarehouseSources, s.selectedConnectionId],
-            (dataWarehouseSources, selectedConnectionId): ExternalDataSource | undefined => {
+            (
+                dataWarehouseSources: null | import('lib/api').PaginatedResponse<ExternalDataSource>,
+                selectedConnectionId: string | undefined
+            ): ExternalDataSource | undefined => {
                 return dataWarehouseSources?.results.find((source) => source.id === selectedConnectionId)
             },
         ],
         sendRawQueryEnabled: [
             (s) => [s.sourceQuery, s.selectedConnectionId],
-            (sourceQuery, selectedConnectionId) => !!selectedConnectionId && (sourceQuery.source.sendRawQuery ?? false),
+            (sourceQuery: DataVisualizationNode, selectedConnectionId: string | undefined) =>
+                !!selectedConnectionId && (sourceQuery.source.sendRawQuery ?? false),
         ],
         isEditingMaterializedView: [
             (s) => [s.editingView],
-            (editingView) => {
+            (editingView: DataWarehouseSavedQuery | undefined) => {
                 return !!editingView?.is_materialized
             },
         ],
-        splitQueryRanges: [(s) => [s.queryInput], (queryInput): QueryRange[] => splitQueries(queryInput ?? '')],
-        isMultiQuery: [(s) => [s.splitQueryRanges], (ranges): boolean => ranges.length > 1],
+        splitQueryRanges: [
+            (s) => [s.queryInput],
+            (queryInput: string | null): QueryRange[] => splitQueries(queryInput ?? ''),
+        ],
+        isMultiQuery: [(s) => [s.splitQueryRanges], (ranges: QueryRange[]): boolean => ranges.length > 1],
         isSourceQueryLastRun: [
             (s) => [s.queryInput, s.lastRunQuery, s.sourceQuery, s.splitQueryRanges],
-            (queryInput, lastRunQuery, sourceQuery, splitRanges) => {
+            (
+                queryInput: string | null,
+                lastRunQuery: DataVisualizationNode | null,
+                sourceQuery: DataVisualizationNode,
+                splitRanges: QueryRange[]
+            ) => {
                 const lastRunQueryText = (lastRunQuery?.source.query ?? sourceQuery.source.query ?? '').trim()
                 if ((queryInput ?? '').trim() === lastRunQueryText) {
                     return true
@@ -2238,18 +2708,18 @@ export const sqlEditorLogic = kea<sqlEditorLogicType>([
         ],
         hasFiltersPlaceholder: [
             (s) => [s.queryInput],
-            (queryInput) => {
+            (queryInput: string | null) => {
                 return queryUsesFiltersPlaceholder(queryInput)
             },
         ],
-        hasQueryInput: [(s) => [s.queryInput], (queryInput) => !!queryInput],
+        hasQueryInput: [(s) => [s.queryInput], (queryInput: string | null) => !!queryInput],
         isEmbeddedMode: [
             () => [(_, p: SqlEditorLogicProps) => p.mode],
-            (mode) => isEmbeddedSQLEditorMode(mode ?? SQLEditorMode.FullScene),
+            (mode: SQLEditorMode | undefined) => isEmbeddedSQLEditorMode(mode ?? SQLEditorMode.FullScene),
         ],
-        dataLogicKey: [(_, p) => [p.tabId], (tabId) => `data-warehouse-editor-data-node-${tabId}`],
-        isDraft: [(s) => [s.activeTab], (activeTab) => (activeTab ? !!activeTab.draft?.id : false)],
-        currentDraft: [(s) => [s.activeTab], (activeTab) => (activeTab ? activeTab.draft : null)],
+        dataLogicKey: [(_, p) => [p.tabId], (tabId: string) => `data-warehouse-editor-data-node-${tabId}`],
+        isDraft: [(s) => [s.activeTab], (activeTab: QueryTab | null) => (activeTab ? !!activeTab.draft?.id : false)],
+        currentDraft: [(s) => [s.activeTab], (activeTab: QueryTab | null) => (activeTab ? activeTab.draft : null)],
         selectedQueryColumns: [
             (s) => [s.selectedQueryTablesAndColumns],
             (tablesAndColumns: Record<string, Record<string, boolean>>): Record<string, boolean> => {
diff --git a/frontend/src/scenes/data-warehouse/editor/suggestions/aiSuggestion.ts b/frontend/src/scenes/data-warehouse/editor/suggestions/aiSuggestion.ts
index 0438b4e40d38..ec6e4ec48cb4 100644
--- a/frontend/src/scenes/data-warehouse/editor/suggestions/aiSuggestion.ts
+++ b/frontend/src/scenes/data-warehouse/editor/suggestions/aiSuggestion.ts
@@ -1,4 +1,4 @@
-import { sqlEditorLogicType } from '../sqlEditorLogicType'
+import type { sqlEditorLogicType } from '../sqlEditorLogic'
 
 // Handlers for AI query suggestions
 
diff --git a/frontend/src/scenes/data-warehouse/saved_queries/dataWarehouseViewsLogic.tsx b/frontend/src/scenes/data-warehouse/saved_queries/dataWarehouseViewsLogic.tsx
index dc877a18acc9..aa8093972605 100644
--- a/frontend/src/scenes/data-warehouse/saved_queries/dataWarehouseViewsLogic.tsx
+++ b/frontend/src/scenes/data-warehouse/saved_queries/dataWarehouseViewsLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
@@ -11,7 +11,8 @@ import { userLogic } from 'scenes/userLogic'
 
 import { DataWarehouseSavedQuery, DataWarehouseSavedQueryFolder } from '~/types'
 
-import type { dataWarehouseViewsLogicType } from './dataWarehouseViewsLogicType'
+import type { DatabaseSchemaViewTable } from '../../../queries/schema/schema-general'
+import type { UserType } from '../../../types'
 
 // Materialization is async: enabling it flips `is_materialized` either synchronously (the
 // /materialize action) or later, when the Temporal job runs (scheduled sync frequency). After
@@ -20,6 +21,261 @@ import type { dataWarehouseViewsLogicType } from './dataWarehouseViewsLogicType'
 const MATERIALIZATION_POLL_INTERVAL_MS = 5000
 const MATERIALIZATION_POLL_MAX_ATTEMPTS = 12
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataWarehouseViewsLogicValues {
+    databaseLoading: boolean // databaseTableListLogic
+    views: DatabaseSchemaViewTable[] // databaseTableListLogic
+    user: UserType | null // userLogic
+    dataWarehouseSavedQueries: DataWarehouseSavedQuery[]
+    dataWarehouseSavedQueriesLoading: boolean
+    dataWarehouseSavedQueryFolders: DataWarehouseSavedQueryFolder[]
+    dataWarehouseSavedQueryFoldersById: Record<string, DataWarehouseSavedQueryFolder>
+    dataWarehouseSavedQueryFoldersLoading: boolean
+    dataWarehouseSavedQueryMap: Record<string, DataWarehouseSavedQuery>
+    dataWarehouseSavedQueryMapById: Record<string, DataWarehouseSavedQuery>
+    dataWarehouseSavedQueryMapByIdStringMap: Record<string, DataWarehouseSavedQuery>
+    initialDataWarehouseSavedQueryLoading: boolean
+    materializingViewIds: string[]
+    shouldShowEmptyState: boolean
+    updatingDataWarehouseSavedQuery: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataWarehouseViewsLogicActions {
+    refreshDatabaseSchema: () => {
+        value: true
+    } // databaseTableListLogic
+    addMaterializingViews: (viewIds: string[]) => {
+        viewIds: string[]
+    }
+    cancelDataWarehouseSavedQuery: (viewId: string) => {
+        viewId: string
+    }
+    clearMaterializingView: (viewId: string) => {
+        viewId: string
+    }
+    createDataWarehouseSavedQuery: (
+        view: Partial<DataWarehouseSavedQuery> & {
+            dag_id?: string
+            folder_id?: string | null
+            types: string[][]
+        }
+    ) => Partial<DataWarehouseSavedQuery> & {
+        types: string[][]
+        folder_id?: string | null
+        dag_id?: string
+    }
+    createDataWarehouseSavedQueryFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    createDataWarehouseSavedQueryFolder: (name: string) => string
+    createDataWarehouseSavedQueryFolderFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    createDataWarehouseSavedQueryFolderSuccess: (
+        dataWarehouseSavedQueryFolders: DataWarehouseSavedQueryFolder[],
+        payload?: string
+    ) => {
+        dataWarehouseSavedQueryFolders: DataWarehouseSavedQueryFolder[]
+        payload?: string
+    }
+    createDataWarehouseSavedQuerySuccess: (
+        dataWarehouseSavedQueries: DataWarehouseSavedQuery[],
+        payload?: Partial<DataWarehouseSavedQuery> & {
+            types: string[][]
+            folder_id?: string | null
+            dag_id?: string
+        }
+    ) => {
+        dataWarehouseSavedQueries: DataWarehouseSavedQuery[]
+        payload?: Partial<DataWarehouseSavedQuery> & {
+            types: string[][]
+            folder_id?: string | null
+            dag_id?: string
+        }
+    }
+    deleteDataWarehouseSavedQuery: (viewId: string) => string
+    deleteDataWarehouseSavedQueryFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteDataWarehouseSavedQueryFolder: (folderId: string) => string
+    deleteDataWarehouseSavedQueryFolderFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteDataWarehouseSavedQueryFolderSuccess: (
+        dataWarehouseSavedQueryFolders: DataWarehouseSavedQueryFolder[],
+        payload?: string
+    ) => {
+        dataWarehouseSavedQueryFolders: DataWarehouseSavedQueryFolder[]
+        payload?: string
+    }
+    deleteDataWarehouseSavedQuerySuccess: (
+        dataWarehouseSavedQueries: DataWarehouseSavedQuery[],
+        payload?: string
+    ) => {
+        dataWarehouseSavedQueries: DataWarehouseSavedQuery[]
+        payload?: string
+    }
+    loadDataWarehouseSavedQueries: () => any
+    loadDataWarehouseSavedQueriesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadDataWarehouseSavedQueriesSuccess: (
+        dataWarehouseSavedQueries: DataWarehouseSavedQuery[],
+        payload?: any
+    ) => {
+        dataWarehouseSavedQueries: DataWarehouseSavedQuery[]
+        payload?: any
+    }
+    loadDataWarehouseSavedQueryFolders: () => any
+    loadDataWarehouseSavedQueryFoldersFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadDataWarehouseSavedQueryFoldersSuccess: (
+        dataWarehouseSavedQueryFolders: DataWarehouseSavedQueryFolder[],
+        payload?: any
+    ) => {
+        dataWarehouseSavedQueryFolders: DataWarehouseSavedQueryFolder[]
+        payload?: any
+    }
+    materializeDataWarehouseSavedQuery: (viewId: string) => {
+        viewId: string
+    }
+    revertMaterialization: (viewId: string) => {
+        viewId: string
+    }
+    runDataWarehouseSavedQuery: (viewId: string) => {
+        viewId: string
+    }
+    updateDataWarehouseSavedQuery: (
+        view: Partial<DataWarehouseSavedQuery> & {
+            edited_history_id?: string
+            folder_id?: string | null
+            id: string
+            lifecycle?: string
+            shouldRematerialize?: boolean
+            soft_update?: boolean
+            sync_frequency?: string
+            types?: string[][]
+        }
+    ) => Partial<DataWarehouseSavedQuery> & {
+        id: string
+        types?: string[][]
+        sync_frequency?: string
+        lifecycle?: string
+        shouldRematerialize?: boolean
+        edited_history_id?: string
+        folder_id?: string | null
+        soft_update?: boolean
+    }
+    updateDataWarehouseSavedQueryFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateDataWarehouseSavedQueryFolder: ({ id, name }: { id: string; name: string }) => {
+        id: string
+        name: string
+    }
+    updateDataWarehouseSavedQueryFolderFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateDataWarehouseSavedQueryFolderSuccess: (
+        dataWarehouseSavedQueryFolders: DataWarehouseSavedQueryFolder[],
+        payload?: {
+            id: string
+            name: string
+        }
+    ) => {
+        dataWarehouseSavedQueryFolders: DataWarehouseSavedQueryFolder[]
+        payload?: {
+            id: string
+            name: string
+        }
+    }
+    updateDataWarehouseSavedQuerySuccess: (
+        dataWarehouseSavedQueries: DataWarehouseSavedQuery[],
+        payload?: Partial<DataWarehouseSavedQuery> & {
+            id: string
+            types?: string[][]
+            sync_frequency?: string
+            lifecycle?: string
+            shouldRematerialize?: boolean
+            edited_history_id?: string
+            folder_id?: string | null
+            soft_update?: boolean
+        }
+    ) => {
+        dataWarehouseSavedQueries: DataWarehouseSavedQuery[]
+        payload?: Partial<DataWarehouseSavedQuery> & {
+            id: string
+            types?: string[][]
+            sync_frequency?: string
+            lifecycle?: string
+            shouldRematerialize?: boolean
+            edited_history_id?: string
+            folder_id?: string | null
+            soft_update?: boolean
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataWarehouseViewsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        shouldShowEmptyState: (views: DatabaseSchemaViewTable[], databaseLoading: boolean) => boolean
+        dataWarehouseSavedQueryMapById: (
+            dataWarehouseSavedQueries: DataWarehouseSavedQuery[]
+        ) => Record<string, DataWarehouseSavedQuery>
+        dataWarehouseSavedQueryMapByIdStringMap: (
+            dataWarehouseSavedQueries: DataWarehouseSavedQuery[]
+        ) => Record<string, DataWarehouseSavedQuery>
+        dataWarehouseSavedQueryMap: (
+            dataWarehouseSavedQueries: DataWarehouseSavedQuery[]
+        ) => Record<string, DataWarehouseSavedQuery>
+        dataWarehouseSavedQueryFoldersById: (
+            dataWarehouseSavedQueryFolders: DataWarehouseSavedQueryFolder[]
+        ) => Record<string, DataWarehouseSavedQueryFolder>
+    }
+}
+
+export type dataWarehouseViewsLogicType = MakeLogicType<
+    dataWarehouseViewsLogicValues,
+    dataWarehouseViewsLogicActions,
+    Record<string, any>,
+    dataWarehouseViewsLogicMeta
+>
+
 export const dataWarehouseViewsLogic = kea<dataWarehouseViewsLogicType>([
     path(['scenes', 'warehouse', 'dataWarehouseSavedQueriesLogic']),
     connect(() => ({
@@ -283,13 +539,13 @@ export const dataWarehouseViewsLogic = kea<dataWarehouseViewsLogicType>([
     selectors({
         shouldShowEmptyState: [
             (s) => [s.views, s.databaseLoading],
-            (views, databaseLoading): boolean => {
+            (views: import('../../../queries/schema').DatabaseSchemaViewTable[], databaseLoading: boolean): boolean => {
                 return views?.length == 0 && !databaseLoading
             },
         ],
         dataWarehouseSavedQueryMapById: [
             (s) => [s.dataWarehouseSavedQueries],
-            (dataWarehouseSavedQueries) => {
+            (dataWarehouseSavedQueries: DataWarehouseSavedQuery[]) => {
                 return (
                     dataWarehouseSavedQueries?.reduce(
                         (acc, cur) => {
@@ -304,7 +560,7 @@ export const dataWarehouseViewsLogic = kea<dataWarehouseViewsLogicType>([
         // id hyphens are removed. Used for hex'd id paths in DAG
         dataWarehouseSavedQueryMapByIdStringMap: [
             (s) => [s.dataWarehouseSavedQueries],
-            (dataWarehouseSavedQueries) => {
+            (dataWarehouseSavedQueries: DataWarehouseSavedQuery[]) => {
                 return (
                     dataWarehouseSavedQueries?.reduce(
                         (acc, cur) => {
@@ -318,7 +574,7 @@ export const dataWarehouseViewsLogic = kea<dataWarehouseViewsLogicType>([
         ],
         dataWarehouseSavedQueryMap: [
             (s) => [s.dataWarehouseSavedQueries],
-            (dataWarehouseSavedQueries) => {
+            (dataWarehouseSavedQueries: DataWarehouseSavedQuery[]) => {
                 return (
                     dataWarehouseSavedQueries?.reduce(
                         (acc, cur) => {
@@ -332,7 +588,7 @@ export const dataWarehouseViewsLogic = kea<dataWarehouseViewsLogicType>([
         ],
         dataWarehouseSavedQueryFoldersById: [
             (s) => [s.dataWarehouseSavedQueryFolders],
-            (folders) => {
+            (folders: DataWarehouseSavedQueryFolder[]) => {
                 return folders.reduce(
                     (acc, folder) => {
                         acc[folder.id] = folder
diff --git a/frontend/src/scenes/data-warehouse/saved_queries/materializationJobsLogic.ts b/frontend/src/scenes/data-warehouse/saved_queries/materializationJobsLogic.ts
index 4e3f39f2e323..67a98bd41f2e 100644
--- a/frontend/src/scenes/data-warehouse/saved_queries/materializationJobsLogic.ts
+++ b/frontend/src/scenes/data-warehouse/saved_queries/materializationJobsLogic.ts
@@ -1,12 +1,25 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, propsChanged, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    afterMount,
+    connect,
+    kea,
+    key,
+    listeners,
+    path,
+    props,
+    propsChanged,
+    reducers,
+    selectors,
+} from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api, { PaginatedResponse } from 'lib/api'
 
 import { DataModelingJob, DataWarehouseSavedQuery } from '~/types'
 
+import type { CountedPaginatedResponse } from '../../../lib/api'
 import { dataWarehouseViewsLogic } from './dataWarehouseViewsLogic'
-import type { materializationJobsLogicType } from './materializationJobsLogicType'
 
 const REFRESH_INTERVAL = 10000
 const DEFAULT_JOBS_PAGE_SIZE = 10
@@ -15,6 +28,110 @@ export interface MaterializationJobsLogicProps {
     viewId: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface materializationJobsLogicValues {
+    dataModelingJobs: PaginatedResponse<DataModelingJob> | null
+    dataModelingJobsLoading: boolean
+    hasMoreJobsToLoad: boolean
+    savedQuery: DataWarehouseSavedQuery | null
+    savedQueryLoading: boolean
+    startingMaterialization: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface materializationJobsLogicActions {
+    updateDataWarehouseSavedQuerySuccess: (
+        dataWarehouseSavedQueries: DataWarehouseSavedQuery[],
+        payload?:
+            | (Partial<DataWarehouseSavedQuery> & {
+                  edited_history_id?: string
+                  folder_id?: string | null
+                  id: string
+                  lifecycle?: string
+                  shouldRematerialize?: boolean
+                  soft_update?: boolean
+                  sync_frequency?: string
+                  types?: string[][]
+              })
+            | undefined
+    ) => {
+        dataWarehouseSavedQueries: DataWarehouseSavedQuery[]
+        payload?: Partial<DataWarehouseSavedQuery> & {
+            edited_history_id?: string
+            folder_id?: string | null
+            id: string
+            lifecycle?: string
+            shouldRematerialize?: boolean
+            soft_update?: boolean
+            sync_frequency?: string
+            types?: string[][]
+        }
+    } // dataWarehouseViewsLogic
+    loadDataModelingJobs: () => any
+    loadDataModelingJobsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadDataModelingJobsSuccess: (
+        dataModelingJobs: CountedPaginatedResponse<DataModelingJob>,
+        payload?: any
+    ) => {
+        dataModelingJobs: CountedPaginatedResponse<DataModelingJob>
+        payload?: any
+    }
+    loadOlderDataModelingJobs: () => any
+    loadOlderDataModelingJobsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadOlderDataModelingJobsSuccess: (
+        dataModelingJobs: PaginatedResponse<DataModelingJob> | null,
+        payload?: any
+    ) => {
+        dataModelingJobs: PaginatedResponse<DataModelingJob> | null
+        payload?: any
+    }
+    loadSavedQuery: () => any
+    loadSavedQueryFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSavedQuerySuccess: (
+        savedQuery: DataWarehouseSavedQuery | null,
+        payload?: any
+    ) => {
+        savedQuery: DataWarehouseSavedQuery | null
+        payload?: any
+    }
+    setStartingMaterialization: (starting: boolean) => {
+        starting: boolean
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface materializationJobsLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        hasMoreJobsToLoad: (dataModelingJobs: PaginatedResponse<DataModelingJob> | null) => boolean
+    }
+}
+
+export type materializationJobsLogicType = MakeLogicType<
+    materializationJobsLogicValues,
+    materializationJobsLogicActions,
+    MaterializationJobsLogicProps,
+    materializationJobsLogicMeta
+>
+
 export const materializationJobsLogic = kea<materializationJobsLogicType>([
     path(['scenes', 'data-warehouse', 'saved_queries', 'materializationJobsLogic']),
     props({} as MaterializationJobsLogicProps),
@@ -86,7 +203,10 @@ export const materializationJobsLogic = kea<materializationJobsLogicType>([
         ],
     }),
     selectors({
-        hasMoreJobsToLoad: [(s) => [s.dataModelingJobs], (dataModelingJobs) => !!dataModelingJobs?.next],
+        hasMoreJobsToLoad: [
+            (s) => [s.dataModelingJobs],
+            (dataModelingJobs: PaginatedResponse<DataModelingJob> | null) => !!dataModelingJobs?.next,
+        ],
     }),
     afterMount(({ actions, props }) => {
         if (props.viewId) {
diff --git a/frontend/src/scenes/data-warehouse/scene/dataModelingLogic.ts b/frontend/src/scenes/data-warehouse/scene/dataModelingLogic.ts
index 45d1fce3bd33..18a2e413b337 100644
--- a/frontend/src/scenes/data-warehouse/scene/dataModelingLogic.ts
+++ b/frontend/src/scenes/data-warehouse/scene/dataModelingLogic.ts
@@ -9,7 +9,7 @@ import {
     applyNodeChanges,
 } from '@xyflow/react'
 import { deepEqual as equal } from 'fast-equals'
-import { actions, afterMount, beforeUnmount, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, beforeUnmount, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import type { RefObject } from 'react'
 
@@ -24,7 +24,6 @@ import {
     DataModelingNodeType,
 } from '~/types'
 
-import type { dataModelingLogicType } from './dataModelingLogicType'
 import { getFormattedNodes } from './modeling/autolayout'
 import { PAGE_SIZE } from './modeling/constants'
 import { Edge, ElkDirection, Node, NodeHandle, SearchMode, ViewMode } from './modeling/types'
@@ -93,6 +92,232 @@ export function parseSearchTerm(searchTerm: string): ParsedSearch {
     return { mode: 'search', baseName: trimmed }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataModelingLogicValues {
+    availableDagIds: string[];
+    availableTypes: DataModelingNodeType[];
+    currentPage: number;
+    dags: DataModelingDAG[];
+    dagsLoading: boolean;
+    dataModelingEdges: DataModelingEdge[];
+    dataModelingEdgesLoading: boolean;
+    dataModelingNodes: DataModelingNode[];
+    dataModelingNodesLoading: boolean;
+    debouncedSearchTerm: string;
+    edges: Edge[];
+    enrichedEdges: Edge[];
+    enrichedNodes: Node[];
+    filterDagIds: string[];
+    filterTypes: DataModelingNodeType[];
+    filteredNodes: DataModelingNode[];
+    graphReady: boolean;
+    highlightedNodeIds: ((baseName: string, mode: "all" | "downstream" | "upstream") => Set<string>);
+    highlightedNodeType: DataModelingNodeType | null;
+    hoveredNodeId: string | null;
+    latestJobMetadataByNodeId: Record<string, {
+        lastRunAt: string | null;
+        status: DataModelingJobStatus;
+    }>;
+    latestJobMetadataBySavedQueryId: Record<string, {
+        lastRunAt: string | null;
+        status: DataModelingJobStatus;
+    }>;
+    layoutDirection: ElkDirection;
+    nodeTypePanelCollapsed: boolean;
+    nodes: Node[];
+    nodesById: Record<string, Node>;
+    nodesLoading: boolean;
+    parsedSearch: ParsedSearch;
+    reactFlowInstance: ReactFlowInstance<Node, Edge> | null;
+    reactFlowWrapper: RefObject<HTMLDivElement> | null;
+    runningNodeIds: Set<string>;
+    savedViewport: Viewport | null;
+    searchTerm: string;
+    selectedDag: DataModelingDAG | null;
+    selectedDagId: string | null;
+    viewMode: ViewMode;
+    viewNodes: DataModelingNode[];
+    visibleNodes: DataModelingNode[];
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataModelingLogicActions {
+    clearFilterDagIds: () => {
+        value: true;
+    };
+    clearFilterTypes: () => {
+        value: true;
+    };
+    loadDags: () => any;
+    loadDagsFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadDagsSuccess: (dags: DataModelingDAG[], payload?: any) => {
+        dags: DataModelingDAG[];
+        payload?: any;
+    };
+    loadDataModelingEdges: () => any;
+    loadDataModelingEdgesFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadDataModelingEdgesSuccess: (dataModelingEdges: DataModelingEdge[], payload?: any) => {
+        dataModelingEdges: DataModelingEdge[];
+        payload?: any;
+    };
+    loadDataModelingNodes: () => any;
+    loadDataModelingNodesFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadDataModelingNodesSuccess: (dataModelingNodes: DataModelingNode[], payload?: any) => {
+        dataModelingNodes: DataModelingNode[];
+        payload?: any;
+    };
+    loadRecentJobs: () => {
+        value: true;
+    };
+    loadRecentJobsSuccess: (recentJobs: DataModelingJob[]) => {
+        recentJobs: DataModelingJob[];
+    };
+    materializeNode: (nodeId: string) => {
+        nodeId: string;
+    };
+    materializeNodeFailure: (nodeId: string, error: string) => {
+        error: string;
+        nodeId: string;
+    };
+    materializeNodeSuccess: (nodeId: string) => {
+        nodeId: string;
+    };
+    onEdgesChange: (edges: EdgeChange<Edge>[]) => {
+        edges: EdgeChange<Edge>[];
+    };
+    onNodesChange: (nodes: NodeChange<Node>[]) => {
+        nodes: NodeChange<Node>[];
+    };
+    pollRunningJobs: () => {
+        value: true;
+    };
+    pollRunningJobsSuccess: (runningJobs: DataModelingJob[]) => {
+        runningJobs: DataModelingJob[];
+    };
+    resetGraph: (dataModelingNodes: DataModelingNode[], dataModelingEdges: DataModelingEdge[], fitViewAfter?: boolean) => {
+        dataModelingEdges: DataModelingEdge[];
+        dataModelingNodes: DataModelingNode[];
+        fitViewAfter: boolean | undefined;
+    };
+    runNode: (nodeId: string, direction: "downstream" | "upstream") => {
+        direction: "downstream" | "upstream";
+        nodeId: string;
+    };
+    runNodeFailure: (nodeId: string, direction: "downstream" | "upstream", error: string) => {
+        direction: "downstream" | "upstream";
+        error: string;
+        nodeId: string;
+    };
+    runNodeSuccess: (nodeId: string, direction: "downstream" | "upstream", runningNodeIds: string[]) => {
+        direction: "downstream" | "upstream";
+        nodeId: string;
+        runningNodeIds: string[];
+    };
+    setCurrentPage: (page: number) => {
+        page: number;
+    };
+    setDebouncedSearchTerm: (debouncedSearchTerm: string) => {
+        debouncedSearchTerm: string;
+    };
+    setEdges: (edges: Edge[]) => {
+        edges: Edge[];
+    };
+    setGraphReady: (ready: boolean) => {
+        ready: boolean;
+    };
+    setHighlightedNodeType: (highlightedNodeType: DataModelingNodeType | null) => {
+        highlightedNodeType: DataModelingNodeType | null;
+    };
+    setHoveredNodeId: (hoveredNodeId: string | null) => {
+        hoveredNodeId: string | null;
+    };
+    setLayoutDirection: (layoutDirection: ElkDirection) => {
+        layoutDirection: ElkDirection;
+    };
+    setNodeTypePanelCollapsed: (collapsed: boolean) => {
+        collapsed: boolean;
+    };
+    setNodes: (nodes: Node[], fitViewAfter?: boolean) => {
+        fitViewAfter: boolean | undefined;
+        nodes: Node[];
+    };
+    setNodesRaw: (nodes: Node[]) => {
+        nodes: Node[];
+    };
+    setReactFlowInstance: (reactFlowInstance: ReactFlowInstance<Node, Edge>) => {
+        reactFlowInstance: ReactFlowInstance<Node, Edge>;
+    };
+    setReactFlowWrapper: (reactFlowWrapper: RefObject<HTMLDivElement>) => {
+        reactFlowWrapper: RefObject<HTMLDivElement>;
+    };
+    setRunningNodeIds: (runningNodeIds: Set<string>) => {
+        runningNodeIds: Set<string>;
+    };
+    setSavedViewport: (viewport: Viewport) => {
+        viewport: Viewport;
+    };
+    setSearchTerm: (searchTerm: string) => {
+        searchTerm: string;
+    };
+    setSelectedDagId: (dagId: string | null) => {
+        dagId: string | null;
+    };
+    setViewMode: (viewMode: ViewMode) => {
+        viewMode: ViewMode;
+    };
+    startPollingRunningJobs: () => {
+        value: true;
+    };
+    stopPollingRunningJobs: () => {
+        value: true;
+    };
+    toggleFilterDagId: (dagId: string) => {
+        dagId: string;
+    };
+    toggleFilterType: (nodeType: DataModelingNodeType) => {
+        nodeType: DataModelingNodeType;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataModelingLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        nodesById: (nodes: Node[]) => Record<string, Node>;
+        nodesLoading: (dataModelingNodesLoading: boolean, dataModelingEdgesLoading: boolean, graphReady: boolean, viewMode: ViewMode) => boolean;
+        latestJobMetadataByNodeId: (nodes: Node[], latestJobMetadataBySavedQueryId: Record<string, {
+            lastRunAt: string | null;
+            status: DataModelingJobStatus;
+        }>) => Record<string, {
+            lastRunAt: string | null;
+            status: DataModelingJobStatus;
+        }>;
+        enrichedNodes: (nodes: Node[], runningNodeIds: Set<string>, highlightedNodeType: DataModelingNodeType | null, latestJobMetadataByNodeId: Record<string, {
+            lastRunAt: string | null;
+            status: DataModelingJobStatus;
+        }>) => Node[];
+        enrichedEdges: (edges: Edge[], hoveredNodeId: string | null) => Edge[];
+        highlightedNodeIds: (nodes: Node[], edges: Edge[]) => ((baseName: string, mode: "all" | "downstream" | "upstream") => Set<string>);
+        parsedSearch: (debouncedSearchTerm: string) => ParsedSearch;
+        filteredNodes: (dataModelingNodes: DataModelingNode[], searchTerm: string) => DataModelingNode[];
+        selectedDag: (dags: DataModelingDAG[], selectedDagId: string | null) => DataModelingDAG | null;
+        availableDagIds: (filteredNodes: DataModelingNode[]) => string[];
+        availableTypes: (filteredNodes: DataModelingNode[]) => DataModelingNodeType[];
+        viewNodes: (filteredNodes: DataModelingNode[], filterDagIds: string[], filterTypes: DataModelingNodeType[]) => DataModelingNode[];
+        visibleNodes: (viewNodes: DataModelingNode[], currentPage: number) => DataModelingNode[];
+    };
+}
+
+export type dataModelingLogicType = MakeLogicType<dataModelingLogicValues, dataModelingLogicActions, Record<string, any>, dataModelingLogicMeta>;
+
 export const dataModelingLogic = kea<dataModelingLogicType>([
     path(['scenes', 'data-warehouse', 'scene', 'dataModelingLogic']),
     actions({
@@ -352,7 +577,7 @@ export const dataModelingLogic = kea<dataModelingLogicType>([
     selectors({
         nodesById: [
             (s) => [s.nodes],
-            (nodes): Record<string, Node> => {
+            (nodes: Node[]): Record<string, Node> => {
                 return nodes.reduce(
                     (acc, node) => {
                         acc[node.id] = node
@@ -375,8 +600,11 @@ export const dataModelingLogic = kea<dataModelingLogicType>([
         latestJobMetadataByNodeId: [
             (s) => [s.nodes, s.latestJobMetadataBySavedQueryId],
             (
-                nodes,
-                latestJobMetadataBySavedQueryId
+                nodes: Node[],
+                latestJobMetadataBySavedQueryId: Record<string, {
+    lastRunAt: string | null;
+    status: DataModelingJobStatus;
+}>
             ): Record<string, { status: DataModelingJobStatus; lastRunAt: string | null }> => {
                 const map: Record<string, { status: DataModelingJobStatus; lastRunAt: string | null }> = {}
                 for (const node of nodes) {
@@ -390,7 +618,10 @@ export const dataModelingLogic = kea<dataModelingLogicType>([
         ],
         enrichedNodes: [
             (s) => [s.nodes, s.runningNodeIds, s.highlightedNodeType, s.latestJobMetadataByNodeId],
-            (nodes, runningNodeIds, highlightedNodeType, latestJobMetadataByNodeId): Node[] => {
+            (nodes: Node[], runningNodeIds: Set<string>, highlightedNodeType: DataModelingNodeType | null, latestJobMetadataByNodeId: Record<string, {
+    lastRunAt: string | null;
+    status: DataModelingJobStatus;
+}>): Node[] => {
                 return nodes.map((node) => {
                     const isRunning = runningNodeIds.has(node.id)
                     const isTypeHighlighted = highlightedNodeType !== null && highlightedNodeType === node.data.type
@@ -424,7 +655,7 @@ export const dataModelingLogic = kea<dataModelingLogicType>([
         ],
         enrichedEdges: [
             (s) => [s.edges, s.hoveredNodeId],
-            (edges, hoveredNodeId): Edge[] => {
+            (edges: Edge[], hoveredNodeId: string | null): Edge[] => {
                 if (!hoveredNodeId) {
                     return edges
                 }
@@ -447,7 +678,7 @@ export const dataModelingLogic = kea<dataModelingLogicType>([
         ],
         highlightedNodeIds: [
             (s) => [s.nodes, s.edges],
-            (nodes, edges): ((baseName: string, mode: 'upstream' | 'downstream' | 'all') => Set<string>) => {
+            (nodes: Node[], edges: Edge[]): ((baseName: string, mode: 'upstream' | 'downstream' | 'all') => Set<string>) => {
                 const { upstream, downstream } = buildAdjacencyMaps(edges)
 
                 return (baseName: string, mode: 'upstream' | 'downstream' | 'all'): Set<string> => {
diff --git a/frontend/src/scenes/data-warehouse/scene/managedWarehouseDataStatusLogic.ts b/frontend/src/scenes/data-warehouse/scene/managedWarehouseDataStatusLogic.ts
index db98ca55f937..1a0b22449a49 100644
--- a/frontend/src/scenes/data-warehouse/scene/managedWarehouseDataStatusLogic.ts
+++ b/frontend/src/scenes/data-warehouse/scene/managedWarehouseDataStatusLogic.ts
@@ -1,4 +1,4 @@
-import { afterMount, connect, kea, listeners, path, selectors } from 'kea'
+import { MakeLogicType, afterMount, connect, kea, listeners, path, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { teamLogic } from 'scenes/teamLogic'
@@ -9,12 +9,51 @@ import type {
     ManagedWarehouseReadinessStateEnumApi,
 } from 'products/data_warehouse/frontend/generated/api.schemas'
 
-import type { managedWarehouseDataStatusLogicType } from './managedWarehouseDataStatusLogicType'
-
 const ACTIVE_REFRESH_INTERVAL_MS = 15_000
 const STABLE_REFRESH_INTERVAL_MS = 60_000
 const ACTIVE_STATES: ManagedWarehouseReadinessStateEnumApi[] = ['waiting', 'backfilling', 'catching_up']
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface managedWarehouseDataStatusLogicValues {
+    currentTeamId: number | null // teamLogic
+    hasActiveWork: boolean
+    managedWarehouseDataStatus: ManagedWarehouseDataStatusResponseApi | null
+    managedWarehouseDataStatusLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface managedWarehouseDataStatusLogicActions {
+    loadManagedWarehouseDataStatus: () => any
+    loadManagedWarehouseDataStatusFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadManagedWarehouseDataStatusSuccess: (
+        managedWarehouseDataStatus: ManagedWarehouseDataStatusResponseApi,
+        payload?: any
+    ) => {
+        managedWarehouseDataStatus: ManagedWarehouseDataStatusResponseApi
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface managedWarehouseDataStatusLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        hasActiveWork: (managedWarehouseDataStatus: ManagedWarehouseDataStatusResponseApi | null) => boolean
+    }
+}
+
+export type managedWarehouseDataStatusLogicType = MakeLogicType<
+    managedWarehouseDataStatusLogicValues,
+    managedWarehouseDataStatusLogicActions,
+    Record<string, any>,
+    managedWarehouseDataStatusLogicMeta
+>
+
 export const managedWarehouseDataStatusLogic = kea<managedWarehouseDataStatusLogicType>([
     path(['scenes', 'data-warehouse', 'scene', 'managedWarehouseDataStatusLogic']),
     connect(() => ({
@@ -33,7 +72,7 @@ export const managedWarehouseDataStatusLogic = kea<managedWarehouseDataStatusLog
     selectors({
         hasActiveWork: [
             (s) => [s.managedWarehouseDataStatus],
-            (managedWarehouseDataStatus): boolean =>
+            (managedWarehouseDataStatus: ManagedWarehouseDataStatusResponseApi | null): boolean =>
                 managedWarehouseDataStatus !== null &&
                 ACTIVE_STATES.includes(managedWarehouseDataStatus.overall_readiness_state),
         ],
diff --git a/frontend/src/scenes/data-warehouse/scene/sourceSchemasModalLogic.ts b/frontend/src/scenes/data-warehouse/scene/sourceSchemasModalLogic.ts
index 4a6037a1da34..91ab111fca94 100644
--- a/frontend/src/scenes/data-warehouse/scene/sourceSchemasModalLogic.ts
+++ b/frontend/src/scenes/data-warehouse/scene/sourceSchemasModalLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { teamLogic } from 'scenes/teamLogic'
@@ -6,8 +6,6 @@ import { teamLogic } from 'scenes/teamLogic'
 import { dataWarehouseManagedWarehouseSourceSchemasRetrieve } from 'products/data_warehouse/frontend/generated/api'
 import type { ManagedWarehouseSourceTableStatusApi } from 'products/data_warehouse/frontend/generated/api.schemas'
 
-import type { sourceSchemasModalLogicType } from './sourceSchemasModalLogicType'
-
 export interface ActiveSource {
     sourceId: string
     sourceName: string
@@ -20,6 +18,41 @@ function isStale(sourceId: string, activeSource: ActiveSource | null): boolean {
     return activeSource?.sourceId !== sourceId
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sourceSchemasModalLogicValues {
+    activeSource: ActiveSource | null
+    sourceSchemas: ManagedWarehouseSourceTableStatusApi[]
+    sourceSchemasError: boolean
+    sourceSchemasLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sourceSchemasModalLogicActions {
+    closeSourceSchemasModal: () => {
+        value: true
+    }
+    loadSourceSchemas: ({ sourceId }: ActiveSource) => ActiveSource
+    loadSourceSchemasFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSourceSchemasSuccess: (
+        sourceSchemas: ManagedWarehouseSourceTableStatusApi[],
+        payload?: ActiveSource
+    ) => {
+        sourceSchemas: ManagedWarehouseSourceTableStatusApi[]
+        payload?: ActiveSource
+    }
+    setSourceSchemasError: (hasError: boolean) => {
+        hasError: boolean
+    }
+}
+
+export type sourceSchemasModalLogicType = MakeLogicType<sourceSchemasModalLogicValues, sourceSchemasModalLogicActions>
+
 export const sourceSchemasModalLogic = kea<sourceSchemasModalLogicType>([
     path(['scenes', 'data-warehouse', 'scene', 'sourceSchemasModalLogic']),
     actions({
diff --git a/frontend/src/scenes/data-warehouse/scene/viewsTabLogic.ts b/frontend/src/scenes/data-warehouse/scene/viewsTabLogic.ts
index e6e522385f26..6daaac65f263 100644
--- a/frontend/src/scenes/data-warehouse/scene/viewsTabLogic.ts
+++ b/frontend/src/scenes/data-warehouse/scene/viewsTabLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { LemonDialog } from '@posthog/lemon-ui'
@@ -13,11 +13,164 @@ import {
     DataWarehouseSavedQueryRunHistory,
 } from '~/types'
 
+import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
 import { dataWarehouseViewsLogic } from '../saved_queries/dataWarehouseViewsLogic'
-import type { viewsTabLogicType } from './viewsTabLogicType'
 
 export const PAGE_SIZE = 10
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface viewsTabLogicValues {
+    dataWarehouseSavedQueries: DataWarehouseSavedQuery[] // dataWarehouseViewsLogic
+    dataWarehouseSavedQueriesLoading: boolean // dataWarehouseViewsLogic
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    accessControlModalOpen: boolean
+    editingAccessControlView: DataWarehouseSavedQuery | null
+    enrichedMaterializedViews: DataWarehouseSavedQuery[]
+    enrichedViews: DataWarehouseSavedQuery[]
+    filteredMaterializedViews: DataWarehouseSavedQuery[]
+    filteredViews: DataWarehouseSavedQuery[]
+    materializedViewDependenciesMap: Record<string, DataWarehouseSavedQueryDependencies>
+    materializedViewDependenciesMapLoading: boolean
+    materializedViewsCurrentPage: number
+    runHistoryMap: Record<string, DataWarehouseSavedQueryRunHistory[]>
+    runHistoryMapLoading: boolean
+    searchTerm: string
+    viewDependenciesMap: Record<string, DataWarehouseSavedQueryDependencies>
+    viewDependenciesMapLoading: boolean
+    viewsCurrentPage: number
+    viewsLoading: boolean
+    visibleMaterializedViews: DataWarehouseSavedQuery[]
+    visibleViews: DataWarehouseSavedQuery[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface viewsTabLogicActions {
+    deleteDataWarehouseSavedQuery: (viewId: string) => string // dataWarehouseViewsLogic
+    runDataWarehouseSavedQuery: (viewId: string) => {
+        viewId: string
+    } // dataWarehouseViewsLogic
+    closeAccessControlModal: () => {
+        value: true
+    }
+    deleteView: (viewId: string) => {
+        viewId: string
+    }
+    loadDependenciesForMaterializedViews: (viewIds: string[]) => {
+        viewIds: string[]
+    }
+    loadDependenciesForMaterializedViewsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadDependenciesForMaterializedViewsSuccess: (
+        materializedViewDependenciesMap: Record<string, DataWarehouseSavedQueryDependencies>,
+        payload?: {
+            viewIds: string[]
+        }
+    ) => {
+        materializedViewDependenciesMap: Record<string, DataWarehouseSavedQueryDependencies>
+        payload?: {
+            viewIds: string[]
+        }
+    }
+    loadDependenciesForViews: (viewIds: string[]) => {
+        viewIds: string[]
+    }
+    loadDependenciesForViewsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadDependenciesForViewsSuccess: (
+        viewDependenciesMap: Record<string, DataWarehouseSavedQueryDependencies>,
+        payload?: {
+            viewIds: string[]
+        }
+    ) => {
+        viewDependenciesMap: Record<string, DataWarehouseSavedQueryDependencies>
+        payload?: {
+            viewIds: string[]
+        }
+    }
+    loadRunHistoryForViews: (viewIds: string[]) => {
+        viewIds: string[]
+    }
+    loadRunHistoryForViewsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRunHistoryForViewsSuccess: (
+        runHistoryMap: Record<string, DataWarehouseSavedQueryRunHistory[]>,
+        payload?: {
+            viewIds: string[]
+        }
+    ) => {
+        runHistoryMap: Record<string, DataWarehouseSavedQueryRunHistory[]>
+        payload?: {
+            viewIds: string[]
+        }
+    }
+    loadVisibleData: () => {
+        value: true
+    }
+    openAccessControlModal: (view: DataWarehouseSavedQuery) => {
+        view: DataWarehouseSavedQuery
+    }
+    runMaterialization: (viewId: string) => {
+        viewId: string
+    }
+    setMaterializedViewsPage: (page: number) => {
+        page: number
+    }
+    setSearchTerm: (searchTerm: string) => {
+        searchTerm: string
+    }
+    setViewsPage: (page: number) => {
+        page: number
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface viewsTabLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        viewsLoading: (dataWarehouseSavedQueriesLoading: boolean) => boolean
+        enrichedMaterializedViews: (
+            dataWarehouseSavedQueries: DataWarehouseSavedQuery[],
+            materializedViewDependenciesMap: Record<string, DataWarehouseSavedQueryDependencies>,
+            runHistoryMap: Record<string, DataWarehouseSavedQueryRunHistory[]>
+        ) => DataWarehouseSavedQuery[]
+        enrichedViews: (
+            dataWarehouseSavedQueries: DataWarehouseSavedQuery[],
+            viewDependenciesMap: Record<string, DataWarehouseSavedQueryDependencies>
+        ) => DataWarehouseSavedQuery[]
+        filteredViews: (enrichedViews: DataWarehouseSavedQuery[], searchTerm: string) => DataWarehouseSavedQuery[]
+        filteredMaterializedViews: (
+            enrichedMaterializedViews: DataWarehouseSavedQuery[],
+            searchTerm: string
+        ) => DataWarehouseSavedQuery[]
+        visibleMaterializedViews: (
+            filteredMaterializedViews: DataWarehouseSavedQuery[],
+            materializedViewsCurrentPage: number
+        ) => DataWarehouseSavedQuery[]
+        visibleViews: (filteredViews: DataWarehouseSavedQuery[], viewsCurrentPage: number) => DataWarehouseSavedQuery[]
+    }
+}
+
+export type viewsTabLogicType = MakeLogicType<
+    viewsTabLogicValues,
+    viewsTabLogicActions,
+    Record<string, any>,
+    viewsTabLogicMeta
+>
+
 export const viewsTabLogic = kea<viewsTabLogicType>([
     path(['scenes', 'data-warehouse', 'scene', 'viewsTabLogic']),
     connect(() => ({
@@ -174,7 +327,7 @@ export const viewsTabLogic = kea<viewsTabLogicType>([
         ],
     })),
     selectors({
-        viewsLoading: [(s) => [s.dataWarehouseSavedQueriesLoading], (loading): boolean => loading],
+        viewsLoading: [(s) => [s.dataWarehouseSavedQueriesLoading], (loading: boolean): boolean => loading],
         enrichedMaterializedViews: [
             (s) => [s.dataWarehouseSavedQueries, s.materializedViewDependenciesMap, s.runHistoryMap],
             (
diff --git a/frontend/src/scenes/data-warehouse/scene/warehouseProvisioningLogic.ts b/frontend/src/scenes/data-warehouse/scene/warehouseProvisioningLogic.ts
index 97caac1ef0a4..e6bccb7221c4 100644
--- a/frontend/src/scenes/data-warehouse/scene/warehouseProvisioningLogic.ts
+++ b/frontend/src/scenes/data-warehouse/scene/warehouseProvisioningLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
@@ -18,7 +18,7 @@ import {
 } from 'products/data_warehouse/frontend/generated/api'
 import type { WarehouseStatusResponseApi } from 'products/data_warehouse/frontend/generated/api.schemas'
 
-import type { warehouseProvisioningLogicType } from './warehouseProvisioningLogicType'
+import type { PreflightStatus } from '../../../types'
 
 // The warehouse name becomes the connection's SNI subdomain (a DNS-1123 label), so it
 // mirrors the backend validator in products/data_warehouse/backend/api/managed_warehouse.py:
@@ -48,6 +48,148 @@ const DELETING_POLL_WARN_THRESHOLD = 18
 
 const currentProjectId = (): string => String(teamLogic.values.currentTeamId)
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface warehouseProvisioningLogicValues {
+    preflight: PreflightStatus | null // preflightLogic
+    backfillTableSuffix: string | null
+    canProvision: boolean
+    canRetryProvision: boolean
+    databaseName: string
+    databaseNameAvailable: boolean | null
+    databaseNameChecking: boolean
+    deletingPollCount: number
+    deprovisionTakingLong: boolean
+    hasBackfill: boolean
+    initialPassword: string | null
+    isActionable: boolean
+    isDeletingOrg: boolean
+    isDeprovisioning: boolean
+    isEnablingBackfill: boolean
+    isInProgress: boolean
+    isProvisioning: boolean
+    isResettingPassword: boolean
+    isValidDatabaseName: boolean
+    isValidTableName: boolean
+    lastRequestedDatabaseName: string | null
+    orgDeletionFailed: boolean
+    orgDeletionSucceeded: boolean
+    pollingActive: boolean
+    retryDatabaseName: string
+    tableName: string
+    warehouseDomain: string | null
+    warehouseStatus: WarehouseStatusResponseApi | null
+    warehouseStatusLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface warehouseProvisioningLogicActions {
+    checkDatabaseName: (name: string) => {
+        name: string
+    }
+    clearInitialPassword: () => {
+        value: true
+    }
+    deleteOrg: () => {
+        value: true
+    }
+    deleteOrgComplete: (success: boolean) => {
+        success: boolean
+    }
+    deprovisionWarehouse: () => {
+        value: true
+    }
+    deprovisionWarehouseComplete: () => {
+        value: true
+    }
+    enableBackfill: (params: { tableName: string }) => {
+        tableName: string
+    }
+    enableBackfillComplete: (suffix: string | null) => {
+        suffix: string | null
+    }
+    loadWarehouseStatus: () => any
+    loadWarehouseStatusFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadWarehouseStatusSuccess: (
+        warehouseStatus: WarehouseStatusResponseApi | null,
+        payload?: any
+    ) => {
+        warehouseStatus: WarehouseStatusResponseApi | null
+        payload?: any
+    }
+    pollStatus: () => {
+        value: true
+    }
+    provisionWarehouse: (params: { databaseName: string; tableName: string }) => {
+        databaseName: string
+        tableName: string
+    }
+    provisionWarehouseComplete: () => {
+        value: true
+    }
+    resetPassword: () => {
+        value: true
+    }
+    resetPasswordComplete: () => {
+        value: true
+    }
+    setDatabaseName: (name: string) => {
+        name: string
+    }
+    setDatabaseNameAvailable: (available: boolean | null) => {
+        available: boolean | null
+    }
+    setDatabaseNameChecking: (checking: boolean) => {
+        checking: boolean
+    }
+    setInitialPassword: (password: string) => {
+        password: string
+    }
+    setLastRequestedDatabaseName: (name: string | null) => {
+        name: string | null
+    }
+    setTableName: (name: string) => {
+        name: string
+    }
+    stopPolling: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface warehouseProvisioningLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        isActionable: (warehouseStatus: WarehouseStatusResponseApi | null) => boolean
+        isInProgress: (warehouseStatus: WarehouseStatusResponseApi | null) => boolean
+        deprovisionTakingLong: (
+            warehouseStatus: WarehouseStatusResponseApi | null,
+            deletingPollCount: number
+        ) => boolean
+        isValidDatabaseName: (databaseName: string) => boolean
+        warehouseDomain: (preflight: PreflightStatus | null) => string | null
+        retryDatabaseName: (databaseName: string, lastRequestedDatabaseName: string | null) => string
+        isValidTableName: (tableName: string) => boolean
+        canProvision: (
+            isValidDatabaseName: boolean,
+            databaseNameAvailable: boolean | null,
+            isValidTableName: boolean
+        ) => boolean
+        canRetryProvision: (retryDatabaseName: string, isValidTableName: boolean) => boolean
+    }
+}
+
+export type warehouseProvisioningLogicType = MakeLogicType<
+    warehouseProvisioningLogicValues,
+    warehouseProvisioningLogicActions,
+    Record<string, any>,
+    warehouseProvisioningLogicMeta
+>
+
 export const warehouseProvisioningLogic = kea<warehouseProvisioningLogicType>([
     path(['scenes', 'data-warehouse', 'scene', 'warehouseProvisioningLogic']),
 
@@ -237,7 +379,7 @@ export const warehouseProvisioningLogic = kea<warehouseProvisioningLogicType>([
     selectors({
         isActionable: [
             (s) => [s.warehouseStatus],
-            (status): boolean => {
+            (status: WarehouseStatusResponseApi | null): boolean => {
                 if (!status) {
                     return true
                 }
@@ -246,7 +388,7 @@ export const warehouseProvisioningLogic = kea<warehouseProvisioningLogicType>([
         ],
         isInProgress: [
             (s) => [s.warehouseStatus],
-            (status): boolean => {
+            (status: WarehouseStatusResponseApi | null): boolean => {
                 if (!status) {
                     return false
                 }
@@ -257,32 +399,34 @@ export const warehouseProvisioningLogic = kea<warehouseProvisioningLogicType>([
         // "still working" note rather than an indefinite spinner.
         deprovisionTakingLong: [
             (s) => [s.warehouseStatus, s.deletingPollCount],
-            (status, deletingPollCount): boolean =>
+            (status: WarehouseStatusResponseApi | null, deletingPollCount: number): boolean =>
                 status?.state === 'deleting' && deletingPollCount >= DELETING_POLL_WARN_THRESHOLD,
         ],
-        isValidDatabaseName: [(s) => [s.databaseName], (name): boolean => WAREHOUSE_NAME_REGEX.test(name)],
+        isValidDatabaseName: [(s) => [s.databaseName], (name: string): boolean => WAREHOUSE_NAME_REGEX.test(name)],
         // DNS zone for the connection host, resolved from the deployment region (null when unknown).
         warehouseDomain: [
             (s) => [s.preflight],
-            (preflight): string | null => {
+            (preflight: null | import('~/types').PreflightStatus): string | null => {
                 const region = preflight?.region
                 return region ? (MANAGED_WAREHOUSE_DOMAINS[region] ?? null) : null
             },
         ],
         retryDatabaseName: [
             (s) => [s.databaseName, s.lastRequestedDatabaseName],
-            (databaseName, lastRequestedDatabaseName): string => databaseName || lastRequestedDatabaseName || '',
+            (databaseName: string, lastRequestedDatabaseName: string | null): string =>
+                databaseName || lastRequestedDatabaseName || '',
         ],
         // The table name is used verbatim as the table suffix, so it must already be a valid
         // identifier (mirrors the backend validator) — we reject rather than silently rewrite.
-        isValidTableName: [(s) => [s.tableName], (name): boolean => TABLE_NAME_REGEX.test(name)],
+        isValidTableName: [(s) => [s.tableName], (name: string): boolean => TABLE_NAME_REGEX.test(name)],
         canProvision: [
             (s) => [s.isValidDatabaseName, s.databaseNameAvailable, s.isValidTableName],
-            (valid, available, validEvents): boolean => valid && available === true && validEvents,
+            (valid: boolean, available: boolean | null, validEvents: boolean): boolean =>
+                valid && available === true && validEvents,
         ],
         canRetryProvision: [
             (s) => [s.retryDatabaseName, s.isValidTableName],
-            (retryDatabaseName, validEvents): boolean =>
+            (retryDatabaseName: string, validEvents: boolean): boolean =>
                 !!retryDatabaseName && WAREHOUSE_NAME_REGEX.test(retryDatabaseName) && validEvents,
         ],
     }),
diff --git a/frontend/src/scenes/data-warehouse/settings/dataWarehouseSettingsSceneLogic.ts b/frontend/src/scenes/data-warehouse/settings/dataWarehouseSettingsSceneLogic.ts
index 802459be034a..b5db1cf18c4c 100644
--- a/frontend/src/scenes/data-warehouse/settings/dataWarehouseSettingsSceneLogic.ts
+++ b/frontend/src/scenes/data-warehouse/settings/dataWarehouseSettingsSceneLogic.ts
@@ -1,5 +1,5 @@
 import type { Monaco } from '@monaco-editor/react'
-import { actions, afterMount, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
 import { router, urlToAction } from 'kea-router'
 import type { editor } from 'monaco-editor'
 import posthog from 'posthog-js'
@@ -19,14 +19,198 @@ import {
     NodeKind,
 } from '~/queries/schema/schema-general'
 
+import type {
+    DatabaseSchemaDataWarehouseTable,
+    DatabaseSchemaEndpointTable,
+    DatabaseSchemaManagedViewTable,
+    DatabaseSchemaQueryResponse,
+} from '../../../queries/schema/schema-general'
+import type { DataWarehouseSavedQuery } from '../../../types'
 import { dataWarehouseViewsLogic } from '../saved_queries/dataWarehouseViewsLogic'
-import type { dataWarehouseSettingsSceneLogicType } from './dataWarehouseSettingsSceneLogicType'
 
 export interface DataWarehouseSceneLogicProps {
     monaco?: Monaco | null
     editor?: editor.IStandaloneCodeEditor | null
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataWarehouseSettingsSceneLogicValues {
+    dataWarehouseSavedQueriesLoading: boolean // dataWarehouseViewsLogic
+    dataWarehouseSavedQueryMapById: Record<string, DataWarehouseSavedQuery> // dataWarehouseViewsLogic
+    dataWarehouseTables: DatabaseSchemaDataWarehouseTable[] // databaseTableListLogic
+    database: Required<DatabaseSchemaQueryResponse> | null // databaseTableListLogic
+    databaseLoading: boolean // databaseTableListLogic
+    externalDataSourceTables: DatabaseSchemaDataWarehouseTable[] // databaseTableListLogic
+    posthogTables: DatabaseSchemaTable[] // databaseTableListLogic
+    views: DatabaseSchemaViewTable[] // databaseTableListLogic
+    viewsMapById: Record<string, DatabaseSchemaEndpointTable | DatabaseSchemaManagedViewTable | DatabaseSchemaViewTable> // databaseTableListLogic
+    dataWarehouseTablesAndViews: DatabaseSchemaTable[]
+    dataWarehouseTablesBySourceType: Record<string, DatabaseSchemaTable[]>
+    editSchemaIsLoading: boolean
+    editingView: string | null
+    inEditSchemaMode: boolean
+    isEditingSavedQuery: boolean
+    materializedViews: DatabaseSchemaMaterializedViewTable[]
+    nonMaterializedViews: DatabaseSchemaTable[]
+    schemaModalIsOpen: boolean
+    schemaUpdates: Record<string, DatabaseSerializedFieldType>
+    selectedRow: DatabaseSchemaTable | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataWarehouseSettingsSceneLogicActions {
+    deleteDataWarehouseSavedQuery: (viewId: string) => string // dataWarehouseViewsLogic
+    updateDataWarehouseSavedQuery: (
+        view: Partial<DataWarehouseSavedQuery> & {
+            edited_history_id?: string
+            folder_id?: string | null
+            id: string
+            lifecycle?: string
+            shouldRematerialize?: boolean
+            soft_update?: boolean
+            sync_frequency?: string
+            types?: string[][]
+        }
+    ) => Partial<DataWarehouseSavedQuery> & {
+        edited_history_id?: string
+        folder_id?: string | null
+        id: string
+        lifecycle?: string
+        shouldRematerialize?: boolean
+        soft_update?: boolean
+        sync_frequency?: string
+        types?: string[][]
+    } // dataWarehouseViewsLogic
+    updateDataWarehouseSavedQuerySuccess: (
+        dataWarehouseSavedQueries: DataWarehouseSavedQuery[],
+        payload?:
+            | (Partial<DataWarehouseSavedQuery> & {
+                  edited_history_id?: string
+                  folder_id?: string | null
+                  id: string
+                  lifecycle?: string
+                  shouldRematerialize?: boolean
+                  soft_update?: boolean
+                  sync_frequency?: string
+                  types?: string[][]
+              })
+            | undefined
+    ) => {
+        dataWarehouseSavedQueries: DataWarehouseSavedQuery[]
+        payload?: Partial<DataWarehouseSavedQuery> & {
+            edited_history_id?: string
+            folder_id?: string | null
+            id: string
+            lifecycle?: string
+            shouldRematerialize?: boolean
+            soft_update?: boolean
+            sync_frequency?: string
+            types?: string[][]
+        }
+    } // dataWarehouseViewsLogic
+    loadDatabase: (
+        args_0?:
+            | {
+                  force?: boolean
+              }
+            | undefined
+    ) => {
+        force?: boolean
+    } // databaseTableListLogic
+    loadDatabaseFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    } // databaseTableListLogic
+    loadDatabaseSuccess: (
+        database: Required<DatabaseSchemaQueryResponse> | null,
+        payload?:
+            | {
+                  force?: boolean
+              }
+            | undefined
+    ) => {
+        database: Required<DatabaseSchemaQueryResponse> | null
+        payload?: {
+            force?: boolean
+        }
+    } // databaseTableListLogic
+    refreshDatabaseSchema: () => {
+        value: true
+    } // databaseTableListLogic
+    cancelEditSchema: () => {
+        database: Required<DatabaseSchemaQueryResponse> | null
+    }
+    deleteDataWarehouseTable: (tableId: string) => {
+        tableId: string
+    }
+    saveSchema: () => {
+        value: true
+    }
+    selectRow: (row: DatabaseSchemaTable | null) => {
+        row: DatabaseSchemaTable | null
+    }
+    setEditSchemaIsLoading: (isLoading: boolean) => {
+        isLoading: boolean
+    }
+    setEditingView: (id: string | null) => {
+        id: string | null
+    }
+    setIsEditingSavedQuery: (isEditingSavedQuery: boolean) => {
+        isEditingSavedQuery: boolean
+    }
+    toggleEditSchemaMode: (inEditSchemaMode?: boolean) => {
+        inEditSchemaMode: boolean | undefined
+    }
+    toggleSchemaModal: () => {
+        value: true
+    }
+    updateSelectedSchema: (
+        columnKey: string,
+        columnType: DatabaseSerializedFieldType
+    ) => {
+        columnKey: string
+        columnType: DatabaseSerializedFieldType
+    }
+    updateView: (
+        query: string,
+        types: string[][]
+    ) => {
+        query: string
+        types: string[][]
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataWarehouseSettingsSceneLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        dataWarehouseTablesBySourceType: (
+            dataWarehouseTables: DatabaseSchemaDataWarehouseTable[]
+        ) => Record<string, DatabaseSchemaTable[]>
+        dataWarehouseTablesAndViews: (
+            dataWarehouseTables: DatabaseSchemaDataWarehouseTable[],
+            views: DatabaseSchemaViewTable[]
+        ) => DatabaseSchemaTable[]
+        nonMaterializedViews: (
+            views: DatabaseSchemaViewTable[],
+            dataWarehouseSavedQueryMapById: Record<string, DataWarehouseSavedQuery>
+        ) => DatabaseSchemaTable[]
+        materializedViews: (
+            views: DatabaseSchemaViewTable[],
+            dataWarehouseSavedQueryMapById: Record<string, DataWarehouseSavedQuery>
+        ) => DatabaseSchemaMaterializedViewTable[]
+    }
+}
+
+export type dataWarehouseSettingsSceneLogicType = MakeLogicType<
+    dataWarehouseSettingsSceneLogicValues,
+    dataWarehouseSettingsSceneLogicActions,
+    DataWarehouseSceneLogicProps,
+    dataWarehouseSettingsSceneLogicMeta
+>
+
 export const dataWarehouseSettingsSceneLogic = kea<dataWarehouseSettingsSceneLogicType>([
     path(['scenes', 'data-warehouse', 'settings', 'dataWarehouseSceneLogic']),
     props({} as DataWarehouseSceneLogicProps),
@@ -169,7 +353,9 @@ export const dataWarehouseSettingsSceneLogic = kea<dataWarehouseSettingsSceneLog
     selectors({
         dataWarehouseTablesBySourceType: [
             (s) => [s.dataWarehouseTables],
-            (dataWarehouseTables): Record<string, DatabaseSchemaTable[]> => {
+            (
+                dataWarehouseTables: import('~/queries/schema/schema-general').DatabaseSchemaDataWarehouseTable[]
+            ): Record<string, DatabaseSchemaTable[]> => {
                 return dataWarehouseTables.reduce((acc: Record<string, DatabaseSchemaTable[]>, table) => {
                     const group = table.source?.source_type ?? 'S3'
                     acc[group] ??= []
@@ -181,13 +367,19 @@ export const dataWarehouseSettingsSceneLogic = kea<dataWarehouseSettingsSceneLog
         ],
         dataWarehouseTablesAndViews: [
             (s) => [s.dataWarehouseTables, s.views],
-            (dataWarehouseTables, views): DatabaseSchemaTable[] => {
+            (
+                dataWarehouseTables: import('~/queries/schema/schema-general').DatabaseSchemaDataWarehouseTable[],
+                views: DatabaseSchemaViewTable[]
+            ): DatabaseSchemaTable[] => {
                 return [...dataWarehouseTables, ...views]
             },
         ],
         nonMaterializedViews: [
             (s) => [s.views, s.dataWarehouseSavedQueryMapById],
-            (views, dataWarehouseSavedQueryMapById): DatabaseSchemaTable[] => {
+            (
+                views: DatabaseSchemaViewTable[],
+                dataWarehouseSavedQueryMapById: Record<string, import('../../../types').DataWarehouseSavedQuery>
+            ): DatabaseSchemaTable[] => {
                 return views
                     .filter((view) => !dataWarehouseSavedQueryMapById[view.id]?.is_materialized)
                     .map((view) => ({
@@ -198,7 +390,10 @@ export const dataWarehouseSettingsSceneLogic = kea<dataWarehouseSettingsSceneLog
         ],
         materializedViews: [
             (s) => [s.views, s.dataWarehouseSavedQueryMapById],
-            (views, dataWarehouseSavedQueryMapById): DatabaseSchemaMaterializedViewTable[] => {
+            (
+                views: DatabaseSchemaViewTable[],
+                dataWarehouseSavedQueryMapById: Record<string, import('../../../types').DataWarehouseSavedQuery>
+            ): DatabaseSchemaMaterializedViewTable[] => {
                 return views
                     .filter((view) => dataWarehouseSavedQueryMapById[view.id]?.is_materialized)
                     .map((view) => ({
diff --git a/frontend/src/scenes/data-warehouse/viewLinkLogic.tsx b/frontend/src/scenes/data-warehouse/viewLinkLogic.tsx
index a3abdf3ca8e3..c18e1d606ca9 100644
--- a/frontend/src/scenes/data-warehouse/viewLinkLogic.tsx
+++ b/frontend/src/scenes/data-warehouse/viewLinkLogic.tsx
@@ -1,5 +1,6 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { subscriptions } from 'kea-subscriptions'
 import posthog from 'posthog-js'
 
@@ -14,7 +15,7 @@ import { DataWarehouseViewLink } from '~/types'
 
 import { joinsLogic } from 'products/data_warehouse/frontend/shared/logics/joinsLogic'
 
-import type { viewLinkLogicType } from './viewLinkLogicType'
+import type { DatabaseSchemaTable } from '../../queries/schema/schema-general'
 import { ViewLinkKeyLabel } from './ViewLinkModal'
 
 const NEW_VIEW_LINK: DataWarehouseViewLink = {
@@ -44,6 +45,205 @@ const disabledReasonForColumn = (column: DatabaseSchemaField): string | undefine
     return undefined
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface viewLinkLogicValues {
+    allTables: DatabaseSchemaTable[] // databaseTableListLogic
+    error: string | null
+    fieldName: string
+    isJoinTableModalOpen: boolean
+    isJoinValid: boolean
+    isJoinValidating: boolean
+    isNewJoin: boolean
+    isViewLinkSubmitting: boolean
+    isViewLinkValid: boolean
+    joinToEdit: DataWarehouseViewLink | null
+    joiningIsUsingHogQLExpression: boolean
+    joiningTableKeys: KeySelectOption[]
+    joiningTablePreviewData: Record<string, any>[]
+    joiningTablePreviewLoading: boolean
+    selectedJoiningKey: string | null
+    selectedJoiningTable: DatabaseSchemaTable | undefined
+    selectedJoiningTableName: string | null
+    selectedSourceKey: string | null
+    selectedSourceTable: DatabaseSchemaTable | undefined
+    selectedSourceTableName: string | null
+    showViewLinkErrors: boolean
+    sourceIsUsingHogQLExpression: boolean
+    sourceTableKeys: KeySelectOption[]
+    sourceTablePreviewData: Record<string, any>[]
+    sourceTablePreviewLoading: boolean
+    sqlCodeSnippet: string | null
+    tableOptions: {
+        label: string
+        value: string
+    }[]
+    validationError: string | null
+    validationWarning: string | null
+    viewLink: DataWarehouseViewLink
+    viewLinkAllErrors: Record<string, any>
+    viewLinkChanged: boolean
+    viewLinkErrors: DeepPartialMap<DataWarehouseViewLink, ValidationErrorType>
+    viewLinkHasErrors: boolean
+    viewLinkManualErrors: Record<string, any>
+    viewLinkTouched: boolean
+    viewLinkTouches: Record<string, boolean>
+    viewLinkValidationErrors: DeepPartialMap<DataWarehouseViewLink, ValidationErrorType>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface viewLinkLogicActions {
+    loadDatabase: (
+        args_0?:
+            | {
+                  force?: boolean
+              }
+            | undefined
+    ) => {
+        force?: boolean
+    } // databaseTableListLogic
+    loadJoins: () => any // joinsLogic
+    checkKeyTypeMismatch: () => void
+    clearModalFields: () => {
+        value: true
+    }
+    deleteViewLink: (
+        table: any,
+        column: any
+    ) => {
+        column: any
+        table: any
+    }
+    loadJoiningTablePreview: (tableName: string) => {
+        tableName: string
+    }
+    loadSourceTablePreview: (tableName: string) => {
+        tableName: string
+    }
+    resetViewLink: (values?: DataWarehouseViewLink) => {
+        values?: DataWarehouseViewLink
+    }
+    saveViewLink: (viewLink: any) => {
+        viewLink: any
+    }
+    selectJoiningKey: (selectedKey: string) => {
+        joiningTable: DatabaseSchemaTable | undefined
+        selectedKey: string
+    }
+    selectJoiningTable: (selectedTableName: string) => {
+        selectedTableName: string
+    }
+    selectSourceKey: (selectedKey: string) => {
+        selectedKey: string
+        sourceTable: DatabaseSchemaTable | undefined
+    }
+    selectSourceTable: (selectedTableName: string) => {
+        selectedTableName: string
+    }
+    setError: (error: string) => {
+        error: string
+    }
+    setFieldName: (fieldName: string) => {
+        fieldName: string
+    }
+    setIsJoinValid: (isValid: boolean) => {
+        isValid: boolean
+    }
+    setJoiningTablePreviewData: (data: Record<string, any>[]) => {
+        data: Record<string, any>[]
+    }
+    setSourceTablePreviewData: (data: Record<string, any>[]) => {
+        data: Record<string, any>[]
+    }
+    setValidationError: (errorMessage: string | null) => {
+        errorMessage: string | null
+    }
+    setValidationWarning: (validationWarning: string | null) => {
+        validationWarning: string | null
+    }
+    setViewLinkManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setViewLinkValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setViewLinkValues: (values: DeepPartial<DataWarehouseViewLink>) => {
+        values: DeepPartial<DataWarehouseViewLink>
+    }
+    submitViewLink: () => {
+        value: boolean
+    }
+    submitViewLinkFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitViewLinkRequest: (viewLink: DataWarehouseViewLink) => {
+        viewLink: DataWarehouseViewLink
+    }
+    submitViewLinkSuccess: (viewLink: DataWarehouseViewLink) => {
+        viewLink: DataWarehouseViewLink
+    }
+    toggleEditJoinModal: (join: DataWarehouseViewLink) => {
+        join: DataWarehouseViewLink
+    }
+    toggleJoinTableModal: () => {
+        value: true
+    }
+    toggleNewJoinModal: (join?: Partial<DataWarehouseViewLink>) => {
+        join: Partial<DataWarehouseViewLink> | undefined
+    }
+    touchViewLinkField: (key: string) => {
+        key: string
+    }
+    validateJoin: () => void
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface viewLinkLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        selectedSourceTable: (
+            selectedSourceTableName: string | null,
+            allTables: DatabaseSchemaTable[]
+        ) => DatabaseSchemaTable | undefined
+        selectedJoiningTable: (
+            selectedJoiningTableName: string | null,
+            allTables: DatabaseSchemaTable[]
+        ) => DatabaseSchemaTable | undefined
+        sourceIsUsingHogQLExpression: (
+            selectedSourceKey: string | null,
+            selectedSourceTable: DatabaseSchemaTable | undefined
+        ) => boolean
+        joiningIsUsingHogQLExpression: (
+            selectedJoiningKey: string | null,
+            selectedJoiningTable: DatabaseSchemaTable | undefined
+        ) => boolean
+        tableOptions: (allTables: DatabaseSchemaTable[]) => {
+            label: string
+            value: string
+        }[]
+        sourceTableKeys: (selectedSourceTable: DatabaseSchemaTable | undefined) => KeySelectOption[]
+        joiningTableKeys: (selectedJoiningTable: DatabaseSchemaTable | undefined) => KeySelectOption[]
+        sqlCodeSnippet: (
+            selectedSourceTableName: string | null,
+            selectedJoiningTableName: string | null,
+            fieldName: string
+        ) => string | null
+    }
+}
+
+export type viewLinkLogicType = MakeLogicType<
+    viewLinkLogicValues,
+    viewLinkLogicActions,
+    Record<string, any>,
+    viewLinkLogicMeta
+>
+
 export const viewLinkLogic = kea<viewLinkLogicType>([
     path(['scenes', 'data-warehouse', 'viewLinkLogic']),
     connect(() => ({
@@ -380,15 +580,24 @@ export const viewLinkLogic = kea<viewLinkLogicType>([
     selectors({
         selectedSourceTable: [
             (s) => [s.selectedSourceTableName, s.allTables],
-            (selectedSourceTableName, tables) => tables.find((row) => row.name === selectedSourceTableName),
+            (
+                selectedSourceTableName: string | null,
+                tables: import('~/queries/schema/schema-general').DatabaseSchemaTable[]
+            ) => tables.find((row) => row.name === selectedSourceTableName),
         ],
         selectedJoiningTable: [
             (s) => [s.selectedJoiningTableName, s.allTables],
-            (selectedJoiningTableName, tables) => tables.find((row) => row.name === selectedJoiningTableName),
+            (
+                selectedJoiningTableName: string | null,
+                tables: import('~/queries/schema/schema-general').DatabaseSchemaTable[]
+            ) => tables.find((row) => row.name === selectedJoiningTableName),
         ],
         sourceIsUsingHogQLExpression: [
             (s) => [s.selectedSourceKey, s.selectedSourceTable],
-            (sourceKey, sourceTable) => {
+            (
+                sourceKey: string | null,
+                sourceTable: import('~/queries/schema/schema-general').DatabaseSchemaTable | undefined
+            ) => {
                 if (sourceKey === null) {
                     return false
                 }
@@ -398,7 +607,10 @@ export const viewLinkLogic = kea<viewLinkLogicType>([
         ],
         joiningIsUsingHogQLExpression: [
             (s) => [s.selectedJoiningKey, s.selectedJoiningTable],
-            (joiningKey, joiningTable) => {
+            (
+                joiningKey: string | null,
+                joiningTable: import('~/queries/schema/schema-general').DatabaseSchemaTable | undefined
+            ) => {
                 if (joiningKey === null) {
                     return false
                 }
@@ -408,7 +620,7 @@ export const viewLinkLogic = kea<viewLinkLogicType>([
         ],
         tableOptions: [
             (s) => [s.allTables],
-            (tables) =>
+            (tables: import('~/queries/schema/schema-general').DatabaseSchemaTable[]) =>
                 tables.map((table) => ({
                     value: table.name,
                     label: table.name,
@@ -416,7 +628,9 @@ export const viewLinkLogic = kea<viewLinkLogicType>([
         ],
         sourceTableKeys: [
             (s) => [s.selectedSourceTable],
-            (selectedSourceTable): KeySelectOption[] => {
+            (
+                selectedSourceTable: import('~/queries/schema/schema-general').DatabaseSchemaTable | undefined
+            ): KeySelectOption[] => {
                 if (!selectedSourceTable) {
                     return []
                 }
@@ -431,7 +645,9 @@ export const viewLinkLogic = kea<viewLinkLogicType>([
         ],
         joiningTableKeys: [
             (s) => [s.selectedJoiningTable],
-            (selectedJoiningTable): KeySelectOption[] => {
+            (
+                selectedJoiningTable: import('~/queries/schema/schema-general').DatabaseSchemaTable | undefined
+            ): KeySelectOption[] => {
                 if (!selectedJoiningTable) {
                     return []
                 }
@@ -446,7 +662,7 @@ export const viewLinkLogic = kea<viewLinkLogicType>([
         ],
         sqlCodeSnippet: [
             (s) => [s.selectedSourceTableName, s.selectedJoiningTableName, s.fieldName],
-            (selectedSourceTableName, joiningTableName, fieldName) => {
+            (selectedSourceTableName: string | null, joiningTableName: string | null, fieldName: string) => {
                 if (!selectedSourceTableName || !joiningTableName) {
                     return null
                 }
diff --git a/frontend/src/scenes/debug/debugSceneLogic.ts b/frontend/src/scenes/debug/debugSceneLogic.ts
index 6359476c298c..780d74f29649 100644
--- a/frontend/src/scenes/debug/debugSceneLogic.ts
+++ b/frontend/src/scenes/debug/debugSceneLogic.ts
@@ -1,14 +1,30 @@
-import { actions, kea, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers } from 'kea'
 import { actionToUrl, urlToAction } from 'kea-router'
 
 import { urls } from 'scenes/urls'
 
 import { stringifiedExamples } from '~/queries/examples'
 
-import type { debugSceneLogicType } from './debugSceneLogicType'
-
 const DEFAULT_QUERY: string = stringifiedExamples['HogQLRaw']
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface debugSceneLogicValues {
+    query1: string
+    query2: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface debugSceneLogicActions {
+    setQuery1: (query: string) => {
+        query: string
+    }
+    setQuery2: (query: string) => {
+        query: string
+    }
+}
+
+export type debugSceneLogicType = MakeLogicType<debugSceneLogicValues, debugSceneLogicActions>
+
 export const debugSceneLogic = kea<debugSceneLogicType>([
     path(['scenes', 'query', 'debugSceneLogic']),
     actions({
diff --git a/frontend/src/scenes/debug/hog/hogReplLogic.ts b/frontend/src/scenes/debug/hog/hogReplLogic.ts
index ef42d95d51c2..df03b715cf3d 100644
--- a/frontend/src/scenes/debug/hog/hogReplLogic.ts
+++ b/frontend/src/scenes/debug/hog/hogReplLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers, selectors } from 'kea'
 import { actionToUrl, urlToAction } from 'kea-router'
 
 import { VMState, newHogCallable, newHogClosure } from '@posthog/hogvm'
@@ -7,8 +7,6 @@ import api from 'lib/api'
 import { execHogAsync } from 'lib/hog'
 import { urls } from 'scenes/urls'
 
-import type { hogReplLogicType } from './hogReplLogicType'
-
 export interface ReplChunk {
     code: string
     result?: string
@@ -20,6 +18,82 @@ export interface ReplChunk {
     status: 'pending' | 'success' | 'error'
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogReplLogicValues {
+    currentCode: string
+    lastLocalGlobals: Record<string, any> | undefined
+    lastLocals: ReplChunk['locals'] | undefined
+    lastState: ReplChunk['state'] | undefined
+    replChunks: ReplChunk[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogReplLogicActions {
+    editFromHere: (index: number) => {
+        index: number
+    }
+    print: (
+        index: number,
+        line: any[]
+    ) => {
+        index: number
+        line: any[]
+    }
+    runCode: (code: string) => {
+        code: string
+    }
+    runCurrentCode: () => {
+        value: true
+    }
+    setBytecode: (
+        index: number,
+        bytecode: any[],
+        locals: any[]
+    ) => {
+        bytecode: any[]
+        index: number
+        locals: any[]
+    }
+    setCurrentCode: (code: string) => {
+        code: string
+    }
+    setReplChunks: (replChunks: ReplChunk[]) => {
+        replChunks: ReplChunk[]
+    }
+    setResult: (
+        index: number,
+        result?: string,
+        error?: string
+    ) => {
+        error: string | undefined
+        index: number
+        result: string | undefined
+    }
+    setVMState: (
+        index: number,
+        state: any
+    ) => {
+        index: number
+        state: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogReplLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        lastLocals: (replChunks: ReplChunk[]) => ReplChunk['locals'] | undefined
+        lastState: (replChunks: ReplChunk[]) => ReplChunk['state'] | undefined
+        lastLocalGlobals: (lastLocals: any[] | undefined) => Record<string, any> | undefined
+    }
+}
+
+export type hogReplLogicType = MakeLogicType<
+    hogReplLogicValues,
+    hogReplLogicActions,
+    Record<string, any>,
+    hogReplLogicMeta
+>
+
 export const hogReplLogic = kea<hogReplLogicType>([
     path(['scenes', 'debug', 'HogRepl']),
     actions({
@@ -58,7 +132,7 @@ export const hogReplLogic = kea<hogReplLogicType>([
     selectors({
         lastLocals: [
             (s) => [s.replChunks],
-            (replChunks): ReplChunk['locals'] | undefined => {
+            (replChunks: ReplChunk[]): ReplChunk['locals'] | undefined => {
                 for (let i = replChunks.length - 1; i >= 0; i--) {
                     if (replChunks[i].locals) {
                         return replChunks[i].locals
@@ -69,7 +143,7 @@ export const hogReplLogic = kea<hogReplLogicType>([
         ],
         lastState: [
             (s) => [s.replChunks],
-            (replChunks): ReplChunk['state'] | undefined => {
+            (replChunks: ReplChunk[]): ReplChunk['state'] | undefined => {
                 for (let i = replChunks.length - 1; i >= 0; i--) {
                     if (replChunks[i].state) {
                         return replChunks[i].state
@@ -80,7 +154,7 @@ export const hogReplLogic = kea<hogReplLogicType>([
         ],
         lastLocalGlobals: [
             (s) => [s.lastLocals],
-            (lastLocals): Record<string, any> | undefined => {
+            (lastLocals: ReplChunk['locals'] | undefined): Record<string, any> | undefined => {
                 if (lastLocals) {
                     return lastLocals.reduce((acc, local) => Object.assign(acc, { [local[0]]: 'local' }), {})
                 }
diff --git a/frontend/src/scenes/debug/queryLogTableLogic.ts b/frontend/src/scenes/debug/queryLogTableLogic.ts
index 0330f94dcc26..639777fe0f85 100644
--- a/frontend/src/scenes/debug/queryLogTableLogic.ts
+++ b/frontend/src/scenes/debug/queryLogTableLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -6,7 +6,7 @@ import { userLogic } from 'scenes/userLogic'
 
 import { HogQLQueryResponse } from '~/queries/schema/schema-general'
 
-import type { queryLogTableLogicType } from './queryLogTableLogicType'
+import type { UserType } from '../../types'
 
 export interface QueryLogEntry {
     query_id: string
@@ -25,6 +25,83 @@ export interface QueryLogTableLogicProps {
     key: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface queryLogTableLogicValues {
+    user: UserType | null // userLogic
+    hasMore: boolean
+    limit: number
+    moreQueryLogs: QueryLogEntry[]
+    moreQueryLogsLoading: boolean
+    queryLogs: QueryLogEntry[]
+    queryLogsLoading: boolean
+    queryLogsWithIndex: (QueryLogEntry & {
+        index: number
+    })[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface queryLogTableLogicActions {
+    loadMoreQueryLogs: () => {
+        value: true
+    }
+    loadMoreQueryLogsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadMoreQueryLogsSuccess: (
+        moreQueryLogs: QueryLogEntry[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        moreQueryLogs: QueryLogEntry[]
+        payload?: {
+            value: true
+        }
+    }
+    loadQueryLogs: () => {
+        value: true
+    }
+    loadQueryLogsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadQueryLogsSuccess: (
+        queryLogs: QueryLogEntry[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        queryLogs: QueryLogEntry[]
+        payload?: {
+            value: true
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface queryLogTableLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        queryLogsWithIndex: (queryLogs: QueryLogEntry[]) => (QueryLogEntry & {
+            index: number
+        })[]
+        hasMore: (moreQueryLogs: QueryLogEntry[], limit: number) => boolean
+    }
+}
+
+export type queryLogTableLogicType = MakeLogicType<
+    queryLogTableLogicValues,
+    queryLogTableLogicActions,
+    Record<string, any>,
+    queryLogTableLogicMeta
+>
+
 export const queryLogTableLogic = kea<queryLogTableLogicType>([
     path(['scenes', 'debug', 'queryLogTableLogic']),
     connect(() => ({
diff --git a/frontend/src/scenes/experiments/ExperimentForm/ExperimentTemplates/experimentTemplateModalLogic.ts b/frontend/src/scenes/experiments/ExperimentForm/ExperimentTemplates/experimentTemplateModalLogic.ts
index 51d540b926e9..7f14709051a0 100644
--- a/frontend/src/scenes/experiments/ExperimentForm/ExperimentTemplates/experimentTemplateModalLogic.ts
+++ b/frontend/src/scenes/experiments/ExperimentForm/ExperimentTemplates/experimentTemplateModalLogic.ts
@@ -1,7 +1,27 @@
-import { actions, kea, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers } from 'kea'
 
 import { ExperimentTemplate } from './constants'
-import type { experimentTemplateModalLogicType } from './experimentTemplateModalLogicType'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface experimentTemplateModalLogicValues {
+    isModalOpen: boolean
+    template: ExperimentTemplate | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface experimentTemplateModalLogicActions {
+    closeTemplateModal: () => {
+        value: true
+    }
+    openTemplateModal: (template: ExperimentTemplate) => {
+        template: ExperimentTemplate
+    }
+}
+
+export type experimentTemplateModalLogicType = MakeLogicType<
+    experimentTemplateModalLogicValues,
+    experimentTemplateModalLogicActions
+>
 
 export const experimentTemplateModalLogic = kea<experimentTemplateModalLogicType>([
     path(['scenes', 'experiments', 'ExperimentForm', 'ExperimentTemplates', 'experimentTemplateModalLogic']),
diff --git a/frontend/src/scenes/experiments/ExperimentForm/MetricsPanel/metricRecentActivityLogic.ts b/frontend/src/scenes/experiments/ExperimentForm/MetricsPanel/metricRecentActivityLogic.ts
index ac9e9b164351..447748074377 100644
--- a/frontend/src/scenes/experiments/ExperimentForm/MetricsPanel/metricRecentActivityLogic.ts
+++ b/frontend/src/scenes/experiments/ExperimentForm/MetricsPanel/metricRecentActivityLogic.ts
@@ -1,18 +1,43 @@
 import { deepEqual as equal } from 'fast-equals'
-import { afterMount, kea, key, path, props, propsChanged } from 'kea'
+import { MakeLogicType, afterMount, kea, key, path, props, propsChanged } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { performQuery } from '~/queries/query'
 import type { ExperimentMetric } from '~/queries/schema/schema-general'
 import { getEventCountQuery } from '~/scenes/experiments/utils'
 
-import type { metricRecentActivityLogicType } from './metricRecentActivityLogicType'
 
 export type MetricRecentActivityLogicProps = {
     metric: ExperimentMetric
     filterTestAccounts: boolean
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface metricRecentActivityLogicValues {
+    eventCount: number | null;
+    eventCountLoading: boolean;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface metricRecentActivityLogicActions {
+    loadEventCount: () => any;
+    loadEventCountFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadEventCountSuccess: (eventCount: number | null, payload?: any) => {
+        eventCount: number | null;
+        payload?: any;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface metricRecentActivityLogicMeta {
+    key: string;
+}
+
+export type metricRecentActivityLogicType = MakeLogicType<metricRecentActivityLogicValues, metricRecentActivityLogicActions, MetricRecentActivityLogicProps, metricRecentActivityLogicMeta>;
+
 export const metricRecentActivityLogic = kea<metricRecentActivityLogicType>([
     props({} as MetricRecentActivityLogicProps),
     key((props) => `${props.metric.uuid}`),
diff --git a/frontend/src/scenes/experiments/ExperimentForm/createExperimentLogic.ts b/frontend/src/scenes/experiments/ExperimentForm/createExperimentLogic.ts
index bca1dd80ffd0..4af7f00b80aa 100644
--- a/frontend/src/scenes/experiments/ExperimentForm/createExperimentLogic.ts
+++ b/frontend/src/scenes/experiments/ExperimentForm/createExperimentLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { router } from 'kea-router'
 
 import api from 'lib/api'
@@ -23,11 +23,13 @@ import type { Experiment, FeatureFlagFilters, MultivariateFlagVariant } from '~/
 
 import type { ExperimentFeatureFlagFiltersApi } from 'products/experiments/frontend/generated/api.schemas'
 
+import type { ProductIntentProperties } from '../../../lib/utils/product-intents'
+import type { ExperimentMetricUnion } from '../../../queries/schema/schema-general'
+import type { FeatureFlagType } from '../../../types'
 import { NEW_EXPERIMENT } from '../constants'
 import { FORM_MODES, experimentLogic } from '../experimentLogic'
 import { experimentSceneLogic } from '../experimentSceneLogic'
 import { getExperimentVariants, toExperimentWritePayload, toFlagVariantsInput } from '../utils'
-import type { createExperimentLogicType } from './createExperimentLogicType'
 import { validateExperimentSubmission } from './experimentSubmissionValidation'
 import type { FeatureFlagKeyValidation } from './variantsPanelLogic'
 import { variantsPanelLogic } from './variantsPanelLogic'
@@ -84,6 +86,145 @@ const clearDraftStorage = (): void => {
 
 export interface CreateExperimentLogicProps {}
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface createExperimentLogicValues {
+    currentProjectId: number | null // projectLogic
+    featureFlagKeyValidation: FeatureFlagKeyValidation | null // variantsPanelLogic
+    featureFlagKeyValidationLoading: boolean // variantsPanelLogic
+    canSubmitExperiment: boolean
+    experiment: Experiment & {
+        feature_flag_filters?: FeatureFlagFilters
+    }
+    experimentErrors: Record<string, string>
+    experimentValidationErrors: string | undefined
+    formCanceled: boolean
+    isExperimentSubmitting: boolean
+    mode: 'create' | 'link'
+    sharedMetrics: {
+        primary: ExperimentMetric[]
+        secondary: ExperimentMetric[]
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface createExperimentLogicActions {
+    reportExperimentCreated: (
+        experiment: Experiment,
+        metadata?:
+            | {
+                  creation_source?: string
+                  has_linked_flag?: boolean
+              }
+            | undefined
+    ) => {
+        experiment: Experiment
+        metadata:
+            | {
+                  creation_source?: string | undefined
+                  has_linked_flag?: boolean | undefined
+              }
+            | undefined
+    } // eventUsageLogic
+    updateFlag: (flag: FeatureFlagType) => {
+        flag: FeatureFlagType
+    } // featureFlagsLogic
+    addProductIntent: (properties: ProductIntentProperties) => ProductIntentProperties // teamLogic
+    cancelForm: () => {
+        value: true
+    }
+    createExperimentSuccess: () => {
+        value: true
+    }
+    resetExperiment: () => {
+        value: true
+    }
+    saveExperiment: () => {
+        value: true
+    }
+    saveExperimentFailure: () => {
+        value: true
+    }
+    saveExperimentStarted: () => {
+        value: true
+    }
+    saveExperimentSuccess: () => {
+        value: true
+    }
+    setExperiment: (experiment: Experiment) => {
+        experiment: Experiment
+    }
+    setExperimentErrors: (errors: Record<string, string>) => {
+        errors: Record<string, string>
+    }
+    setExperimentValue: (
+        name: string,
+        value: any
+    ) => {
+        name: string
+        value: any
+    }
+    setExposureCriteria: (criteria: ExperimentExposureCriteria) => {
+        criteria: ExperimentExposureCriteria
+    }
+    setFeatureFlagConfig: (config: {
+        ensure_experience_continuity?: boolean
+        feature_flag_key?: string
+        rollout_percentage?: number
+        variants?: MultivariateFlagVariant[]
+    }) => {
+        config: {
+            ensure_experience_continuity?: boolean | undefined
+            feature_flag_key?: string | undefined
+            rollout_percentage?: number | undefined
+            variants?: MultivariateFlagVariant[] | undefined
+        }
+    }
+    setSharedMetrics: (sharedMetrics: { primary: ExperimentMetric[]; secondary: ExperimentMetric[] }) => {
+        sharedMetrics: {
+            primary: ExperimentMetricUnion[]
+            secondary: ExperimentMetricUnion[]
+        }
+    }
+    validateField: (field: 'name') => {
+        field: 'name'
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface createExperimentLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        canSubmitExperiment: (
+            experiment: Experiment & {
+                feature_flag_filters?: FeatureFlagFilters
+            },
+            featureFlagKeyValidation: FeatureFlagKeyValidation | null,
+            mode: 'create' | 'link',
+            experimentErrors: Record<string, string>
+        ) => boolean
+        experimentValidationErrors: (
+            experiment: Experiment & {
+                feature_flag_filters?: FeatureFlagFilters
+            },
+            featureFlagKeyValidation: FeatureFlagKeyValidation | null,
+            mode: 'create' | 'link',
+            experimentErrors: Record<string, string>
+        ) => string | undefined
+        mode: (
+            experiment: Experiment & {
+                feature_flag_filters?: FeatureFlagFilters
+            }
+        ) => 'create' | 'link'
+    }
+}
+
+export type createExperimentLogicType = MakeLogicType<
+    createExperimentLogicValues,
+    createExperimentLogicActions,
+    CreateExperimentLogicProps,
+    createExperimentLogicMeta
+>
+
 export const createExperimentLogic = kea<createExperimentLogicType>([
     props({} as CreateExperimentLogicProps),
     key(() => 'create-experiment'),
diff --git a/frontend/src/scenes/experiments/ExperimentForm/selectExistingFeatureFlagModalLogic.ts b/frontend/src/scenes/experiments/ExperimentForm/selectExistingFeatureFlagModalLogic.ts
index 146ae5ece575..95bf8a9e13eb 100644
--- a/frontend/src/scenes/experiments/ExperimentForm/selectExistingFeatureFlagModalLogic.ts
+++ b/frontend/src/scenes/experiments/ExperimentForm/selectExistingFeatureFlagModalLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { PaginationManual } from '@posthog/lemon-ui'
@@ -11,8 +11,8 @@ import { teamLogic } from 'scenes/teamLogic'
 
 import { FeatureFlagType } from '~/types'
 
+import type { TeamPublicType, TeamType } from '../../../types'
 import type { FeatureFlagModalFilters } from '../experimentsLogic'
-import type { selectExistingFeatureFlagModalLogicType } from './selectExistingFeatureFlagModalLogicType'
 
 // Canonical definition lives in experimentsLogic; re-exported so existing importers keep working.
 export type { FeatureFlagModalFilters }
@@ -26,6 +26,106 @@ const DEFAULT_FILTERS: FeatureFlagModalFilters = {
     evaluation_runtime: undefined,
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface selectExistingFeatureFlagModalLogicValues {
+    currentProjectId: number | string // teamLogic
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    featureFlags: {
+        count: number
+        results: FeatureFlagType[]
+    }
+    featureFlagsLoading: boolean
+    filters: FeatureFlagModalFilters
+    isEvaluationTagsRequired: boolean
+    isModalOpen: boolean
+    pagination: PaginationManual
+    paramsFromFilters: Record<string, any>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface selectExistingFeatureFlagModalLogicActions {
+    reportExperimentFeatureFlagModalOpened: () => {} // eventUsageLogic
+    loadCurrentTeamSuccess: (
+        currentTeam: TeamPublicType | null,
+        payload?: any
+    ) => {
+        currentTeam: TeamPublicType | null
+        payload?: any
+    } // teamLogic
+    updateCurrentTeamSuccess: (
+        currentTeam: TeamPublicType | TeamType,
+        payload?: Partial<TeamType> | undefined
+    ) => {
+        currentTeam: TeamPublicType | TeamType
+        payload?: Partial<TeamType>
+    } // teamLogic
+    closeSelectExistingFeatureFlagModal: () => {
+        value: true
+    }
+    loadFeatureFlags: () => any
+    loadFeatureFlagsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadFeatureFlagsForAutocomplete: () => {
+        value: true
+    }
+    loadFeatureFlagsSuccess: (
+        featureFlags: {
+            count: number
+            results: FeatureFlagType[]
+        },
+        payload?: any
+    ) => {
+        featureFlags: {
+            count: number
+            results: FeatureFlagType[]
+        }
+        payload?: any
+    }
+    openSelectExistingFeatureFlagModal: () => {
+        value: true
+    }
+    resetFilters: () => {
+        value: true
+    }
+    setFilters: (
+        filters: Partial<FeatureFlagModalFilters>,
+        replace?: boolean
+    ) => {
+        filters: Partial<FeatureFlagModalFilters>
+        replace: boolean | undefined
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface selectExistingFeatureFlagModalLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        paramsFromFilters: (
+            filters: FeatureFlagModalFilters,
+            currentTeam: TeamPublicType | TeamType | null
+        ) => Record<string, any>
+        pagination: (
+            filters: FeatureFlagModalFilters,
+            featureFlags: {
+                count: number
+                results: FeatureFlagType[]
+            }
+        ) => PaginationManual
+        isEvaluationTagsRequired: (currentTeam: TeamPublicType | TeamType | null) => boolean
+    }
+}
+
+export type selectExistingFeatureFlagModalLogicType = MakeLogicType<
+    selectExistingFeatureFlagModalLogicValues,
+    selectExistingFeatureFlagModalLogicActions,
+    Record<string, any>,
+    selectExistingFeatureFlagModalLogicMeta
+>
+
 export const selectExistingFeatureFlagModalLogic = kea<selectExistingFeatureFlagModalLogicType>([
     path(['scenes', 'experiments', 'create', 'selectExistingFeatureFlagModalLogic']),
 
@@ -116,7 +216,10 @@ export const selectExistingFeatureFlagModalLogic = kea<selectExistingFeatureFlag
     selectors({
         paramsFromFilters: [
             (s) => [s.filters, s.currentTeam],
-            (filters: FeatureFlagModalFilters, currentTeam) => {
+            (
+                filters: FeatureFlagModalFilters,
+                currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType
+            ) => {
                 const params: Record<string, any> = {
                     ...filters,
                     limit: FLAGS_PER_PAGE,
@@ -133,7 +236,13 @@ export const selectExistingFeatureFlagModalLogic = kea<selectExistingFeatureFlag
         ],
         pagination: [
             (s) => [s.filters, s.featureFlags],
-            (filters, featureFlags): PaginationManual => {
+            (
+                filters: FeatureFlagModalFilters,
+                featureFlags: {
+                    count: number
+                    results: FeatureFlagType[]
+                }
+            ): PaginationManual => {
                 const currentPage = filters.page || 1
                 const hasNextPage = featureFlags.count > currentPage * FLAGS_PER_PAGE
                 const hasPreviousPage = currentPage > 1
@@ -163,7 +272,8 @@ export const selectExistingFeatureFlagModalLogic = kea<selectExistingFeatureFlag
         ],
         isEvaluationTagsRequired: [
             (s) => [s.currentTeam],
-            (currentTeam) => currentTeam?.require_evaluation_contexts || false,
+            (currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType) =>
+                currentTeam?.require_evaluation_contexts || false,
         ],
     }),
 ])
diff --git a/frontend/src/scenes/experiments/ExperimentForm/variantsPanelLogic.ts b/frontend/src/scenes/experiments/ExperimentForm/variantsPanelLogic.ts
index c47bf64278ae..46928887842e 100644
--- a/frontend/src/scenes/experiments/ExperimentForm/variantsPanelLogic.ts
+++ b/frontend/src/scenes/experiments/ExperimentForm/variantsPanelLogic.ts
@@ -1,4 +1,4 @@
-import { kea } from 'kea'
+import { MakeLogicType, kea } from 'kea'
 
 import api from 'lib/api'
 import { toParams } from 'lib/utils/url'
@@ -9,7 +9,9 @@ import { teamLogic } from 'scenes/teamLogic'
 
 import type { Experiment, FeatureFlagType } from '~/types'
 
-import type { variantsPanelLogicType } from './variantsPanelLogicType'
+import type { ExperimentIdType } from '../../../types'
+import type { FeatureFlagsResult } from '../../feature-flags/featureFlagsLogic'
+import type { ExperimentsResult } from '../experimentsLogic'
 
 export type FeatureFlagKeyValidation = {
     valid: boolean
@@ -19,6 +21,132 @@ export type FeatureFlagKeyValidation = {
     key?: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface variantsPanelLogicValues {
+    experiments: ExperimentsResult // experimentsLogic
+    featureFlags: FeatureFlagsResult // featureFlagsLogic
+    currentProjectId: number | string // teamLogic
+    featureFlagKeyError: string | null
+    featureFlagKeyForAutocomplete: string | null
+    featureFlagKeyValidation: FeatureFlagKeyValidation | null
+    featureFlagKeyValidationLoading: boolean
+    linkedFeatureFlag: FeatureFlagType | null
+    mode: 'create' | 'link'
+    unavailableFeatureFlagKeys: Set<string>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface variantsPanelLogicActions {
+    clearFeatureFlagKeyValidation: () => {
+        value: true
+    }
+    clearFeatureFlagKeyValidationFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    clearFeatureFlagKeyValidationSuccess: (
+        featureFlagKeyValidation: null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        featureFlagKeyValidation: null
+        payload?: {
+            value: true
+        }
+    }
+    setFeatureFlagKeyForAutocomplete: (key: string | null) => {
+        key: string | null
+    }
+    setLinkedFeatureFlag: (flag: FeatureFlagType | null) => {
+        flag: FeatureFlagType | null
+    }
+    setMode: (mode: 'create' | 'link') => {
+        mode: 'create' | 'link'
+    }
+    validateFeatureFlagKey: (key: string) => {
+        key: string
+    }
+    validateFeatureFlagKeyFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    validateFeatureFlagKeySuccess: (
+        featureFlagKeyValidation:
+            | {
+                  error: string
+                  existingFlag: any
+                  key: string
+                  valid: false
+              }
+            | {
+                  error: string
+                  existingFlag?: undefined
+                  key: string
+                  valid: false
+              }
+            | {
+                  error: null
+                  existingFlag?: undefined
+                  key: string
+                  valid: true
+              },
+        payload?: {
+            key: string
+        }
+    ) => {
+        featureFlagKeyValidation:
+            | {
+                  error: string
+                  existingFlag: any
+                  key: string
+                  valid: false
+              }
+            | {
+                  error: string
+                  existingFlag?: undefined
+                  key: string
+                  valid: false
+              }
+            | {
+                  error: null
+                  existingFlag?: undefined
+                  key: string
+                  valid: true
+              }
+        payload?: {
+            key: string
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface variantsPanelLogicProps {
+    disabled: boolean
+    experiment: Experiment
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface variantsPanelLogicMeta {
+    key: ExperimentIdType
+    __keaTypeGenInternalSelectorTypes: {
+        unavailableFeatureFlagKeys: (featureFlags: FeatureFlagsResult, experiments: ExperimentsResult) => Set<string>
+    }
+}
+
+export type variantsPanelLogicType = MakeLogicType<
+    variantsPanelLogicValues,
+    variantsPanelLogicActions,
+    variantsPanelLogicProps,
+    variantsPanelLogicMeta
+>
+
 export const variantsPanelLogic = kea<variantsPanelLogicType>({
     key: (props) => props.experiment?.id || 'new',
     path: (key) => ['scenes', 'experiments', 'create', 'panels', 'variantsPanelLogic', key],
@@ -135,7 +263,10 @@ export const variantsPanelLogic = kea<variantsPanelLogicType>({
         // TRICKY: we do not load all feature flags here, just the latest ones.
         unavailableFeatureFlagKeys: [
             (s) => [s.featureFlags, s.experiments],
-            (featureFlags, experiments) => {
+            (
+                featureFlags: import('scenes/feature-flags/featureFlagsLogic').FeatureFlagsResult,
+                experiments: import('scenes/experiments/experimentsLogic').ExperimentsResult
+            ) => {
                 return new Set([
                     ...featureFlags.results.map((flag) => flag.key),
                     ...experiments.results.map((experiment) => experiment.feature_flag_key),
diff --git a/frontend/src/scenes/experiments/ExperimentTabContent/createDraftExperimentFromFlagLogic.ts b/frontend/src/scenes/experiments/ExperimentTabContent/createDraftExperimentFromFlagLogic.ts
index 74296de57743..3008eb874866 100644
--- a/frontend/src/scenes/experiments/ExperimentTabContent/createDraftExperimentFromFlagLogic.ts
+++ b/frontend/src/scenes/experiments/ExperimentTabContent/createDraftExperimentFromFlagLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, props, reducers } from 'kea'
 import { router } from 'kea-router'
 
 import api from 'lib/api'
@@ -9,12 +9,61 @@ import { urls } from 'scenes/urls'
 
 import type { Experiment } from '~/types'
 
-import type { createDraftExperimentFromFlagLogicType } from './createDraftExperimentFromFlagLogicType'
-
 export interface CreateDraftExperimentFromFlagLogicProps {
     featureFlagKey: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface createDraftExperimentFromFlagLogicValues {
+    currentProjectId: number | string // teamLogic
+    error: string | null
+    experimentDescription: string
+    experimentName: string
+    isLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface createDraftExperimentFromFlagLogicActions {
+    reportExperimentCreated: (
+        experiment: Experiment,
+        metadata?:
+            | {
+                  creation_source?: string
+                  has_linked_flag?: boolean
+              }
+            | undefined
+    ) => {
+        experiment: Experiment
+        metadata:
+            | {
+                  creation_source?: string | undefined
+                  has_linked_flag?: boolean | undefined
+              }
+            | undefined
+    } // eventUsageLogic
+    createDraftExperiment: () => {
+        value: true
+    }
+    createDraftExperimentFailure: (error: string) => {
+        error: string
+    }
+    createDraftExperimentSuccess: (experiment: Experiment) => {
+        experiment: Experiment
+    }
+    setExperimentDescription: (description: string) => {
+        description: string
+    }
+    setExperimentName: (name: string) => {
+        name: string
+    }
+}
+
+export type createDraftExperimentFromFlagLogicType = MakeLogicType<
+    createDraftExperimentFromFlagLogicValues,
+    createDraftExperimentFromFlagLogicActions,
+    CreateDraftExperimentFromFlagLogicProps
+>
+
 export const createDraftExperimentFromFlagLogic = kea<createDraftExperimentFromFlagLogicType>([
     path(['scenes', 'experiments', 'ExperimentTabContent', 'createDraftExperimentFromFlagLogic']),
     props({} as CreateDraftExperimentFromFlagLogicProps),
diff --git a/frontend/src/scenes/experiments/ExperimentView/exposureCriteriaModalLogic.ts b/frontend/src/scenes/experiments/ExperimentView/exposureCriteriaModalLogic.ts
index 9bb191918aa8..40d20905d24b 100644
--- a/frontend/src/scenes/experiments/ExperimentView/exposureCriteriaModalLogic.ts
+++ b/frontend/src/scenes/experiments/ExperimentView/exposureCriteriaModalLogic.ts
@@ -1,9 +1,31 @@
-import { actions, kea, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers } from 'kea'
 
 import type { ExperimentExposureCriteria } from '~/queries/schema/schema-general'
 import { NEW_EXPERIMENT } from '~/scenes/experiments/constants'
 
-import type { exposureCriteriaModalLogicType } from './exposureCriteriaModalLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface exposureCriteriaModalLogicValues {
+    exposureCriteria: ExperimentExposureCriteria
+    isExposureCriteriaModalOpen: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface exposureCriteriaModalLogicActions {
+    closeExposureCriteriaModal: () => {
+        value: true
+    }
+    openExposureCriteriaModal: (exposureCriteria?: ExperimentExposureCriteria) => {
+        exposureCriteria: ExperimentExposureCriteria | undefined
+    }
+    setExposureCriteria: (exposureCriteria: ExperimentExposureCriteria) => {
+        exposureCriteria: ExperimentExposureCriteria
+    }
+}
+
+export type exposureCriteriaModalLogicType = MakeLogicType<
+    exposureCriteriaModalLogicValues,
+    exposureCriteriaModalLogicActions
+>
 
 export const exposureCriteriaModalLogic = kea<exposureCriteriaModalLogicType>([
     path(['scenes', 'experiments', 'ExperimentForm', 'exposureCriteriaModalLogic']),
diff --git a/frontend/src/scenes/experiments/ExperimentWizard/experimentWizardLogic.ts b/frontend/src/scenes/experiments/ExperimentWizard/experimentWizardLogic.ts
index 0bc21aac7c38..dec4c981478c 100644
--- a/frontend/src/scenes/experiments/ExperimentWizard/experimentWizardLogic.ts
+++ b/frontend/src/scenes/experiments/ExperimentWizard/experimentWizardLogic.ts
@@ -1,16 +1,21 @@
-import { actions, connect, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 
 import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
 
 import type { Experiment, FeatureFlagType } from '~/types'
 
+import type {
+    ExperimentExposureCriteria,
+    ExperimentMetric,
+    ExperimentMetricUnion,
+} from '../../../queries/schema/schema-general'
+import type { FeatureFlagFilters, MultivariateFlagVariant } from '../../../types'
 import { NEW_EXPERIMENT } from '../constants'
 import { createExperimentLogic } from '../ExperimentForm/createExperimentLogic'
 import { selectExistingFeatureFlagModalLogic } from '../ExperimentForm/selectExistingFeatureFlagModalLogic'
 import type { FeatureFlagKeyValidation } from '../ExperimentForm/variantsPanelLogic'
 import { variantsPanelLogic } from '../ExperimentForm/variantsPanelLogic'
 import { getExperimentVariants, getFlagVariants } from '../utils'
-import type { experimentWizardLogicType } from './experimentWizardLogicType'
 
 export type ExperimentWizardStep = 'about' | 'variants' | 'analytics'
 
@@ -43,6 +48,159 @@ export const STEP_ORDER: Record<ExperimentWizardStep, number> = {
 
 export interface ExperimentWizardLogicProps {}
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface experimentWizardLogicValues {
+    experiment: Experiment & {
+        feature_flag_filters?: FeatureFlagFilters
+    } // createExperimentLogic
+    featureFlagKeyValidation: FeatureFlagKeyValidation | null // createExperimentLogic
+    featureFlagKeyValidationLoading: boolean // createExperimentLogic
+    isExperimentSubmitting: boolean // createExperimentLogic
+    sharedMetrics: {
+        primary: ExperimentMetric[]
+        secondary: ExperimentMetric[]
+    } // createExperimentLogic
+    currentStep: ExperimentWizardStep
+    currentStepHasErrors: boolean
+    departedSteps: Record<string, boolean>
+    hasFormErrors: boolean
+    initialFlagCheckDone: boolean
+    isFirstStep: boolean
+    isLastStep: boolean
+    linkedFeatureFlag: FeatureFlagType | null
+    showGuide: boolean
+    stepNumber: number
+    stepValidationErrors: Record<ExperimentWizardStep, string[]>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface experimentWizardLogicActions {
+    saveExperiment: () => {
+        value: true
+    } // createExperimentLogic
+    saveExperimentSuccess: () => {
+        value: true
+    } // createExperimentLogic
+    setExperiment: (experiment: Experiment) => {
+        experiment: Experiment
+    } // createExperimentLogic
+    setExperimentValue: (
+        name: string,
+        value: any
+    ) => {
+        name: string
+        value: any
+    } // createExperimentLogic
+    setExposureCriteria: (criteria: ExperimentExposureCriteria) => {
+        criteria: ExperimentExposureCriteria
+    } // createExperimentLogic
+    setFeatureFlagConfig: (config: {
+        ensure_experience_continuity?: boolean
+        feature_flag_key?: string
+        rollout_percentage?: number
+        variants?: MultivariateFlagVariant[]
+    }) => {
+        config: {
+            ensure_experience_continuity?: boolean | undefined
+            feature_flag_key?: string | undefined
+            rollout_percentage?: number | undefined
+            variants?: MultivariateFlagVariant[] | undefined
+        }
+    } // createExperimentLogic
+    setSharedMetrics: (sharedMetrics: { primary: ExperimentMetric[]; secondary: ExperimentMetric[] }) => {
+        sharedMetrics: {
+            primary: ExperimentMetricUnion[]
+            secondary: ExperimentMetricUnion[]
+        }
+    } // createExperimentLogic
+    reportExperimentWizardGuideToggled: (
+        visible: boolean,
+        currentStep: string
+    ) => {
+        currentStep: string
+        visible: boolean
+    } // eventUsageLogic
+    reportExperimentWizardStarted: (guideVisible: boolean) => {
+        guideVisible: boolean
+    } // eventUsageLogic
+    loadFeatureFlagsForAutocomplete: () => {
+        value: true
+    } // selectExistingFeatureFlagModalLogic
+    loadFeatureFlagsSuccess: (
+        featureFlags: {
+            count: number
+            results: FeatureFlagType[]
+        },
+        payload?: any
+    ) => {
+        featureFlags: {
+            count: number
+            results: FeatureFlagType[]
+        }
+        payload?: any
+    } // selectExistingFeatureFlagModalLogic
+    clearFeatureFlagKeyValidation: () => {
+        value: true
+    } // variantsPanelLogic
+    validateFeatureFlagKey: (key: string) => {
+        key: string
+    } // variantsPanelLogic
+    _applyStep: (step: ExperimentWizardStep) => {
+        step: ExperimentWizardStep
+    }
+    markStepDeparted: (step: ExperimentWizardStep) => {
+        step: ExperimentWizardStep
+    }
+    nextStep: () => {
+        value: true
+    }
+    prevStep: () => {
+        value: true
+    }
+    resetWizard: () => {
+        value: true
+    }
+    setLinkedFeatureFlag: (flag: FeatureFlagType | null) => {
+        flag: FeatureFlagType | null
+    }
+    setStep: (step: ExperimentWizardStep) => {
+        step: ExperimentWizardStep
+    }
+    toggleGuide: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface experimentWizardLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        stepNumber: (currentStep: ExperimentWizardStep) => number
+        isLastStep: (currentStep: ExperimentWizardStep) => boolean
+        isFirstStep: (currentStep: ExperimentWizardStep) => boolean
+        stepValidationErrors: (
+            experiment: Experiment & {
+                feature_flag_filters?: FeatureFlagFilters
+            },
+            featureFlagKeyValidation: FeatureFlagKeyValidation | null,
+            linkedFeatureFlag: FeatureFlagType | null,
+            departedSteps: Record<string, boolean>
+        ) => Record<ExperimentWizardStep, string[]>
+        currentStepHasErrors: (
+            stepValidationErrors: Record<ExperimentWizardStep, string[]>,
+            currentStep: ExperimentWizardStep
+        ) => boolean
+        hasFormErrors: (stepValidationErrors: Record<ExperimentWizardStep, string[]>) => boolean
+    }
+}
+
+export type experimentWizardLogicType = MakeLogicType<
+    experimentWizardLogicValues,
+    experimentWizardLogicActions,
+    ExperimentWizardLogicProps,
+    experimentWizardLogicMeta
+>
+
 export const experimentWizardLogic = kea<experimentWizardLogicType>([
     path(['scenes', 'experiments', 'wizard', 'experimentWizardLogic']),
 
diff --git a/frontend/src/scenes/experiments/Metrics/experimentMetricModalLogic.ts b/frontend/src/scenes/experiments/Metrics/experimentMetricModalLogic.ts
index 160194f4820f..fb7abdf94129 100644
--- a/frontend/src/scenes/experiments/Metrics/experimentMetricModalLogic.ts
+++ b/frontend/src/scenes/experiments/Metrics/experimentMetricModalLogic.ts
@@ -1,9 +1,9 @@
-import { actions, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers, selectors } from 'kea'
 
 import type { ExperimentMetric } from '~/queries/schema/schema-general'
 
+import type { ExperimentMetricUnion } from '../../../queries/schema/schema-general'
 import { getDefaultFunnelMetric } from '../utils'
-import type { experimentMetricModalLogicType } from './experimentMetricModalLogicType'
 
 export const METRIC_CONTEXTS = {
     primary: {
@@ -20,6 +20,46 @@ export const METRIC_CONTEXTS = {
 
 export type MetricContext = (typeof METRIC_CONTEXTS)[keyof typeof METRIC_CONTEXTS]
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface experimentMetricModalLogicValues {
+    context: MetricContext
+    isCreateMode: boolean
+    isEditMode: boolean
+    isModalOpen: boolean
+    metric: ExperimentMetric | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface experimentMetricModalLogicActions {
+    closeExperimentMetricModal: () => {
+        value: true
+    }
+    openExperimentMetricModal: (
+        context: MetricContext,
+        metric?: ExperimentMetric
+    ) => {
+        context: MetricContext
+        metric: ExperimentMetricUnion | undefined
+    }
+    setMetric: (metric?: ExperimentMetric) => {
+        metric: ExperimentMetricUnion | undefined
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface experimentMetricModalLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        isCreateMode: (isEditMode: boolean) => boolean
+    }
+}
+
+export type experimentMetricModalLogicType = MakeLogicType<
+    experimentMetricModalLogicValues,
+    experimentMetricModalLogicActions,
+    Record<string, any>,
+    experimentMetricModalLogicMeta
+>
+
 export const experimentMetricModalLogic = kea<experimentMetricModalLogicType>([
     path(['scenes', 'experiments', 'Metrics', 'experimentMetricModalLogic']),
 
diff --git a/frontend/src/scenes/experiments/Metrics/metricSourceModalLogic.tsx b/frontend/src/scenes/experiments/Metrics/metricSourceModalLogic.tsx
index 8730aae556e0..da9b56f7f50e 100644
--- a/frontend/src/scenes/experiments/Metrics/metricSourceModalLogic.tsx
+++ b/frontend/src/scenes/experiments/Metrics/metricSourceModalLogic.tsx
@@ -1,8 +1,25 @@
-import { kea } from 'kea'
+import { MakeLogicType, kea } from 'kea'
 import { actions, path, reducers } from 'kea'
 
 import { METRIC_CONTEXTS, type MetricContext } from './experimentMetricModalLogic'
-import type { metricSourceModalLogicType } from './metricSourceModalLogicType'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface metricSourceModalLogicValues {
+    context: MetricContext
+    isModalOpen: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface metricSourceModalLogicActions {
+    closeMetricSourceModal: () => {
+        value: true
+    }
+    openMetricSourceModal: (context: MetricContext) => {
+        context: MetricContext
+    }
+}
+
+export type metricSourceModalLogicType = MakeLogicType<metricSourceModalLogicValues, metricSourceModalLogicActions>
 
 export const metricSourceModalLogic = kea<metricSourceModalLogicType>([
     path(['scenes', 'experiments', 'metrics', 'metricSourceModalLogic']),
diff --git a/frontend/src/scenes/experiments/Metrics/sharedMetricDetailsModalLogic.ts b/frontend/src/scenes/experiments/Metrics/sharedMetricDetailsModalLogic.ts
index 0f1ecf93019f..b69e89275656 100644
--- a/frontend/src/scenes/experiments/Metrics/sharedMetricDetailsModalLogic.ts
+++ b/frontend/src/scenes/experiments/Metrics/sharedMetricDetailsModalLogic.ts
@@ -1,9 +1,35 @@
-import { actions, kea, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers } from 'kea'
 
 import type { ExperimentMetric } from '~/queries/schema/schema-general'
 
+import type { ExperimentMetricUnion } from '../../../queries/schema/schema-general'
 import { METRIC_CONTEXTS, type MetricContext } from './experimentMetricModalLogic'
-import type { sharedMetricDetailsModalLogicType } from './sharedMetricDetailsModalLogicType'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sharedMetricDetailsModalLogicValues {
+    context: MetricContext
+    isModalOpen: boolean
+    sharedMetric: ExperimentMetric | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sharedMetricDetailsModalLogicActions {
+    closeSharedMetricDetailModal: () => {
+        value: true
+    }
+    openSharedMetricDetailModal: (
+        metric: ExperimentMetric,
+        context: MetricContext
+    ) => {
+        context: MetricContext
+        metric: ExperimentMetricUnion
+    }
+}
+
+export type sharedMetricDetailsModalLogicType = MakeLogicType<
+    sharedMetricDetailsModalLogicValues,
+    sharedMetricDetailsModalLogicActions
+>
 
 export const sharedMetricDetailsModalLogic = kea<sharedMetricDetailsModalLogicType>([
     path(['scenes', 'experiments', 'Metrics', 'sharedMetricDetailsModalLogic']),
diff --git a/frontend/src/scenes/experiments/Metrics/sharedMetricModalLogic.ts b/frontend/src/scenes/experiments/Metrics/sharedMetricModalLogic.ts
index 6bca8f0f227b..6f3ff2619a7b 100644
--- a/frontend/src/scenes/experiments/Metrics/sharedMetricModalLogic.ts
+++ b/frontend/src/scenes/experiments/Metrics/sharedMetricModalLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api, { CountedPaginatedResponse } from 'lib/api'
@@ -8,12 +8,144 @@ import { teamLogic } from 'scenes/teamLogic'
 
 import { NodeKind } from '~/queries/schema/schema-general'
 
+import type { ExperimentIdType } from '../../../types'
 import { SharedMetric } from '../SharedMetrics/sharedMetricLogic'
 import { METRIC_CONTEXTS, type MetricContext } from './experimentMetricModalLogic'
-import type { sharedMetricModalLogicType } from './sharedMetricModalLogicType'
 
 export const MODAL_PAGE_SIZE = 20
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sharedMetricModalLogicValues {
+    currentProjectId: number | string // teamLogic
+    availableTags: string[]
+    compatibleSharedMetrics: SharedMetric[]
+    context: MetricContext
+    displayedMetrics: SharedMetric[]
+    filterTags: string[]
+    hasAnyCompatibleSharedMetrics: boolean
+    isCreateMode: boolean
+    isEditMode: boolean
+    isLoadingAllSharedMetrics: boolean
+    isModalOpen: boolean
+    loadedSharedMetrics: SharedMetric[]
+    searchTerm: string
+    selectedMetricIds: SharedMetric['id'][]
+    sharedMetricId: SharedMetric['id'] | null
+    sharedMetricsResponse: CountedPaginatedResponse<SharedMetric> | null
+    sharedMetricsResponseLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sharedMetricModalLogicActions {
+    reportExperimentSharedMetricAssigned: (
+        experimentId: ExperimentIdType,
+        sharedMetric: SharedMetric
+    ) => {
+        experimentId: ExperimentIdType
+        sharedMetric: SharedMetric
+    } // eventUsageLogic
+    clearFilterTags: () => {
+        value: true
+    }
+    clearSelectedMetricIds: () => {
+        value: true
+    }
+    closeSharedMetricModal: () => {
+        value: true
+    }
+    loadAllSharedMetrics: (_: any) => any
+    loadAllSharedMetricsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAllSharedMetricsSuccess: (
+        sharedMetricsResponse: {
+            count: number
+            next: null
+            previous?: string | null | undefined
+            results: SharedMetric[]
+        },
+        payload?: any
+    ) => {
+        sharedMetricsResponse: {
+            count: number
+            next: null
+            previous?: string | null | undefined
+            results: SharedMetric[]
+        }
+        payload?: any
+    }
+    loadSharedMetrics: (_: void) => void
+    loadSharedMetricsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSharedMetricsSuccess: (
+        sharedMetricsResponse: CountedPaginatedResponse<SharedMetric>,
+        payload?: void
+    ) => {
+        sharedMetricsResponse: CountedPaginatedResponse<SharedMetric>
+        payload?: void
+    }
+    openSharedMetricModal: (
+        context: MetricContext,
+        sharedMetricId?: SharedMetric['id'] | null
+    ) => {
+        context: MetricContext
+        sharedMetricId: number | null | undefined
+    }
+    selectByTag: (
+        tag: string,
+        alreadyAddedIds: SharedMetric['id'][]
+    ) => {
+        alreadyAddedIds: number[]
+        tag: string
+    }
+    setHasAnyCompatibleSharedMetrics: (hasAny: boolean) => {
+        hasAny: boolean
+    }
+    setSearchTerm: (searchTerm: string) => {
+        searchTerm: string
+    }
+    setSelectedMetricIds: (ids: SharedMetric['id'][]) => {
+        ids: number[]
+    }
+    setSharedMetric: (sharedMetric: SharedMetric) => {
+        sharedMetric: SharedMetric
+    }
+    toggleSelectedMetricId: (id: SharedMetric['id']) => {
+        id: number
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sharedMetricModalLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        loadedSharedMetrics: (sharedMetricsResponse: CountedPaginatedResponse<SharedMetric> | null) => SharedMetric[]
+        compatibleSharedMetrics: (loadedSharedMetrics: SharedMetric[]) => SharedMetric[]
+        availableTags: (compatibleSharedMetrics: SharedMetric[]) => string[]
+        displayedMetrics: (compatibleSharedMetrics: SharedMetric[], filterTags: string[]) => SharedMetric[]
+        isLoadingAllSharedMetrics: (
+            sharedMetricsResponseLoading: boolean,
+            sharedMetricsResponse: CountedPaginatedResponse<SharedMetric> | null
+        ) => boolean
+        isCreateMode: (isEditMode: boolean) => boolean
+    }
+}
+
+export type sharedMetricModalLogicType = MakeLogicType<
+    sharedMetricModalLogicValues,
+    sharedMetricModalLogicActions,
+    Record<string, any>,
+    sharedMetricModalLogicMeta
+>
+
 export const sharedMetricModalLogic = kea<sharedMetricModalLogicType>([
     path(['scenes', 'experiments', 'Metrics', 'sharedMetricModalLogic']),
 
@@ -160,7 +292,10 @@ export const sharedMetricModalLogic = kea<sharedMetricModalLogicType>([
     })),
 
     selectors({
-        loadedSharedMetrics: [(s) => [s.sharedMetricsResponse], (response): SharedMetric[] => response?.results ?? []],
+        loadedSharedMetrics: [
+            (s) => [s.sharedMetricsResponse],
+            (response: CountedPaginatedResponse<SharedMetric> | null): SharedMetric[] => response?.results ?? [],
+        ],
         compatibleSharedMetrics: [
             (s) => [s.loadedSharedMetrics],
             (loadedSharedMetrics: SharedMetric[]): SharedMetric[] =>
diff --git a/frontend/src/scenes/experiments/RunningTimeCalculator/runningTimeLogic.ts b/frontend/src/scenes/experiments/RunningTimeCalculator/runningTimeLogic.ts
index 44cd45fc8ee8..901b35aacaf4 100644
--- a/frontend/src/scenes/experiments/RunningTimeCalculator/runningTimeLogic.ts
+++ b/frontend/src/scenes/experiments/RunningTimeCalculator/runningTimeLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { subscriptions } from 'kea-subscriptions'
 
@@ -17,6 +17,8 @@ import type {
     RunningTimeCalculationResultApi,
 } from 'products/experiments/frontend/generated/api.schemas'
 
+import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
+import type { CachedNewExperimentQueryResponse, ExperimentMetricUnion } from '../../../queries/schema/schema-general'
 import { experimentLogic } from '../experimentLogic'
 import { experimentMetricsLogic } from '../experimentMetricsLogic'
 import { isLaunched } from '../experimentsLogic'
@@ -30,7 +32,6 @@ import {
     calculateExposureRate,
     getCalculatorMetricType,
 } from './calculations'
-import type { runningTimeLogicType } from './runningTimeLogicType'
 
 export interface RunningTimeLogicProps {
     experiment: Experiment
@@ -49,6 +50,209 @@ export interface ManualPreview {
     runningTime: number | null
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface runningTimeLogicValues {
+    currentProjectId: number | null // experimentLogic
+    experiment: Experiment // experimentLogic
+    orderedPrimaryMetricsWithResults: {
+        displayIndex: number
+        error: any
+        metric: ExperimentMetricUnion
+        metricIndex: number
+        result: any
+    }[] // experimentLogic
+    primaryMetricsResultsLoading: boolean // experimentLogic
+    recalcPrimaryMetricsResults: CachedNewExperimentQueryResponse[] // experimentMetricsLogic
+    recalcPrimaryMetricsResultsErrors: (unknown | null)[] // experimentMetricsLogic
+    defaultMinimumDetectableEffect: number // experimentsConfigLogic
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    isRunningTimeConfigModalOpen: boolean // modalsLogic
+    automaticCalculation: RunningTimeCalculationResultApi | null
+    automaticCalculationInput: RunningTimeCalculationInputApi | null
+    automaticCalculationLoading: boolean
+    config: RunningTimeConfig
+    configOverrides: Partial<RunningTimeConfig> | null
+    currentExposures: number | null
+    dailyExposureRate: number | null
+    initialConfig: RunningTimeConfig
+    isComplete: boolean
+    isManualMode: boolean
+    isSaving: boolean
+    manualFormPreview: ManualPreview
+    manualPreview: ManualPreview
+    manualPreviewInput: RunningTimeCalculationInputApi | null
+    manualPreviewLoading: boolean
+    mde: number
+    metricsWithResults: {
+        displayIndex: number
+        error: any
+        metric: ExperimentMetricUnion
+        metricIndex: number
+        result: any
+    }[]
+    mode: RunningTimeConfig['mode']
+    numberOfVariants: number
+    remainingDays: number | null
+    targetSampleSize: number | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface runningTimeLogicActions {
+    setExperiment: (experiment: Partial<Experiment>) => {
+        experiment: Partial<Experiment>
+    } // experimentLogic
+    closeRunningTimeConfigModal: () => {
+        value: true
+    } // modalsLogic
+    cancel: () => {
+        value: true
+    }
+    loadAutomaticCalculation: (input: RunningTimeCalculationInputApi) => RunningTimeCalculationInputApi
+    loadAutomaticCalculationFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAutomaticCalculationSuccess: (
+        automaticCalculation: RunningTimeCalculationResultApi,
+        payload?: RunningTimeCalculationInputApi
+    ) => {
+        automaticCalculation: RunningTimeCalculationResultApi
+        payload?: RunningTimeCalculationInputApi
+    }
+    loadManualPreview: (input: RunningTimeCalculationInputApi) => RunningTimeCalculationInputApi
+    loadManualPreviewFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadManualPreviewSuccess: (
+        manualPreview: {
+            runningTime: number | null
+            sampleSize: number | null
+        },
+        payload?: RunningTimeCalculationInputApi
+    ) => {
+        manualPreview: {
+            runningTime: number | null
+            sampleSize: number | null
+        }
+        payload?: RunningTimeCalculationInputApi
+    }
+    persistRunningTimeEstimate: () => {
+        value: true
+    }
+    resetConfig: () => {
+        value: true
+    }
+    save: () => {
+        value: true
+    }
+    setConfig: (config: Partial<RunningTimeConfig>) => {
+        config: Partial<RunningTimeConfig>
+    }
+    setSaving: (saving: boolean) => {
+        saving: boolean
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface runningTimeLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        numberOfVariants: (experiment: Experiment) => number
+        isManualMode: (experiment: Experiment) => boolean
+        initialConfig: (
+            experiment: Experiment,
+            isManualMode: boolean,
+            defaultMinimumDetectableEffect: number
+        ) => RunningTimeConfig
+        config: (
+            initialConfig: RunningTimeConfig,
+            configOverrides: Partial<RunningTimeConfig> | null
+        ) => RunningTimeConfig
+        mde: (config: RunningTimeConfig) => number
+        mode: (config: RunningTimeConfig) => RunningTimeConfig['mode']
+        metricsWithResults: (
+            experiment: Experiment,
+            featureFlags: FeatureFlagsSet,
+            orderedPrimaryMetricsWithResults: {
+                displayIndex: number
+                error: any
+                metric: ExperimentMetricUnion
+                metricIndex: number
+                result: any
+            }[],
+            recalcPrimaryMetricsResults: CachedNewExperimentQueryResponse[],
+            recalcPrimaryMetricsResultsErrors: unknown[]
+        ) => {
+            displayIndex: number
+            error: any
+            metric: ExperimentMetricUnion
+            metricIndex: number
+            result: any
+        }[]
+        currentExposures: (
+            metricsWithResults: {
+                displayIndex: number
+                error: any
+                metric: ExperimentMetricUnion
+                metricIndex: number
+                result: any
+            }[]
+        ) => number | null
+        automaticCalculationInput: (
+            mode: 'automatic' | 'manual',
+            metricsWithResults: {
+                displayIndex: number
+                error: any
+                metric: ExperimentMetricUnion
+                metricIndex: number
+                result: any
+            }[],
+            numberOfVariants: number,
+            mde: number
+        ) => RunningTimeCalculationInputApi | null
+        manualPreviewInput: (
+            config: RunningTimeConfig,
+            numberOfVariants: number
+        ) => RunningTimeCalculationInputApi | null
+        targetSampleSize: (
+            isManualMode: boolean,
+            experiment: Experiment,
+            automaticCalculationInput: RunningTimeCalculationInputApi | null,
+            automaticCalculation: RunningTimeCalculationResultApi | null
+        ) => number | null
+        dailyExposureRate: (
+            isManualMode: boolean,
+            experiment: Experiment,
+            currentExposures: number | null
+        ) => number | null
+        remainingDays: (
+            targetSampleSize: number | null,
+            currentExposures: number | null,
+            dailyExposureRate: number | null,
+            experiment: Experiment
+        ) => number | null
+        isComplete: (currentExposures: number | null, targetSampleSize: number | null) => boolean
+        manualFormPreview: (
+            manualPreviewInput: RunningTimeCalculationInputApi | null,
+            manualPreview: ManualPreview
+        ) => ManualPreview
+    }
+}
+
+export type runningTimeLogicType = MakeLogicType<
+    runningTimeLogicValues,
+    runningTimeLogicActions,
+    RunningTimeLogicProps,
+    runningTimeLogicMeta
+>
+
 export const runningTimeLogic = kea<runningTimeLogicType>([
     path(['scenes', 'experiments', 'RunningTimeCalculator', 'runningTimeLogic']),
     props({} as RunningTimeLogicProps),
@@ -140,19 +344,23 @@ export const runningTimeLogic = kea<runningTimeLogicType>([
     selectors({
         numberOfVariants: [
             (s) => [s.experiment],
-            (experiment): number => getFlagVariants(experiment?.feature_flag).length || 2,
+            (experiment: Experiment): number => getFlagVariants(experiment?.feature_flag).length || 2,
         ],
 
         isManualMode: [
             (s) => [s.experiment],
-            (experiment): boolean =>
+            (experiment: Experiment): boolean =>
                 experiment?.running_time_calculation?.exposure_estimate_config?.conversionRateInputType ===
                 ConversionRateInputType.MANUAL,
         ],
 
         initialConfig: [
             (s) => [s.experiment, s.isManualMode, s.defaultMinimumDetectableEffect],
-            (experiment, isManualMode, defaultMinimumDetectableEffect): RunningTimeConfig => {
+            (
+                experiment: Experiment,
+                isManualMode: boolean,
+                defaultMinimumDetectableEffect: number
+            ): RunningTimeConfig => {
                 // Pre-launch experiments must use manual mode (no data available for automatic)
                 const isPreLaunch = !isLaunched(experiment)
                 const exposureEstimateConfig = experiment?.running_time_calculation?.exposure_estimate_config
@@ -170,14 +378,14 @@ export const runningTimeLogic = kea<runningTimeLogicType>([
 
         config: [
             (s) => [s.initialConfig, s.configOverrides],
-            (initialConfig, configOverrides): RunningTimeConfig =>
+            (initialConfig: RunningTimeConfig, configOverrides: Partial<RunningTimeConfig> | null): RunningTimeConfig =>
                 configOverrides ? { ...initialConfig, ...configOverrides } : initialConfig,
         ],
 
         // Pulled out as primitives so automaticCalculationInput stays stable when the experiment object
         // is replaced (e.g. after persisting an estimate) but the underlying values are unchanged.
-        mde: [(s) => [s.config], (config): number => config.mde],
-        mode: [(s) => [s.config], (config): RunningTimeConfig['mode'] => config.mode],
+        mde: [(s) => [s.config], (config: RunningTimeConfig): number => config.mde],
+        mode: [(s) => [s.config], (config: RunningTimeConfig): RunningTimeConfig['mode'] => config.mode],
 
         // Legacy flow exposes metric results via experimentLogic; the recalculation flow exposes them
         // via experimentMetricsLogic. Pick whichever is active so automatic mode always has a baseline.
@@ -189,7 +397,19 @@ export const runningTimeLogic = kea<runningTimeLogicType>([
                 s.recalcPrimaryMetricsResults,
                 s.recalcPrimaryMetricsResultsErrors,
             ],
-            (experiment, featureFlags, legacyMetricsWithResults, recalcResults, recalcErrors) => {
+            (
+                experiment: Experiment,
+                featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet,
+                legacyMetricsWithResults: {
+                    displayIndex: number
+                    error: any
+                    metric: import('../../../queries/schema').ExperimentMetricUnion
+                    metricIndex: number
+                    result: any
+                }[],
+                recalcResults: import('../../../queries/schema').CachedNewExperimentQueryResponse[],
+                recalcErrors: (unknown | null)[]
+            ) => {
                 if (experiment && featureFlags[FEATURE_FLAGS.EXPERIMENTS_METRICS_RECALCULATION]) {
                     return getOrderedMetricsWithResults(experiment, recalcResults, recalcErrors, [], [], false)
                 }
@@ -199,13 +419,32 @@ export const runningTimeLogic = kea<runningTimeLogicType>([
 
         currentExposures: [
             (s) => [s.metricsWithResults],
-            (results): number | null => calculateCurrentExposures(results?.[0]?.result ?? null),
+            (
+                results: {
+                    displayIndex: number
+                    error: any
+                    metric: import('../../../queries/schema').ExperimentMetricUnion
+                    metricIndex: number
+                    result: any
+                }[]
+            ): number | null => calculateCurrentExposures(results?.[0]?.result ?? null),
         ],
 
         // Request body for the automatic-mode calculation, or null when not applicable (manual mode / no results yet).
         automaticCalculationInput: [
             (s) => [s.mode, s.metricsWithResults, s.numberOfVariants, s.mde],
-            (mode, results, numberOfVariants, mde): RunningTimeCalculationInputApi | null => {
+            (
+                mode: RunningTimeConfig['mode'],
+                results: {
+                    displayIndex: number
+                    error: any
+                    metric: import('../../../queries/schema').ExperimentMetricUnion
+                    metricIndex: number
+                    result: any
+                }[],
+                numberOfVariants: number,
+                mde: number
+            ): RunningTimeCalculationInputApi | null => {
                 // Gate on the in-form mode rather than the persisted mode. While the form is in manual mode
                 // (even if the experiment is still saved as automatic), the automatic estimate is neither
                 // shown nor persisted, so editing the MDE shouldn't fire a wasted automatic calculation.
@@ -228,7 +467,7 @@ export const runningTimeLogic = kea<runningTimeLogicType>([
         // Request body for the live manual-mode preview, or null when the form inputs aren't usable yet.
         manualPreviewInput: [
             (s) => [s.config, s.numberOfVariants],
-            (config, numberOfVariants): RunningTimeCalculationInputApi | null => {
+            (config: RunningTimeConfig, numberOfVariants: number): RunningTimeCalculationInputApi | null => {
                 // Use !(x > 0) to catch NaN, 0, negative, and undefined
                 if (config.mode !== 'manual' || !(config.baselineValue > 0) || !(config.mde > 0)) {
                     return null
@@ -246,7 +485,12 @@ export const runningTimeLogic = kea<runningTimeLogicType>([
 
         targetSampleSize: [
             (s) => [s.isManualMode, s.experiment, s.automaticCalculationInput, s.automaticCalculation],
-            (isManualMode, experiment, automaticInput, automaticCalculation): number | null => {
+            (
+                isManualMode: boolean,
+                experiment: Experiment,
+                automaticInput: RunningTimeCalculationInputApi | null,
+                automaticCalculation: RunningTimeCalculationResultApi | null
+            ): number | null => {
                 if (isManualMode) {
                     // Persisted by the save listener from the same backend calculation.
                     return experiment?.running_time_calculation?.recommended_sample_size ?? null
@@ -260,7 +504,7 @@ export const runningTimeLogic = kea<runningTimeLogicType>([
 
         dailyExposureRate: [
             (s) => [s.isManualMode, s.experiment, s.currentExposures],
-            (isManualMode, experiment, currentExposures): number | null => {
+            (isManualMode: boolean, experiment: Experiment, currentExposures: number | null): number | null => {
                 if (isManualMode) {
                     return experiment?.running_time_calculation?.exposure_estimate_config?.manualExposureRate ?? null
                 }
@@ -274,7 +518,12 @@ export const runningTimeLogic = kea<runningTimeLogicType>([
         // Days until we reach target sample size
         remainingDays: [
             (s) => [s.targetSampleSize, s.currentExposures, s.dailyExposureRate, s.experiment],
-            (target, current, rate, experiment): number | null => {
+            (
+                target: number | null,
+                current: number | null,
+                rate: number | null,
+                experiment: Experiment
+            ): number | null => {
                 if (!target || !rate || rate <= 0) {
                     return null
                 }
@@ -299,11 +548,13 @@ export const runningTimeLogic = kea<runningTimeLogicType>([
         ],
         isComplete: [
             (s) => [s.currentExposures, s.targetSampleSize],
-            (current, target): boolean => current !== null && target !== null && current >= target,
+            (current: number | null, target: number | null): boolean =>
+                current !== null && target !== null && current >= target,
         ],
         manualFormPreview: [
             (s) => [s.manualPreviewInput, s.manualPreview],
-            (input, preview): ManualPreview => (input ? preview : { sampleSize: null, runningTime: null }),
+            (input: RunningTimeCalculationInputApi | null, preview: ManualPreview): ManualPreview =>
+                input ? preview : { sampleSize: null, runningTime: null },
         ],
     }),
 
diff --git a/frontend/src/scenes/experiments/SharedMetrics/sharedMetricLogic.tsx b/frontend/src/scenes/experiments/SharedMetrics/sharedMetricLogic.tsx
index d36fb17ab415..6b9fff8817d8 100644
--- a/frontend/src/scenes/experiments/SharedMetrics/sharedMetricLogic.tsx
+++ b/frontend/src/scenes/experiments/SharedMetrics/sharedMetricLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router, urlToAction } from 'kea-router'
 
@@ -17,8 +17,10 @@ import { SIDE_PANEL_CONTEXT_KEY, SidePanelSceneContext } from '~/layout/navigati
 import { AccessControlLevel, ActivityScope, Breadcrumb, ExperimentsTabs } from '~/types'
 import type { UserBasicType } from '~/types'
 
+import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
+import type { ExperimentMetricUnion } from '../../../queries/schema/schema-general'
+import type { BillingType } from '../../../types'
 import { getDefaultFunnelMetric } from '../utils'
-import type { sharedMetricLogicType } from './sharedMetricLogicType'
 import { sharedMetricsLogic } from './sharedMetricsLogic'
 
 export interface SharedMetricLogicProps {
@@ -47,6 +49,113 @@ export const NEW_SHARED_METRIC: Partial<SharedMetric> = {
     user_access_level: AccessControlLevel.Editor,
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sharedMetricLogicValues {
+    billing: BillingType | null // billingLogic
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    currentProjectId: number | string // teamLogic
+    action: 'create' | 'duplicate' | 'update'
+    breadcrumbs: Breadcrumb[]
+    newSharedMetric: {
+        created_at?: string | null | undefined
+        created_by?: UserBasicType | null | undefined
+        description?: string | undefined
+        id?: number | undefined
+        metadata?: Record<string, any> | undefined
+        name?: string | undefined
+        query: ExperimentMetricUnion
+        tags?: string[] | undefined
+        updated_at?: string | null | undefined
+        user_access_level?: AccessControlLevel | undefined
+    }
+    sharedMetric: Partial<SharedMetric>
+    sharedMetricId: number | string
+    sharedMetricLoading: boolean
+    sidePanelContext: SidePanelSceneContext | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sharedMetricLogicActions {
+    reportExperimentSharedMetricCreated: (sharedMetric: SharedMetric) => {
+        sharedMetric: SharedMetric
+    } // eventUsageLogic
+    loadSharedMetrics: (_?: void | undefined) => void // sharedMetricsLogic
+    createSharedMetric: () => {
+        value: true
+    }
+    deleteSharedMetric: () => {
+        value: true
+    }
+    loadSharedMetric: () => any
+    loadSharedMetricFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSharedMetricSuccess: (
+        sharedMetric:
+            | SharedMetric
+            | {
+                  created_at?: string | null | undefined
+                  created_by?: UserBasicType | null | undefined
+                  description?: string | undefined
+                  id?: number | undefined
+                  metadata?: Record<string, any> | undefined
+                  name?: string | undefined
+                  query: ExperimentMetricUnion
+                  tags?: string[] | undefined
+                  updated_at?: string | null | undefined
+                  user_access_level?: AccessControlLevel | undefined
+              },
+        payload?: any
+    ) => {
+        sharedMetric:
+            | SharedMetric
+            | {
+                  created_at?: string | null | undefined
+                  created_by?: UserBasicType | null | undefined
+                  description?: string | undefined
+                  id?: number | undefined
+                  metadata?: Record<string, any> | undefined
+                  name?: string | undefined
+                  query: ExperimentMetricUnion
+                  tags?: string[] | undefined
+                  updated_at?: string | null | undefined
+                  user_access_level?: AccessControlLevel | undefined
+              }
+        payload?: any
+    }
+    setSharedMetric: (metric: Partial<SharedMetric>) => {
+        metric: Partial<SharedMetric>
+    }
+    updateSharedMetric: (redirect?: boolean) => {
+        redirect: boolean | undefined
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sharedMetricLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        sharedMetricId: (arg: any) => number | string
+        action: (action: 'create' | 'duplicate' | 'update') => 'create' | 'duplicate' | 'update'
+        breadcrumbs: (sharedMetric: Partial<SharedMetric>, sharedMetricId: number | string) => Breadcrumb[]
+        sidePanelContext: (
+            sharedMetric: Partial<SharedMetric>,
+            sharedMetricId: number | string
+        ) => SidePanelSceneContext | null
+    }
+}
+
+export type sharedMetricLogicType = MakeLogicType<
+    sharedMetricLogicValues,
+    sharedMetricLogicActions,
+    SharedMetricLogicProps,
+    sharedMetricLogicMeta
+>
+
 export const sharedMetricLogic = kea<sharedMetricLogicType>([
     props({} as SharedMetricLogicProps),
     path((key) => ['scenes', 'experiments', 'sharedMetricLogic', key]),
@@ -161,7 +270,7 @@ export const sharedMetricLogic = kea<sharedMetricLogicType>([
             () => [(_, props) => props.sharedMetricId ?? 'new'],
             (sharedMetricId): string | number => sharedMetricId,
         ],
-        action: [(_, p) => [p.action], (action) => action],
+        action: [(_, p) => [p.action], (action: 'create' | 'duplicate' | 'update') => action],
         newSharedMetric: [
             () => [],
             () => ({
diff --git a/frontend/src/scenes/experiments/SharedMetrics/sharedMetricsLogic.tsx b/frontend/src/scenes/experiments/SharedMetrics/sharedMetricsLogic.tsx
index b6d9cb095680..ae3d5b510609 100644
--- a/frontend/src/scenes/experiments/SharedMetrics/sharedMetricsLogic.tsx
+++ b/frontend/src/scenes/experiments/SharedMetrics/sharedMetricsLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, connect, events, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, listeners, path, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -8,10 +8,60 @@ import { toParams } from 'lib/utils/url'
 import { teamLogic } from 'scenes/teamLogic'
 
 import type { SharedMetric } from './sharedMetricLogic'
-import type { sharedMetricsLogicType } from './sharedMetricsLogicType'
 
 export const PAGE_SIZE = 100
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sharedMetricsLogicValues {
+    currentProjectId: number | string // teamLogic
+    count: number
+    page: number
+    savingTagsMetricId: SharedMetric['id'] | null
+    searchTerm: string
+    sharedMetrics: SharedMetric[]
+    sharedMetricsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sharedMetricsLogicActions {
+    deleteSharedMetric: (metricId: SharedMetric['id']) => {
+        metricId: number
+    }
+    loadSharedMetrics: (_: void) => void
+    loadSharedMetricsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSharedMetricsSuccess: (
+        sharedMetrics: SharedMetric[],
+        payload?: void
+    ) => {
+        sharedMetrics: SharedMetric[]
+        payload?: void
+    }
+    setCount: (count: number) => {
+        count: number
+    }
+    setPage: (page: number) => {
+        page: number
+    }
+    setSearchTerm: (searchTerm: string) => {
+        searchTerm: string
+    }
+    updateSharedMetricTags: (
+        metricId: SharedMetric['id'],
+        tags: string[]
+    ) => {
+        metricId: number
+        tags: string[]
+    }
+}
+
+export type sharedMetricsLogicType = MakeLogicType<sharedMetricsLogicValues, sharedMetricsLogicActions>
+
 export const sharedMetricsLogic = kea<sharedMetricsLogicType>([
     path(['scenes', 'experiments', 'sharedMetricsLogic']),
     connect(() => ({ values: [teamLogic, ['currentProjectId']] })),
diff --git a/frontend/src/scenes/experiments/components/ResultsBreakdown/resultsBreakdownLogic.ts b/frontend/src/scenes/experiments/components/ResultsBreakdown/resultsBreakdownLogic.ts
index 2974097a2f10..afabd86c4151 100644
--- a/frontend/src/scenes/experiments/components/ResultsBreakdown/resultsBreakdownLogic.ts
+++ b/frontend/src/scenes/experiments/components/ResultsBreakdown/resultsBreakdownLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { P, match } from 'ts-pattern'
 
@@ -35,7 +35,9 @@ import {
     StepOrderValue,
 } from '~/types'
 
-import type { resultsBreakdownLogicType } from './resultsBreakdownLogicType'
+import type { FeatureFlagsSet } from '../../../../lib/logic/featureFlagLogic'
+import type { InsightQueryNode } from '../../../../queries/schema/schema-general'
+import type { ExperimentTriggeredBy } from '../../experimentLogic'
 
 const filterFunnelSteps = (steps: FunnelStep[], variants: string[]): FunnelStep[] =>
     steps.filter((step) =>
@@ -52,6 +54,67 @@ export type ResultBreakdownLogicProps = {
     isPrimary: boolean
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface resultsBreakdownLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    breakdownLastRefresh: string | null
+    breakdownResults: FunnelStep[] | FunnelStep[][] | null
+    breakdownResultsLoading: boolean
+    query: InsightVizNode<InsightQueryNode> | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface resultsBreakdownLogicActions {
+    refreshExperimentResults: (
+        forceRefresh?: boolean | undefined,
+        triggeredBy?: ExperimentTriggeredBy | undefined,
+        refreshIfStale?: boolean | undefined
+    ) => {
+        forceRefresh: boolean | undefined
+        refreshIfStale: boolean
+        triggeredBy: ExperimentTriggeredBy
+    } // experimentLogic
+    loadBreakdownResults: (refresh?: boolean) => {
+        refresh: boolean | undefined
+    }
+    loadBreakdownResultsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadBreakdownResultsSuccess: (
+        breakdownResults: FunnelStep[] | FunnelStep[][],
+        payload?: {
+            refresh: boolean | undefined
+        }
+    ) => {
+        breakdownResults: FunnelStep[] | FunnelStep[][]
+        payload?: {
+            refresh: boolean | undefined
+        }
+    }
+    setBreakdownLastRefresh: (lastRefresh: string | null) => {
+        lastRefresh: string | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface resultsBreakdownLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        query: (arg: any) => InsightVizNode<InsightQueryNode> | null
+    }
+}
+
+export type resultsBreakdownLogicType = MakeLogicType<
+    resultsBreakdownLogicValues,
+    resultsBreakdownLogicActions,
+    ResultBreakdownLogicProps,
+    resultsBreakdownLogicMeta
+>
+
 /**
  * This logic only works with the new query runner.
  * Legacy Funnels and Trends engine are resolved backend side.
diff --git a/frontend/src/scenes/experiments/experimentLogic.tsx b/frontend/src/scenes/experiments/experimentLogic.tsx
index 6b1d32800c31..dd8226766782 100644
--- a/frontend/src/scenes/experiments/experimentLogic.tsx
+++ b/frontend/src/scenes/experiments/experimentLogic.tsx
@@ -1,5 +1,18 @@
-import { actions, connect, isBreakpoint, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    connect,
+    isBreakpoint,
+    kea,
+    key,
+    listeners,
+    path,
+    props,
+    reducers,
+    selectors,
+} from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 
@@ -71,6 +84,20 @@ import {
     PropertyMathType,
 } from '~/types'
 
+import type { ProductIntentProperties } from '../../lib/utils/product-intents'
+import type { Noun } from '../../models/groupsModel'
+import type { ExperimentMetricUnion } from '../../queries/schema/schema-general'
+import type {
+    BillingType,
+    ExperimentHoldoutType,
+    ExperimentIdType,
+    FunnelResultType,
+    FunnelTimeConversionMetrics,
+    GroupType,
+    GroupTypeIndex,
+    TrendResult,
+} from '../../types'
+import type { ExperimentsConfig } from '../settings/environment/experimentsConfigLogic'
 import {
     EXPERIMENT_AUTO_REFRESH_INITIAL_INTERVAL_SECONDS,
     EXPERIMENT_MIN_EXPOSURES_FOR_RESULTS,
@@ -78,7 +105,6 @@ import {
     NEW_EXPERIMENT_FORCE_REFRESH_AFTER_MINUTES,
     MetricInsightId,
 } from './constants'
-import type { experimentLogicType } from './experimentLogicType'
 import { experimentMetricsLogic } from './experimentMetricsLogic'
 import { experimentSceneLogic } from './experimentSceneLogic'
 import {
@@ -306,7 +332,7 @@ const loadMetrics = async ({
     onSetErrors,
 }: MetricLoadingConfig): Promise<MetricLoadingSummary> => {
     const results: CachedNewExperimentQueryResponse[] = []
-    const currentErrors = new Array(metrics.length).fill(null)
+    const currentErrors = Array.from({ length: metrics.length }).fill(null)
 
     let successfulCount = 0
     let erroredCount = 0
@@ -457,6 +483,913 @@ export type ExperimentSavedMetric = {
     name: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface experimentLogicValues {
+    billing: BillingType | null // billingLogic
+    defaultMinimumDetectableEffect: number // experimentsConfigLogic
+    experimentsConfig: ExperimentsConfig | null // experimentsConfigLogic
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    conversionMetrics: FunnelTimeConversionMetrics // funnelDataLogic
+    funnelResults: FunnelResultType // funnelDataLogic
+    aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun // groupsModel
+    groupTypes: Map<GroupTypeIndex, GroupType> // groupsModel
+    showGroupsOptions: boolean // groupsModel
+    holdouts: ExperimentHoldoutType[] // holdoutsLogic
+    funnelMetricInsightLoading: boolean // insightDataLogic
+    trendMetricInsightLoading: boolean // insightDataLogic
+    currentProjectId: number | null // projectLogic
+    sharedMetrics: SharedMetric[] // sharedMetricsLogic
+    currentTeamId: number | null // teamLogic
+    trendResults: TrendResult[] // trendsDataLogic
+    actualRunningTime: number
+    autoRefresh: {
+        enabled: boolean
+        interval: number
+    }
+    compatibleSharedMetrics: SharedMetric[]
+    createExperimentLoading: boolean
+    currentRefresh: CurrentRefreshSnapshot | null
+    editingPrimaryMetricUuid: string | null
+    editingSecondaryMetricUuid: string | null
+    editingSharedMetricId: SharedMetric['id'] | null
+    endExperimentLoading: boolean
+    excludedVariants: string[]
+    experiment: Experiment
+    experimentAllErrors: Record<string, any>
+    experimentChanged: boolean
+    experimentErrors: DeepPartialMap<Experiment, ValidationErrorType>
+    experimentHasErrors: boolean
+    experimentId: Experiment['id']
+    experimentLoading: boolean
+    experimentManualErrors: Record<string, any>
+    experimentMathAggregationForTrends: () => CountPerActorMathType | PropertyMathType | undefined
+    experimentMissing: boolean
+    experimentTouched: boolean
+    experimentTouches: Record<string, boolean>
+    experimentUpdate: Experiment | null
+    experimentUpdateLoading: boolean
+    experimentValidationErrors: DeepPartialMap<Experiment, ValidationErrorType>
+    experimentWarning: ExperimentWarning | null
+    exposureCohort: CohortType | null
+    exposureCohortLoading: boolean
+    exposureCriteria: ExperimentExposureCriteria | undefined
+    exposures: any
+    exposuresLoading: boolean
+    featureFlagValidationError: string | null
+    firstPrimaryMetric: ExperimentFunnelsQuery | ExperimentMetric | ExperimentTrendsQuery | undefined
+    formMode: FormModes
+    freezeExposureLoading: boolean
+    getExperimentMetricType: (metric: ExperimentMetricUnion | undefined) => ExperimentMetricType
+    getInsightType: (
+        metric: ExperimentFunnelsQuery | ExperimentMetricUnion | ExperimentTrendsQuery | undefined
+    ) => InsightType
+    getOrderedMetricsWithResults: (isSecondary: boolean) => {
+        displayIndex: number
+        error: any
+        metric: ExperimentMetricUnion
+        metricIndex: number
+        result: any
+    }[]
+    hasMinimumExposureForResults: boolean
+    hasPrimaryMetricSet: boolean
+    hogfettiTrigger: (() => void) | null
+    isCreatingExperimentDashboard: boolean
+    isExperimentDraft: boolean
+    isExperimentLaunched: boolean
+    isExperimentRunning: boolean
+    isExperimentStopped: boolean
+    isExperimentSubmitting: boolean
+    isExperimentValid: boolean
+    isFlagActive: boolean
+    isPageVisible: boolean
+    isSingleVariantShipped: boolean
+    launchExperimentLoading: boolean
+    minimumDetectableEffect: number
+    notifyWhenResultsReady: boolean
+    orderedPrimaryMetricsWithResults: {
+        displayIndex: number
+        error: any
+        metric: ExperimentMetricUnion
+        metricIndex: number
+        result: any
+    }[]
+    orderedSecondaryMetricsWithResults: {
+        displayIndex: number
+        error: any
+        metric: ExperimentMetricUnion
+        metricIndex: number
+        result: any
+    }[]
+    primaryMetricsLengthWithSharedMetrics: number
+    primaryMetricsResults: CachedNewExperimentQueryResponse[]
+    primaryMetricsResultsErrors: any[]
+    primaryMetricsResultsLoading: boolean
+    props: any
+    recommendedRunningTime: number
+    recommendedSampleSize: number
+    secondaryMetricsLengthWithSharedMetrics: number
+    secondaryMetricsResults: CachedNewExperimentQueryResponse[]
+    secondaryMetricsResultsErrors: any[]
+    secondaryMetricsResultsLoading: boolean
+    shippedVariantKey: string | null
+    showDebugPanel: boolean
+    showExperimentErrors: boolean
+    showNotificationOffer: boolean
+    statsMethod: ExperimentStatsMethod
+    unfreezeExposureLoading: boolean
+    unmodifiedExperiment: Experiment | null
+    usesNewQueryRunner: boolean
+    validExistingFeatureFlag: FeatureFlagType | null
+    variants: MultivariateFlagVariant[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface experimentLogicActions {
+    reportExperimentAiSummaryRequested: (experiment: Experiment) => {
+        experiment: Experiment
+    } // eventUsageLogic
+    reportExperimentAutoRefreshToggled: (
+        experiment: Experiment,
+        enabled: boolean,
+        interval: number
+    ) => {
+        enabled: boolean
+        experiment: Experiment
+        interval: number
+    } // eventUsageLogic
+    reportExperimentCreated: (
+        experiment: Experiment,
+        metadata?:
+            | {
+                  creation_source?: string
+                  has_linked_flag?: boolean
+              }
+            | undefined
+    ) => {
+        experiment: Experiment
+        metadata:
+            | {
+                  creation_source?: string | undefined
+                  has_linked_flag?: boolean | undefined
+              }
+            | undefined
+    } // eventUsageLogic
+    reportExperimentDashboardCreated: (
+        experiment: Experiment,
+        dashboardId: number
+    ) => {
+        dashboardId: number
+        experiment: Experiment
+    } // eventUsageLogic
+    reportExperimentExposureCohortCreated: (
+        experiment: Experiment,
+        cohort: CohortType
+    ) => {
+        cohort: CohortType
+        experiment: Experiment
+    } // eventUsageLogic
+    reportExperimentHoldoutAssigned: (args_0: {
+        experimentId: ExperimentIdType
+        holdoutId: ExperimentHoldoutType['id']
+    }) => {
+        experimentId: ExperimentIdType
+        holdoutId: number | null
+    } // eventUsageLogic
+    reportExperimentMetricBreakdownAdded: (
+        experiment: Experiment,
+        metricUuid: string,
+        breakdown: Breakdown,
+        isPrimary: boolean
+    ) => {
+        breakdown: Breakdown
+        experiment: Experiment
+        isPrimary: boolean
+        metricUuid: string
+    } // eventUsageLogic
+    reportExperimentMetricBreakdownRemoved: (
+        experiment: Experiment,
+        metricUuid: string,
+        breakdown: Breakdown,
+        index: number,
+        isPrimary: boolean
+    ) => {
+        breakdown: Breakdown
+        experiment: Experiment
+        index: number
+        isPrimary: boolean
+        metricUuid: string
+    } // eventUsageLogic
+    reportExperimentMetricsRefreshed: (
+        experiment: Experiment,
+        forceRefresh: boolean,
+        context?:
+            | {
+                  auto_refresh_enabled?: boolean
+                  auto_refresh_interval?: number
+                  previous_refresh_age_ms?: number | null
+                  previous_refresh_id?: string | null
+                  previous_refresh_state?: string | null
+                  previous_refresh_triggered_by?: string | null
+                  triggered_by: 'auto-refresh' | 'manual'
+              }
+            | undefined
+    ) => {
+        context:
+            | {
+                  auto_refresh_enabled?: boolean | undefined
+                  auto_refresh_interval?: number | undefined
+                  previous_refresh_age_ms?: number | null | undefined
+                  previous_refresh_id?: string | null | undefined
+                  previous_refresh_state?: string | null | undefined
+                  previous_refresh_triggered_by?: string | null | undefined
+                  triggered_by: 'auto-refresh' | 'manual'
+              }
+            | undefined
+        experiment: Experiment
+        forceRefresh: boolean
+    } // eventUsageLogic
+    reportExperimentReleaseConditionsViewed: (experimentId: ExperimentIdType) => {
+        experimentId: ExperimentIdType
+    } // eventUsageLogic
+    reportExperimentResultsLoadingTimeout: (experimentId: ExperimentIdType) => {
+        experimentId: ExperimentIdType
+    } // eventUsageLogic
+    reportExperimentSessionReplaySummaryRequested: (experiment: Experiment) => {
+        experiment: Experiment
+    } // eventUsageLogic
+    reportExperimentSharedMetricAssigned: (
+        experimentId: ExperimentIdType,
+        sharedMetric: SharedMetric
+    ) => {
+        experimentId: ExperimentIdType
+        sharedMetric: SharedMetric
+    } // eventUsageLogic
+    reportExperimentTimeseriesRecalculated: (
+        experimentId: ExperimentIdType,
+        metric: ExperimentMetricUnion
+    ) => {
+        experimentId: ExperimentIdType
+        metric: ExperimentMetricUnion
+    } // eventUsageLogic
+    reportExperimentTimeseriesViewed: (
+        experimentId: ExperimentIdType,
+        metric: ExperimentMetricUnion
+    ) => {
+        experimentId: ExperimentIdType
+        metric: ExperimentMetricUnion
+    } // eventUsageLogic
+    reportExperimentVariantScreenshotUploaded: (experimentId: ExperimentIdType) => {
+        experimentId: ExperimentIdType
+    } // eventUsageLogic
+    reportExperimentViewed: (
+        experiment: Experiment,
+        duration: number | null
+    ) => {
+        duration: number | null
+        experiment: Experiment
+    } // eventUsageLogic
+    addToExperiments: (experiment: Experiment) => Experiment // experimentsLogic
+    updateExperiments: (experiment: Experiment) => Experiment // experimentsLogic
+    updateFlagFromPartial: (
+        flag: Partial<FeatureFlagType> & {
+            id: number
+        }
+    ) => {
+        flag: Partial<FeatureFlagType> & {
+            id: number
+        }
+    } // featureFlagsLogic
+    closeFinishExperimentModal: () => {
+        value: true
+    } // modalsLogic
+    closePauseExperimentModal: () => {
+        value: true
+    } // modalsLogic
+    closePrimaryMetricModal: () => {
+        value: true
+    } // modalsLogic
+    closePrimaryMetricsReorderModal: () => {
+        value: true
+    } // modalsLogic
+    closeResumeExperimentModal: () => {
+        value: true
+    } // modalsLogic
+    closeSecondaryMetricModal: () => {
+        value: true
+    } // modalsLogic
+    closeSecondaryMetricsReorderModal: () => {
+        value: true
+    } // modalsLogic
+    openPrimaryMetricModal: (uuid: string) => {
+        uuid: string
+    } // modalsLogic
+    openPrimarySharedMetricModal: (sharedMetricId: number | null) => {
+        sharedMetricId: number | null
+    } // modalsLogic
+    openReleaseConditionsModal: () => {
+        value: true
+    } // modalsLogic
+    openSecondaryMetricModal: (uuid: string) => {
+        uuid: string
+    } // modalsLogic
+    openSecondarySharedMetricModal: (sharedMetricId: number | null) => {
+        sharedMetricId: number | null
+    } // modalsLogic
+    addProductIntent: (properties: ProductIntentProperties) => ProductIntentProperties // teamLogic
+    addSharedMetricsToExperiment: (
+        sharedMetricIds: SharedMetric['id'][],
+        metadata: {
+            type: 'primary' | 'secondary'
+        }
+    ) => {
+        metadata: {
+            type: 'primary' | 'secondary'
+        }
+        sharedMetricIds: number[]
+    }
+    archiveExperiment: (disableFeatureFlag?: boolean) => {
+        disableFeatureFlag: boolean
+    }
+    changeExperimentEndDate: (endDate: string) => {
+        endDate: string
+    }
+    changeExperimentStartDate: (startDate: string) => {
+        startDate: string
+    }
+    clearMetricsResults: () => {
+        value: true
+    }
+    createExperiment: (
+        draft?: boolean,
+        folder?: string | null
+    ) => {
+        draft: boolean | undefined
+        folder: string | null | undefined
+    }
+    createExperimentDashboard: () => {
+        value: true
+    }
+    createExposureCohort: () => any
+    createExposureCohortFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    createExposureCohortSuccess: (
+        exposureCohort: CohortType | null,
+        payload?: any
+    ) => {
+        exposureCohort: CohortType | null
+        payload?: any
+    }
+    dismissNotificationOffer: () => {
+        value: true
+    }
+    duplicateMetric: ({ uuid, isSecondary, newUuid }: { isSecondary: boolean; newUuid: string; uuid: string }) => {
+        isSecondary: boolean
+        newUuid: string
+        uuid: string
+    }
+    endExperiment: (openCleanupPr?: boolean) => {
+        openCleanupPr: boolean
+    }
+    endExperimentWithoutShipping: (openCleanupPr?: boolean) => {
+        openCleanupPr: boolean
+    }
+    finishExperiment: ({
+        selectedVariantKey,
+        releaseToEveryone,
+        openCleanupPr,
+    }: {
+        openCleanupPr?: boolean
+        releaseToEveryone: boolean
+        selectedVariantKey: string
+    }) => {
+        openCleanupPr: boolean
+        releaseToEveryone: boolean
+        selectedVariantKey: string
+    }
+    freezeExposure: () => {
+        value: true
+    }
+    launchExperiment: () => {
+        value: true
+    }
+    loadExperiment: (payload?: { triggeredBy?: ExperimentTriggeredBy }) => {
+        triggeredBy?: ExperimentTriggeredBy
+    }
+    loadExperimentFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadExperimentSuccess: (
+        experiment: Experiment,
+        payload?: {
+            triggeredBy?: ExperimentTriggeredBy
+        }
+    ) => {
+        experiment: Experiment
+        payload?: {
+            triggeredBy?: ExperimentTriggeredBy
+        }
+    }
+    loadExposures: (refresh?: boolean) => boolean
+    loadExposuresFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadExposuresSuccess: (
+        exposures: any,
+        payload?: boolean
+    ) => {
+        exposures: any
+        payload?: boolean
+    }
+    loadPrimaryMetricsResults: (
+        refresh?: boolean,
+        refreshId?: string
+    ) => {
+        refresh: boolean | undefined
+        refreshId: string | undefined
+    }
+    loadSecondaryMetricsResults: (
+        refresh?: boolean,
+        refreshId?: string
+    ) => {
+        refresh: boolean | undefined
+        refreshId: string | undefined
+    }
+    markRefreshFinished: (
+        refreshId: string,
+        finalState: FinishedRefreshState
+    ) => {
+        finalState: FinishedRefreshState
+        refreshId: string
+    }
+    markRefreshStarted: (
+        refreshId: string,
+        triggeredBy: ExperimentTriggeredBy
+    ) => {
+        refreshId: string
+        triggeredBy: ExperimentTriggeredBy
+    }
+    pauseExperiment: () => {
+        value: true
+    }
+    refreshExperimentResults: (
+        forceRefresh?: boolean,
+        triggeredBy?: ExperimentTriggeredBy,
+        refreshIfStale?: boolean
+    ) => {
+        forceRefresh: boolean | undefined
+        refreshIfStale: boolean
+        triggeredBy: ExperimentTriggeredBy
+    }
+    refreshStaleResultsOnReentry: () => {
+        value: true
+    }
+    removeMetric: (
+        uuid: string,
+        context: 'primary' | 'secondary'
+    ) => {
+        context: 'primary' | 'secondary'
+        uuid: string
+    }
+    removeMetricBreakdown: (
+        uuid: string,
+        index: number,
+        breakdown: Breakdown
+    ) => {
+        breakdown: Breakdown
+        index: number
+        uuid: string
+    }
+    removeSharedMetricFromExperiment: (sharedMetricId: SharedMetric['id']) => {
+        sharedMetricId: number
+    }
+    resetAutoRefreshInterval: () => {
+        value: true
+    }
+    resetExperiment: (values?: Experiment) => {
+        values?: Experiment
+    }
+    resetRunningExperiment: () => {
+        value: true
+    }
+    restoreUnmodifiedExperiment: () => {
+        value: true
+    }
+    resumeExperiment: () => {
+        value: true
+    }
+    retryPrimaryMetric: (index: number) => {
+        index: number
+    }
+    retrySecondaryMetric: (index: number) => {
+        index: number
+    }
+    saveMetricsReorder: (
+        isSecondary: boolean,
+        orderedUuids: string[],
+        removedUuids: string[],
+        movedUuids: string[]
+    ) => {
+        isSecondary: boolean
+        movedUuids: string[]
+        orderedUuids: string[]
+        removedUuids: string[]
+    }
+    setAutoRefresh: (
+        enabled: boolean,
+        interval: number
+    ) => {
+        enabled: boolean
+        interval: number
+    }
+    setCreateExperimentLoading: (loading: boolean) => {
+        loading: boolean
+    }
+    setEditExperiment: (editing: boolean) => {
+        editing: boolean
+    }
+    setEndExperimentLoading: (loading: boolean) => {
+        loading: boolean
+    }
+    setExperiment: (experiment: Partial<Experiment>) => {
+        experiment: Partial<Experiment>
+    }
+    setExperimentManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setExperimentMissing: () => {
+        value: true
+    }
+    setExperimentValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setExperimentValues: (values: DeepPartial<Experiment>) => {
+        values: DeepPartial<Experiment>
+    }
+    setExposureCriteria: (exposureCriteria: ExperimentExposureCriteria) => {
+        exposureCriteria: ExperimentExposureCriteria
+    }
+    setFeatureFlagValidationError: (error: string) => {
+        error: string
+    }
+    setFreezeExposureLoading: (loading: boolean) => {
+        loading: boolean
+    }
+    setFunnelsMetric: ({
+        uuid,
+        name,
+        series,
+        filterTestAccounts,
+        breakdownAttributionType,
+        breakdownAttributionValue,
+        funnelWindowInterval,
+        funnelWindowIntervalUnit,
+        aggregation_group_type_index,
+        funnelAggregateByHogQL,
+        isSecondary,
+    }: {
+        aggregation_group_type_index?: number
+        breakdownAttributionType?: BreakdownAttributionType
+        breakdownAttributionValue?: number
+        filterTestAccounts?: boolean
+        funnelAggregateByHogQL?: string
+        funnelWindowInterval?: number
+        funnelWindowIntervalUnit?: string
+        isSecondary?: boolean
+        name?: string
+        series?: AnyEntityNode[]
+        uuid: string
+    }) => {
+        aggregation_group_type_index: number | undefined
+        breakdownAttributionType: BreakdownAttributionType | undefined
+        breakdownAttributionValue: number | undefined
+        filterTestAccounts: boolean | undefined
+        funnelAggregateByHogQL: string | undefined
+        funnelWindowInterval: number | undefined
+        funnelWindowIntervalUnit: string | undefined
+        isSecondary: boolean | undefined
+        name: string | undefined
+        series: AnyEntityNode[] | undefined
+        uuid: string
+    }
+    setHogfettiTrigger: (trigger: (() => void) | null) => {
+        trigger: (() => void) | null
+    }
+    setIsCreatingExperimentDashboard: (isCreating: boolean) => {
+        isCreating: boolean
+    }
+    setLaunchExperimentLoading: (loading: boolean) => {
+        loading: boolean
+    }
+    setMetric: ({
+        uuid,
+        name,
+        metric,
+        isSecondary,
+    }: {
+        isSecondary?: boolean
+        metric: ExperimentMetric
+        name?: string
+        uuid: string
+    }) => {
+        isSecondary: boolean
+        metric: ExperimentMetricUnion
+        name: string | undefined
+        uuid: string
+    }
+    setNotifyWhenResultsReady: (notify: boolean) => {
+        notify: boolean
+    }
+    setPageVisibility: (visible: boolean) => {
+        visible: boolean
+    }
+    setPrimaryMetricsResults: (results: CachedNewExperimentQueryResponse[]) => {
+        results: CachedNewExperimentQueryResponse[]
+    }
+    setPrimaryMetricsResultsErrors: (errors: any[]) => {
+        errors: any[]
+    }
+    setPrimaryMetricsResultsLoading: (loading: boolean) => {
+        loading: boolean
+    }
+    setSecondaryMetricsResults: (results: CachedNewExperimentQueryResponse[]) => {
+        results: CachedNewExperimentQueryResponse[]
+    }
+    setSecondaryMetricsResultsErrors: (errors: any[]) => {
+        errors: any[]
+    }
+    setSecondaryMetricsResultsLoading: (loading: boolean) => {
+        loading: boolean
+    }
+    setShowNotificationOffer: (show: boolean) => {
+        show: boolean
+    }
+    setTrendsExposureMetric: ({
+        uuid,
+        name,
+        series,
+        filterTestAccounts,
+        isSecondary,
+    }: {
+        filterTestAccounts?: boolean
+        isSecondary?: boolean
+        name?: string
+        series?: AnyEntityNode[]
+        uuid: string
+    }) => {
+        filterTestAccounts: boolean | undefined
+        isSecondary: boolean
+        name: string | undefined
+        series: AnyEntityNode[] | undefined
+        uuid: string
+    }
+    setTrendsMetric: ({
+        uuid,
+        name,
+        series,
+        filterTestAccounts,
+        isSecondary,
+    }: {
+        filterTestAccounts?: boolean
+        isSecondary?: boolean
+        name?: string
+        series?: AnyEntityNode[]
+        uuid: string
+    }) => {
+        filterTestAccounts: boolean | undefined
+        isSecondary: boolean
+        name: string | undefined
+        series: AnyEntityNode[] | undefined
+        uuid: string
+    }
+    setUnfreezeExposureLoading: (loading: boolean) => {
+        loading: boolean
+    }
+    setUnmodifiedExperiment: (experiment: Experiment) => {
+        experiment: Experiment
+    }
+    setValidExistingFeatureFlag: (featureFlag: FeatureFlagType | null) => {
+        featureFlag: FeatureFlagType | null
+    }
+    setVariantExcluded: (
+        variantKey: string,
+        excluded: boolean
+    ) => {
+        excluded: boolean
+        variantKey: string
+    }
+    stopAutoRefreshInterval: () => {
+        value: true
+    }
+    submitExperiment: () => {
+        value: boolean
+    }
+    submitExperimentFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitExperimentRequest: (experiment: Experiment) => {
+        experiment: Experiment
+    }
+    submitExperimentSuccess: (experiment: Experiment) => {
+        experiment: Experiment
+    }
+    subscribeToResultsNotification: () => {
+        value: true
+    }
+    toggleDebugPanel: () => {
+        value: true
+    }
+    touchExperimentField: (key: string) => {
+        key: string
+    }
+    unarchiveExperiment: () => {
+        value: true
+    }
+    unfreezeExposure: () => {
+        value: true
+    }
+    updateDistribution: (
+        variants: MultivariateFlagVariant[],
+        rolloutPercentage?: number
+    ) => {
+        rolloutPercentage: number | undefined
+        variants: MultivariateFlagVariant[]
+    }
+    updateExperiment: (update: ExperimentUpdatePayload) => ExperimentUpdatePayload
+    updateExperimentCollectionGoal: () => {
+        value: true
+    }
+    updateExperimentFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateExperimentMetrics: () => {
+        value: true
+    }
+    updateExperimentSettings: (update: Partial<Experiment>) => {
+        update: Partial<Experiment>
+    }
+    updateExperimentSuccess: (
+        experimentUpdate: Experiment,
+        payload?: ExperimentUpdatePayload
+    ) => {
+        experimentUpdate: Experiment
+        payload?: ExperimentUpdatePayload
+    }
+    updateExperimentVariantImages: (variantPreviewMediaIds: Record<string, string[]>) => {
+        variantPreviewMediaIds: Record<string, string[]>
+    }
+    updateExperimentVariantNotes: (variantNotes: Record<string, string>) => {
+        variantNotes: Record<string, string>
+    }
+    updateExposureCriteria: () => {
+        value: true
+    }
+    updateMetricBreakdown: (
+        uuid: string,
+        breakdown: Breakdown
+    ) => {
+        breakdown: Breakdown
+        uuid: string
+    }
+    validateFeatureFlag: (featureFlagKey: string) => {
+        featureFlagKey: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface experimentLogicMeta {
+    key: ExperimentIdType
+    __keaTypeGenInternalSelectorTypes: {
+        props: (arg: any) => any
+        experimentId: (arg: any) => Experiment['id']
+        formMode: (arg: any) => FormModes
+        isExperimentDraft: (experiment: Experiment) => boolean
+        isExperimentLaunched: (experiment: Experiment) => boolean
+        isExperimentRunning: (experiment: Experiment) => boolean
+        isFlagActive: (experiment: Experiment) => boolean
+        isExperimentStopped: (experiment: Experiment) => boolean
+        variants: (experiment: Experiment) => MultivariateFlagVariant[]
+        excludedVariants: (experiment: Experiment) => string[]
+        experimentMathAggregationForTrends: (
+            experiment: Experiment
+        ) => () => CountPerActorMathType | PropertyMathType | undefined
+        minimumDetectableEffect: (experiment: Experiment, defaultMinimumDetectableEffect: number) => number
+        recommendedSampleSize: (
+            conversionMetrics: FunnelTimeConversionMetrics,
+            variants: MultivariateFlagVariant[],
+            minimumDetectableEffect: number
+        ) => number
+        recommendedRunningTime: (
+            experiment: Experiment,
+            variants: MultivariateFlagVariant[],
+            getInsightType: (
+                metric: ExperimentFunnelsQuery | ExperimentMetricUnion | ExperimentTrendsQuery | undefined
+            ) => InsightType,
+            firstPrimaryMetric: ExperimentFunnelsQuery | ExperimentMetricUnion | ExperimentTrendsQuery | undefined,
+            funnelResults: FunnelResultType,
+            conversionMetrics: FunnelTimeConversionMetrics,
+            trendResults: TrendResult[],
+            minimumDetectableEffect: number
+        ) => number
+        actualRunningTime: (experiment: Experiment) => number
+        isSingleVariantShipped: (experiment: Experiment) => boolean
+        shippedVariantKey: (experiment: Experiment) => string | null
+        experimentWarning: (
+            experiment: Experiment,
+            isExperimentRunning: boolean,
+            isExperimentDraft: boolean,
+            isFlagActive: boolean,
+            isSingleVariantShipped: boolean,
+            shippedVariantKey: string | null
+        ) => ExperimentWarning | null
+        hasPrimaryMetricSet: (primaryMetricsLengthWithSharedMetrics: number) => boolean
+        firstPrimaryMetric: (
+            experiment: Experiment
+        ) => ExperimentFunnelsQuery | ExperimentMetric | ExperimentTrendsQuery | undefined
+        primaryMetricsLengthWithSharedMetrics: (experiment: Experiment) => number
+        secondaryMetricsLengthWithSharedMetrics: (experiment: Experiment) => number
+        compatibleSharedMetrics: (sharedMetrics: SharedMetric[], usesNewQueryRunner: boolean) => SharedMetric[]
+        usesNewQueryRunner: (experiment: Experiment) => boolean
+        hasMinimumExposureForResults: (exposures: any, usesNewQueryRunner: boolean) => boolean
+        exposureCriteria: (experiment: Experiment) => ExperimentExposureCriteria | undefined
+        getOrderedMetricsWithResults: (
+            experiment: Experiment,
+            primaryMetricsResults: CachedNewExperimentQueryResponse[],
+            primaryMetricsResultsErrors: any[],
+            secondaryMetricsResults: CachedNewExperimentQueryResponse[],
+            secondaryMetricsResultsErrors: any[]
+        ) => (isSecondary: boolean) => {
+            displayIndex: number
+            error: any
+            metric: ExperimentMetricUnion
+            metricIndex: number
+            result: any
+        }[]
+        orderedPrimaryMetricsWithResults: (
+            getOrderedMetricsWithResults: (isSecondary: boolean) => {
+                displayIndex: number
+                error: any
+                metric: ExperimentMetricUnion
+                metricIndex: number
+                result: any
+            }[]
+        ) => {
+            displayIndex: number
+            error: any
+            metric: ExperimentMetricUnion
+            metricIndex: number
+            result: any
+        }[]
+        orderedSecondaryMetricsWithResults: (
+            getOrderedMetricsWithResults: (isSecondary: boolean) => {
+                displayIndex: number
+                error: any
+                metric: ExperimentMetricUnion
+                metricIndex: number
+                result: any
+            }[]
+        ) => {
+            displayIndex: number
+            error: any
+            metric: ExperimentMetricUnion
+            metricIndex: number
+            result: any
+        }[]
+        statsMethod: (experiment: Experiment) => ExperimentStatsMethod
+    }
+}
+
+export type experimentLogicType = MakeLogicType<
+    experimentLogicValues,
+    experimentLogicActions,
+    ExperimentLogicProps,
+    experimentLogicMeta
+>
+
 export const experimentLogic = kea<experimentLogicType>([
     props({} as ExperimentLogicProps),
     key((props) => props.experimentId ?? 'new'),
@@ -2632,42 +3565,45 @@ export const experimentLogic = kea<experimentLogicType>([
         ],
         isExperimentDraft: [
             (s) => [s.experiment],
-            (experiment): boolean => {
+            (experiment: Experiment): boolean => {
                 return !!experiment && !isLaunched(experiment) && !experiment.archived
             },
         ],
         isExperimentLaunched: [
             (s) => [s.experiment],
-            (experiment): boolean => {
+            (experiment: Experiment): boolean => {
                 return !!experiment && isLaunched(experiment)
             },
         ],
         isExperimentRunning: [
             (s) => [s.experiment],
-            (experiment): boolean => {
+            (experiment: Experiment): boolean => {
                 return isLaunched(experiment) && !hasEnded(experiment)
             },
         ],
         isFlagActive: [
             (s) => [s.experiment],
-            (experiment): boolean => {
+            (experiment: Experiment): boolean => {
                 return !!experiment?.feature_flag?.active
             },
         ],
         isExperimentStopped: [
             (s) => [s.experiment],
-            (experiment): boolean => {
+            (experiment: Experiment): boolean => {
                 return hasEnded(experiment) && !experiment.archived
             },
         ],
-        variants: [(s) => [s.experiment], (experiment): MultivariateFlagVariant[] => getExperimentVariants(experiment)],
+        variants: [
+            (s) => [s.experiment],
+            (experiment: Experiment): MultivariateFlagVariant[] => getExperimentVariants(experiment),
+        ],
         excludedVariants: [
             (s) => [s.experiment],
             (experiment: Experiment): string[] => experiment?.excluded_variants ?? [],
         ],
         experimentMathAggregationForTrends: [
             (s) => [s.experiment],
-            (experiment) => (): PropertyMathType | CountPerActorMathType | undefined => {
+            (experiment: Experiment) => (): PropertyMathType | CountPerActorMathType | undefined => {
                 const query = experiment?.metrics?.[0] as ExperimentTrendsQuery
                 if (!query) {
                     return undefined
@@ -2693,7 +3629,7 @@ export const experimentLogic = kea<experimentLogicType>([
         ],
         minimumDetectableEffect: [
             (s) => [s.experiment, s.defaultMinimumDetectableEffect],
-            (newExperiment, defaultMinimumDetectableEffect): number => {
+            (newExperiment: Experiment, defaultMinimumDetectableEffect: number): number => {
                 return (
                     newExperiment?.running_time_calculation?.minimum_detectable_effect ?? defaultMinimumDetectableEffect
                 )
@@ -2701,7 +3637,11 @@ export const experimentLogic = kea<experimentLogicType>([
         ],
         recommendedSampleSize: [
             (s) => [s.conversionMetrics, s.variants, s.minimumDetectableEffect],
-            (conversionMetrics, variants, minimumDetectableEffect): number => {
+            (
+                conversionMetrics: import('~/types').FunnelTimeConversionMetrics,
+                variants: MultivariateFlagVariant[],
+                minimumDetectableEffect: number
+            ): number => {
                 const conversionRate = conversionMetrics.totalRate * 100
                 const sampleSizePerVariant = legacyMinimumSampleSizePerVariant(minimumDetectableEffect, conversionRate)
                 const sampleSize = sampleSizePerVariant * variants.length
@@ -2720,14 +3660,20 @@ export const experimentLogic = kea<experimentLogicType>([
                 s.minimumDetectableEffect,
             ],
             (
-                experiment,
-                variants,
-                getInsightType,
-                firstPrimaryMetric,
-                funnelResults,
-                conversionMetrics,
-                trendResults,
-                minimumDetectableEffect
+                experiment: Experiment,
+                variants: MultivariateFlagVariant[],
+                getInsightType: (
+                    metric:
+                        | ExperimentFunnelsQuery
+                        | ExperimentTrendsQuery
+                        | import('~/queries/schema/schema-general').ExperimentMetricUnion
+                        | undefined
+                ) => InsightType,
+                firstPrimaryMetric: ExperimentFunnelsQuery | ExperimentMetric | ExperimentTrendsQuery | undefined,
+                funnelResults: import('~/types').FunnelResultType,
+                conversionMetrics: import('~/types').FunnelTimeConversionMetrics,
+                trendResults: import('~/types').TrendResult[],
+                minimumDetectableEffect: number
             ): number => {
                 if (getInsightType(firstPrimaryMetric) === InsightType.FUNNELS) {
                     const currentDuration = dayjs().diff(dayjs(experiment?.start_date), 'hour')
@@ -2832,7 +3778,7 @@ export const experimentLogic = kea<experimentLogicType>([
         ],
         hasPrimaryMetricSet: [
             (s) => [s.primaryMetricsLengthWithSharedMetrics],
-            (primaryMetricsLengthWithSharedMetrics): boolean => {
+            (primaryMetricsLengthWithSharedMetrics: number): boolean => {
                 return primaryMetricsLengthWithSharedMetrics > 0
             },
         ],
@@ -2937,11 +3883,11 @@ export const experimentLogic = kea<experimentLogicType>([
                 s.secondaryMetricsResultsErrors,
             ],
             (
-                experiment,
-                primaryMetricsResults,
-                primaryMetricsResultsErrors,
-                secondaryMetricsResults,
-                secondaryMetricsResultsErrors
+                experiment: Experiment,
+                primaryMetricsResults: CachedNewExperimentQueryResponse[],
+                primaryMetricsResultsErrors: any[],
+                secondaryMetricsResults: CachedNewExperimentQueryResponse[],
+                secondaryMetricsResultsErrors: any[]
             ) =>
                 (isSecondary: boolean) =>
                     getOrderedMetricsWithResults(
@@ -2955,11 +3901,27 @@ export const experimentLogic = kea<experimentLogicType>([
         ],
         orderedPrimaryMetricsWithResults: [
             (s) => [s.getOrderedMetricsWithResults],
-            (getOrderedMetricsWithResults) => getOrderedMetricsWithResults(false),
+            (
+                getOrderedMetricsWithResults: (isSecondary: boolean) => {
+                    displayIndex: number
+                    error: any
+                    metric: import('~/queries/schema/schema-general').ExperimentMetricUnion
+                    metricIndex: number
+                    result: any
+                }[]
+            ) => getOrderedMetricsWithResults(false),
         ],
         orderedSecondaryMetricsWithResults: [
             (s) => [s.getOrderedMetricsWithResults],
-            (getOrderedMetricsWithResults) => getOrderedMetricsWithResults(true),
+            (
+                getOrderedMetricsWithResults: (isSecondary: boolean) => {
+                    displayIndex: number
+                    error: any
+                    metric: import('~/queries/schema/schema-general').ExperimentMetricUnion
+                    metricIndex: number
+                    result: any
+                }[]
+            ) => getOrderedMetricsWithResults(true),
         ],
         statsMethod: [
             (s) => [s.experiment],
diff --git a/frontend/src/scenes/experiments/experimentMetricsLogic.ts b/frontend/src/scenes/experiments/experimentMetricsLogic.ts
index b803543c904c..5a2846c30c5d 100644
--- a/frontend/src/scenes/experiments/experimentMetricsLogic.ts
+++ b/frontend/src/scenes/experiments/experimentMetricsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 
 import { lemonToast } from '@posthog/lemon-ui'
 
@@ -20,7 +20,8 @@ import type {
     TriggerEnumApi,
 } from 'products/experiments/frontend/generated/api.schemas'
 
-import type { experimentMetricsLogicType } from './experimentMetricsLogicType'
+import type { FeatureFlagsSet } from '../../lib/logic/featureFlagLogic'
+import type { ExperimentIdType } from '../../types'
 import { isLaunched } from './experimentsLogic'
 
 type ExperimentSavedMetric = {
@@ -136,6 +137,135 @@ const resolveErrorByUuid = (recalculation: ExperimentMetricsRecalculationApi): R
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface experimentMetricsLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    currentProjectId: number | null // projectLogic
+    currentRecalculation: ExperimentMetricsRecalculationApi | null
+    isMetricRecalculating: (metricUuid: string | undefined) => boolean
+    isRecalculating: boolean
+    lastRefresh: string | null
+    primaryMetricsResults: CachedNewExperimentQueryResponse[]
+    primaryMetricsResultsErrors: (unknown | null)[]
+    recalculatingMetricUuids: string[]
+    recalculationDisplayState: 'cold' | 'initial' | 'partial' | 'refreshing' | 'resting'
+    recalculationLoading: boolean
+    recalculationProgress: {
+        completed: number
+        total: number
+    }
+    secondaryMetricsResults: CachedNewExperimentQueryResponse[]
+    secondaryMetricsResultsErrors: (unknown | null)[]
+    totalMetricsCount: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface experimentMetricsLogicActions {
+    reportExperimentMetricRecalculation: (
+        status: 'completed' | 'failed' | 'triggered',
+        properties: {
+            duration_ms?: number
+            experiment_id: number
+            failed?: number
+            is_existing?: boolean
+            poll_count?: number
+            recalculation_id: string | null
+            succeeded?: number
+            total_metrics?: number
+            trigger?:
+                | 'auto_refresh'
+                | 'cold_run'
+                | 'config_change'
+                | 'experiment_launch'
+                | 'experiment_stop'
+                | 'experiment_update'
+                | 'manual'
+                | 'stale_refresh'
+        }
+    ) => {
+        properties: {
+            duration_ms?: number | undefined
+            experiment_id: number
+            failed?: number | undefined
+            is_existing?: boolean | undefined
+            poll_count?: number | undefined
+            recalculation_id: string | null
+            succeeded?: number | undefined
+            total_metrics?: number | undefined
+            trigger?:
+                | 'auto_refresh'
+                | 'cold_run'
+                | 'config_change'
+                | 'experiment_launch'
+                | 'experiment_stop'
+                | 'experiment_update'
+                | 'manual'
+                | 'stale_refresh'
+                | undefined
+        }
+        status: 'completed' | 'failed' | 'triggered'
+    } // eventUsageLogic
+    loadLatestRecalculation: () => {
+        value: true
+    }
+    pollRecalculation: (recalculationId: string) => {
+        recalculationId: string
+    }
+    setCurrentRecalculation: (recalculation: ExperimentMetricsRecalculationApi | null) => {
+        recalculation: ExperimentMetricsRecalculationApi | null
+    }
+    setPrimaryMetricsResults: (results: CachedNewExperimentQueryResponse[]) => {
+        results: CachedNewExperimentQueryResponse[]
+    }
+    setPrimaryMetricsResultsErrors: (errors: (unknown | null)[]) => {
+        errors: unknown[]
+    }
+    setRecalculatingMetricUuids: (uuids: string[]) => {
+        uuids: string[]
+    }
+    setRecalculationLoading: (loading: boolean) => {
+        loading: boolean
+    }
+    setSecondaryMetricsResults: (results: CachedNewExperimentQueryResponse[]) => {
+        results: CachedNewExperimentQueryResponse[]
+    }
+    setSecondaryMetricsResultsErrors: (errors: (unknown | null)[]) => {
+        errors: unknown[]
+    }
+    triggerRecalculation: (trigger?: TriggerEnumApi) => {
+        trigger: TriggerEnumApi
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface experimentMetricsLogicMeta {
+    key: ExperimentIdType
+    __keaTypeGenInternalSelectorTypes: {
+        isRecalculating: (
+            recalculationLoading: boolean,
+            currentRecalculation: ExperimentMetricsRecalculationApi | null
+        ) => boolean
+        recalculationProgress: (currentRecalculation: ExperimentMetricsRecalculationApi | null) => {
+            completed: number
+            total: number
+        }
+        totalMetricsCount: (arg: any) => number
+        lastRefresh: (currentRecalculation: ExperimentMetricsRecalculationApi | null) => string | null
+        recalculationDisplayState: (
+            recalculationLoading: boolean,
+            currentRecalculation: ExperimentMetricsRecalculationApi | null
+        ) => 'cold' | 'initial' | 'partial' | 'refreshing' | 'resting'
+        isMetricRecalculating: (recalculatingMetricUuids: string[]) => (metricUuid: string | undefined) => boolean
+    }
+}
+
+export type experimentMetricsLogicType = MakeLogicType<
+    experimentMetricsLogicValues,
+    experimentMetricsLogicActions,
+    ExperimentMetricsLogicProps,
+    experimentMetricsLogicMeta
+>
+
 export const experimentMetricsLogic = kea<experimentMetricsLogicType>([
     props({} as ExperimentMetricsLogicProps),
     key((props) => props.experiment.id),
@@ -207,7 +337,7 @@ export const experimentMetricsLogic = kea<experimentMetricsLogicType>([
         // True while a recalculation is being fetched or is still running.
         isRecalculating: [
             (s) => [s.recalculationLoading, s.currentRecalculation],
-            (recalculationLoading, recalculation): boolean =>
+            (recalculationLoading: boolean, recalculation: ExperimentMetricsRecalculationApi | null): boolean =>
                 recalculationLoading ||
                 recalculation?.status === RECALCULATION_STATUSES.pending ||
                 recalculation?.status === RECALCULATION_STATUSES.in_progress,
@@ -216,7 +346,7 @@ export const experimentMetricsLogic = kea<experimentMetricsLogicType>([
             (s) => [s.currentRecalculation],
             // "completed" here means resolved: a failed metric is done too, so it counts toward progress.
             // Without this, a run where every metric fails sits at 0/N forever and looks stuck.
-            (recalc): { completed: number; total: number } => ({
+            (recalc: ExperimentMetricsRecalculationApi | null): { completed: number; total: number } => ({
                 completed: (recalc?.completed_metrics ?? 0) + (recalc?.failed_metrics ?? 0),
                 total: recalc?.total_metrics ?? 0,
             }),
@@ -228,10 +358,16 @@ export const experimentMetricsLogic = kea<experimentMetricsLogicType>([
             (experiment: Experiment): number =>
                 metricsInOrder(experiment, 'primary').length + metricsInOrder(experiment, 'secondary').length,
         ],
-        lastRefresh: [(s) => [s.currentRecalculation], (recalc): string | null => recalc?.query_to ?? null],
+        lastRefresh: [
+            (s) => [s.currentRecalculation],
+            (recalc: ExperimentMetricsRecalculationApi | null): string | null => recalc?.query_to ?? null,
+        ],
         recalculationDisplayState: [
             (s) => [s.recalculationLoading, s.currentRecalculation],
-            (recalculationLoading, recalculation): 'initial' | 'cold' | 'refreshing' | 'partial' | 'resting' => {
+            (
+                recalculationLoading: boolean,
+                recalculation: ExperimentMetricsRecalculationApi | null
+            ): 'initial' | 'cold' | 'refreshing' | 'partial' | 'resting' => {
                 if (!recalculation) {
                     return recalculationLoading ? 'initial' : 'resting'
                 }
@@ -248,7 +384,7 @@ export const experimentMetricsLogic = kea<experimentMetricsLogicType>([
         // Predicate the table uses to dim a metric whose stale value is still being refreshed.
         isMetricRecalculating: [
             (s) => [s.recalculatingMetricUuids],
-            (uuids): ((metricUuid: string | undefined) => boolean) => {
+            (uuids: string[]): ((metricUuid: string | undefined) => boolean) => {
                 const recalculating = new Set(uuids)
                 return (metricUuid) => !!metricUuid && recalculating.has(metricUuid)
             },
diff --git a/frontend/src/scenes/experiments/experimentResultsNotificationLogic.ts b/frontend/src/scenes/experiments/experimentResultsNotificationLogic.ts
index d8ff9113ce53..42c48141d6ed 100644
--- a/frontend/src/scenes/experiments/experimentResultsNotificationLogic.ts
+++ b/frontend/src/scenes/experiments/experimentResultsNotificationLogic.ts
@@ -1,17 +1,48 @@
-import { actions, connect, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers } from 'kea'
 import { subscriptions } from 'kea-subscriptions'
 
 import { lemonToast } from '@posthog/lemon-ui'
 
 import { Experiment } from '~/types'
 
+import type { ExperimentIdType } from '../../types'
 import { experimentMetricsLogic } from './experimentMetricsLogic'
-import type { experimentResultsNotificationLogicType } from './experimentResultsNotificationLogicType'
 
 export interface ExperimentResultsNotificationLogicProps {
     experiment: Experiment
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface experimentResultsNotificationLogicValues {
+    isRecalculating: boolean // experimentMetricsLogic
+    notifyWhenResultsReady: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface experimentResultsNotificationLogicActions {
+    notifyResultsReady: () => {
+        value: true
+    }
+    setNotifyWhenResultsReady: (notify: boolean) => {
+        notify: boolean
+    }
+    subscribeToResultsNotification: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface experimentResultsNotificationLogicMeta {
+    key: ExperimentIdType
+}
+
+export type experimentResultsNotificationLogicType = MakeLogicType<
+    experimentResultsNotificationLogicValues,
+    experimentResultsNotificationLogicActions,
+    ExperimentResultsNotificationLogicProps,
+    experimentResultsNotificationLogicMeta
+>
+
 /**
  * Browser notification for the recalculation flow: the status bar's "Notify me" button opts in, and a
  * notification fires when the run finishes. Driven entirely by `experimentMetricsLogic.isRecalculating`
diff --git a/frontend/src/scenes/experiments/experimentSceneLogic.tsx b/frontend/src/scenes/experiments/experimentSceneLogic.tsx
index cd178afa73c0..15bb6cbfe404 100644
--- a/frontend/src/scenes/experiments/experimentSceneLogic.tsx
+++ b/frontend/src/scenes/experiments/experimentSceneLogic.tsx
@@ -1,4 +1,16 @@
-import { BuiltLogic, actions, kea, listeners, path, props, reducers, selectors, sharedListeners } from 'kea'
+import {
+    MakeLogicType,
+    BuiltLogic,
+    actions,
+    kea,
+    listeners,
+    path,
+    props,
+    reducers,
+    selectors,
+    sharedListeners,
+} from 'kea'
+import type { BreakPointFunction } from 'kea'
 import { router, urlToAction } from 'kea-router'
 
 import { trackedActionToUrl } from 'lib/logic/scenes/trackedActionToUrl'
@@ -9,14 +21,115 @@ import { urls } from 'scenes/urls'
 import { SIDE_PANEL_CONTEXT_KEY, SidePanelSceneContext } from '~/layout/navigation-3000/sidepanel/types'
 import { ActivityScope, Breadcrumb, Experiment, ProjectTreeRef } from '~/types'
 
+import type { ExperimentIdType } from '../../types'
 import { NEW_EXPERIMENT } from './constants'
 import { type ExperimentLogicProps, FORM_MODES, type FormModes, experimentLogic } from './experimentLogic'
-import type { experimentLogicType } from './experimentLogicType'
-import type { experimentSceneLogicType } from './experimentSceneLogicType'
+import type { experimentLogicType } from './experimentLogic'
 import { stepStorageKey } from './ExperimentWizard/experimentWizardLogic'
 
 export interface ExperimentSceneLogicProps extends ExperimentLogicProps {}
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface experimentSceneLogicValues {
+    activeTabKey: string
+    breadcrumbs: Breadcrumb[]
+    experiment: Experiment
+    experimentId: ExperimentIdType
+    experimentLogicRef: {
+        logic: BuiltLogic<experimentLogicType>
+        props: ExperimentLogicProps
+        unmount: () => void
+    } | null
+    experimentMissing: boolean
+    experimentMissingSelector: ((state: any, props?: ExperimentLogicProps | undefined) => boolean) | undefined
+    experimentSelector: ((state: any, props?: ExperimentLogicProps | undefined) => Experiment) | undefined
+    formMode: FormModes
+    isExperimentLaunched: boolean
+    isExperimentLaunchedSelector: ((state: any, props?: ExperimentLogicProps | undefined) => boolean) | undefined
+    projectTreeRef: ProjectTreeRef
+    sidePanelContext: SidePanelSceneContext | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface experimentSceneLogicActions {
+    resetExperimentState: (experimentConfig: Experiment) => {
+        experimentConfig: Experiment
+    }
+    setActiveTabKey: (activeTabKey: string) => {
+        activeTabKey: string
+    }
+    setEditMode: (editing: boolean) => {
+        editing: boolean
+    }
+    setExperimentLogicRef: (
+        logic: BuiltLogic<experimentLogicType> | null,
+        unmount: (() => void) | null,
+        logicProps: ExperimentLogicProps | null
+    ) => {
+        logic: BuiltLogic<experimentLogicType> | null
+        logicProps: ExperimentLogicProps | null
+        unmount: (() => void) | null
+    }
+    setSceneState: (
+        experimentId: Experiment['id'],
+        formMode: FormModes
+    ) => {
+        experimentId: ExperimentIdType
+        formMode: FormModes
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface experimentSceneLogicMeta {
+    sharedListeners: {
+        ensureExperimentLogicMounted: (
+            payload: any,
+            breakpoint: BreakPointFunction,
+            action: {
+                type: string
+                payload: any
+            },
+            previousState: any
+        ) => void | Promise<void>
+    }
+    __keaTypeGenInternalSelectorTypes: {
+        experimentSelector: (
+            experimentLogicRef: {
+                logic: BuiltLogic<experimentLogicType>
+                props: ExperimentLogicProps
+                unmount: () => void
+            } | null
+        ) => ((state: any, props?: ExperimentLogicProps | undefined) => Experiment) | undefined
+        experiment: (arg: Experiment | null | undefined) => Experiment
+        experimentMissingSelector: (
+            experimentLogicRef: {
+                logic: BuiltLogic<experimentLogicType>
+                props: ExperimentLogicProps
+                unmount: () => void
+            } | null
+        ) => ((state: any, props?: ExperimentLogicProps | undefined) => boolean) | undefined
+        experimentMissing: (arg: boolean | undefined) => boolean
+        isExperimentLaunchedSelector: (
+            experimentLogicRef: {
+                logic: BuiltLogic<experimentLogicType>
+                props: ExperimentLogicProps
+                unmount: () => void
+            } | null
+        ) => ((state: any, props?: ExperimentLogicProps | undefined) => boolean) | undefined
+        isExperimentLaunched: (arg: boolean | undefined) => boolean
+        breadcrumbs: (experiment: Experiment, experimentId: ExperimentIdType) => Breadcrumb[]
+        sidePanelContext: (experimentId: ExperimentIdType) => SidePanelSceneContext | null
+        projectTreeRef: (experimentId: ExperimentIdType) => ProjectTreeRef
+    }
+}
+
+export type experimentSceneLogicType = MakeLogicType<
+    experimentSceneLogicValues,
+    experimentSceneLogicActions,
+    ExperimentSceneLogicProps,
+    experimentSceneLogicMeta
+>
+
 export const experimentSceneLogic = kea<experimentSceneLogicType>([
     props({} as ExperimentSceneLogicProps),
     path(['scenes', 'experiments', 'experimentSceneLogic']),
@@ -70,7 +183,13 @@ export const experimentSceneLogic = kea<experimentSceneLogicType>([
     selectors({
         experimentSelector: [
             (s) => [s.experimentLogicRef],
-            (experimentLogicRef) => experimentLogicRef?.logic.selectors.experiment,
+            (
+                experimentLogicRef: {
+                    logic: BuiltLogic<experimentLogicType>
+                    props: ExperimentLogicProps
+                    unmount: () => void
+                } | null
+            ) => experimentLogicRef?.logic.selectors.experiment,
         ],
         experiment: [
             (s) => [
@@ -82,11 +201,17 @@ export const experimentSceneLogic = kea<experimentSceneLogicType>([
                     }
                 },
             ],
-            (experiment): Experiment => (experiment ?? NEW_EXPERIMENT) as Experiment,
+            (experiment: Experiment | null | undefined): Experiment => (experiment ?? NEW_EXPERIMENT) as Experiment,
         ],
         experimentMissingSelector: [
             (s) => [s.experimentLogicRef],
-            (experimentLogicRef) => experimentLogicRef?.logic.selectors.experimentMissing,
+            (
+                experimentLogicRef: {
+                    logic: BuiltLogic<experimentLogicType>
+                    props: ExperimentLogicProps
+                    unmount: () => void
+                } | null
+            ) => experimentLogicRef?.logic.selectors.experimentMissing,
         ],
         experimentMissing: [
             (s) => [
@@ -98,11 +223,17 @@ export const experimentSceneLogic = kea<experimentSceneLogicType>([
                     }
                 },
             ],
-            (experimentMissing): boolean => experimentMissing ?? false,
+            (experimentMissing: boolean | undefined): boolean => experimentMissing ?? false,
         ],
         isExperimentLaunchedSelector: [
             (s) => [s.experimentLogicRef],
-            (experimentLogicRef) => experimentLogicRef?.logic.selectors.isExperimentLaunched,
+            (
+                experimentLogicRef: {
+                    logic: BuiltLogic<experimentLogicType>
+                    props: ExperimentLogicProps
+                    unmount: () => void
+                } | null
+            ) => experimentLogicRef?.logic.selectors.isExperimentLaunched,
         ],
         isExperimentLaunched: [
             (s) => [
@@ -114,7 +245,7 @@ export const experimentSceneLogic = kea<experimentSceneLogicType>([
                     }
                 },
             ],
-            (isExperimentLaunched): boolean => isExperimentLaunched ?? false,
+            (isExperimentLaunched: boolean | undefined): boolean => isExperimentLaunched ?? false,
         ],
         breadcrumbs: [
             (s) => [s.experiment, s.experimentId],
diff --git a/frontend/src/scenes/experiments/experimentTabLogic.ts b/frontend/src/scenes/experiments/experimentTabLogic.ts
index b4bd07bdb1fe..e01389cae091 100644
--- a/frontend/src/scenes/experiments/experimentTabLogic.ts
+++ b/frontend/src/scenes/experiments/experimentTabLogic.ts
@@ -1,4 +1,4 @@
-import { afterMount, connect, kea, key, path, props } from 'kea'
+import { MakeLogicType, afterMount, connect, kea, key, path, props } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -6,12 +6,48 @@ import { teamLogic } from 'scenes/teamLogic'
 
 import type { Experiment } from '~/types'
 
-import type { experimentTabLogicType } from './experimentTabLogicType'
-
 export interface ExperimentTabLogicProps {
     featureFlagId: number
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface experimentTabLogicValues {
+    currentProjectId: number | string // teamLogic
+    relatedExperiments: Experiment[]
+    relatedExperimentsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface experimentTabLogicActions {
+    loadRelatedExperiments: () => any
+    loadRelatedExperimentsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRelatedExperimentsSuccess: (
+        relatedExperiments: Experiment[],
+        payload?: any
+    ) => {
+        relatedExperiments: Experiment[]
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface experimentTabLogicMeta {
+    key: number
+}
+
+export type experimentTabLogicType = MakeLogicType<
+    experimentTabLogicValues,
+    experimentTabLogicActions,
+    ExperimentTabLogicProps,
+    experimentTabLogicMeta
+>
+
 export const experimentTabLogic = kea<experimentTabLogicType>([
     path(['scenes', 'experiments', 'experimentTabLogic']),
     props({} as ExperimentTabLogicProps),
diff --git a/frontend/src/scenes/experiments/experimentTimeseriesLogic.ts b/frontend/src/scenes/experiments/experimentTimeseriesLogic.ts
index c356b7b83ff1..2bd50f20d842 100644
--- a/frontend/src/scenes/experiments/experimentTimeseriesLogic.ts
+++ b/frontend/src/scenes/experiments/experimentTimeseriesLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, props, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, props, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -19,7 +19,7 @@ import {
 } from '~/queries/schema/schema-general'
 import { Experiment, ExperimentIdType } from '~/types'
 
-import type { experimentTimeseriesLogicType } from './experimentTimeseriesLogicType'
+import type { ExperimentMetricUnion } from '../../queries/schema/schema-general'
 import { COLORS } from './MetricsView/shared/colors'
 import { getMetricColors, getVariantInterval } from './MetricsView/shared/utils'
 import { getExperimentVariants } from './utils'
@@ -59,6 +59,117 @@ export interface ExperimentTimeseriesLogicProps {
     metric: ExperimentMetric | undefined
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface experimentTimeseriesLogicValues {
+    currentProjectId: number | string // teamLogic
+    chartData: (variantKey: string) => ProcessedChartData | null
+    hasTimeseriesData: boolean
+    isRecalculating: boolean
+    processedVariantData: (variantKey: string) => ProcessedTimeseriesDataPoint[]
+    progressMessage: string | null
+    timeseries: ExperimentMetricTimeseries | null
+    timeseriesLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface experimentTimeseriesLogicActions {
+    reportExperimentTimeseriesRecalculated: (
+        experimentId: ExperimentIdType,
+        metric: ExperimentMetricUnion
+    ) => {
+        experimentId: ExperimentIdType
+        metric: ExperimentMetricUnion
+    } // eventUsageLogic
+    clearTimeseries: () => {
+        value: true
+    }
+    clearTimeseriesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    clearTimeseriesSuccess: (
+        timeseries: null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        timeseries: null
+        payload?: {
+            value: true
+        }
+    }
+    loadTimeseries: ({ metric }: { metric: ExperimentMetric }) => {
+        metric: ExperimentMetric
+    }
+    loadTimeseriesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadTimeseriesSuccess: (
+        timeseries: ExperimentMetricTimeseries | null,
+        payload?: {
+            metric: ExperimentMetric
+        }
+    ) => {
+        timeseries: ExperimentMetricTimeseries | null
+        payload?: {
+            metric: ExperimentMetric
+        }
+    }
+    recalculateTimeseries: ({ metric }: { metric: ExperimentMetric }) => {
+        metric: ExperimentMetricUnion
+    }
+    recalculateTimeseriesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    recalculateTimeseriesSuccess: (
+        timeseries: null,
+        payload?: {
+            metric: ExperimentMetricUnion
+        }
+    ) => {
+        timeseries: null
+        payload?: {
+            metric: ExperimentMetricUnion
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface experimentTimeseriesLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        isRecalculating: (timeseries: ExperimentMetricTimeseries | null) => boolean
+        processedVariantData: (
+            timeseries: ExperimentMetricTimeseries | null
+        ) => (variantKey: string) => ProcessedTimeseriesDataPoint[]
+        progressMessage: (timeseries: ExperimentMetricTimeseries | null) => string | null
+        hasTimeseriesData: (timeseries: ExperimentMetricTimeseries | null) => boolean
+        chartData: (
+            processedVariantData: (variantKey: string) => ProcessedTimeseriesDataPoint[],
+            timeseries: ExperimentMetricTimeseries | null,
+            experiment: Experiment,
+            metric: ExperimentMetricUnion | undefined
+        ) => (variantKey: string) => ProcessedChartData | null
+    }
+}
+
+export type experimentTimeseriesLogicType = MakeLogicType<
+    experimentTimeseriesLogicValues,
+    experimentTimeseriesLogicActions,
+    ExperimentTimeseriesLogicProps,
+    experimentTimeseriesLogicMeta
+>
+
 export const experimentTimeseriesLogic = kea<experimentTimeseriesLogicType>([
     props({} as ExperimentTimeseriesLogicProps),
     path((key) => ['scenes', 'experiments', 'experimentTimeseriesLogic', key]),
diff --git a/frontend/src/scenes/experiments/experimentsLogic.ts b/frontend/src/scenes/experiments/experimentsLogic.ts
index 56eab76c822f..28bcb05eef92 100644
--- a/frontend/src/scenes/experiments/experimentsLogic.ts
+++ b/frontend/src/scenes/experiments/experimentsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 
@@ -25,7 +25,7 @@ import {
     FeatureFlagType,
 } from '~/types'
 
-import type { experimentsLogicType } from './experimentsLogicType'
+import type { AvailableFeature, TeamPublicType, TeamType, UserType } from '../../types'
 import { getFlagVariants } from './utils'
 
 export const EXPERIMENTS_PER_PAGE = 100
@@ -150,6 +150,387 @@ function normalizeExperimentFilterStatus(status: string | undefined): Experiment
     return 'all'
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface experimentsLogicValues {
+    featureFlags: FeatureFlagsResult // featureFlagsLogic
+    currentProjectId: number | null // projectLogic
+    location: {
+        pathname: string
+        search: string
+        hash: string
+    } // router
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean // userLogic
+    user: UserType | null // userLogic
+    breadcrumbs: Breadcrumb[]
+    count: number
+    experiments: ExperimentsResult
+    experimentsLoading: boolean
+    experimentsStats: ExperimentVelocityStats
+    experimentsStatsLoading: boolean
+    featureFlagModalFeatureFlags: {
+        count: number
+        results: FeatureFlagType[]
+    }
+    featureFlagModalFeatureFlagsLoading: boolean
+    featureFlagModalFilters: FeatureFlagModalFilters
+    featureFlagModalPageFromURL: number
+    featureFlagModalPagination: PaginationManual
+    featureFlagModalParamsFromFilters: Record<string, any>
+    filters: ExperimentsFilters
+    hasLoadedExperiments: boolean
+    pagination: PaginationManual
+    paramsFromFilters: {
+        archived?: boolean | undefined
+        created_by_id?: number[] | undefined
+        limit: number
+        offset: number
+        order?: string | undefined
+        page?: number | undefined
+        search?: string | undefined
+        status?: ExperimentStatus | 'all' | undefined
+    }
+    shouldShowEmptyState: boolean
+    sidePanelContext: SidePanelSceneContext
+    tab: ExperimentsTabs
+    unavailableFeatureFlagKeys: Set<string>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface experimentsLogicActions {
+    loadCurrentTeamSuccess: (
+        currentTeam: TeamPublicType | null,
+        payload?: any
+    ) => {
+        currentTeam: TeamPublicType | null
+        payload?: any
+    } // teamLogic
+    updateCurrentTeamSuccess: (
+        currentTeam: TeamPublicType | TeamType,
+        payload?: Partial<TeamType> | undefined
+    ) => {
+        currentTeam: TeamPublicType | TeamType
+        payload?: Partial<TeamType>
+    } // teamLogic
+    addToExperiments: (experiment: Experiment) => Experiment
+    addToExperimentsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    addToExperimentsSuccess: (
+        experiments: {
+            count: number
+            filters?: ExperimentsFilters | null | undefined
+            next?: string | null | undefined
+            previous?: string | null | undefined
+            results: Experiment[]
+        },
+        payload?: Experiment
+    ) => {
+        experiments: {
+            count: number
+            filters?: ExperimentsFilters | null | undefined
+            next?: string | null | undefined
+            previous?: string | null | undefined
+            results: Experiment[]
+        }
+        payload?: Experiment
+    }
+    archiveExperiment: ({ id, disableFeatureFlag }: { disableFeatureFlag: boolean; id: number }) => {
+        id: number
+        disableFeatureFlag: boolean
+    }
+    archiveExperimentFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    archiveExperimentSuccess: (
+        experiments: {
+            count: number
+            filters?: ExperimentsFilters | null | undefined
+            next?: string | null | undefined
+            previous?: string | null | undefined
+            results: Experiment[]
+        },
+        payload?: {
+            id: number
+            disableFeatureFlag: boolean
+        }
+    ) => {
+        experiments: {
+            count: number
+            filters?: ExperimentsFilters | null | undefined
+            next?: string | null | undefined
+            previous?: string | null | undefined
+            results: Experiment[]
+        }
+        payload?: {
+            id: number
+            disableFeatureFlag: boolean
+        }
+    }
+    copyExperimentToProject: (payload: {
+        featureFlagKey?: string
+        id: number
+        name?: string
+        onSuccess?: () => void
+        targetProjectId: number
+        targetTeamId: number
+    }) => {
+        id: number
+        targetProjectId: number
+        targetTeamId: number
+        featureFlagKey?: string
+        name?: string
+        onSuccess?: () => void
+    }
+    copyExperimentToProjectFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    copyExperimentToProjectSuccess: (
+        experiments: ExperimentsResult,
+        payload?: {
+            id: number
+            targetProjectId: number
+            targetTeamId: number
+            featureFlagKey?: string
+            name?: string
+            onSuccess?: () => void
+        }
+    ) => {
+        experiments: ExperimentsResult
+        payload?: {
+            id: number
+            targetProjectId: number
+            targetTeamId: number
+            featureFlagKey?: string
+            name?: string
+            onSuccess?: () => void
+        }
+    }
+    duplicateExperiment: (payload: { featureFlagKey?: string; id: number; name?: string }) => {
+        id: number
+        featureFlagKey?: string
+        name?: string
+    }
+    duplicateExperimentFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    duplicateExperimentSuccess: (
+        experiments: {
+            count: number
+            filters?: ExperimentsFilters | null | undefined
+            next?: string | null | undefined
+            previous?: string | null | undefined
+            results: any[]
+        },
+        payload?: {
+            id: number
+            featureFlagKey?: string
+            name?: string
+        }
+    ) => {
+        experiments: {
+            count: number
+            filters?: ExperimentsFilters | null | undefined
+            next?: string | null | undefined
+            previous?: string | null | undefined
+            results: any[]
+        }
+        payload?: {
+            id: number
+            featureFlagKey?: string
+            name?: string
+        }
+    }
+    loadExperiments: (_: void) => void
+    loadExperimentsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadExperimentsStats: () => any
+    loadExperimentsStatsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadExperimentsStatsSuccess: (
+        experimentsStats: ExperimentVelocityStats,
+        payload?: any
+    ) => {
+        experimentsStats: ExperimentVelocityStats
+        payload?: any
+    }
+    loadExperimentsSuccess: (
+        experiments: ExperimentsResult,
+        payload?: void
+    ) => {
+        experiments: ExperimentsResult
+        payload?: void
+    }
+    loadFeatureFlagModalFeatureFlags: (_: void) => void
+    loadFeatureFlagModalFeatureFlagsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadFeatureFlagModalFeatureFlagsSuccess: (
+        featureFlagModalFeatureFlags: {
+            count: number
+            results: FeatureFlagType[]
+        },
+        payload?: void
+    ) => {
+        featureFlagModalFeatureFlags: {
+            count: number
+            results: FeatureFlagType[]
+        }
+        payload?: void
+    }
+    openFeatureFlagModal: () => {
+        value: true
+    }
+    resetFeatureFlagModalFilters: () => {
+        value: true
+    }
+    setExperimentsFilters: (
+        filters: Partial<ExperimentsFilters>,
+        replace?: boolean
+    ) => {
+        filters: Partial<ExperimentsFilters>
+        replace: boolean | undefined
+    }
+    setExperimentsTab: (tabKey: ExperimentsTabs) => {
+        tabKey: ExperimentsTabs
+    }
+    setFeatureFlagModalFilters: (
+        filters: Partial<FeatureFlagModalFilters>,
+        replace?: boolean
+    ) => {
+        filters: Partial<FeatureFlagModalFilters>
+        replace: boolean | undefined
+    }
+    unarchiveExperiment: (id: number) => number
+    unarchiveExperimentFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    unarchiveExperimentSuccess: (
+        experiments: {
+            count: number
+            filters?: ExperimentsFilters | null | undefined
+            next?: string | null | undefined
+            previous?: string | null | undefined
+            results: Experiment[]
+        },
+        payload?: number
+    ) => {
+        experiments: {
+            count: number
+            filters?: ExperimentsFilters | null | undefined
+            next?: string | null | undefined
+            previous?: string | null | undefined
+            results: Experiment[]
+        }
+        payload?: number
+    }
+    updateExperiments: (experiment: Experiment) => Experiment
+    updateExperimentsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateExperimentsSuccess: (
+        experiments: {
+            count: number
+            filters?: ExperimentsFilters | null | undefined
+            next?: string | null | undefined
+            previous?: string | null | undefined
+            results: Experiment[]
+        },
+        payload?: Experiment
+    ) => {
+        experiments: {
+            count: number
+            filters?: ExperimentsFilters | null | undefined
+            next?: string | null | undefined
+            previous?: string | null | undefined
+            results: Experiment[]
+        }
+        payload?: Experiment
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface experimentsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        count: (experiments: ExperimentsResult) => number
+        paramsFromFilters: (filters: ExperimentsFilters) => {
+            archived?: boolean | undefined
+            created_by_id?: number[] | undefined
+            limit: number
+            offset: number
+            order?: string | undefined
+            page?: number | undefined
+            search?: string | undefined
+            status?: ExperimentStatus | 'all' | undefined
+        }
+        featureFlagModalParamsFromFilters: (
+            featureFlagModalFilters: FeatureFlagModalFilters,
+            currentTeam: TeamPublicType | TeamType | null
+        ) => Record<string, any>
+        featureFlagModalPageFromURL: (searchParams: Record<string, any>) => number
+        featureFlagModalPagination: (
+            featureFlagModalFilters: FeatureFlagModalFilters,
+            featureFlagModalFeatureFlags: {
+                count: number
+                results: FeatureFlagType[]
+            },
+            featureFlagModalPageFromURL: number
+        ) => PaginationManual
+        shouldShowEmptyState: (
+            experimentsLoading: boolean,
+            experiments: ExperimentsResult,
+            filters: ExperimentsFilters
+        ) => boolean
+        pagination: (filters: ExperimentsFilters, count: number) => PaginationManual
+        unavailableFeatureFlagKeys: (featureFlags: FeatureFlagsResult, experiments: ExperimentsResult) => Set<string>
+    }
+}
+
+export type experimentsLogicType = MakeLogicType<
+    experimentsLogicValues,
+    experimentsLogicActions,
+    Record<string, any>,
+    experimentsLogicMeta
+>
+
 export const experimentsLogic = kea<experimentsLogicType>([
     path(['scenes', 'experiments', 'experimentsLogic']),
     connect(() => ({
@@ -383,7 +764,7 @@ export const experimentsLogic = kea<experimentsLogicType>([
         ],
     })),
     selectors(() => ({
-        count: [(selectors) => [selectors.experiments], (experiments) => experiments.count],
+        count: [(selectors) => [selectors.experiments], (experiments: ExperimentsResult) => experiments.count],
         paramsFromFilters: [
             (s) => [s.filters],
             (filters: ExperimentsFilters) => ({
@@ -394,7 +775,10 @@ export const experimentsLogic = kea<experimentsLogicType>([
         ],
         featureFlagModalParamsFromFilters: [
             (s) => [s.featureFlagModalFilters, s.currentTeam],
-            (filters: FeatureFlagModalFilters, currentTeam) => {
+            (
+                filters: FeatureFlagModalFilters,
+                currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType
+            ) => {
                 const params: Record<string, any> = {
                     ...filters,
                     limit: FLAGS_PER_PAGE,
@@ -411,13 +795,20 @@ export const experimentsLogic = kea<experimentsLogicType>([
         ],
         featureFlagModalPageFromURL: [
             () => [router.selectors.searchParams],
-            (searchParams) => {
+            (searchParams: Record<string, any>) => {
                 return parseInt(searchParams['ff_page']) || 1
             },
         ],
         featureFlagModalPagination: [
             (s) => [s.featureFlagModalFilters, s.featureFlagModalFeatureFlags, s.featureFlagModalPageFromURL],
-            (filters, featureFlags, urlPage): PaginationManual => {
+            (
+                filters: FeatureFlagModalFilters,
+                featureFlags: {
+                    count: number
+                    results: FeatureFlagType[]
+                },
+                urlPage: number
+            ): PaginationManual => {
                 const currentPage = Math.max(filters.page || 1, urlPage)
 
                 const hasNextPage = featureFlags.count > currentPage * FLAGS_PER_PAGE
@@ -448,7 +839,7 @@ export const experimentsLogic = kea<experimentsLogicType>([
         ],
         shouldShowEmptyState: [
             (s) => [s.experimentsLoading, s.experiments, s.filters],
-            (experimentsLoading, experiments, filters): boolean => {
+            (experimentsLoading: boolean, experiments: ExperimentsResult, filters: ExperimentsFilters): boolean => {
                 return (
                     !experimentsLoading &&
                     (experiments.results?.length ?? 0) === 0 &&
@@ -458,7 +849,7 @@ export const experimentsLogic = kea<experimentsLogicType>([
         ],
         pagination: [
             (s) => [s.filters, s.count],
-            (filters, count): PaginationManual => {
+            (filters: ExperimentsFilters, count: number): PaginationManual => {
                 return {
                     controlled: true,
                     pageSize: EXPERIMENTS_PER_PAGE,
diff --git a/frontend/src/scenes/experiments/holdoutsLogic.tsx b/frontend/src/scenes/experiments/holdoutsLogic.tsx
index 2b7aa04b0c6e..f897ab0e5d6b 100644
--- a/frontend/src/scenes/experiments/holdoutsLogic.tsx
+++ b/frontend/src/scenes/experiments/holdoutsLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, connect, events, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, listeners, path, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -8,8 +8,6 @@ import { teamLogic } from 'scenes/teamLogic'
 
 import { ExperimentHoldoutType } from '~/types'
 
-import type { holdoutsLogicType } from './holdoutsLogicType'
-
 export const NEW_HOLDOUT: ExperimentHoldoutType = {
     id: null,
     name: '',
@@ -26,6 +24,113 @@ export const NEW_HOLDOUT: ExperimentHoldoutType = {
     updated_at: null,
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface holdoutsLogicValues {
+    currentProjectId: number | string // teamLogic
+    holdout: ExperimentHoldoutType
+    holdouts: ExperimentHoldoutType[]
+    holdoutsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface holdoutsLogicActions {
+    reportExperimentHoldoutCreated: (holdout: ExperimentHoldoutType) => {
+        holdout: ExperimentHoldoutType
+    } // eventUsageLogic
+    createHoldout: () => {
+        value: true
+    }
+    createHoldoutFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    createHoldoutSuccess: (
+        holdouts: ExperimentHoldoutType[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        holdouts: ExperimentHoldoutType[]
+        payload?: {
+            value: true
+        }
+    }
+    deleteHoldout: (id: number | null) => {
+        id: number | null
+    }
+    deleteHoldoutFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteHoldoutSuccess: (
+        holdouts: ExperimentHoldoutType[],
+        payload?: {
+            id: number | null
+        }
+    ) => {
+        holdouts: ExperimentHoldoutType[]
+        payload?: {
+            id: number | null
+        }
+    }
+    loadHoldout: (id: number | null) => {
+        id: number | null
+    }
+    loadHoldouts: () => any
+    loadHoldoutsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadHoldoutsSuccess: (
+        holdouts: ExperimentHoldoutType[],
+        payload?: any
+    ) => {
+        holdouts: ExperimentHoldoutType[]
+        payload?: any
+    }
+    setHoldout: (holdout: Partial<ExperimentHoldoutType>) => {
+        holdout: Partial<ExperimentHoldoutType>
+    }
+    updateHoldout: (
+        id: number | null,
+        holdout: Partial<ExperimentHoldoutType>
+    ) => {
+        holdout: Partial<ExperimentHoldoutType>
+        id: number | null
+    }
+    updateHoldoutFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateHoldoutSuccess: (
+        holdouts: ExperimentHoldoutType[],
+        payload?: {
+            holdout: Partial<ExperimentHoldoutType>
+            id: number | null
+        }
+    ) => {
+        holdouts: ExperimentHoldoutType[]
+        payload?: {
+            holdout: Partial<ExperimentHoldoutType>
+            id: number | null
+        }
+    }
+}
+
+export type holdoutsLogicType = MakeLogicType<holdoutsLogicValues, holdoutsLogicActions>
+
 export const holdoutsLogic = kea<holdoutsLogicType>([
     path(['scenes', 'experiments', 'holdoutsLogic']),
     actions({
diff --git a/frontend/src/scenes/experiments/legacy/legacyExperimentLogic.tsx b/frontend/src/scenes/experiments/legacy/legacyExperimentLogic.tsx
index 98bd2fa75b72..14262265c664 100644
--- a/frontend/src/scenes/experiments/legacy/legacyExperimentLogic.tsx
+++ b/frontend/src/scenes/experiments/legacy/legacyExperimentLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 
 import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
 import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
@@ -18,8 +18,8 @@ import {
 import { setLatestVersionsOnQuery } from '~/queries/utils'
 import { Experiment } from '~/types'
 
+import type { ExperimentIdType } from '../../../types'
 import { modalsLogic } from '../modalsLogic'
-import type { legacyExperimentLogicType } from './legacyExperimentLogicType'
 
 export interface LegacyExperimentLogicProps {
     experiment: Experiment
@@ -181,7 +181,7 @@ const loadLegacyMetrics = async ({
         | null
     )[] = []
 
-    const currentErrors = new Array(metrics.length).fill(null)
+    const currentErrors = Array.from({ length: metrics.length }).fill(null)
 
     let successfulCount = 0
     let erroredCount = 0
@@ -288,6 +288,134 @@ const loadLegacyMetrics = async ({
     return { successfulCount, erroredCount, cachedCount }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface legacyExperimentLogicValues {
+    currentProjectId: number | string // teamLogic
+    currentTeamId: number | null // teamLogic
+    experiment: Experiment
+    experimentId: ExperimentIdType
+    legacyPrimaryMetricsResults: (
+        | CachedExperimentFunnelsQueryResponse
+        | CachedExperimentTrendsQueryResponse
+        | CachedLegacyExperimentQueryResponse
+        | null
+    )[]
+    legacySecondaryMetricsResults: (
+        | CachedExperimentFunnelsQueryResponse
+        | CachedExperimentTrendsQueryResponse
+        | CachedLegacyExperimentQueryResponse
+        | null
+    )[]
+    primaryMetricsResultsErrors: any[]
+    primaryMetricsResultsLoading: boolean
+    secondaryMetricsResultsErrors: any[]
+    secondaryMetricsResultsLoading: boolean
+    unmodifiedExperiment: Experiment | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface legacyExperimentLogicActions {
+    closeFinishExperimentModal: () => {
+        value: true
+    } // modalsLogic
+    archiveExperiment: (disableFeatureFlag?: boolean) => {
+        disableFeatureFlag: boolean
+    }
+    endExperiment: () => {
+        value: true
+    }
+    endExperimentWithoutShipping: () => {
+        value: true
+    }
+    finishExperiment: ({ selectedVariantKey }: { selectedVariantKey: string }) => {
+        selectedVariantKey: string
+    }
+    loadPrimaryMetricsResults: (
+        refresh?: boolean,
+        refreshId?: string
+    ) => {
+        refresh: boolean | undefined
+        refreshId: string | undefined
+    }
+    loadSecondaryMetricsResults: (
+        refresh?: boolean,
+        refreshId?: string
+    ) => {
+        refresh: boolean | undefined
+        refreshId: string | undefined
+    }
+    refreshExperimentResults: (
+        forceRefresh?: boolean,
+        triggeredBy?: LegacyExperimentTriggeredBy
+    ) => {
+        forceRefresh: boolean | undefined
+        triggeredBy: LegacyExperimentTriggeredBy
+    }
+    restoreUnmodifiedExperiment: () => {
+        value: true
+    }
+    setExperiment: (update: Partial<Experiment>) => {
+        update: Partial<Experiment>
+    }
+    setLegacyPrimaryMetricsResults: (
+        results: (
+            | CachedExperimentFunnelsQueryResponse
+            | CachedExperimentTrendsQueryResponse
+            | CachedLegacyExperimentQueryResponse
+            | null
+        )[]
+    ) => {
+        results: (
+            | CachedExperimentFunnelsQueryResponse
+            | CachedExperimentTrendsQueryResponse
+            | CachedLegacyExperimentQueryResponse
+            | null
+        )[]
+    }
+    setLegacySecondaryMetricsResults: (
+        results: (
+            | CachedExperimentFunnelsQueryResponse
+            | CachedExperimentTrendsQueryResponse
+            | CachedLegacyExperimentQueryResponse
+            | null
+        )[]
+    ) => {
+        results: (
+            | CachedExperimentFunnelsQueryResponse
+            | CachedExperimentTrendsQueryResponse
+            | CachedLegacyExperimentQueryResponse
+            | null
+        )[]
+    }
+    setPrimaryMetricsResultsErrors: (errors: any[]) => {
+        errors: any[]
+    }
+    setPrimaryMetricsResultsLoading: (loading: boolean) => {
+        loading: boolean
+    }
+    setSecondaryMetricsResultsErrors: (errors: any[]) => {
+        errors: any[]
+    }
+    setSecondaryMetricsResultsLoading: (loading: boolean) => {
+        loading: boolean
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface legacyExperimentLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        experimentId: (experiment: Experiment) => ExperimentIdType
+    }
+}
+
+export type legacyExperimentLogicType = MakeLogicType<
+    legacyExperimentLogicValues,
+    legacyExperimentLogicActions,
+    LegacyExperimentLogicProps,
+    legacyExperimentLogicMeta
+>
+
 /**
  * @deprecated Legacy experiment logic for read-only legacy experiments.
  *
@@ -415,7 +543,7 @@ export const legacyExperimentLogic = kea<legacyExperimentLogicType>([
         ],
     })),
     selectors({
-        experimentId: [(s) => [s.experiment], (experiment) => experiment.id],
+        experimentId: [(s) => [s.experiment], (experiment: Experiment) => experiment.id],
     }),
     listeners(({ values, actions }) => ({
         afterMount: () => {
diff --git a/frontend/src/scenes/experiments/legacy/legacyExperimentModalsLogic.ts b/frontend/src/scenes/experiments/legacy/legacyExperimentModalsLogic.ts
index 36fd399191f5..c69a986ccd4b 100644
--- a/frontend/src/scenes/experiments/legacy/legacyExperimentModalsLogic.ts
+++ b/frontend/src/scenes/experiments/legacy/legacyExperimentModalsLogic.ts
@@ -1,7 +1,61 @@
-import { actions, kea, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers } from 'kea'
 
 import { SharedMetric } from '../SharedMetrics/sharedMetricLogic'
-import type { legacyExperimentModalsLogicType } from './legacyExperimentModalsLogicType'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface legacyExperimentModalsLogicValues {
+    isPrimaryMetricModalOpen: boolean
+    isPrimaryMetricSourceModalOpen: boolean
+    isPrimarySharedMetricModalOpen: boolean
+    isSecondaryMetricModalOpen: boolean
+    isSecondaryMetricSourceModalOpen: boolean
+    isSecondarySharedMetricModalOpen: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface legacyExperimentModalsLogicActions {
+    closePrimaryMetricModal: () => {
+        value: true
+    }
+    closePrimaryMetricSourceModal: () => {
+        value: true
+    }
+    closePrimarySharedMetricModal: () => {
+        value: true
+    }
+    closeSecondaryMetricModal: () => {
+        value: true
+    }
+    closeSecondaryMetricSourceModal: () => {
+        value: true
+    }
+    closeSecondarySharedMetricModal: () => {
+        value: true
+    }
+    openPrimaryMetricModal: (uuid: string) => {
+        uuid: string
+    }
+    openPrimaryMetricSourceModal: () => {
+        value: true
+    }
+    openPrimarySharedMetricModal: (sharedMetricId: SharedMetric['id'] | null) => {
+        sharedMetricId: number | null
+    }
+    openSecondaryMetricModal: (uuid: string) => {
+        uuid: string
+    }
+    openSecondaryMetricSourceModal: () => {
+        value: true
+    }
+    openSecondarySharedMetricModal: (sharedMetricId: SharedMetric['id'] | null) => {
+        sharedMetricId: number | null
+    }
+}
+
+export type legacyExperimentModalsLogicType = MakeLogicType<
+    legacyExperimentModalsLogicValues,
+    legacyExperimentModalsLogicActions
+>
 
 /**
  * @deprecated
diff --git a/frontend/src/scenes/experiments/modalsLogic.ts b/frontend/src/scenes/experiments/modalsLogic.ts
index 836bb1f78355..0d9b1975b50d 100644
--- a/frontend/src/scenes/experiments/modalsLogic.ts
+++ b/frontend/src/scenes/experiments/modalsLogic.ts
@@ -1,12 +1,174 @@
-import { actions, connect, kea, path, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, path, reducers } from 'kea'
 
 import { featureFlagsLogic } from 'scenes/feature-flags/featureFlagsLogic'
 import { projectLogic } from 'scenes/projectLogic'
 import { teamLogic } from 'scenes/teamLogic'
 
-import type { modalsLogicType } from './modalsLogicType'
+import type { FeatureFlagType } from '../../types'
 import { SharedMetric } from './SharedMetrics/sharedMetricLogic'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface modalsLogicValues {
+    currentProjectId: number | null // projectLogic
+    currentTeamId: number | null // teamLogic
+    isCupedModalOpen: boolean
+    isDescriptionModalOpen: boolean
+    isDistributionModalOpen: boolean
+    isEditConclusionModalOpen: boolean
+    isExperimentCollectionGoalModalOpen: boolean
+    isExposureCriteriaModalOpen: boolean
+    isFinishExperimentModalOpen: boolean
+    isPauseExperimentModalOpen: boolean
+    isPrimaryMetricModalOpen: boolean
+    isPrimaryMetricSourceModalOpen: boolean
+    isPrimaryMetricsReorderModalOpen: boolean
+    isPrimarySharedMetricModalOpen: boolean
+    isReleaseConditionsModalOpen: boolean
+    isResumeExperimentModalOpen: boolean
+    isRunningTimeConfigModalOpen: boolean
+    isSecondaryMetricModalOpen: boolean
+    isSecondaryMetricSourceModalOpen: boolean
+    isSecondaryMetricsReorderModalOpen: boolean
+    isSecondarySharedMetricModalOpen: boolean
+    isStatsEngineModalOpen: boolean
+    isVariantDeltaTimeseriesModalOpen: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface modalsLogicActions {
+    updateFlag: (flag: FeatureFlagType) => {
+        flag: FeatureFlagType
+    } // featureFlagsLogic
+    closeCupedModal: () => {
+        value: true
+    }
+    closeDescriptionModal: () => {
+        value: true
+    }
+    closeDistributionModal: () => {
+        value: true
+    }
+    closeEditConclusionModal: () => {
+        value: true
+    }
+    closeExperimentCollectionGoalModal: () => {
+        value: true
+    }
+    closeExposureCriteriaModal: () => {
+        value: true
+    }
+    closeFinishExperimentModal: () => {
+        value: true
+    }
+    closePauseExperimentModal: () => {
+        value: true
+    }
+    closePrimaryMetricModal: () => {
+        value: true
+    }
+    closePrimaryMetricSourceModal: () => {
+        value: true
+    }
+    closePrimaryMetricsReorderModal: () => {
+        value: true
+    }
+    closePrimarySharedMetricModal: () => {
+        value: true
+    }
+    closeReleaseConditionsModal: () => {
+        value: true
+    }
+    closeResumeExperimentModal: () => {
+        value: true
+    }
+    closeRunningTimeConfigModal: () => {
+        value: true
+    }
+    closeSecondaryMetricModal: () => {
+        value: true
+    }
+    closeSecondaryMetricSourceModal: () => {
+        value: true
+    }
+    closeSecondaryMetricsReorderModal: () => {
+        value: true
+    }
+    closeSecondarySharedMetricModal: () => {
+        value: true
+    }
+    closeStatsEngineModal: () => {
+        value: true
+    }
+    closeVariantDeltaTimeseriesModal: () => {
+        value: true
+    }
+    openCupedModal: () => {
+        value: true
+    }
+    openDescriptionModal: () => {
+        value: true
+    }
+    openDistributionModal: () => {
+        value: true
+    }
+    openEditConclusionModal: () => {
+        value: true
+    }
+    openExperimentCollectionGoalModal: () => {
+        value: true
+    }
+    openExposureCriteriaModal: () => {
+        value: true
+    }
+    openFinishExperimentModal: () => {
+        value: true
+    }
+    openPauseExperimentModal: () => {
+        value: true
+    }
+    openPrimaryMetricModal: (uuid: string) => {
+        uuid: string
+    }
+    openPrimaryMetricSourceModal: () => {
+        value: true
+    }
+    openPrimaryMetricsReorderModal: () => {
+        value: true
+    }
+    openPrimarySharedMetricModal: (sharedMetricId: SharedMetric['id'] | null) => {
+        sharedMetricId: number | null
+    }
+    openReleaseConditionsModal: () => {
+        value: true
+    }
+    openResumeExperimentModal: () => {
+        value: true
+    }
+    openRunningTimeConfigModal: () => {
+        value: true
+    }
+    openSecondaryMetricModal: (uuid: string) => {
+        uuid: string
+    }
+    openSecondaryMetricSourceModal: () => {
+        value: true
+    }
+    openSecondaryMetricsReorderModal: () => {
+        value: true
+    }
+    openSecondarySharedMetricModal: (sharedMetricId: SharedMetric['id'] | null) => {
+        sharedMetricId: number | null
+    }
+    openStatsEngineModal: () => {
+        value: true
+    }
+    openVariantDeltaTimeseriesModal: () => {
+        value: true
+    }
+}
+
+export type modalsLogicType = MakeLogicType<modalsLogicValues, modalsLogicActions>
+
 export const modalsLogic = kea<modalsLogicType>([
     path(['scenes', 'experiments', 'modalsLogic']),
     connect(() => ({
diff --git a/frontend/src/scenes/exports/exportsSceneLogic.tsx b/frontend/src/scenes/exports/exportsSceneLogic.tsx
index 9b6acec2fae9..614d3168f7b6 100644
--- a/frontend/src/scenes/exports/exportsSceneLogic.tsx
+++ b/frontend/src/scenes/exports/exportsSceneLogic.tsx
@@ -1,4 +1,4 @@
-import { afterMount, connect, kea, path, selectors } from 'kea'
+import { MakeLogicType, afterMount, connect, kea, path, selectors } from 'kea'
 
 import { exportsLogic } from 'lib/components/ExportButton/exportsLogic'
 import { sceneConfigurations } from 'scenes/scenes'
@@ -6,7 +6,19 @@ import { Scene } from 'scenes/sceneTypes'
 
 import { Breadcrumb } from '~/types'
 
-import type { exportsSceneLogicType } from './exportsSceneLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface exportsSceneLogicValues {
+    breadcrumbs: Breadcrumb[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface exportsSceneLogicActions {
+    loadExports: () => {
+        value: true
+    } // exportsLogic
+}
+
+export type exportsSceneLogicType = MakeLogicType<exportsSceneLogicValues, exportsSceneLogicActions>
 
 export const exportsSceneLogic = kea<exportsSceneLogicType>([
     path(['scenes', 'exports', 'exportsSceneLogic']),
diff --git a/frontend/src/scenes/feature-flags/defaultEvaluationContextsLogic.ts b/frontend/src/scenes/feature-flags/defaultEvaluationContextsLogic.ts
index 54ec563ae372..8a47539269aa 100644
--- a/frontend/src/scenes/feature-flags/defaultEvaluationContextsLogic.ts
+++ b/frontend/src/scenes/feature-flags/defaultEvaluationContextsLogic.ts
@@ -1,11 +1,11 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
 import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
 import { teamLogic } from 'scenes/teamLogic'
 
-import type { defaultEvaluationContextsLogicType } from './defaultEvaluationContextsLogicType'
+import type { TeamPublicType, TeamType } from '../../types'
 
 export interface DefaultEvaluationContext {
     id: number | string
@@ -19,6 +19,204 @@ export interface DefaultEvaluationContextsResponse {
     enabled: boolean
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface defaultEvaluationContextsLogicValues {
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    availableContexts: string[]
+    canAddMoreContexts: boolean
+    contexts: DefaultEvaluationContext[]
+    defaultEvaluationContexts: DefaultEvaluationContextsResponse | null
+    defaultEvaluationContextsLoading: boolean
+    hiddenContexts: string[]
+    isAdding: boolean
+    isEnabled: boolean
+    newContextInput: string
+    pendingContextName: string | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface defaultEvaluationContextsLogicActions {
+    updateCurrentTeam: (payload: Partial<TeamType>) => Partial<TeamType> // teamLogic
+    addContext: (contextName: string) => {
+        contextName: string
+    }
+    addContextFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    addContextSuccess: (
+        defaultEvaluationContexts: {
+            available_contexts: any[]
+            default_evaluation_contexts: {
+                id: any
+                name: any
+            }[]
+            enabled: boolean
+            hidden_contexts: string[]
+        } | null,
+        payload?: {
+            contextName: string
+        }
+    ) => {
+        defaultEvaluationContexts: {
+            available_contexts: any[]
+            default_evaluation_contexts: {
+                id: any
+                name: any
+            }[]
+            enabled: boolean
+            hidden_contexts: string[]
+        } | null
+        payload?: {
+            contextName: string
+        }
+    }
+    hideContext: (contextName: string) => {
+        contextName: string
+    }
+    hideContextFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    hideContextSuccess: (
+        defaultEvaluationContexts: {
+            available_contexts: string[]
+            default_evaluation_contexts: DefaultEvaluationContext[]
+            enabled: boolean
+            hidden_contexts: string[]
+        } | null,
+        payload?: {
+            contextName: string
+        }
+    ) => {
+        defaultEvaluationContexts: {
+            available_contexts: string[]
+            default_evaluation_contexts: DefaultEvaluationContext[]
+            enabled: boolean
+            hidden_contexts: string[]
+        } | null
+        payload?: {
+            contextName: string
+        }
+    }
+    loadDefaultEvaluationContexts: () => {
+        value: true
+    }
+    loadDefaultEvaluationContextsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadDefaultEvaluationContextsSuccess: (
+        defaultEvaluationContexts: DefaultEvaluationContextsResponse | null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        defaultEvaluationContexts: DefaultEvaluationContextsResponse | null
+        payload?: {
+            value: true
+        }
+    }
+    removeContext: (contextName: string) => {
+        contextName: string
+    }
+    removeContextFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    removeContextSuccess: (
+        defaultEvaluationContexts: {
+            available_contexts: string[]
+            default_evaluation_contexts: DefaultEvaluationContext[]
+            enabled: boolean
+            hidden_contexts: string[]
+        } | null,
+        payload?: {
+            contextName: string
+        }
+    ) => {
+        defaultEvaluationContexts: {
+            available_contexts: string[]
+            default_evaluation_contexts: DefaultEvaluationContext[]
+            enabled: boolean
+            hidden_contexts: string[]
+        } | null
+        payload?: {
+            contextName: string
+        }
+    }
+    setIsAdding: (isAdding: boolean) => {
+        isAdding: boolean
+    }
+    setNewContextInput: (value: string) => {
+        value: string
+    }
+    toggleEnabled: (enabled: boolean) => {
+        enabled: boolean
+    }
+    unhideContext: (contextName: string) => {
+        contextName: string
+    }
+    unhideContextFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    unhideContextSuccess: (
+        defaultEvaluationContexts: {
+            available_contexts: string[]
+            default_evaluation_contexts: DefaultEvaluationContext[]
+            enabled: boolean
+            hidden_contexts: string[]
+        } | null,
+        payload?: {
+            contextName: string
+        }
+    ) => {
+        defaultEvaluationContexts: {
+            available_contexts: string[]
+            default_evaluation_contexts: DefaultEvaluationContext[]
+            enabled: boolean
+            hidden_contexts: string[]
+        } | null
+        payload?: {
+            contextName: string
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface defaultEvaluationContextsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        contexts: (defaultEvaluationContexts: DefaultEvaluationContextsResponse | null) => DefaultEvaluationContext[]
+        availableContexts: (defaultEvaluationContexts: DefaultEvaluationContextsResponse | null) => string[]
+        hiddenContexts: (defaultEvaluationContexts: DefaultEvaluationContextsResponse | null) => string[]
+        isEnabled: (currentTeam: TeamPublicType | TeamType | null) => boolean
+        canAddMoreContexts: (contexts: DefaultEvaluationContext[]) => boolean
+    }
+}
+
+export type defaultEvaluationContextsLogicType = MakeLogicType<
+    defaultEvaluationContextsLogicValues,
+    defaultEvaluationContextsLogicActions,
+    Record<string, any>,
+    defaultEvaluationContextsLogicMeta
+>
+
 export const defaultEvaluationContextsLogic = kea<defaultEvaluationContextsLogicType>([
     path(['scenes', 'feature-flags', 'defaultEvaluationContextsLogic']),
 
@@ -232,16 +430,30 @@ export const defaultEvaluationContextsLogic = kea<defaultEvaluationContextsLogic
     selectors({
         contexts: [
             (s) => [s.defaultEvaluationContexts],
-            (data): DefaultEvaluationContext[] => data?.default_evaluation_contexts || [],
+            (data: DefaultEvaluationContextsResponse | null): DefaultEvaluationContext[] =>
+                data?.default_evaluation_contexts || [],
         ],
 
-        availableContexts: [(s) => [s.defaultEvaluationContexts], (data): string[] => data?.available_contexts || []],
+        availableContexts: [
+            (s) => [s.defaultEvaluationContexts],
+            (data: DefaultEvaluationContextsResponse | null): string[] => data?.available_contexts || [],
+        ],
 
-        hiddenContexts: [(s) => [s.defaultEvaluationContexts], (data): string[] => data?.hidden_contexts || []],
+        hiddenContexts: [
+            (s) => [s.defaultEvaluationContexts],
+            (data: DefaultEvaluationContextsResponse | null): string[] => data?.hidden_contexts || [],
+        ],
 
-        isEnabled: [(s) => [s.currentTeam], (team): boolean => team?.default_evaluation_contexts_enabled || false],
+        isEnabled: [
+            (s) => [s.currentTeam],
+            (team: null | import('../../types').TeamPublicType | import('../../types').TeamType): boolean =>
+                team?.default_evaluation_contexts_enabled || false,
+        ],
 
-        canAddMoreContexts: [(s) => [s.contexts], (contexts): boolean => contexts.length < 10],
+        canAddMoreContexts: [
+            (s) => [s.contexts],
+            (contexts: DefaultEvaluationContext[]): boolean => contexts.length < 10,
+        ],
     }),
 
     afterMount(({ actions }) => {
diff --git a/frontend/src/scenes/feature-flags/defaultReleaseConditionsLogic.ts b/frontend/src/scenes/feature-flags/defaultReleaseConditionsLogic.ts
index e2cb81169d2f..1cb119ce2341 100644
--- a/frontend/src/scenes/feature-flags/defaultReleaseConditionsLogic.ts
+++ b/frontend/src/scenes/feature-flags/defaultReleaseConditionsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -8,7 +8,7 @@ import { teamLogic } from 'scenes/teamLogic'
 
 import { FeatureFlagFilters, FeatureFlagGroupType } from '~/types'
 
-import type { defaultReleaseConditionsLogicType } from './defaultReleaseConditionsLogicType'
+import type { TeamPublicType, TeamType } from '../../types'
 import { uniformAggregationGroupTypeIndex } from './defaultReleaseConditionsUtils'
 
 export interface DefaultReleaseConditionsResponse {
@@ -43,6 +43,83 @@ export async function resolveDefaultReleaseConditions(
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface defaultReleaseConditionsLogicValues {
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    defaultReleaseConditions: DefaultReleaseConditionsResponse | null
+    defaultReleaseConditionsLoading: boolean
+    filtersForEditor: FeatureFlagFilters
+    groups: FeatureFlagGroupType[]
+    hasChanges: boolean
+    isEnabled: boolean
+    localEnabled: boolean
+    localGroups: FeatureFlagGroupType[] | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface defaultReleaseConditionsLogicActions {
+    discardChanges: () => {
+        value: true
+    }
+    loadDefaultReleaseConditions: () => any
+    loadDefaultReleaseConditionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadDefaultReleaseConditionsSuccess: (
+        defaultReleaseConditions: DefaultReleaseConditionsResponse | null,
+        payload?: any
+    ) => {
+        defaultReleaseConditions: DefaultReleaseConditionsResponse | null
+        payload?: any
+    }
+    saveDefaultReleaseConditions: () => any
+    saveDefaultReleaseConditionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    saveDefaultReleaseConditionsSuccess: (
+        defaultReleaseConditions: DefaultReleaseConditionsResponse,
+        payload?: any
+    ) => {
+        defaultReleaseConditions: DefaultReleaseConditionsResponse
+        payload?: any
+    }
+    setLocalEnabled: (enabled: boolean) => {
+        enabled: boolean
+    }
+    setLocalGroups: (groups: FeatureFlagGroupType[]) => {
+        groups: FeatureFlagGroupType[]
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface defaultReleaseConditionsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        isEnabled: (localEnabled: boolean) => boolean
+        groups: (localGroups: FeatureFlagGroupType[] | null) => FeatureFlagGroupType[]
+        filtersForEditor: (groups: FeatureFlagGroupType[]) => FeatureFlagFilters
+        hasChanges: (
+            localGroups: FeatureFlagGroupType[] | null,
+            localEnabled: boolean,
+            defaultReleaseConditions: DefaultReleaseConditionsResponse | null
+        ) => boolean
+    }
+}
+
+export type defaultReleaseConditionsLogicType = MakeLogicType<
+    defaultReleaseConditionsLogicValues,
+    defaultReleaseConditionsLogicActions,
+    Record<string, any>,
+    defaultReleaseConditionsLogicMeta
+>
+
 export const defaultReleaseConditionsLogic = kea<defaultReleaseConditionsLogicType>([
     path(['scenes', 'feature-flags', 'defaultReleaseConditionsLogic']),
 
@@ -114,13 +191,16 @@ export const defaultReleaseConditionsLogic = kea<defaultReleaseConditionsLogicTy
     })),
 
     selectors({
-        isEnabled: [(s) => [s.localEnabled], (enabled): boolean => enabled],
+        isEnabled: [(s) => [s.localEnabled], (enabled: boolean): boolean => enabled],
 
-        groups: [(s) => [s.localGroups], (localGroups): FeatureFlagGroupType[] => localGroups ?? []],
+        groups: [
+            (s) => [s.localGroups],
+            (localGroups: FeatureFlagGroupType[] | null): FeatureFlagGroupType[] => localGroups ?? [],
+        ],
 
         filtersForEditor: [
             (s) => [s.groups],
-            (groups): FeatureFlagFilters => ({
+            (groups: FeatureFlagGroupType[]): FeatureFlagFilters => ({
                 groups: groups.length > 0 ? groups : [{ properties: [], rollout_percentage: 0, variant: null }],
                 multivariate: null,
                 payloads: {},
@@ -130,7 +210,11 @@ export const defaultReleaseConditionsLogic = kea<defaultReleaseConditionsLogicTy
 
         hasChanges: [
             (s) => [s.localGroups, s.localEnabled, s.defaultReleaseConditions],
-            (localGroups, localEnabled, saved): boolean => {
+            (
+                localGroups: FeatureFlagGroupType[] | null,
+                localEnabled: boolean,
+                saved: DefaultReleaseConditionsResponse | null
+            ): boolean => {
                 if (!saved) {
                     return false
                 }
diff --git a/frontend/src/scenes/feature-flags/featureFlagConditionWarningLogic.ts b/frontend/src/scenes/feature-flags/featureFlagConditionWarningLogic.ts
index b7696f656d36..566c9aed6584 100644
--- a/frontend/src/scenes/feature-flags/featureFlagConditionWarningLogic.ts
+++ b/frontend/src/scenes/feature-flags/featureFlagConditionWarningLogic.ts
@@ -1,4 +1,4 @@
-import { connect, kea, key, path, props, selectors } from 'kea'
+import { MakeLogicType, connect, kea, key, path, props, selectors } from 'kea'
 
 import { isPropertyFilterWithOperator } from 'lib/components/PropertyFilters/utils'
 import { stringifyWithBigInts } from 'lib/utils/json'
@@ -6,8 +6,6 @@ import { stringifyWithBigInts } from 'lib/utils/json'
 import { cohortsModel } from '~/models/cohortsModel'
 import { AnyPropertyFilter, CohortType, FeatureFlagEvaluationRuntime, PropertyFilterType } from '~/types'
 
-import type { featureFlagConditionWarningLogicType } from './featureFlagConditionWarningLogicType'
-
 export interface FeatureFlagConditionWarningLogicProps {
     properties: AnyPropertyFilter[]
     evaluationRuntime: FeatureFlagEvaluationRuntime
@@ -17,6 +15,31 @@ const REGEX_LOOKAHEAD = /(?<!\\)\(\?[=!]/ // (?= or (?!
 const REGEX_LOOKBEHIND = /(?<!\\)\(\?<[=!]/ //  or (?<!
 const REGEX_BACKREFERENCE = /(?<!\\)\\[1-9]/ // \1 through \9
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface featureFlagConditionWarningLogicValues {
+    cohortsById: Partial<Record<number | string, CohortType>> // cohortsModel
+    warning: string | undefined
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface featureFlagConditionWarningLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        warning: (
+            cohortsById: Partial<Record<number | string, CohortType>>,
+            properties: AnyPropertyFilter[],
+            evaluationRuntime: FeatureFlagEvaluationRuntime
+        ) => string | undefined
+    }
+}
+
+export type featureFlagConditionWarningLogicType = MakeLogicType<
+    featureFlagConditionWarningLogicValues,
+    {},
+    FeatureFlagConditionWarningLogicProps,
+    featureFlagConditionWarningLogicMeta
+>
+
 export const featureFlagConditionWarningLogic = kea<featureFlagConditionWarningLogicType>([
     path(['scenes', 'feature-flags', 'featureFlagConditionWarningLogic']),
     props({} as FeatureFlagConditionWarningLogicProps),
diff --git a/frontend/src/scenes/feature-flags/featureFlagConfirmationLogic.ts b/frontend/src/scenes/feature-flags/featureFlagConfirmationLogic.ts
index 740c98b8e09b..9a78c3f91398 100644
--- a/frontend/src/scenes/feature-flags/featureFlagConfirmationLogic.ts
+++ b/frontend/src/scenes/feature-flags/featureFlagConfirmationLogic.ts
@@ -1,11 +1,10 @@
-import { actions, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 
 import { objectsEqual } from 'lib/utils/objects'
 
 import { FeatureFlagType } from '~/types'
 
 import { openConfirmationModal } from './ConfirmationModal'
-import type { featureFlagConfirmationLogicType } from './featureFlagConfirmationLogicType'
 import { DependentFlag } from './featureFlagLogic'
 
 /**
@@ -155,6 +154,41 @@ export interface FeatureFlagConfirmationLogicProps {
     onConfirm: () => void
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface featureFlagConfirmationLogicValues {
+    flagChanges: string[]
+    hasChanges: boolean
+    showSaveConfirmModal: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface featureFlagConfirmationLogicActions {
+    confirmChanges: () => {
+        value: true
+    }
+    setFlagChanges: (changes: string[]) => {
+        changes: string[]
+    }
+    showConfirmationModal: (show: boolean) => {
+        show: boolean
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface featureFlagConfirmationLogicMeta {
+    key: number | 'new'
+    __keaTypeGenInternalSelectorTypes: {
+        hasChanges: (flagChanges: string[]) => boolean
+    }
+}
+
+export type featureFlagConfirmationLogicType = MakeLogicType<
+    featureFlagConfirmationLogicValues,
+    featureFlagConfirmationLogicActions,
+    FeatureFlagConfirmationLogicProps,
+    featureFlagConfirmationLogicMeta
+>
+
 export const featureFlagConfirmationLogic = kea<featureFlagConfirmationLogicType>([
     path(['scenes', 'feature-flags', 'featureFlagConfirmationLogic']),
     props({} as FeatureFlagConfirmationLogicProps),
diff --git a/frontend/src/scenes/feature-flags/featureFlagConfirmationSettingsLogic.ts b/frontend/src/scenes/feature-flags/featureFlagConfirmationSettingsLogic.ts
index 52dd58b8ff10..c094de4a6a91 100644
--- a/frontend/src/scenes/feature-flags/featureFlagConfirmationSettingsLogic.ts
+++ b/frontend/src/scenes/feature-flags/featureFlagConfirmationSettingsLogic.ts
@@ -1,16 +1,110 @@
-import { afterMount, connect, kea, listeners, path } from 'kea'
+import { MakeLogicType, afterMount, connect, kea, listeners, path } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
 import { teamLogic } from 'scenes/teamLogic'
 
-import type { featureFlagConfirmationSettingsLogicType } from './featureFlagConfirmationSettingsLogicType'
+import type { TeamPublicType, TeamType } from '../../types'
 
 export type ConfirmationMessageForm = {
     message: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface featureFlagConfirmationSettingsLogicValues {
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    confirmationMessage: string | null
+    confirmationMessageForm: ConfirmationMessageForm
+    confirmationMessageFormAllErrors: Record<string, any>
+    confirmationMessageFormChanged: boolean
+    confirmationMessageFormErrors: DeepPartialMap<ConfirmationMessageForm, ValidationErrorType>
+    confirmationMessageFormHasErrors: boolean
+    confirmationMessageFormManualErrors: Record<string, any>
+    confirmationMessageFormTouched: boolean
+    confirmationMessageFormTouches: Record<string, boolean>
+    confirmationMessageFormValidationErrors: DeepPartialMap<ConfirmationMessageForm, ValidationErrorType>
+    confirmationMessageLoading: boolean
+    isConfirmationMessageFormSubmitting: boolean
+    isConfirmationMessageFormValid: boolean
+    showConfirmationMessageFormErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface featureFlagConfirmationSettingsLogicActions {
+    loadCurrentTeamSuccess: (
+        currentTeam: TeamPublicType | null,
+        payload?: any
+    ) => {
+        currentTeam: TeamPublicType | null
+        payload?: any
+    } // teamLogic
+    updateCurrentTeam: (payload: Partial<TeamType>) => Partial<TeamType> // teamLogic
+    updateCurrentTeamSuccess: (
+        currentTeam: TeamPublicType | TeamType,
+        payload?: Partial<TeamType> | undefined
+    ) => {
+        currentTeam: TeamPublicType | TeamType
+        payload?: Partial<TeamType>
+    } // teamLogic
+    resetConfirmationMessageForm: (values?: ConfirmationMessageForm) => {
+        values?: ConfirmationMessageForm
+    }
+    setConfirmationMessageFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setConfirmationMessageFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setConfirmationMessageFormValues: (values: DeepPartial<ConfirmationMessageForm>) => {
+        values: DeepPartial<ConfirmationMessageForm>
+    }
+    submitConfirmationMessageForm: () => {
+        value: boolean
+    }
+    submitConfirmationMessageFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitConfirmationMessageFormRequest: (confirmationMessageForm: ConfirmationMessageForm) => {
+        confirmationMessageForm: ConfirmationMessageForm
+    }
+    submitConfirmationMessageFormSuccess: (confirmationMessageForm: ConfirmationMessageForm) => {
+        confirmationMessageForm: ConfirmationMessageForm
+    }
+    touchConfirmationMessageFormField: (key: string) => {
+        key: string
+    }
+    updateConfirmationMessage: (data: ConfirmationMessageForm) => ConfirmationMessageForm
+    updateConfirmationMessageFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateConfirmationMessageSuccess: (
+        confirmationMessage: string,
+        payload?: ConfirmationMessageForm
+    ) => {
+        confirmationMessage: string
+        payload?: ConfirmationMessageForm
+    }
+}
+
+export type featureFlagConfirmationSettingsLogicType = MakeLogicType<
+    featureFlagConfirmationSettingsLogicValues,
+    featureFlagConfirmationSettingsLogicActions
+>
+
 export const featureFlagConfirmationSettingsLogic = kea<featureFlagConfirmationSettingsLogicType>([
     path(['scenes', 'feature-flags', 'featureFlagConfirmationSettingsLogic']),
 
diff --git a/frontend/src/scenes/feature-flags/featureFlagEvaluationContextsLogic.ts b/frontend/src/scenes/feature-flags/featureFlagEvaluationContextsLogic.ts
index 373244905912..432b3966dd4b 100644
--- a/frontend/src/scenes/feature-flags/featureFlagEvaluationContextsLogic.ts
+++ b/frontend/src/scenes/feature-flags/featureFlagEvaluationContextsLogic.ts
@@ -1,6 +1,5 @@
-import { actions, kea, key, listeners, path, props, propsChanged, reducers } from 'kea'
+import { MakeLogicType, actions, kea, key, listeners, path, props, propsChanged, reducers } from 'kea'
 
-import type { featureFlagEvaluationContextsLogicType } from './featureFlagEvaluationContextsLogicType'
 import { featureFlagLogic } from './featureFlagLogic'
 
 export interface FeatureFlagEvaluationContextsLogicProps {
@@ -11,6 +10,54 @@ export interface FeatureFlagEvaluationContextsLogicProps {
     evaluationContexts: string[]
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface featureFlagEvaluationContextsLogicValues {
+    isEditingContexts: boolean
+    isEditingTags: boolean
+    localEvaluationContexts: string[]
+    localTags: string[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface featureFlagEvaluationContextsLogicActions {
+    cancelEditingContexts: () => {
+        value: true
+    }
+    cancelEditingTags: () => {
+        value: true
+    }
+    saveContexts: () => {
+        value: true
+    }
+    saveTags: () => {
+        value: true
+    }
+    setIsEditingContexts: (isEditing: boolean) => {
+        isEditing: boolean
+    }
+    setIsEditingTags: (isEditing: boolean) => {
+        isEditing: boolean
+    }
+    setLocalEvaluationContexts: (evaluationContexts: string[]) => {
+        evaluationContexts: string[]
+    }
+    setLocalTags: (tags: string[]) => {
+        tags: string[]
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface featureFlagEvaluationContextsLogicMeta {
+    key: string
+}
+
+export type featureFlagEvaluationContextsLogicType = MakeLogicType<
+    featureFlagEvaluationContextsLogicValues,
+    featureFlagEvaluationContextsLogicActions,
+    FeatureFlagEvaluationContextsLogicProps,
+    featureFlagEvaluationContextsLogicMeta
+>
+
 export const featureFlagEvaluationContextsLogic = kea<featureFlagEvaluationContextsLogicType>([
     path(['scenes', 'feature-flags', 'featureFlagEvaluationContextsLogic']),
     props({} as FeatureFlagEvaluationContextsLogicProps),
diff --git a/frontend/src/scenes/feature-flags/featureFlagIntentWarningLogic.ts b/frontend/src/scenes/feature-flags/featureFlagIntentWarningLogic.ts
index 65575b9328d1..e7281fecf078 100644
--- a/frontend/src/scenes/feature-flags/featureFlagIntentWarningLogic.ts
+++ b/frontend/src/scenes/feature-flags/featureFlagIntentWarningLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, path, props, reducers, selectors } from 'kea'
 
 import { isPropertyFilterWithOperator } from 'lib/components/PropertyFilters/utils'
 import { FEATURE_FLAGS, INSTANTLY_AVAILABLE_PROPERTIES } from 'lib/constants'
@@ -14,7 +14,7 @@ import {
     PropertyFilterType,
 } from '~/types'
 
-import type { featureFlagIntentWarningLogicType } from './featureFlagIntentWarningLogicType'
+import type { FeatureFlagsSet } from '../../lib/logic/featureFlagLogic'
 import { featureFlagLogic, FeatureFlagLogicProps } from './featureFlagLogic'
 
 export type FlagIntent = 'local-eval' | 'first-page-load'
@@ -40,6 +40,45 @@ function isGroupBroad(group: FeatureFlagGroupType): boolean {
     return hasNoProperties && isFullRollout
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface featureFlagIntentWarningLogicValues {
+    cohortsById: Partial<Record<number | string, CohortType>> // cohortsModel
+    enabledFeatures: FeatureFlagsSet // enabledFeaturesLogic
+    featureFlag: FeatureFlagType // featureFlagLogic
+    flagIntent: FlagIntent | null // featureFlagLogic
+    intentIssues: string[]
+    issuesExpanded: boolean
+    unreachableGroups: Set<number>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface featureFlagIntentWarningLogicActions {
+    toggleIssuesExpanded: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface featureFlagIntentWarningLogicMeta {
+    key: number | 'link' | 'new'
+    __keaTypeGenInternalSelectorTypes: {
+        unreachableGroups: (featureFlag: FeatureFlagType) => Set<number>
+        intentIssues: (
+            featureFlag: FeatureFlagType,
+            flagIntent: FlagIntent | null,
+            cohortsById: Partial<Record<number | string, CohortType>>,
+            enabledFeatures: FeatureFlagsSet
+        ) => string[]
+    }
+}
+
+export type featureFlagIntentWarningLogicType = MakeLogicType<
+    featureFlagIntentWarningLogicValues,
+    featureFlagIntentWarningLogicActions,
+    FeatureFlagLogicProps,
+    featureFlagIntentWarningLogicMeta
+>
+
 export const featureFlagIntentWarningLogic = kea<featureFlagIntentWarningLogicType>([
     path(['scenes', 'feature-flags', 'featureFlagIntentWarningLogic']),
     props({} as FeatureFlagLogicProps),
diff --git a/frontend/src/scenes/feature-flags/featureFlagLogic.ts b/frontend/src/scenes/feature-flags/featureFlagLogic.ts
index 2e9b2d707af3..af4c0f523463 100644
--- a/frontend/src/scenes/feature-flags/featureFlagLogic.ts
+++ b/frontend/src/scenes/feature-flags/featureFlagLogic.ts
@@ -1,6 +1,7 @@
 import { CronExpressionParser } from 'cron-parser'
 import cronstrue from 'cronstrue'
 import {
+    MakeLogicType,
     actions,
     afterMount,
     connect,
@@ -13,7 +14,9 @@ import {
     selectors,
     sharedListeners,
 } from 'kea'
+import type { BreakPointFunction } from 'kea'
 import { DeepPartialMap, ValidationErrorType, forms } from 'kea-forms'
+import type { DeepPartial, FieldName } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { beforeUnload, router, urlToAction } from 'kea-router'
 import { CombinedLocation } from 'kea-router/lib/utils'
@@ -81,14 +84,32 @@ import {
 import { NEW_EARLY_ACCESS_FEATURE } from 'products/early_access_features/frontend/earlyAccessFeatureLogic'
 import { TEMPLATE_NAMES } from 'products/feature_flags/frontend/featureFlagTemplateConstants'
 
+import type { CopyFlagsResponseApi } from '../../../../products/feature_flags/frontend/generated/api.schemas'
+import type { FeatureFlagsSet } from '../../lib/logic/featureFlagLogic'
+import type { ProductIntentProperties } from '../../lib/utils/product-intents'
+import type { Noun } from '../../models/groupsModel'
+import type { Node } from '../../queries/schema/schema-general'
+import type {
+    AnyPropertyFilter,
+    Experiment,
+    FeatureFlagFilters,
+    MinimalEarlyAccessFeatureType,
+    OrganizationType,
+    SidePanelTab,
+    TeamPublicType,
+    TeamType,
+    UserBasicType,
+    UserType,
+} from '../../types'
 import { organizationLogic } from '../organizationLogic'
 import { teamLogic } from '../teamLogic'
 import { defaultEvaluationContextsLogic } from './defaultEvaluationContextsLogic'
+import type { DefaultEvaluationContextsResponse } from './defaultEvaluationContextsLogic'
 import { defaultReleaseConditionsLogic, resolveDefaultReleaseConditions } from './defaultReleaseConditionsLogic'
+import type { DefaultReleaseConditionsResponse } from './defaultReleaseConditionsLogic'
 import { uniformAggregationGroupTypeIndex } from './defaultReleaseConditionsUtils'
 import { checkFeatureFlagConfirmation } from './featureFlagConfirmationLogic'
 import type { FlagIntent } from './featureFlagIntentWarningLogic'
-import type { featureFlagLogicType } from './featureFlagLogicType'
 import { flagToggleKey, updateFlagActiveInProject } from './updateFlagActiveInProject'
 
 const VALID_INTENTS: FlagIntent[] = ['local-eval', 'first-page-load']
@@ -562,6 +583,1217 @@ function cleanFilterGroups(groups?: FeatureFlagGroupType[]): FeatureFlagGroupTyp
     return groups.map(({ sort_key, ...rest }: FeatureFlagGroupType) => rest)
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface featureFlagLogicValues {
+    defaultEvaluationContexts: DefaultEvaluationContextsResponse | null // defaultEvaluationContextsLogic
+    defaultReleaseConditions: DefaultReleaseConditionsResponse | null // defaultReleaseConditionsLogic
+    enabledFeatures: FeatureFlagsSet // enabledFeaturesLogic
+    aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun // groupsModel
+    currentOrganization: OrganizationType | null // organizationLogic
+    currentOrganizationId: string // organizationLogic
+    currentProjectId: number | null // projectLogic
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    currentTeamId: number | null // teamLogic
+    hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean // userLogic
+    user: UserType | null // userLogic
+    accessDeniedToFeatureFlag: boolean
+    activeRecurringSchedules: ScheduledChangeType[]
+    activeSchedules: ScheduledChangeType[]
+    activeTab: FeatureFlagsTab
+    aggregationTargetName: string
+    areVariantRolloutsValid: boolean
+    breadcrumbs: Breadcrumb[]
+    canCreateEarlyAccessFeature: boolean
+    canCreatePairedSchedule: boolean
+    completedSchedules: ScheduledChangeType[]
+    copyDestinationProject: number | null
+    copySchedule: boolean
+    cronExpression: string | null
+    cronPreview: string | null
+    customPairDisableCron: string
+    customPairDisableCronPreview: string | null
+    customPairEnableCron: string
+    customPairEnableCronPreview: string | null
+    dependentFlags: DependentFlag[]
+    dependentFlagsLoading: boolean
+    disableCopiedFlag: boolean
+    earlyAccessFeaturesList: MinimalEarlyAccessFeatureType[]
+    emailDomain: string
+    endDate: Dayjs | null
+    expandAdvancedOnEdit: boolean
+    experiment: any
+    experimentLoading: boolean
+    featureFlag: FeatureFlagType
+    featureFlagActiveUpdate: FeatureFlagType | null
+    featureFlagActiveUpdateLoading: boolean
+    featureFlagAllErrors: Record<string, any>
+    featureFlagChanged: boolean
+    featureFlagCopy: any
+    featureFlagCopyLoading: boolean
+    featureFlagErrors: DeepPartialMap<
+        {
+            _create_in_folder?: string | null | undefined
+            _should_create_usage_dashboard?: boolean | undefined
+            active: boolean
+            archived: boolean
+            bucketing_identifier?: FeatureFlagBucketingIdentifier | null | undefined
+            can_edit: boolean
+            created_at: string | null
+            created_by: UserBasicType | null
+            deleted: boolean
+            ensure_experience_continuity: boolean
+            evaluation_contexts: string[]
+            evaluation_runtime: FeatureFlagEvaluationRuntime
+            experiment_set: number[] | null
+            experiment_set_metadata:
+                | {
+                      id: number
+                      is_running: boolean
+                      name: string
+                  }[]
+                | null
+            features: MinimalEarlyAccessFeatureType[] | null
+            filters: FeatureFlagFilters
+            has_encrypted_payloads: boolean
+            has_enriched_analytics?: boolean | undefined
+            id: number | null
+            is_remote_configuration: boolean
+            is_used_in_replay_settings?: boolean | undefined
+            key: string
+            last_called_at?: string | null | undefined
+            last_modified_by: UserBasicType | null
+            name: string
+            status: 'ACTIVE' | 'ARCHIVED' | 'DELETED' | 'STALE' | 'UNKNOWN'
+            surveys: Survey[] | null
+            tags: string[]
+            updated_at: string | null
+            usage_dashboard?: number | undefined
+            user_access_level: AccessControlLevel
+            version: number | null
+        },
+        ValidationErrorType
+    >
+    featureFlagHasErrors: boolean
+    featureFlagKey: string
+    featureFlagLoading: boolean
+    featureFlagManualErrors: Record<string, any>
+    featureFlagMissing: boolean
+    featureFlagRefresh: FeatureFlagType | null
+    featureFlagRefreshLoading: boolean
+    featureFlagTouched: boolean
+    featureFlagTouches: Record<string, boolean>
+    featureFlagValidationErrors: DeepPartialMap<
+        {
+            _create_in_folder?: string | null | undefined
+            _should_create_usage_dashboard?: boolean | undefined
+            active: boolean
+            archived: boolean
+            bucketing_identifier?: FeatureFlagBucketingIdentifier | null | undefined
+            can_edit: boolean
+            created_at: string | null
+            created_by: UserBasicType | null
+            deleted: boolean
+            ensure_experience_continuity: boolean
+            evaluation_contexts: string[]
+            evaluation_runtime: FeatureFlagEvaluationRuntime
+            experiment_set: number[] | null
+            experiment_set_metadata:
+                | {
+                      id: number
+                      is_running: boolean
+                      name: string
+                  }[]
+                | null
+            features: MinimalEarlyAccessFeatureType[] | null
+            filters: FeatureFlagFilters
+            has_encrypted_payloads: boolean
+            has_enriched_analytics?: boolean | undefined
+            id: number | null
+            is_remote_configuration: boolean
+            is_used_in_replay_settings?: boolean | undefined
+            key: string
+            last_called_at?: string | null | undefined
+            last_modified_by: UserBasicType | null
+            name: string
+            status: 'ACTIVE' | 'ARCHIVED' | 'DELETED' | 'STALE' | 'UNKNOWN'
+            surveys: Survey[] | null
+            tags: string[]
+            updated_at: string | null
+            usage_dashboard?: number | undefined
+            user_access_level: AccessControlLevel
+            version: number | null
+        },
+        ValidationErrorType
+    >
+    flagIntent: FlagIntent | null
+    flagStatus: FeatureFlagStatusResponse | null
+    flagStatusLoading: boolean
+    flagType: 'boolean' | 'multivariate' | 'remote_config'
+    flagTypeString:
+        | 'Multiple variants with rollout percentages (A/B/n test)'
+        | 'Release toggle (boolean)'
+        | 'Remote configuration (single payload)'
+    hasEarlyAccessFeatures: boolean
+    hasEncryptedPayloadBeenSaved: boolean | undefined
+    hasExperiment: boolean | null
+    hasSurveys: boolean | null
+    hasUnsavedChanges: boolean
+    isDraftExperiment: boolean
+    isEditingFlag: boolean
+    isFeatureFlagSubmitting: boolean
+    isFeatureFlagValid: boolean
+    isFormDirty: boolean
+    isRecurring: boolean
+    multivariateEnabled: boolean
+    newCohort: CohortType | null
+    newCohortLoading: boolean
+    newEarlyAccessFeature: EarlyAccessFeatureType | null
+    newEarlyAccessFeatureLoading: boolean
+    newSurvey: Survey | null
+    newSurveyLoading: boolean
+    nonEmptyVariants: MultivariateFlagVariant[]
+    openVariants: string[]
+    originalFeatureFlag: FeatureFlagType | null
+    pausedRecurringSchedules: ScheduledChangeType[]
+    payloadExpanded: boolean
+    projectFlagsToggling: Record<string, boolean>
+    projectTreeRef: ProjectTreeRef
+    projectsWithCurrentFlag: OrganizationFeatureFlag[]
+    projectsWithCurrentFlagLoading: boolean
+    properties: AnyPropertyFilter[]
+    propertySelectErrors: any
+    props: any
+    recordingFilterForFlag: Partial<RecordingUniversalFilters>
+    recurrenceInterval: RecurrenceInterval | null
+    relatedInsights: QueryBasedInsightModel[]
+    relatedInsightsLoading: boolean
+    repeatsValue: RecurrenceInterval | 'cron' | 'none'
+    roleBasedAccessEnabled: boolean
+    scheduleDateMarker: any
+    schedulePayload: ScheduleFlagPayload
+    schedulePayloadErrors: any
+    schedulePreset: PairedPresetKey | null
+    scheduledChange: ScheduledChangeType
+    scheduledChangeLoading: boolean
+    scheduledChangeOperation: ScheduledChangeOperationType
+    scheduledChanges: ScheduledChangeType[]
+    scheduledChangesLoading: boolean
+    showFeatureFlagErrors: boolean
+    showImplementation: boolean
+    sidePanelContext: SidePanelSceneContext | null
+    templateExpanded: boolean
+    templates: Array<{
+        description: string
+        getValues: (flag: FeatureFlagType) => Partial<FeatureFlagType>
+        id: string
+        name: string
+    }>
+    upcomingOneTimeSchedules: ScheduledChangeType[]
+    urlIntentApplied: boolean
+    urlTemplateApplied: boolean
+    variantErrors: VariantError[]
+    variantRolloutSum: number
+    variants: MultivariateFlagVariant[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface featureFlagLogicActions {
+    loadDefaultEvaluationContexts: () => {
+        value: true
+    } // defaultEvaluationContextsLogic
+    loadDefaultReleaseConditions: () => any // defaultReleaseConditionsLogic
+    deleteFlag: (id: number) => {
+        id: number
+    } // featureFlagsLogic
+    updateFlag: (flag: FeatureFlagType) => {
+        flag: FeatureFlagType
+    } // featureFlagsLogic
+    closeSidePanel: (tab?: SidePanelTab | undefined) => {
+        tab: SidePanelTab | undefined
+    } // sidePanelStateLogic
+    addProductIntent: (properties: ProductIntentProperties) => ProductIntentProperties // teamLogic
+    addVariant: () => {
+        value: true
+    }
+    applyTemplate: (templateId: string) => {
+        templateId: string
+    }
+    applyUrlIntent: () => {
+        value: true
+    }
+    applyUrlTemplate: (templateId: string) => {
+        templateId: string
+    }
+    copyFlag: () => any
+    copyFlagFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    copyFlagSuccess: (
+        featureFlagCopy: CopyFlagsResponseApi | undefined,
+        payload?: any
+    ) => {
+        featureFlagCopy: CopyFlagsResponseApi | undefined
+        payload?: any
+    }
+    createEarlyAccessFeature: () => any
+    createEarlyAccessFeatureFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    createEarlyAccessFeatureSuccess: (
+        newEarlyAccessFeature: EarlyAccessFeatureType,
+        payload?: any
+    ) => {
+        newEarlyAccessFeature: EarlyAccessFeatureType
+        payload?: any
+    }
+    createPairedSchedule: () => {
+        value: true
+    }
+    createScheduledChange: () => any
+    createScheduledChangeFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    createScheduledChangeSuccess: (
+        scheduledChange:
+            | {
+                  scheduled_change: ScheduledChangeType
+              }
+            | undefined,
+        payload?: any
+    ) => {
+        scheduledChange:
+            | {
+                  scheduled_change: ScheduledChangeType
+              }
+            | undefined
+        payload?: any
+    }
+    createStaticCohort: () => any
+    createStaticCohortFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    createStaticCohortSuccess: (
+        newCohort: CohortType | null,
+        payload?: any
+    ) => {
+        newCohort: CohortType | null
+        payload?: any
+    }
+    createSurvey: () => any
+    createSurveyFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    createSurveySuccess: (
+        newSurvey: Survey,
+        payload?: any
+    ) => {
+        newSurvey: Survey
+        payload?: any
+    }
+    deleteFeatureFlag: (featureFlag: Partial<FeatureFlagType>) => {
+        featureFlag: Partial<FeatureFlagType>
+    }
+    deleteScheduledChange: (scheduledChangeId: any) => any
+    deleteScheduledChangeFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteScheduledChangeSuccess: (
+        scheduledChange:
+            | {
+                  scheduled_change: ScheduledChangeType
+              }
+            | undefined,
+        payload?: any
+    ) => {
+        scheduledChange:
+            | {
+                  scheduled_change: ScheduledChangeType
+              }
+            | undefined
+        payload?: any
+    }
+    distributeVariantsEqually: () => {
+        value: true
+    }
+    duplicateVariant: (index: number) => {
+        index: number
+    }
+    editFeatureFlag: (
+        editing: boolean,
+        options?: {
+            expandAdvanced?: boolean
+        }
+    ) => {
+        editing: boolean
+        expandAdvanced: boolean
+    }
+    enrichUsageDashboard: () => {
+        value: true
+    }
+    generateUsageDashboard: () => {
+        value: true
+    }
+    loadDependentFlags: () => any
+    loadDependentFlagsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadDependentFlagsSuccess: (
+        dependentFlags: DependentFlag[],
+        payload?: any
+    ) => {
+        dependentFlags: DependentFlag[]
+        payload?: any
+    }
+    loadExperiment: () => any
+    loadExperimentFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadExperimentSuccess: (
+        experiment: Experiment | null,
+        payload?: any
+    ) => {
+        experiment: Experiment | null
+        payload?: any
+    }
+    loadFeatureFlag: () => any
+    loadFeatureFlagFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadFeatureFlagStatus: () => any
+    loadFeatureFlagStatusFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadFeatureFlagStatusSuccess: (
+        flagStatus: Promise<FeatureFlagStatusResponse> | null,
+        payload?: any
+    ) => {
+        flagStatus: Promise<FeatureFlagStatusResponse> | null
+        payload?: any
+    }
+    loadFeatureFlagSuccess: (
+        featureFlag: FeatureFlagType,
+        payload?: any
+    ) => {
+        featureFlag: FeatureFlagType
+        payload?: any
+    }
+    loadProjectsWithCurrentFlag: () => any
+    loadProjectsWithCurrentFlagFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadProjectsWithCurrentFlagSuccess: (
+        projectsWithCurrentFlag: OrganizationFeatureFlag[],
+        payload?: any
+    ) => {
+        projectsWithCurrentFlag: OrganizationFeatureFlag[]
+        payload?: any
+    }
+    loadRelatedInsights: () => any
+    loadRelatedInsightsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRelatedInsightsSuccess: (
+        relatedInsights: QueryBasedInsightModel<Node<Record<string, any>>>[],
+        payload?: any
+    ) => {
+        relatedInsights: QueryBasedInsightModel<Node<Record<string, any>>>[]
+        payload?: any
+    }
+    loadScheduledChanges: () => any
+    loadScheduledChangesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadScheduledChangesSuccess: (
+        scheduledChanges: ScheduledChangeType[] | undefined,
+        payload?: any
+    ) => {
+        scheduledChanges: ScheduledChangeType[] | undefined
+        payload?: any
+    }
+    moveVariantDown: (index: number) => {
+        index: number
+    }
+    moveVariantUp: (index: number) => {
+        index: number
+    }
+    projectFlagActiveUpdateFailed: (
+        teamId: number,
+        flagId: number
+    ) => {
+        flagId: number
+        teamId: number
+    }
+    projectFlagActiveUpdated: (
+        teamId: number,
+        flagId: number,
+        active: boolean
+    ) => {
+        active: boolean
+        flagId: number
+        teamId: number
+    }
+    refreshFeatureFlag: () => any
+    refreshFeatureFlagFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    refreshFeatureFlagSuccess: (
+        featureFlagRefresh: FeatureFlagType | null,
+        payload?: any
+    ) => {
+        featureFlagRefresh: FeatureFlagType | null
+        payload?: any
+    }
+    removeVariant: (index: number) => {
+        index: number
+    }
+    reorderVariants: (
+        fromIndex: number,
+        toIndex: number
+    ) => {
+        fromIndex: number
+        toIndex: number
+    }
+    resetEncryptedPayload: () => {}
+    resetFeatureFlag: (values?: {
+        _create_in_folder?: string | null | undefined
+        _should_create_usage_dashboard?: boolean | undefined
+        active: boolean
+        archived: boolean
+        bucketing_identifier?: FeatureFlagBucketingIdentifier | null | undefined
+        can_edit: boolean
+        created_at: string | null
+        created_by: UserBasicType | null
+        deleted: boolean
+        ensure_experience_continuity: boolean
+        evaluation_contexts: string[]
+        evaluation_runtime: FeatureFlagEvaluationRuntime
+        experiment_set: number[] | null
+        experiment_set_metadata:
+            | {
+                  id: number
+                  is_running: boolean
+                  name: string
+              }[]
+            | null
+        features: MinimalEarlyAccessFeatureType[] | null
+        filters: FeatureFlagFilters
+        has_encrypted_payloads: boolean
+        has_enriched_analytics?: boolean | undefined
+        id: number | null
+        is_remote_configuration: boolean
+        is_used_in_replay_settings?: boolean | undefined
+        key: string
+        last_called_at?: string | null | undefined
+        last_modified_by: UserBasicType | null
+        name: string
+        status: 'ACTIVE' | 'ARCHIVED' | 'DELETED' | 'STALE' | 'UNKNOWN'
+        surveys: Survey[] | null
+        tags: string[]
+        updated_at: string | null
+        usage_dashboard?: number | undefined
+        user_access_level: AccessControlLevel
+        version: number | null
+    }) => {
+        values?: {
+            _create_in_folder?: string | null | undefined
+            _should_create_usage_dashboard?: boolean | undefined
+            active: boolean
+            archived: boolean
+            bucketing_identifier?: FeatureFlagBucketingIdentifier | null | undefined
+            can_edit: boolean
+            created_at: string | null
+            created_by: UserBasicType | null
+            deleted: boolean
+            ensure_experience_continuity: boolean
+            evaluation_contexts: string[]
+            evaluation_runtime: FeatureFlagEvaluationRuntime
+            experiment_set: number[] | null
+            experiment_set_metadata:
+                | {
+                      id: number
+                      is_running: boolean
+                      name: string
+                  }[]
+                | null
+            features: MinimalEarlyAccessFeatureType[] | null
+            filters: FeatureFlagFilters
+            has_encrypted_payloads: boolean
+            has_enriched_analytics?: boolean | undefined
+            id: number | null
+            is_remote_configuration: boolean
+            is_used_in_replay_settings?: boolean | undefined
+            key: string
+            last_called_at?: string | null | undefined
+            last_modified_by: UserBasicType | null
+            name: string
+            status: 'ACTIVE' | 'ARCHIVED' | 'DELETED' | 'STALE' | 'UNKNOWN'
+            surveys: Survey[] | null
+            tags: string[]
+            updated_at: string | null
+            usage_dashboard?: number | undefined
+            user_access_level: AccessControlLevel
+            version: number | null
+        }
+    }
+    restoreFeatureFlag: (featureFlag: Partial<FeatureFlagType>) => {
+        featureFlag: Partial<FeatureFlagType>
+    }
+    resumeRecurringScheduledChange: (scheduledChangeId: number) => {
+        scheduledChangeId: number
+    }
+    saveDescriptionInline: (name: string) => {
+        name: string
+    }
+    saveFeatureFlag: (updatedFlag: Partial<FeatureFlagType>) => Partial<FeatureFlagType>
+    saveFeatureFlagFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    saveFeatureFlagSuccess: (
+        featureFlag: FeatureFlagType,
+        payload?: Partial<FeatureFlagType>
+    ) => {
+        featureFlag: FeatureFlagType
+        payload?: Partial<FeatureFlagType>
+    }
+    saveSidebarExperimentFeatureFlag: (updatedFlag: Partial<FeatureFlagType>) => Partial<FeatureFlagType>
+    saveSidebarExperimentFeatureFlagFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    saveSidebarExperimentFeatureFlagSuccess: (
+        featureFlag: FeatureFlagType,
+        payload?: Partial<FeatureFlagType>
+    ) => {
+        featureFlag: FeatureFlagType
+        payload?: Partial<FeatureFlagType>
+    }
+    saveTagsInline: (tags: string[]) => {
+        tags: string[]
+    }
+    setAccessDeniedToFeatureFlag: () => {
+        value: true
+    }
+    setActiveTab: (tab: FeatureFlagsTab) => {
+        tab: FeatureFlagsTab
+    }
+    setBucketingIdentifier: (bucketingIdentifier: FeatureFlagBucketingIdentifier | null) => {
+        bucketingIdentifier: FeatureFlagBucketingIdentifier | null
+    }
+    setCopyDestinationProject: (id: number | null) => {
+        id: number | null
+    }
+    setCopySchedule: (copySchedule: boolean) => {
+        copySchedule: boolean
+    }
+    setCronExpression: (cronExpression: string | null) => {
+        cronExpression: string | null
+    }
+    setCustomPairCron: (
+        which: 'disable' | 'enable',
+        expression: string
+    ) => {
+        expression: string
+        which: 'disable' | 'enable'
+    }
+    setDisableCopiedFlag: (disableCopiedFlag: boolean) => {
+        disableCopiedFlag: boolean
+    }
+    setEndDate: (endDate: Dayjs | null) => {
+        endDate: Dayjs | null
+    }
+    setFeatureFlag: (featureFlag: FeatureFlagType) => {
+        featureFlag: FeatureFlagType
+    }
+    setFeatureFlagFilters: (
+        filters: FeatureFlagType['filters'],
+        errors: any
+    ) => {
+        errors: any
+        filters: FeatureFlagFilters
+    }
+    setFeatureFlagManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setFeatureFlagMissing: () => {
+        value: true
+    }
+    setFeatureFlagValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setFeatureFlagValues: (
+        values: DeepPartial<{
+            _create_in_folder?: string | null | undefined
+            _should_create_usage_dashboard?: boolean | undefined
+            active: boolean
+            archived: boolean
+            bucketing_identifier?: FeatureFlagBucketingIdentifier | null | undefined
+            can_edit: boolean
+            created_at: string | null
+            created_by: UserBasicType | null
+            deleted: boolean
+            ensure_experience_continuity: boolean
+            evaluation_contexts: string[]
+            evaluation_runtime: FeatureFlagEvaluationRuntime
+            experiment_set: number[] | null
+            experiment_set_metadata:
+                | {
+                      id: number
+                      is_running: boolean
+                      name: string
+                  }[]
+                | null
+            features: MinimalEarlyAccessFeatureType[] | null
+            filters: FeatureFlagFilters
+            has_encrypted_payloads: boolean
+            has_enriched_analytics?: boolean | undefined
+            id: number | null
+            is_remote_configuration: boolean
+            is_used_in_replay_settings?: boolean | undefined
+            key: string
+            last_called_at?: string | null | undefined
+            last_modified_by: UserBasicType | null
+            name: string
+            status: 'ACTIVE' | 'ARCHIVED' | 'DELETED' | 'STALE' | 'UNKNOWN'
+            surveys: Survey[] | null
+            tags: string[]
+            updated_at: string | null
+            usage_dashboard?: number | undefined
+            user_access_level: AccessControlLevel
+            version: number | null
+        }>
+    ) => {
+        values: DeepPartial<{
+            _create_in_folder?: string | null | undefined
+            _should_create_usage_dashboard?: boolean | undefined
+            active: boolean
+            archived: boolean
+            bucketing_identifier?: FeatureFlagBucketingIdentifier | null | undefined
+            can_edit: boolean
+            created_at: string | null
+            created_by: UserBasicType | null
+            deleted: boolean
+            ensure_experience_continuity: boolean
+            evaluation_contexts: string[]
+            evaluation_runtime: FeatureFlagEvaluationRuntime
+            experiment_set: number[] | null
+            experiment_set_metadata:
+                | {
+                      id: number
+                      is_running: boolean
+                      name: string
+                  }[]
+                | null
+            features: MinimalEarlyAccessFeatureType[] | null
+            filters: FeatureFlagFilters
+            has_encrypted_payloads: boolean
+            has_enriched_analytics?: boolean | undefined
+            id: number | null
+            is_remote_configuration: boolean
+            is_used_in_replay_settings?: boolean | undefined
+            key: string
+            last_called_at?: string | null | undefined
+            last_modified_by: UserBasicType | null
+            name: string
+            status: 'ACTIVE' | 'ARCHIVED' | 'DELETED' | 'STALE' | 'UNKNOWN'
+            surveys: Survey[] | null
+            tags: string[]
+            updated_at: string | null
+            usage_dashboard?: number | undefined
+            user_access_level: AccessControlLevel
+            version: number | null
+        }>
+    }
+    setFlagIntent: (intent: FlagIntent | null) => {
+        intent: FlagIntent | null
+    }
+    setIsRecurring: (isRecurring: boolean) => {
+        isRecurring: boolean
+    }
+    setMultivariateEnabled: (enabled: boolean) => {
+        enabled: boolean
+    }
+    setMultivariateOptions: (multivariateOptions: MultivariateFlagOptions | null) => {
+        multivariateOptions: MultivariateFlagOptions | null
+    }
+    setOpenVariants: (openVariants: string[]) => {
+        openVariants: string[]
+    }
+    setPayloadExpanded: (expanded: boolean) => {
+        expanded: boolean
+    }
+    setRecurrenceInterval: (interval: RecurrenceInterval | null) => {
+        interval: RecurrenceInterval | null
+    }
+    setRemoteConfigEnabled: (enabled: boolean) => {
+        enabled: boolean
+    }
+    setRepeatsValue: (value: RecurrenceInterval | 'cron' | 'none') => {
+        value: RecurrenceInterval | 'cron' | 'none'
+    }
+    setScheduleDateMarker: (dateMarker: any) => {
+        dateMarker: any
+    }
+    setSchedulePayload: (
+        filters: FeatureFlagType['filters'] | null,
+        active: FeatureFlagType['active'] | null,
+        errors?: any,
+        variants?: MultivariateFlagVariant[] | null,
+        payloads?: Record<string, any> | null
+    ) => {
+        active: boolean | null
+        errors: any
+        filters: FeatureFlagFilters | null
+        payloads: Record<string, any> | null | undefined
+        variants: MultivariateFlagVariant[] | null | undefined
+    }
+    setSchedulePreset: (preset: PairedPresetKey | null) => {
+        preset: PairedPresetKey | null
+    }
+    setScheduledChangeOperation: (changeType: ScheduledChangeOperationType) => {
+        changeType: ScheduledChangeOperationType
+    }
+    setShowImplementation: (show: boolean) => {
+        show: boolean
+    }
+    setTemplateExpanded: (expanded: boolean) => {
+        expanded: boolean
+    }
+    showDependentFlagsConfirmation: (payload: {
+        dependentFlags: DependentFlag[]
+        isBeingDisabled?: boolean
+        onConfirm: () => void
+        originalFlag: FeatureFlagType | null
+        requireStatusConfirmation?: boolean
+        updatedFlag: Partial<FeatureFlagType>
+    }) => {
+        dependentFlags: DependentFlag[]
+        isBeingDisabled?: boolean | undefined
+        onConfirm: () => void
+        originalFlag: FeatureFlagType | null
+        requireStatusConfirmation?: boolean | undefined
+        updatedFlag: Partial<FeatureFlagType>
+    }
+    stopRecurringScheduledChange: (scheduledChangeId: number) => {
+        scheduledChangeId: number
+    }
+    submitFeatureFlag: () => {
+        value: boolean
+    }
+    submitFeatureFlagFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitFeatureFlagRequest: (featureFlag: {
+        _create_in_folder?: string | null | undefined
+        _should_create_usage_dashboard?: boolean | undefined
+        active: boolean
+        archived: boolean
+        bucketing_identifier?: FeatureFlagBucketingIdentifier | null | undefined
+        can_edit: boolean
+        created_at: string | null
+        created_by: UserBasicType | null
+        deleted: boolean
+        ensure_experience_continuity: boolean
+        evaluation_contexts: string[]
+        evaluation_runtime: FeatureFlagEvaluationRuntime
+        experiment_set: number[] | null
+        experiment_set_metadata:
+            | {
+                  id: number
+                  is_running: boolean
+                  name: string
+              }[]
+            | null
+        features: MinimalEarlyAccessFeatureType[] | null
+        filters: FeatureFlagFilters
+        has_encrypted_payloads: boolean
+        has_enriched_analytics?: boolean | undefined
+        id: number | null
+        is_remote_configuration: boolean
+        is_used_in_replay_settings?: boolean | undefined
+        key: string
+        last_called_at?: string | null | undefined
+        last_modified_by: UserBasicType | null
+        name: string
+        status: 'ACTIVE' | 'ARCHIVED' | 'DELETED' | 'STALE' | 'UNKNOWN'
+        surveys: Survey[] | null
+        tags: string[]
+        updated_at: string | null
+        usage_dashboard?: number | undefined
+        user_access_level: AccessControlLevel
+        version: number | null
+    }) => {
+        featureFlag: {
+            _create_in_folder?: string | null | undefined
+            _should_create_usage_dashboard?: boolean | undefined
+            active: boolean
+            archived: boolean
+            bucketing_identifier?: FeatureFlagBucketingIdentifier | null | undefined
+            can_edit: boolean
+            created_at: string | null
+            created_by: UserBasicType | null
+            deleted: boolean
+            ensure_experience_continuity: boolean
+            evaluation_contexts: string[]
+            evaluation_runtime: FeatureFlagEvaluationRuntime
+            experiment_set: number[] | null
+            experiment_set_metadata:
+                | {
+                      id: number
+                      is_running: boolean
+                      name: string
+                  }[]
+                | null
+            features: MinimalEarlyAccessFeatureType[] | null
+            filters: FeatureFlagFilters
+            has_encrypted_payloads: boolean
+            has_enriched_analytics?: boolean | undefined
+            id: number | null
+            is_remote_configuration: boolean
+            is_used_in_replay_settings?: boolean | undefined
+            key: string
+            last_called_at?: string | null | undefined
+            last_modified_by: UserBasicType | null
+            name: string
+            status: 'ACTIVE' | 'ARCHIVED' | 'DELETED' | 'STALE' | 'UNKNOWN'
+            surveys: Survey[] | null
+            tags: string[]
+            updated_at: string | null
+            usage_dashboard?: number | undefined
+            user_access_level: AccessControlLevel
+            version: number | null
+        }
+    }
+    submitFeatureFlagSuccess: (featureFlag: {
+        _create_in_folder?: string | null | undefined
+        _should_create_usage_dashboard?: boolean | undefined
+        active: boolean
+        archived: boolean
+        bucketing_identifier?: FeatureFlagBucketingIdentifier | null | undefined
+        can_edit: boolean
+        created_at: string | null
+        created_by: UserBasicType | null
+        deleted: boolean
+        ensure_experience_continuity: boolean
+        evaluation_contexts: string[]
+        evaluation_runtime: FeatureFlagEvaluationRuntime
+        experiment_set: number[] | null
+        experiment_set_metadata:
+            | {
+                  id: number
+                  is_running: boolean
+                  name: string
+              }[]
+            | null
+        features: MinimalEarlyAccessFeatureType[] | null
+        filters: FeatureFlagFilters
+        has_encrypted_payloads: boolean
+        has_enriched_analytics?: boolean | undefined
+        id: number | null
+        is_remote_configuration: boolean
+        is_used_in_replay_settings?: boolean | undefined
+        key: string
+        last_called_at?: string | null | undefined
+        last_modified_by: UserBasicType | null
+        name: string
+        status: 'ACTIVE' | 'ARCHIVED' | 'DELETED' | 'STALE' | 'UNKNOWN'
+        surveys: Survey[] | null
+        tags: string[]
+        updated_at: string | null
+        usage_dashboard?: number | undefined
+        user_access_level: AccessControlLevel
+        version: number | null
+    }) => {
+        featureFlag: {
+            _create_in_folder?: string | null | undefined
+            _should_create_usage_dashboard?: boolean | undefined
+            active: boolean
+            archived: boolean
+            bucketing_identifier?: FeatureFlagBucketingIdentifier | null | undefined
+            can_edit: boolean
+            created_at: string | null
+            created_by: UserBasicType | null
+            deleted: boolean
+            ensure_experience_continuity: boolean
+            evaluation_contexts: string[]
+            evaluation_runtime: FeatureFlagEvaluationRuntime
+            experiment_set: number[] | null
+            experiment_set_metadata:
+                | {
+                      id: number
+                      is_running: boolean
+                      name: string
+                  }[]
+                | null
+            features: MinimalEarlyAccessFeatureType[] | null
+            filters: FeatureFlagFilters
+            has_encrypted_payloads: boolean
+            has_enriched_analytics?: boolean | undefined
+            id: number | null
+            is_remote_configuration: boolean
+            is_used_in_replay_settings?: boolean | undefined
+            key: string
+            last_called_at?: string | null | undefined
+            last_modified_by: UserBasicType | null
+            name: string
+            status: 'ACTIVE' | 'ARCHIVED' | 'DELETED' | 'STALE' | 'UNKNOWN'
+            surveys: Survey[] | null
+            tags: string[]
+            updated_at: string | null
+            usage_dashboard?: number | undefined
+            user_access_level: AccessControlLevel
+            version: number | null
+        }
+    }
+    submitFeatureFlagWithValidation: (featureFlag: Partial<FeatureFlagType>) => {
+        featureFlag: Partial<FeatureFlagType>
+    }
+    toggleFeatureFlagActive: (active: boolean) => {
+        active: boolean
+    }
+    toggleProjectFlagActive: (
+        teamId: number,
+        flagId: number,
+        active: boolean
+    ) => {
+        active: boolean
+        flagId: number
+        teamId: number
+    }
+    touchFeatureFlagField: (key: string) => {
+        key: string
+    }
+    updateFeatureFlagActive: (active: boolean) => boolean
+    updateFeatureFlagActiveFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateFeatureFlagActiveSuccess: (
+        featureFlagActiveUpdate: FeatureFlagType,
+        payload?: boolean
+    ) => {
+        featureFlagActiveUpdate: FeatureFlagType
+        payload?: boolean
+    }
+    updateFeatureFlagArchived: (archived: boolean) => boolean
+    updateFeatureFlagArchivedFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateFeatureFlagArchivedSuccess: (
+        featureFlagActiveUpdate: FeatureFlagType,
+        payload?: boolean
+    ) => {
+        featureFlagActiveUpdate: FeatureFlagType
+        payload?: boolean
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface featureFlagLogicMeta {
+    key: number | 'link' | 'new'
+    sharedListeners: {
+        checkDependentFlagsAndConfirm: (
+            payload: {
+                onConfirm: () => void
+                originalFlag: FeatureFlagType | null
+                requireStatusConfirmation?: boolean | undefined
+                updatedFlag: Partial<FeatureFlagType>
+            },
+            breakpoint: BreakPointFunction,
+            action: {
+                type: string
+                payload: {
+                    onConfirm: () => void
+                    originalFlag: FeatureFlagType | null
+                    requireStatusConfirmation?: boolean | undefined
+                    updatedFlag: Partial<FeatureFlagType>
+                }
+            },
+            previousState: any
+        ) => void | Promise<void>
+        showDependentFlagsConfirmation: (
+            payload: {
+                dependentFlags: DependentFlag[]
+                isBeingDisabled?: boolean | undefined
+                onConfirm: () => void
+                originalFlag: FeatureFlagType | null
+                requireStatusConfirmation?: boolean | undefined
+                updatedFlag: Partial<FeatureFlagType>
+            },
+            breakpoint: BreakPointFunction,
+            action: {
+                type: string
+                payload: {
+                    dependentFlags: DependentFlag[]
+                    isBeingDisabled?: boolean | undefined
+                    onConfirm: () => void
+                    originalFlag: FeatureFlagType | null
+                    requireStatusConfirmation?: boolean | undefined
+                    updatedFlag: Partial<FeatureFlagType>
+                }
+            },
+            previousState: any
+        ) => void | Promise<void>
+    }
+    __keaTypeGenInternalSelectorTypes: {
+        props: (arg: any) => any
+        hasUnsavedChanges: (featureFlag: FeatureFlagType, originalFeatureFlag: FeatureFlagType | null) => boolean
+        isFormDirty: (
+            originalFeatureFlag: FeatureFlagType | null,
+            hasUnsavedChanges: boolean,
+            featureFlagChanged: boolean
+        ) => boolean
+        multivariateEnabled: (featureFlag: FeatureFlagType) => boolean
+        flagType: (featureFlag: FeatureFlagType) => 'boolean' | 'multivariate' | 'remote_config'
+        flagTypeString: (
+            featureFlag: FeatureFlagType
+        ) =>
+            | 'Multiple variants with rollout percentages (A/B/n test)'
+            | 'Release toggle (boolean)'
+            | 'Remote configuration (single payload)'
+        roleBasedAccessEnabled: (
+            hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean
+        ) => boolean
+        variants: (featureFlag: FeatureFlagType) => MultivariateFlagVariant[]
+        nonEmptyVariants: (variants: MultivariateFlagVariant[]) => MultivariateFlagVariant[]
+        variantRolloutSum: (variants: MultivariateFlagVariant[]) => number
+        areVariantRolloutsValid: (variants: MultivariateFlagVariant[], variantRolloutSum: number) => boolean
+        aggregationTargetName: (
+            featureFlag: FeatureFlagType,
+            aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun
+        ) => string
+        breadcrumbs: (featureFlag: FeatureFlagType) => Breadcrumb[]
+        projectTreeRef: (arg: number | 'link' | 'new') => ProjectTreeRef
+        sidePanelContext: (featureFlag: FeatureFlagType) => SidePanelSceneContext | null
+        recordingFilterForFlag: (featureFlag: FeatureFlagType) => Partial<RecordingUniversalFilters>
+        hasEarlyAccessFeatures: (featureFlag: FeatureFlagType) => boolean
+        earlyAccessFeaturesList: (featureFlag: FeatureFlagType) => MinimalEarlyAccessFeatureType[]
+        featureFlagKey: (featureFlag: FeatureFlagType) => string
+        canCreateEarlyAccessFeature: (featureFlag: FeatureFlagType, variants: MultivariateFlagVariant[]) => boolean
+        hasSurveys: (featureFlag: FeatureFlagType) => boolean | null
+        hasEncryptedPayloadBeenSaved: (featureFlag: FeatureFlagType, props: any) => boolean | undefined
+        hasExperiment: (featureFlag: FeatureFlagType) => boolean | null
+        isDraftExperiment: (experiment: any) => boolean
+        properties: (featureFlag: FeatureFlagType) => AnyPropertyFilter[]
+        variantErrors: (variants: MultivariateFlagVariant[]) => VariantError[]
+        repeatsValue: (
+            isRecurring: boolean,
+            cronExpression: string | null,
+            recurrenceInterval: RecurrenceInterval | null
+        ) => RecurrenceInterval | 'cron' | 'none'
+        cronPreview: (cronExpression: string | null) => string | null
+        customPairEnableCronPreview: (customPairEnableCron: string) => string | null
+        customPairDisableCronPreview: (customPairDisableCron: string) => string | null
+        canCreatePairedSchedule: (
+            schedulePreset: PairedPresetKey | null,
+            customPairEnableCron: string,
+            customPairDisableCron: string,
+            customPairEnableCronPreview: string | null,
+            customPairDisableCronPreview: string | null
+        ) => boolean
+        activeRecurringSchedules: (scheduledChanges: ScheduledChangeType[]) => ScheduledChangeType[]
+        pausedRecurringSchedules: (scheduledChanges: ScheduledChangeType[]) => ScheduledChangeType[]
+        upcomingOneTimeSchedules: (scheduledChanges: ScheduledChangeType[]) => ScheduledChangeType[]
+        completedSchedules: (scheduledChanges: ScheduledChangeType[]) => ScheduledChangeType[]
+        activeSchedules: (
+            activeRecurringSchedules: ScheduledChangeType[],
+            pausedRecurringSchedules: ScheduledChangeType[],
+            upcomingOneTimeSchedules: ScheduledChangeType[]
+        ) => ScheduledChangeType[]
+        emailDomain: (user: UserType | null) => string
+        templates: (emailDomain: string) => Array<{
+            description: string
+            getValues: (flag: FeatureFlagType) => Partial<FeatureFlagType>
+            id: string
+            name: string
+        }>
+    }
+}
+
+export type featureFlagLogicType = MakeLogicType<
+    featureFlagLogicValues,
+    featureFlagLogicActions,
+    FeatureFlagLogicProps,
+    featureFlagLogicMeta
+>
+
 export const featureFlagLogic = kea<featureFlagLogicType>([
     path(['scenes', 'feature-flags', 'featureFlagLogic']),
     props({} as FeatureFlagLogicProps),
@@ -2471,7 +3703,7 @@ export const featureFlagLogic = kea<featureFlagLogicType>([
         props: [() => [(_, props) => props], (props) => props],
         hasUnsavedChanges: [
             (s) => [s.featureFlag, s.originalFeatureFlag],
-            (featureFlag, originalFeatureFlag): boolean => {
+            (featureFlag: FeatureFlagType, originalFeatureFlag: FeatureFlagType | null): boolean => {
                 if (!originalFeatureFlag) {
                     // New flag — compare against form defaults via featureFlagChanged instead
                     return false
@@ -2482,15 +3714,22 @@ export const featureFlagLogic = kea<featureFlagLogicType>([
         ],
         isFormDirty: [
             (s) => [s.originalFeatureFlag, s.hasUnsavedChanges, s.featureFlagChanged],
-            (originalFeatureFlag, hasUnsavedChanges, featureFlagChanged): boolean =>
+            (
+                originalFeatureFlag: FeatureFlagType | null,
+                hasUnsavedChanges: boolean,
+                featureFlagChanged: boolean
+            ): boolean =>
                 // Existing flags compare against server state; new flags fall back to the
                 // form-defaults check from kea-forms (NEW_FLAG would otherwise always read dirty).
                 originalFeatureFlag ? hasUnsavedChanges : featureFlagChanged,
         ],
-        multivariateEnabled: [(s) => [s.featureFlag], (featureFlag) => !!featureFlag?.filters.multivariate],
+        multivariateEnabled: [
+            (s) => [s.featureFlag],
+            (featureFlag: FeatureFlagType) => !!featureFlag?.filters.multivariate,
+        ],
         flagType: [
             (s) => [s.featureFlag],
-            (featureFlag) =>
+            (featureFlag: FeatureFlagType) =>
                 featureFlag?.is_remote_configuration
                     ? 'remote_config'
                     : featureFlag?.filters.multivariate
@@ -2499,7 +3738,7 @@ export const featureFlagLogic = kea<featureFlagLogicType>([
         ],
         flagTypeString: [
             (s) => [s.featureFlag],
-            (featureFlag) =>
+            (featureFlag: FeatureFlagType) =>
                 featureFlag?.is_remote_configuration
                     ? 'Remote configuration (single payload)'
                     : featureFlag?.filters.multivariate
@@ -2508,23 +3747,37 @@ export const featureFlagLogic = kea<featureFlagLogicType>([
         ],
         roleBasedAccessEnabled: [
             (s) => [s.hasAvailableFeature],
-            (hasAvailableFeature) => hasAvailableFeature(AvailableFeature.ROLE_BASED_ACCESS),
+            (hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean) =>
+                hasAvailableFeature(AvailableFeature.ROLE_BASED_ACCESS),
+        ],
+        variants: [
+            (s) => [s.featureFlag],
+            (featureFlag: FeatureFlagType) => featureFlag?.filters.multivariate?.variants || [],
+        ],
+        nonEmptyVariants: [
+            (s) => [s.variants],
+            (variants: MultivariateFlagVariant[]) => variants.filter(({ key }) => !!key),
         ],
-        variants: [(s) => [s.featureFlag], (featureFlag) => featureFlag?.filters.multivariate?.variants || []],
-        nonEmptyVariants: [(s) => [s.variants], (variants) => variants.filter(({ key }) => !!key)],
         variantRolloutSum: [
             (s) => [s.variants],
-            (variants) => variants.reduce((total: number, { rollout_percentage }) => total + rollout_percentage, 0),
+            (variants: MultivariateFlagVariant[]) =>
+                variants.reduce((total: number, { rollout_percentage }) => total + rollout_percentage, 0),
         ],
         areVariantRolloutsValid: [
             (s) => [s.variants, s.variantRolloutSum],
-            (variants, variantRolloutSum) =>
+            (variants: MultivariateFlagVariant[], variantRolloutSum: number) =>
                 variants.every(({ rollout_percentage }) => rollout_percentage >= 0 && rollout_percentage <= 100) &&
                 variantRolloutSum === 100,
         ],
         aggregationTargetName: [
             (s) => [s.featureFlag, s.aggregationLabel],
-            (featureFlag, aggregationLabel): string => {
+            (
+                featureFlag: FeatureFlagType,
+                aggregationLabel: (
+                    groupTypeIndex: number | null | undefined,
+                    deferToUserWording?: boolean
+                ) => import('~/models/groupsModel').Noun
+            ): string => {
                 if (featureFlag && featureFlag.filters.aggregation_group_type_index != null) {
                     return aggregationLabel(featureFlag.filters.aggregation_group_type_index).plural
                 }
@@ -2533,7 +3786,7 @@ export const featureFlagLogic = kea<featureFlagLogicType>([
         ],
         breadcrumbs: [
             (s) => [s.featureFlag],
-            (featureFlag): Breadcrumb[] => [
+            (featureFlag: FeatureFlagType): Breadcrumb[] => [
                 {
                     key: Scene.FeatureFlags,
                     name: 'Feature Flags',
@@ -2549,12 +3802,15 @@ export const featureFlagLogic = kea<featureFlagLogicType>([
         ],
         projectTreeRef: [
             () => [(_, props: FeatureFlagLogicProps) => props.id],
-            (id): ProjectTreeRef => ({ type: 'feature_flag', ref: id === 'link' || id === 'new' ? null : String(id) }),
+            (id: number | 'link' | 'new'): ProjectTreeRef => ({
+                type: 'feature_flag',
+                ref: id === 'link' || id === 'new' ? null : String(id),
+            }),
         ],
 
         [SIDE_PANEL_CONTEXT_KEY]: [
             (s) => [s.featureFlag],
-            (featureFlag): SidePanelSceneContext | null => {
+            (featureFlag: FeatureFlagType): SidePanelSceneContext | null => {
                 return featureFlag?.id
                     ? {
                           activity_scope: ActivityScope.FEATURE_FLAG,
@@ -2567,7 +3823,7 @@ export const featureFlagLogic = kea<featureFlagLogicType>([
         ],
         recordingFilterForFlag: [
             (s) => [s.featureFlag],
-            (featureFlag): Partial<RecordingUniversalFilters> => {
+            (featureFlag: FeatureFlagType): Partial<RecordingUniversalFilters> => {
                 const flagKey = featureFlag?.key
                 if (!flagKey) {
                     return {}
@@ -2578,37 +3834,37 @@ export const featureFlagLogic = kea<featureFlagLogicType>([
         ],
         hasEarlyAccessFeatures: [
             (s) => [s.featureFlag],
-            (featureFlag) => {
+            (featureFlag: FeatureFlagType) => {
                 return (featureFlag?.features?.length || 0) > 0
             },
         ],
         earlyAccessFeaturesList: [
             (s) => [s.featureFlag],
-            (featureFlag) => {
+            (featureFlag: FeatureFlagType) => {
                 return featureFlag?.features || []
             },
         ],
         featureFlagKey: [
             (s) => [s.featureFlag],
-            (featureFlag) => {
+            (featureFlag: FeatureFlagType) => {
                 return featureFlag.key
             },
         ],
         canCreateEarlyAccessFeature: [
             (s) => [s.featureFlag, s.variants],
-            (featureFlag, variants) => {
+            (featureFlag: FeatureFlagType, variants: MultivariateFlagVariant[]) => {
                 return featureFlag && featureFlag.filters.aggregation_group_type_index == null && variants.length === 0
             },
         ],
         hasSurveys: [
             (s) => [s.featureFlag],
-            (featureFlag) => {
+            (featureFlag: FeatureFlagType) => {
                 return featureFlag?.surveys && featureFlag.surveys.length > 0
             },
         ],
         hasEncryptedPayloadBeenSaved: [
             (s) => [s.featureFlag, s.props],
-            (featureFlag, props) => {
+            (featureFlag: FeatureFlagType, props) => {
                 if (!featureFlag.has_encrypted_payloads) {
                     return false
                 }
@@ -2620,7 +3876,7 @@ export const featureFlagLogic = kea<featureFlagLogicType>([
         ],
         hasExperiment: [
             (s) => [s.featureFlag],
-            (featureFlag) => {
+            (featureFlag: FeatureFlagType) => {
                 return featureFlag?.experiment_set && featureFlag.experiment_set.length > 0
             },
         ],
@@ -2642,7 +3898,7 @@ export const featureFlagLogic = kea<featureFlagLogicType>([
         ],
         variantErrors: [
             (s) => [s.variants],
-            (variants) => {
+            (variants: MultivariateFlagVariant[]) => {
                 const errors: VariantError[] = variants.map(({ key: variantKey }: MultivariateFlagVariant) => ({
                     key: validateFeatureFlagKey(variantKey),
                 }))
@@ -2651,12 +3907,25 @@ export const featureFlagLogic = kea<featureFlagLogicType>([
         ],
         repeatsValue: [
             (s) => [s.isRecurring, s.cronExpression, s.recurrenceInterval],
-            (isRecurring, cronExpression, recurrenceInterval): RecurrenceInterval | 'none' | 'cron' =>
+            (
+                isRecurring: boolean,
+                cronExpression: string | null,
+                recurrenceInterval: RecurrenceInterval | null
+            ): RecurrenceInterval | 'none' | 'cron' =>
                 isRecurring ? (cronExpression !== null ? 'cron' : (recurrenceInterval ?? 'none')) : 'none',
         ],
-        cronPreview: [(s) => [s.cronExpression], (cronExpression): string | null => describeCron(cronExpression)],
-        customPairEnableCronPreview: [(s) => [s.customPairEnableCron], (cron): string | null => describeCron(cron)],
-        customPairDisableCronPreview: [(s) => [s.customPairDisableCron], (cron): string | null => describeCron(cron)],
+        cronPreview: [
+            (s) => [s.cronExpression],
+            (cronExpression: string | null): string | null => describeCron(cronExpression),
+        ],
+        customPairEnableCronPreview: [
+            (s) => [s.customPairEnableCron],
+            (cron: string): string | null => describeCron(cron),
+        ],
+        customPairDisableCronPreview: [
+            (s) => [s.customPairDisableCron],
+            (cron: string): string | null => describeCron(cron),
+        ],
         canCreatePairedSchedule: [
             (s) => [
                 s.schedulePreset,
@@ -2665,7 +3934,13 @@ export const featureFlagLogic = kea<featureFlagLogicType>([
                 s.customPairEnableCronPreview,
                 s.customPairDisableCronPreview,
             ],
-            (preset, enableCron, disableCron, enablePreview, disablePreview): boolean => {
+            (
+                preset: PairedPresetKey | null,
+                enableCron: string,
+                disableCron: string,
+                enablePreview: string | null,
+                disablePreview: string | null
+            ): boolean => {
                 if (!preset) {
                     return false
                 }
@@ -2707,14 +3982,20 @@ export const featureFlagLogic = kea<featureFlagLogicType>([
         activeSchedules: [
             (s) => [s.activeRecurringSchedules, s.pausedRecurringSchedules, s.upcomingOneTimeSchedules],
             // Interleave all schedule types so the upcoming list reads soonest first.
-            (activeRecurring, pausedRecurring, upcomingOneTime) =>
-                [...activeRecurring, ...pausedRecurring, ...upcomingOneTime].sort(byScheduledAt),
+            (
+                activeRecurring: ScheduledChangeType[],
+                pausedRecurring: ScheduledChangeType[],
+                upcomingOneTime: ScheduledChangeType[]
+            ) => [...activeRecurring, ...pausedRecurring, ...upcomingOneTime].sort(byScheduledAt),
+        ],
+        emailDomain: [
+            (s) => [s.user],
+            (user: null | import('~/types').UserType) => user?.email?.split('@')[1] || 'example.com',
         ],
-        emailDomain: [(s) => [s.user], (user) => user?.email?.split('@')[1] || 'example.com'],
         templates: [
             (s) => [s.emailDomain],
             (
-                emailDomain
+                emailDomain: string
             ): Array<{
                 id: string
                 name: string
diff --git a/frontend/src/scenes/feature-flags/featureFlagReleaseConditionsLogic.ts b/frontend/src/scenes/feature-flags/featureFlagReleaseConditionsLogic.ts
index 5d4ee80891cb..e550877e69f5 100644
--- a/frontend/src/scenes/feature-flags/featureFlagReleaseConditionsLogic.ts
+++ b/frontend/src/scenes/feature-flags/featureFlagReleaseConditionsLogic.ts
@@ -1,4 +1,5 @@
 import {
+    MakeLogicType,
     actions,
     afterMount,
     connect,
@@ -36,8 +37,10 @@ import {
     UserBlastRadiusType,
 } from '~/types'
 
+import type { SimpleOption } from '../../lib/components/TaxonomicFilter/types'
+import type { Noun } from '../../models/groupsModel'
+import type { GroupType } from '../../types'
 import { resolveAggregationGroupTypeIndex } from './aggregation'
-import type { featureFlagReleaseConditionsLogicType } from './featureFlagReleaseConditionsLogicType'
 
 // A property filter targets people by their raw distinct id.
 export function isDistinctIdFilter(property: AnyPropertyFilter): boolean {
@@ -102,6 +105,218 @@ function ensureSortKeys(
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface featureFlagReleaseConditionsLogicValues {
+    aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun // groupsModel
+    groupTypes: Map<GroupTypeIndex, GroupType> // groupsModel
+    currentProjectId: number | null // projectLogic
+    affectedCounts: Record<string, number | undefined>
+    aggregationTargetName: (conditionGroupTypeIndex?: number | null | undefined) => string
+    computeBlastRadiusPercentage: (rolloutPercentage: any, sortKey: any) => any
+    distinctIdNameCache: Record<string, string>
+    distinctIds: string[]
+    draggedGroup: FeatureFlagGroupType | null
+    filterGroups: FeatureFlagGroupType[]
+    filters: FeatureFlagFilters & {
+        groups: FeatureFlagGroupTypeWithSortKey[]
+    }
+    filtersTaxonomicOptions: Partial<Record<TaxonomicFilterGroupType, SimpleOption[]>>
+    flagIds: string[]
+    flagKeyCache: Record<string, string>
+    flagKeyLoading: boolean
+    flagKeysLoading: boolean
+    getDistinctIdName: (distinctId: string) => string
+    getFlagKey: (flagId: string) => string
+    isAnyItemDragging: boolean
+    openConditions: string[]
+    properties: AnyPropertyFilter[]
+    propertySelectErrors: {
+        properties:
+            | {
+                  value: string | undefined
+              }[]
+            | undefined
+        rollout_percentage: string | undefined
+        variant: null
+    }[]
+    taxonomicGroupTypes: TaxonomicFilterGroupType[]
+    taxonomicGroupTypesForCondition: (conditionGroupTypeIndex: number | null | undefined) => TaxonomicFilterGroupType[]
+    totalCounts: Record<string, number | undefined>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface featureFlagReleaseConditionsLogicActions {
+    addConditionSet: (sortKey?: string) => {
+        sortKey: string | undefined
+    }
+    calculateBlastRadius: () => {
+        value: true
+    }
+    calculateBlastRadiusForCondition: (
+        sortKey: string,
+        properties: AnyPropertyFilter[] | undefined,
+        groupTypeIndex: number | null
+    ) => {
+        groupTypeIndex: number | null
+        properties: AnyPropertyFilter[] | undefined
+        sortKey: string
+    }
+    duplicateConditionSet: (index: number) => {
+        index: number
+    }
+    loadAllFlagKeys: (flagIds: string[]) => {
+        flagIds: string[]
+    }
+    loadDistinctIdNames: (distinctIds: string[]) => {
+        distinctIds: string[]
+    }
+    moveConditionSetDown: (index: number) => {
+        index: number
+    }
+    moveConditionSetUp: (index: number) => {
+        index: number
+    }
+    openCondition: (sortKey: string) => {
+        sortKey: string
+    }
+    removeConditionSet: (index: number) => {
+        index: number
+    }
+    reorderConditionSets: (
+        activeId: string,
+        overId: string
+    ) => {
+        activeId: string
+        overId: string
+    }
+    setAffectedCount: (
+        sortKey: string,
+        count?: number
+    ) => {
+        count: number | undefined
+        sortKey: string
+    }
+    setAggregationGroupTypeIndex: (value: number | null) => {
+        value: number | null
+    }
+    setConditionAggregation: (
+        index: number,
+        groupTypeIndex: number | null
+    ) => {
+        groupTypeIndex: number | null
+        index: number
+    }
+    setDistinctIdNames: (distinctIdNames: Record<string, string>) => {
+        distinctIdNames: Record<string, string>
+    }
+    setDraggedGroup: (draggedGroup: FeatureFlagGroupType | null) => {
+        draggedGroup: FeatureFlagGroupType | null
+    }
+    setEarlyExit: (earlyExit: boolean) => {
+        earlyExit: boolean
+    }
+    setFilters: (filters: FeatureFlagFilters) => {
+        filters: FeatureFlagFilters
+    }
+    setFlagKeys: (flagKeys: Record<string, string>) => {
+        flagKeys: Record<string, string>
+    }
+    setFlagKeysLoading: (isLoading: boolean) => {
+        isLoading: boolean
+    }
+    setIsAnyItemDragging: (isAnyItemDragging: boolean) => {
+        isAnyItemDragging: boolean
+    }
+    setOpenConditions: (openConditions: string[]) => {
+        openConditions: string[]
+    }
+    setTotalCount: (
+        sortKey: string,
+        count?: number
+    ) => {
+        count: number | undefined
+        sortKey: string
+    }
+    updateConditionSet: (
+        index: number,
+        newRolloutPercentage?: number,
+        newProperties?: AnyPropertyFilter[],
+        newVariant?: string | null,
+        newDescription?: string | null
+    ) => {
+        index: number
+        newDescription: string | null | undefined
+        newProperties: AnyPropertyFilter[] | undefined
+        newRolloutPercentage: number | undefined
+        newVariant: string | null | undefined
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface featureFlagReleaseConditionsLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        filterGroups: (
+            filters: FeatureFlagFilters & {
+                groups: FeatureFlagGroupTypeWithSortKey[]
+            }
+        ) => FeatureFlagGroupType[]
+        taxonomicGroupTypes: (
+            filters: FeatureFlagFilters & {
+                groups: FeatureFlagGroupTypeWithSortKey[]
+            },
+            groupTypes: Map<GroupTypeIndex, GroupType>
+        ) => TaxonomicFilterGroupType[]
+        aggregationTargetName: (
+            filters: FeatureFlagFilters & {
+                groups: FeatureFlagGroupTypeWithSortKey[]
+            },
+            aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun
+        ) => (conditionGroupTypeIndex?: number | null | undefined) => string
+        taxonomicGroupTypesForCondition: (
+            filters: FeatureFlagFilters & {
+                groups: FeatureFlagGroupTypeWithSortKey[]
+            },
+            groupTypes: Map<GroupTypeIndex, GroupType>
+        ) => (conditionGroupTypeIndex: number | null | undefined) => TaxonomicFilterGroupType[]
+        filtersTaxonomicOptions: (
+            filters: FeatureFlagFilters & {
+                groups: FeatureFlagGroupTypeWithSortKey[]
+            }
+        ) => Partial<Record<TaxonomicFilterGroupType, SimpleOption[]>>
+        propertySelectErrors: (
+            filters: FeatureFlagFilters & {
+                groups: FeatureFlagGroupTypeWithSortKey[]
+            }
+        ) => {
+            properties:
+                | {
+                      value: string | undefined
+                  }[]
+                | undefined
+            rollout_percentage: string | undefined
+            variant: null
+        }[]
+        computeBlastRadiusPercentage: (
+            affectedCounts: Record<string, number | undefined>,
+            totalCounts: Record<string, number | undefined>
+        ) => (rolloutPercentage: any, sortKey: any) => any
+        getFlagKey: (flagKeyCache: Record<string, string>) => (flagId: string) => string
+        flagKeysLoading: (flagKeyLoading: boolean) => boolean
+        flagIds: (filterGroups: FeatureFlagGroupType[]) => string[]
+        distinctIds: (filterGroups: FeatureFlagGroupType[]) => string[]
+        getDistinctIdName: (distinctIdNameCache: Record<string, string>) => (distinctId: string) => string
+        properties: (filterGroups: FeatureFlagGroupType[]) => AnyPropertyFilter[]
+    }
+}
+
+export type featureFlagReleaseConditionsLogicType = MakeLogicType<
+    featureFlagReleaseConditionsLogicValues,
+    featureFlagReleaseConditionsLogicActions,
+    FeatureFlagReleaseConditionsLogicProps,
+    featureFlagReleaseConditionsLogicMeta
+>
+
 export const featureFlagReleaseConditionsLogic = kea<featureFlagReleaseConditionsLogicType>([
     path(['scenes', 'feature-flags', 'featureFlagReleaseConditionsLogic']),
     props({} as FeatureFlagReleaseConditionsLogicProps),
@@ -692,7 +907,12 @@ export const featureFlagReleaseConditionsLogic = kea<featureFlagReleaseCondition
         filterGroups: [(s) => [s.filters], (filters: FeatureFlagFilters) => filters.groups || []],
         taxonomicGroupTypes: [
             (s) => [s.filters, s.groupTypes],
-            (filters, groupTypes): TaxonomicFilterGroupType[] => {
+            (
+                filters: FeatureFlagFilters & {
+                    groups: FeatureFlagGroupTypeWithSortKey[]
+                },
+                groupTypes: Map<GroupTypeIndex, import('~/types').GroupType>
+            ): TaxonomicFilterGroupType[] => {
                 const targetGroupTypes = []
                 const targetGroup =
                     filters?.aggregation_group_type_index != null
@@ -718,7 +938,15 @@ export const featureFlagReleaseConditionsLogic = kea<featureFlagReleaseCondition
         ],
         aggregationTargetName: [
             (s) => [s.filters, s.aggregationLabel],
-            (filters, aggregationLabel) =>
+            (
+                filters: FeatureFlagFilters & {
+                    groups: FeatureFlagGroupTypeWithSortKey[]
+                },
+                aggregationLabel: (
+                    groupTypeIndex: number | null | undefined,
+                    deferToUserWording?: boolean
+                ) => import('~/models/groupsModel').Noun
+            ) =>
                 (conditionGroupTypeIndex?: number | null): string => {
                     const effectiveIndex = resolveAggregationGroupTypeIndex(
                         conditionGroupTypeIndex,
@@ -732,7 +960,12 @@ export const featureFlagReleaseConditionsLogic = kea<featureFlagReleaseCondition
         ],
         taxonomicGroupTypesForCondition: [
             (s) => [s.filters, s.groupTypes],
-            (filters, groupTypes) =>
+            (
+                filters: FeatureFlagFilters & {
+                    groups: FeatureFlagGroupTypeWithSortKey[]
+                },
+                groupTypes: Map<GroupTypeIndex, import('~/types').GroupType>
+            ) =>
                 (conditionGroupTypeIndex: number | null | undefined): TaxonomicFilterGroupType[] => {
                     const effectiveIndex = resolveAggregationGroupTypeIndex(
                         conditionGroupTypeIndex,
@@ -765,7 +998,11 @@ export const featureFlagReleaseConditionsLogic = kea<featureFlagReleaseCondition
         ],
         filtersTaxonomicOptions: [
             (s) => [s.filters],
-            (filters) => {
+            (
+                filters: FeatureFlagFilters & {
+                    groups: FeatureFlagGroupTypeWithSortKey[]
+                }
+            ) => {
                 if (filters && filters.aggregation_group_type_index != null) {
                     return {}
                 }
@@ -783,7 +1020,11 @@ export const featureFlagReleaseConditionsLogic = kea<featureFlagReleaseCondition
         ],
         propertySelectErrors: [
             (s) => [s.filters],
-            (filters) => {
+            (
+                filters: FeatureFlagFilters & {
+                    groups: FeatureFlagGroupTypeWithSortKey[]
+                }
+            ) => {
                 return filters?.groups?.map(({ properties, rollout_percentage }: FeatureFlagGroupType) => ({
                     properties: properties?.map((property: AnyPropertyFilter) => ({
                         value: getPropertyValueError(property),
@@ -802,38 +1043,41 @@ export const featureFlagReleaseConditionsLogic = kea<featureFlagReleaseCondition
         ],
         computeBlastRadiusPercentage: [
             (s) => [s.affectedCounts, s.totalCounts],
-            (affectedCounts, totalCounts) => (rolloutPercentage, sortKey) => {
-                let effectiveRolloutPercentage = rolloutPercentage
-                if (
-                    rolloutPercentage === undefined ||
-                    rolloutPercentage === null ||
-                    (rolloutPercentage && rolloutPercentage > 100)
-                ) {
-                    effectiveRolloutPercentage = 100
-                }
+            (affectedCounts: Record<string, number | undefined>, totalCounts: Record<string, number | undefined>) =>
+                (rolloutPercentage, sortKey) => {
+                    let effectiveRolloutPercentage = rolloutPercentage
+                    if (
+                        rolloutPercentage === undefined ||
+                        rolloutPercentage === null ||
+                        (rolloutPercentage && rolloutPercentage > 100)
+                    ) {
+                        effectiveRolloutPercentage = 100
+                    }
 
-                const affected = affectedCounts[sortKey]
-                const total = totalCounts[sortKey]
+                    const affected = affectedCounts[sortKey]
+                    const total = totalCounts[sortKey]
 
-                if (affected === -1 || total === -1 || !total || affected === undefined) {
-                    return effectiveRolloutPercentage
-                }
+                    if (affected === -1 || total === -1 || !total || affected === undefined) {
+                        return effectiveRolloutPercentage
+                    }
 
-                let effectiveTotal = total
-                if (effectiveTotal === 0) {
-                    effectiveTotal = 1
-                }
+                    let effectiveTotal = total
+                    if (effectiveTotal === 0) {
+                        effectiveTotal = 1
+                    }
 
-                return Math.round(effectiveRolloutPercentage * ((affected ?? 0) / effectiveTotal) * 1000000) / 1000000
-            },
+                    return (
+                        Math.round(effectiveRolloutPercentage * ((affected ?? 0) / effectiveTotal) * 1000000) / 1000000
+                    )
+                },
         ],
         getFlagKey: [
             (s) => [s.flagKeyCache],
-            (flagKeyCache) => (flagId: string) => {
+            (flagKeyCache: Record<string, string>) => (flagId: string) => {
                 return flagKeyCache[flagId] || flagId
             },
         ],
-        flagKeysLoading: [(s) => [s.flagKeyLoading], (flagKeyLoading) => flagKeyLoading],
+        flagKeysLoading: [(s) => [s.flagKeyLoading], (flagKeyLoading: boolean) => flagKeyLoading],
         flagIds: [
             (s) => [s.filterGroups],
             (filterGroups: FeatureFlagGroupType[]) =>
diff --git a/frontend/src/scenes/feature-flags/featureFlagScheduleEditLogic.ts b/frontend/src/scenes/feature-flags/featureFlagScheduleEditLogic.ts
index d0cb135a4d4a..bdadbc71a8eb 100644
--- a/frontend/src/scenes/feature-flags/featureFlagScheduleEditLogic.ts
+++ b/frontend/src/scenes/feature-flags/featureFlagScheduleEditLogic.ts
@@ -1,5 +1,5 @@
 import { CronExpressionParser } from 'cron-parser'
-import { actions, connect, key, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, key, kea, listeners, path, props, reducers, selectors } from 'kea'
 
 import api from 'lib/api'
 import { Dayjs, dayjs } from 'lib/dayjs'
@@ -7,6 +7,7 @@ import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
 
 import { RecurrenceInterval, ScheduledChangeOperationType, ScheduledChangeType } from '~/types'
 
+import type { TeamPublicType, TeamType } from '../../types'
 import { teamLogic } from '../teamLogic'
 import {
     describeCron,
@@ -14,7 +15,6 @@ import {
     scheduleDateFromStoredISO,
     scheduleDateToProjectTzISO,
 } from './featureFlagLogic'
-import type { featureFlagScheduleEditLogicType } from './featureFlagScheduleEditLogicType'
 
 // Used from reducers, which don't receive `values` — we still need a synchronous read at
 // action-dispatch time. Selectors and listeners use the reactive `projectTimezone` selector instead.
@@ -26,6 +26,106 @@ export interface FeatureFlagScheduleEditLogicProps {
     id: number | 'new' | 'link'
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface featureFlagScheduleEditLogicValues {
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    editCronExpression: string | null
+    editCronPreview: string | null
+    editEndDate: Dayjs | null
+    editIsRecurring: boolean
+    editOperationType: ScheduledChangeOperationType | null
+    editPayloadValue: boolean
+    editRecurrenceInterval: RecurrenceInterval | null
+    editRepeatsValue: RecurrenceInterval | 'cron' | 'none'
+    editSaving: boolean
+    editScheduledAt: Dayjs | null
+    editValidationErrors: Record<string, string>
+    editingSchedule: ScheduledChangeType | null
+    hasEditChanges: boolean
+    isEditOpen: boolean
+    projectTimezone: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface featureFlagScheduleEditLogicActions {
+    closeEdit: () => {
+        value: true
+    }
+    openEdit: (schedule: ScheduledChangeType) => {
+        schedule: ScheduledChangeType
+    }
+    saveEdit: () => {
+        value: true
+    }
+    saveEditFailure: () => {
+        value: true
+    }
+    saveEditSuccess: () => {
+        value: true
+    }
+    setEditCronExpression: (cron: string | null) => {
+        cron: string | null
+    }
+    setEditEndDate: (date: Dayjs | null) => {
+        date: Dayjs | null
+    }
+    setEditIsRecurring: (isRecurring: boolean) => {
+        isRecurring: boolean
+    }
+    setEditPayloadValue: (value: boolean) => {
+        value: boolean
+    }
+    setEditRecurrenceInterval: (interval: RecurrenceInterval | null) => {
+        interval: RecurrenceInterval | null
+    }
+    setEditRepeatsValue: (value: RecurrenceInterval | 'cron' | 'none') => {
+        value: RecurrenceInterval | 'cron' | 'none'
+    }
+    setEditScheduledAt: (date: Dayjs | null) => {
+        date: Dayjs | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface featureFlagScheduleEditLogicMeta {
+    key: number | 'link' | 'new'
+    __keaTypeGenInternalSelectorTypes: {
+        isEditOpen: (editingSchedule: ScheduledChangeType | null) => boolean
+        projectTimezone: (currentTeam: TeamPublicType | TeamType | null) => string
+        editRepeatsValue: (
+            editIsRecurring: boolean,
+            editCronExpression: string | null,
+            editRecurrenceInterval: RecurrenceInterval | null
+        ) => RecurrenceInterval | 'cron' | 'none'
+        editCronPreview: (editCronExpression: string | null) => string | null
+        editOperationType: (editingSchedule: ScheduledChangeType | null) => ScheduledChangeOperationType | null
+        hasEditChanges: (
+            editingSchedule: ScheduledChangeType | null,
+            editScheduledAt: Dayjs | null,
+            editCronExpression: string | null,
+            editRecurrenceInterval: RecurrenceInterval | null,
+            editEndDate: Dayjs | null,
+            editIsRecurring: boolean,
+            editPayloadValue: boolean,
+            projectTimezone: string
+        ) => boolean
+        editValidationErrors: (
+            editScheduledAt: Dayjs | null,
+            editCronExpression: string | null,
+            editEndDate: Dayjs | null,
+            editIsRecurring: boolean,
+            projectTimezone: string
+        ) => Record<string, string>
+    }
+}
+
+export type featureFlagScheduleEditLogicType = MakeLogicType<
+    featureFlagScheduleEditLogicValues,
+    featureFlagScheduleEditLogicActions,
+    FeatureFlagScheduleEditLogicProps,
+    featureFlagScheduleEditLogicMeta
+>
+
 export const featureFlagScheduleEditLogic = kea<featureFlagScheduleEditLogicType>([
     path((id) => ['scenes', 'feature-flags', 'featureFlagScheduleEditLogic', id]),
     props({} as FeatureFlagScheduleEditLogicProps),
@@ -126,19 +226,28 @@ export const featureFlagScheduleEditLogic = kea<featureFlagScheduleEditLogicType
         ],
     }),
     selectors({
-        isEditOpen: [(s) => [s.editingSchedule], (schedule): boolean => schedule !== null],
+        isEditOpen: [(s) => [s.editingSchedule], (schedule: ScheduledChangeType | null): boolean => schedule !== null],
         // Reactive timezone input — selectors that depend on it recompute when the project
         // timezone changes, which matters if the user switches projects while the edit dialog is open.
-        projectTimezone: [(s) => [s.currentTeam], (currentTeam): string => currentTeam?.timezone || 'UTC'],
+        projectTimezone: [
+            (s) => [s.currentTeam],
+            (currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType): string =>
+                currentTeam?.timezone || 'UTC',
+        ],
         editRepeatsValue: [
             (s) => [s.editIsRecurring, s.editCronExpression, s.editRecurrenceInterval],
-            (isRecurring, cron, interval): RecurrenceInterval | 'none' | 'cron' =>
+            (
+                isRecurring: boolean,
+                cron: string | null,
+                interval: RecurrenceInterval | null
+            ): RecurrenceInterval | 'none' | 'cron' =>
                 isRecurring ? (cron !== null ? 'cron' : (interval ?? 'none')) : 'none',
         ],
-        editCronPreview: [(s) => [s.editCronExpression], (cron): string | null => describeCron(cron)],
+        editCronPreview: [(s) => [s.editCronExpression], (cron: string | null): string | null => describeCron(cron)],
         editOperationType: [
             (s) => [s.editingSchedule],
-            (schedule): ScheduledChangeOperationType | null => schedule?.payload?.operation ?? null,
+            (schedule: ScheduledChangeType | null): ScheduledChangeOperationType | null =>
+                schedule?.payload?.operation ?? null,
         ],
         hasEditChanges: [
             (s) => [
@@ -151,7 +260,16 @@ export const featureFlagScheduleEditLogic = kea<featureFlagScheduleEditLogicType
                 s.editPayloadValue,
                 s.projectTimezone,
             ],
-            (schedule, scheduledAt, cron, interval, endDate, isRecurring, payloadValue, tz): boolean => {
+            (
+                schedule: ScheduledChangeType | null,
+                scheduledAt: Dayjs | null,
+                cron: string | null,
+                interval: RecurrenceInterval | null,
+                endDate: Dayjs | null,
+                isRecurring: boolean,
+                payloadValue: boolean,
+                tz: string
+            ): boolean => {
                 if (!schedule) {
                     return false
                 }
@@ -188,7 +306,13 @@ export const featureFlagScheduleEditLogic = kea<featureFlagScheduleEditLogicType
         ],
         editValidationErrors: [
             (s) => [s.editScheduledAt, s.editCronExpression, s.editEndDate, s.editIsRecurring, s.projectTimezone],
-            (scheduledAt, cron, endDate, isRecurring, tz): Record<string, string> => {
+            (
+                scheduledAt: Dayjs | null,
+                cron: string | null,
+                endDate: Dayjs | null,
+                isRecurring: boolean,
+                tz: string
+            ): Record<string, string> => {
                 const errors: Record<string, string> = {}
                 // editScheduledAt is a browser-local Dayjs whose wall clock mirrors the project
                 // timezone, so we reinterpret it in project tz before comparing to "now".
diff --git a/frontend/src/scenes/feature-flags/featureFlagTestingLogic.ts b/frontend/src/scenes/feature-flags/featureFlagTestingLogic.ts
index ad16b0812ee5..00135be1ae58 100644
--- a/frontend/src/scenes/feature-flags/featureFlagTestingLogic.ts
+++ b/frontend/src/scenes/feature-flags/featureFlagTestingLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api, { ApiError } from 'lib/api'
@@ -15,7 +15,7 @@ import type {
     FeatureFlagTestEvaluationResponseApi,
 } from 'products/feature_flags/frontend/generated/api.schemas'
 
-import type { featureFlagTestingLogicType } from './featureFlagTestingLogicType'
+import type { FeatureFlagConditionPropertyAnalysisApi } from '../../../../products/feature_flags/frontend/generated/api.schemas'
 
 export type ConditionAnalysis = FeatureFlagConditionAnalysisApi
 export type TestResult = FeatureFlagTestEvaluationResponseApi
@@ -121,6 +121,265 @@ export interface FeatureFlagTestingLogicProps {
     flagId: number
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface featureFlagTestingLogicValues {
+    currentProjectId: number | null // projectLogic
+    activeResult: TestResult | null
+    allEvaluations: PerDistinctIdEvaluation[] | null
+    allEvaluationsLoading: boolean
+    bucketingDistinctId: string | null
+    datePickerOpen: boolean
+    datePickerValue: Dayjs | null
+    enrichedConditions: {
+        display: {
+            label: string | null
+            tone: 'info' | 'muted' | 'success' | 'warning'
+        }
+        explanation: string
+        index: number
+        isWinningCondition: boolean
+        matched: boolean
+        matchedButNotWinner: boolean | undefined
+        properties: FeatureFlagConditionPropertyAnalysisApi[]
+        properties_matched?: boolean | undefined
+        rollout_excluded: boolean
+        rollout_percentage: number
+        variant: string | null
+    }[]
+    errorDisplay: {
+        helpText: string | null
+        message: string
+    } | null
+    hasMultipleDistinctIds: boolean
+    hasValidPerson: boolean
+    includeTime: boolean
+    personDistinctIds: string[]
+    resolvedPersonDistinctIds: string[] | null
+    resolvedPersonDistinctIdsLoading: boolean
+    resultsDiverge: boolean
+    selectedPerson: Partial<PersonType> | null
+    selectedResultDistinctId: string | null
+    testError: string | null
+    testEvaluation: TestResult | null
+    testEvaluationLoading: boolean
+    testFormData: TestFormData
+    testResult: TestResult | null
+    usedProperties: Set<string>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface featureFlagTestingLogicActions {
+    clearBatchEvaluations: () => {
+        value: true
+    }
+    clearBatchEvaluationsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    clearBatchEvaluationsSuccess: (
+        allEvaluations: null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        allEvaluations: null
+        payload?: {
+            value: true
+        }
+    }
+    clearTestForm: () => {
+        value: true
+    }
+    clearTestFormFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    clearTestFormSuccess: (
+        resolvedPersonDistinctIds: null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        resolvedPersonDistinctIds: null
+        payload?: {
+            value: true
+        }
+    }
+    resolvePersonDistinctIds: (distinctId: string) => string
+    resolvePersonDistinctIdsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    resolvePersonDistinctIdsSuccess: (
+        resolvedPersonDistinctIds: string[],
+        payload?: string
+    ) => {
+        resolvedPersonDistinctIds: string[]
+        payload?: string
+    }
+    setDatePickerOpen: (open: boolean) => {
+        open: boolean
+    }
+    setDatePickerValue: (value: Dayjs | null) => {
+        value: Dayjs | null
+    }
+    setIncludeTime: (includeTime: boolean) => {
+        includeTime: boolean
+    }
+    setSelectedPerson: (
+        person: Partial<PersonType> | null,
+        distinctId?: string
+    ) => {
+        distinctId: string | undefined
+        person: Partial<PersonType> | null
+    }
+    setSelectedPersonFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    setSelectedPersonSuccess: (
+        resolvedPersonDistinctIds: null,
+        payload?: {
+            distinctId: string | undefined
+            person: Partial<PersonType> | null
+        }
+    ) => {
+        resolvedPersonDistinctIds: null
+        payload?: {
+            distinctId: string | undefined
+            person: Partial<PersonType> | null
+        }
+    }
+    setSelectedResultDistinctId: (distinctId: string | null) => {
+        distinctId: string | null
+    }
+    setTestError: (error: string | null) => {
+        error: string | null
+    }
+    setTestFormData: (formData: Partial<TestFormData>) => {
+        formData: Partial<TestFormData>
+    }
+    testAllDistinctIds: ({
+        flagId,
+        distinctIds,
+        formData,
+    }: {
+        distinctIds: string[]
+        flagId: number
+        formData: TestFormData
+    }) => {
+        flagId: number
+        distinctIds: string[]
+        formData: TestFormData
+    }
+    testAllDistinctIdsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    testAllDistinctIdsSuccess: (
+        allEvaluations: PerDistinctIdEvaluation[],
+        payload?: {
+            flagId: number
+            distinctIds: string[]
+            formData: TestFormData
+        }
+    ) => {
+        allEvaluations: PerDistinctIdEvaluation[]
+        payload?: {
+            flagId: number
+            distinctIds: string[]
+            formData: TestFormData
+        }
+    }
+    testFlagEvaluation: ({ flagId, formData }: { flagId: number; formData: TestFormData }) => {
+        flagId: number
+        formData: TestFormData
+    }
+    testFlagEvaluationFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    testFlagEvaluationSuccess: (
+        testEvaluation: FeatureFlagTestEvaluationResponseApi,
+        payload?: {
+            flagId: number
+            formData: TestFormData
+        }
+    ) => {
+        testEvaluation: FeatureFlagTestEvaluationResponseApi
+        payload?: {
+            flagId: number
+            formData: TestFormData
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface featureFlagTestingLogicMeta {
+    key: number
+    __keaTypeGenInternalSelectorTypes: {
+        activeResult: (
+            testResult: FeatureFlagTestEvaluationResponseApi | null,
+            allEvaluations: PerDistinctIdEvaluation[] | null,
+            selectedResultDistinctId: string | null
+        ) => TestResult | null
+        resultsDiverge: (allEvaluations: PerDistinctIdEvaluation[] | null) => boolean
+        usedProperties: (activeResult: FeatureFlagTestEvaluationResponseApi | null) => Set<string>
+        enrichedConditions: (activeResult: FeatureFlagTestEvaluationResponseApi | null) => {
+            display: {
+                label: string | null
+                tone: 'info' | 'muted' | 'success' | 'warning'
+            }
+            explanation: string
+            index: number
+            isWinningCondition: boolean
+            matched: boolean
+            matchedButNotWinner: boolean | undefined
+            properties: FeatureFlagConditionPropertyAnalysisApi[]
+            properties_matched?: boolean | undefined
+            rollout_excluded: boolean
+            rollout_percentage: number
+            variant: string | null
+        }[]
+        hasValidPerson: (testFormData: TestFormData) => boolean
+        personDistinctIds: (
+            selectedPerson: Partial<PersonType> | null,
+            resolvedPersonDistinctIds: string[] | null
+        ) => string[]
+        hasMultipleDistinctIds: (personDistinctIds: string[]) => boolean
+        bucketingDistinctId: (activeResult: FeatureFlagTestEvaluationResponseApi | null) => string | null
+        errorDisplay: (testError: string | null) => {
+            helpText: string | null
+            message: string
+        } | null
+    }
+}
+
+export type featureFlagTestingLogicType = MakeLogicType<
+    featureFlagTestingLogicValues,
+    featureFlagTestingLogicActions,
+    FeatureFlagTestingLogicProps,
+    featureFlagTestingLogicMeta
+>
+
 export const featureFlagTestingLogic = kea<featureFlagTestingLogicType>([
     props({} as FeatureFlagTestingLogicProps),
     key((props) => props.flagId),
diff --git a/frontend/src/scenes/feature-flags/featureFlagsLogic.ts b/frontend/src/scenes/feature-flags/featureFlagsLogic.ts
index 173ffc41439c..77e303d71cb0 100644
--- a/frontend/src/scenes/feature-flags/featureFlagsLogic.ts
+++ b/frontend/src/scenes/feature-flags/featureFlagsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 
@@ -16,8 +16,6 @@ import { urls } from 'scenes/urls'
 import { SIDE_PANEL_CONTEXT_KEY, SidePanelSceneContext } from '~/layout/navigation-3000/sidepanel/types'
 import { ActivityScope, Breadcrumb, FeatureFlagType } from '~/types'
 
-import type { featureFlagsLogicType } from './featureFlagsLogicType'
-
 export const FLAGS_PER_PAGE = 100
 
 export function flagMatchesSearch(flag: FeatureFlagType, search?: string): boolean {
@@ -158,6 +156,179 @@ export interface FlagLogicProps {
     flagPrefix?: string // used to filter flags by prefix e.g. for the user interview flags
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface featureFlagsLogicValues {
+    currentProjectId: number | null // projectLogic
+    activeTab: FeatureFlagsTab
+    breadcrumbs: Breadcrumb[]
+    count: number
+    displayedFlags: FeatureFlagType[]
+    enrichAnalyticsNoticeAcknowledged: boolean
+    featureFlags: FeatureFlagsResult
+    featureFlagsLoading: boolean
+    featureFlagsUpdating: Record<number, boolean>
+    filters: FeatureFlagsFilters
+    filtersChanged: boolean
+    localFlagsCache: FeatureFlagType[]
+    pagination: PaginationManual
+    paramsFromFilters: {
+        active?: string | undefined
+        archived?: string | undefined
+        created_by_id?: number[] | undefined
+        evaluation_runtime?: string | undefined
+        excluded_tags?: string[] | undefined
+        limit: number
+        offset: number
+        order?: string | undefined
+        page?: number | undefined
+        search?: string | undefined
+        tags?: string[] | undefined
+        type?: string | undefined
+    }
+    shouldShowEmptyState: boolean
+    sidePanelContext: SidePanelSceneContext
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface featureFlagsLogicActions {
+    closeEnrichAnalyticsNotice: () => {
+        value: true
+    }
+    deleteFlag: (id: number) => {
+        id: number
+    }
+    loadFeatureFlags: () => any
+    loadFeatureFlagsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadFeatureFlagsSuccess: (
+        featureFlags: FeatureFlagsResult,
+        payload?: any
+    ) => {
+        featureFlags: FeatureFlagsResult
+        payload?: any
+    }
+    setActiveTab: (tabKey: FeatureFlagsTab) => {
+        tabKey: FeatureFlagsTab
+    }
+    setFeatureFlagUpdating: (
+        id: number,
+        updating: boolean
+    ) => {
+        id: number
+        updating: boolean
+    }
+    setFeatureFlagsFilters: (
+        filters: Partial<FeatureFlagsFilters>,
+        replace?: boolean
+    ) => {
+        filters: Partial<FeatureFlagsFilters>
+        replace: boolean | undefined
+    }
+    updateFeatureFlag: ({ id, payload }: { id: number; payload: Partial<FeatureFlagType> }) => {
+        id: number
+        payload: Partial<FeatureFlagType>
+    }
+    updateFeatureFlagFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateFeatureFlagSuccess: (
+        featureFlags: {
+            count: number
+            filters?: FeatureFlagsFilters | null | undefined
+            lastUpdatedFlagId: number
+            next?: string | null | undefined
+            previous?: string | null | undefined
+            results: any[]
+        },
+        payload?: {
+            id: number
+            payload: Partial<FeatureFlagType>
+        }
+    ) => {
+        featureFlags: {
+            count: number
+            filters?: FeatureFlagsFilters | null | undefined
+            lastUpdatedFlagId: number
+            next?: string | null | undefined
+            previous?: string | null | undefined
+            results: any[]
+        }
+        payload?: {
+            id: number
+            payload: Partial<FeatureFlagType>
+        }
+    }
+    updateFlag: (flag: FeatureFlagType) => {
+        flag: FeatureFlagType
+    }
+    updateFlagActive: (
+        id: number,
+        active: boolean
+    ) => {
+        active: boolean
+        id: number
+    }
+    updateFlagFromPartial: (
+        flag: Partial<FeatureFlagType> & {
+            id: number
+        }
+    ) => {
+        flag: Partial<FeatureFlagType> & {
+            id: number
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface featureFlagsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        count: (featureFlags: FeatureFlagsResult) => number
+        filtersChanged: (filters: FeatureFlagsFilters, featureFlags: FeatureFlagsResult) => boolean
+        paramsFromFilters: (filters: FeatureFlagsFilters) => {
+            active?: string | undefined
+            archived?: string | undefined
+            created_by_id?: number[] | undefined
+            evaluation_runtime?: string | undefined
+            excluded_tags?: string[] | undefined
+            limit: number
+            offset: number
+            order?: string | undefined
+            page?: number | undefined
+            search?: string | undefined
+            tags?: string[] | undefined
+            type?: string | undefined
+        }
+        shouldShowEmptyState: (
+            featureFlagsLoading: boolean,
+            featureFlags: FeatureFlagsResult,
+            filters: FeatureFlagsFilters
+        ) => boolean
+        pagination: (
+            filters: FeatureFlagsFilters,
+            displayedFlags: FeatureFlagType[],
+            featureFlags: FeatureFlagsResult,
+            filtersChanged: boolean
+        ) => PaginationManual
+        displayedFlags: (localFlagsCache: FeatureFlagType[], filters: FeatureFlagsFilters) => FeatureFlagType[]
+    }
+}
+
+export type featureFlagsLogicType = MakeLogicType<
+    featureFlagsLogicValues,
+    featureFlagsLogicActions,
+    FlagLogicProps,
+    featureFlagsLogicMeta
+>
+
 export const featureFlagsLogic = kea<featureFlagsLogicType>([
     props({} as FlagLogicProps),
     path(['scenes', 'feature-flags', 'featureFlagsLogic']),
@@ -294,10 +465,10 @@ export const featureFlagsLogic = kea<featureFlagsLogicType>([
         ],
     }),
     selectors({
-        count: [(selectors) => [selectors.featureFlags], (featureFlags) => featureFlags.count],
+        count: [(selectors) => [selectors.featureFlags], (featureFlags: FeatureFlagsResult) => featureFlags.count],
         filtersChanged: [
             (s) => [s.filters, s.featureFlags],
-            (filters, featureFlags): boolean => {
+            (filters: FeatureFlagsFilters, featureFlags: FeatureFlagsResult): boolean => {
                 if (!featureFlags.filters) {
                     return false
                 }
@@ -326,7 +497,7 @@ export const featureFlagsLogic = kea<featureFlagsLogicType>([
         // Check to see if any non-default filters are being used
         shouldShowEmptyState: [
             (s) => [s.featureFlagsLoading, s.featureFlags, s.filters],
-            (featureFlagsLoading, featureFlags, filters): boolean => {
+            (featureFlagsLoading: boolean, featureFlags: FeatureFlagsResult, filters: FeatureFlagsFilters): boolean => {
                 return (
                     !featureFlagsLoading && featureFlags.results.length <= 0 && objectsEqual(filters, DEFAULT_FILTERS)
                 )
@@ -334,7 +505,12 @@ export const featureFlagsLogic = kea<featureFlagsLogicType>([
         ],
         pagination: [
             (s) => [s.filters, s.displayedFlags, s.featureFlags, s.filtersChanged],
-            (filters, displayedFlags, featureFlags, filtersChanged): PaginationManual => {
+            (
+                filters: FeatureFlagsFilters,
+                displayedFlags: FeatureFlagType[],
+                featureFlags: FeatureFlagsResult,
+                filtersChanged: boolean
+            ): PaginationManual => {
                 return {
                     controlled: true,
                     pageSize: FLAGS_PER_PAGE,
diff --git a/frontend/src/scenes/feature-flags/flagSelectionLogic.ts b/frontend/src/scenes/feature-flags/flagSelectionLogic.ts
index b1fead9dbfcc..4e605d3552b9 100644
--- a/frontend/src/scenes/feature-flags/flagSelectionLogic.ts
+++ b/frontend/src/scenes/feature-flags/flagSelectionLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { beforeUnload } from 'kea-router'
 
@@ -13,8 +13,8 @@ import { projectLogic } from 'scenes/projectLogic'
 
 import type { CopyFlagsResponseApi } from 'products/feature_flags/frontend/generated/api.schemas'
 
+import type { OrganizationType } from '../../types'
 import { featureFlagsLogic } from './featureFlagsLogic'
-import type { flagSelectionLogicType } from './flagSelectionLogicType'
 
 export type FlagRolloutState = 'fully_rolled_out' | 'not_rolled_out' | 'partial'
 
@@ -169,6 +169,160 @@ export function getBulkCopyDisabledReason(selectedCount: number, extraReason?: s
     return undefined
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface flagSelectionLogicValues {
+    paramsFromFilters: {
+        active?: string | undefined
+        archived?: string | undefined
+        created_by_id?: number[] | undefined
+        evaluation_runtime?: string | undefined
+        excluded_tags?: string[] | undefined
+        limit: number
+        offset: number
+        order?: string | undefined
+        page?: number | undefined
+        search?: string | undefined
+        tags?: string[] | undefined
+        type?: string | undefined
+    } // featureFlagsLogic
+    currentOrganization: OrganizationType | null // organizationLogic
+    currentProjectId: number | null // projectLogic
+    bulkCopyDisableCopiedFlag: boolean
+    bulkCopyFlagCount: number
+    bulkCopyHardFailures: BulkCopyFailure[]
+    bulkCopyModalVisible: boolean
+    bulkCopyParams: BulkCopyParams | null
+    bulkCopyPendingApproval: BulkCopyFailure[]
+    bulkCopyProgress: {
+        done: number
+        total: number
+    } | null
+    bulkCopyResult: BulkCopyResult | null
+    bulkCopyRunning: boolean
+    bulkCopySchedule: boolean
+    bulkCopySourceProjectId: number | null
+    bulkCopySplitCopied: {
+        newCopies: {
+            key: string
+            projectIds: number[]
+        }[]
+        overwrites: {
+            key: string
+            projectIds: number[]
+        }[]
+    }
+    bulkCopySubmitDisabledReason: string | undefined
+    bulkCopyTargetProjectIds: number[]
+    bulkDeleteResponse: BulkDeleteResult | null
+    bulkDeleteResponseLoading: boolean
+    bulkDeleteResult: BulkDeleteResult | null
+    resultsModalVisible: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface flagSelectionLogicActions {
+    reportFeatureFlagBulkCopy: (
+        flagCount: number,
+        projectCount: number,
+        failedCount: number
+    ) => {
+        failedCount: number
+        flagCount: number
+        projectCount: number
+    } // eventUsageLogic
+    loadFeatureFlags: () => any // featureFlagsLogic
+    bulkCopyFlags: () => {
+        value: true
+    }
+    bulkCopyFlagsFinished: (result: BulkCopyResult | null) => {
+        result: BulkCopyResult | null
+    }
+    bulkDeleteFlags: ({ ids, allMatching }: { allMatching: boolean; ids: number[] }) => {
+        ids: number[]
+        allMatching: boolean
+    }
+    bulkDeleteFlagsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    bulkDeleteFlagsSuccess: (
+        bulkDeleteResponse: BulkDeleteResult,
+        payload?: {
+            ids: number[]
+            allMatching: boolean
+        }
+    ) => {
+        bulkDeleteResponse: BulkDeleteResult
+        payload?: {
+            ids: number[]
+            allMatching: boolean
+        }
+    }
+    closeBulkCopyModal: () => {
+        value: true
+    }
+    hideResultsModal: () => {
+        value: true
+    }
+    openBulkCopyModal: (params: BulkCopyParams) => {
+        params: BulkCopyParams
+    }
+    setBulkCopyDisableCopiedFlag: (disableCopiedFlag: boolean) => {
+        disableCopiedFlag: boolean
+    }
+    setBulkCopyProgress: (
+        done: number,
+        total: number
+    ) => {
+        done: number
+        total: number
+    }
+    setBulkCopySchedule: (copySchedule: boolean) => {
+        copySchedule: boolean
+    }
+    setBulkCopySourceProjectId: (projectId: number) => {
+        projectId: number
+    }
+    setBulkCopyTargetProjectIds: (projectIds: number[]) => {
+        projectIds: number[]
+    }
+    showResultsModal: (result: BulkDeleteResult) => {
+        result: BulkDeleteResult
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface flagSelectionLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        resultsModalVisible: (bulkDeleteResult: BulkDeleteResult | null) => boolean
+        bulkCopyModalVisible: (bulkCopyParams: BulkCopyParams | null) => boolean
+        bulkCopyFlagCount: (bulkCopyParams: BulkCopyParams | null) => number
+        bulkCopySplitCopied: (bulkCopyResult: BulkCopyResult | null) => {
+            newCopies: {
+                key: string
+                projectIds: number[]
+            }[]
+            overwrites: {
+                key: string
+                projectIds: number[]
+            }[]
+        }
+        bulkCopyPendingApproval: (bulkCopyResult: BulkCopyResult | null) => BulkCopyFailure[]
+        bulkCopyHardFailures: (bulkCopyResult: BulkCopyResult | null) => BulkCopyFailure[]
+        bulkCopySubmitDisabledReason: (bulkCopyTargetProjectIds: number[]) => string | undefined
+    }
+}
+
+export type flagSelectionLogicType = MakeLogicType<
+    flagSelectionLogicValues,
+    flagSelectionLogicActions,
+    Record<string, any>,
+    flagSelectionLogicMeta
+>
+
 export const flagSelectionLogic = kea<flagSelectionLogicType>([
     path(['scenes', 'feature-flags', 'flagSelectionLogic']),
 
diff --git a/frontend/src/scenes/feature-flags/projects-grid/projectsGridLogic.ts b/frontend/src/scenes/feature-flags/projects-grid/projectsGridLogic.ts
index dca8828f65c7..cab2889dfff9 100644
--- a/frontend/src/scenes/feature-flags/projects-grid/projectsGridLogic.ts
+++ b/frontend/src/scenes/feature-flags/projects-grid/projectsGridLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -9,8 +9,8 @@ import { teamLogic } from 'scenes/teamLogic'
 import { OrganizationFeatureFlag, OrganizationFeatureFlagRow, OrganizationType } from '~/types'
 
 import { flagSelectionLogic } from '../flagSelectionLogic'
+import type { BulkCopyResult } from '../flagSelectionLogic'
 import { flagToggleKey, updateFlagActiveInProject } from '../updateFlagActiveInProject'
-import type { projectsGridLogicType } from './projectsGridLogicType'
 
 export const PAGE_SIZE = 25
 
@@ -23,6 +23,138 @@ export interface LoadFlagsResult {
 
 const storageKey = (teamId: number): string => `ff-projects-grid.picked-teams.${teamId}`
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface projectsGridLogicValues {
+    currentOrganization: OrganizationType | null // organizationLogic
+    currentTeamId: number | null // teamLogic
+    accessibleTeamIds: Set<number>
+    flags: OrganizationFeatureFlagRow[]
+    flagsHasMore: boolean
+    flagsOffset: number
+    flagsPage: LoadFlagsResult | null
+    flagsPageLoading: boolean
+    pickedTeamIds: number[]
+    search: string
+    siblingQueue: string[]
+    siblingsByFlagKey: Record<string, OrganizationFeatureFlag[]>
+    siblingsLoadingKeys: string[]
+    togglingFlagIds: Record<string, boolean>
+    visibleColumns: number[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface projectsGridLogicActions {
+    bulkCopyFlagsFinished: (result: BulkCopyResult | null) => {
+        result: BulkCopyResult | null
+    } // flagSelectionLogic
+    enqueueSiblingFetches: (keys: string[]) => {
+        keys: string[]
+    }
+    flagActiveUpdateFailed: (
+        teamId: number,
+        flagId: number
+    ) => {
+        flagId: number
+        teamId: number
+    }
+    flagActiveUpdated: (
+        flagKey: string,
+        teamId: number,
+        flagId: number,
+        active: boolean
+    ) => {
+        active: boolean
+        flagId: number
+        flagKey: string
+        teamId: number
+    }
+    loadFlagsPage: ({ offset, search }: { offset: number; search: string }) => {
+        offset: number
+        search: string
+    }
+    loadFlagsPageFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadFlagsPageSuccess: (
+        flagsPage: {
+            next: string | null
+            offset: number
+            results: OrganizationFeatureFlagRow[]
+            search: string
+        },
+        payload?: {
+            offset: number
+            search: string
+        }
+    ) => {
+        flagsPage: {
+            next: string | null
+            offset: number
+            results: OrganizationFeatureFlagRow[]
+            search: string
+        }
+        payload?: {
+            offset: number
+            search: string
+        }
+    }
+    loadMoreFlags: () => {
+        value: true
+    }
+    resetPickedTeamIds: () => {
+        value: true
+    }
+    setPickedTeamIds: (teamIds: number[]) => {
+        teamIds: number[]
+    }
+    setSearch: (search: string) => {
+        search: string
+    }
+    siblingsFailed: (flagKey: string) => {
+        flagKey: string
+    }
+    siblingsLoaded: (
+        flagKey: string,
+        siblings: OrganizationFeatureFlag[]
+    ) => {
+        flagKey: string
+        siblings: OrganizationFeatureFlag[]
+    }
+    startSiblingFetch: (flagKey: string) => {
+        flagKey: string
+    }
+    toggleFlagActive: (
+        flagKey: string,
+        teamId: number,
+        flagId: number,
+        active: boolean
+    ) => {
+        active: boolean
+        flagId: number
+        flagKey: string
+        teamId: number
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface projectsGridLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        visibleColumns: (currentTeamId: number | null, pickedTeamIds: number[]) => number[]
+        accessibleTeamIds: (currentOrganization: OrganizationType | null) => Set<number>
+    }
+}
+
+export type projectsGridLogicType = MakeLogicType<
+    projectsGridLogicValues,
+    projectsGridLogicActions,
+    Record<string, any>,
+    projectsGridLogicMeta
+>
+
 export const projectsGridLogic = kea<projectsGridLogicType>([
     path(['scenes', 'feature-flags', 'projects-grid', 'projectsGridLogic']),
     connect(() => ({
@@ -174,7 +306,7 @@ export const projectsGridLogic = kea<projectsGridLogicType>([
     selectors({
         visibleColumns: [
             (s) => [s.currentTeamId, s.pickedTeamIds],
-            (currentTeamId, pickedTeamIds): number[] =>
+            (currentTeamId: number | null, pickedTeamIds: number[]): number[] =>
                 currentTeamId ? [currentTeamId, ...pickedTeamIds.filter((id) => id !== currentTeamId)] : pickedTeamIds,
         ],
         accessibleTeamIds: [
diff --git a/frontend/src/scenes/funnels/FunnelFlowGraph/funnelFlowGraphLogic.ts b/frontend/src/scenes/funnels/FunnelFlowGraph/funnelFlowGraphLogic.ts
index 81712ab891bb..0f444ca3780a 100644
--- a/frontend/src/scenes/funnels/FunnelFlowGraph/funnelFlowGraphLogic.ts
+++ b/frontend/src/scenes/funnels/FunnelFlowGraph/funnelFlowGraphLogic.ts
@@ -1,6 +1,6 @@
 import { Edge, MarkerType, Node } from '@xyflow/react'
 import type { ElkExtendedEdge, ElkNode } from 'elkjs/lib/elk.bundled.js'
-import { actions, connect, kea, key, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, path, props, reducers, selectors } from 'kea'
 import { subscriptions } from 'kea-subscriptions'
 
 import { getElk } from 'lib/elk'
@@ -9,8 +9,9 @@ import { keyForInsightLogicProps } from 'scenes/insights/sharedUtils'
 import { InsightLogicProps } from '~/types'
 import { FunnelStepWithConversionMetrics } from '~/types'
 
+import type { PathsLink } from '../../../queries/schema/schema-general'
+import type { FunnelStepWithNestedBreakdown } from '../../../types'
 import { funnelDataLogic } from '../funnelDataLogic'
-import type { funnelFlowGraphLogicType } from './funnelFlowGraphLogicType'
 import { funnelPathsExpansionLogic } from './funnelPathsExpansionLogic'
 import {
     bridgeConfigForExpansion,
@@ -21,6 +22,7 @@ import {
     PATH_NODE_WIDTH,
     PathFlowNodeData,
 } from './pathFlowUtils'
+import type { PathExpansion } from './pathFlowUtils'
 
 export const NODE_HEIGHT = 160
 export const NODE_WIDTH = 300
@@ -119,6 +121,101 @@ export interface FunnelFlowLogicProps extends InsightLogicProps {
     mode?: FunnelFlowGraphMode
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface funnelFlowGraphLogicValues {
+    isStepOptional: (step: number) => boolean // funnelDataLogic
+    stepNames: FunnelStepWithNestedBreakdown[] // funnelDataLogic
+    visibleStepsWithConversionMetrics: FunnelStepWithConversionMetrics[] // funnelDataLogic
+    expandedPath: PathExpansion | null // funnelPathsExpansionLogic
+    expandedPathResults: PathsLink[] | null // funnelPathsExpansionLogic
+    edgeType: string
+    edges: Edge[]
+    expandedPathElements: {
+        edges: Edge<PathFlowEdgeData>[]
+        hiddenEdgeId: string | null
+        nodes: Node<PathFlowNodeData>[]
+    } | null
+    fitViewOptions: {
+        maxZoom: number
+        padding: number
+    }
+    funnelEdges: Edge<FunnelFlowEdgeData>[]
+    funnelNodes: Node<FunnelFlowNodeData>[]
+    isProfileMode: boolean
+    laidOutNodes: AnyFlowNode[]
+    nodeHeight: number
+    nodeType: string
+    nodeWidth: number
+    nodes: AnyFlowNode[]
+    pathNodeType: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface funnelFlowGraphLogicActions {
+    setLaidOutNodes: (laidOutNodes: AnyFlowNode[]) => {
+        laidOutNodes: AnyFlowNode[]
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface funnelFlowGraphLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        isProfileMode: (arg: any) => boolean
+        nodeType: (arg: any) => string
+        pathNodeType: (arg: any) => string
+        edgeType: (isProfileMode: boolean) => string
+        nodeWidth: (isProfileMode: boolean) => number
+        nodeHeight: (isProfileMode: boolean) => number
+        fitViewOptions: (isProfileMode: boolean) => {
+            maxZoom: number
+            padding: number
+        }
+        funnelNodes: (
+            visibleStepsWithConversionMetrics: FunnelStepWithConversionMetrics[],
+            stepNames: FunnelStepWithNestedBreakdown[],
+            isStepOptional: (step: number) => boolean,
+            nodeType: string,
+            nodeWidth: number,
+            nodeHeight: number
+        ) => Node<FunnelFlowNodeData>[]
+        funnelEdges: (funnelNodes: Node<FunnelFlowNodeData>[], edgeType: string) => Edge<FunnelFlowEdgeData>[]
+        expandedPathElements: (
+            funnelNodes: Node<FunnelFlowNodeData>[],
+            expandedPath: PathExpansion | null,
+            expandedPathResults: PathsLink[] | null,
+            pathNodeType: string
+        ) => {
+            edges: Edge<PathFlowEdgeData>[]
+            hiddenEdgeId: string | null
+            nodes: Node<PathFlowNodeData>[]
+        } | null
+        nodes: (
+            funnelNodes: Node<FunnelFlowNodeData>[],
+            expandedPathElements: {
+                edges: Edge<PathFlowEdgeData>[]
+                hiddenEdgeId: string | null
+                nodes: Node<PathFlowNodeData>[]
+            } | null
+        ) => AnyFlowNode[]
+        edges: (
+            funnelEdges: Edge<FunnelFlowEdgeData>[],
+            expandedPathElements: {
+                edges: Edge<PathFlowEdgeData>[]
+                hiddenEdgeId: string | null
+                nodes: Node<PathFlowNodeData>[]
+            } | null
+        ) => Edge[]
+    }
+}
+
+export type funnelFlowGraphLogicType = MakeLogicType<
+    funnelFlowGraphLogicValues,
+    funnelFlowGraphLogicActions,
+    FunnelFlowLogicProps,
+    funnelFlowGraphLogicMeta
+>
+
 export const funnelFlowGraphLogic = kea<funnelFlowGraphLogicType>([
     path((key) => ['scenes', 'funnels', 'FunnelFlowGraph', 'funnelFlowGraphLogic', key]),
     props({} as FunnelFlowLogicProps),
@@ -156,18 +253,21 @@ export const funnelFlowGraphLogic = kea<funnelFlowGraphLogicType>([
             () => [(_, props) => props.mode],
             (mode): string => (mode === 'builder' ? 'builderPathNode' : 'pathNode'),
         ],
-        edgeType: [(s) => [s.isProfileMode], (isProfileMode): string => (isProfileMode ? 'profile' : 'journey')],
+        edgeType: [
+            (s) => [s.isProfileMode],
+            (isProfileMode: boolean): string => (isProfileMode ? 'profile' : 'journey'),
+        ],
         nodeWidth: [
             (s) => [s.isProfileMode],
-            (isProfileMode): number => (isProfileMode ? PROFILE_NODE_WIDTH : NODE_WIDTH),
+            (isProfileMode: boolean): number => (isProfileMode ? PROFILE_NODE_WIDTH : NODE_WIDTH),
         ],
         nodeHeight: [
             (s) => [s.isProfileMode],
-            (isProfileMode): number => (isProfileMode ? PROFILE_NODE_HEIGHT : NODE_HEIGHT),
+            (isProfileMode: boolean): number => (isProfileMode ? PROFILE_NODE_HEIGHT : NODE_HEIGHT),
         ],
         fitViewOptions: [
             (s) => [s.isProfileMode],
-            (isProfileMode) => (isProfileMode ? PROFILE_FIT_VIEW_OPTIONS : FIT_VIEW_OPTIONS),
+            (isProfileMode: boolean) => (isProfileMode ? PROFILE_FIT_VIEW_OPTIONS : FIT_VIEW_OPTIONS),
         ],
         funnelNodes: [
             (s) => [
@@ -178,7 +278,14 @@ export const funnelFlowGraphLogic = kea<funnelFlowGraphLogicType>([
                 s.nodeWidth,
                 s.nodeHeight,
             ],
-            (steps, stepNames, isStepOptional, nodeType, nodeWidth, nodeHeight): Node<FunnelFlowNodeData>[] => {
+            (
+                steps: FunnelStepWithConversionMetrics[],
+                stepNames: import('~/types').FunnelStepWithNestedBreakdown[],
+                isStepOptional: (step: number) => boolean,
+                nodeType: string,
+                nodeWidth: number,
+                nodeHeight: number
+            ): Node<FunnelFlowNodeData>[] => {
                 const stepsToMap: FunnelStepWithConversionMetrics[] =
                     steps.length > 0
                         ? steps
@@ -204,7 +311,7 @@ export const funnelFlowGraphLogic = kea<funnelFlowGraphLogicType>([
         ],
         funnelEdges: [
             (s) => [s.funnelNodes, s.edgeType],
-            (nodes, edgeType): Edge<FunnelFlowEdgeData>[] =>
+            (nodes: Node<FunnelFlowNodeData>[], edgeType: string): Edge<FunnelFlowEdgeData>[] =>
                 nodes.slice(0, -1).map((node, index) => {
                     const targetNode = nodes[index + 1]
                     const touchesOptionalStep = targetNode.data.isOptional
@@ -241,10 +348,10 @@ export const funnelFlowGraphLogic = kea<funnelFlowGraphLogicType>([
         expandedPathElements: [
             (s) => [s.funnelNodes, s.expandedPath, s.expandedPathResults, s.pathNodeType],
             (
-                funnelNodes,
-                expandedPath,
-                expandedPathResults,
-                pathNodeType
+                funnelNodes: Node<FunnelFlowNodeData>[],
+                expandedPath: null | import('./pathFlowUtils').PathExpansion,
+                expandedPathResults: import('../../../queries/schema').PathsLink[] | null,
+                pathNodeType: string
             ): {
                 nodes: Node<PathFlowNodeData>[]
                 edges: Edge<PathFlowEdgeData>[]
@@ -274,7 +381,14 @@ export const funnelFlowGraphLogic = kea<funnelFlowGraphLogicType>([
         ],
         nodes: [
             (s) => [s.funnelNodes, s.expandedPathElements],
-            (funnelNodes, expandedPathElements): AnyFlowNode[] => {
+            (
+                funnelNodes: Node<FunnelFlowNodeData>[],
+                expandedPathElements: {
+                    edges: Edge<PathFlowEdgeData>[]
+                    hiddenEdgeId: string | null
+                    nodes: Node<PathFlowNodeData>[]
+                } | null
+            ): AnyFlowNode[] => {
                 if (!expandedPathElements) {
                     return funnelNodes
                 }
@@ -283,7 +397,14 @@ export const funnelFlowGraphLogic = kea<funnelFlowGraphLogicType>([
         ],
         edges: [
             (s) => [s.funnelEdges, s.expandedPathElements],
-            (funnelEdges, expandedPathElements): Edge[] => {
+            (
+                funnelEdges: Edge<FunnelFlowEdgeData>[],
+                expandedPathElements: {
+                    edges: Edge<PathFlowEdgeData>[]
+                    hiddenEdgeId: string | null
+                    nodes: Node<PathFlowNodeData>[]
+                } | null
+            ): Edge[] => {
                 if (!expandedPathElements) {
                     return funnelEdges
                 }
diff --git a/frontend/src/scenes/funnels/FunnelFlowGraph/funnelPathsExpansionLogic.ts b/frontend/src/scenes/funnels/FunnelFlowGraph/funnelPathsExpansionLogic.ts
index bedd2739e8ff..4a538099b19e 100644
--- a/frontend/src/scenes/funnels/FunnelFlowGraph/funnelPathsExpansionLogic.ts
+++ b/frontend/src/scenes/funnels/FunnelFlowGraph/funnelPathsExpansionLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 
 import { lemonToast } from '@posthog/lemon-ui'
 
@@ -9,12 +9,58 @@ import { performQuery } from '~/queries/query'
 import { PathsLink, PathsQuery } from '~/queries/schema/schema-general'
 import { InsightLogicProps } from '~/types'
 
+import type { FunnelsQuery } from '../../../queries/schema/schema-general'
 import { funnelDataLogic } from '../funnelDataLogic'
-import type { funnelPathsExpansionLogicType } from './funnelPathsExpansionLogicType'
 import { buildPathsQuery, PathExpansion, pathExpansionCacheKey } from './pathFlowUtils'
 
 const DEFAULT_LOGIC_KEY = 'default_funnel_paths_expansion'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface funnelPathsExpansionLogicValues {
+    querySource: FunnelsQuery | null // funnelDataLogic
+    expandedPath: PathExpansion | null
+    expandedPathCacheKey: string | null
+    expandedPathResults: PathsLink[] | null
+    pathsLoading: boolean
+    pathsResultsCache: Record<string, PathsLink[]>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface funnelPathsExpansionLogicActions {
+    collapsePath: () => {
+        value: true
+    }
+    expandPath: (expansion: PathExpansion) => {
+        expansion: PathExpansion
+    }
+    setPathsResults: (
+        cacheKey: string,
+        results: PathsLink[]
+    ) => {
+        cacheKey: string
+        results: PathsLink[]
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface funnelPathsExpansionLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        expandedPathCacheKey: (expandedPath: PathExpansion | null) => string | null
+        expandedPathResults: (
+            expandedPathCacheKey: string | null,
+            pathsResultsCache: Record<string, PathsLink[]>
+        ) => PathsLink[] | null
+    }
+}
+
+export type funnelPathsExpansionLogicType = MakeLogicType<
+    funnelPathsExpansionLogicValues,
+    funnelPathsExpansionLogicActions,
+    InsightLogicProps,
+    funnelPathsExpansionLogicMeta
+>
+
 export const funnelPathsExpansionLogic = kea<funnelPathsExpansionLogicType>([
     path((key) => ['scenes', 'funnels', 'FunnelFlowGraph', 'funnelPathsExpansionLogic', key]),
     props({} as InsightLogicProps),
@@ -57,11 +103,12 @@ export const funnelPathsExpansionLogic = kea<funnelPathsExpansionLogicType>([
     selectors({
         expandedPathCacheKey: [
             (s) => [s.expandedPath],
-            (expandedPath): string | null => (expandedPath ? pathExpansionCacheKey(expandedPath) : null),
+            (expandedPath: PathExpansion | null): string | null =>
+                expandedPath ? pathExpansionCacheKey(expandedPath) : null,
         ],
         expandedPathResults: [
             (s) => [s.expandedPathCacheKey, s.pathsResultsCache],
-            (cacheKey, pathsResultsCache): PathsLink[] | null =>
+            (cacheKey: string | null, pathsResultsCache: Record<string, PathsLink[]>): PathsLink[] | null =>
                 cacheKey ? (pathsResultsCache[cacheKey] ?? null) : null,
         ],
     }),
diff --git a/frontend/src/scenes/funnels/funnelCorrelationDetailsLogic.ts b/frontend/src/scenes/funnels/funnelCorrelationDetailsLogic.ts
index fae6a4d5a116..defb8be9b2f9 100644
--- a/frontend/src/scenes/funnels/funnelCorrelationDetailsLogic.ts
+++ b/frontend/src/scenes/funnels/funnelCorrelationDetailsLogic.ts
@@ -1,12 +1,62 @@
-import { actions, connect, kea, key, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, path, props, reducers, selectors } from 'kea'
 
 import { keyForInsightLogicProps } from 'scenes/insights/sharedUtils'
 
 import { FunnelCorrelation, InsightLogicProps } from '~/types'
 
-import type { funnelCorrelationDetailsLogicType } from './funnelCorrelationDetailsLogicType'
+import type { FunnelStepWithNestedBreakdown } from '../../types'
 import { funnelDataLogic } from './funnelDataLogic'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface funnelCorrelationDetailsLogicValues {
+    steps: FunnelStepWithNestedBreakdown[] // funnelDataLogic
+    correlationDetails: FunnelCorrelation | null
+    correlationDetailsModalOpen: boolean
+    correlationMatrixAndScore: {
+        correlationScore: number
+        correlationScoreStrength: 'moderate' | 'strong' | 'weak' | null
+        falseNegative: number
+        falsePositive: number
+        trueNegative: number
+        truePositive: number
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface funnelCorrelationDetailsLogicActions {
+    closeCorrelationDetailsModal: () => {
+        value: true
+    }
+    openCorrelationDetailsModal: (payload: FunnelCorrelation) => {
+        payload: FunnelCorrelation
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface funnelCorrelationDetailsLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        correlationMatrixAndScore: (
+            correlationDetails: FunnelCorrelation | null,
+            steps: FunnelStepWithNestedBreakdown[]
+        ) => {
+            correlationScore: number
+            correlationScoreStrength: 'moderate' | 'strong' | 'weak' | null
+            falseNegative: number
+            falsePositive: number
+            trueNegative: number
+            truePositive: number
+        }
+    }
+}
+
+export type funnelCorrelationDetailsLogicType = MakeLogicType<
+    funnelCorrelationDetailsLogicValues,
+    funnelCorrelationDetailsLogicActions,
+    InsightLogicProps,
+    funnelCorrelationDetailsLogicMeta
+>
+
 export const funnelCorrelationDetailsLogic = kea<funnelCorrelationDetailsLogicType>([
     props({} as InsightLogicProps),
     key(keyForInsightLogicProps('insight_funnel')),
@@ -40,8 +90,8 @@ export const funnelCorrelationDetailsLogic = kea<funnelCorrelationDetailsLogicTy
         correlationMatrixAndScore: [
             (s) => [s.correlationDetails, s.steps],
             (
-                correlationDetails,
-                steps
+                correlationDetails: FunnelCorrelation | null,
+                steps: import('~/types').FunnelStepWithNestedBreakdown[]
             ): {
                 truePositive: number
                 falsePositive: number
diff --git a/frontend/src/scenes/funnels/funnelCorrelationLogic.ts b/frontend/src/scenes/funnels/funnelCorrelationLogic.ts
index f5cb97f23310..d9c28e18523e 100644
--- a/frontend/src/scenes/funnels/funnelCorrelationLogic.ts
+++ b/frontend/src/scenes/funnels/funnelCorrelationLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, defaults, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, defaults, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -16,10 +16,124 @@ import {
 import { setLatestVersionsOnQuery } from '~/queries/utils'
 import { FunnelCorrelation, FunnelCorrelationType, InsightLogicProps } from '~/types'
 
-import type { funnelCorrelationLogicType } from './funnelCorrelationLogicType'
+import type { FunnelsQuery } from '../../queries/schema/schema-general'
+import type { TeamPublicType, TeamType } from '../../types'
 import { funnelDataLogic } from './funnelDataLogic'
 import { appendToCorrelationConfig } from './funnelUtils'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface funnelCorrelationLogicValues {
+    querySource: FunnelsQuery | null // funnelDataLogic
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    __ignore: FunnelCorrelationResultsType | null
+    correlationTypes: FunnelCorrelationType[]
+    correlationValues: FunnelCorrelation[]
+    correlations: Record<'events', FunnelCorrelation[]>
+    correlationsLoading: boolean
+    eventHasPropertyCorrelations: (eventName: string) => boolean
+    eventWithPropertyCorrelations: Record<string, FunnelCorrelation[]>
+    eventWithPropertyCorrelationsLoading: boolean
+    eventWithPropertyCorrelationsValues: Record<string, FunnelCorrelation[]>
+    excludedEventNames: string[]
+    excludedEventPropertyNames: string[]
+    isEventExcluded: (eventName: string) => boolean
+    isEventPropertyExcluded: (propertyName: string) => boolean
+    loadedEventCorrelationsTableOnce: boolean
+    nestedTableExpandedKeys: string[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface funnelCorrelationLogicActions {
+    addNestedTableExpandedKey: (expandKey: string) => {
+        expandKey: string
+    }
+    excludeEventFromProject: (eventName: string) => {
+        eventName: string
+    }
+    excludeEventPropertyFromProject: (
+        eventName: string,
+        propertyName: string
+    ) => {
+        eventName: string
+        propertyName: string
+    }
+    loadEventCorrelations: (_: any) => any
+    loadEventCorrelationsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadEventCorrelationsSuccess: (
+        correlations: {
+            events: FunnelCorrelation[]
+        },
+        payload?: any
+    ) => {
+        correlations: {
+            events: FunnelCorrelation[]
+        }
+        payload?: any
+    }
+    loadEventWithPropertyCorrelations: (eventName: string) => string
+    loadEventWithPropertyCorrelationsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadEventWithPropertyCorrelationsSuccess: (
+        eventWithPropertyCorrelations: {
+            [x: string]: FunnelCorrelation[]
+        },
+        payload?: string
+    ) => {
+        eventWithPropertyCorrelations: {
+            [x: string]: FunnelCorrelation[]
+        }
+        payload?: string
+    }
+    removeNestedTableExpandedKey: (expandKey: string) => {
+        expandKey: string
+    }
+    setCorrelationTypes: (types: FunnelCorrelationType[]) => {
+        types: FunnelCorrelationType[]
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface funnelCorrelationLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        correlationValues: (
+            correlations: Record<'events', FunnelCorrelation[]>,
+            correlationTypes: FunnelCorrelationType[],
+            excludedEventNames: string[]
+        ) => FunnelCorrelation[]
+        excludedEventNames: (currentTeam: TeamPublicType | TeamType | null) => string[]
+        isEventExcluded: (excludedEventNames: string[]) => (eventName: string) => boolean
+        excludedEventPropertyNames: (currentTeam: TeamPublicType | TeamType | null) => string[]
+        isEventPropertyExcluded: (excludedEventPropertyNames: string[]) => (propertyName: string) => boolean
+        eventWithPropertyCorrelationsValues: (
+            eventWithPropertyCorrelations: Record<string, FunnelCorrelation[]>,
+            correlationTypes: FunnelCorrelationType[],
+            excludedEventPropertyNames: string[]
+        ) => Record<string, FunnelCorrelation[]>
+        eventHasPropertyCorrelations: (
+            eventWithPropertyCorrelationsValues: Record<string, FunnelCorrelation[]>
+        ) => (eventName: string) => boolean
+    }
+}
+
+export type funnelCorrelationLogicType = MakeLogicType<
+    funnelCorrelationLogicValues,
+    funnelCorrelationLogicActions,
+    InsightLogicProps,
+    funnelCorrelationLogicMeta
+>
+
 export const funnelCorrelationLogic = kea<funnelCorrelationLogicType>([
     props({} as InsightLogicProps),
     key(keyForInsightLogicProps('insight_funnel')),
@@ -155,7 +269,11 @@ export const funnelCorrelationLogic = kea<funnelCorrelationLogicType>([
         // event correlation
         correlationValues: [
             (s) => [s.correlations, s.correlationTypes, s.excludedEventNames],
-            (correlations, correlationTypes, excludedEventNames): FunnelCorrelation[] => {
+            (
+                correlations: Record<'events', FunnelCorrelation[]>,
+                correlationTypes: FunnelCorrelationType[],
+                excludedEventNames: string[]
+            ): FunnelCorrelation[] => {
                 return correlations.events
                     ?.filter(
                         (correlation) =>
@@ -178,30 +296,32 @@ export const funnelCorrelationLogic = kea<funnelCorrelationLogicType>([
         ],
         excludedEventNames: [
             (s) => [s.currentTeam],
-            (currentTeam): string[] => currentTeam?.correlation_config?.excluded_event_names || [],
+            (currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType): string[] =>
+                currentTeam?.correlation_config?.excluded_event_names || [],
         ],
         isEventExcluded: [
             (s) => [s.excludedEventNames],
-            (excludedEventNames) => (eventName: string) =>
+            (excludedEventNames: string[]) => (eventName: string) =>
                 excludedEventNames.find((name) => name === eventName) !== undefined,
         ],
 
         // event property correlation
         excludedEventPropertyNames: [
             (s) => [s.currentTeam],
-            (currentTeam): string[] => currentTeam?.correlation_config?.excluded_event_property_names || [],
+            (currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType): string[] =>
+                currentTeam?.correlation_config?.excluded_event_property_names || [],
         ],
         isEventPropertyExcluded: [
             (s) => [s.excludedEventPropertyNames],
-            (excludedEventPropertyNames) => (propertyName: string) =>
+            (excludedEventPropertyNames: string[]) => (propertyName: string) =>
                 excludedEventPropertyNames.find((name) => name === propertyName) !== undefined,
         ],
         eventWithPropertyCorrelationsValues: [
             (s) => [s.eventWithPropertyCorrelations, s.correlationTypes, s.excludedEventPropertyNames],
             (
-                eventWithPropertyCorrelations,
-                correlationTypes,
-                excludedEventPropertyNames
+                eventWithPropertyCorrelations: Record<string, FunnelCorrelation[]>,
+                correlationTypes: FunnelCorrelationType[],
+                excludedEventPropertyNames: string[]
             ): Record<string, FunnelCorrelation[]> => {
                 const eventWithPropertyCorrelationsValues: Record<string, FunnelCorrelation[]> = {}
                 for (const key in eventWithPropertyCorrelations) {
@@ -231,7 +351,9 @@ export const funnelCorrelationLogic = kea<funnelCorrelationLogicType>([
         ],
         eventHasPropertyCorrelations: [
             (s) => [s.eventWithPropertyCorrelationsValues],
-            (eventWithPropertyCorrelationsValues): ((eventName: string) => boolean) => {
+            (
+                eventWithPropertyCorrelationsValues: Record<string, FunnelCorrelation[]>
+            ): ((eventName: string) => boolean) => {
                 return (eventName) => {
                     return !!eventWithPropertyCorrelationsValues[eventName]
                 }
diff --git a/frontend/src/scenes/funnels/funnelCorrelationUsageLogic.ts b/frontend/src/scenes/funnels/funnelCorrelationUsageLogic.ts
index 932a2721cbdc..7cbe258e2bf4 100644
--- a/frontend/src/scenes/funnels/funnelCorrelationUsageLogic.ts
+++ b/frontend/src/scenes/funnels/funnelCorrelationUsageLogic.ts
@@ -1,4 +1,4 @@
-import { BreakPointFunction, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, BreakPointFunction, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 
 import { visibilitySensorLogic } from 'lib/components/VisibilitySensor/visibilitySensorLogic'
 import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
@@ -8,13 +8,175 @@ import { keyForInsightLogicProps } from 'scenes/insights/sharedUtils'
 
 import { EntityTypes, FunnelCorrelationResultsType, InsightLogicProps } from '~/types'
 
+import type {
+    DataNode,
+    ErrorTrackingQueryResponse,
+    FunnelsQuery,
+    HogQLAutocompleteResponse,
+    HogQLMetadataResponse,
+    HogQLQueryResponse,
+    HogQueryResponse,
+    LifecycleQuery,
+    LogAttributesQueryResponse,
+    LogValuesQueryResponse,
+    MetricsQueryResponse,
+    Node,
+    PathsQuery,
+    RefreshType,
+    RetentionQuery,
+    SessionsQueryResponse,
+    StickinessQuery,
+    TraceSpansAggregationQueryResponse,
+    TraceSpansAttributeBreakdownQueryResponse,
+    TraceSpansQueryResponse,
+    TrendsQuery,
+    WebOverviewQuery,
+    WebStatsTableQuery,
+} from '../../queries/schema/schema-general'
+import type { FunnelCorrelation, FunnelCorrelationType } from '../../types'
 import { funnelCorrelationLogic } from './funnelCorrelationLogic'
-import type { funnelCorrelationUsageLogicType } from './funnelCorrelationUsageLogicType'
 import { funnelDataLogic } from './funnelDataLogic'
 import { funnelPersonsModalLogic } from './funnelPersonsModalLogic'
 import { funnelPropertyCorrelationLogic } from './funnelPropertyCorrelationLogic'
 import { parseEventAndProperty } from './funnelUtils'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface funnelCorrelationUsageLogicValues {
+    isInDashboardContext: boolean // insightLogic
+    querySource:
+        | FunnelsQuery
+        | LifecycleQuery
+        | PathsQuery
+        | RetentionQuery
+        | StickinessQuery
+        | TrendsQuery
+        | WebOverviewQuery
+        | WebStatsTableQuery
+        | null // insightVizDataLogic
+    correlationPropKey: string
+    shouldReportCorrelationViewed: boolean
+    shouldReportPropertyCorrelationViewed: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface funnelCorrelationUsageLogicActions {
+    reportCorrelationInteraction: (
+        correlationType: FunnelCorrelationResultsType,
+        action: string,
+        props?: Record<string, any> | undefined
+    ) => {
+        action: string
+        correlationType: FunnelCorrelationResultsType
+        props: Record<string, any> | undefined
+    } // eventUsageLogic
+    reportCorrelationViewed: (
+        query: Node<Record<string, any>> | null,
+        delay?: number | undefined,
+        propertiesTable?: boolean | undefined
+    ) => {
+        delay: number | undefined
+        propertiesTable: boolean | undefined
+        query: Node<Record<string, any>> | null
+    } // eventUsageLogic
+    excludeEventFromProject: (eventName: string) => {
+        eventName: string
+    } // funnelCorrelationLogic
+    excludeEventPropertyFromProject: (
+        eventName: string,
+        propertyName: string
+    ) => {
+        eventName: string
+        propertyName: string
+    } // funnelCorrelationLogic
+    loadEventWithPropertyCorrelations: (eventName: string) => string // funnelCorrelationLogic
+    setCorrelationTypes: (types: FunnelCorrelationType[]) => {
+        types: FunnelCorrelationType[]
+    } // funnelCorrelationLogic
+    hideSkewWarning: () => {
+        value: true
+    } // funnelDataLogic
+    openCorrelationPersonsModal: (
+        correlation: FunnelCorrelation,
+        success: boolean
+    ) => {
+        correlation: FunnelCorrelation
+        success: boolean
+    } // funnelPersonsModalLogic
+    excludePropertyFromProject: (propertyName: string) => {
+        propertyName: string
+    } // funnelPropertyCorrelationLogic
+    setPropertyCorrelationTypes: (types: FunnelCorrelationType[]) => {
+        types: FunnelCorrelationType[]
+    } // funnelPropertyCorrelationLogic
+    setPropertyNames: (propertyNames: string[]) => {
+        propertyNames: string[]
+    } // funnelPropertyCorrelationLogic
+    loadDataSuccess: (
+        response:
+            | ErrorTrackingQueryResponse
+            | HogQLAutocompleteResponse
+            | HogQLMetadataResponse
+            | HogQLQueryResponse<any[]>
+            | HogQueryResponse
+            | LogAttributesQueryResponse
+            | LogValuesQueryResponse
+            | MetricsQueryResponse
+            | Record<string, any>
+            | SessionsQueryResponse
+            | TraceSpansAggregationQueryResponse
+            | TraceSpansAttributeBreakdownQueryResponse
+            | TraceSpansQueryResponse
+            | null
+            | undefined,
+        payload?:
+            | {
+                  overrideQuery: DataNode<Record<string, any>> | undefined
+                  pollOnly: boolean
+                  queryId: string
+                  refresh: RefreshType | undefined
+              }
+            | undefined
+    ) => {
+        payload?: {
+            overrideQuery: DataNode<Record<string, any>> | undefined
+            pollOnly: boolean
+            queryId: string
+            refresh: RefreshType | undefined
+        }
+        response:
+            | ErrorTrackingQueryResponse
+            | HogQLAutocompleteResponse
+            | HogQLMetadataResponse
+            | HogQLQueryResponse<any[]>
+            | HogQueryResponse
+            | LogAttributesQueryResponse
+            | LogValuesQueryResponse
+            | MetricsQueryResponse
+            | Record<string, any>
+            | SessionsQueryResponse
+            | TraceSpansAggregationQueryResponse
+            | TraceSpansAttributeBreakdownQueryResponse
+            | TraceSpansQueryResponse
+            | null
+            | undefined
+    } // insightVizDataLogic
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface funnelCorrelationUsageLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        correlationPropKey: (arg: any) => string
+    }
+}
+
+export type funnelCorrelationUsageLogicType = MakeLogicType<
+    funnelCorrelationUsageLogicValues,
+    funnelCorrelationUsageLogicActions,
+    InsightLogicProps,
+    funnelCorrelationUsageLogicMeta
+>
+
 export const funnelCorrelationUsageLogic = kea<funnelCorrelationUsageLogicType>([
     props({} as InsightLogicProps),
     key(keyForInsightLogicProps('insight_funnel')),
diff --git a/frontend/src/scenes/funnels/funnelDataLogic.ts b/frontend/src/scenes/funnels/funnelDataLogic.ts
index 023739bda7d7..2c417847d453 100644
--- a/frontend/src/scenes/funnels/funnelDataLogic.ts
+++ b/frontend/src/scenes/funnels/funnelDataLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { router } from 'kea-router'
 
 import { DataColorTheme, DataColorToken } from 'lib/colors'
@@ -40,7 +40,27 @@ import {
     FilterType,
 } from '~/types'
 
-import type { funnelDataLogicType } from './funnelDataLogicType'
+import type { FeatureFlagsSet } from '../../lib/logic/featureFlagLogic'
+import type {
+    AnyDataWarehouseNode,
+    AnyEntityNode,
+    BreakdownFilter,
+    DataWarehouseNode,
+    FunnelsQuerySeriesNodeUnion,
+    GoalLine,
+    GroupNode,
+    InsightFilter,
+    LifecycleQuery,
+    PathsQuery,
+    ResultCustomizationByValue,
+    RetentionQuery,
+    StickinessQuery,
+    TrendsQuery,
+    WebOverviewQuery,
+    WebStatsTableQuery,
+} from '../../queries/schema/schema-general'
+import type { BreakdownKeyType, FunnelStep, IntervalType, LabelGroupType } from '../../types'
+import type { QuerySourceUpdate } from '../insights/insightVizDataLogic'
 import {
     TIME_INTERVAL_BOUNDS,
     aggregateBreakdownCompareResult,
@@ -160,6 +180,335 @@ function isFunnelsQueryOrLegacyFilter(
     return isFunnelsQuery(querySource)
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface funnelDataLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun // groupsModel
+    breakdownFilter: BreakdownFilter | null | undefined // insightVizDataLogic
+    funnelsFilter: FunnelsFilter | null | undefined // insightVizDataLogic
+    getTheme: (themeId: number | string | null | undefined) => DataColorTheme | null // insightVizDataLogic
+    goalLines: GoalLine[] | null | undefined // insightVizDataLogic
+    hasDataWarehouseSeries: boolean // insightVizDataLogic
+    insightData: Record<string, any> // insightVizDataLogic
+    insightDataError: Record<string, any> | null // insightVizDataLogic
+    insightFilter: InsightFilter | null | undefined // insightVizDataLogic
+    interval: IntervalType | null | undefined // insightVizDataLogic
+    labelGroupType: LabelGroupType // insightVizDataLogic
+    legendPosition: string | null | undefined // insightVizDataLogic
+    showLegend: boolean | null | undefined // insightVizDataLogic
+    showValuesOnSeries: boolean | null | undefined // insightVizDataLogic
+    vizQuerySource:
+        | FunnelsQuery
+        | LifecycleQuery
+        | PathsQuery
+        | RetentionQuery
+        | StickinessQuery
+        | TrendsQuery
+        | WebOverviewQuery
+        | WebStatsTableQuery
+        | null // insightVizDataLogic
+    vizSeries: (AnyEntityNode<AnyDataWarehouseNode> | GroupNode<DataWarehouseNode>)[] | null | undefined // insightVizDataLogic
+    searchParams: Record<string, any> // router
+    advancedOptionsUsedCount: number
+    aggregationTargetLabel: Noun
+    breakdownSorting: string | undefined
+    conversionMetrics: FunnelTimeConversionMetrics
+    conversionWindow: Required<FunnelConversionWindow>
+    conversionWindowInterval: number | null
+    conversionWindowUnit: FunnelConversionWindowTimeUnit | null
+    disableFunnelBreakdownBaseline: boolean
+    exclusionDefaultStepRange: FunnelExclusionSteps
+    exclusionFilters: FilterType
+    flattenedBreakdowns: FlattenedFunnelStepByBreakdown[]
+    getFunnelsColor: (dataset: FlattenedFunnelStepByBreakdown | FunnelStepWithConversionMetrics) => string
+    getFunnelsColorToken: (
+        dataset: FlattenedFunnelStepByBreakdown | FunnelStepWithConversionMetrics
+    ) => [DataColorTheme | null, DataColorToken | null]
+    hasFunnelResults: boolean
+    hiddenLegendBreakdowns: string[] | undefined
+    histogramGraphData: HistogramGraphDatum[] | null
+    histogramGraphDataPrevious: HistogramGraphDatum[] | null
+    incompletenessOffsetFromEnd: number
+    indexedSteps: {
+        action_id: string
+        average_conversion_time: number | null
+        breakdown?: BreakdownKeyType | undefined
+        breakdown_value?: BreakdownKeyType | undefined
+        breakdowns?: BreakdownKeyType[] | undefined
+        colorIndex: number
+        compare: boolean | undefined
+        compare_label?: 'current' | 'previous' | undefined
+        converted_people_url: string
+        count: number
+        custom_name?: string | null | undefined
+        data?: number[] | undefined
+        days?: string[] | undefined
+        dropped_people_url: string | null
+        id: number
+        labels?: string[] | undefined
+        median_conversion_time: number | null
+        name: string
+        nested_breakdown?: FunnelStep[] | undefined
+        order: number
+        people?: string[] | undefined
+        seriesIndex: number
+        type: EntityType
+    }[]
+    isBreakdownCompareFunnel: boolean
+    isComparedFunnel: boolean
+    isEmptyFunnel: boolean | null
+    isFunnelWithEnoughSteps: boolean
+    isFunnelWithIncompleteDataWarehouseStep: boolean
+    isSkewed: boolean
+    isStepOptional: (step: number) => boolean
+    isStepsFunnel: boolean | null
+    isTimeToConvertFunnel: boolean | null
+    isTrendsFunnel: boolean | null
+    numericBinCount: number
+    querySource: FunnelsQuery | null
+    resultCustomizations: Record<string, ResultCustomizationByValue> | undefined
+    results: FunnelResultType
+    series: FunnelsQuerySeriesNodeUnion[] | null
+    skewWarningHidden: boolean
+    stepNames: FunnelStepWithNestedBreakdown[]
+    steps: FunnelStepWithNestedBreakdown[]
+    stepsWithConversionMetrics: FunnelStepWithConversionMetrics[]
+    timeConversionResults: FunnelsTimeConversionBins | null
+    timeConversionResultsPrevious: FunnelsTimeConversionBins | null
+    visibleStepsWithConversionMetrics: FunnelStepWithConversionMetrics[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface funnelDataLogicActions {
+    cancelChanges: () => {
+        value: true
+    } // insightDataLogic
+    updateInsightFilter: (insightFilter: InsightFilter) => {
+        insightFilter: InsightFilter
+    } // insightVizDataLogic
+    updateQuerySource: (querySource: QuerySourceUpdate) => {
+        querySource: QuerySourceUpdate
+    } // insightVizDataLogic
+    push: (
+        url: string,
+        searchInput?: string | Record<string, any>,
+        hashInput?: string | Record<string, any>
+    ) => {
+        hashInput: string | Record<string, any>
+        searchInput: string | Record<string, any>
+        url: string
+    } // router
+    commitConversionWindow: () => {
+        value: true
+    }
+    hideSkewWarning: () => {
+        value: true
+    }
+    setBreakdownSorting: (breakdownSorting: string | undefined) => {
+        breakdownSorting: string | undefined
+    }
+    setConversionWindowInterval: (funnelWindowInterval: number) => {
+        funnelWindowInterval: number
+    }
+    setConversionWindowUnit: (funnelWindowIntervalUnit: FunnelConversionWindowTimeUnit) => {
+        funnelWindowIntervalUnit: FunnelConversionWindowTimeUnit
+    }
+    setHiddenLegendBreakdowns: (hiddenLegendBreakdowns: string[]) => {
+        hiddenLegendBreakdowns: string[]
+    }
+    toggleLegendBreakdownVisibility: (breakdown: string) => {
+        breakdown: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface funnelDataLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        querySource: (
+            vizQuerySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => FunnelsQuery | null
+        series: (
+            vizQuerySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null,
+            vizSeries: (AnyEntityNode<AnyDataWarehouseNode> | GroupNode<DataWarehouseNode>)[] | null | undefined
+        ) => FunnelsQuerySeriesNodeUnion[] | null
+        isStepsFunnel: (funnelsFilter: FunnelsFilter | null | undefined) => boolean | null
+        isTimeToConvertFunnel: (funnelsFilter: FunnelsFilter | null | undefined) => boolean | null
+        isTrendsFunnel: (funnelsFilter: FunnelsFilter | null | undefined) => boolean | null
+        isEmptyFunnel: (querySource: FunnelsQuery | null) => boolean | null
+        aggregationTargetLabel: (
+            querySource: FunnelsQuery | null,
+            aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun
+        ) => Noun
+        results: (
+            insightData: Record<string, any>,
+            vizQuerySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null,
+            querySource: FunnelsQuery | null
+        ) => FunnelResultType
+        steps: (
+            insightData: Record<string, any>,
+            vizQuerySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null,
+            querySource: FunnelsQuery | null,
+            breakdownFilter: BreakdownFilter | null | undefined,
+            results: FunnelResultType,
+            isTimeToConvertFunnel: boolean | null,
+            isStepsFunnel: boolean | null
+        ) => FunnelStepWithNestedBreakdown[]
+        stepNames: (querySource: FunnelsQuery | null) => FunnelStepWithNestedBreakdown[]
+        isComparedFunnel: (steps: FunnelStepWithNestedBreakdown[]) => boolean
+        isBreakdownCompareFunnel: (results: FunnelResultType, isStepsFunnel: boolean | null) => boolean
+        stepsWithConversionMetrics: (
+            steps: FunnelStepWithNestedBreakdown[],
+            funnelsFilter: FunnelsFilter | null | undefined,
+            querySource: FunnelsQuery | null
+        ) => FunnelStepWithConversionMetrics[]
+        disableFunnelBreakdownBaseline: (arg: any) => boolean
+        flattenedBreakdowns: (
+            stepsWithConversionMetrics: FunnelStepWithConversionMetrics[],
+            funnelsFilter: FunnelsFilter | null | undefined,
+            disableFunnelBreakdownBaseline: boolean,
+            breakdownSorting: string | undefined,
+            isComparedFunnel: boolean,
+            isBreakdownCompareFunnel: boolean
+        ) => FlattenedFunnelStepByBreakdown[]
+        hiddenLegendBreakdowns: (funnelsFilter: FunnelsFilter | null | undefined) => string[] | undefined
+        breakdownSorting: (funnelsFilter: FunnelsFilter | null | undefined) => string | undefined
+        resultCustomizations: (
+            funnelsFilter: FunnelsFilter | null | undefined
+        ) => Record<string, ResultCustomizationByValue> | undefined
+        visibleStepsWithConversionMetrics: (
+            stepsWithConversionMetrics: FunnelStepWithConversionMetrics[],
+            flattenedBreakdowns: FlattenedFunnelStepByBreakdown[],
+            hiddenLegendBreakdowns: string[] | undefined,
+            isComparedFunnel: boolean,
+            isBreakdownCompareFunnel: boolean
+        ) => FunnelStepWithConversionMetrics[]
+        timeConversionResults: (
+            results: FunnelResultType,
+            funnelsFilter: FunnelsFilter | null | undefined
+        ) => FunnelsTimeConversionBins | null
+        timeConversionResultsPrevious: (
+            results: FunnelResultType,
+            funnelsFilter: FunnelsFilter | null | undefined
+        ) => FunnelsTimeConversionBins | null
+        histogramGraphData: (timeConversionResults: FunnelsTimeConversionBins | null) => HistogramGraphDatum[] | null
+        histogramGraphDataPrevious: (
+            timeConversionResultsPrevious: FunnelsTimeConversionBins | null
+        ) => HistogramGraphDatum[] | null
+        hasFunnelResults: (
+            insightData: Record<string, any>,
+            funnelsFilter: FunnelsFilter | null | undefined,
+            steps: FunnelStepWithNestedBreakdown[],
+            histogramGraphData: HistogramGraphDatum[] | null,
+            querySource: FunnelsQuery | null,
+            stepNames: FunnelStepWithNestedBreakdown[]
+        ) => boolean
+        numericBinCount: (
+            funnelsFilter: FunnelsFilter | null | undefined,
+            timeConversionResults: FunnelsTimeConversionBins | null
+        ) => number
+        conversionMetrics: (
+            steps: FunnelStepWithNestedBreakdown[],
+            funnelsFilter: FunnelsFilter | null | undefined,
+            timeConversionResults: FunnelsTimeConversionBins | null,
+            insightData: Record<string, any>
+        ) => FunnelTimeConversionMetrics
+        conversionWindow: (funnelsFilter: FunnelsFilter | null | undefined) => Required<FunnelConversionWindow>
+        incompletenessOffsetFromEnd: (
+            steps: FunnelStepWithNestedBreakdown[],
+            conversionWindow: Required<FunnelConversionWindow>
+        ) => number
+        advancedOptionsUsedCount: (funnelsFilter: FunnelsFilter | null | undefined) => number
+        isSkewed: (conversionMetrics: FunnelTimeConversionMetrics, skewWarningHidden: boolean) => boolean
+        indexedSteps: (steps: FunnelStepWithNestedBreakdown[]) => {
+            action_id: string
+            average_conversion_time: number | null
+            breakdown?: BreakdownKeyType | undefined
+            breakdown_value?: BreakdownKeyType | undefined
+            breakdowns?: BreakdownKeyType[] | undefined
+            colorIndex: number
+            compare: boolean | undefined
+            compare_label?: 'current' | 'previous' | undefined
+            converted_people_url: string
+            count: number
+            custom_name?: string | null | undefined
+            data?: number[] | undefined
+            days?: string[] | undefined
+            dropped_people_url: string | null
+            id: number
+            labels?: string[] | undefined
+            median_conversion_time: number | null
+            name: string
+            nested_breakdown?: FunnelStep[] | undefined
+            order: number
+            people?: string[] | undefined
+            seriesIndex: number
+            type: EntityType
+        }[]
+        getFunnelsColorToken: (
+            resultCustomizations: Record<string, ResultCustomizationByValue> | undefined,
+            getTheme: (themeId: number | string | null | undefined) => DataColorTheme | null,
+            breakdownFilter: BreakdownFilter | null | undefined,
+            querySource: FunnelsQuery | null
+        ) => (
+            dataset: FlattenedFunnelStepByBreakdown | FunnelStepWithConversionMetrics
+        ) => [DataColorTheme | null, DataColorToken | null]
+        getFunnelsColor: (
+            getFunnelsColorToken: (
+                dataset: FlattenedFunnelStepByBreakdown | FunnelStepWithConversionMetrics
+            ) => [DataColorTheme | null, DataColorToken | null]
+        ) => (dataset: FlattenedFunnelStepByBreakdown | FunnelStepWithConversionMetrics) => string
+        isStepOptional: (querySource: FunnelsQuery | null) => (step: number) => boolean
+        isFunnelWithEnoughSteps: (series: FunnelsQuerySeriesNodeUnion[] | null) => boolean
+        isFunnelWithIncompleteDataWarehouseStep: (series: FunnelsQuerySeriesNodeUnion[] | null) => boolean
+        exclusionDefaultStepRange: (querySource: FunnelsQuery | null) => FunnelExclusionSteps
+        exclusionFilters: (funnelsFilter: FunnelsFilter | null | undefined) => FilterType
+    }
+}
+
+export type funnelDataLogicType = MakeLogicType<
+    funnelDataLogicValues,
+    funnelDataLogicActions,
+    InsightLogicProps,
+    funnelDataLogicMeta
+>
+
 export const funnelDataLogic = kea<funnelDataLogicType>([
     path((key) => ['scenes', 'funnels', 'funnelDataLogic', key]),
     props({} as InsightLogicProps),
@@ -240,17 +589,50 @@ export const funnelDataLogic = kea<funnelDataLogicType>([
     selectors(({ props }) => ({
         querySource: [
             (s) => [s.vizQuerySource],
-            (vizQuerySource) => (isFunnelsQuery(vizQuerySource) ? vizQuerySource : null),
+            (
+                vizQuerySource:
+                    | FunnelsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').LifecycleQuery
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').RetentionQuery
+                    | import('~/queries/schema/schema-general').StickinessQuery
+                    | import('~/queries/schema/schema-general').TrendsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => (isFunnelsQuery(vizQuerySource) ? vizQuerySource : null),
         ],
 
         series: [
             (s) => [s.vizQuerySource, s.vizSeries],
-            (vizQuerySource, series) => (isFunnelsQuery(vizQuerySource) ? (series as FunnelsQuery['series']) : null),
+            (
+                vizQuerySource:
+                    | FunnelsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').LifecycleQuery
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').RetentionQuery
+                    | import('~/queries/schema/schema-general').StickinessQuery
+                    | import('~/queries/schema/schema-general').TrendsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery,
+                series:
+                    | (
+                          | import('~/queries/schema/schema-general').AnyEntityNode<
+                                import('~/queries/schema/schema-general').AnyDataWarehouseNode
+                            >
+                          | import('~/queries/schema/schema-general').GroupNode<
+                                import('~/queries/schema/schema-general').DataWarehouseNode
+                            >
+                      )[]
+                    | null
+                    | undefined
+            ) => (isFunnelsQuery(vizQuerySource) ? (series as FunnelsQuery['series']) : null),
         ],
 
         isStepsFunnel: [
             (s) => [s.funnelsFilter],
-            (funnelsFilter): boolean | null => {
+            (funnelsFilter: FunnelsFilter | null | undefined): boolean | null => {
                 return funnelsFilter === null
                     ? null
                     : funnelsFilter === undefined
@@ -260,20 +642,20 @@ export const funnelDataLogic = kea<funnelDataLogicType>([
         ],
         isTimeToConvertFunnel: [
             (s) => [s.funnelsFilter],
-            (funnelsFilter): boolean | null => {
+            (funnelsFilter: FunnelsFilter | null | undefined): boolean | null => {
                 return funnelsFilter === null ? null : funnelsFilter?.funnelVizType === FunnelVizType.TimeToConvert
             },
         ],
         isTrendsFunnel: [
             (s) => [s.funnelsFilter],
-            (funnelsFilter): boolean | null => {
+            (funnelsFilter: FunnelsFilter | null | undefined): boolean | null => {
                 return funnelsFilter === null ? null : funnelsFilter?.funnelVizType === FunnelVizType.Trends
             },
         ],
 
         isEmptyFunnel: [
             (s) => [s.querySource],
-            (q): boolean | null => {
+            (q: FunnelsQuery | null): boolean | null => {
                 return isFunnelsQuery(q)
                     ? q.series.filter((n) => n.kind === NodeKind.EventsNode || n.kind === NodeKind.ActionsNode)
                           .length === 0
@@ -283,7 +665,10 @@ export const funnelDataLogic = kea<funnelDataLogicType>([
 
         aggregationTargetLabel: [
             (s) => [s.querySource, s.aggregationLabel],
-            (querySource, aggregationLabel): Noun => {
+            (
+                querySource: FunnelsQuery | null,
+                aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun
+            ): Noun => {
                 if (!querySource) {
                     return { singular: '', plural: '' }
                 }
@@ -300,7 +685,20 @@ export const funnelDataLogic = kea<funnelDataLogicType>([
 
         results: [
             (s) => [s.insightData, s.vizQuerySource, s.querySource],
-            (insightData, vizQuerySource, querySource): FunnelResultType => {
+            (
+                insightData: Record<string, any>,
+                vizQuerySource:
+                    | FunnelsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').LifecycleQuery
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').RetentionQuery
+                    | import('~/queries/schema/schema-general').StickinessQuery
+                    | import('~/queries/schema/schema-general').TrendsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery,
+                querySource: FunnelsQuery | null
+            ): FunnelResultType => {
                 // Web analytics queries should not be processed as funnels, even though their response
                 // structure may look similar. InsightVizDisplay unconditionally mounts funnelDataLogic,
                 // so we need explicit guards to prevent web analytics data from being misinterpreted.
@@ -348,13 +746,22 @@ export const funnelDataLogic = kea<funnelDataLogicType>([
                 s.isStepsFunnel,
             ],
             (
-                insightData,
-                _vizQuerySource,
-                querySource,
-                breakdownFilter,
-                results,
-                isTimeToConvertFunnel,
-                isStepsFunnel
+                insightData: Record<string, any>,
+                _vizQuerySource:
+                    | FunnelsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').LifecycleQuery
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').RetentionQuery
+                    | import('~/queries/schema/schema-general').StickinessQuery
+                    | import('~/queries/schema/schema-general').TrendsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery,
+                querySource: FunnelsQuery | null,
+                breakdownFilter: null | import('~/queries/schema/schema-general').BreakdownFilter | undefined,
+                results: FunnelResultType,
+                isTimeToConvertFunnel: boolean | null,
+                isStepsFunnel: boolean | null
             ): FunnelStepWithNestedBreakdown[] => {
                 if (!isFunnelsQueryOrLegacyFilter(insightData, querySource)) {
                     return []
@@ -390,7 +797,7 @@ export const funnelDataLogic = kea<funnelDataLogicType>([
         ],
         stepNames: [
             (s) => [s.querySource],
-            (querySource): FunnelStepWithNestedBreakdown[] => {
+            (querySource: FunnelsQuery | null): FunnelStepWithNestedBreakdown[] => {
                 if (!querySource?.series?.length) {
                     return []
                 }
@@ -425,7 +832,7 @@ export const funnelDataLogic = kea<funnelDataLogicType>([
         // visibility machinery must be bypassed for it.
         isComparedFunnel: [
             (s) => [s.steps],
-            (steps): boolean =>
+            (steps: FunnelStepWithNestedBreakdown[]): boolean =>
                 Array.isArray(steps) &&
                 steps.some((step) => step.nested_breakdown?.some((series) => series.compare_label != null)),
         ],
@@ -435,7 +842,8 @@ export const funnelDataLogic = kea<funnelDataLogicType>([
         // breakdown machinery entirely, the latter keeps it (table, hidden legend) around the grouped bars.
         isBreakdownCompareFunnel: [
             (s) => [s.results, s.isStepsFunnel],
-            (results, isStepsFunnel): boolean => !!isStepsFunnel && isFunnelStepsBreakdownCompareResult(results),
+            (results: FunnelResultType, isStepsFunnel: boolean | null): boolean =>
+                !!isStepsFunnel && isFunnelStepsBreakdownCompareResult(results),
         ],
         stepsWithConversionMetrics: [
             (s) => [s.steps, s.funnelsFilter, s.querySource],
@@ -500,13 +908,17 @@ export const funnelDataLogic = kea<funnelDataLogicType>([
         ],
         hiddenLegendBreakdowns: [
             (s) => [s.funnelsFilter],
-            (funnelsFilter): string[] | undefined => funnelsFilter?.hiddenLegendBreakdowns,
+            (funnelsFilter: FunnelsFilter | null | undefined): string[] | undefined =>
+                funnelsFilter?.hiddenLegendBreakdowns,
         ],
         breakdownSorting: [
             (s) => [s.funnelsFilter],
             (funnelsFilter: FunnelsFilter | null | undefined): string | undefined => funnelsFilter?.breakdownSorting,
         ],
-        resultCustomizations: [(s) => [s.funnelsFilter], (funnelsFilter) => funnelsFilter?.resultCustomizations],
+        resultCustomizations: [
+            (s) => [s.funnelsFilter],
+            (funnelsFilter: FunnelsFilter | null | undefined) => funnelsFilter?.resultCustomizations,
+        ],
         visibleStepsWithConversionMetrics: [
             (s) => [
                 s.stepsWithConversionMetrics,
@@ -613,7 +1025,10 @@ export const funnelDataLogic = kea<funnelDataLogicType>([
          */
         timeConversionResults: [
             (s) => [s.results, s.funnelsFilter],
-            (results, funnelsFilter): FunnelsTimeConversionBins | null => {
+            (
+                results: FunnelResultType,
+                funnelsFilter: FunnelsFilter | null | undefined
+            ): FunnelsTimeConversionBins | null => {
                 if (funnelsFilter?.funnelVizType !== FunnelVizType.TimeToConvert) {
                     return null
                 }
@@ -630,7 +1045,10 @@ export const funnelDataLogic = kea<funnelDataLogicType>([
         ],
         timeConversionResultsPrevious: [
             (s) => [s.results, s.funnelsFilter],
-            (results, funnelsFilter): FunnelsTimeConversionBins | null => {
+            (
+                results: FunnelResultType,
+                funnelsFilter: FunnelsFilter | null | undefined
+            ): FunnelsTimeConversionBins | null => {
                 if (funnelsFilter?.funnelVizType !== FunnelVizType.TimeToConvert || !Array.isArray(results)) {
                     return null
                 }
@@ -643,17 +1061,24 @@ export const funnelDataLogic = kea<funnelDataLogicType>([
         ],
         histogramGraphData: [
             (s) => [s.timeConversionResults],
-            (timeConversionResults): HistogramGraphDatum[] | null =>
+            (timeConversionResults: FunnelsTimeConversionBins | null): HistogramGraphDatum[] | null =>
                 timeConversionBinsToHistogramData(timeConversionResults),
         ],
         histogramGraphDataPrevious: [
             (s) => [s.timeConversionResultsPrevious],
-            (timeConversionResultsPrevious): HistogramGraphDatum[] | null =>
+            (timeConversionResultsPrevious: FunnelsTimeConversionBins | null): HistogramGraphDatum[] | null =>
                 timeConversionBinsToHistogramData(timeConversionResultsPrevious),
         ],
         hasFunnelResults: [
             (s) => [s.insightData, s.funnelsFilter, s.steps, s.histogramGraphData, s.querySource, s.stepNames],
-            (insightData, funnelsFilter, steps, histogramGraphData, querySource, stepNames) => {
+            (
+                insightData: Record<string, any>,
+                funnelsFilter: FunnelsFilter | null | undefined,
+                steps: FunnelStepWithNestedBreakdown[],
+                histogramGraphData: HistogramGraphDatum[] | null,
+                querySource: FunnelsQuery | null,
+                stepNames: FunnelStepWithNestedBreakdown[]
+            ) => {
                 if (!isFunnelsQueryOrLegacyFilter(insightData, querySource)) {
                     return false
                 }
@@ -673,7 +1098,10 @@ export const funnelDataLogic = kea<funnelDataLogicType>([
         ],
         numericBinCount: [
             (s) => [s.funnelsFilter, s.timeConversionResults],
-            (funnelsFilter, timeConversionResults): number => {
+            (
+                funnelsFilter: FunnelsFilter | null | undefined,
+                timeConversionResults: FunnelsTimeConversionBins | null
+            ): number => {
                 if (funnelsFilter?.binCount === BIN_COUNT_AUTO) {
                     return timeConversionResults?.bins?.length ?? 0
                 }
@@ -683,7 +1111,12 @@ export const funnelDataLogic = kea<funnelDataLogicType>([
 
         conversionMetrics: [
             (s) => [s.steps, s.funnelsFilter, s.timeConversionResults, s.insightData],
-            (steps, funnelsFilter, timeConversionResults, insightData): FunnelTimeConversionMetrics => {
+            (
+                steps: FunnelStepWithNestedBreakdown[],
+                funnelsFilter: FunnelsFilter | null | undefined,
+                timeConversionResults: FunnelsTimeConversionBins | null,
+                insightData: Record<string, any>
+            ): FunnelTimeConversionMetrics => {
                 // steps should be empty in time conversion view. Return metrics precalculated on backend
                 if (funnelsFilter?.funnelVizType === FunnelVizType.TimeToConvert) {
                     return {
@@ -726,7 +1159,7 @@ export const funnelDataLogic = kea<funnelDataLogicType>([
         ],
         conversionWindow: [
             (s) => [s.funnelsFilter],
-            (funnelsFilter): Required<FunnelConversionWindow> => {
+            (funnelsFilter: FunnelsFilter | null | undefined): Required<FunnelConversionWindow> => {
                 const { funnelWindowInterval, funnelWindowIntervalUnit } = funnelsFilter || {}
                 return {
                     funnelWindowInterval: funnelWindowInterval || 14,
@@ -736,7 +1169,7 @@ export const funnelDataLogic = kea<funnelDataLogicType>([
         ],
         incompletenessOffsetFromEnd: [
             (s) => [s.steps, s.conversionWindow],
-            (steps, conversionWindow) => {
+            (steps: FunnelStepWithNestedBreakdown[], conversionWindow: Required<FunnelConversionWindow>) => {
                 if (steps?.[0]?.days === undefined) {
                     return 0
                 }
@@ -757,7 +1190,7 @@ export const funnelDataLogic = kea<funnelDataLogicType>([
          */
         advancedOptionsUsedCount: [
             (s) => [s.funnelsFilter],
-            (funnelsFilter): number => {
+            (funnelsFilter: FunnelsFilter | null | undefined): number => {
                 let count = 0
                 if (funnelsFilter?.funnelOrderType && funnelsFilter?.funnelOrderType !== StepOrderValue.ORDERED) {
                     count = count + 1
@@ -777,13 +1210,13 @@ export const funnelDataLogic = kea<funnelDataLogicType>([
 
         isSkewed: [
             (s) => [s.conversionMetrics, s.skewWarningHidden],
-            (conversionMetrics, skewWarningHidden): boolean => {
+            (conversionMetrics: FunnelTimeConversionMetrics, skewWarningHidden: boolean): boolean => {
                 return !skewWarningHidden && (conversionMetrics.totalRate < 0.1 || conversionMetrics.totalRate > 0.9)
             },
         ],
         indexedSteps: [
             (s) => [s.steps],
-            (steps) => {
+            (steps: FunnelStepWithNestedBreakdown[]) => {
                 if (!Array.isArray(steps)) {
                     return []
                 }
@@ -818,7 +1251,14 @@ export const funnelDataLogic = kea<funnelDataLogicType>([
         ],
         getFunnelsColorToken: [
             (s) => [s.resultCustomizations, s.getTheme, s.breakdownFilter, s.querySource],
-            (resultCustomizations, getTheme, breakdownFilter, querySource) => {
+            (
+                resultCustomizations:
+                    | Record<string, import('~/queries/schema/schema-general').ResultCustomizationByValue>
+                    | undefined,
+                getTheme: (themeId: number | string | null | undefined) => DataColorTheme | null,
+                breakdownFilter: null | import('~/queries/schema/schema-general').BreakdownFilter | undefined,
+                querySource: FunnelsQuery | null
+            ) => {
                 return (
                     dataset: FlattenedFunnelStepByBreakdown | FunnelStepWithConversionMetrics
                 ): [DataColorTheme | null, DataColorToken | null] => {
@@ -862,7 +1302,11 @@ export const funnelDataLogic = kea<funnelDataLogicType>([
         ],
         getFunnelsColor: [
             (s) => [s.getFunnelsColorToken],
-            (getFunnelsColorToken) => {
+            (
+                getFunnelsColorToken: (
+                    dataset: FlattenedFunnelStepByBreakdown | FunnelStepWithConversionMetrics
+                ) => [DataColorTheme | null, DataColorToken | null]
+            ) => {
                 return (dataset: FlattenedFunnelStepByBreakdown | FunnelStepWithConversionMetrics) => {
                     const [colorTheme, colorToken] = getFunnelsColorToken(dataset)
                     const color = colorTheme && colorToken ? getColorFromToken(colorTheme, colorToken) : '#000000'
@@ -888,10 +1332,15 @@ export const funnelDataLogic = kea<funnelDataLogicType>([
         ],
 
         // Validations
-        isFunnelWithEnoughSteps: [(s) => [s.series], (series) => isFunnelWithEnoughSteps(series)],
+        isFunnelWithEnoughSteps: [
+            (s) => [s.series],
+            (series: import('~/queries/schema/schema-general').FunnelsQuerySeriesNodeUnion[] | null) =>
+                isFunnelWithEnoughSteps(series),
+        ],
         isFunnelWithIncompleteDataWarehouseStep: [
             (s) => [s.series],
-            (series) => isFunnelWithIncompleteDataWarehouseStep(series),
+            (series: import('~/queries/schema/schema-general').FunnelsQuerySeriesNodeUnion[] | null) =>
+                isFunnelWithIncompleteDataWarehouseStep(series),
         ],
 
         // Exclusion filters
@@ -904,7 +1353,7 @@ export const funnelDataLogic = kea<funnelDataLogicType>([
         ],
         exclusionFilters: [
             (s) => [s.funnelsFilter],
-            (funnelsFilter): FilterType => ({
+            (funnelsFilter: FunnelsFilter | null | undefined): FilterType => ({
                 events: funnelsFilter?.exclusions?.map(({ funnelFromStep, funnelToStep, ...rest }, index) => ({
                     funnel_from_step: funnelFromStep,
                     funnel_to_step: funnelToStep,
diff --git a/frontend/src/scenes/funnels/funnelPersonsModalLogic.ts b/frontend/src/scenes/funnels/funnelPersonsModalLogic.ts
index 261c713d60a3..cc402f56fc9a 100644
--- a/frontend/src/scenes/funnels/funnelPersonsModalLogic.ts
+++ b/frontend/src/scenes/funnels/funnelPersonsModalLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, selectors } from 'kea'
 
 import { elementsToAction } from 'scenes/activity/explore/createActionFromEvent'
 import { insightLogic } from 'scenes/insights/insightLogic'
@@ -24,12 +24,75 @@ import {
     PropertyOperator,
 } from '~/types'
 
+import type { FunnelsFilter, FunnelsQuery } from '../../queries/schema/schema-general'
+import type { FunnelStepWithNestedBreakdown } from '../../types'
 import { funnelDataLogic } from './funnelDataLogic'
-import type { funnelPersonsModalLogicType } from './funnelPersonsModalLogicType'
 import { parseBreakdownValue, parseEventAndProperty } from './funnelUtils'
 
 const DEFAULT_FUNNEL_LOGIC_KEY = 'default_funnel_key'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface funnelPersonsModalLogicValues {
+    funnelsFilter: FunnelsFilter | null | undefined // funnelDataLogic
+    querySource: FunnelsQuery | null // funnelDataLogic
+    steps: FunnelStepWithNestedBreakdown[] // funnelDataLogic
+    isInDashboardContext: boolean // insightLogic
+    isInExperimentContext: boolean // insightLogic
+    canOpenPersonModal: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface funnelPersonsModalLogicActions {
+    openCorrelationPersonsModal: (
+        correlation: FunnelCorrelation,
+        success: boolean
+    ) => {
+        correlation: FunnelCorrelation
+        success: boolean
+    }
+    openPersonsModalForSeries: ({
+        step,
+        series,
+        converted,
+    }: {
+        converted: boolean
+        series: Omit<FunnelStepWithConversionMetrics, 'nested_breakdown'>
+        step: FunnelStep
+    }) => {
+        converted: boolean
+        series: Omit<FunnelStepWithConversionMetrics, 'nested_breakdown'>
+        step: FunnelStep
+    }
+    openPersonsModalForStep: ({
+        step,
+        stepIndex,
+        converted,
+    }: {
+        converted: boolean
+        step: FunnelStep
+        stepIndex?: number
+    }) => {
+        converted: boolean
+        step: FunnelStep
+        stepIndex: number | undefined
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface funnelPersonsModalLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        canOpenPersonModal: (funnelsFilter: FunnelsFilter | null | undefined) => boolean
+    }
+}
+
+export type funnelPersonsModalLogicType = MakeLogicType<
+    funnelPersonsModalLogicValues,
+    funnelPersonsModalLogicActions,
+    InsightLogicProps,
+    funnelPersonsModalLogicMeta
+>
+
 export const funnelPersonsModalLogic = kea<funnelPersonsModalLogicType>([
     props({} as InsightLogicProps),
     key(keyForInsightLogicProps(DEFAULT_FUNNEL_LOGIC_KEY)),
@@ -80,7 +143,7 @@ export const funnelPersonsModalLogic = kea<funnelPersonsModalLogicType>([
     selectors({
         canOpenPersonModal: [
             (s) => [s.funnelsFilter],
-            (funnelsFilter): boolean => {
+            (funnelsFilter: null | import('~/queries/schema/schema-general').FunnelsFilter | undefined): boolean => {
                 if (funnelsFilter?.customAggregationTarget) {
                     return false
                 }
diff --git a/frontend/src/scenes/funnels/funnelPropertyCorrelationLogic.ts b/frontend/src/scenes/funnels/funnelPropertyCorrelationLogic.ts
index 1d71fcf428c6..81a4988b6d74 100644
--- a/frontend/src/scenes/funnels/funnelPropertyCorrelationLogic.ts
+++ b/frontend/src/scenes/funnels/funnelPropertyCorrelationLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, defaults, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, defaults, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -10,9 +10,10 @@ import { FunnelCorrelationQuery, FunnelsActorsQuery, NodeKind } from '~/queries/
 import { setLatestVersionsOnQuery } from '~/queries/utils'
 import { FunnelCorrelation, FunnelCorrelationResultsType, FunnelCorrelationType, InsightLogicProps } from '~/types'
 
+import type { FunnelsQuery } from '../../queries/schema/schema-general'
+import type { TeamPublicType, TeamType } from '../../types'
 import { teamLogic } from '../teamLogic'
 import { funnelCorrelationLogic } from './funnelCorrelationLogic'
-import type { funnelPropertyCorrelationLogicType } from './funnelPropertyCorrelationLogicType'
 import { appendToCorrelationConfig } from './funnelUtils'
 
 // List of events that should be excluded, if we don't have an explicit list of
@@ -39,6 +40,77 @@ export const DEFAULT_EXCLUDED_PERSON_PROPERTIES = [
     '$initial_geoip_subdivision_name',
 ]
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface funnelPropertyCorrelationLogicValues {
+    querySource: FunnelsQuery | null // funnelCorrelationLogic
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    __ignore: FunnelCorrelationResultsType | null
+    excludedPropertyNames: string[]
+    isPropertyExcludedFromProject: (propertyName: string) => boolean
+    loadedPropertyCorrelationsTableOnce: boolean
+    propertyCorrelationTypes: FunnelCorrelationType[]
+    propertyCorrelationValues: FunnelCorrelation[]
+    propertyCorrelations: Record<'events', FunnelCorrelation[]>
+    propertyCorrelationsLoading: boolean
+    propertyNames: string[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface funnelPropertyCorrelationLogicActions {
+    excludePropertyFromProject: (propertyName: string) => {
+        propertyName: string
+    }
+    loadPropertyCorrelations: (_: any) => any
+    loadPropertyCorrelationsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPropertyCorrelationsSuccess: (
+        propertyCorrelations: {
+            events: FunnelCorrelation[]
+        },
+        payload?: any
+    ) => {
+        propertyCorrelations: {
+            events: FunnelCorrelation[]
+        }
+        payload?: any
+    }
+    setAllProperties: () => {
+        value: true
+    }
+    setPropertyCorrelationTypes: (types: FunnelCorrelationType[]) => {
+        types: FunnelCorrelationType[]
+    }
+    setPropertyNames: (propertyNames: string[]) => {
+        propertyNames: string[]
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface funnelPropertyCorrelationLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        propertyCorrelationValues: (
+            propertyCorrelations: Record<'events', FunnelCorrelation[]>,
+            propertyCorrelationTypes: FunnelCorrelationType[],
+            excludedPropertyNames: string[]
+        ) => FunnelCorrelation[]
+        excludedPropertyNames: (currentTeam: TeamPublicType | TeamType | null) => string[]
+        isPropertyExcludedFromProject: (excludedPropertyNames: string[]) => (propertyName: string) => boolean
+    }
+}
+
+export type funnelPropertyCorrelationLogicType = MakeLogicType<
+    funnelPropertyCorrelationLogicValues,
+    funnelPropertyCorrelationLogicActions,
+    InsightLogicProps,
+    funnelPropertyCorrelationLogicMeta
+>
+
 export const funnelPropertyCorrelationLogic = kea<funnelPropertyCorrelationLogicType>([
     props({} as InsightLogicProps),
     key(keyForInsightLogicProps('insight_funnel')),
@@ -129,7 +201,11 @@ export const funnelPropertyCorrelationLogic = kea<funnelPropertyCorrelationLogic
     selectors({
         propertyCorrelationValues: [
             (s) => [s.propertyCorrelations, s.propertyCorrelationTypes, s.excludedPropertyNames],
-            (propertyCorrelations, propertyCorrelationTypes, excludedPropertyNames): FunnelCorrelation[] => {
+            (
+                propertyCorrelations: Record<'events', FunnelCorrelation[]>,
+                propertyCorrelationTypes: FunnelCorrelationType[],
+                excludedPropertyNames: string[]
+            ): FunnelCorrelation[] => {
                 return propertyCorrelations.events
                     .filter(
                         (correlation) =>
@@ -152,12 +228,12 @@ export const funnelPropertyCorrelationLogic = kea<funnelPropertyCorrelationLogic
         ],
         excludedPropertyNames: [
             (s) => [s.currentTeam],
-            (currentTeam): string[] =>
+            (currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType): string[] =>
                 currentTeam?.correlation_config?.excluded_person_property_names || DEFAULT_EXCLUDED_PERSON_PROPERTIES,
         ],
         isPropertyExcludedFromProject: [
             (s) => [s.excludedPropertyNames],
-            (excludedPropertyNames) => (propertyName: string) =>
+            (excludedPropertyNames: string[]) => (propertyName: string) =>
                 excludedPropertyNames.find((name) => name === propertyName) !== undefined,
         ],
     }),
diff --git a/frontend/src/scenes/groups/groupLogic.ts b/frontend/src/scenes/groups/groupLogic.ts
index 0ac2d4115273..6fcc5e0f1989 100644
--- a/frontend/src/scenes/groups/groupLogic.ts
+++ b/frontend/src/scenes/groups/groupLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router, urlToAction } from 'kea-router'
 import posthog from 'posthog-js'
@@ -26,7 +26,9 @@ import { ActivityScope, Breadcrumb, Group, GroupTypeIndex, PropertyFilterType, P
 import { CUSTOMER_ANALYTICS_DEFAULT_QUERY_TAGS } from 'products/customer_analytics/frontend/constants'
 import { revenueAnalyticsLogic } from 'products/revenue_analytics/frontend/revenueAnalyticsLogic'
 
-import type { groupLogicType } from './groupLogicType'
+import type { FeatureFlagsSet } from '../../lib/logic/featureFlagLogic'
+import type { Noun } from '../../models/groupsModel'
+import type { GroupType } from '../../types'
 
 function getGroupEventsQuery(groupTypeIndex: number, groupKey: string): DataTableNode {
     return {
@@ -69,6 +71,178 @@ export function resolveBackNavigation(searchParams: Record<string, any>): GroupB
     return { url, name: typeof name === 'string' && name ? name : 'Back' }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface groupLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun // groupsModel
+    groupTypes: Map<GroupTypeIndex, GroupType> // groupsModel
+    isRevenueAnalyticsEnabled: boolean // revenueAnalyticsLogic
+    currentTeamId: number | null // teamLogic
+    backNavigation: GroupBackNavigation | null
+    backTo: Breadcrumb
+    breadcrumbs: Breadcrumb[]
+    effectiveLifetimeValue: {
+        source: 'properties' | 'revenue-analytics' | null
+        value: number | null
+    }
+    effectiveMRR: {
+        source: 'properties' | 'revenue-analytics' | null
+        value: number | null
+    }
+    groupData: Group | null
+    groupDataLoading: boolean
+    groupEventsQuery: DataTableNode | null
+    groupEventsQueryIsDirty: boolean
+    groupRevenueAnalyticsData: {
+        lifetimeValue: number | null
+        mrr: number | null
+    } | null
+    groupRevenueAnalyticsDataLoading: boolean
+    groupTab: string | null
+    groupType: string | null
+    groupTypeDetailDashboard: number | null
+    groupTypeName: string
+    groupTypeNamePlural: string
+    hasRevenueData: boolean
+    logicProps: GroupLogicProps
+    sidePanelContext: SidePanelSceneContext | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface groupLogicActions {
+    createDetailDashboard: (groupTypeIndex: number) => number // groupsModel
+    deleteProperty: (key: string) => {
+        key: string
+    }
+    editProperty: (
+        key: string,
+        newValue?: boolean | number | string | null
+    ) => {
+        key: string
+        newValue: boolean | number | string | null | undefined
+    }
+    loadGroup: () => any
+    loadGroupFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadGroupRevenueAnalyticsData: () => any
+    loadGroupRevenueAnalyticsDataFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadGroupRevenueAnalyticsDataSuccess: (
+        groupRevenueAnalyticsData: {
+            lifetimeValue: any
+            mrr: any
+        } | null,
+        payload?: any
+    ) => {
+        groupRevenueAnalyticsData: {
+            lifetimeValue: any
+            mrr: any
+        } | null
+        payload?: any
+    }
+    loadGroupSuccess: (
+        groupData: Group | null,
+        payload?: any
+    ) => {
+        groupData: Group | null
+        payload?: any
+    }
+    resetGroupEventsQuery: () => {
+        value: true
+    }
+    setGroupData: (group: Group) => {
+        group: Group
+    }
+    setGroupEventsQuery: (query: Node) => {
+        query: Node<Record<string, any>>
+    }
+    setGroupTab: (groupTab: string | null) => {
+        groupTab: string | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface groupLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        logicProps: (arg: any) => GroupLogicProps
+        groupEventsQueryIsDirty: (
+            groupEventsQuery: DataTableNode | null,
+            groupTypeIndex: number,
+            groupKey: string
+        ) => boolean
+        groupTypeName: (
+            aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun,
+            groupTypeIndex: number
+        ) => string
+        groupTypeNamePlural: (
+            aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun,
+            groupTypeIndex: number
+        ) => string
+        groupType: (groupTypes: Map<GroupTypeIndex, GroupType>, groupTypeIndex: number) => string | null
+        groupTypeDetailDashboard: (groupTypes: Map<GroupTypeIndex, GroupType>, groupTypeIndex: number) => number | null
+        effectiveMRR: (
+            groupRevenueAnalyticsData: {
+                lifetimeValue: number | null
+                mrr: number | null
+            } | null,
+            groupData: Group | null
+        ) => {
+            source: 'properties' | 'revenue-analytics' | null
+            value: number | null
+        }
+        effectiveLifetimeValue: (
+            groupRevenueAnalyticsData: {
+                lifetimeValue: number | null
+                mrr: number | null
+            } | null,
+            groupData: Group | null
+        ) => {
+            source: 'properties' | 'revenue-analytics' | null
+            value: number | null
+        }
+        hasRevenueData: (
+            effectiveMRR: {
+                source: 'properties' | 'revenue-analytics' | null
+                value: number | null
+            },
+            effectiveLifetimeValue: {
+                source: 'properties' | 'revenue-analytics' | null
+                value: number | null
+            }
+        ) => boolean
+        backNavigation: (searchParams: Record<string, any>) => GroupBackNavigation | null
+        backTo: (
+            aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun,
+            groupTypeIndex: number,
+            backNavigation: GroupBackNavigation | null
+        ) => Breadcrumb
+        breadcrumbs: (
+            groupTypeName: string,
+            groupTypeIndex: number,
+            groupKey: string,
+            groupData: Group | null
+        ) => Breadcrumb[]
+        sidePanelContext: (
+            groupTypeIndex: number,
+            groupKey: string,
+            featureFlags: FeatureFlagsSet
+        ) => SidePanelSceneContext | null
+    }
+}
+
+export type groupLogicType = MakeLogicType<groupLogicValues, groupLogicActions, GroupLogicProps, groupLogicMeta>
+
 export const groupLogic = kea<groupLogicType>([
     props({} as GroupLogicProps),
     key(({ groupKey, groupTypeIndex }) => `${groupTypeIndex}-${groupKey}`),
@@ -236,7 +410,7 @@ export const groupLogic = kea<groupLogicType>([
 
         groupEventsQueryIsDirty: [
             (s, p) => [s.groupEventsQuery, p.groupTypeIndex, p.groupKey],
-            (groupEventsQuery, groupTypeIndex, groupKey): boolean => {
+            (groupEventsQuery: DataTableNode | null, groupTypeIndex: number, groupKey: string): boolean => {
                 if (!groupEventsQuery) {
                     return false
                 }
@@ -246,24 +420,44 @@ export const groupLogic = kea<groupLogicType>([
 
         groupTypeName: [
             (s, p) => [s.aggregationLabel, p.groupTypeIndex],
-            (aggregationLabel, index): string => aggregationLabel(index).singular,
+            (
+                aggregationLabel: (
+                    groupTypeIndex: number | null | undefined,
+                    deferToUserWording?: boolean
+                ) => import('~/models/groupsModel').Noun,
+                index: number
+            ): string => aggregationLabel(index).singular,
         ],
         groupTypeNamePlural: [
             (s, p) => [s.aggregationLabel, p.groupTypeIndex],
-            (aggregationLabel, index): string => aggregationLabel(index).plural,
+            (
+                aggregationLabel: (
+                    groupTypeIndex: number | null | undefined,
+                    deferToUserWording?: boolean
+                ) => import('~/models/groupsModel').Noun,
+                index: number
+            ): string => aggregationLabel(index).plural,
         ],
         groupType: [
             (s, p) => [s.groupTypes, p.groupTypeIndex],
-            (groupTypes, index): string | null => groupTypes.get(index as GroupTypeIndex)?.group_type ?? null,
+            (groupTypes: Map<GroupTypeIndex, import('~/types').GroupType>, index: number): string | null =>
+                groupTypes.get(index as GroupTypeIndex)?.group_type ?? null,
         ],
         groupTypeDetailDashboard: [
             (s, p) => [s.groupTypes, p.groupTypeIndex],
-            (groupTypes, index): number | null => groupTypes.get(index as GroupTypeIndex)?.detail_dashboard ?? null,
+            (groupTypes: Map<GroupTypeIndex, import('~/types').GroupType>, index: number): number | null =>
+                groupTypes.get(index as GroupTypeIndex)?.detail_dashboard ?? null,
         ],
         // Combine revenue analytics with group properties, prioritizing analytics
         effectiveMRR: [
             (s) => [s.groupRevenueAnalyticsData, s.groupData],
-            (revenueData, groupData): { value: number | null; source: 'revenue-analytics' | 'properties' | null } => {
+            (
+                revenueData: {
+                    lifetimeValue: number | null
+                    mrr: number | null
+                } | null,
+                groupData: Group | null
+            ): { value: number | null; source: 'revenue-analytics' | 'properties' | null } => {
                 // Use pre-calculated data if available
                 if (revenueData?.mrr !== null && revenueData?.mrr !== undefined) {
                     return { value: revenueData.mrr, source: 'revenue-analytics' }
@@ -278,7 +472,13 @@ export const groupLogic = kea<groupLogicType>([
         ],
         effectiveLifetimeValue: [
             (s) => [s.groupRevenueAnalyticsData, s.groupData],
-            (revenueData, groupData): { value: number | null; source: 'revenue-analytics' | 'properties' | null } => {
+            (
+                revenueData: {
+                    lifetimeValue: number | null
+                    mrr: number | null
+                } | null,
+                groupData: Group | null
+            ): { value: number | null; source: 'revenue-analytics' | 'properties' | null } => {
                 // Use pre-calculated data if available
                 if (revenueData?.lifetimeValue !== null && revenueData?.lifetimeValue !== undefined) {
                     return { value: revenueData.lifetimeValue, source: 'revenue-analytics' }
@@ -293,15 +493,31 @@ export const groupLogic = kea<groupLogicType>([
         ],
         hasRevenueData: [
             (s) => [s.effectiveMRR, s.effectiveLifetimeValue],
-            (mrr, ltv): boolean => mrr.value !== null || ltv.value !== null,
+            (
+                mrr: {
+                    source: 'properties' | 'revenue-analytics' | null
+                    value: number | null
+                },
+                ltv: {
+                    source: 'properties' | 'revenue-analytics' | null
+                    value: number | null
+                }
+            ): boolean => mrr.value !== null || ltv.value !== null,
         ],
         backNavigation: [
             () => [router.selectors.searchParams],
-            (searchParams): GroupBackNavigation | null => resolveBackNavigation(searchParams),
+            (searchParams: Record<string, any>): GroupBackNavigation | null => resolveBackNavigation(searchParams),
         ],
         backTo: [
             (s, p) => [s.aggregationLabel, p.groupTypeIndex, s.backNavigation],
-            (aggregationLabel, groupTypeIndex, backNavigation): Breadcrumb => {
+            (
+                aggregationLabel: (
+                    groupTypeIndex: number | null | undefined,
+                    deferToUserWording?: boolean
+                ) => import('~/models/groupsModel').Noun,
+                groupTypeIndex: number,
+                backNavigation: GroupBackNavigation | null
+            ): Breadcrumb => {
                 if (backNavigation) {
                     return { key: 'group-back', name: backNavigation.name, path: backNavigation.url }
                 }
@@ -314,7 +530,12 @@ export const groupLogic = kea<groupLogicType>([
         ],
         breadcrumbs: [
             (s, p) => [s.groupTypeName, p.groupTypeIndex, p.groupKey, s.groupData],
-            (groupTypeName, groupTypeIndex, groupKey, groupData): Breadcrumb[] => {
+            (
+                groupTypeName: string,
+                groupTypeIndex: number,
+                groupKey: string,
+                groupData: Group | null
+            ): Breadcrumb[] => {
                 const breadcrumbs: Breadcrumb[] = []
                 breadcrumbs.push({
                     key: Scene.DataManagement,
@@ -340,7 +561,11 @@ export const groupLogic = kea<groupLogicType>([
         ],
         [SIDE_PANEL_CONTEXT_KEY]: [
             (s, p) => [p.groupTypeIndex, p.groupKey, s.featureFlags],
-            (groupTypeIndex, groupKey, featureFlags): SidePanelSceneContext | null => {
+            (
+                groupTypeIndex: number,
+                groupKey: string,
+                featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet
+            ): SidePanelSceneContext | null => {
                 if (!featureFlags[FEATURE_FLAGS.CUSTOMER_ANALYTICS]) {
                     return null
                 }
diff --git a/frontend/src/scenes/groups/groupsListLogic.ts b/frontend/src/scenes/groups/groupsListLogic.ts
index 88f395882a49..250c722bc93e 100644
--- a/frontend/src/scenes/groups/groupsListLogic.ts
+++ b/frontend/src/scenes/groups/groupsListLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers } from 'kea'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 import posthog from 'posthog-js'
 
@@ -9,7 +9,8 @@ import { groupsModel } from '~/models/groupsModel'
 import { DataTableNode, NodeKind, ProductKey } from '~/queries/schema/schema-general'
 import { GroupPropertyFilter, GroupTypeIndex } from '~/types'
 
-import type { groupsListLogicType } from './groupsListLogicType'
+import type { Noun } from '../../models/groupsModel'
+import type { GroupType } from '../../types'
 
 export interface GroupsListLogicProps {
     groupTypeIndex: GroupTypeIndex | number
@@ -39,6 +40,43 @@ export const GROUPS_LIST_DEFAULT_QUERY = (groupTypeIndex: GroupTypeIndex | numbe
         contextKey: `group-${groupTypeIndex}-list`,
     }) as DataTableNode
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface groupsListLogicValues {
+    groupsEnabled: boolean // groupsAccessLogic
+    aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun // groupsModel
+    groupTypes: Map<GroupTypeIndex, GroupType> // groupsModel
+    currentTeamId: number | null // teamLogic
+    groupFilters: GroupPropertyFilter[]
+    query: DataTableNode
+    queryWasModified: boolean
+    sorting: string[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface groupsListLogicActions {
+    setGroupFilters: (filters: GroupPropertyFilter[]) => {
+        filters: GroupPropertyFilter[]
+    }
+    setQuery: (query: DataTableNode) => {
+        query: DataTableNode
+    }
+    setQueryWasModified: (queryWasModified: boolean) => {
+        queryWasModified: boolean
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface groupsListLogicMeta {
+    key: number
+}
+
+export type groupsListLogicType = MakeLogicType<
+    groupsListLogicValues,
+    groupsListLogicActions,
+    GroupsListLogicProps,
+    groupsListLogicMeta
+>
+
 export const groupsListLogic = kea<groupsListLogicType>([
     props({} as GroupsListLogicProps),
     key((props: GroupsListLogicProps) => props.groupTypeIndex),
diff --git a/frontend/src/scenes/groups/groupsNewLogic.ts b/frontend/src/scenes/groups/groupsNewLogic.ts
index f3c31f19ed89..3ade99613012 100644
--- a/frontend/src/scenes/groups/groupsNewLogic.ts
+++ b/frontend/src/scenes/groups/groupsNewLogic.ts
@@ -1,5 +1,19 @@
-import { actions, afterMount, beforeUnmount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    afterMount,
+    beforeUnmount,
+    connect,
+    kea,
+    key,
+    listeners,
+    path,
+    props,
+    reducers,
+    selectors,
+} from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { actionToUrl } from 'kea-router'
 import { router } from 'kea-router'
@@ -15,7 +29,8 @@ import { urls } from 'scenes/urls'
 import { groupsModel } from '~/models/groupsModel'
 import { Breadcrumb, CreateGroupParams, Group, GroupTypeIndex } from '~/types'
 
-import type { groupsNewLogicType } from './groupsNewLogicType'
+import type { FeatureFlagsSet } from '../../lib/logic/featureFlagLogic'
+import type { Noun } from '../../models/groupsModel'
 
 export type GroupsNewLogicProps = {
     groupTypeIndex: number
@@ -36,6 +51,119 @@ export interface GroupProperty {
 
 const NEW_GROUP = {} as NewGroupFormData
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface groupsNewLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun // groupsModel
+    breadcrumbs: Breadcrumb[]
+    createdGroup: Group | null
+    createdGroupLoading: boolean
+    customProperties: GroupProperty[]
+    group: NewGroupFormData
+    groupAllErrors: Record<string, any>
+    groupChanged: boolean
+    groupErrors: DeepPartialMap<NewGroupFormData, ValidationErrorType>
+    groupHasErrors: boolean
+    groupManualErrors: Record<string, any>
+    groupTouched: boolean
+    groupTouches: Record<string, boolean>
+    groupTypeName: string
+    groupTypeNamePlural: string
+    groupValidationErrors: DeepPartialMap<NewGroupFormData, ValidationErrorType>
+    isGroupSubmitting: boolean
+    isGroupValid: boolean
+    logicProps: GroupsNewLogicProps
+    showGroupErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface groupsNewLogicActions {
+    addFormProperty: () => {}
+    removeFormProperty: (index: number) => {
+        index: number
+    }
+    resetGroup: (values?: NewGroupFormData) => {
+        values?: NewGroupFormData
+    }
+    saveGroup: (groupParams: CreateGroupParams) => {
+        groupParams: CreateGroupParams
+    }
+    saveGroupFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    saveGroupSuccess: (
+        createdGroup: Group,
+        payload?: {
+            groupParams: CreateGroupParams
+        }
+    ) => {
+        createdGroup: Group
+        payload?: {
+            groupParams: CreateGroupParams
+        }
+    }
+    setGroupManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setGroupValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setGroupValues: (values: DeepPartial<NewGroupFormData>) => {
+        values: DeepPartial<NewGroupFormData>
+    }
+    submitGroup: () => {
+        value: boolean
+    }
+    submitGroupFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitGroupRequest: (group: NewGroupFormData) => {
+        group: NewGroupFormData
+    }
+    submitGroupSuccess: (group: NewGroupFormData) => {
+        group: NewGroupFormData
+    }
+    touchGroupField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface groupsNewLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        logicProps: (arg: any) => GroupsNewLogicProps
+        groupTypeName: (
+            aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun,
+            logicProps: GroupsNewLogicProps
+        ) => string
+        groupTypeNamePlural: (
+            aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun,
+            logicProps: GroupsNewLogicProps
+        ) => string
+        breadcrumbs: (logicProps: GroupsNewLogicProps, groupTypeName: string) => Breadcrumb[]
+    }
+}
+
+export type groupsNewLogicType = MakeLogicType<
+    groupsNewLogicValues,
+    groupsNewLogicActions,
+    GroupsNewLogicProps,
+    groupsNewLogicMeta
+>
+
 export const groupsNewLogic = kea<groupsNewLogicType>([
     props({} as GroupsNewLogicProps),
     key((props) => `${props.groupTypeIndex}-new`),
@@ -49,19 +177,31 @@ export const groupsNewLogic = kea<groupsNewLogicType>([
         logicProps: [() => [(_, props) => props], (props): GroupsNewLogicProps => props],
         groupTypeName: [
             (s) => [s.aggregationLabel, s.logicProps],
-            (aggregationLabel, logicProps): string => {
+            (
+                aggregationLabel: (
+                    groupTypeIndex: number | null | undefined,
+                    deferToUserWording?: boolean
+                ) => import('~/models/groupsModel').Noun,
+                logicProps: GroupsNewLogicProps
+            ): string => {
                 return aggregationLabel(logicProps.groupTypeIndex).singular
             },
         ],
         groupTypeNamePlural: [
             (s) => [s.aggregationLabel, s.logicProps],
-            (aggregationLabel, logicProps): string => {
+            (
+                aggregationLabel: (
+                    groupTypeIndex: number | null | undefined,
+                    deferToUserWording?: boolean
+                ) => import('~/models/groupsModel').Noun,
+                logicProps: GroupsNewLogicProps
+            ): string => {
                 return aggregationLabel(logicProps.groupTypeIndex).plural
             },
         ],
         breadcrumbs: [
             (s) => [s.logicProps, s.groupTypeName],
-            (logicProps, groupTypeName): Breadcrumb[] => {
+            (logicProps: GroupsNewLogicProps, groupTypeName: string): Breadcrumb[] => {
                 return [
                     {
                         key: Scene.Groups,
diff --git a/frontend/src/scenes/groups/groupsSceneLogic.ts b/frontend/src/scenes/groups/groupsSceneLogic.ts
index d91a8fc6e421..d29c921fa95a 100644
--- a/frontend/src/scenes/groups/groupsSceneLogic.ts
+++ b/frontend/src/scenes/groups/groupsSceneLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, path, reducers, selectors } from 'kea'
 import { urlToAction } from 'kea-router'
 
 import { GroupsAccessStatus } from 'lib/introductions/groupsAccessLogic'
@@ -9,7 +9,8 @@ import { urls } from 'scenes/urls'
 import { groupsModel } from '~/models/groupsModel'
 import { Breadcrumb } from '~/types'
 
-import type { groupsSceneLogicType } from './groupsSceneLogicType'
+import type { Noun } from '../../models/groupsModel'
+import type { GroupType, GroupTypeIndex } from '../../types'
 
 export type GroupsTab = {
     key: string
@@ -19,6 +20,54 @@ export type GroupsTab = {
     buttons?: any
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface groupsSceneLogicValues {
+    aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun // groupsModel
+    groupTypes: Map<GroupTypeIndex, GroupType> // groupsModel
+    groupTypesLoading: boolean // groupsModel
+    groupsAccessStatus: GroupsAccessStatus // groupsModel
+    breadcrumbs: Breadcrumb[]
+    groupTypeIndex: number
+    groupTypeName: string
+    groupTypeNamePlural: string
+    showGroupsIntroductionPage: boolean
+    tabs: GroupsTab[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface groupsSceneLogicActions {
+    setGroupTypeIndex: (groupTypeIndex: number) => {
+        groupTypeIndex: number
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface groupsSceneLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        groupTypeName: (
+            aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun,
+            groupTypeIndex: number
+        ) => string
+        groupTypeNamePlural: (
+            aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun,
+            groupTypeIndex: number
+        ) => string
+        breadcrumbs: (
+            groupTypeIndex: number,
+            groupTypeNamePlural: string,
+            showGroupsIntroductionPage: boolean
+        ) => Breadcrumb[]
+        showGroupsIntroductionPage: (groupsAccessStatus: GroupsAccessStatus) => boolean
+    }
+}
+
+export type groupsSceneLogicType = MakeLogicType<
+    groupsSceneLogicValues,
+    groupsSceneLogicActions,
+    Record<string, any>,
+    groupsSceneLogicMeta
+>
+
 export const groupsSceneLogic = kea<groupsSceneLogicType>([
     path(['scenes', 'groups', 'groupsSceneLogic']),
     connect(() => ({
@@ -44,19 +93,35 @@ export const groupsSceneLogic = kea<groupsSceneLogicType>([
         ],
         groupTypeName: [
             (s) => [s.aggregationLabel, s.groupTypeIndex],
-            (aggregationLabel, groupTypeIndex): string => {
+            (
+                aggregationLabel: (
+                    groupTypeIndex: number | null | undefined,
+                    deferToUserWording?: boolean
+                ) => import('~/models/groupsModel').Noun,
+                groupTypeIndex: number
+            ): string => {
                 return aggregationLabel(groupTypeIndex).singular
             },
         ],
         groupTypeNamePlural: [
             (s) => [s.aggregationLabel, s.groupTypeIndex],
-            (aggregationLabel, groupTypeIndex): string => {
+            (
+                aggregationLabel: (
+                    groupTypeIndex: number | null | undefined,
+                    deferToUserWording?: boolean
+                ) => import('~/models/groupsModel').Noun,
+                groupTypeIndex: number
+            ): string => {
                 return aggregationLabel(groupTypeIndex).plural
             },
         ],
         breadcrumbs: [
             (s) => [s.groupTypeIndex, s.groupTypeNamePlural, s.showGroupsIntroductionPage],
-            (groupTypeIndex, groupTypeNamePlural, showGroupsIntroductionPage): Breadcrumb[] => {
+            (
+                groupTypeIndex: number,
+                groupTypeNamePlural: string,
+                showGroupsIntroductionPage: boolean
+            ): Breadcrumb[] => {
                 return [
                     {
                         key: Scene.Groups,
@@ -69,7 +134,7 @@ export const groupsSceneLogic = kea<groupsSceneLogicType>([
         ],
         showGroupsIntroductionPage: [
             (s) => [s.groupsAccessStatus],
-            (groupsAccessStatus): boolean => {
+            (groupsAccessStatus: GroupsAccessStatus): boolean => {
                 return [
                     GroupsAccessStatus.HasAccess,
                     GroupsAccessStatus.HasGroupTypes,
diff --git a/frontend/src/scenes/groups/relatedGroupsLogic.ts b/frontend/src/scenes/groups/relatedGroupsLogic.ts
index c74c8c2d2483..c6889894668f 100644
--- a/frontend/src/scenes/groups/relatedGroupsLogic.ts
+++ b/frontend/src/scenes/groups/relatedGroupsLogic.ts
@@ -1,4 +1,4 @@
-import { connect, events, kea, key, path, props, selectors } from 'kea'
+import { MakeLogicType, connect, events, kea, key, path, props, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -7,7 +7,70 @@ import { teamLogic } from 'scenes/teamLogic'
 
 import { ActorType } from '~/types'
 
-import type { relatedGroupsLogicType } from './relatedGroupsLogicType'
+import type { PersonActorType } from '../../types'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface relatedGroupsLogicValues {
+    currentTeamId: number | null // teamLogic
+    relatedActors: ActorType[]
+    relatedActorsLoading: boolean
+    relatedPeople: PersonActorType[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface relatedGroupsLogicActions {
+    loadRelatedActors: () => any
+    loadRelatedActorsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRelatedActorsSuccess: (
+        relatedActors: ActorType[],
+        payload?: any
+    ) => {
+        relatedActors: ActorType[]
+        payload?: any
+    }
+    setGroup: () => any
+    setGroupFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    setGroupSuccess: (
+        relatedActors: never[],
+        payload?: any
+    ) => {
+        relatedActors: never[]
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface relatedGroupsLogicProps {
+    groupTypeIndex: number | null
+    id: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface relatedGroupsLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        relatedPeople: (relatedActors: ActorType[]) => PersonActorType[]
+    }
+}
+
+export type relatedGroupsLogicType = MakeLogicType<
+    relatedGroupsLogicValues,
+    relatedGroupsLogicActions,
+    relatedGroupsLogicProps,
+    relatedGroupsLogicMeta
+>
 
 export const relatedGroupsLogic = kea<relatedGroupsLogicType>([
     props(
diff --git a/frontend/src/scenes/health/categoryDetail/healthCategoryDetailLogic.ts b/frontend/src/scenes/health/categoryDetail/healthCategoryDetailLogic.ts
index 55398eb3eae8..5d9338e02b81 100644
--- a/frontend/src/scenes/health/categoryDetail/healthCategoryDetailLogic.ts
+++ b/frontend/src/scenes/health/categoryDetail/healthCategoryDetailLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 
@@ -13,11 +13,12 @@ import { Breadcrumb } from '~/types'
 
 import { HEALTH_CATEGORY_CONFIG, kindsForCategory } from '../healthCategories'
 import type { HealthIssueCategory } from '../healthCategories'
+import type { CategoryConfig } from '../healthCategories'
 import type { HealthIssuesResponse } from '../healthSceneLogic'
 import { kindToLabel, worstSeverity as computeWorstSeverity } from '../healthUtils'
 import type { HealthIssue, HealthIssueSeverity } from '../types'
 import { CATEGORY_DETAIL_CONFIG } from './categoryDetailConfig'
-import type { healthCategoryDetailLogicType } from './healthCategoryDetailLogicType'
+import type { CategoryDetailConfig } from './categoryDetailConfig'
 
 export interface HealthCategoryDetailLogicProps {
     category: string
@@ -30,6 +31,83 @@ export interface KindGroup {
     worstSeverity: HealthIssueSeverity
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface healthCategoryDetailLogicValues {
+    currentTeamIdStrict: number | string // teamLogic
+    breadcrumbs: Breadcrumb[]
+    category: string
+    categoryConfig: CategoryConfig
+    categoryIssues: HealthIssue[]
+    detailConfig: CategoryDetailConfig | undefined
+    healthIssues: HealthIssuesResponse | null
+    healthIssuesLoading: boolean
+    isValidCategory: boolean
+    issuesByKind: KindGroup[]
+    showDismissed: boolean
+    statusSummary: {
+        count: number
+        isHealthy: boolean
+        worstSeverity: HealthIssueSeverity | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface healthCategoryDetailLogicActions {
+    dismissIssue: (id: string) => {
+        id: string
+    }
+    loadHealthIssues: () => any
+    loadHealthIssuesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadHealthIssuesSuccess: (
+        healthIssues: HealthIssuesResponse | null,
+        payload?: any
+    ) => {
+        healthIssues: HealthIssuesResponse | null
+        payload?: any
+    }
+    refreshHealthData: () => {
+        value: true
+    }
+    setShowDismissed: (show: boolean) => {
+        show: boolean
+    }
+    undismissIssue: (id: string) => {
+        id: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface healthCategoryDetailLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        category: (arg: any) => string
+        isValidCategory: (category: string) => boolean
+        categoryConfig: (category: string) => CategoryConfig
+        detailConfig: (category: string) => CategoryDetailConfig | undefined
+        categoryIssues: (healthIssues: HealthIssuesResponse | null, category: string) => HealthIssue[]
+        issuesByKind: (categoryIssues: HealthIssue[]) => KindGroup[]
+        statusSummary: (categoryIssues: HealthIssue[]) => {
+            count: number
+            isHealthy: boolean
+            worstSeverity: HealthIssueSeverity | null
+        }
+        breadcrumbs: (categoryConfig: CategoryConfig) => Breadcrumb[]
+    }
+}
+
+export type healthCategoryDetailLogicType = MakeLogicType<
+    healthCategoryDetailLogicValues,
+    healthCategoryDetailLogicActions,
+    HealthCategoryDetailLogicProps,
+    healthCategoryDetailLogicMeta
+>
+
 export const healthCategoryDetailLogic = kea<healthCategoryDetailLogicType>([
     path((key) => ['scenes', 'health', 'categoryDetail', 'healthCategoryDetailLogic', key]),
     props({} as HealthCategoryDetailLogicProps),
diff --git a/frontend/src/scenes/health/healthSceneLogic.tsx b/frontend/src/scenes/health/healthSceneLogic.tsx
index e7086e79fc41..ffac2ade89b1 100644
--- a/frontend/src/scenes/health/healthSceneLogic.tsx
+++ b/frontend/src/scenes/health/healthSceneLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api, { ApiError } from 'lib/api'
@@ -11,7 +11,6 @@ import { teamLogic } from 'scenes/teamLogic'
 import { Breadcrumb } from '~/types'
 
 import { CATEGORY_ORDER, HEALTH_CATEGORY_CONFIG, categoryForKind } from './healthCategories'
-import type { healthSceneLogicType } from './healthSceneLogicType'
 import type { CategoryHealthSummary, HealthIssue, HealthIssueSeverity } from './types'
 import { REFRESH_COOLDOWN_MS, REFRESH_POLL_COUNT, REFRESH_POLL_INTERVAL_MS, SEVERITY_ORDER } from './types'
 
@@ -22,6 +21,77 @@ export interface HealthIssuesResponse {
     previous?: string | null
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface healthSceneLogicValues {
+    currentTeamIdStrict: number | string // teamLogic
+    breadcrumbs: Breadcrumb[]
+    categorySummaries: CategoryHealthSummary[]
+    healthIssues: HealthIssuesResponse | null
+    healthIssuesLoading: boolean
+    isManualRefresh: boolean
+    isRefreshInFlight: boolean
+    issues: HealthIssue[]
+    nextRefreshAvailableAt: number | null
+    showDismissed: boolean
+    totalCount: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface healthSceneLogicActions {
+    clearRefreshInFlight: () => {
+        value: true
+    }
+    dismissIssue: (id: string) => {
+        id: string
+    }
+    loadHealthIssues: () => any
+    loadHealthIssuesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadHealthIssuesSuccess: (
+        healthIssues: HealthIssuesResponse | null,
+        payload?: any
+    ) => {
+        healthIssues: HealthIssuesResponse | null
+        payload?: any
+    }
+    refreshHealthData: (isManual?: boolean) => {
+        isManual: boolean
+    }
+    resetManualRefresh: () => {
+        value: true
+    }
+    setNextRefreshAvailableAt: (timestamp: number | null) => {
+        timestamp: number | null
+    }
+    setShowDismissed: (show: boolean) => {
+        show: boolean
+    }
+    undismissIssue: (id: string) => {
+        id: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface healthSceneLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        issues: (healthIssues: HealthIssuesResponse | null) => HealthIssue[]
+        totalCount: (healthIssues: HealthIssuesResponse | null) => number
+        categorySummaries: (issues: HealthIssue[]) => CategoryHealthSummary[]
+    }
+}
+
+export type healthSceneLogicType = MakeLogicType<
+    healthSceneLogicValues,
+    healthSceneLogicActions,
+    Record<string, any>,
+    healthSceneLogicMeta
+>
+
 export const healthSceneLogic = kea<healthSceneLogicType>([
     path(['scenes', 'health', 'healthSceneLogic']),
     connect({
diff --git a/frontend/src/scenes/health/pipelineStatus/pipelineHealthLogic.ts b/frontend/src/scenes/health/pipelineStatus/pipelineHealthLogic.ts
index 5d02b05ca42d..f5d3201cbb0c 100644
--- a/frontend/src/scenes/health/pipelineStatus/pipelineHealthLogic.ts
+++ b/frontend/src/scenes/health/pipelineStatus/pipelineHealthLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -6,7 +6,7 @@ import { FEATURE_FLAGS } from 'lib/constants'
 import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
 import { teamLogic } from 'scenes/teamLogic'
 
-import type { pipelineHealthLogicType } from './pipelineHealthLogicType'
+import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
 
 export type HealthStatus = 'danger' | 'warning' | 'success'
 
@@ -28,6 +28,58 @@ export interface DataHealthIssuesResponse {
 
 export const REFRESH_INTERVAL = 60 * 1000 * 5 // 5 minutes
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface pipelineHealthLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    currentTeamIdStrict: number | string // teamLogic
+    hasErrors: boolean
+    hasIssues: boolean
+    healthIssues: DataHealthIssuesResponse | null
+    healthIssuesLoading: boolean
+    healthStatus: HealthStatus
+    issueCount: number
+    issues: DataHealthIssue[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface pipelineHealthLogicActions {
+    loadHealthIssues: () => any
+    loadHealthIssuesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadHealthIssuesSuccess: (
+        healthIssues: DataHealthIssuesResponse | null,
+        payload?: any
+    ) => {
+        healthIssues: DataHealthIssuesResponse | null
+        payload?: any
+    }
+    setPageVisibility: (visible: boolean) => {
+        visible: boolean
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface pipelineHealthLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        hasIssues: (issueCount: number) => boolean
+        healthStatus: (issueCount: number) => HealthStatus
+        issues: (healthIssues: DataHealthIssuesResponse | null) => DataHealthIssue[]
+        hasErrors: (healthIssues: DataHealthIssuesResponse | null, healthIssuesLoading: boolean) => boolean
+    }
+}
+
+export type pipelineHealthLogicType = MakeLogicType<
+    pipelineHealthLogicValues,
+    pipelineHealthLogicActions,
+    Record<string, any>,
+    pipelineHealthLogicMeta
+>
+
 export const pipelineHealthLogic = kea<pipelineHealthLogicType>([
     path(['scenes', 'health', 'pipelineStatus', 'pipelineHealthLogic']),
     connect({
diff --git a/frontend/src/scenes/health/pipelineStatus/pipelineStatusSceneLogic.tsx b/frontend/src/scenes/health/pipelineStatus/pipelineStatusSceneLogic.tsx
index ccb68513dcb9..0ad94293f1bc 100644
--- a/frontend/src/scenes/health/pipelineStatus/pipelineStatusSceneLogic.tsx
+++ b/frontend/src/scenes/health/pipelineStatus/pipelineStatusSceneLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, path, reducers, selectors } from 'kea'
 import { router } from 'kea-router'
 
 import { FEATURE_FLAGS } from 'lib/constants'
@@ -9,14 +9,75 @@ import { urls } from 'scenes/urls'
 
 import { Breadcrumb } from '~/types'
 
+import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
 import { pipelineHealthLogic } from './pipelineHealthLogic'
 import type { DataHealthIssue } from './pipelineHealthLogic'
-import type { pipelineStatusSceneLogicType } from './pipelineStatusSceneLogicType'
 
 export type IssueTypeFilter = 'all' | DataHealthIssue['type']
 
 const THIRTY_DAYS_MS = 30 * 24 * 60 * 60 * 1000
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface pipelineStatusSceneLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    issues: DataHealthIssue[] // pipelineHealthLogic
+    activeDismissedIds: Set<string>
+    breadcrumbs: Breadcrumb[]
+    dismissedCount: number
+    dismissedIssues: Record<string, number>
+    filteredIssueCount: number
+    filteredIssues: DataHealthIssue[]
+    isIssueDismissed: (issueId: string) => boolean
+    searchTerm: string
+    showDismissed: boolean
+    typeFilter: IssueTypeFilter
+    typeSummary: Record<DataHealthIssue['type'], number>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface pipelineStatusSceneLogicActions {
+    dismissIssue: (issueId: string) => {
+        issueId: string
+    }
+    setSearchTerm: (term: string) => {
+        term: string
+    }
+    setShowDismissed: (show: boolean) => {
+        show: boolean
+    }
+    setTypeFilter: (filter: IssueTypeFilter) => {
+        filter: IssueTypeFilter
+    }
+    undismissIssue: (issueId: string) => {
+        issueId: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface pipelineStatusSceneLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        activeDismissedIds: (dismissedIssues: Record<string, number>) => Set<string>
+        typeSummary: (issues: DataHealthIssue[]) => Record<DataHealthIssue['type'], number>
+        filteredIssues: (
+            issues: DataHealthIssue[],
+            typeFilter: IssueTypeFilter,
+            searchTerm: string,
+            activeDismissedIds: Set<string>,
+            showDismissed: boolean
+        ) => DataHealthIssue[]
+        filteredIssueCount: (filteredIssues: DataHealthIssue[]) => number
+        dismissedCount: (issues: DataHealthIssue[], activeDismissedIds: Set<string>) => number
+        isIssueDismissed: (activeDismissedIds: Set<string>) => (issueId: string) => boolean
+    }
+}
+
+export type pipelineStatusSceneLogicType = MakeLogicType<
+    pipelineStatusSceneLogicValues,
+    pipelineStatusSceneLogicActions,
+    Record<string, any>,
+    pipelineStatusSceneLogicMeta
+>
+
 export const pipelineStatusSceneLogic = kea<pipelineStatusSceneLogicType>([
     path(['scenes', 'health', 'pipelineStatus', 'pipelineStatusSceneLogic']),
     connect({
diff --git a/frontend/src/scenes/heatmaps/components/heatmapRecordingFallbackLogic.ts b/frontend/src/scenes/heatmaps/components/heatmapRecordingFallbackLogic.ts
index 1a4d855cc39e..5df32c31c665 100644
--- a/frontend/src/scenes/heatmaps/components/heatmapRecordingFallbackLogic.ts
+++ b/frontend/src/scenes/heatmaps/components/heatmapRecordingFallbackLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props } from 'kea'
 import { loaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
@@ -8,8 +8,6 @@ import { sessionPlayerModalLogic } from 'scenes/session-recordings/player/modal/
 import { NodeKind, RecordingsQuery } from '~/queries/schema/schema-general'
 import { PropertyFilterType, PropertyOperator, SessionRecordingType } from '~/types'
 
-import type { heatmapRecordingFallbackLogicType } from './heatmapRecordingFallbackLogicType'
-
 export type HeatmapRecordingFallbackLogicProps = {
     url: string
 }
@@ -34,6 +32,59 @@ export function buildRecordingsQueryForUrl(url: string): RecordingsQuery {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface heatmapRecordingFallbackLogicValues {
+    matchingRecordings: SessionRecordingType[] | null
+    matchingRecordingsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface heatmapRecordingFallbackLogicActions {
+    openSessionPlayer: (
+        sessionRecording: Pick<SessionRecordingType, 'id' | 'matching_events'>,
+        initialTimestamp?: number | null | undefined
+    ) => {
+        initialTimestamp: number | null
+        sessionRecording: Pick<SessionRecordingType, 'id' | 'matching_events'>
+    } // sessionPlayerModalLogic
+    loadMatchingRecordings: () => {
+        value: true
+    }
+    loadMatchingRecordingsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadMatchingRecordingsSuccess: (
+        matchingRecordings: SessionRecordingType[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        matchingRecordings: SessionRecordingType[]
+        payload?: {
+            value: true
+        }
+    }
+    openRecording: (recordingId: string) => {
+        recordingId: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface heatmapRecordingFallbackLogicMeta {
+    key: string
+}
+
+export type heatmapRecordingFallbackLogicType = MakeLogicType<
+    heatmapRecordingFallbackLogicValues,
+    heatmapRecordingFallbackLogicActions,
+    HeatmapRecordingFallbackLogicProps,
+    heatmapRecordingFallbackLogicMeta
+>
+
 export const heatmapRecordingFallbackLogic = kea<heatmapRecordingFallbackLogicType>([
     path(['scenes', 'heatmaps', 'components', 'heatmapRecordingFallbackLogic']),
     props({} as HeatmapRecordingFallbackLogicProps),
diff --git a/frontend/src/scenes/heatmaps/components/heatmapsBrowserLogic.ts b/frontend/src/scenes/heatmaps/components/heatmapsBrowserLogic.ts
index 47f7da82a6fa..94a995dcfbe7 100644
--- a/frontend/src/scenes/heatmaps/components/heatmapsBrowserLogic.ts
+++ b/frontend/src/scenes/heatmaps/components/heatmapsBrowserLogic.ts
@@ -1,4 +1,16 @@
-import { actions, afterMount, beforeUnmount, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    afterMount,
+    beforeUnmount,
+    connect,
+    kea,
+    listeners,
+    path,
+    props,
+    reducers,
+    selectors,
+} from 'kea'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 import posthog from 'posthog-js'
@@ -19,7 +31,9 @@ import { removeReplayIframeDataFromLocalStorage } from 'scenes/session-recording
 
 import { hogql } from '~/queries/utils'
 
-import type { heatmapsBrowserLogicType } from './heatmapsBrowserLogicType'
+import type { KeyedAppUrl } from '../../../lib/components/AuthorizedUrlList/authorizedUrlListLogic'
+import type { HrefMatchType } from '../../../lib/components/heatmaps/heatmapDataLogic'
+import type { HeatmapFilters } from '../../../lib/components/heatmaps/types'
 
 export type HeatmapsBrowserLogicProps = {
     iframeRef: RefObject<HTMLIFrameElement | null>
@@ -50,6 +64,206 @@ const normalizeUrlPath = (urlObj: URL): string => {
     return urlObj.toString()
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface heatmapsBrowserLogicValues {
+    checkUrlIsAuthorized: (url: string) => boolean // authorizedUrlListLogic
+    urlsKeyed: KeyedAppUrl[] // authorizedUrlListLogic
+    commonFilters: CommonFilters // heatmapDataLogic
+    heatmapColorPalette: string | null // heatmapDataLogic
+    heatmapEmpty: boolean // heatmapDataLogic
+    heatmapFilters: HeatmapFilters // heatmapDataLogic
+    heatmapFixedPositionMode: HeatmapFixedPositionMode // heatmapDataLogic
+    heightOverride: number // heatmapDataLogic
+    hrefMatchType: HrefMatchType // heatmapDataLogic
+    widthOverride: number // heatmapDataLogic
+    browserSearchResults: string[] | null
+    browserSearchResultsLoading: boolean
+    browserSearchTerm: string
+    browserUrlSearchOptions: string[] | null
+    dataUrl: string | null
+    displayUrl: string | null
+    filterPanelCollapsed: boolean
+    hasValidReplayIframeData: boolean
+    iframeBanner: IFrameBanner | null
+    isBrowserUrlAuthorized: boolean
+    isBrowserUrlValid: boolean
+    loading: boolean
+    noPageviews: boolean
+    replayIframeData: ReplayIframeData | null
+    topUrls:
+        | {
+              count: number
+              url: string
+          }[]
+        | null
+    topUrlsLoading: boolean
+    userTouchedDataUrl: boolean
+    viewportRange: {
+        max: number
+        min: number
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface heatmapsBrowserLogicActions {
+    loadHeatmap: () => {
+        value: true
+    } // heatmapDataLogic
+    patchHeatmapFilters: (filters: Partial<HeatmapFilters>) => {
+        filters: Partial<HeatmapFilters>
+    } // heatmapDataLogic
+    setCommonFilters: (filters: CommonFilters) => {
+        filters: CommonFilters
+    } // heatmapDataLogic
+    setHeatmapColorPalette: (palette: string | null) => {
+        palette: string | null
+    } // heatmapDataLogic
+    setHeatmapFixedPositionMode: (mode: HeatmapFixedPositionMode) => {
+        mode: HeatmapFixedPositionMode
+    } // heatmapDataLogic
+    setHref: (href: string) => {
+        href: string
+    } // heatmapDataLogic
+    setHrefMatchType: (matchType: HrefMatchType) => {
+        matchType: HrefMatchType
+    } // heatmapDataLogic
+    setWindowWidthOverride: (widthOverride: number | null) => {
+        widthOverride: number | null
+    } // heatmapDataLogic
+    loadBrowserSearchResults: () => {
+        value: true
+    }
+    loadBrowserSearchResultsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadBrowserSearchResultsSuccess: (
+        browserSearchResults: string[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        browserSearchResults: string[]
+        payload?: {
+            value: true
+        }
+    }
+    loadTopUrls: () => {
+        value: true
+    }
+    loadTopUrlsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadTopUrlsSuccess: (
+        topUrls: {
+            count: number
+            url: string
+        }[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        topUrls: {
+            count: number
+            url: string
+        }[]
+        payload?: {
+            value: true
+        }
+    }
+    maybeLoadTopUrls: () => {
+        value: true
+    }
+    onIframeLoad: () => {
+        value: true
+    }
+    sendToolbarMessage: (
+        type: PostHogAppToolbarEvent,
+        payload?: Record<string, any>
+    ) => {
+        payload: Record<string, any> | undefined
+        type: PostHogAppToolbarEvent
+    }
+    setBrowserSearch: (searchTerm: string) => {
+        searchTerm: string
+    }
+    setDataUrl: (url: string | null) => {
+        url: string | null
+    }
+    setDataUrlUserTouched: (touched: boolean) => {
+        touched: boolean
+    }
+    setDisplayUrl: (url: string | null) => {
+        url: string | null
+    }
+    setIframeBanner: (banner: IFrameBanner | null) => {
+        banner: IFrameBanner | null
+    }
+    setReplayIframeData: (replayIframeData: ReplayIframeData | null) => {
+        replayIframeData: ReplayIframeData | null
+    }
+    setReplayIframeDataURL: (url: string | null) => {
+        url: string | null
+    }
+    startTrackingLoading: () => {
+        value: true
+    }
+    stopTrackingLoading: () => {
+        value: true
+    }
+    toggleFilterPanelCollapsed: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface heatmapsBrowserLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        browserUrlSearchOptions: (
+            browserSearchResults: string[] | null,
+            topUrls:
+                | {
+                      count: number
+                      url: string
+                  }[]
+                | null,
+            browserSearchTerm: string
+        ) => string[] | null
+        isBrowserUrlAuthorized: (dataUrl: string | null, checkUrlIsAuthorized: (url: string) => boolean) => boolean
+        isBrowserUrlValid: (dataUrl: string | null) => boolean
+        viewportRange: (
+            heatmapFilters: HeatmapFilters,
+            widthOverride: number
+        ) => {
+            max: number
+            min: number
+        }
+        noPageviews: (
+            topUrlsLoading: boolean,
+            topUrls:
+                | {
+                      count: number
+                      url: string
+                  }[]
+                | null
+        ) => boolean
+    }
+}
+
+export type heatmapsBrowserLogicType = MakeLogicType<
+    heatmapsBrowserLogicValues,
+    heatmapsBrowserLogicActions,
+    HeatmapsBrowserLogicProps,
+    heatmapsBrowserLogicMeta
+>
+
 export const heatmapsBrowserLogic = kea<heatmapsBrowserLogicType>([
     path(['scenes', 'heatmaps', 'components', 'heatmapsBrowserLogic']),
     props({} as HeatmapsBrowserLogicProps),
@@ -228,14 +442,23 @@ export const heatmapsBrowserLogic = kea<heatmapsBrowserLogicType>([
     selectors({
         browserUrlSearchOptions: [
             (s) => [s.browserSearchResults, s.topUrls, s.browserSearchTerm],
-            (browserSearchResults, topUrls, browserSearchTerm) => {
+            (
+                browserSearchResults: string[] | null,
+                topUrls:
+                    | {
+                          count: number
+                          url: string
+                      }[]
+                    | null,
+                browserSearchTerm: string
+            ) => {
                 return browserSearchTerm ? browserSearchResults : (topUrls?.map((x) => x.url) ?? [])
             },
         ],
 
         isBrowserUrlAuthorized: [
             (s) => [s.dataUrl, s.checkUrlIsAuthorized],
-            (dataUrl, checkUrlIsAuthorized) => {
+            (dataUrl: string | null, checkUrlIsAuthorized: (url: string) => boolean) => {
                 if (!dataUrl) {
                     return false
                 }
@@ -244,7 +467,7 @@ export const heatmapsBrowserLogic = kea<heatmapsBrowserLogicType>([
         ],
         isBrowserUrlValid: [
             (s) => [s.dataUrl],
-            (dataUrl) => {
+            (dataUrl: string | null) => {
                 if (!dataUrl) {
                     // an empty dataUrl is valid
                     // since we just won't do anything with it
@@ -266,14 +489,22 @@ export const heatmapsBrowserLogic = kea<heatmapsBrowserLogicType>([
 
         viewportRange: [
             (s) => [s.heatmapFilters, s.widthOverride],
-            (heatmapFilters, widthOverride) => {
+            (heatmapFilters: import('lib/components/heatmaps/types').HeatmapFilters, widthOverride: number) => {
                 return calculateViewportRange(heatmapFilters, widthOverride)
             },
         ],
 
         noPageviews: [
             (s) => [s.topUrlsLoading, s.topUrls],
-            (topUrlsLoading, topUrls) => !topUrlsLoading && (!topUrls || topUrls.length === 0),
+            (
+                topUrlsLoading: boolean,
+                topUrls:
+                    | {
+                          count: number
+                          url: string
+                      }[]
+                    | null
+            ) => !topUrlsLoading && (!topUrls || topUrls.length === 0),
         ],
     }),
 
diff --git a/frontend/src/scenes/heatmaps/components/recordingClickmapLogic.ts b/frontend/src/scenes/heatmaps/components/recordingClickmapLogic.ts
index b006f0fc82b3..f70c740f9ad8 100644
--- a/frontend/src/scenes/heatmaps/components/recordingClickmapLogic.ts
+++ b/frontend/src/scenes/heatmaps/components/recordingClickmapLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, events, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { subscriptions } from 'kea-subscriptions'
 import posthog from 'posthog-js'
@@ -23,8 +23,11 @@ import type {
     ElementsStatsRetrieveParams,
 } from 'products/product_analytics/frontend/generated/api.schemas'
 
+import type { CommonFilters } from '../../../lib/components/heatmaps/types'
+import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
+import type { TeamPublicType, TeamType } from '../../../types'
 import { heatmapsBrowserLogic, isUrlPattern } from './heatmapsBrowserLogic'
-import type { recordingClickmapLogicType } from './recordingClickmapLogicType'
+import type { ReplayIframeData } from './heatmapsBrowserLogic'
 
 export interface ClickmapBox {
     top: number
@@ -157,6 +160,111 @@ export function computeClickmapBoxes(
     return boxes.sort((a, b) => b.count - a.count)
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface recordingClickmapLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    commonFilters: CommonFilters // heatmapDataLogic
+    replayIframeData: ReplayIframeData | null // heatmapsBrowserLogic
+    currentProjectId: number | null // projectLogic
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    clickmapActive: boolean
+    clickmapAvailable: boolean
+    clickmapBoxes: ClickmapBox[]
+    clickmapEnabled: boolean
+    elementStats: ElementStatsResponseApi | null
+    elementStatsLoading: boolean
+    highestClickCount: number
+    hoveredBoxKey: string | null
+    matchLinksByHref: boolean
+    selectedBoxKey: string | null
+    tooltipSuppressed: boolean
+    totalClickCount: number
+    wantedDataAttributes: string[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface recordingClickmapLogicActions {
+    setCommonFilters: (filters: CommonFilters) => {
+        filters: CommonFilters
+    } // heatmapDataLogic
+    setHeatmapTooltipSuppressed: (suppressed: boolean) => {
+        suppressed: boolean
+    } // heatmapDataLogic
+    setWindowWidthOverride: (widthOverride: number | null) => {
+        widthOverride: number | null
+    } // heatmapDataLogic
+    onIframeLoad: () => {
+        value: true
+    } // heatmapsBrowserLogic
+    setReplayIframeData: (replayIframeData: ReplayIframeData | null) => {
+        replayIframeData: ReplayIframeData | null
+    } // heatmapsBrowserLogic
+    setReplayIframeDataURL: (url: string | null) => {
+        url: string | null
+    } // heatmapsBrowserLogic
+    loadElementStats: () => {
+        value: true
+    }
+    loadElementStatsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadElementStatsSuccess: (
+        elementStats: ElementStatsResponseApi | null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        elementStats: ElementStatsResponseApi | null
+        payload?: {
+            value: true
+        }
+    }
+    maybeLoadElementStats: () => {
+        value: true
+    }
+    recomputeClickmap: () => {
+        value: true
+    }
+    selectClickmapBox: (key: string | null) => {
+        key: string | null
+    }
+    setClickmapBoxes: (boxes: ClickmapBox[]) => {
+        boxes: ClickmapBox[]
+    }
+    setClickmapEnabled: (enabled: boolean) => {
+        enabled: boolean
+    }
+    setHoveredBoxKey: (key: string | null) => {
+        key: string | null
+    }
+    setMatchLinksByHref: (matchLinksByHref: boolean) => {
+        matchLinksByHref: boolean
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface recordingClickmapLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        clickmapAvailable: (featureFlags: FeatureFlagsSet) => boolean
+        clickmapActive: (clickmapAvailable: boolean, clickmapEnabled: boolean) => boolean
+        wantedDataAttributes: (currentTeam: TeamPublicType | TeamType | null) => string[]
+        highestClickCount: (clickmapBoxes: ClickmapBox[]) => number
+        totalClickCount: (clickmapBoxes: ClickmapBox[]) => number
+        tooltipSuppressed: (hoveredBoxKey: string | null, selectedBoxKey: string | null) => boolean
+    }
+}
+
+export type recordingClickmapLogicType = MakeLogicType<
+    recordingClickmapLogicValues,
+    recordingClickmapLogicActions,
+    RecordingClickmapLogicProps,
+    recordingClickmapLogicMeta
+>
+
 export const recordingClickmapLogic = kea<recordingClickmapLogicType>([
     path(['scenes', 'heatmaps', 'components', 'recordingClickmapLogic']),
     props({} as RecordingClickmapLogicProps),
@@ -269,27 +377,30 @@ export const recordingClickmapLogic = kea<recordingClickmapLogicType>([
     selectors({
         clickmapAvailable: [
             (s) => [s.featureFlags],
-            (featureFlags): boolean => !!featureFlags[FEATURE_FLAGS.HEATMAPS_RECORDING_CLICKMAP],
+            (featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet): boolean =>
+                !!featureFlags[FEATURE_FLAGS.HEATMAPS_RECORDING_CLICKMAP],
         ],
         clickmapActive: [
             (s) => [s.clickmapAvailable, s.clickmapEnabled],
-            (clickmapAvailable, clickmapEnabled): boolean => clickmapAvailable && clickmapEnabled,
+            (clickmapAvailable: boolean, clickmapEnabled: boolean): boolean => clickmapAvailable && clickmapEnabled,
         ],
         wantedDataAttributes: [
             (s) => [s.currentTeam],
-            (currentTeam): string[] => Array.from(new Set(['data-attr', ...(currentTeam?.data_attributes ?? [])])),
+            (currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType): string[] =>
+                Array.from(new Set(['data-attr', ...(currentTeam?.data_attributes ?? [])])),
         ],
         highestClickCount: [
             (s) => [s.clickmapBoxes],
-            (clickmapBoxes) => clickmapBoxes.reduce((max, box) => Math.max(max, box.count), 0),
+            (clickmapBoxes: ClickmapBox[]) => clickmapBoxes.reduce((max, box) => Math.max(max, box.count), 0),
         ],
         totalClickCount: [
             (s) => [s.clickmapBoxes],
-            (clickmapBoxes) => clickmapBoxes.reduce((sum, box) => sum + box.count, 0),
+            (clickmapBoxes: ClickmapBox[]) => clickmapBoxes.reduce((sum, box) => sum + box.count, 0),
         ],
         tooltipSuppressed: [
             (s) => [s.hoveredBoxKey, s.selectedBoxKey],
-            (hoveredBoxKey, selectedBoxKey): boolean => hoveredBoxKey !== null || selectedBoxKey !== null,
+            (hoveredBoxKey: string | null, selectedBoxKey: string | null): boolean =>
+                hoveredBoxKey !== null || selectedBoxKey !== null,
         ],
     }),
     subscriptions(({ actions }) => ({
diff --git a/frontend/src/scenes/heatmaps/scenes/heatmap/heatmapLogic.ts b/frontend/src/scenes/heatmaps/scenes/heatmap/heatmapLogic.ts
index 717bc49914a2..b2e54e2cccc1 100644
--- a/frontend/src/scenes/heatmaps/scenes/heatmap/heatmapLogic.ts
+++ b/frontend/src/scenes/heatmaps/scenes/heatmap/heatmapLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { router } from 'kea-router'
 import posthog from 'posthog-js'
 
@@ -13,7 +13,8 @@ import { heatmapsSceneLogic } from 'scenes/heatmaps/scenes/heatmaps/heatmapsScen
 
 import { HeatmapStatus, HeatmapType } from '~/types'
 
-import type { heatmapLogicType } from './heatmapLogicType'
+import type { CommonFilters, HeatmapFilters, HeatmapFixedPositionMode } from '../../../../lib/components/heatmaps/types'
+import type { ExportContext } from '../../../../types'
 
 const DEFAULT_HEATMAP_NAME = 'Untitled heatmap'
 
@@ -46,6 +47,166 @@ export function resolveHeatmapExportUrl(
     return displayUrl ?? ''
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface heatmapLogicValues {
+    commonFilters: CommonFilters // heatmapDataLogic
+    heatmapColorPalette: string | null // heatmapDataLogic
+    heatmapFilters: HeatmapFilters // heatmapDataLogic
+    heatmapFixedPositionMode: HeatmapFixedPositionMode // heatmapDataLogic
+    heightOverride: number // heatmapDataLogic
+    widthOverride: number // heatmapDataLogic
+    dataUrl: string | null // heatmapsBrowserLogic
+    displayUrl: string | null // heatmapsBrowserLogic
+    isBrowserUrlAuthorized: boolean // heatmapsBrowserLogic
+    blockConsentModals: boolean
+    containerWidth: number | null
+    desiredNumericWidth: number
+    displayUrlIsPattern: boolean
+    effectiveWidth: number
+    generatingScreenshot: boolean
+    heatmapId: number | null
+    isDisplayUrlValid: boolean
+    isPageUrlDraftValid: boolean
+    loading: boolean
+    name: string
+    pageUrlDraft: string
+    pageUrlDraftIsPattern: boolean
+    savedBlockConsentModals: boolean
+    savedDisplayUrl: string | null
+    scalePercent: number
+    screenshotError: string | null
+    screenshotLoaded: boolean
+    screenshotLoading: boolean
+    screenshotUrl: string | null
+    status: HeatmapStatus
+    type: HeatmapType
+    width: number | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface heatmapLogicActions {
+    startHeatmapExport: (export_context: ExportContext) => {
+        export_context: ExportContext
+    } // exportsLogic
+    loadHeatmap: () => {
+        value: true
+    } // heatmapDataLogic
+    setWindowWidthOverride: (widthOverride: number | null) => {
+        widthOverride: number | null
+    } // heatmapDataLogic
+    onIframeLoad: () => {
+        value: true
+    } // heatmapsBrowserLogic
+    setDataUrl: (url: string | null) => {
+        url: string | null
+    } // heatmapsBrowserLogic
+    setDataUrlUserTouched: (touched: boolean) => {
+        touched: boolean
+    } // heatmapsBrowserLogic
+    setDisplayUrl: (url: string | null) => {
+        url: string | null
+    } // heatmapsBrowserLogic
+    loadSavedHeatmaps: () => {
+        value: true
+    } // heatmapsSceneLogic
+    applyPageUrlDraft: () => {
+        value: true
+    }
+    changeCaptureMethod: (type: HeatmapType) => {
+        type: HeatmapType
+    }
+    createHeatmap: () => {
+        value: true
+    }
+    exportHeatmap: () => {
+        value: true
+    }
+    load: () => {
+        value: true
+    }
+    pollScreenshotStatus: (
+        id: number,
+        width?: number
+    ) => {
+        id: number
+        width: number | undefined
+    }
+    regenerateScreenshot: () => {
+        value: true
+    }
+    setBlockConsentModals: (value: boolean) => {
+        value: boolean
+    }
+    setContainerWidth: (containerWidth: number | null) => {
+        containerWidth: number | null
+    }
+    setGeneratingScreenshot: (generating: boolean) => {
+        generating: boolean
+    }
+    setHeatmapId: (id: number | null) => {
+        id: number | null
+    }
+    setLoading: (loading: boolean) => {
+        loading: boolean
+    }
+    setName: (name: string) => {
+        name: string
+    }
+    setPageUrlDraft: (value: string) => {
+        value: string
+    }
+    setScreenshotError: (error: string | null) => {
+        error: string | null
+    }
+    setScreenshotLoaded: (screenshotLoaded: boolean) => {
+        screenshotLoaded: boolean
+    }
+    setScreenshotUrl: (url: string | null) => {
+        url: string | null
+    }
+    setType: (type: HeatmapType) => {
+        type: HeatmapType
+    }
+    setWidth: (width: number) => {
+        width: number
+    }
+    snapshotSavedBlockConsentModals: (value: boolean) => {
+        value: boolean
+    }
+    snapshotSavedDisplayUrl: (displayUrl: string | null) => {
+        displayUrl: string | null
+    }
+    updateHeatmap: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface heatmapLogicProps {
+    id: number | string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface heatmapLogicMeta {
+    key: number | string
+    __keaTypeGenInternalSelectorTypes: {
+        isDisplayUrlValid: (displayUrl: string | null) => boolean
+        displayUrlIsPattern: (displayUrl: string | null) => boolean
+        isPageUrlDraftValid: (pageUrlDraft: string) => boolean
+        pageUrlDraftIsPattern: (pageUrlDraft: string) => boolean
+        desiredNumericWidth: (widthOverride: number, containerWidth: number | null) => number
+        effectiveWidth: (desiredNumericWidth: number) => number
+        scalePercent: (widthOverride: number, containerWidth: number | null) => number
+    }
+}
+
+export type heatmapLogicType = MakeLogicType<
+    heatmapLogicValues,
+    heatmapLogicActions,
+    heatmapLogicProps,
+    heatmapLogicMeta
+>
+
 export const heatmapLogic = kea<heatmapLogicType>([
     path(['scenes', 'heatmaps', 'scenes', 'heatmap', 'heatmapLogic']),
     props({ id: 'new' as string | number }),
diff --git a/frontend/src/scenes/heatmaps/scenes/heatmap/heatmapRecordingLogic.ts b/frontend/src/scenes/heatmaps/scenes/heatmap/heatmapRecordingLogic.ts
index 8bec7a1f5841..6311d141a4b9 100644
--- a/frontend/src/scenes/heatmaps/scenes/heatmap/heatmapRecordingLogic.ts
+++ b/frontend/src/scenes/heatmaps/scenes/heatmap/heatmapRecordingLogic.ts
@@ -1,4 +1,4 @@
-import { kea, path, selectors } from 'kea'
+import { MakeLogicType, kea, path, selectors } from 'kea'
 
 import { sceneConfigurations } from 'scenes/scenes'
 import { Scene } from 'scenes/sceneTypes'
@@ -6,7 +6,12 @@ import { urls } from 'scenes/urls'
 
 import { Breadcrumb } from '~/types'
 
-import type { heatmapRecordingLogicType } from './heatmapRecordingLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface heatmapRecordingLogicValues {
+    breadcrumbs: Breadcrumb[]
+}
+
+export type heatmapRecordingLogicType = MakeLogicType<heatmapRecordingLogicValues, {}>
 
 export const heatmapRecordingLogic = kea<heatmapRecordingLogicType>([
     path(['scenes', 'heatmaps', 'scenes', 'heatmap', 'heatmapRecordingLogic']),
diff --git a/frontend/src/scenes/heatmaps/scenes/heatmaps/heatmapsSceneLogic.ts b/frontend/src/scenes/heatmaps/scenes/heatmaps/heatmapsSceneLogic.ts
index 54b273bc4dcb..d5b0ee8ab3d0 100644
--- a/frontend/src/scenes/heatmaps/scenes/heatmaps/heatmapsSceneLogic.ts
+++ b/frontend/src/scenes/heatmaps/scenes/heatmaps/heatmapsSceneLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 
 import api from 'lib/api'
 import { deleteWithUndo } from 'lib/utils/deleteWithUndo'
@@ -10,8 +10,6 @@ import { urls } from 'scenes/urls'
 
 import { Breadcrumb, HeatmapSavedFilters, HeatmapScreenshotType } from '~/types'
 
-import type { heatmapsSceneLogicType } from './heatmapsSceneLogicType'
-
 export const DEFAULT_HEATMAP_FILTERS = {
     createdBy: 'All users',
     search: '',
@@ -21,6 +19,40 @@ export const DEFAULT_HEATMAP_FILTERS = {
 
 export const HEATMAPS_PER_PAGE = 30
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface heatmapsSceneLogicValues {
+    currentTeamIdStrict: number | string // teamLogic
+    breadcrumbs: Breadcrumb[]
+    filters: HeatmapSavedFilters
+    savedHeatmaps: HeatmapScreenshotType[]
+    savedHeatmapsLoading: boolean
+    totalCount: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface heatmapsSceneLogicActions {
+    deleteHeatmap: (short_id: string) => {
+        short_id: string
+    }
+    loadSavedHeatmaps: () => {
+        value: true
+    }
+    setHeatmapsFilters: (filters: HeatmapSavedFilters) => {
+        filters: HeatmapSavedFilters
+    }
+    setLoading: (loading: boolean) => {
+        loading: boolean
+    }
+    setSavedHeatmaps: (items: HeatmapScreenshotType[]) => {
+        items: HeatmapScreenshotType[]
+    }
+    setTotalCount: (count: number) => {
+        count: number
+    }
+}
+
+export type heatmapsSceneLogicType = MakeLogicType<heatmapsSceneLogicValues, heatmapsSceneLogicActions>
+
 export const heatmapsSceneLogic = kea<heatmapsSceneLogicType>([
     path(['scenes', 'heatmaps', 'scenes', 'heatmaps', 'heatmapsSceneLogic']),
     connect(() => ({ values: [teamLogic, ['currentTeamIdStrict']] })),
diff --git a/frontend/src/scenes/hog-functions/AlertWizard/alertWizardLogic.ts b/frontend/src/scenes/hog-functions/AlertWizard/alertWizardLogic.ts
index 7cd83883928c..36984df76b84 100644
--- a/frontend/src/scenes/hog-functions/AlertWizard/alertWizardLogic.ts
+++ b/frontend/src/scenes/hog-functions/AlertWizard/alertWizardLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 import posthog from 'posthog-js'
@@ -22,7 +22,7 @@ import {
     PropertyOperator,
 } from '~/types'
 
-import type { alertWizardLogicType } from './alertWizardLogicType'
+import type { CyclotronJobInputSchemaType, HogFunctionSubTemplateType } from '../../../types'
 
 export enum WizardStep {
     Destination = 'destination',
@@ -134,6 +134,194 @@ function extractDestinationKeyFromAlert(alert: HogFunctionType, allDestinations:
     return null
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface alertWizardLogicValues {
+    activeSubTemplate: HogFunctionSubTemplateType | null
+    alertCreated: boolean
+    alertCreationView: AlertCreationView
+    allDestinations: WizardDestination[]
+    availableTriggers: WizardTrigger[]
+    configuration: {
+        inputs: Record<
+            string,
+            {
+                bytecode?: any
+                order?: number | undefined
+                secret?: boolean | undefined
+                templating?: 'hog' | 'liquid' | undefined
+                value: any
+            }
+        >
+        inputs_schema: CyclotronJobInputSchemaType[]
+    }
+    currentStep: WizardStep
+    existingAlerts: HogFunctionType[]
+    existingAlertsLoading: boolean
+    extraDestinations: WizardDestination[]
+    inputValues: Record<string, CyclotronJobInputType>
+    primaryDestinations: WizardDestination[]
+    requiredInputsSchema: CyclotronJobInputSchemaType[]
+    selectedDestinationKey: string | null
+    selectedKinds: string[] | null
+    selectedTemplate: HogFunctionTemplateType | null
+    selectedTemplateLoading: boolean
+    selectedTriggerKey: HogFunctionSubTemplateIdType | null
+    sortedDestinations: WizardDestination[]
+    subTemplateIds: HogFunctionSubTemplateIdType[]
+    submitting: boolean
+    testing: boolean
+    triggers: WizardTrigger[]
+    usedDestinationKeys: Set<string>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface alertWizardLogicActions {
+    createAlertSuccess: () => {
+        value: true
+    }
+    loadExistingAlerts: () => any
+    loadExistingAlertsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadExistingAlertsSuccess: (
+        existingAlerts: HogFunctionType[],
+        payload?: any
+    ) => {
+        existingAlerts: HogFunctionType[]
+        payload?: any
+    }
+    loadTemplate: (templateId: string) => string
+    loadTemplateFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadTemplateSuccess: (
+        selectedTemplate: HogFunctionTemplateType,
+        payload?: string
+    ) => {
+        selectedTemplate: HogFunctionTemplateType
+        payload?: string
+    }
+    resetWizard: () => {
+        value: true
+    }
+    restoreWizardState: (state: {
+        destinationKey: string | null
+        step: WizardStep
+        triggerKey: HogFunctionSubTemplateIdType | null
+    }) => {
+        state: {
+            destinationKey: string | null
+            step: WizardStep
+            triggerKey: HogFunctionSubTemplateIdType | null
+        }
+    }
+    setAlertCreationView: (view: AlertCreationView) => {
+        view: AlertCreationView
+    }
+    setDestinationKey: (destinationKey: string) => {
+        destinationKey: string
+    }
+    setInputValue: (
+        key: string,
+        value: CyclotronJobInputType
+    ) => {
+        key: string
+        value: {
+            bytecode?: any
+            order?: number | undefined
+            secret?: boolean | undefined
+            templating?: 'hog' | 'liquid' | undefined
+            value: any
+        }
+    }
+    setStep: (step: WizardStep) => {
+        step: WizardStep
+    }
+    setTriggerKey: (triggerKey: HogFunctionSubTemplateIdType) => {
+        triggerKey: HogFunctionSubTemplateIdType
+    }
+    submitConfiguration: () => {
+        value: true
+    }
+    submitConfigurationComplete: () => {
+        value: true
+    }
+    testConfiguration: () => {
+        value: true
+    }
+    testConfigurationComplete: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface alertWizardLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        usedDestinationKeys: (existingAlerts: HogFunctionType[], allDestinations: WizardDestination[]) => Set<string>
+        sortedDestinations: (
+            usedDestinationKeys: Set<string>,
+            allDestinations: WizardDestination[]
+        ) => WizardDestination[]
+        primaryDestinations: (sortedDestinations: WizardDestination[]) => WizardDestination[]
+        extraDestinations: (sortedDestinations: WizardDestination[]) => WizardDestination[]
+        availableTriggers: (
+            selectedDestinationKey: string | null,
+            triggers: WizardTrigger[],
+            allDestinations: WizardDestination[]
+        ) => WizardTrigger[]
+        activeSubTemplate: (
+            selectedDestinationKey: string | null,
+            selectedTriggerKey: HogFunctionSubTemplateIdType | null,
+            allDestinations: WizardDestination[]
+        ) => HogFunctionSubTemplateType | null
+        requiredInputsSchema: (
+            selectedTemplate: HogFunctionTemplateType | null,
+            activeSubTemplate: HogFunctionSubTemplateType | null
+        ) => CyclotronJobInputSchemaType[]
+        configuration: (
+            selectedTemplate: HogFunctionTemplateType | null,
+            inputValues: Record<
+                string,
+                {
+                    bytecode?: any
+                    order?: number | undefined
+                    secret?: boolean | undefined
+                    templating?: 'hog' | 'liquid' | undefined
+                    value: any
+                }
+            >
+        ) => {
+            inputs: Record<
+                string,
+                {
+                    bytecode?: any
+                    order?: number | undefined
+                    secret?: boolean | undefined
+                    templating?: 'hog' | 'liquid' | undefined
+                    value: any
+                }
+            >
+            inputs_schema: CyclotronJobInputSchemaType[]
+        }
+    }
+}
+
+export type alertWizardLogicType = MakeLogicType<
+    alertWizardLogicValues,
+    alertWizardLogicActions,
+    AlertWizardLogicProps,
+    alertWizardLogicMeta
+>
+
 export const alertWizardLogic = kea<alertWizardLogicType>([
     props({} as AlertWizardLogicProps),
     key((p) => p.logicKey),
@@ -267,7 +455,7 @@ export const alertWizardLogic = kea<alertWizardLogicType>([
     selectors({
         usedDestinationKeys: [
             (s) => [s.existingAlerts, s.allDestinations],
-            (existingAlerts, allDestinations): Set<string> => {
+            (existingAlerts: HogFunctionType[], allDestinations: WizardDestination[]): Set<string> => {
                 const used = new Set<string>()
                 for (const alert of existingAlerts) {
                     const key = extractDestinationKeyFromAlert(alert, allDestinations)
@@ -281,7 +469,7 @@ export const alertWizardLogic = kea<alertWizardLogicType>([
 
         sortedDestinations: [
             (s) => [s.usedDestinationKeys, s.allDestinations],
-            (usedDestinationKeys, allDestinations): WizardDestination[] => {
+            (usedDestinationKeys: Set<string>, allDestinations: WizardDestination[]): WizardDestination[] => {
                 return [...allDestinations].sort((a, b) => {
                     const aUsed = usedDestinationKeys.has(a.key) ? 1 : 0
                     const bUsed = usedDestinationKeys.has(b.key) ? 1 : 0
@@ -292,17 +480,23 @@ export const alertWizardLogic = kea<alertWizardLogicType>([
 
         primaryDestinations: [
             (s) => [s.sortedDestinations],
-            (sortedDestinations): WizardDestination[] => sortedDestinations.slice(0, PRIMARY_DESTINATION_LIMIT),
+            (sortedDestinations: WizardDestination[]): WizardDestination[] =>
+                sortedDestinations.slice(0, PRIMARY_DESTINATION_LIMIT),
         ],
 
         extraDestinations: [
             (s) => [s.sortedDestinations],
-            (sortedDestinations): WizardDestination[] => sortedDestinations.slice(PRIMARY_DESTINATION_LIMIT),
+            (sortedDestinations: WizardDestination[]): WizardDestination[] =>
+                sortedDestinations.slice(PRIMARY_DESTINATION_LIMIT),
         ],
 
         availableTriggers: [
             (s) => [s.selectedDestinationKey, s.triggers, s.allDestinations],
-            (selectedDestinationKey, triggers, allDestinations): WizardTrigger[] => {
+            (
+                selectedDestinationKey: string | null,
+                triggers: WizardTrigger[],
+                allDestinations: WizardDestination[]
+            ): WizardTrigger[] => {
                 if (!selectedDestinationKey) {
                     return triggers
                 }
@@ -316,7 +510,11 @@ export const alertWizardLogic = kea<alertWizardLogicType>([
 
         activeSubTemplate: [
             (s) => [s.selectedDestinationKey, s.selectedTriggerKey, s.allDestinations],
-            (selectedDestinationKey, selectedTriggerKey, allDestinations) => {
+            (
+                selectedDestinationKey: string | null,
+                selectedTriggerKey: HogFunctionSubTemplateIdType | null,
+                allDestinations: WizardDestination[]
+            ) => {
                 if (!selectedDestinationKey || !selectedTriggerKey) {
                     return null
                 }
@@ -331,7 +529,10 @@ export const alertWizardLogic = kea<alertWizardLogicType>([
 
         requiredInputsSchema: [
             (s) => [s.selectedTemplate, s.activeSubTemplate],
-            (selectedTemplate, activeSubTemplate) => {
+            (
+                selectedTemplate: HogFunctionTemplateType | null,
+                activeSubTemplate: null | import('~/types').HogFunctionSubTemplateType
+            ) => {
                 if (!selectedTemplate) {
                     return []
                 }
@@ -347,7 +548,7 @@ export const alertWizardLogic = kea<alertWizardLogicType>([
 
         configuration: [
             (s) => [s.selectedTemplate, s.inputValues],
-            (selectedTemplate, inputValues) => ({
+            (selectedTemplate: HogFunctionTemplateType | null, inputValues: Record<string, CyclotronJobInputType>) => ({
                 inputs_schema: selectedTemplate?.inputs_schema ?? [],
                 inputs: inputValues,
             }),
diff --git a/frontend/src/scenes/hog-functions/HogFunctionScene.tsx b/frontend/src/scenes/hog-functions/HogFunctionScene.tsx
index c4fde5684f44..8b748c526ead 100644
--- a/frontend/src/scenes/hog-functions/HogFunctionScene.tsx
+++ b/frontend/src/scenes/hog-functions/HogFunctionScene.tsx
@@ -1,4 +1,17 @@
-import { BindLogic, actions, connect, kea, key, path, props, reducers, selectors, useActions, useValues } from 'kea'
+import {
+    MakeLogicType,
+    BindLogic,
+    actions,
+    connect,
+    kea,
+    key,
+    path,
+    props,
+    reducers,
+    selectors,
+    useActions,
+    useValues,
+} from 'kea'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 
 import { LemonDivider } from '@posthog/lemon-ui'
@@ -35,13 +48,13 @@ import {
     HogFunctionTypeType,
 } from '~/types'
 
+import type { HogFunctionConfigurationType } from '../../types'
 import { HogFunctionBackfills } from './backfills/HogFunctionBackfills'
 import {
     HogFunctionConfigurationClearChangesButton,
     HogFunctionConfigurationSaveButton,
 } from './configuration/components/HogFunctionConfigurationButtons'
 import { HogFunctionIconEditable } from './configuration/HogFunctionIcon'
-import type { hogFunctionSceneLogicType } from './HogFunctionSceneType'
 import { HogInvocations } from './invocations/HogInvocations'
 import { HogFunctionMetrics } from './metrics/HogFunctionMetrics'
 import { HogFunctionSkeleton } from './misc/HogFunctionSkeleton'
@@ -66,6 +79,45 @@ const HogFunctionSceneMapping: Partial<Record<HogFunctionTypeType, { scene: Scen
     source_webhook: { scene: Scene.Sources, url: urls.sources },
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFunctionSceneLogicValues {
+    configuration: HogFunctionConfigurationType; // hogFunctionConfigurationLogic
+    loaded: boolean; // hogFunctionConfigurationLogic
+    loading: boolean; // hogFunctionConfigurationLogic
+    type: HogFunctionTypeType; // hogFunctionConfigurationLogic
+    alertId: string | undefined;
+    breadcrumbs: Breadcrumb[];
+    currentTab: HogFunctionSceneTab;
+    isSurveyNotification: boolean;
+    logicProps: any;
+    returnTo: string | undefined;
+    supportsBackfills: boolean;
+    surveyId: string | undefined;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFunctionSceneLogicActions {
+    setCurrentTab: (tab: HogFunctionSceneTab) => {
+        tab: "backfills" | "configuration" | "history" | "invocations" | "logs" | "metrics" | "runs" | "testing";
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFunctionSceneLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        logicProps: (arg: any) => any;
+        supportsBackfills: (type: HogFunctionTypeType, configuration: HogFunctionConfigurationType) => boolean;
+        alertId: (configuration: HogFunctionConfigurationType) => string | undefined;
+        surveyId: (configuration: HogFunctionConfigurationType) => string | undefined;
+        isSurveyNotification: (configuration: HogFunctionConfigurationType) => boolean;
+        returnTo: (searchParams: Record<string, any>) => string | undefined;
+        breadcrumbs: (type: HogFunctionTypeType, loading: boolean, configuration: HogFunctionConfigurationType, alertId: string | undefined, surveyId: string | undefined, isSurveyNotification: boolean, returnTo: string | undefined, arg: any) => Breadcrumb[];
+    };
+}
+
+export type hogFunctionSceneLogicType = MakeLogicType<hogFunctionSceneLogicValues, hogFunctionSceneLogicActions, HogFunctionConfigurationLogicProps, hogFunctionSceneLogicMeta>;
+
 export const hogFunctionSceneLogic = kea<hogFunctionSceneLogicType>([
     props({} as HogFunctionConfigurationLogicProps),
     key(({ id, templateId }: HogFunctionConfigurationLogicProps) => id ?? templateId ?? 'new'),
diff --git a/frontend/src/scenes/hog-functions/backfills/hogFunctionBackfillsLogic.tsx b/frontend/src/scenes/hog-functions/backfills/hogFunctionBackfillsLogic.tsx
index 972904d8f89c..1704cdac65c7 100644
--- a/frontend/src/scenes/hog-functions/backfills/hogFunctionBackfillsLogic.tsx
+++ b/frontend/src/scenes/hog-functions/backfills/hogFunctionBackfillsLogic.tsx
@@ -1,4 +1,5 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import type { DeepPartial } from 'kea-forms'
 
 import { lemonToast } from '@posthog/lemon-ui'
 
@@ -6,13 +7,47 @@ import api from 'lib/api'
 
 import { HogFunctionConfigurationType } from '~/types'
 
+import type { HogFunctionType } from '../../../types'
 import { hogFunctionConfigurationLogic } from '../configuration/hogFunctionConfigurationLogic'
-import type { hogFunctionBackfillsLogicType } from './hogFunctionBackfillsLogicType'
 
 export interface HogFunctionBackfillsLogicProps {
     id: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFunctionBackfillsLogicValues {
+    configuration: HogFunctionConfigurationType; // hogFunctionConfigurationLogic
+    hasTriedEnabling: boolean;
+    isLoading: boolean;
+    isReady: boolean;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFunctionBackfillsLogicActions {
+    loadHogFunction: () => any; // hogFunctionConfigurationLogic
+    loadHogFunctionSuccess: (hogFunction: HogFunctionType | null, payload?: any) => {
+        hogFunction: HogFunctionType | null;
+        payload?: any;
+    }; // hogFunctionConfigurationLogic
+    setConfigurationValues: (values: DeepPartial<HogFunctionConfigurationType>) => {
+        values: DeepPartial<HogFunctionConfigurationType>;
+    }; // hogFunctionConfigurationLogic
+    enableHogFunctionBackfills: () => boolean;
+    setLoading: (loading: boolean) => {
+        loading: boolean;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFunctionBackfillsLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        isReady: (configuration: HogFunctionConfigurationType, isLoading: boolean) => boolean;
+    };
+}
+
+export type hogFunctionBackfillsLogicType = MakeLogicType<hogFunctionBackfillsLogicValues, hogFunctionBackfillsLogicActions, HogFunctionBackfillsLogicProps, hogFunctionBackfillsLogicMeta>;
+
 export const hogFunctionBackfillsLogic = kea<hogFunctionBackfillsLogicType>([
     props({} as HogFunctionBackfillsLogicProps),
     key(({ id }: HogFunctionBackfillsLogicProps) => id),
diff --git a/frontend/src/scenes/hog-functions/configuration/components/hogFunctionSourceWebhookTestLogic.tsx b/frontend/src/scenes/hog-functions/configuration/components/hogFunctionSourceWebhookTestLogic.tsx
index d968afc727ff..1bd44ffbe310 100644
--- a/frontend/src/scenes/hog-functions/configuration/components/hogFunctionSourceWebhookTestLogic.tsx
+++ b/frontend/src/scenes/hog-functions/configuration/components/hogFunctionSourceWebhookTestLogic.tsx
@@ -1,11 +1,12 @@
-import { actions, connect, kea, key, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, path, props, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 
 import { publicWebhooksHostOrigin } from 'lib/utils/apiHost'
 import { tryJsonParse } from 'lib/utils/json'
 
+import type { HogFunctionConfigurationType } from '../../../../types'
 import { HogFunctionConfigurationLogicProps, hogFunctionConfigurationLogic } from '../hogFunctionConfigurationLogic'
-import type { hogFunctionSourceWebhookTestLogicType } from './hogFunctionSourceWebhookTestLogicType'
 
 export type HogFunctionSourceWebhookTestForm = {
     method: string
@@ -20,6 +21,76 @@ export type HogFunctionSourceWebhookTestResult = {
     body: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFunctionSourceWebhookTestLogicValues {
+    configuration: HogFunctionConfigurationType; // hogFunctionConfigurationLogic
+    templateId: string | undefined; // hogFunctionConfigurationLogic
+    exampleCurlRequest: string;
+    expanded: boolean;
+    isTestInvocationSubmitting: boolean;
+    isTestInvocationValid: boolean;
+    showTestInvocationErrors: boolean;
+    testInvocation: HogFunctionSourceWebhookTestForm;
+    testInvocationAllErrors: Record<string, any>;
+    testInvocationChanged: boolean;
+    testInvocationErrors: DeepPartialMap<HogFunctionSourceWebhookTestForm, ValidationErrorType>;
+    testInvocationHasErrors: boolean;
+    testInvocationManualErrors: Record<string, any>;
+    testInvocationTouched: boolean;
+    testInvocationTouches: Record<string, boolean>;
+    testInvocationValidationErrors: DeepPartialMap<HogFunctionSourceWebhookTestForm, ValidationErrorType>;
+    testResult: HogFunctionSourceWebhookTestResult | null;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFunctionSourceWebhookTestLogicActions {
+    resetTestInvocation: (values?: HogFunctionSourceWebhookTestForm) => {
+        values?: HogFunctionSourceWebhookTestForm;
+    };
+    setTestInvocationManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>;
+    };
+    setTestInvocationValue: (key: FieldName, value: any) => {
+        name: FieldName;
+        value: any;
+    };
+    setTestInvocationValues: (values: DeepPartial<HogFunctionSourceWebhookTestForm>) => {
+        values: DeepPartial<HogFunctionSourceWebhookTestForm>;
+    };
+    setTestResult: (result: HogFunctionSourceWebhookTestResult | null) => {
+        result: HogFunctionSourceWebhookTestResult | null;
+    };
+    submitTestInvocation: () => {
+        value: boolean;
+    };
+    submitTestInvocationFailure: (error: Error, errors: Record<string, any>) => {
+        error: Error;
+        errors: Record<string, any>;
+    };
+    submitTestInvocationRequest: (testInvocation: HogFunctionSourceWebhookTestForm) => {
+        testInvocation: HogFunctionSourceWebhookTestForm;
+    };
+    submitTestInvocationSuccess: (testInvocation: HogFunctionSourceWebhookTestForm) => {
+        testInvocation: HogFunctionSourceWebhookTestForm;
+    };
+    toggleExpanded: (expanded?: boolean) => {
+        expanded: boolean | undefined;
+    };
+    touchTestInvocationField: (key: string) => {
+        key: string;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFunctionSourceWebhookTestLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        exampleCurlRequest: (testInvocation: HogFunctionSourceWebhookTestForm, arg: any) => string;
+    };
+}
+
+export type hogFunctionSourceWebhookTestLogicType = MakeLogicType<hogFunctionSourceWebhookTestLogicValues, hogFunctionSourceWebhookTestLogicActions, HogFunctionConfigurationLogicProps, hogFunctionSourceWebhookTestLogicMeta>;
+
 export const hogFunctionSourceWebhookTestLogic = kea<hogFunctionSourceWebhookTestLogicType>([
     props({} as HogFunctionConfigurationLogicProps),
     key(({ id, templateId }: HogFunctionConfigurationLogicProps) => {
@@ -96,7 +167,7 @@ export const hogFunctionSourceWebhookTestLogic = kea<hogFunctionSourceWebhookTes
     selectors({
         exampleCurlRequest: [
             (s) => [s.testInvocation, (_, props) => props],
-            (testInvocation, props) => {
+            (testInvocation: HogFunctionSourceWebhookTestForm, props) => {
                 const headersJson = tryJsonParse(testInvocation.headers)
                 const headers = headersJson
                     ? Object.entries(headersJson)
diff --git a/frontend/src/scenes/hog-functions/configuration/hogFunctionConfigurationLogic.tsx b/frontend/src/scenes/hog-functions/configuration/hogFunctionConfigurationLogic.tsx
index 2167b7d93256..14de28ea1865 100644
--- a/frontend/src/scenes/hog-functions/configuration/hogFunctionConfigurationLogic.tsx
+++ b/frontend/src/scenes/hog-functions/configuration/hogFunctionConfigurationLogic.tsx
@@ -1,5 +1,5 @@
 import { deepEqual as equal } from 'fast-equals'
-import { actions, afterMount, connect, isBreakpoint, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, isBreakpoint, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { DeepPartialMap, ValidationErrorType, forms } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { beforeUnload, router, urlToAction } from 'kea-router'
@@ -69,7 +69,9 @@ import {
 
 import { performWideEventsQueryInTwoPhases } from '../sampleEventsQuery'
 import { eventToHogFunctionContextId } from '../sub-templates/sub-templates'
-import type { hogFunctionConfigurationLogicType } from './hogFunctionConfigurationLogicType'
+import type { GroupType, GroupTypeIndex, ProjectType, TeamPublicType, TeamType } from '../../../types'
+import type { DeepPartial, FieldName } from 'kea-forms'
+import type { HogFunctionMappingTemplateType } from '../../../types'
 
 export interface HogFunctionConfigurationLogicProps {
     logicKey?: string
@@ -302,6 +304,381 @@ export function mightDropEvents(code: string): boolean {
     return false
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFunctionConfigurationLogicValues {
+    groupTypes: Map<GroupTypeIndex, GroupType>; // groupsModel
+    currentProject: ProjectType | null; // projectLogic
+    currentProjectId: number | null; // projectLogic
+    currentTeam: TeamPublicType | TeamType | null; // teamLogic
+    hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean; // userLogic
+    baseEventsQuery: EventsQuery | null;
+    canEditSource: boolean;
+    canLoadSampleGlobals: boolean;
+    configuration: HogFunctionConfigurationType;
+    configurationAllErrors: Record<string, any>;
+    configurationChanged: boolean;
+    configurationErrors: DeepPartialMap<HogFunctionConfigurationType, ValidationErrorType>;
+    configurationHasErrors: boolean;
+    configurationManualErrors: Record<string, any>;
+    configurationTouched: boolean;
+    configurationTouches: Record<string, boolean>;
+    configurationValidationErrors: DeepPartialMap<HogFunctionConfigurationType, ValidationErrorType>;
+    contextId: HogFunctionConfigurationContextId;
+    currentHogCode: string;
+    currentInputs: CyclotronJobInputSchemaType[];
+    defaultFormState: HogFunctionConfigurationType | null;
+    eventsDataTableNode: DataTableNode | null;
+    exampleInvocationGlobals: CyclotronJobInvocationGlobals;
+    filtersContainPersonProperties: boolean;
+    hasGroupsAddon: boolean;
+    hasHadSubmissionErrors: boolean;
+    hogFunction: HogFunctionType | null;
+    hogFunctionLoading: boolean;
+    inputFormErrors: Record<string, string> | null;
+    inputFormWarnings: Record<string, string>;
+    inputsDiff: {
+        newInputs: CyclotronJobInputSchemaType[];
+        oldInputs: CyclotronJobInputSchemaType[];
+    } | null;
+    inputsValidation: CyclotronJobInputsValidationResult;
+    isConfigurationSubmitting: boolean;
+    isConfigurationValid: boolean;
+    isLegacyPlugin: boolean | undefined;
+    lastEventQuery: EventsQuery | null;
+    lastEventSecondQuery: EventsQuery | null;
+    loaded: boolean;
+    loading: boolean;
+    logicProps: HogFunctionConfigurationLogicProps;
+    mappingTemplates: HogFunctionMappingTemplateType[];
+    matchingFilters: PropertyGroupFilter;
+    mightDropEvents: boolean;
+    newFilters: CyclotronJobFiltersType | null;
+    newHogCode: string | null;
+    newInputs: CyclotronJobInputSchemaType[] | null;
+    oldFilters: CyclotronJobFiltersType | null;
+    oldHogCode: string | null;
+    oldInputs: CyclotronJobInputSchemaType[] | null;
+    sampleGlobals: CyclotronJobInvocationGlobals | null;
+    sampleGlobalsError: string | null;
+    sampleGlobalsLoading: boolean;
+    sampleGlobalsWithInputs: CyclotronJobInvocationGlobalsWithInputs;
+    showConfigurationErrors: boolean;
+    showEventsList: boolean;
+    showExpectedVolume: boolean;
+    showFilters: boolean;
+    showSource: boolean;
+    showTesting: boolean;
+    sourceUsesEvents: boolean;
+    sparkline: SparklineData | null;
+    sparklineLoading: boolean;
+    sparklineQuery: TrendsQuery | null;
+    survey: Survey | null;
+    surveyIdFromFilters: string | null;
+    surveyLoading: boolean;
+    template: HogFunctionTemplateType | null;
+    templateHasChanged: boolean | "" | undefined;
+    templateId: string | undefined;
+    templateLoading: boolean;
+    type: HogFunctionTypeType;
+    unsavedConfiguration: {
+        configuration: HogFunctionConfigurationType;
+        timestamp: number;
+    } | null;
+    useMapping: number | true | undefined;
+    usesGroups: boolean;
+    willChangeEnabledOnSave: boolean;
+    willReEnableOnSave: boolean;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFunctionConfigurationLogicActions {
+    clearFiltersDiff: () => {
+        value: true;
+    };
+    clearHogCodeDiff: () => {
+        value: true;
+    };
+    clearInputsDiff: () => {
+        value: true;
+    };
+    deleteHogFunction: () => {
+        value: true;
+    };
+    duplicate: () => {
+        value: true;
+    };
+    duplicateFromTemplate: () => {
+        value: true;
+    };
+    loadHogFunction: () => any;
+    loadHogFunctionFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadHogFunctionSuccess: (hogFunction: HogFunctionType | null, payload?: any) => {
+        hogFunction: HogFunctionType | null;
+        payload?: any;
+    };
+    loadSampleGlobals: (payload?: {
+        eventId?: string;
+    }) => {
+        eventId: string | undefined;
+    };
+    loadSampleGlobalsFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadSampleGlobalsSuccess: (sampleGlobals: CyclotronJobInvocationGlobals | null, payload?: {
+        eventId: string | undefined;
+    }) => {
+        sampleGlobals: CyclotronJobInvocationGlobals | null;
+        payload?: {
+            eventId: string | undefined;
+        };
+    };
+    loadSurvey: () => any;
+    loadSurveyFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadSurveySuccess: (survey: Survey | null, payload?: any) => {
+        survey: Survey | null;
+        payload?: any;
+    };
+    loadTemplate: () => any;
+    loadTemplateFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadTemplateSuccess: (template: HogFunctionTemplateType | null, payload?: any) => {
+        template: HogFunctionTemplateType | null;
+        payload?: any;
+    };
+    persistForUnload: () => {
+        value: true;
+    };
+    reportAIFiltersAccepted: () => {
+        value: true;
+    };
+    reportAIFiltersPromptOpen: () => {
+        value: true;
+    };
+    reportAIFiltersPrompted: () => {
+        value: true;
+    };
+    reportAIFiltersRejected: () => {
+        value: true;
+    };
+    reportAIHogFunctionAccepted: () => {
+        value: true;
+    };
+    reportAIHogFunctionInputsAccepted: () => {
+        value: true;
+    };
+    reportAIHogFunctionInputsPromptOpen: () => {
+        value: true;
+    };
+    reportAIHogFunctionInputsPrompted: () => {
+        value: true;
+    };
+    reportAIHogFunctionInputsRejected: () => {
+        value: true;
+    };
+    reportAIHogFunctionPromptOpen: () => {
+        value: true;
+    };
+    reportAIHogFunctionPrompted: () => {
+        value: true;
+    };
+    reportAIHogFunctionRejected: () => {
+        value: true;
+    };
+    resetConfiguration: (values?: HogFunctionConfigurationType) => {
+        values?: HogFunctionConfigurationType;
+    };
+    resetForm: () => {
+        value: true;
+    };
+    resetToTemplate: () => {
+        value: true;
+    };
+    setConfigurationManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>;
+    };
+    setConfigurationValue: (key: FieldName, value: any) => {
+        name: FieldName;
+        value: any;
+    };
+    setConfigurationValues: (values: DeepPartial<HogFunctionConfigurationType>) => {
+        values: DeepPartial<HogFunctionConfigurationType>;
+    };
+    setNewFilters: (newFilters: CyclotronJobFiltersType) => {
+        newFilters: CyclotronJobFiltersType;
+    };
+    setNewHogCode: (newHogCode: string) => {
+        newHogCode: string;
+    };
+    setNewInputs: (newInputs: CyclotronJobInputSchemaType[]) => {
+        newInputs: CyclotronJobInputSchemaType[];
+    };
+    setOldFilters: (oldFilters: CyclotronJobFiltersType) => {
+        oldFilters: CyclotronJobFiltersType;
+    };
+    setOldHogCode: (oldHogCode: string) => {
+        oldHogCode: string;
+    };
+    setOldInputs: (oldInputs: CyclotronJobInputSchemaType[]) => {
+        oldInputs: CyclotronJobInputSchemaType[];
+    };
+    setSampleGlobals: (sampleGlobals: CyclotronJobInvocationGlobals | null) => {
+        sampleGlobals: CyclotronJobInvocationGlobals | null;
+    };
+    setSampleGlobalsError: (error: any) => {
+        error: any;
+    };
+    setShowEventsList: (showEventsList: boolean) => {
+        showEventsList: boolean;
+    };
+    setShowSource: (showSource: boolean) => {
+        showSource: boolean;
+    };
+    setUnsavedConfiguration: (configuration: HogFunctionConfigurationType | null) => {
+        configuration: HogFunctionConfigurationType | null;
+    };
+    sparklineQueryChanged: (sparklineQuery: TrendsQuery) => {
+        sparklineQuery: TrendsQuery;
+    };
+    sparklineQueryChangedFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    sparklineQueryChangedSuccess: (sparkline: {
+        count: any;
+        data: {
+            color: string;
+            name: string;
+            values: number[];
+        }[];
+        labels: any;
+        warning: string | undefined;
+    } | {
+        count: any;
+        data: {
+            color: string;
+            name: string;
+            values: number[];
+        }[];
+        labels: any;
+        warning?: undefined;
+    } | null, payload?: {
+        sparklineQuery: TrendsQuery;
+    }) => {
+        sparkline: {
+            count: any;
+            data: {
+                color: string;
+                name: string;
+                values: number[];
+            }[];
+            labels: any;
+            warning: string | undefined;
+        } | {
+            count: any;
+            data: {
+                color: string;
+                name: string;
+                values: number[];
+            }[];
+            labels: any;
+            warning?: undefined;
+        } | null;
+        payload?: {
+            sparklineQuery: TrendsQuery;
+        };
+    };
+    submitConfiguration: () => {
+        value: boolean;
+    };
+    submitConfigurationFailure: (error: Error, errors: Record<string, any>) => {
+        error: Error;
+        errors: Record<string, any>;
+    };
+    submitConfigurationRequest: (configuration: HogFunctionConfigurationType) => {
+        configuration: HogFunctionConfigurationType;
+    };
+    submitConfigurationSuccess: (configuration: HogFunctionConfigurationType) => {
+        configuration: HogFunctionConfigurationType;
+    };
+    touchConfigurationField: (key: string) => {
+        key: string;
+    };
+    upsertHogFunction: (configuration: HogFunctionConfigurationType) => {
+        configuration: HogFunctionConfigurationType;
+    };
+    upsertHogFunctionFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    upsertHogFunctionSuccess: (hogFunction: HogFunctionType, payload?: {
+        configuration: HogFunctionConfigurationType;
+    }) => {
+        hogFunction: HogFunctionType;
+        payload?: {
+            configuration: HogFunctionConfigurationType;
+        };
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFunctionConfigurationLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        logicProps: (arg: any) => HogFunctionConfigurationLogicProps;
+        surveyIdFromFilters: (configuration: HogFunctionConfigurationType) => string | null;
+        type: (configuration: HogFunctionConfigurationType, hogFunction: HogFunctionType | null) => HogFunctionTypeType;
+        hasGroupsAddon: (hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean) => boolean;
+        useMapping: (hogFunction: HogFunctionType | null, template: HogFunctionTemplateType | null) => number | true | undefined;
+        defaultFormState: (template: HogFunctionTemplateType | null, hogFunction: HogFunctionType | null) => HogFunctionConfigurationType | null;
+        templateId: (template: HogFunctionTemplateType | null, hogFunction: HogFunctionType | null) => string | undefined;
+        loading: (hogFunctionLoading: boolean, templateLoading: boolean) => boolean;
+        loaded: (hogFunction: HogFunctionType | null, template: HogFunctionTemplateType | null) => boolean;
+        contextId: (configuration: HogFunctionConfigurationType) => HogFunctionConfigurationContextId;
+        inputsValidation: (configuration: HogFunctionConfigurationType) => CyclotronJobInputsValidationResult;
+        inputFormErrors: (inputsValidation: CyclotronJobInputsValidationResult) => Record<string, string> | null;
+        inputFormWarnings: (inputsValidation: CyclotronJobInputsValidationResult) => Record<string, string>;
+        willReEnableOnSave: (configuration: HogFunctionConfigurationType, hogFunction: HogFunctionType | null) => boolean;
+        willChangeEnabledOnSave: (configuration: HogFunctionConfigurationType, hogFunction: HogFunctionType | null) => boolean;
+        exampleInvocationGlobals: (configuration: HogFunctionConfigurationType, currentProject: ProjectType | null, groupTypes: Map<GroupTypeIndex, GroupType>, contextId: HogFunctionConfigurationContextId, survey: Survey | null) => CyclotronJobInvocationGlobals;
+        sampleGlobalsWithInputs: (sampleGlobals: CyclotronJobInvocationGlobals | null, exampleInvocationGlobals: CyclotronJobInvocationGlobals, configuration: HogFunctionConfigurationType) => CyclotronJobInvocationGlobalsWithInputs;
+        matchingFilters: (configuration: HogFunctionConfigurationType, useMapping: number | true | undefined) => PropertyGroupFilter;
+        filtersContainPersonProperties: (configuration: HogFunctionConfigurationType) => boolean;
+        sourceUsesEvents: (configuration: HogFunctionConfigurationType, type: HogFunctionTypeType) => boolean;
+        sparklineQuery: (configuration: HogFunctionConfigurationType, matchingFilters: PropertyGroupFilter, sourceUsesEvents: boolean) => TrendsQuery | null;
+        baseEventsQuery: (configuration: HogFunctionConfigurationType, matchingFilters: PropertyGroupFilter, groupTypes: Map<GroupTypeIndex, GroupType>, sourceUsesEvents: boolean) => EventsQuery | null;
+        eventsDataTableNode: (baseEventsQuery: EventsQuery | null) => DataTableNode | null;
+        lastEventQuery: (baseEventsQuery: EventsQuery | null) => EventsQuery | null;
+        lastEventSecondQuery: (lastEventQuery: EventsQuery | null) => EventsQuery | null;
+        templateHasChanged: (hogFunction: HogFunctionType | null, configuration: HogFunctionConfigurationType) => boolean | "" | undefined;
+        mappingTemplates: (hogFunction: HogFunctionType | null, template: HogFunctionTemplateType | null) => HogFunctionMappingTemplateType[];
+        usesGroups: (configuration: HogFunctionConfigurationType) => boolean;
+        mightDropEvents: (configuration: HogFunctionConfigurationType, type: HogFunctionTypeType) => boolean;
+        currentHogCode: (newHogCode: string | null, configuration: HogFunctionConfigurationType) => string;
+        currentInputs: (newInputs: CyclotronJobInputSchemaType[] | null, configuration: HogFunctionConfigurationType) => CyclotronJobInputSchemaType[];
+        inputsDiff: (oldInputs: CyclotronJobInputSchemaType[] | null, newInputs: CyclotronJobInputSchemaType[] | null) => {
+            newInputs: CyclotronJobInputSchemaType[];
+            oldInputs: CyclotronJobInputSchemaType[];
+        } | null;
+        canLoadSampleGlobals: (lastEventQuery: EventsQuery | null) => boolean;
+        showFilters: (type: HogFunctionTypeType) => boolean;
+        showExpectedVolume: (type: HogFunctionTypeType, sourceUsesEvents: boolean) => boolean;
+        canEditSource: (type: HogFunctionTypeType, template: HogFunctionTemplateType | null, hogFunction: HogFunctionType | null) => boolean;
+        showTesting: (type: HogFunctionTypeType) => boolean;
+        isLegacyPlugin: (template: HogFunctionTemplateType | null, hogFunction: HogFunctionType | null) => boolean | undefined;
+    };
+}
+
+export type hogFunctionConfigurationLogicType = MakeLogicType<hogFunctionConfigurationLogicValues, hogFunctionConfigurationLogicActions, HogFunctionConfigurationLogicProps, hogFunctionConfigurationLogicMeta>;
+
 export const hogFunctionConfigurationLogic = kea<hogFunctionConfigurationLogicType>([
     path((id) => ['scenes', 'pipeline', 'hogFunctionConfigurationLogic', id]),
     props({} as HogFunctionConfigurationLogicProps),
@@ -753,7 +1130,7 @@ export const hogFunctionConfigurationLogic = kea<hogFunctionConfigurationLogicTy
         logicProps: [() => [(_, props) => props], (props: HogFunctionConfigurationLogicProps) => props],
         surveyIdFromFilters: [
             (s) => [s.configuration],
-            (configuration): string | null => {
+            (configuration: HogFunctionConfigurationType): string | null => {
                 for (const event of configuration?.filters?.events ?? []) {
                     const prop = (event.properties as AnyPropertyFilter[] | undefined)?.find(
                         (p) => p.key === SurveyEventProperties.SURVEY_ID && 'value' in p && p.value
@@ -767,22 +1144,22 @@ export const hogFunctionConfigurationLogic = kea<hogFunctionConfigurationLogicTy
         ],
         type: [
             (s) => [s.configuration, s.hogFunction],
-            (configuration, hogFunction) => configuration?.type ?? hogFunction?.type ?? 'loading',
+            (configuration: HogFunctionConfigurationType, hogFunction: HogFunctionType | null) => configuration?.type ?? hogFunction?.type ?? 'loading',
         ],
         hasGroupsAddon: [
             (s) => [s.hasAvailableFeature],
-            (hasAvailableFeature) => {
+            (hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean) => {
                 return hasAvailableFeature(AvailableFeature.GROUP_ANALYTICS)
             },
         ],
         useMapping: [
             (s) => [s.hogFunction, s.template],
             // If the function has mappings, or the template has mapping templates, we use mappings
-            (hogFunction, template) => Array.isArray(hogFunction?.mappings) || template?.mapping_templates?.length,
+            (hogFunction: HogFunctionType | null, template: HogFunctionTemplateType | null) => Array.isArray(hogFunction?.mappings) || template?.mapping_templates?.length,
         ],
         defaultFormState: [
             (s) => [s.template, s.hogFunction],
-            (template, hogFunction): HogFunctionConfigurationType | null => {
+            (template: HogFunctionTemplateType | null, hogFunction: HogFunctionType | null): HogFunctionConfigurationType | null => {
                 if (template) {
                     return templateToConfiguration(template)
                 }
@@ -792,39 +1169,39 @@ export const hogFunctionConfigurationLogic = kea<hogFunctionConfigurationLogicTy
 
         templateId: [
             (s) => [s.template, s.hogFunction],
-            (template, hogFunction) => template?.id || hogFunction?.template?.id,
+            (template: HogFunctionTemplateType | null, hogFunction: HogFunctionType | null) => template?.id || hogFunction?.template?.id,
         ],
 
         loading: [
             (s) => [s.hogFunctionLoading, s.templateLoading],
-            (hogFunctionLoading, templateLoading) => hogFunctionLoading || templateLoading,
+            (hogFunctionLoading: boolean, templateLoading: boolean) => hogFunctionLoading || templateLoading,
         ],
-        loaded: [(s) => [s.hogFunction, s.template], (hogFunction, template) => !!hogFunction || !!template],
+        loaded: [(s) => [s.hogFunction, s.template], (hogFunction: HogFunctionType | null, template: HogFunctionTemplateType | null) => !!hogFunction || !!template],
 
         contextId: [
             (s) => [s.configuration],
-            (configuration): HogFunctionConfigurationContextId => {
+            (configuration: HogFunctionConfigurationType): HogFunctionConfigurationContextId => {
                 return eventToHogFunctionContextId(configuration.filters?.events?.[0]?.id)
             },
         ],
 
         inputsValidation: [
             (s) => [s.configuration],
-            (configuration): CyclotronJobInputsValidationResult =>
+            (configuration: HogFunctionConfigurationType): CyclotronJobInputsValidationResult =>
                 CyclotronJobInputsValidation.validate(configuration.inputs ?? {}, configuration.inputs_schema ?? []),
         ],
         inputFormErrors: [
             (s) => [s.inputsValidation],
-            (inputsValidation): Record<string, string> | null =>
+            (inputsValidation: CyclotronJobInputsValidationResult): Record<string, string> | null =>
                 inputsValidation.valid ? null : inputsValidation.errors,
         ],
         inputFormWarnings: [
             (s) => [s.inputsValidation],
-            (inputsValidation): Record<string, string> => inputsValidation.warnings,
+            (inputsValidation: CyclotronJobInputsValidationResult): Record<string, string> => inputsValidation.warnings,
         ],
         willReEnableOnSave: [
             (s) => [s.configuration, s.hogFunction],
-            (configuration, hogFunction) => {
+            (configuration: HogFunctionConfigurationType, hogFunction: HogFunctionType | null) => {
                 const hogState = hogFunction?.status?.state ?? 0
                 return configuration?.enabled && hogState === HogWatcherState.disabled
             },
@@ -832,13 +1209,13 @@ export const hogFunctionConfigurationLogic = kea<hogFunctionConfigurationLogicTy
 
         willChangeEnabledOnSave: [
             (s) => [s.configuration, s.hogFunction],
-            (configuration, hogFunction) => {
+            (configuration: HogFunctionConfigurationType, hogFunction: HogFunctionType | null) => {
                 return configuration?.enabled !== (hogFunction?.enabled ?? false)
             },
         ],
         exampleInvocationGlobals: [
             (s) => [s.configuration, s.currentProject, s.groupTypes, s.contextId, s.survey],
-            (configuration, currentProject, groupTypes, contextId, survey): CyclotronJobInvocationGlobals => {
+            (configuration: HogFunctionConfigurationType, currentProject: ProjectType | null, groupTypes: Map<GroupTypeIndex, GroupType>, contextId: HogFunctionConfigurationContextId, survey: Survey | null): CyclotronJobInvocationGlobals => {
                 const currentUrl = window.location.href.split('#')[0]
                 const eventId = uuid()
                 const personId = uuid()
@@ -955,7 +1332,7 @@ export const hogFunctionConfigurationLogic = kea<hogFunctionConfigurationLogicTy
         ],
         sampleGlobalsWithInputs: [
             (s) => [s.sampleGlobals, s.exampleInvocationGlobals, s.configuration],
-            (sampleGlobals, exampleInvocationGlobals, configuration): CyclotronJobInvocationGlobalsWithInputs => {
+            (sampleGlobals: CyclotronJobInvocationGlobals | null, exampleInvocationGlobals: CyclotronJobInvocationGlobals, configuration: HogFunctionConfigurationType): CyclotronJobInvocationGlobalsWithInputs => {
                 const inputs: Record<string, any> = {}
                 for (const input of configuration?.inputs_schema || []) {
                     inputs[input.key] = input.type
@@ -994,7 +1371,7 @@ export const hogFunctionConfigurationLogic = kea<hogFunctionConfigurationLogicTy
         ],
         matchingFilters: [
             (s) => [s.configuration, s.useMapping],
-            (configuration, useMapping): PropertyGroupFilter => {
+            (configuration: HogFunctionConfigurationType, useMapping: number | true | undefined): PropertyGroupFilter => {
                 // We're using mappings, but none are provided, so match zero events.
                 if (useMapping && !configuration.mappings?.length) {
                     return {
@@ -1084,7 +1461,7 @@ export const hogFunctionConfigurationLogic = kea<hogFunctionConfigurationLogicTy
 
         filtersContainPersonProperties: [
             (s) => [s.configuration],
-            (configuration) => {
+            (configuration: HogFunctionConfigurationType) => {
                 const filters = configuration.filters
                 let containsPersonProperties = false
                 if (filters?.properties && !containsPersonProperties) {
@@ -1106,14 +1483,14 @@ export const hogFunctionConfigurationLogic = kea<hogFunctionConfigurationLogicTy
 
         sourceUsesEvents: [
             (s) => [s.configuration, s.type],
-            (configuration, type) => {
+            (configuration: HogFunctionConfigurationType, type: HogFunctionTypeType) => {
                 return TYPES_WITH_REAL_EVENTS.includes(type) && (configuration.filters?.source ?? 'events') === 'events'
             },
         ],
 
         sparklineQuery: [
             (s) => [s.configuration, s.matchingFilters, s.sourceUsesEvents],
-            (configuration, matchingFilters, sourceUsesEvents): TrendsQuery | null => {
+            (configuration: HogFunctionConfigurationType, matchingFilters: PropertyGroupFilter, sourceUsesEvents: boolean): TrendsQuery | null => {
                 if (!sourceUsesEvents) {
                     return null
                 }
@@ -1146,7 +1523,7 @@ export const hogFunctionConfigurationLogic = kea<hogFunctionConfigurationLogicTy
 
         baseEventsQuery: [
             (s) => [s.configuration, s.matchingFilters, s.groupTypes, s.sourceUsesEvents],
-            (configuration, matchingFilters, groupTypes, sourceUsesEvents): EventsQuery | null => {
+            (configuration: HogFunctionConfigurationType, matchingFilters: PropertyGroupFilter, groupTypes: Map<GroupTypeIndex, GroupType>, sourceUsesEvents: boolean): EventsQuery | null => {
                 if (!sourceUsesEvents) {
                     return null
                 }
@@ -1175,7 +1552,7 @@ export const hogFunctionConfigurationLogic = kea<hogFunctionConfigurationLogicTy
 
         eventsDataTableNode: [
             (s) => [s.baseEventsQuery],
-            (baseEventsQuery): DataTableNode | null => {
+            (baseEventsQuery: EventsQuery | null): DataTableNode | null => {
                 return baseEventsQuery
                     ? setLatestVersionsOnQuery(
                           {
@@ -1193,29 +1570,29 @@ export const hogFunctionConfigurationLogic = kea<hogFunctionConfigurationLogicTy
 
         lastEventQuery: [
             (s) => [s.baseEventsQuery],
-            (baseEventsQuery): EventsQuery | null => {
+            (baseEventsQuery: EventsQuery | null): EventsQuery | null => {
                 return baseEventsQuery ? { ...baseEventsQuery, limit: 1 } : null
             },
             { resultEqualityCheck: equal },
         ],
         lastEventSecondQuery: [
             (s) => [s.lastEventQuery],
-            (lastEventQuery): EventsQuery | null => (lastEventQuery ? { ...lastEventQuery, after: '-30d' } : null),
+            (lastEventQuery: EventsQuery | null): EventsQuery | null => (lastEventQuery ? { ...lastEventQuery, after: '-30d' } : null),
         ],
         templateHasChanged: [
             (s) => [s.hogFunction, s.configuration],
-            (hogFunction, configuration) => {
+            (hogFunction: HogFunctionType | null, configuration: HogFunctionConfigurationType) => {
                 return hogFunction?.template?.code && hogFunction.template.code !== configuration.hog
             },
         ],
         mappingTemplates: [
             (s) => [s.hogFunction, s.template],
-            (hogFunction, template) => template?.mapping_templates ?? hogFunction?.template?.mapping_templates ?? [],
+            (hogFunction: HogFunctionType | null, template: HogFunctionTemplateType | null) => template?.mapping_templates ?? hogFunction?.template?.mapping_templates ?? [],
         ],
 
         usesGroups: [
             (s) => [s.configuration],
-            (configuration) => {
+            (configuration: HogFunctionConfigurationType) => {
                 // NOTE: Bit hacky but works good enough...
                 const configStr = JSON.stringify(configuration)
                 return configStr.includes('groups.') || configStr.includes('{groups}')
@@ -1223,7 +1600,7 @@ export const hogFunctionConfigurationLogic = kea<hogFunctionConfigurationLogicTy
         ],
         mightDropEvents: [
             (s) => [s.configuration, s.type],
-            (configuration, type) => {
+            (configuration: HogFunctionConfigurationType, type: HogFunctionTypeType) => {
                 if (type !== 'transformation') {
                     return false
                 }
@@ -1259,28 +1636,28 @@ export const hogFunctionConfigurationLogic = kea<hogFunctionConfigurationLogicTy
 
         canLoadSampleGlobals: [
             (s) => [s.lastEventQuery],
-            (lastEventQuery) => {
+            (lastEventQuery: EventsQuery | null) => {
                 return !!lastEventQuery
             },
         ],
 
         showFilters: [
             (s) => [s.type],
-            (type) => {
+            (type: HogFunctionTypeType) => {
                 return ['destination', 'internal_destination', 'site_destination', 'transformation'].includes(type)
             },
         ],
 
         showExpectedVolume: [
             (s) => [s.type, s.sourceUsesEvents],
-            (type, sourceUsesEvents) => {
+            (type: HogFunctionTypeType, sourceUsesEvents: boolean) => {
                 return sourceUsesEvents && ['destination', 'site_destination', 'transformation'].includes(type)
             },
         ],
 
         canEditSource: [
             (s) => [s.type, s.template, s.hogFunction],
-            (type, template, hogFunction) => {
+            (type: HogFunctionTypeType, template: HogFunctionTemplateType | null, hogFunction: HogFunctionType | null) => {
                 const codeLanguage = template?.code_language || hogFunction?.template?.code_language
 
                 if (type === 'site_app' || type === 'site_destination') {
@@ -1298,14 +1675,14 @@ export const hogFunctionConfigurationLogic = kea<hogFunctionConfigurationLogicTy
 
         showTesting: [
             (s) => [s.type],
-            (type) => {
+            (type: HogFunctionTypeType) => {
                 return ['destination', 'internal_destination', 'transformation'].includes(type)
             },
         ],
 
         isLegacyPlugin: [
             (s) => [s.template, s.hogFunction],
-            (template, hogFunction) => {
+            (template: HogFunctionTemplateType | null, hogFunction: HogFunctionType | null) => {
                 return (template?.id || hogFunction?.template?.id)?.startsWith('plugin-')
             },
         ],
diff --git a/frontend/src/scenes/hog-functions/configuration/hogFunctionIconLogic.ts b/frontend/src/scenes/hog-functions/configuration/hogFunctionIconLogic.ts
index 9121f2b304df..8e88d3f4aedd 100644
--- a/frontend/src/scenes/hog-functions/configuration/hogFunctionIconLogic.ts
+++ b/frontend/src/scenes/hog-functions/configuration/hogFunctionIconLogic.ts
@@ -1,18 +1,75 @@
-import { actions, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, kea, key, listeners, path, props, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
 
 import { HogFunctionIconResponse } from '~/types'
 
-import type { hogFunctionIconLogicType } from './hogFunctionIconLogicType'
-
 export interface HogFunctionIconLogicProps {
     logicKey: string
     src?: string
     onChange?: (src: string) => void
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFunctionIconLogicValues {
+    possibleIcons: HogFunctionIconResponse[] | null
+    possibleIconsLoading: boolean
+    searchTerm: string | null
+    showPopover: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFunctionIconLogicActions {
+    loadPossibleIcons: () => {
+        value: true
+    }
+    loadPossibleIconsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPossibleIconsSuccess: (
+        possibleIcons: {
+            id: string
+            name: string
+            url: string
+        }[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        possibleIcons: {
+            id: string
+            name: string
+            url: string
+        }[]
+        payload?: {
+            value: true
+        }
+    }
+    setSearchTerm: (search: string) => {
+        search: string
+    }
+    setShowPopover: (show: boolean) => {
+        show: boolean
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFunctionIconLogicMeta {
+    key: string
+}
+
+export type hogFunctionIconLogicType = MakeLogicType<
+    hogFunctionIconLogicValues,
+    hogFunctionIconLogicActions,
+    HogFunctionIconLogicProps,
+    hogFunctionIconLogicMeta
+>
+
 export const hogFunctionIconLogic = kea<hogFunctionIconLogicType>([
     props({} as HogFunctionIconLogicProps),
     key((props) => props.logicKey ?? 'default'),
diff --git a/frontend/src/scenes/hog-functions/configuration/hogFunctionTestLogic.tsx b/frontend/src/scenes/hog-functions/configuration/hogFunctionTestLogic.tsx
index 3ddf59c89ad4..2fa40ce9b658 100644
--- a/frontend/src/scenes/hog-functions/configuration/hogFunctionTestLogic.tsx
+++ b/frontend/src/scenes/hog-functions/configuration/hogFunctionTestLogic.tsx
@@ -1,5 +1,6 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import type { editor } from 'monaco-editor'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -11,12 +12,12 @@ import { tryJsonParse } from 'lib/utils/json'
 import { groupsModel } from '~/models/groupsModel'
 import { CyclotronJobInvocationGlobals, CyclotronJobTestInvocationResult } from '~/types'
 
+import type { GroupType, GroupTypeIndex, HogFunctionConfigurationType, HogFunctionTypeType } from '../../../types'
 import {
     HogFunctionConfigurationLogicProps,
     hogFunctionConfigurationLogic,
     sanitizeConfiguration,
 } from './hogFunctionConfigurationLogic'
-import type { hogFunctionTestLogicType } from './hogFunctionTestLogicType'
 
 export type HogFunctionTestInvocationForm = {
     globals: string // CyclotronJobInvocationGlobals
@@ -65,6 +66,144 @@ export interface CodeEditorValidation {
     decorations: string[]
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFunctionTestLogicValues {
+    groupTypes: Map<GroupTypeIndex, GroupType>; // groupsModel
+    configuration: HogFunctionConfigurationType; // hogFunctionConfigurationLogic
+    configurationHasErrors: boolean; // hogFunctionConfigurationLogic
+    currentHogCode: string; // hogFunctionConfigurationLogic
+    exampleInvocationGlobals: CyclotronJobInvocationGlobals; // hogFunctionConfigurationLogic
+    sampleGlobals: CyclotronJobInvocationGlobals | null; // hogFunctionConfigurationLogic
+    sampleGlobalsError: string | null; // hogFunctionConfigurationLogic
+    sampleGlobalsLoading: boolean; // hogFunctionConfigurationLogic
+    templateId: string | undefined; // hogFunctionConfigurationLogic
+    type: HogFunctionTypeType; // hogFunctionConfigurationLogic
+    currentDecorationIds: string[];
+    expanded: boolean;
+    fetchCancelled: boolean;
+    isTestInvocationSubmitting: boolean;
+    isTestInvocationValid: boolean;
+    jsonError: string | null;
+    sampleGlobalsLoadingAndNotCancelled: boolean;
+    savedGlobals: {
+        globals: CyclotronJobInvocationGlobals;
+        name: string;
+    }[];
+    showTestInvocationErrors: boolean;
+    sortedTestsResult: {
+        hasDiff: boolean;
+        input: string;
+        output: string;
+    } | null;
+    testInvocation: HogFunctionTestInvocationForm;
+    testInvocationAllErrors: Record<string, any>;
+    testInvocationChanged: boolean;
+    testInvocationErrors: DeepPartialMap<HogFunctionTestInvocationForm, ValidationErrorType>;
+    testInvocationHasErrors: boolean;
+    testInvocationManualErrors: Record<string, any>;
+    testInvocationTouched: boolean;
+    testInvocationTouches: Record<string, boolean>;
+    testInvocationValidationErrors: DeepPartialMap<HogFunctionTestInvocationForm, ValidationErrorType>;
+    testResult: CyclotronJobTestInvocationResult | null;
+    testResultMode: "diff" | "raw";
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFunctionTestLogicActions {
+    loadSampleGlobals: (payload?: {
+        eventId?: string;
+    } | undefined) => {
+        eventId: string | undefined;
+    }; // hogFunctionConfigurationLogic
+    loadSampleGlobalsSuccess: (sampleGlobals: CyclotronJobInvocationGlobals | null, payload?: {
+        eventId: string | undefined;
+    } | undefined) => {
+        payload?: {
+            eventId: string | undefined;
+        };
+        sampleGlobals: CyclotronJobInvocationGlobals | null;
+    }; // hogFunctionConfigurationLogic
+    setSampleGlobals: (sampleGlobals: CyclotronJobInvocationGlobals | null) => {
+        sampleGlobals: CyclotronJobInvocationGlobals | null;
+    }; // hogFunctionConfigurationLogic
+    touchConfigurationField: (key: string) => {
+        key: string;
+    }; // hogFunctionConfigurationLogic
+    cancelSampleGlobalsLoading: () => {
+        value: true;
+    };
+    deleteSavedGlobals: (index: number) => {
+        index: number;
+    };
+    receiveExampleGlobals: (globals: CyclotronJobInvocationGlobals | null) => {
+        globals: CyclotronJobInvocationGlobals | null;
+    };
+    resetTestInvocation: (values?: HogFunctionTestInvocationForm) => {
+        values?: HogFunctionTestInvocationForm;
+    };
+    saveGlobals: (name: string, globals: CyclotronJobInvocationGlobals) => {
+        globals: CyclotronJobInvocationGlobals;
+        name: string;
+    };
+    setDecorationIds: (decorationIds: string[]) => {
+        decorationIds: string[];
+    };
+    setJsonError: (error: string | null) => {
+        error: string | null;
+    };
+    setTestInvocationManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>;
+    };
+    setTestInvocationValue: (key: FieldName, value: any) => {
+        name: FieldName;
+        value: any;
+    };
+    setTestInvocationValues: (values: DeepPartial<HogFunctionTestInvocationForm>) => {
+        values: DeepPartial<HogFunctionTestInvocationForm>;
+    };
+    setTestResult: (result: CyclotronJobTestInvocationResult | null) => {
+        result: CyclotronJobTestInvocationResult | null;
+    };
+    setTestResultMode: (mode: "diff" | "raw") => {
+        mode: "diff" | "raw";
+    };
+    submitTestInvocation: () => {
+        value: boolean;
+    };
+    submitTestInvocationFailure: (error: Error, errors: Record<string, any>) => {
+        error: Error;
+        errors: Record<string, any>;
+    };
+    submitTestInvocationRequest: (testInvocation: HogFunctionTestInvocationForm) => {
+        testInvocation: HogFunctionTestInvocationForm;
+    };
+    submitTestInvocationSuccess: (testInvocation: HogFunctionTestInvocationForm) => {
+        testInvocation: HogFunctionTestInvocationForm;
+    };
+    toggleExpanded: (expanded?: boolean) => {
+        expanded: boolean | undefined;
+    };
+    touchTestInvocationField: (key: string) => {
+        key: string;
+    };
+    validateJson: (value: string, editor: editor.IStandaloneCodeEditor, decorations: string[]) => CodeEditorValidation;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFunctionTestLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        sortedTestsResult: (configuration: HogFunctionConfigurationType, testResult: CyclotronJobTestInvocationResult | null, testInvocation: HogFunctionTestInvocationForm) => {
+            hasDiff: boolean;
+            input: string;
+            output: string;
+        } | null;
+        sampleGlobalsLoadingAndNotCancelled: (sampleGlobalsLoading: boolean, fetchCancelled: boolean) => boolean;
+    };
+}
+
+export type hogFunctionTestLogicType = MakeLogicType<hogFunctionTestLogicValues, hogFunctionTestLogicActions, HogFunctionConfigurationLogicProps, hogFunctionTestLogicMeta>;
+
 export const hogFunctionTestLogic = kea<hogFunctionTestLogicType>([
     props({} as HogFunctionConfigurationLogicProps),
     key(({ id, templateId }: HogFunctionConfigurationLogicProps) => {
@@ -359,9 +498,9 @@ export const hogFunctionTestLogic = kea<hogFunctionTestLogicType>([
         sortedTestsResult: [
             (s) => [s.configuration, s.testResult, s.testInvocation],
             (
-                configuration,
-                testResult,
-                testInvocation
+                configuration: import('~/types').HogFunctionConfigurationType,
+                testResult: CyclotronJobTestInvocationResult | null,
+                testInvocation: HogFunctionTestInvocationForm
             ): {
                 input: string
                 output: string
@@ -388,7 +527,7 @@ export const hogFunctionTestLogic = kea<hogFunctionTestLogicType>([
 
         sampleGlobalsLoadingAndNotCancelled: [
             (s) => [s.sampleGlobalsLoading, s.fetchCancelled],
-            (sampleGlobalsLoading, fetchCancelled) => sampleGlobalsLoading && !fetchCancelled,
+            (sampleGlobalsLoading: boolean, fetchCancelled: boolean) => sampleGlobalsLoading && !fetchCancelled,
         ],
     })),
 
diff --git a/frontend/src/scenes/hog-functions/email-templater/emailTemplaterLogic.tsx b/frontend/src/scenes/hog-functions/email-templater/emailTemplaterLogic.tsx
index 57e5293045de..7a61459dbfcf 100644
--- a/frontend/src/scenes/hog-functions/email-templater/emailTemplaterLogic.tsx
+++ b/frontend/src/scenes/hog-functions/email-templater/emailTemplaterLogic.tsx
@@ -1,5 +1,18 @@
-import { actions, afterMount, connect, kea, listeners, path, props, propsChanged, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    afterMount,
+    connect,
+    kea,
+    listeners,
+    path,
+    props,
+    propsChanged,
+    reducers,
+    selectors,
+} from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { Editor, EmailEditorProps, EditorRef as _EditorRef } from 'react-email-editor'
 
@@ -14,7 +27,6 @@ import { PreflightStatus, PropertyDefinition, PropertyDefinitionType, Realm } fr
 
 import { MessageTemplate } from 'products/workflows/frontend/TemplateLibrary/types'
 
-import type { emailTemplaterLogicType } from './emailTemplaterLogicType'
 import type { EmailTemplate } from './types'
 
 export type { EmailTemplate }
@@ -116,6 +128,164 @@ function autoRevealAdvancedFields(
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface emailTemplaterLogicValues {
+    preflight: PreflightStatus | null // preflightLogic
+    activeContentTab: 'plaintext' | 'visual'
+    appliedTemplate: MessageTemplate | null
+    emailEditorRef: EditorRef | null
+    emailTemplate: EmailTemplate
+    emailTemplateAllErrors: Record<string, any>
+    emailTemplateChanged: boolean
+    emailTemplateErrors: DeepPartialMap<EmailTemplate, ValidationErrorType>
+    emailTemplateHasErrors: boolean
+    emailTemplateManualErrors: Record<string, any>
+    emailTemplateTouched: boolean
+    emailTemplateTouches: Record<string, boolean>
+    emailTemplateValidationErrors: DeepPartialMap<EmailTemplate, ValidationErrorType>
+    hiddenAdvancedFields: EmailMetaField[]
+    isEmailEditorReady: boolean
+    isEmailTemplateSubmitting: boolean
+    isEmailTemplateValid: boolean
+    isModalOpen: boolean
+    isSaveTemplateModalOpen: boolean
+    logicProps: EmailTemplaterLogicProps
+    mergeTags: UnlayerMergeTags
+    personPropertyDefinitions: PropertyDefinition[]
+    personPropertyDefinitionsLoading: boolean
+    revealedAdvancedFields: EmailMetaFieldKey[]
+    showEmailTemplateErrors: boolean
+    templates: MessageTemplate[]
+    templatesLoading: boolean
+    templatingEngine: 'hog' | 'liquid'
+    unlayerEditorProjectId: 275430 | undefined
+    visibleFields: EmailMetaField[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface emailTemplaterLogicActions {
+    applyTemplate: (template: MessageTemplate) => {
+        template: MessageTemplate
+    }
+    closeWithConfirmation: () => {
+        value: true
+    }
+    hideAdvancedField: (key: EmailMetaFieldKey) => {
+        key: EmailMetaFieldKey
+    }
+    loadPersonPropertyDefinitions: () => any
+    loadPersonPropertyDefinitionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPersonPropertyDefinitionsSuccess: (
+        personPropertyDefinitions: PropertyDefinition[],
+        payload?: any
+    ) => {
+        personPropertyDefinitions: PropertyDefinition[]
+        payload?: any
+    }
+    loadTemplates: () => any
+    loadTemplatesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadTemplatesSuccess: (
+        templates: MessageTemplate[],
+        payload?: any
+    ) => {
+        templates: MessageTemplate[]
+        payload?: any
+    }
+    onEmailEditorReady: () => {
+        value: true
+    }
+    resetEmailTemplate: (values?: EmailTemplate) => {
+        values?: EmailTemplate
+    }
+    revealAdvancedField: (key: EmailMetaFieldKey) => {
+        key: EmailMetaFieldKey
+    }
+    saveAsTemplate: (
+        name: string,
+        description: string
+    ) => {
+        description: string
+        name: string
+    }
+    setActiveContentTab: (tab: 'plaintext' | 'visual') => {
+        tab: 'plaintext' | 'visual'
+    }
+    setEmailEditorRef: (emailEditorRef: EditorRef | null) => {
+        emailEditorRef: EditorRef | null
+    }
+    setEmailTemplateManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setEmailTemplateValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setEmailTemplateValues: (values: DeepPartial<EmailTemplate>) => {
+        values: DeepPartial<EmailTemplate>
+    }
+    setIsModalOpen: (isModalOpen: boolean) => {
+        isModalOpen: boolean
+    }
+    setIsSaveTemplateModalOpen: (isOpen: boolean) => {
+        isOpen: boolean
+    }
+    setTemplatingEngine: (templating: 'hog' | 'liquid') => {
+        templating: 'hog' | 'liquid'
+    }
+    submitEmailTemplate: () => {
+        value: boolean
+    }
+    submitEmailTemplateFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitEmailTemplateRequest: (emailTemplate: EmailTemplate) => {
+        emailTemplate: EmailTemplate
+    }
+    submitEmailTemplateSuccess: (emailTemplate: EmailTemplate) => {
+        emailTemplate: EmailTemplate
+    }
+    touchEmailTemplateField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface emailTemplaterLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        logicProps: (arg: any) => EmailTemplaterLogicProps
+        mergeTags: (personPropertyDefinitions: PropertyDefinition[]) => UnlayerMergeTags
+        unlayerEditorProjectId: (preflight: PreflightStatus | null) => 275430 | undefined
+        visibleFields: (arg: EmailTemplaterType, revealedAdvancedFields: EmailMetaFieldKey[]) => EmailMetaField[]
+        hiddenAdvancedFields: (arg: EmailTemplaterType, visibleFields: EmailMetaField[]) => EmailMetaField[]
+    }
+}
+
+export type emailTemplaterLogicType = MakeLogicType<
+    emailTemplaterLogicValues,
+    emailTemplaterLogicActions,
+    EmailTemplaterLogicProps,
+    emailTemplaterLogicMeta
+>
+
 export const emailTemplaterLogic = kea<emailTemplaterLogicType>([
     props({} as EmailTemplaterLogicProps),
     path(['scenes', 'hog-functions', 'email-templater', 'emailTemplaterLogic']),
diff --git a/frontend/src/scenes/hog-functions/invocations/hogInvocationsLogic.tsx b/frontend/src/scenes/hog-functions/invocations/hogInvocationsLogic.tsx
index 4816b8e2bf54..aa9b8456e957 100644
--- a/frontend/src/scenes/hog-functions/invocations/hogInvocationsLogic.tsx
+++ b/frontend/src/scenes/hog-functions/invocations/hogInvocationsLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 
@@ -16,8 +16,6 @@ import { hogFunctionsRerunCreate } from 'products/cdp/frontend/generated/api'
 import type { HogInvocationRerunFilterStatusEnumApi } from 'products/cdp/frontend/generated/api.schemas'
 import { hogFlowsRerunCreate } from 'products/workflows/frontend/generated/api'
 
-import type { hogInvocationsLogicType } from './hogInvocationsLogicType'
-
 export const HOG_INVOCATIONS_PAGE_SIZE = 100
 
 /** Display-side mirror of the backend cap. Backend enforces the actual limit via the
@@ -666,6 +664,213 @@ async function fetchProblemLevels(
     return levelByInvocationId
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogInvocationsLogicValues {
+    canBulkRerun: boolean
+    expandedIds: Record<string, boolean>
+    filters: HogInvocationsFilters
+    hasLoadedOnce: boolean
+    hasMore: boolean
+    hasRunningRows: boolean
+    personPropertiesById: Record<
+        string,
+        {
+            distinct_ids?: string[]
+            properties: Record<string, any>
+        }
+    >
+    personPropertiesByIdLoading: boolean
+    personSearchResults: PersonType[]
+    personSearchResultsLoading: boolean
+    pickedPerson: PersonType | null
+    rerunableSelectedIds: string[]
+    runs: HogInvocationRow[]
+    runsLoading: boolean
+    selectAllState: 'all' | 'none' | 'some'
+    selectableIds: string[]
+    selectedCount: number
+    selectedIds: Record<string, boolean>
+    sparkline: SparklineData | null
+    sparklineLoading: boolean
+    statusCounts: Record<RunStatus, number>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogInvocationsLogicActions {
+    bulkRerun: (params: BulkRerunParams) => {
+        params: BulkRerunParams
+    }
+    clearSelected: () => {
+        value: true
+    }
+    enrichProblems: (invocationIds: string[] | null) => string[] | null
+    enrichProblemsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    enrichProblemsSuccess: (
+        runs: HogInvocationRow[],
+        payload?: string[] | null
+    ) => {
+        runs: HogInvocationRow[]
+        payload?: string[] | null
+    }
+    hydratePeople: (personIds: string[]) => {
+        personIds: string[]
+    }
+    hydratePeopleFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    hydratePeopleSuccess: (
+        personPropertiesById: Record<
+            string,
+            {
+                distinct_ids?: string[] | undefined
+                properties: Record<string, any>
+            }
+        >,
+        payload?: {
+            personIds: string[]
+        }
+    ) => {
+        personPropertiesById: Record<
+            string,
+            {
+                distinct_ids?: string[] | undefined
+                properties: Record<string, any>
+            }
+        >
+        payload?: {
+            personIds: string[]
+        }
+    }
+    loadMore: (_: any) => any
+    loadMoreFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadMoreSuccess: (
+        runs: HogInvocationRow[],
+        payload?: any
+    ) => {
+        runs: HogInvocationRow[]
+        payload?: any
+    }
+    loadRuns: (_: any) => any
+    loadRunsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRunsSuccess: (
+        runs: HogInvocationRow[],
+        payload?: any
+    ) => {
+        runs: HogInvocationRow[]
+        payload?: any
+    }
+    loadSparkline: (_: any) => any
+    loadSparklineFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSparklineSuccess: (
+        sparkline: SparklineData,
+        payload?: any
+    ) => {
+        sparkline: SparklineData
+        payload?: any
+    }
+    refresh: () => {
+        value: true
+    }
+    rerunInvocations: (invocationIds: string[]) => {
+        invocationIds: string[]
+    }
+    resetFilters: () => {
+        value: true
+    }
+    searchPersons: ({ search }: { search: string }) => {
+        search: string
+    }
+    searchPersonsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    searchPersonsSuccess: (
+        personSearchResults: PersonType[],
+        payload?: {
+            search: string
+        }
+    ) => {
+        personSearchResults: PersonType[]
+        payload?: {
+            search: string
+        }
+    }
+    setExpanded: (
+        invocationId: string,
+        expanded: boolean
+    ) => {
+        expanded: boolean
+        invocationId: string
+    }
+    setFilters: (filters: Partial<HogInvocationsFilters>) => {
+        filters: Partial<HogInvocationsFilters>
+    }
+    setHasMore: (hasMore: boolean) => {
+        hasMore: boolean
+    }
+    setPickedPerson: (person: PersonType | null) => {
+        person: PersonType | null
+    }
+    setSelectedIds: (ids: string[]) => {
+        ids: string[]
+    }
+    toggleSelected: (invocationId: string) => {
+        invocationId: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogInvocationsLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        statusCounts: (runs: HogInvocationRow[]) => Record<RunStatus, number>
+        selectedCount: (selectedIds: Record<string, boolean>) => number
+        canBulkRerun: (selectedCount: number) => boolean
+        rerunableSelectedIds: (selectedIds: Record<string, boolean>, runs: HogInvocationRow[]) => string[]
+        hasRunningRows: (runs: HogInvocationRow[]) => boolean
+        selectableIds: (runs: HogInvocationRow[]) => string[]
+        selectAllState: (selectedIds: Record<string, boolean>, selectableIds: string[]) => 'all' | 'none' | 'some'
+    }
+}
+
+export type hogInvocationsLogicType = MakeLogicType<
+    hogInvocationsLogicValues,
+    hogInvocationsLogicActions,
+    HogInvocationsLogicProps,
+    hogInvocationsLogicMeta
+>
+
 /**
  * Rerun is async — the `/rerun` endpoint enqueues a cyclotron wrapper job;
  * new lifecycle rows show up here once the worker drains it.
diff --git a/frontend/src/scenes/hog-functions/list/hogFunctionRequestModalLogic.tsx b/frontend/src/scenes/hog-functions/list/hogFunctionRequestModalLogic.tsx
index 0faf0831e250..6544ae306b84 100644
--- a/frontend/src/scenes/hog-functions/list/hogFunctionRequestModalLogic.tsx
+++ b/frontend/src/scenes/hog-functions/list/hogFunctionRequestModalLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path } from 'kea'
 import posthog from 'posthog-js'
 
 import { LemonDialog, LemonInput, LemonTextArea, lemonToast } from '@posthog/lemon-ui'
@@ -9,8 +9,31 @@ import { userLogic } from 'scenes/userLogic'
 
 import { HogFunctionTypeType } from '~/types'
 
+import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
+import type { UserType } from '../../../types'
 import { humanizeHogFunctionType } from '../hog-function-utils'
-import type { hogFunctionRequestModalLogicType } from './hogFunctionRequestModalLogicType'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFunctionRequestModalLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    user: UserType | null // userLogic
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFunctionRequestModalLogicActions {
+    openFeedbackDialog: (
+        type: HogFunctionTypeType,
+        name?: string
+    ) => {
+        name: string
+        type: HogFunctionTypeType
+    }
+}
+
+export type hogFunctionRequestModalLogicType = MakeLogicType<
+    hogFunctionRequestModalLogicValues,
+    hogFunctionRequestModalLogicActions
+>
 
 export const hogFunctionRequestModalLogic = kea<hogFunctionRequestModalLogicType>([
     path(() => ['scenes', 'hog-functions', 'list', 'hogFunctionRequestModalLogic']),
diff --git a/frontend/src/scenes/hog-functions/list/hogFunctionTemplateListLogic.tsx b/frontend/src/scenes/hog-functions/list/hogFunctionTemplateListLogic.tsx
index a5e195be331f..0a887d057afe 100644
--- a/frontend/src/scenes/hog-functions/list/hogFunctionTemplateListLogic.tsx
+++ b/frontend/src/scenes/hog-functions/list/hogFunctionTemplateListLogic.tsx
@@ -1,5 +1,5 @@
 import FuseClass from 'fuse.js'
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, combineUrl, router, urlToAction } from 'kea-router'
 import posthog from 'posthog-js'
@@ -25,9 +25,10 @@ import {
 
 import { cleanSourceId, isManagedSourceId, isSelfManagedSourceId } from 'products/data_warehouse/frontend/utils'
 
+import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
+import type { AvailableFeature } from '../../../types'
 import { HogFunctionDeliveryType, getHogFunctionDeliveryType } from '../hog-function-utils'
 import { getSubTemplate } from '../sub-templates/sub-templates'
-import type { hogFunctionTemplateListLogicType } from './hogFunctionTemplateListLogicType'
 
 // Helping kea-typegen navigate the exported default class for Fuse
 export interface Fuse extends FuseClass<HogFunctionTemplateType> {}
@@ -83,6 +84,80 @@ export const shouldShowHogFunctionTemplate = (
     return true
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFunctionTemplateListLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean // userLogic
+    user: UserType | null // userLogic
+    filteredTemplates: HogFunctionTemplateType[]
+    filters: HogFunctionTemplateListFilters
+    loading: boolean
+    rawTemplates: HogFunctionTemplateType[]
+    rawTemplatesLoading: boolean
+    templates: HogFunctionTemplateWithSubTemplateType[]
+    templatesFuse: Fuse
+    urlForTemplate: (template: HogFunctionTemplateWithSubTemplateType) => string | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFunctionTemplateListLogicActions {
+    loadHogFunctionTemplates: () => any
+    loadHogFunctionTemplatesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadHogFunctionTemplatesSuccess: (
+        rawTemplates: HogFunctionTemplateType[],
+        payload?: any
+    ) => {
+        rawTemplates: HogFunctionTemplateType[]
+        payload?: any
+    }
+    registerInterest: (template: HogFunctionTemplateType) => {
+        template: HogFunctionTemplateType
+    }
+    resetFilters: () => {
+        value: true
+    }
+    setFilters: (filters: Partial<HogFunctionTemplateListFilters>) => {
+        filters: Partial<HogFunctionTemplateListFilters>
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFunctionTemplateListLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        loading: (rawTemplatesLoading: boolean) => boolean
+        templates: (
+            rawTemplates: HogFunctionTemplateType[],
+            user: UserType | null,
+            featureFlags: FeatureFlagsSet,
+            arg: HogFunctionTemplateType[],
+            arg2: HogFunctionSubTemplateIdType[]
+        ) => HogFunctionTemplateWithSubTemplateType[]
+        templatesFuse: (templates: HogFunctionTemplateWithSubTemplateType[]) => Fuse
+        filteredTemplates: (
+            filters: HogFunctionTemplateListFilters,
+            templates: HogFunctionTemplateWithSubTemplateType[],
+            templatesFuse: Fuse,
+            arg: any,
+            arg2: any
+        ) => HogFunctionTemplateType[]
+        urlForTemplate: (arg: any) => (template: HogFunctionTemplateWithSubTemplateType) => string | null
+    }
+}
+
+export type hogFunctionTemplateListLogicType = MakeLogicType<
+    hogFunctionTemplateListLogicValues,
+    hogFunctionTemplateListLogicActions,
+    HogFunctionTemplateListLogicProps,
+    hogFunctionTemplateListLogicMeta
+>
+
 export const hogFunctionTemplateListLogic = kea<hogFunctionTemplateListLogicType>([
     props({
         manualTemplates: null,
@@ -130,7 +205,7 @@ export const hogFunctionTemplateListLogic = kea<hogFunctionTemplateListLogicType
         ],
     })),
     selectors({
-        loading: [(s) => [s.rawTemplatesLoading], (x) => x],
+        loading: [(s) => [s.rawTemplatesLoading], (x: boolean) => x],
 
         templates: [
             (s) => [
@@ -141,11 +216,11 @@ export const hogFunctionTemplateListLogic = kea<hogFunctionTemplateListLogicType
                 (_, p: HogFunctionTemplateListLogicProps) => p.subTemplateIds ?? EMPTY_ARRAY,
             ],
             (
-                rawTemplates,
-                user,
-                featureFlags,
-                manualTemplates,
-                subTemplateIds
+                rawTemplates: HogFunctionTemplateType[],
+                user: UserType | null,
+                featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet,
+                manualTemplates: HogFunctionTemplateType[],
+                subTemplateIds: HogFunctionSubTemplateIdType[]
             ): HogFunctionTemplateWithSubTemplateType[] => {
                 let templates: HogFunctionTemplateWithSubTemplateType[] = []
 
@@ -191,7 +266,7 @@ export const hogFunctionTemplateListLogic = kea<hogFunctionTemplateListLogicType
 
         templatesFuse: [
             (s) => [s.templates],
-            (templates): Fuse => {
+            (templates: HogFunctionTemplateWithSubTemplateType[]): Fuse => {
                 return createFuse(templates || [], {
                     keys: ['name', 'description'],
                 })
@@ -207,9 +282,9 @@ export const hogFunctionTemplateListLogic = kea<hogFunctionTemplateListLogicType
                 (_, props) => props.customFilterFunction ?? ALWAYS_TRUE,
             ],
             (
-                filters,
-                templates,
-                templatesFuse,
+                filters: HogFunctionTemplateListFilters,
+                templates: HogFunctionTemplateWithSubTemplateType[],
+                templatesFuse: Fuse,
                 hideComingSoonByDefault,
                 customFilterFunction
             ): HogFunctionTemplateType[] => {
diff --git a/frontend/src/scenes/hog-functions/list/hogFunctionsListLogic.tsx b/frontend/src/scenes/hog-functions/list/hogFunctionsListLogic.tsx
index e9f634696520..c67f5ecbde38 100644
--- a/frontend/src/scenes/hog-functions/list/hogFunctionsListLogic.tsx
+++ b/frontend/src/scenes/hog-functions/list/hogFunctionsListLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 
@@ -14,8 +14,9 @@ import { userLogic } from 'scenes/userLogic'
 import { deleteFromTree, refreshTreeItem } from '~/layout/panel-layout/ProjectTree/projectTreeLogic'
 import { CyclotronJobFiltersType, HogFunctionType, HogFunctionTypeType, UserType } from '~/types'
 
+import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
+import type { AvailableFeature } from '../../../types'
 import { HogFunctionDeliveryType, getHogFunctionDeliveryType } from '../hog-function-utils'
-import type { hogFunctionsListLogicType } from './hogFunctionsListLogicType'
 
 export const CDP_TEST_HIDDEN_FLAG = '[CDP-TEST-HIDDEN]'
 const EMPTY_MANUAL_FUNCTIONS: HogFunctionType[] = []
@@ -46,6 +47,171 @@ export const shouldShowHogFunction = (hogFunction: HogFunctionType, user?: UserT
     return true
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFunctionsListLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    currentProjectId: number | null // projectLogic
+    hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean // userLogic
+    user: UserType | null // userLogic
+    enabledHogFunctions: HogFunctionType[]
+    filteredHogFunctions: HogFunctionType[]
+    filters: HogFunctionListFilters
+    hiddenHogFunctions: HogFunctionType[]
+    hogFunctions: HogFunctionType[]
+    hogFunctionsLoading: boolean
+    loading: boolean
+    reorderModalOpen: boolean
+    sortedHogFunctions: HogFunctionType[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFunctionsListLogicActions {
+    addHogFunction: (hogFunction: HogFunctionType) => {
+        hogFunction: HogFunctionType
+    }
+    addHogFunctionFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    addHogFunctionSuccess: (
+        hogFunctions: HogFunctionType[],
+        payload?: {
+            hogFunction: HogFunctionType
+        }
+    ) => {
+        hogFunctions: HogFunctionType[]
+        payload?: {
+            hogFunction: HogFunctionType
+        }
+    }
+    deleteHogFunction: (hogFunction: HogFunctionType) => {
+        hogFunction: HogFunctionType
+    }
+    deleteHogFunctionFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteHogFunctionSuccess: (
+        hogFunctions: HogFunctionType[],
+        payload?: {
+            hogFunction: HogFunctionType
+        }
+    ) => {
+        hogFunctions: HogFunctionType[]
+        payload?: {
+            hogFunction: HogFunctionType
+        }
+    }
+    loadHogFunctions: () => any
+    loadHogFunctionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadHogFunctionsSuccess: (
+        hogFunctions: HogFunctionType[],
+        payload?: any
+    ) => {
+        hogFunctions: HogFunctionType[]
+        payload?: any
+    }
+    resetFilters: () => {
+        value: true
+    }
+    saveHogFunctionOrder: (newOrders: Record<string, number>) => {
+        newOrders: Record<string, number>
+    }
+    saveHogFunctionOrderFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    saveHogFunctionOrderSuccess: (
+        hogFunctions: HogFunctionType[],
+        payload?: {
+            newOrders: Record<string, number>
+        }
+    ) => {
+        hogFunctions: HogFunctionType[]
+        payload?: {
+            newOrders: Record<string, number>
+        }
+    }
+    setFilters: (filters: Partial<HogFunctionListFilters>) => {
+        filters: Partial<HogFunctionListFilters>
+    }
+    setReorderModalOpen: (open: boolean) => {
+        open: boolean
+    }
+    toggleEnabled: (
+        hogFunction: HogFunctionType,
+        enabled: boolean
+    ) => {
+        enabled: boolean
+        hogFunction: HogFunctionType
+    }
+    toggleEnabledFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    toggleEnabledSuccess: (
+        hogFunctions: HogFunctionType[],
+        payload?: {
+            enabled: boolean
+            hogFunction: HogFunctionType
+        }
+    ) => {
+        hogFunctions: HogFunctionType[]
+        payload?: {
+            enabled: boolean
+            hogFunction: HogFunctionType
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFunctionsListLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        loading: (hogFunctionsLoading: boolean) => boolean
+        sortedHogFunctions: (
+            hogFunctions: HogFunctionType[],
+            filters: HogFunctionListFilters,
+            arg: any
+        ) => HogFunctionType[]
+        enabledHogFunctions: (sortedHogFunctions: HogFunctionType[]) => HogFunctionType[]
+        filteredHogFunctions: (
+            filters: HogFunctionListFilters,
+            sortedHogFunctions: HogFunctionType[],
+            user: UserType | null
+        ) => HogFunctionType[]
+        hiddenHogFunctions: (
+            sortedHogFunctions: HogFunctionType[],
+            filteredHogFunctions: HogFunctionType[]
+        ) => HogFunctionType[]
+    }
+}
+
+export type hogFunctionsListLogicType = MakeLogicType<
+    hogFunctionsListLogicValues,
+    hogFunctionsListLogicActions,
+    HogFunctionListLogicProps,
+    hogFunctionsListLogicMeta
+>
+
 export const hogFunctionsListLogic = kea<hogFunctionsListLogicType>([
     props({} as HogFunctionListLogicProps),
     key((props) =>
@@ -151,7 +317,7 @@ export const hogFunctionsListLogic = kea<hogFunctionsListLogicType>([
         ],
     })),
     selectors({
-        loading: [(s) => [s.hogFunctionsLoading], (hogFunctionsLoading) => hogFunctionsLoading],
+        loading: [(s) => [s.hogFunctionsLoading], (hogFunctionsLoading: boolean) => hogFunctionsLoading],
         sortedHogFunctions: [
             (s) => [s.hogFunctions, s.filters, (_, props) => props.manualFunctions ?? EMPTY_MANUAL_FUNCTIONS],
             (
@@ -173,13 +339,17 @@ export const hogFunctionsListLogic = kea<hogFunctionsListLogicType>([
         ],
         enabledHogFunctions: [
             (s) => [s.sortedHogFunctions],
-            (hogFunctions): HogFunctionType[] => {
+            (hogFunctions: HogFunctionType[]): HogFunctionType[] => {
                 return hogFunctions.filter((hogFunction) => hogFunction.enabled)
             },
         ],
         filteredHogFunctions: [
             (s) => [s.filters, s.sortedHogFunctions, s.user],
-            (filters, hogFunctions, user): HogFunctionType[] => {
+            (
+                filters: HogFunctionListFilters,
+                hogFunctions: HogFunctionType[],
+                user: UserType | null
+            ): HogFunctionType[] => {
                 const { showPaused, createdBy, deliveryType } = filters
 
                 return hogFunctions.filter((x) => {
@@ -206,7 +376,7 @@ export const hogFunctionsListLogic = kea<hogFunctionsListLogicType>([
 
         hiddenHogFunctions: [
             (s) => [s.sortedHogFunctions, s.filteredHogFunctions],
-            (sortedHogFunctions, filteredHogFunctions): HogFunctionType[] => {
+            (sortedHogFunctions: HogFunctionType[], filteredHogFunctions: HogFunctionType[]): HogFunctionType[] => {
                 return sortedHogFunctions.filter((hogFunction) => !filteredHogFunctions.includes(hogFunction))
             },
         ],
diff --git a/frontend/src/scenes/hog-functions/list/newNotificationDialogLogic.ts b/frontend/src/scenes/hog-functions/list/newNotificationDialogLogic.ts
index 068f8adbb08f..5deab8f80397 100644
--- a/frontend/src/scenes/hog-functions/list/newNotificationDialogLogic.ts
+++ b/frontend/src/scenes/hog-functions/list/newNotificationDialogLogic.ts
@@ -1,5 +1,6 @@
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 
 import { lemonToast } from '@posthog/lemon-ui'
 
@@ -8,8 +9,8 @@ import { integrationsLogic } from 'lib/integrations/integrationsLogic'
 
 import { CyclotronJobFiltersType, HogFunctionSubTemplateIdType, HogFunctionType } from '~/types'
 
+import type { IntegrationType } from '../../../types'
 import { HOG_FUNCTION_SUB_TEMPLATE_COMMON_PROPERTIES, HOG_FUNCTION_SUB_TEMPLATES } from '../sub-templates/sub-templates'
-import type { newNotificationDialogLogicType } from './newNotificationDialogLogicType'
 
 export type DestinationKey = 'slack' | 'discord' | 'microsoft-teams' | 'webhook'
 
@@ -43,6 +44,88 @@ export interface NewNotificationDialogLogicProps {
     filtersOverride?: CyclotronJobFiltersType
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface newNotificationDialogLogicValues {
+    integrations: IntegrationType[] | null // integrationsLogic
+    isNotificationFormSubmitting: boolean
+    isNotificationFormValid: boolean
+    isOpen: boolean
+    notificationForm: NewNotificationForm
+    notificationFormAllErrors: Record<string, any>
+    notificationFormChanged: boolean
+    notificationFormErrors: DeepPartialMap<NewNotificationForm, ValidationErrorType>
+    notificationFormHasErrors: boolean
+    notificationFormManualErrors: Record<string, any>
+    notificationFormTouched: boolean
+    notificationFormTouches: Record<string, boolean>
+    notificationFormValidationErrors: DeepPartialMap<NewNotificationForm, ValidationErrorType>
+    selectedSlackIntegration: IntegrationType | null
+    showNotificationFormErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface newNotificationDialogLogicActions {
+    closeDialog: () => {
+        value: true
+    }
+    openDialog: () => {
+        value: true
+    }
+    resetNotificationForm: (values?: NewNotificationForm) => {
+        values?: NewNotificationForm
+    }
+    setNotificationFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setNotificationFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setNotificationFormValues: (values: DeepPartial<NewNotificationForm>) => {
+        values: DeepPartial<NewNotificationForm>
+    }
+    submitNotificationForm: () => {
+        value: boolean
+    }
+    submitNotificationFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitNotificationFormRequest: (notificationForm: NewNotificationForm) => {
+        notificationForm: NewNotificationForm
+    }
+    submitNotificationFormSuccess: (notificationForm: NewNotificationForm) => {
+        notificationForm: NewNotificationForm
+    }
+    touchNotificationFormField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface newNotificationDialogLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        selectedSlackIntegration: (
+            integrations: IntegrationType[] | null,
+            notificationForm: NewNotificationForm
+        ) => IntegrationType | null
+    }
+}
+
+export type newNotificationDialogLogicType = MakeLogicType<
+    newNotificationDialogLogicValues,
+    newNotificationDialogLogicActions,
+    NewNotificationDialogLogicProps,
+    newNotificationDialogLogicMeta
+>
+
 export const newNotificationDialogLogic = kea<newNotificationDialogLogicType>([
     path(['scenes', 'hog-functions', 'list', 'newNotificationDialogLogic']),
     props({} as NewNotificationDialogLogicProps),
@@ -149,7 +232,8 @@ export const newNotificationDialogLogic = kea<newNotificationDialogLogicType>([
     selectors({
         selectedSlackIntegration: [
             (s) => [s.integrations, s.notificationForm],
-            (integrations, form) => integrations?.find((i) => i.id === form.slackIntegrationId) ?? null,
+            (integrations: import('~/types').IntegrationType[] | null, form: NewNotificationForm) =>
+                integrations?.find((i) => i.id === form.slackIntegrationId) ?? null,
         ],
     }),
 
diff --git a/frontend/src/scenes/hog-functions/logs/hogFunctionLogsLogic.ts b/frontend/src/scenes/hog-functions/logs/hogFunctionLogsLogic.ts
index 9952f25abd3d..3de54807a4c7 100644
--- a/frontend/src/scenes/hog-functions/logs/hogFunctionLogsLogic.ts
+++ b/frontend/src/scenes/hog-functions/logs/hogFunctionLogsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { beforeUnload } from 'kea-router'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -9,7 +9,6 @@ import { Dayjs, dayjs } from 'lib/dayjs'
 import { hogql } from '~/queries/utils'
 import { LogEntryLevel } from '~/types'
 
-import type { hogFunctionLogsLogicType } from './hogFunctionLogsLogicType'
 import { GroupedLogEntry, LogsViewerLogicProps, logsViewerLogic } from './logsViewerLogic'
 
 export type RetryInvocationState = 'pending' | 'success' | 'failure'
@@ -92,6 +91,77 @@ const loadClickhouseEvents = async (
     })
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFunctionLogsLogicValues {
+    groupedLogs: GroupedLogEntry[] // logsViewerLogic
+    eventIdByInvocationId: Record<string, string>
+    retries: Record<string, RetryInvocationState>
+    retryRunning: boolean
+    selectedForRetry: Record<string, boolean>
+    selectingMany: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFunctionLogsLogicActions {
+    addLogGroups: (logGroups: GroupedLogEntry[]) => {
+        logGroups: GroupedLogEntry[]
+    } // logsViewerLogic
+    setRowExpanded: (
+        instanceId: string,
+        expanded: boolean
+    ) => {
+        expanded: boolean
+        instanceId: string
+    } // logsViewerLogic
+    retryInvocation: (
+        groupedLogEntry: GroupedLogEntry,
+        eventId: string
+    ) => {
+        eventId: string
+        groupedLogEntry: GroupedLogEntry
+    }
+    retryInvocationFailure: (groupedLogEntry: GroupedLogEntry) => {
+        groupedLogEntry: GroupedLogEntry
+    }
+    retryInvocationStarted: (groupedLogEntry: GroupedLogEntry) => {
+        groupedLogEntry: GroupedLogEntry
+    }
+    retryInvocationSuccess: (groupedLogEntry: GroupedLogEntry) => {
+        groupedLogEntry: GroupedLogEntry
+    }
+    retryInvocations: (groupedLogEntries: GroupedLogEntry[]) => {
+        groupedLogEntries: GroupedLogEntry[]
+    }
+    retrySelectedInvocations: () => {
+        value: true
+    }
+    selectAllForRetry: () => {
+        value: true
+    }
+    setSelectedForRetry: (selectedForRetry: Record<string, boolean>) => {
+        selectedForRetry: Record<string, boolean>
+    }
+    setSelectingMany: (selectingMany: boolean) => {
+        selectingMany: boolean
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFunctionLogsLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        retryRunning: (retries: Record<string, RetryInvocationState>) => boolean
+        eventIdByInvocationId: (groupedLogs: GroupedLogEntry[]) => Record<string, string>
+    }
+}
+
+export type hogFunctionLogsLogicType = MakeLogicType<
+    hogFunctionLogsLogicValues,
+    hogFunctionLogsLogicActions,
+    LogsViewerLogicProps,
+    hogFunctionLogsLogicMeta
+>
+
 export const hogFunctionLogsLogic = kea<hogFunctionLogsLogicType>([
     path((key) => ['scenes', 'pipeline', 'hogfunctions', 'logs', 'hogFunctionLogsLogic', key]),
     props({} as LogsViewerLogicProps), // TODO: Remove `stage` from props, it isn't needed here for anything
@@ -170,14 +240,14 @@ export const hogFunctionLogsLogic = kea<hogFunctionLogsLogicType>([
     selectors({
         retryRunning: [
             (s) => [s.retries],
-            (retries) => {
+            (retries: Record<string, RetryInvocationState>) => {
                 return Object.values(retries).some((x) => x === 'pending')
             },
         ],
 
         eventIdByInvocationId: [
             (s) => [s.groupedLogs],
-            (groupedLogs) => {
+            (groupedLogs: GroupedLogEntry[]) => {
                 const eventIdByInvocationId: Record<string, string> = {}
 
                 for (const record of groupedLogs) {
diff --git a/frontend/src/scenes/hog-functions/logs/logsViewerLogic.tsx b/frontend/src/scenes/hog-functions/logs/logsViewerLogic.tsx
index 74a74d830364..59b1fa624abe 100644
--- a/frontend/src/scenes/hog-functions/logs/logsViewerLogic.tsx
+++ b/frontend/src/scenes/hog-functions/logs/logsViewerLogic.tsx
@@ -1,4 +1,5 @@
 import {
+    MakeLogicType,
     actions,
     afterMount,
     beforeUnmount,
@@ -23,8 +24,6 @@ import { teamLogic } from 'scenes/teamLogic'
 import { HogQLQueryString, hogql } from '~/queries/utils'
 import { LogEntryLevel } from '~/types'
 
-import type { logsViewerLogicType } from './logsViewerLogicType'
-
 export const ALL_LOG_LEVELS: LogEntryLevel[] = ['DEBUG', 'LOG', 'INFO', 'WARN', 'ERROR']
 export const POLLING_INTERVAL = 5000
 export const LOG_VIEWER_LIMIT = 100
@@ -248,6 +247,216 @@ export const groupLogs = (logs: LogEntry[]): GroupedLogEntry[] => {
     return Object.values(byId).reverse()
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsViewerLogicValues {
+    allLogEntries: LogEntry[]
+    allLogEntryKeys: Set<string>
+    expandedRows: Record<string, boolean>
+    filters: LogsViewerFilters
+    groupedLogs: GroupedLogEntry[]
+    groupedLogsLoading: boolean
+    hiddenLogs: LogEntry[]
+    hiddenLogsLoading: boolean
+    isGrouped: boolean
+    isThereMoreToLoad: boolean
+    logEntryParams: LogEntryParams
+    logsLoading: boolean
+    newestLogTimestamp: Dayjs | null
+    oldestLogTimestamp: Dayjs | null
+    unGroupedLogs: LogEntry[]
+    unGroupedLogsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsViewerLogicActions {
+    addLogGroups: (logGroups: GroupedLogEntry[]) => {
+        logGroups: GroupedLogEntry[]
+    }
+    addLogGroupsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    addLogGroupsSuccess: (
+        groupedLogs: GroupedLogEntry[],
+        payload?: {
+            logGroups: GroupedLogEntry[]
+        }
+    ) => {
+        groupedLogs: GroupedLogEntry[]
+        payload?: {
+            logGroups: GroupedLogEntry[]
+        }
+    }
+    clearHiddenLogs: () => {
+        value: true
+    }
+    clearHiddenLogsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    clearHiddenLogsSuccess: (
+        hiddenLogs: never[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        hiddenLogs: never[]
+        payload?: {
+            value: true
+        }
+    }
+    clearLogs: () => {
+        value: true
+    }
+    loadGroupedLogs: () => {
+        value: true
+    }
+    loadGroupedLogsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadGroupedLogsSuccess: (
+        groupedLogs: GroupedLogEntry[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        groupedLogs: GroupedLogEntry[]
+        payload?: {
+            value: true
+        }
+    }
+    loadLogs: () => {
+        value: true
+    }
+    loadMoreGroupedLogs: () => any
+    loadMoreGroupedLogsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadMoreGroupedLogsSuccess: (
+        groupedLogs: GroupedLogEntry[],
+        payload?: any
+    ) => {
+        groupedLogs: GroupedLogEntry[]
+        payload?: any
+    }
+    loadMoreUngroupedLogs: () => any
+    loadMoreUngroupedLogsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadMoreUngroupedLogsSuccess: (
+        unGroupedLogs: LogEntry[],
+        payload?: any
+    ) => {
+        unGroupedLogs: LogEntry[]
+        payload?: any
+    }
+    loadNewerLogs: () => {
+        value: true
+    }
+    loadNewerLogsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadNewerLogsSuccess: (
+        hiddenLogs: LogEntry[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        hiddenLogs: LogEntry[]
+        payload?: {
+            value: true
+        }
+    }
+    loadOlderLogs: () => {
+        value: true
+    }
+    loadUngroupedLogs: () => {
+        value: true
+    }
+    loadUngroupedLogsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadUngroupedLogsSuccess: (
+        unGroupedLogs: LogEntry[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        unGroupedLogs: LogEntry[]
+        payload?: {
+            value: true
+        }
+    }
+    markLogsEnd: () => {
+        value: true
+    }
+    revealHiddenLogs: () => {
+        value: true
+    }
+    scheduleLoadNewerLogs: () => {
+        value: true
+    }
+    setFilters: (filters: Partial<LogsViewerFilters>) => {
+        filters: Partial<LogsViewerFilters>
+    }
+    setIsGrouped: (isGrouped: boolean) => {
+        isGrouped: boolean
+    }
+    setRowExpanded: (
+        instanceId: string,
+        expanded: boolean
+    ) => {
+        expanded: boolean
+        instanceId: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsViewerLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        logsLoading: (groupedLogsLoading: boolean, unGroupedLogsLoading: boolean) => boolean
+        logEntryParams: (arg: any, filters: LogsViewerFilters) => LogEntryParams
+        allLogEntries: (groupedLogs: GroupedLogEntry[], unGroupedLogs: LogEntry[], hiddenLogs: LogEntry[]) => LogEntry[]
+        allLogEntryKeys: (allLogEntries: LogEntry[]) => Set<string>
+        newestLogTimestamp: (allLogEntries: LogEntry[]) => Dayjs | null
+        oldestLogTimestamp: (allLogEntries: LogEntry[]) => Dayjs | null
+    }
+}
+
+export type logsViewerLogicType = MakeLogicType<
+    logsViewerLogicValues,
+    logsViewerLogicActions,
+    LogsViewerLogicProps,
+    logsViewerLogicMeta
+>
+
 export const logsViewerLogic = kea<logsViewerLogicType>([
     path((key) => ['scenes', 'pipeline', 'hogfunctions', 'logs', 'logsViewerLogic', key]),
     props({} as LogsViewerLogicProps), // TODO: Remove `stage` from props, it isn't needed here for anything
@@ -462,13 +671,13 @@ export const logsViewerLogic = kea<logsViewerLogicType>([
     selectors(() => ({
         logsLoading: [
             (s) => [s.groupedLogsLoading, s.unGroupedLogsLoading],
-            (groupedLogsLoading, unGroupedLogsLoading): boolean => {
+            (groupedLogsLoading: boolean, unGroupedLogsLoading: boolean): boolean => {
                 return groupedLogsLoading || unGroupedLogsLoading
             },
         ],
         logEntryParams: [
             (s) => [(_, p) => p, s.filters],
-            (props, filters): LogEntryParams => {
+            (props, filters: LogsViewerFilters): LogEntryParams => {
                 const searchGroups = [filters.search, ...(props.searchGroups || [])].filter((x) => !!x) as string[]
                 return {
                     ...props.defaultFilters,
@@ -485,21 +694,21 @@ export const logsViewerLogic = kea<logsViewerLogicType>([
 
         allLogEntries: [
             (s) => [s.groupedLogs, s.unGroupedLogs, s.hiddenLogs],
-            (groupedLogs, unGroupedLogs, hiddenLogs): LogEntry[] => {
+            (groupedLogs: GroupedLogEntry[], unGroupedLogs: LogEntry[], hiddenLogs: LogEntry[]): LogEntry[] => {
                 return [...groupedLogs.flatMap((log) => log.entries), ...unGroupedLogs, ...hiddenLogs]
             },
         ],
 
         allLogEntryKeys: [
             (s) => [s.allLogEntries],
-            (allLogEntries): Set<string> => {
+            (allLogEntries: LogEntry[]): Set<string> => {
                 return new Set(allLogEntries.map(toKey))
             },
         ],
 
         newestLogTimestamp: [
             (s) => [s.allLogEntries],
-            (allLogEntries): Dayjs | null => {
+            (allLogEntries: LogEntry[]): Dayjs | null => {
                 const item = allLogEntries.reduce(
                     (max, log) => {
                         if (!max) {
@@ -516,7 +725,7 @@ export const logsViewerLogic = kea<logsViewerLogicType>([
 
         oldestLogTimestamp: [
             (s) => [s.allLogEntries],
-            (allLogEntries): Dayjs | null => {
+            (allLogEntries: LogEntry[]): Dayjs | null => {
                 return allLogEntries.reduce(
                     (min, log) => {
                         if (!min) {
diff --git a/frontend/src/scenes/hog-functions/testing/hogFunctionTestingLogic.tsx b/frontend/src/scenes/hog-functions/testing/hogFunctionTestingLogic.tsx
index 6e4b5ad9b7c9..d2d3a2b394df 100644
--- a/frontend/src/scenes/hog-functions/testing/hogFunctionTestingLogic.tsx
+++ b/frontend/src/scenes/hog-functions/testing/hogFunctionTestingLogic.tsx
@@ -1,5 +1,5 @@
 import { deepEqual as equal } from 'fast-equals'
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { beforeUnload } from 'kea-router'
 import { subscriptions } from 'kea-subscriptions'
@@ -20,7 +20,9 @@ import {
 } from '~/types'
 
 import { hogFunctionConfigurationLogic, sanitizeConfiguration } from '../configuration/hogFunctionConfigurationLogic'
-import type { hogFunctionTestingLogicType } from './hogFunctionTestingLogicType'
+import type { GroupType, GroupTypeIndex } from '../../../types'
+import type { HogFunctionConfigurationType, PropertyGroupFilter } from '../../../types'
+import type { AccessControlFilterWarning, DataWarehouseSyncWarning, HogQLQueryModifiers, QueryStatus, QueryTiming, ResolvedDateRangeResponse } from '../../../queries/schema/schema-general'
 
 export interface HogFunctionTestingLogicProps {
     id: string
@@ -37,6 +39,278 @@ export interface CyclotronJobTestInvocationResultWithEventId extends CyclotronJo
 
 const PAGE_ROWS = 20
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFunctionTestingLogicValues {
+    groupTypes: Map<GroupTypeIndex, GroupType>; // groupsModel
+    configuration: HogFunctionConfigurationType; // hogFunctionConfigurationLogic
+    matchingFilters: PropertyGroupFilter; // hogFunctionConfigurationLogic
+    templateId: string | undefined; // hogFunctionConfigurationLogic
+    baseEventsQuery: EventsQuery | null;
+    dateRange: {
+        after: string | null;
+        before: string | null;
+    };
+    events: EventsResultType;
+    eventsLoading: boolean;
+    eventsWithRetries: any[][];
+    expandedRows: string[];
+    loadingRetries: string[];
+    nextQuery: EventsQuery | null;
+    pageTimestamps: (string | undefined)[];
+    previousQuery: EventsQuery | null;
+    retries: CyclotronJobTestInvocationResultWithEventId[];
+    retriesLoading: boolean;
+    selectedForRetry: string[];
+    selectingMany: boolean;
+    totalEvents: number;
+    totalEventsLoading: boolean;
+    totalEventsQuery: TrendsQuery | null;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFunctionTestingLogicActions {
+    addLoadingRetry: (eventId: string) => {
+        eventId: string;
+    };
+    changeDateRange: (after: string | null, before: string | null) => {
+        after: string | null;
+        before: string | null;
+    };
+    collapseRow: (eventId: string) => {
+        eventId: string;
+    };
+    decreaseCurrentPage: () => {
+        value: true;
+    };
+    deselectForRetry: (eventIds: string[]) => {
+        eventIds: string[];
+    };
+    expandRow: (eventId: string) => {
+        eventId: string;
+    };
+    increaseCurrentPage: (timestamp: string | undefined) => {
+        timestamp: string | undefined;
+    };
+    loadEvents: () => any;
+    loadEventsFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadEventsSuccess: (events: {
+        before: undefined;
+        results: never[];
+    } | {
+        before: string | undefined;
+        columns: any[];
+        error?: string | undefined;
+        hasMore?: boolean | undefined;
+        hogql: string;
+        limit?: number | undefined;
+        modifiers?: HogQLQueryModifiers | undefined;
+        nextCursor?: string | undefined;
+        offset?: number | undefined;
+        query_status?: QueryStatus | undefined;
+        resolved_compare_date_range?: ResolvedDateRangeResponse | undefined;
+        resolved_date_range?: ResolvedDateRangeResponse | undefined;
+        results: any[][];
+        timings?: QueryTiming[] | undefined;
+        types: string[];
+        warnings?: (AccessControlFilterWarning | DataWarehouseSyncWarning)[] | undefined;
+    }, payload?: any) => {
+        events: {
+            before: undefined;
+            results: never[];
+        } | {
+            before: string | undefined;
+            columns: any[];
+            error?: string | undefined;
+            hasMore?: boolean | undefined;
+            hogql: string;
+            limit?: number | undefined;
+            modifiers?: HogQLQueryModifiers | undefined;
+            nextCursor?: string | undefined;
+            offset?: number | undefined;
+            query_status?: QueryStatus | undefined;
+            resolved_compare_date_range?: ResolvedDateRangeResponse | undefined;
+            resolved_date_range?: ResolvedDateRangeResponse | undefined;
+            results: any[][];
+            timings?: QueryTiming[] | undefined;
+            types: string[];
+            warnings?: (AccessControlFilterWarning | DataWarehouseSyncWarning)[] | undefined;
+        };
+        payload?: any;
+    };
+    loadNextEventsPage: () => any;
+    loadNextEventsPageFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadNextEventsPageSuccess: (events: {
+        before: undefined;
+        results: any[][];
+    } | {
+        before: string | undefined;
+        columns: any[];
+        error?: string | undefined;
+        hasMore?: boolean | undefined;
+        hogql: string;
+        limit?: number | undefined;
+        modifiers?: HogQLQueryModifiers | undefined;
+        nextCursor?: string | undefined;
+        offset?: number | undefined;
+        query_status?: QueryStatus | undefined;
+        resolved_compare_date_range?: ResolvedDateRangeResponse | undefined;
+        resolved_date_range?: ResolvedDateRangeResponse | undefined;
+        results: any[][];
+        timings?: QueryTiming[] | undefined;
+        types: string[];
+        warnings?: (AccessControlFilterWarning | DataWarehouseSyncWarning)[] | undefined;
+    }, payload?: any) => {
+        events: {
+            before: undefined;
+            results: any[][];
+        } | {
+            before: string | undefined;
+            columns: any[];
+            error?: string | undefined;
+            hasMore?: boolean | undefined;
+            hogql: string;
+            limit?: number | undefined;
+            modifiers?: HogQLQueryModifiers | undefined;
+            nextCursor?: string | undefined;
+            offset?: number | undefined;
+            query_status?: QueryStatus | undefined;
+            resolved_compare_date_range?: ResolvedDateRangeResponse | undefined;
+            resolved_date_range?: ResolvedDateRangeResponse | undefined;
+            results: any[][];
+            timings?: QueryTiming[] | undefined;
+            types: string[];
+            warnings?: (AccessControlFilterWarning | DataWarehouseSyncWarning)[] | undefined;
+        };
+        payload?: any;
+    };
+    loadPreviousEventsPage: () => any;
+    loadPreviousEventsPageFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadPreviousEventsPageSuccess: (events: {
+        before: undefined;
+        results: any[][];
+    } | {
+        before: string | undefined;
+        columns: any[];
+        error?: string | undefined;
+        hasMore?: boolean | undefined;
+        hogql: string;
+        limit?: number | undefined;
+        modifiers?: HogQLQueryModifiers | undefined;
+        nextCursor?: string | undefined;
+        offset?: number | undefined;
+        query_status?: QueryStatus | undefined;
+        resolved_compare_date_range?: ResolvedDateRangeResponse | undefined;
+        resolved_date_range?: ResolvedDateRangeResponse | undefined;
+        results: any[][];
+        timings?: QueryTiming[] | undefined;
+        types: string[];
+        warnings?: (AccessControlFilterWarning | DataWarehouseSyncWarning)[] | undefined;
+    }, payload?: any) => {
+        events: {
+            before: undefined;
+            results: any[][];
+        } | {
+            before: string | undefined;
+            columns: any[];
+            error?: string | undefined;
+            hasMore?: boolean | undefined;
+            hogql: string;
+            limit?: number | undefined;
+            modifiers?: HogQLQueryModifiers | undefined;
+            nextCursor?: string | undefined;
+            offset?: number | undefined;
+            query_status?: QueryStatus | undefined;
+            resolved_compare_date_range?: ResolvedDateRangeResponse | undefined;
+            resolved_date_range?: ResolvedDateRangeResponse | undefined;
+            results: any[][];
+            timings?: QueryTiming[] | undefined;
+            types: string[];
+            warnings?: (AccessControlFilterWarning | DataWarehouseSyncWarning)[] | undefined;
+        };
+        payload?: any;
+    };
+    loadTotalEvents: () => any;
+    loadTotalEventsFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadTotalEventsSuccess: (totalEvents: number, payload?: any) => {
+        totalEvents: number;
+        payload?: any;
+    };
+    removeLoadingRetry: (eventId: string) => {
+        eventId: string;
+    };
+    resetCollapsedRows: () => {
+        value: true;
+    };
+    resetCurrentPage: () => {
+        value: true;
+    };
+    resetSelectedForRetry: () => {
+        value: true;
+    };
+    retryInvocation: ({
+                    eventId,
+                    globals,
+                }: {
+        eventId: string;
+        globals: CyclotronJobInvocationGlobals;
+    }) => {
+        eventId: string;
+        globals: CyclotronJobInvocationGlobals;
+    };
+    retryInvocationFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    retryInvocationSuccess: (retries: CyclotronJobTestInvocationResultWithEventId[], payload?: {
+        eventId: string;
+        globals: CyclotronJobInvocationGlobals;
+    }) => {
+        retries: CyclotronJobTestInvocationResultWithEventId[];
+        payload?: {
+            eventId: string;
+            globals: CyclotronJobInvocationGlobals;
+        };
+    };
+    selectForRetry: (eventIds: string[]) => {
+        eventIds: string[];
+    };
+    setSelectingMany: (selectingMany: boolean) => {
+        selectingMany: boolean;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFunctionTestingLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        baseEventsQuery: (configuration: HogFunctionConfigurationType, matchingFilters: PropertyGroupFilter, groupTypes: Map<GroupTypeIndex, GroupType>, dateRange: {
+            after: string | null;
+            before: string | null;
+        }) => EventsQuery | null;
+        totalEventsQuery: (configuration: HogFunctionConfigurationType, matchingFilters: PropertyGroupFilter, dateRange: {
+            after: string | null;
+            before: string | null;
+        }) => TrendsQuery | null;
+        eventsWithRetries: (events: EventsResultType, retries: CyclotronJobTestInvocationResultWithEventId[]) => any[][];
+        nextQuery: (baseEventsQuery: EventsQuery | null, events: EventsResultType) => EventsQuery | null;
+        previousQuery: (baseEventsQuery: EventsQuery | null, events: EventsResultType) => EventsQuery | null;
+    };
+}
+
+export type hogFunctionTestingLogicType = MakeLogicType<hogFunctionTestingLogicValues, hogFunctionTestingLogicActions, HogFunctionTestingLogicProps, hogFunctionTestingLogicMeta>;
+
 export const hogFunctionTestingLogic = kea<hogFunctionTestingLogicType>([
     path((key) => ['scenes', 'pipeline', 'hogFunctionTestingLogic', key]),
     props({} as HogFunctionTestingLogicProps),
@@ -209,7 +483,10 @@ export const hogFunctionTestingLogic = kea<hogFunctionTestingLogicType>([
     selectors(({ values }) => ({
         baseEventsQuery: [
             (s) => [s.configuration, s.matchingFilters, s.groupTypes, s.dateRange],
-            (configuration, matchingFilters, groupTypes, dateRange): EventsQuery | null => {
+            (configuration: HogFunctionConfigurationType, matchingFilters: PropertyGroupFilter, groupTypes: Map<GroupTypeIndex, GroupType>, dateRange: {
+    after: string | null;
+    before: string | null;
+}): EventsQuery | null => {
                 const query: EventsQuery = {
                     kind: NodeKind.EventsQuery,
                     filterTestAccounts: configuration.filters?.filter_test_accounts,
@@ -235,7 +512,10 @@ export const hogFunctionTestingLogic = kea<hogFunctionTestingLogicType>([
         ],
         totalEventsQuery: [
             (s) => [s.configuration, s.matchingFilters, s.dateRange],
-            (configuration, matchingFilters, dateRange): TrendsQuery | null => {
+            (configuration: HogFunctionConfigurationType, matchingFilters: PropertyGroupFilter, dateRange: {
+    after: string | null;
+    before: string | null;
+}): TrendsQuery | null => {
                 return setLatestVersionsOnQuery({
                     kind: NodeKind.TrendsQuery,
                     filterTestAccounts: configuration.filters?.filter_test_accounts,
@@ -273,7 +553,7 @@ export const hogFunctionTestingLogic = kea<hogFunctionTestingLogicType>([
         ],
         nextQuery: [
             (s) => [s.baseEventsQuery, s.events],
-            (baseEventsQuery, events): EventsQuery | null => {
+            (baseEventsQuery: EventsQuery | null, events: EventsResultType): EventsQuery | null => {
                 if (!baseEventsQuery || !events) {
                     return null
                 }
@@ -297,7 +577,7 @@ export const hogFunctionTestingLogic = kea<hogFunctionTestingLogicType>([
         ],
         previousQuery: [
             (s) => [s.baseEventsQuery, s.events],
-            (baseEventsQuery, events): EventsQuery | null => {
+            (baseEventsQuery: EventsQuery | null, events: EventsResultType): EventsQuery | null => {
                 if (!baseEventsQuery || !events) {
                     return null
                 }
diff --git a/frontend/src/scenes/inbox/components/shell/agentSetupModalLogic.ts b/frontend/src/scenes/inbox/components/shell/agentSetupModalLogic.ts
index 39af9253b243..b591bf25ba8f 100644
--- a/frontend/src/scenes/inbox/components/shell/agentSetupModalLogic.ts
+++ b/frontend/src/scenes/inbox/components/shell/agentSetupModalLogic.ts
@@ -1,10 +1,25 @@
-import { actions, kea, path, reducers } from 'kea'
-
-import type { agentSetupModalLogicType } from './agentSetupModalLogicType'
+import { MakeLogicType, actions, kea, path, reducers } from 'kea'
 
 /** Setup widgets whose management UI opens in a modal. GitHub and MCP servers link out instead. */
 export type AgentSetupModalKey = 'signal-sources' | 'scout-troop' | 'slack'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface agentSetupModalLogicValues {
+    openModal: AgentSetupModalKey | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface agentSetupModalLogicActions {
+    closeSetupModal: () => {
+        value: true
+    }
+    openSetupModal: (key: AgentSetupModalKey) => {
+        key: AgentSetupModalKey
+    }
+}
+
+export type agentSetupModalLogicType = MakeLogicType<agentSetupModalLogicValues, agentSetupModalLogicActions>
+
 /** Tracks which agent-setup widget's modal is open (one at a time), driven from the widget strip. */
 export const agentSetupModalLogic = kea<agentSetupModalLogicType>([
     path(['scenes', 'inbox', 'components', 'shell', 'agentSetupModalLogic']),
diff --git a/frontend/src/scenes/inbox/components/signalCards/inboxErrorTrackingIssueLogic.ts b/frontend/src/scenes/inbox/components/signalCards/inboxErrorTrackingIssueLogic.ts
index b1794dd5f30c..6752371ce15d 100644
--- a/frontend/src/scenes/inbox/components/signalCards/inboxErrorTrackingIssueLogic.ts
+++ b/frontend/src/scenes/inbox/components/signalCards/inboxErrorTrackingIssueLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -10,7 +10,7 @@ import { DateRange, ErrorTrackingIssue, ErrorTrackingRelationalIssue } from '~/q
 import { errorTrackingIssueQuery } from 'products/error_tracking/frontend/queries'
 import { ERROR_TRACKING_LISTING_RESOLUTION } from 'products/error_tracking/frontend/utils'
 
-import type { inboxErrorTrackingIssueLogicType } from './inboxErrorTrackingIssueLogicType'
+import type { ErrorTrackingIssueAggregations } from '../../../../queries/schema/schema-general'
 
 export type InboxErrorTrackingIssueSourceType = 'issue_created' | 'issue_reopened' | 'issue_spiking'
 
@@ -35,6 +35,99 @@ function defaultDateRange(): DateRange {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface inboxErrorTrackingIssueLogicValues {
+    issue: ErrorTrackingRelationalIssue | null
+    issueLoading: boolean
+    mergedFailed: boolean
+    mergedIssue: ErrorTrackingIssue | null
+    mergedToIssueId: string | null
+    sparklineResolution: number
+    spikeEvents: ErrorTrackingSpikeEvent[]
+    spikeEventsLoading: boolean
+    summary: InboxErrorTrackingIssueSummary | null
+    summaryLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface inboxErrorTrackingIssueLogicActions {
+    loadIssue: () => any
+    loadIssueFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadIssueSuccess: (
+        issue: ErrorTrackingRelationalIssue,
+        payload?: any
+    ) => {
+        issue: ErrorTrackingRelationalIssue
+        payload?: any
+    }
+    loadSpikeEvents: () => any
+    loadSpikeEventsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSpikeEventsSuccess: (
+        spikeEvents: ErrorTrackingSpikeEvent[],
+        payload?: any
+    ) => {
+        spikeEvents: ErrorTrackingSpikeEvent[]
+        payload?: any
+    }
+    loadSummary: () => any
+    loadSummaryFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSummarySuccess: (
+        summary: {
+            aggregations: ErrorTrackingIssueAggregations
+            first_seen: string
+            last_seen: string
+        } | null,
+        payload?: any
+    ) => {
+        summary: {
+            aggregations: ErrorTrackingIssueAggregations
+            first_seen: string
+            last_seen: string
+        } | null
+        payload?: any
+    }
+    setMergedToIssueId: (issueId: string | null) => {
+        issueId: string | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface inboxErrorTrackingIssueLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        mergedFailed: (issueLoading: boolean, issue: ErrorTrackingRelationalIssue | null) => boolean
+        mergedIssue: (
+            issue: ErrorTrackingRelationalIssue | null,
+            summary: InboxErrorTrackingIssueSummary | null
+        ) => ErrorTrackingIssue | null
+    }
+}
+
+export type inboxErrorTrackingIssueLogicType = MakeLogicType<
+    inboxErrorTrackingIssueLogicValues,
+    inboxErrorTrackingIssueLogicActions,
+    InboxErrorTrackingIssueLogicProps,
+    inboxErrorTrackingIssueLogicMeta
+>
+
 /**
  * Loads the live error tracking issue (relational row + summary aggregations, plus spike events for
  * spiking signals) so the inbox signal card can embed the real issue row read-only. Keyed by
@@ -123,7 +216,10 @@ export const inboxErrorTrackingIssueLogic = kea<inboxErrorTrackingIssueLogicType
 
     selectors({
         /** True once the issue load failed (not found, merged away, or otherwise unavailable). */
-        mergedFailed: [(s) => [s.issueLoading, s.issue], (issueLoading, issue) => !issueLoading && !issue],
+        mergedFailed: [
+            (s) => [s.issueLoading, s.issue],
+            (issueLoading: boolean, issue: ErrorTrackingRelationalIssue | null) => !issueLoading && !issue,
+        ],
 
         /** Assembled `ErrorTrackingIssue` for the read-only row: relational issue merged with summary. */
         mergedIssue: [
diff --git a/frontend/src/scenes/inbox/components/signalCards/inboxLlmTraceLogic.ts b/frontend/src/scenes/inbox/components/signalCards/inboxLlmTraceLogic.ts
index 2f4499b5b956..8007401ea852 100644
--- a/frontend/src/scenes/inbox/components/signalCards/inboxLlmTraceLogic.ts
+++ b/frontend/src/scenes/inbox/components/signalCards/inboxLlmTraceLogic.ts
@@ -1,4 +1,4 @@
-import { afterMount, kea, key, path, props } from 'kea'
+import { MakeLogicType, afterMount, kea, key, path, props } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -6,8 +6,6 @@ import { dayjs } from 'lib/dayjs'
 
 import { LLMTrace, NodeKind, TraceQuery, TraceQueryResponse } from '~/queries/schema/schema-general'
 
-import type { inboxLlmTraceLogicType } from './inboxLlmTraceLogicType'
-
 export interface InboxLlmTraceLogicProps {
     traceId: string
 }
@@ -17,6 +15,43 @@ export interface InboxLlmTraceLogicProps {
 // narrow window would miss them.
 const TRACE_LOOKBACK_FLOOR = dayjs.utc(new Date(2025, 0, 10)).toISOString()
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface inboxLlmTraceLogicValues {
+    trace: LLMTrace | null
+    traceLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface inboxLlmTraceLogicActions {
+    loadTrace: () => any
+    loadTraceFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadTraceSuccess: (
+        trace: LLMTrace | null,
+        payload?: any
+    ) => {
+        trace: LLMTrace | null
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface inboxLlmTraceLogicMeta {
+    key: string
+}
+
+export type inboxLlmTraceLogicType = MakeLogicType<
+    inboxLlmTraceLogicValues,
+    inboxLlmTraceLogicActions,
+    InboxLlmTraceLogicProps,
+    inboxLlmTraceLogicMeta
+>
+
 /**
  * Keyed loader that eagerly fetches a single `LLMTrace` by id for an inbox signal card. Intentionally
  * standalone — it does not mount the AI observability trace scene logic (which owns URL routing). On
diff --git a/frontend/src/scenes/inbox/inboxSceneLogic.ts b/frontend/src/scenes/inbox/inboxSceneLogic.ts
index e2e3d198a078..2c4466bf72b4 100644
--- a/frontend/src/scenes/inbox/inboxSceneLogic.ts
+++ b/frontend/src/scenes/inbox/inboxSceneLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 
@@ -14,13 +14,13 @@ import { Breadcrumb } from '~/types'
 
 import { OriginProduct, Task, TaskRunStatus } from 'products/posthog_ai/frontend/types/taskTypes'
 
+import type { UserType } from '../../types'
 import {
     captureInboxReportClosed,
     captureInboxReportOpened,
     InboxReportCloseMethod,
     InboxReportOpenMethod,
 } from './inboxAnalytics'
-import type { inboxSceneLogicType } from './inboxSceneLogicType'
 import { inboxFiltersLogic } from './logics/inboxFiltersLogic'
 import { INBOX_FLAT_TAB_LIST_PARAMS, reportListLogic } from './logics/reportListLogic'
 import { scratchpadLogic } from './logics/scratchpadLogic'
@@ -179,6 +179,123 @@ interface InboxOpenTracking {
     openedAt: number
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface inboxSceneLogicValues {
+    isSessionAnalysisRunning: boolean // signalSourcesLogic
+    user: UserType | null // userLogic
+    activeTab: InboxTabKey
+    breadcrumbs: Breadcrumb[]
+    isFindingsOpen: boolean
+    isRunningSessionAnalysis: boolean
+    isScratchpadOpen: boolean
+    isStaff: boolean
+    selectedReport: SignalReport | null
+    selectedReportId: string | null
+    selectedReportLoading: boolean
+    selectedReportResponse: SignalReport | null
+    selectedReportResponseLoading: boolean
+    selectedScoutFindingId: string | null
+    selectedScoutSkillName: string | null
+    signalRuns: SignalRun[]
+    signalRunsLoading: boolean
+    signalRunsResponse: SignalRun[] | null
+    signalRunsResponseLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface inboxSceneLogicActions {
+    loadSourceConfigs: () => any // signalSourcesLogic
+    loadRuns: (_payload: void) => void
+    loadRunsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRunsSuccess: (
+        signalRunsResponse: SignalRun[],
+        payload?: void
+    ) => {
+        signalRunsResponse: SignalRun[]
+        payload?: void
+    }
+    loadSelectedReport: ({ id }: { id: string }) => {
+        id: string
+    }
+    loadSelectedReportFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSelectedReportSuccess: (
+        selectedReportResponse: SignalReport,
+        payload?: {
+            id: string
+        }
+    ) => {
+        selectedReportResponse: SignalReport
+        payload?: {
+            id: string
+        }
+    }
+    runSessionAnalysis: () => {
+        value: true
+    }
+    runSessionAnalysisFailure: (error: string) => {
+        error: string
+    }
+    runSessionAnalysisSuccess: () => {
+        value: true
+    }
+    seedSelectedReport: (report: SignalReport | null) => {
+        report: SignalReport | null
+    }
+    setActiveTab: (tab: InboxTabKey) => {
+        tab: InboxTabKey
+    }
+    setFindingsOpen: (open: boolean) => {
+        open: boolean
+    }
+    setScratchpadOpen: (open: boolean) => {
+        open: boolean
+    }
+    setSelectedReportId: (
+        id: string | null,
+        openMethod?: InboxReportOpenMethod
+    ) => {
+        id: string | null
+        openMethod: InboxReportOpenMethod
+    }
+    setSelectedScoutSkillName: (
+        skillName: string | null,
+        findingId?: string | null
+    ) => {
+        findingId: string | null
+        skillName: string | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface inboxSceneLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        isStaff: (user: UserType | null) => boolean
+        signalRuns: (signalRunsResponse: SignalRun[] | null) => SignalRun[]
+        signalRunsLoading: (signalRunsResponse: SignalRun[] | null, signalRunsResponseLoading: boolean) => boolean
+        selectedReport: (selectedReportResponse: SignalReport | null) => SignalReport | null
+        selectedReportLoading: (selectedReportResponseLoading: boolean) => boolean
+    }
+}
+
+export type inboxSceneLogicType = MakeLogicType<
+    inboxSceneLogicValues,
+    inboxSceneLogicActions,
+    Record<string, any>,
+    inboxSceneLogicMeta
+>
+
 /**
  * Inbox scene orchestrator. Owns the active tab, the selected report (loaded by id),
  * the project-wide Runs list, and session-analysis. The per-tab report
@@ -340,7 +457,10 @@ export const inboxSceneLogic = kea<inboxSceneLogicType>([
                 },
             ],
         ],
-        isStaff: [() => [userLogic.selectors.user], (user): boolean => user?.is_staff ?? false],
+        isStaff: [
+            () => [userLogic.selectors.user],
+            (user: null | import('~/types').UserType): boolean => user?.is_staff ?? false,
+        ],
         signalRuns: [
             (s) => [s.signalRunsResponse],
             (signalRunsResponse: SignalRun[] | null): SignalRun[] => signalRunsResponse ?? [],
diff --git a/frontend/src/scenes/inbox/inboxTaskKickoffLogic.ts b/frontend/src/scenes/inbox/inboxTaskKickoffLogic.ts
index a07e3b118e57..e6a9b1d480b7 100644
--- a/frontend/src/scenes/inbox/inboxTaskKickoffLogic.ts
+++ b/frontend/src/scenes/inbox/inboxTaskKickoffLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers } from 'kea'
 import { router } from 'kea-router'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -8,7 +8,6 @@ import { urls } from 'scenes/urls'
 
 import { OriginProduct } from 'products/posthog_ai/frontend/types/taskTypes'
 
-import type { inboxTaskKickoffLogicType } from './inboxTaskKickoffLogicType'
 import { SIGNAL_REPORT_TASK_IMPLEMENTATION_RELATIONSHIP, SignalReport, SignalReportTaskRelationship } from './types'
 
 // Cloud-adapted port of desktop `useDiscussReport` / `useCreatePrReport`. These are
@@ -90,6 +89,40 @@ async function createReportTask(
     router.actions.push(urls.taskDetail(task.id))
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface inboxTaskKickoffLogicValues {
+    isCreatingPr: boolean
+    isDiscussing: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface inboxTaskKickoffLogicActions {
+    createPrFailure: () => {
+        value: true
+    }
+    createPrFromReport: (report: SignalReport) => {
+        report: SignalReport
+    }
+    createPrSuccess: () => {
+        value: true
+    }
+    discussReport: (
+        report: SignalReport,
+        question?: string
+    ) => {
+        question: string | undefined
+        report: SignalReport
+    }
+    discussReportFailure: () => {
+        value: true
+    }
+    discussReportSuccess: () => {
+        value: true
+    }
+}
+
+export type inboxTaskKickoffLogicType = MakeLogicType<inboxTaskKickoffLogicValues, inboxTaskKickoffLogicActions>
+
 export const inboxTaskKickoffLogic = kea<inboxTaskKickoffLogicType>([
     path(['scenes', 'inbox', 'inboxTaskKickoffLogic']),
 
diff --git a/frontend/src/scenes/inbox/logics/findingsLogic.ts b/frontend/src/scenes/inbox/logics/findingsLogic.ts
index f1c0e66e71d0..a187ca53e6fa 100644
--- a/frontend/src/scenes/inbox/logics/findingsLogic.ts
+++ b/frontend/src/scenes/inbox/logics/findingsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { subscriptions } from 'kea-subscriptions'
 
@@ -13,7 +13,6 @@ import {
     SignalScoutRunSummary,
 } from '../types'
 import { mostRecentEmittedRuns, prettifyScoutSkillName } from '../utils/scoutRunsWindow'
-import type { findingsLogicType } from './findingsLogicType'
 import { ScoutEmissionRow } from './scoutDetailLogic'
 import { scoutFleetLogic } from './scoutFleetLogic'
 
@@ -34,6 +33,133 @@ function severityRank(severity: SignalReportPriority | null): number {
     return severity == null ? 5 : SEVERITY_RANK[severity]
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface findingsLogicValues {
+    runsWindow: {
+        complete: boolean
+        runs: SignalScoutRunSummary[]
+    } // scoutFleetLogic
+    runsWindowComplete: boolean // scoutFleetLogic
+    runsWindowLoadedOnce: boolean // scoutFleetLogic
+    availableScouts: {
+        count: number
+        label: string
+        skillName: string
+    }[]
+    emissionReports: SignalScoutEmissionReportLink[]
+    emissionReportsLoading: boolean
+    emissions: SignalScoutEmission[]
+    emissionsLoadFailed: boolean
+    emissionsLoading: boolean
+    emittedRuns: SignalScoutRunSummary[]
+    emittedRunsKey: string
+    filteredRows: ScoutEmissionRow[]
+    hasLoadedOnce: boolean
+    latestEmittedAt: string | null
+    reportBySourceId: Map<string, LinkedSignalReport>
+    rows: ScoutEmissionRow[]
+    scoutCount: number
+    scoutFilter: string
+    searchText: string
+    severityFilter: string
+    sortKey: FindingsSortKey
+    totalCount: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface findingsLogicActions {
+    loadEmissionReports: () => any
+    loadEmissionReportsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadEmissionReportsSuccess: (
+        emissionReports: SignalScoutEmissionReportLink[],
+        payload?: any
+    ) => {
+        emissionReports: SignalScoutEmissionReportLink[]
+        payload?: any
+    }
+    loadEmissions: () => any
+    loadEmissionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadEmissionsSuccess: (
+        emissions: SignalScoutEmission[],
+        payload?: any
+    ) => {
+        emissions: SignalScoutEmission[]
+        payload?: any
+    }
+    setScoutFilter: (scoutFilter: string) => {
+        scoutFilter: string
+    }
+    setSearchText: (searchText: string) => {
+        searchText: string
+    }
+    setSeverityFilter: (severityFilter: string) => {
+        severityFilter: string
+    }
+    setSortKey: (sortKey: FindingsSortKey) => {
+        sortKey: FindingsSortKey
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface findingsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        emittedRuns: (runsWindow: { complete: boolean; runs: SignalScoutRunSummary[] }) => SignalScoutRunSummary[]
+        emittedRunsKey: (emittedRuns: SignalScoutRunSummary[]) => string
+        reportBySourceId: (emissionReports: SignalScoutEmissionReportLink[]) => Map<string, LinkedSignalReport>
+        rows: (
+            emissions: SignalScoutEmission[],
+            emittedRuns: SignalScoutRunSummary[],
+            reportBySourceId: Map<string, LinkedSignalReport>
+        ) => ScoutEmissionRow[]
+        availableScouts: (rows: ScoutEmissionRow[]) => {
+            count: number
+            label: string
+            skillName: string
+        }[]
+        filteredRows: (
+            rows: ScoutEmissionRow[],
+            searchText: string,
+            scoutFilter: string,
+            severityFilter: string,
+            sortKey: FindingsSortKey
+        ) => ScoutEmissionRow[]
+        totalCount: (rows: ScoutEmissionRow[]) => number
+        scoutCount: (
+            availableScouts: {
+                count: number
+                label: string
+                skillName: string
+            }[]
+        ) => number
+        latestEmittedAt: (rows: ScoutEmissionRow[]) => string | null
+        hasLoadedOnce: (
+            runsWindowLoadedOnce: boolean,
+            emittedRuns: SignalScoutRunSummary[],
+            emissionsLoading: boolean,
+            emissions: SignalScoutEmission[]
+        ) => boolean
+    }
+}
+
+export type findingsLogicType = MakeLogicType<
+    findingsLogicValues,
+    findingsLogicActions,
+    Record<string, any>,
+    findingsLogicMeta
+>
+
 /**
  * Fleet-wide findings logic — the cross-troop counterpart of the per-scout `scoutDetailLogic`. Reuses
  * `scoutFleetLogic`'s polled runs window to find every scout's recent emitted runs, fetches their
@@ -135,7 +261,7 @@ export const findingsLogic = kea<findingsLogicType>([
         ],
         reportBySourceId: [
             (s) => [s.emissionReports],
-            (emissionReports): Map<string, LinkedSignalReport> =>
+            (emissionReports: SignalScoutEmissionReportLink[]): Map<string, LinkedSignalReport> =>
                 new Map(
                     emissionReports
                         .filter((link) => link.report !== null)
@@ -162,7 +288,7 @@ export const findingsLogic = kea<findingsLogicType>([
         // Distinct scouts present in the loaded findings, with a per-scout count, for the scout filter.
         availableScouts: [
             (s) => [s.rows],
-            (rows): { skillName: string; label: string; count: number }[] => {
+            (rows: ScoutEmissionRow[]): { skillName: string; label: string; count: number }[] => {
                 const counts = new Map<string, number>()
                 for (const row of rows) {
                     counts.set(row.run.skill_name, (counts.get(row.run.skill_name) ?? 0) + 1)
@@ -175,7 +301,13 @@ export const findingsLogic = kea<findingsLogicType>([
         // Visible set: search (over finding text + prettified scout name) + scout + severity, then sort.
         filteredRows: [
             (s) => [s.rows, s.searchText, s.scoutFilter, s.severityFilter, s.sortKey],
-            (rows, searchText, scoutFilter, severityFilter, sortKey): ScoutEmissionRow[] => {
+            (
+                rows: ScoutEmissionRow[],
+                searchText: string,
+                scoutFilter: string,
+                severityFilter: string,
+                sortKey: FindingsSortKey
+            ): ScoutEmissionRow[] => {
                 const needle = searchText.trim().toLowerCase()
                 const filtered = rows.filter((row) => {
                     if (scoutFilter !== FINDINGS_SCOUT_FILTER_ALL && row.run.skill_name !== scoutFilter) {
@@ -213,11 +345,20 @@ export const findingsLogic = kea<findingsLogicType>([
             },
         ],
         // Page header tallies, from the loaded set (not the cheap window sum the callout uses).
-        totalCount: [(s) => [s.rows], (rows): number => rows.length],
-        scoutCount: [(s) => [s.availableScouts], (availableScouts): number => availableScouts.length],
+        totalCount: [(s) => [s.rows], (rows: ScoutEmissionRow[]): number => rows.length],
+        scoutCount: [
+            (s) => [s.availableScouts],
+            (
+                availableScouts: {
+                    count: number
+                    label: string
+                    skillName: string
+                }[]
+            ): number => availableScouts.length,
+        ],
         latestEmittedAt: [
             (s) => [s.rows],
-            (rows): string | null => {
+            (rows: ScoutEmissionRow[]): string | null => {
                 let latest: string | null = null
                 for (const row of rows) {
                     const at = row.emission.emitted_at
@@ -233,7 +374,12 @@ export const findingsLogic = kea<findingsLogicType>([
         // `!emissionsLoading` guard suppresses poll flicker once findings are in hand.
         hasLoadedOnce: [
             (s) => [s.runsWindowLoadedOnce, s.emittedRuns, s.emissionsLoading, s.emissions],
-            (runsWindowLoadedOnce, emittedRuns: SignalScoutRunSummary[], emissionsLoading, emissions): boolean =>
+            (
+                runsWindowLoadedOnce: boolean,
+                emittedRuns: SignalScoutRunSummary[],
+                emissionsLoading: boolean,
+                emissions: SignalScoutEmission[]
+            ): boolean =>
                 runsWindowLoadedOnce && (emittedRuns.length === 0 || !emissionsLoading || emissions.length > 0),
         ],
     }),
diff --git a/frontend/src/scenes/inbox/logics/inboxBulkActionsLogic.ts b/frontend/src/scenes/inbox/logics/inboxBulkActionsLogic.ts
index 7e2fa8baf136..219a473565d1 100644
--- a/frontend/src/scenes/inbox/logics/inboxBulkActionsLogic.ts
+++ b/frontend/src/scenes/inbox/logics/inboxBulkActionsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers, selectors } from 'kea'
 
 import { lemonToast } from '@posthog/lemon-ui'
 
@@ -6,7 +6,6 @@ import api from 'lib/api'
 
 import { captureInboxReportAction } from '../inboxAnalytics'
 import type { DismissalReasonValue } from '../utils/dismissalReasons'
-import type { inboxBulkActionsLogicType } from './inboxBulkActionsLogicType'
 
 /** Tally of a bulk operation that ran one request per selected report. */
 interface BulkActionResult {
@@ -23,6 +22,67 @@ function formatDismissSummary(result: BulkActionResult): string {
     return `${successCount} ${pluralized} dismissed, ${failureCount} failed`
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface inboxBulkActionsLogicValues {
+    hasSelection: boolean
+    isDismissing: boolean
+    selectedCount: number
+    selectedReportIds: string[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface inboxBulkActionsLogicActions {
+    bulkDismiss: (
+        reason: DismissalReasonValue,
+        note: string
+    ) => {
+        note: string
+        reason:
+            | 'already_fixed'
+            | 'analysis_wrong'
+            | 'other'
+            | 'report_unclear'
+            | 'wontfix_intentional'
+            | 'wontfix_irrelevant'
+    }
+    bulkDismissFailure: () => {
+        value: true
+    }
+    bulkDismissSuccess: () => {
+        value: true
+    }
+    clearSelection: () => {
+        value: true
+    }
+    reportArchived: () => {
+        value: true
+    }
+    selectAll: (reportIds: string[]) => {
+        reportIds: string[]
+    }
+    setSelectedReportIds: (reportIds: string[]) => {
+        reportIds: string[]
+    }
+    toggleReportSelection: (reportId: string) => {
+        reportId: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface inboxBulkActionsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        selectedCount: (selectedReportIds: string[]) => number
+        hasSelection: (selectedReportIds: string[]) => boolean
+    }
+}
+
+export type inboxBulkActionsLogicType = MakeLogicType<
+    inboxBulkActionsLogicValues,
+    inboxBulkActionsLogicActions,
+    Record<string, any>,
+    inboxBulkActionsLogicMeta
+>
+
 /**
  * Multi-select + bulk dismiss for the inbox report list. Mirrors desktop
  * `inboxReportSelectionStore` (selection state) and `useInboxBulkActions`
diff --git a/frontend/src/scenes/inbox/logics/inboxFiltersLogic.ts b/frontend/src/scenes/inbox/logics/inboxFiltersLogic.ts
index 028a90f8b41d..a34a9b3556e3 100644
--- a/frontend/src/scenes/inbox/logics/inboxFiltersLogic.ts
+++ b/frontend/src/scenes/inbox/logics/inboxFiltersLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 
@@ -8,7 +8,6 @@ import { urls } from 'scenes/urls'
 
 import { INBOX_PRIORITY_OPTIONS, INBOX_SORT_OPTIONS, INBOX_SOURCE_OPTIONS } from '../filterOptions'
 import { INBOX_SCOPE_FOR_YOU, InboxScope, SignalReportPriority } from '../types'
-import type { inboxFiltersLogicType } from './inboxFiltersLogicType'
 
 /** A teammate who can be scoped to / suggested as a reviewer. Matches the `available_reviewers` API row. */
 export interface InboxReviewerOption {
@@ -142,6 +141,102 @@ export function buildSignalReportListOrdering(field: InboxSortField, direction:
     return field === 'updated_at' ? `${fieldKey},status` : `${fieldKey},status,-updated_at`
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface inboxFiltersLogicValues {
+    availableReviewers: InboxReviewerOption[]
+    availableReviewersLoading: boolean
+    hasActiveFilters: boolean
+    hasUserChosenScope: boolean
+    priorityFilter: SignalReportPriority[]
+    scope: InboxScope
+    searchQuery: string
+    sortDirection: InboxSortDirection
+    sortField: InboxSortField
+    sourceProductFilter: string[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface inboxFiltersLogicActions {
+    applyDefaultScope: (scope: InboxScope) => {
+        scope: InboxScope
+    }
+    clearFilters: () => {
+        value: true
+    }
+    loadAvailableReviewers: ({ query }?: { query?: string }) => {
+        query?: string
+    }
+    loadAvailableReviewersFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAvailableReviewersSuccess: (
+        availableReviewers: {
+            email: string
+            name: string
+            user_uuid: string
+        }[],
+        payload?: {
+            query?: string
+        }
+    ) => {
+        availableReviewers: {
+            email: string
+            name: string
+            user_uuid: string
+        }[]
+        payload?: {
+            query?: string
+        }
+    }
+    searchAvailableReviewers: (query: string) => {
+        query: string
+    }
+    setFilters: (filters: InboxFilterState) => {
+        filters: InboxFilterState
+    }
+    setScope: (scope: InboxScope) => {
+        scope: InboxScope
+    }
+    setSearchQuery: (searchQuery: string) => {
+        searchQuery: string
+    }
+    setSort: (
+        field: InboxSortField,
+        direction: InboxSortDirection
+    ) => {
+        direction: InboxSortDirection
+        field: InboxSortField
+    }
+    togglePriority: (priority: SignalReportPriority) => {
+        priority: SignalReportPriority
+    }
+    toggleSourceProduct: (source: string) => {
+        source: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface inboxFiltersLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        hasActiveFilters: (
+            searchQuery: string,
+            sourceProductFilter: string[],
+            priorityFilter: SignalReportPriority[]
+        ) => boolean
+    }
+}
+
+export type inboxFiltersLogicType = MakeLogicType<
+    inboxFiltersLogicValues,
+    inboxFiltersLogicActions,
+    Record<string, any>,
+    inboxFiltersLogicMeta
+>
+
 /**
  * Persisted inbox filter state. Mirrors desktop's zustand stores:
  * - `inboxReviewerScopeStore` → `scope` (persisted, default "for-you")
@@ -272,7 +367,7 @@ export const inboxFiltersLogic = kea<inboxFiltersLogicType>([
         // reports the way search/source/priority do, and `clearFilters` leaves them untouched.
         hasActiveFilters: [
             (s) => [s.searchQuery, s.sourceProductFilter, s.priorityFilter],
-            (searchQuery, sourceProductFilter, priorityFilter): boolean =>
+            (searchQuery: string, sourceProductFilter: string[], priorityFilter: SignalReportPriority[]): boolean =>
                 searchQuery.trim().length > 0 || sourceProductFilter.length > 0 || priorityFilter.length > 0,
         ],
     }),
diff --git a/frontend/src/scenes/inbox/logics/inboxOnboardingLogic.ts b/frontend/src/scenes/inbox/logics/inboxOnboardingLogic.ts
index 80454f8caa65..ec857e3fa0e6 100644
--- a/frontend/src/scenes/inbox/logics/inboxOnboardingLogic.ts
+++ b/frontend/src/scenes/inbox/logics/inboxOnboardingLogic.ts
@@ -1,7 +1,7 @@
-import { actions, connect, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, path, reducers, selectors } from 'kea'
 
 import { signalSourcesLogic } from '../signalSourcesLogic'
-import type { inboxOnboardingLogicType } from './inboxOnboardingLogicType'
+import type { SignalScoutConfig, SignalSourceConfig } from '../types'
 import { INBOX_FLAT_TAB_LIST_PARAMS, reportListLogic } from './reportListLogic'
 import { scoutFleetLogic } from './scoutFleetLogic'
 
@@ -55,6 +55,60 @@ export function computeOnboardingMode({
     return 'takeover'
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface inboxOnboardingLogicValues {
+    pullsCount: number | null // reportListLogic
+    pullsCountLoading: boolean // reportListLogic
+    reportsCount: number | null // reportListLogic
+    reportsCountLoading: boolean // reportListLogic
+    enabledScoutsCount: number // scoutFleetLogic
+    scoutConfigs: SignalScoutConfig[] | null // scoutFleetLogic
+    enabledSourcesCount: number // signalSourcesLogic
+    sourceConfigs: SignalSourceConfig[] | null // signalSourcesLogic
+    areCountsResolved: boolean
+    bannerDismissed: boolean
+    hasExistingWork: boolean
+    isSelfDrivingSetUp: boolean
+    isSetupLoaded: boolean
+    onboardingMode: InboxOnboardingMode
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface inboxOnboardingLogicActions {
+    dismissBanner: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface inboxOnboardingLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        isSelfDrivingSetUp: (enabledSourcesCount: number, enabledScoutsCount: number) => boolean
+        isSetupLoaded: (sourceConfigs: SignalSourceConfig[] | null, scoutConfigs: SignalScoutConfig[] | null) => boolean
+        areCountsResolved: (
+            pullsCount: number | null,
+            reportsCount: number | null,
+            pullsCountLoading: boolean,
+            reportsCountLoading: boolean
+        ) => boolean
+        hasExistingWork: (pullsCount: number | null, reportsCount: number | null) => boolean
+        onboardingMode: (
+            isSetupLoaded: boolean,
+            isSelfDrivingSetUp: boolean,
+            areCountsResolved: boolean,
+            hasExistingWork: boolean,
+            bannerDismissed: boolean
+        ) => InboxOnboardingMode
+    }
+}
+
+export type inboxOnboardingLogicType = MakeLogicType<
+    inboxOnboardingLogicValues,
+    inboxOnboardingLogicActions,
+    Record<string, any>,
+    inboxOnboardingLogicMeta
+>
+
 /**
  * Decides how the single-command self-driving onboarding presents itself. There are no in-app
  * setup steps – the user runs one wizard command in their repo – so "set up" is read straight
@@ -104,33 +158,43 @@ export const inboxOnboardingLogic = kea<inboxOnboardingLogicType>([
     selectors({
         isSelfDrivingSetUp: [
             (s) => [s.enabledSourcesCount, s.enabledScoutsCount],
-            (enabledSourcesCount, enabledScoutsCount): boolean => enabledSourcesCount + enabledScoutsCount > 0,
+            (enabledSourcesCount: number, enabledScoutsCount: number): boolean =>
+                enabledSourcesCount + enabledScoutsCount > 0,
         ],
         // Both source + scout config loaders have settled, so the set-up verdict is trustworthy.
         isSetupLoaded: [
             (s) => [s.sourceConfigs, s.scoutConfigs],
-            (sourceConfigs, scoutConfigs): boolean => sourceConfigs !== null && scoutConfigs !== null,
+            (
+                sourceConfigs: import('../types').SignalSourceConfig[] | null,
+                scoutConfigs: import('../types').SignalScoutConfig[] | null
+            ): boolean => sourceConfigs !== null && scoutConfigs !== null,
         ],
         // Counts are "resolved" once both limit=1 requests have returned, OR once neither is still
         // loading (so a failed count request can't strand the onboarding on the loading state – this
         // is only consulted after the configs have loaded, by which point the counts have started).
         areCountsResolved: [
             (s) => [s.pullsCount, s.reportsCount, s.pullsCountLoading, s.reportsCountLoading],
-            (pullsCount, reportsCount, pullsCountLoading, reportsCountLoading): boolean =>
+            (
+                pullsCount: number | null,
+                reportsCount: number | null,
+                pullsCountLoading: boolean,
+                reportsCountLoading: boolean
+            ): boolean =>
                 (pullsCount !== null && reportsCount !== null) || (!pullsCountLoading && !reportsCountLoading),
         ],
         hasExistingWork: [
             (s) => [s.pullsCount, s.reportsCount],
-            (pullsCount, reportsCount): boolean => (pullsCount ?? 0) + (reportsCount ?? 0) > 0,
+            (pullsCount: number | null, reportsCount: number | null): boolean =>
+                (pullsCount ?? 0) + (reportsCount ?? 0) > 0,
         ],
         onboardingMode: [
             (s) => [s.isSetupLoaded, s.isSelfDrivingSetUp, s.areCountsResolved, s.hasExistingWork, s.bannerDismissed],
             (
-                isSetupLoaded,
-                isSelfDrivingSetUp,
-                areCountsResolved,
-                hasExistingWork,
-                bannerDismissed
+                isSetupLoaded: boolean,
+                isSelfDrivingSetUp: boolean,
+                areCountsResolved: boolean,
+                hasExistingWork: boolean,
+                bannerDismissed: boolean
             ): InboxOnboardingMode =>
                 computeOnboardingMode({
                     isSetupLoaded,
diff --git a/frontend/src/scenes/inbox/logics/inboxReportDetailLogic.ts b/frontend/src/scenes/inbox/logics/inboxReportDetailLogic.ts
index d24877389c10..9178cb51e365 100644
--- a/frontend/src/scenes/inbox/logics/inboxReportDetailLogic.ts
+++ b/frontend/src/scenes/inbox/logics/inboxReportDetailLogic.ts
@@ -1,4 +1,16 @@
-import { actions, afterMount, kea, key, listeners, path, props, propsChanged, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    afterMount,
+    kea,
+    key,
+    listeners,
+    path,
+    props,
+    propsChanged,
+    reducers,
+    selectors,
+} from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -13,6 +25,7 @@ import { signalsReportsSignalsRetrieve } from 'products/signals/frontend/generat
 import { signalsReportArtefactsDiff } from 'products/signals/frontend/generated/api'
 import type { CommitDiffResponseApi } from 'products/signals/frontend/generated/api.schemas'
 
+import type { SignalNodeApi } from '../../../../../products/signals/frontend/generated/api.schemas'
 import {
     deriveTaskPurpose,
     PURPOSE_ORDER,
@@ -31,7 +44,6 @@ import {
     SignalReportArtefactResponse,
     SignalReportStatus,
 } from '../types'
-import type { inboxReportDetailLogicType } from './inboxReportDetailLogicType'
 
 /** Run statuses that count as terminal. Mirrors desktop `isTerminalStatus` / `ReportTasksSection`. */
 const TERMINAL_RUN_STATUSES: TaskRunStatus[] = [TaskRunStatus.COMPLETED, TaskRunStatus.FAILED, TaskRunStatus.CANCELLED]
@@ -88,6 +100,196 @@ function latestJudgmentExplanation(
     return typeof explanation === 'string' && explanation.trim() ? explanation : null
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface inboxReportDetailLogicValues {
+    actionabilityExplanation: string | null
+    addReviewerOptions: AvailableReviewerOption[]
+    availableReviewers: AvailableReviewerOption[] | null
+    availableReviewersLoading: boolean
+    diffArtefactId: string | null
+    displayReviewers: EnrichedReviewer[] | null
+    expandedTaskIds: string[]
+    isReResearch: boolean
+    isReportActive: boolean
+    isUpdatingReviewers: boolean
+    latestCommitArtefact: SignalReportArtefact | null
+    optimisticReviewers: EnrichedReviewer[] | null
+    primaryTask: ReportTaskEntry | null
+    priorityExplanation: string | null
+    report: SignalReport | null
+    reportArtefacts: SignalReportArtefact[] | null
+    reportArtefactsLoading: boolean
+    reportDiff: CommitDiffResponseApi | null
+    reportDiffError: string | null
+    reportDiffLoading: boolean
+    reportReviewers: EnrichedReviewer[] | null
+    reportSignals: SignalNode[] | null
+    reportSignalsLoading: boolean
+    reportTasks: ReportTaskEntry[] | null
+    reportTasksLoading: boolean
+    selectedTask: ReportTaskEntry | null
+    selectedTaskId: string | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface inboxReportDetailLogicActions {
+    loadAvailableReviewers: ({ query }?: { query?: string }) => {
+        query?: string
+    }
+    loadAvailableReviewersFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAvailableReviewersSuccess: (
+        availableReviewers: {
+            email: string
+            name: string
+            user_uuid: string
+        }[],
+        payload?: {
+            query?: string
+        }
+    ) => {
+        availableReviewers: {
+            email: string
+            name: string
+            user_uuid: string
+        }[]
+        payload?: {
+            query?: string
+        }
+    }
+    loadReportArtefacts: () => any
+    loadReportArtefactsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadReportArtefactsSuccess: (
+        reportArtefacts: SignalReportArtefact[],
+        payload?: any
+    ) => {
+        reportArtefacts: SignalReportArtefact[]
+        payload?: any
+    }
+    loadReportDiff: ({ artefactId }: { artefactId: string }) => {
+        artefactId: string
+    }
+    loadReportDiffFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadReportDiffSuccess: (
+        reportDiff: CommitDiffResponseApi | null,
+        payload?: {
+            artefactId: string
+        }
+    ) => {
+        reportDiff: CommitDiffResponseApi | null
+        payload?: {
+            artefactId: string
+        }
+    }
+    loadReportSignals: () => any
+    loadReportSignalsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadReportSignalsSuccess: (
+        reportSignals: SignalNodeApi[],
+        payload?: any
+    ) => {
+        reportSignals: SignalNodeApi[]
+        payload?: any
+    }
+    loadReportTasks: () => any
+    loadReportTasksFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadReportTasksSuccess: (
+        reportTasks: ReportTaskEntry[],
+        payload?: any
+    ) => {
+        reportTasks: ReportTaskEntry[]
+        payload?: any
+    }
+    searchAvailableReviewers: (query: string) => {
+        query: string
+    }
+    setOptimisticReviewers: (reviewers: EnrichedReviewer[] | null) => {
+        reviewers: EnrichedReviewer[] | null
+    }
+    setReport: (report: SignalReport | null) => {
+        report: SignalReport | null
+    }
+    setSelectedTaskId: (taskId: string | null) => {
+        taskId: string | null
+    }
+    toggleExpandedTask: (taskId: string) => {
+        taskId: string
+    }
+    updateReviewers: (
+        artefactId: string,
+        content: Record<string, string>[],
+        optimistic: EnrichedReviewer[]
+    ) => {
+        artefactId: string
+        content: Record<string, string>[]
+        optimistic: EnrichedReviewer[]
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface inboxReportDetailLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        isUpdatingReviewers: (optimisticReviewers: EnrichedReviewer[] | null) => boolean
+        reportReviewers: (reportArtefacts: SignalReportArtefact[] | null) => EnrichedReviewer[] | null
+        isReportActive: (report: SignalReport | null) => boolean
+        latestCommitArtefact: (reportArtefacts: SignalReportArtefact[] | null) => SignalReportArtefact | null
+        priorityExplanation: (reportArtefacts: SignalReportArtefact[] | null) => string | null
+        actionabilityExplanation: (reportArtefacts: SignalReportArtefact[] | null) => string | null
+        displayReviewers: (
+            reportReviewers: EnrichedReviewer[] | null,
+            optimisticReviewers: EnrichedReviewer[] | null,
+            user: null | import('../../../types').UserType
+        ) => EnrichedReviewer[] | null
+        addReviewerOptions: (
+            availableReviewers: AvailableReviewerOption[] | null,
+            user: null | import('../../../types').UserType
+        ) => AvailableReviewerOption[]
+        isReResearch: (reportTasks: ReportTaskEntry[] | null) => boolean
+        primaryTask: (reportTasks: ReportTaskEntry[] | null) => ReportTaskEntry | null
+        selectedTask: (
+            reportTasks: ReportTaskEntry[] | null,
+            selectedTaskId: string | null,
+            primaryTask: ReportTaskEntry | null
+        ) => ReportTaskEntry | null
+    }
+}
+
+export type inboxReportDetailLogicType = MakeLogicType<
+    inboxReportDetailLogicValues,
+    inboxReportDetailLogicActions,
+    InboxReportDetailLogicProps,
+    inboxReportDetailLogicMeta
+>
+
 /**
  * Per-selected-report detail logic: artefacts, contributing signals, suggested reviewers, and linked tasks.
  * Keyed by `reportId` so each open report gets its own mounted instance. Does NOT import `inboxSceneLogic`
@@ -283,7 +485,10 @@ export const inboxReportDetailLogic = kea<inboxReportDetailLogicType>([
     selectors({
         // Mirrors the optimistic override lifecycle: an update is in flight exactly while the
         // optimistic list is set (cleared once the reload lands or the update fails).
-        isUpdatingReviewers: [(s) => [s.optimisticReviewers], (optimisticReviewers) => optimisticReviewers !== null],
+        isUpdatingReviewers: [
+            (s) => [s.optimisticReviewers],
+            (optimisticReviewers: EnrichedReviewer[] | null) => optimisticReviewers !== null,
+        ],
         reportReviewers: [
             (s) => [s.reportArtefacts],
             (reportArtefacts: SignalReportArtefact[] | null): EnrichedReviewer[] | null => {
diff --git a/frontend/src/scenes/inbox/logics/inboxUsageLogic.ts b/frontend/src/scenes/inbox/logics/inboxUsageLogic.ts
index fb5f10e37ce7..1cc6a2aa3050 100644
--- a/frontend/src/scenes/inbox/logics/inboxUsageLogic.ts
+++ b/frontend/src/scenes/inbox/logics/inboxUsageLogic.ts
@@ -1,5 +1,6 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 
 import { FEATURE_FLAGS } from 'lib/constants'
@@ -14,8 +15,9 @@ import { BillingProductV2Type } from '~/types'
 import { signalsReportsRefundSummaryRetrieve } from 'products/signals/frontend/generated/api'
 import type { SignalReportRefundSummaryResponseApi } from 'products/signals/frontend/generated/api.schemas'
 
+import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
+import type { BillingType } from '../../../types'
 import { inboxBulkActionsLogic } from './inboxBulkActionsLogic'
-import type { inboxUsageLogicType } from './inboxUsageLogicType'
 
 // The inbox/signals billing product type (a flat per-PR credit charge). This is the identifier
 // billing uses everywhere — it's also the key into `custom_limits_usd` — so we match on it rather
@@ -37,6 +39,183 @@ function perCreditUsd(product: BillingProductV2Type): number | null {
     return product.unit_amount_usd ? parseFloat(product.unit_amount_usd) : null
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface inboxUsageLogicValues {
+    billing: BillingType | null // billingLogic
+    billingLoading: boolean // billingLogic
+    canAccessBilling: boolean // billingLogic
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    currentTeamId: number | null // teamLogic
+    creditsPerPr: number | null
+    customLimitUsd: number | null
+    estimatedBudgetUsd: number | null
+    freePrs: number
+    isLimitFormSubmitting: boolean
+    isLimitFormValid: boolean
+    isLoading: boolean
+    isModalOpen: boolean
+    isSubscribed: boolean
+    limitForm: {
+        prs: number | null
+    }
+    limitFormAllErrors: Record<string, any>
+    limitFormChanged: boolean
+    limitFormErrors: DeepPartialMap<
+        {
+            prs: number | null
+        },
+        ValidationErrorType
+    >
+    limitFormHasErrors: boolean
+    limitFormManualErrors: Record<string, any>
+    limitFormTouched: boolean
+    limitFormTouches: Record<string, boolean>
+    limitFormValidationErrors: DeepPartialMap<
+        {
+            prs: number | null
+        },
+        ValidationErrorType
+    >
+    limitPrs: number | null
+    percentage: number
+    pricePerPrUsd: number | null
+    product: BillingProductV2Type | null
+    refundSummary: SignalReportRefundSummaryResponseApi | null
+    refundSummaryLoading: boolean
+    resetDate: Dayjs | null
+    showLimitFormErrors: boolean
+    spentUsd: number | null
+    status: InboxUsageStatus
+    usedPrs: number
+    usedPrsDisplay: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface inboxUsageLogicActions {
+    loadBilling: () => any // billingLogic
+    updateBillingLimits: (limits: { [key: string]: number | null }) => {
+        [key: string]: number | null
+    } // billingLogic
+    closeModal: () => {
+        value: true
+    }
+    loadRefundSummary: () => any
+    loadRefundSummaryFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRefundSummarySuccess: (
+        refundSummary: SignalReportRefundSummaryResponseApi | null,
+        payload?: any
+    ) => {
+        refundSummary: SignalReportRefundSummaryResponseApi | null
+        payload?: any
+    }
+    openModal: () => {
+        value: true
+    }
+    resetLimitForm: (values?: { prs: number | null }) => {
+        values?: {
+            prs: number | null
+        }
+    }
+    setLimitFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setLimitFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setLimitFormValues: (
+        values: DeepPartial<{
+            prs: number | null
+        }>
+    ) => {
+        values: DeepPartial<{
+            prs: number | null
+        }>
+    }
+    submitLimitForm: () => {
+        value: boolean
+    }
+    submitLimitFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitLimitFormRequest: (limitForm: { prs: number | null }) => {
+        limitForm: {
+            prs: number | null
+        }
+    }
+    submitLimitFormSuccess: (limitForm: { prs: number | null }) => {
+        limitForm: {
+            prs: number | null
+        }
+    }
+    touchLimitFormField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface inboxUsageLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        product: (billing: BillingType | null) => BillingProductV2Type | null
+        isLoading: (
+            billing: BillingType | null,
+            billingLoading: boolean,
+            refundSummary: SignalReportRefundSummaryResponseApi | null,
+            refundSummaryLoading: boolean,
+            featureFlags: FeatureFlagsSet
+        ) => boolean
+        isSubscribed: (product: BillingProductV2Type | null) => boolean
+        creditsPerPr: (product: BillingProductV2Type | null) => number | null
+        pricePerPrUsd: (product: BillingProductV2Type | null, creditsPerPr: number | null) => number | null
+        freePrs: (product: BillingProductV2Type | null, creditsPerPr: number | null) => number
+        usedPrs: (
+            product: BillingProductV2Type | null,
+            creditsPerPr: number | null,
+            refundSummary: SignalReportRefundSummaryResponseApi | null
+        ) => number
+        customLimitUsd: (billing: BillingType | null, product: BillingProductV2Type | null) => number | null
+        limitPrs: (
+            product: BillingProductV2Type | null,
+            creditsPerPr: number | null,
+            customLimitUsd: number | null,
+            pricePerPrUsd: number | null,
+            freePrs: number
+        ) => number | null
+        status: (usedPrs: number, limitPrs: number | null) => InboxUsageStatus
+        usedPrsDisplay: (usedPrs: number, limitPrs: number | null) => number
+        spentUsd: (usedPrs: number, freePrs: number, pricePerPrUsd: number | null) => number | null
+        percentage: (usedPrs: number, limitPrs: number | null, freePrs: number) => number
+        resetDate: (billing: BillingType | null) => Dayjs | null
+        estimatedBudgetUsd: (
+            limitForm: {
+                prs: number | null
+            },
+            pricePerPrUsd: number | null,
+            freePrs: number
+        ) => number | null
+    }
+}
+
+export type inboxUsageLogicType = MakeLogicType<
+    inboxUsageLogicValues,
+    inboxUsageLogicActions,
+    Record<string, any>,
+    inboxUsageLogicMeta
+>
+
 /**
  * Drives the PR-usage widget in the inbox agents rail. Reads the inbox/signals billing product and
  * surfaces usage, limit, and reset date in PRs (the product bills in credits; `display_divisor`
@@ -120,12 +299,18 @@ export const inboxUsageLogic = kea<inboxUsageLogicType>([
     selectors({
         product: [
             (s) => [s.billing],
-            (billing): BillingProductV2Type | null =>
+            (billing: null | import('~/types').BillingType): BillingProductV2Type | null =>
                 billing?.products?.find((p) => p.type === INBOX_PRODUCT_TYPE) ?? null,
         ],
         isLoading: [
             (s) => [s.billing, s.billingLoading, s.refundSummary, s.refundSummaryLoading, s.featureFlags],
-            (billing, billingLoading, refundSummary, refundSummaryLoading, featureFlags): boolean => {
+            (
+                billing: null | import('~/types').BillingType,
+                billingLoading: boolean,
+                refundSummary: SignalReportRefundSummaryResponseApi | null,
+                refundSummaryLoading: boolean,
+                featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet
+            ): boolean => {
                 if (billing === null && billingLoading) {
                     return true
                 }
@@ -138,16 +323,16 @@ export const inboxUsageLogic = kea<inboxUsageLogicType>([
         ],
         // Free plan can't raise the limit past the free allocation — the widget points to
         // billing to upgrade instead of editing a limit.
-        isSubscribed: [(s) => [s.product], (product): boolean => !!product?.subscribed],
+        isSubscribed: [(s) => [s.product], (product: BillingProductV2Type | null): boolean => !!product?.subscribed],
         // Credits per PR — the API's credits → PR divisor. Null means we can't safely show PRs.
         creditsPerPr: [
             (s) => [s.product],
-            (product): number | null =>
+            (product: BillingProductV2Type | null): number | null =>
                 product?.display_divisor && product.display_divisor > 0 ? product.display_divisor : null,
         ],
         pricePerPrUsd: [
             (s) => [s.product, s.creditsPerPr],
-            (product, creditsPerPr): number | null => {
+            (product: BillingProductV2Type | null, creditsPerPr: number | null): number | null => {
                 if (!product || !creditsPerPr) {
                     return null
                 }
@@ -157,12 +342,16 @@ export const inboxUsageLogic = kea<inboxUsageLogicType>([
         ],
         freePrs: [
             (s) => [s.product, s.creditsPerPr],
-            (product, creditsPerPr): number =>
+            (product: BillingProductV2Type | null, creditsPerPr: number | null): number =>
                 product && creditsPerPr ? Math.round(calculateFreeTier(product) / creditsPerPr) : 0,
         ],
         usedPrs: [
             (s) => [s.product, s.creditsPerPr, s.refundSummary],
-            (product, creditsPerPr, refundSummary): number => {
+            (
+                product: BillingProductV2Type | null,
+                creditsPerPr: number | null,
+                refundSummary: SignalReportRefundSummaryResponseApi | null
+            ): number => {
                 if (!product || !creditsPerPr) {
                     return 0
                 }
@@ -179,7 +368,7 @@ export const inboxUsageLogic = kea<inboxUsageLogicType>([
         ],
         customLimitUsd: [
             (s) => [s.billing, s.product],
-            (billing, product): number | null => {
+            (billing: null | import('~/types').BillingType, product: BillingProductV2Type | null): number | null => {
                 if (!product) {
                     return null
                 }
@@ -191,7 +380,13 @@ export const inboxUsageLogic = kea<inboxUsageLogicType>([
         // product's own usage_limit (credits). Null means uncapped.
         limitPrs: [
             (s) => [s.product, s.creditsPerPr, s.customLimitUsd, s.pricePerPrUsd, s.freePrs],
-            (product, creditsPerPr, customLimitUsd, pricePerPrUsd, freePrs): number | null => {
+            (
+                product: BillingProductV2Type | null,
+                creditsPerPr: number | null,
+                customLimitUsd: number | null,
+                pricePerPrUsd: number | null,
+                freePrs: number
+            ): number | null => {
                 if (!product || !creditsPerPr) {
                     return null
                 }
@@ -206,7 +401,7 @@ export const inboxUsageLogic = kea<inboxUsageLogicType>([
         ],
         status: [
             (s) => [s.usedPrs, s.limitPrs],
-            (usedPrs, limitPrs): InboxUsageStatus => {
+            (usedPrs: number, limitPrs: number | null): InboxUsageStatus => {
                 if (limitPrs == null) {
                     return 'normal'
                 }
@@ -222,19 +417,20 @@ export const inboxUsageLogic = kea<inboxUsageLogicType>([
         // Displayed usage caps at the limit — we never show "53 / 50" when usage runs over.
         usedPrsDisplay: [
             (s) => [s.usedPrs, s.limitPrs],
-            (usedPrs, limitPrs): number => (limitPrs != null ? Math.min(usedPrs, limitPrs) : usedPrs),
+            (usedPrs: number, limitPrs: number | null): number =>
+                limitPrs != null ? Math.min(usedPrs, limitPrs) : usedPrs,
         ],
         // USD spent so far this period: PRs beyond the free allowance, at the per-PR price.
         // Null when we can't price a PR (so the widget hides the figure rather than show "$0").
         spentUsd: [
             (s) => [s.usedPrs, s.freePrs, s.pricePerPrUsd],
-            (usedPrs, freePrs, pricePerPrUsd): number | null =>
+            (usedPrs: number, freePrs: number, pricePerPrUsd: number | null): number | null =>
                 pricePerPrUsd == null ? null : Math.max(0, usedPrs - freePrs) * pricePerPrUsd,
         ],
         // Bar fill as a % of the denominator (the limit, or the free allowance when uncapped).
         percentage: [
             (s) => [s.usedPrs, s.limitPrs, s.freePrs],
-            (usedPrs, limitPrs, freePrs): number => {
+            (usedPrs: number, limitPrs: number | null, freePrs: number): number => {
                 const denominator = limitPrs ?? (freePrs || null)
                 if (!denominator) {
                     return 0
@@ -242,11 +438,21 @@ export const inboxUsageLogic = kea<inboxUsageLogicType>([
                 return Math.min(100, Math.round((usedPrs / denominator) * 100))
             },
         ],
-        resetDate: [(s) => [s.billing], (billing): Dayjs | null => billing?.billing_period?.current_period_end ?? null],
+        resetDate: [
+            (s) => [s.billing],
+            (billing: null | import('~/types').BillingType): Dayjs | null =>
+                billing?.billing_period?.current_period_end ?? null,
+        ],
         // USD spend cap implied by the limit currently typed into the modal. Drives the live budget.
         estimatedBudgetUsd: [
             (s) => [s.limitForm, s.pricePerPrUsd, s.freePrs],
-            (limitForm, pricePerPrUsd, freePrs): number | null => {
+            (
+                limitForm: {
+                    prs: number | null
+                },
+                pricePerPrUsd: number | null,
+                freePrs: number
+            ): number | null => {
                 const prs = limitForm?.prs
                 if (pricePerPrUsd == null || prs == null || Number.isNaN(prs)) {
                     return null
diff --git a/frontend/src/scenes/inbox/logics/reportListLogic.ts b/frontend/src/scenes/inbox/logics/reportListLogic.ts
index 7ffcc7dd8f88..46d32e2a95b6 100644
--- a/frontend/src/scenes/inbox/logics/reportListLogic.ts
+++ b/frontend/src/scenes/inbox/logics/reportListLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -6,6 +6,7 @@ import { lemonToast } from '@posthog/lemon-ui'
 import api, { CountedPaginatedResponse } from 'lib/api'
 import { userLogic } from 'scenes/userLogic'
 
+import type { UserType } from '../../../types'
 import { captureInboxReportAction } from '../inboxAnalytics'
 import {
     ACTIONABLE_ACTIONABILITY_VALUES,
@@ -15,10 +16,11 @@ import {
     InboxScope,
     SignalReport,
 } from '../types'
+import type { SignalReportPriority } from '../types'
 import { DismissalReasonValue } from '../utils/dismissalReasons'
 import { inboxBulkActionsLogic } from './inboxBulkActionsLogic'
 import { buildSignalReportListOrdering, inboxFiltersLogic } from './inboxFiltersLogic'
-import type { reportListLogicType } from './reportListLogicType'
+import type { InboxFilterState, InboxSortDirection, InboxSortField } from './inboxFiltersLogic'
 
 const PAGE_SIZE = 50
 
@@ -75,6 +77,170 @@ export function shouldDefaultToEntireProject(input: {
     )
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface reportListLogicValues {
+    hasUserChosenScope: boolean // inboxFiltersLogic
+    priorityFilter: SignalReportPriority[] // inboxFiltersLogic
+    scope: InboxScope // inboxFiltersLogic
+    searchQuery: string // inboxFiltersLogic
+    sortDirection: InboxSortDirection // inboxFiltersLogic
+    sortField: InboxSortField // inboxFiltersLogic
+    sourceProductFilter: string[] // inboxFiltersLogic
+    user: UserType | null // userLogic
+    count: number | null
+    countLoading: boolean
+    hasMore: boolean
+    isLoaded: boolean
+    listApiParams: any
+    reports: SignalReport[]
+    reportsResponse: CountedPaginatedResponse<SignalReport> | null
+    reportsResponseLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface reportListLogicActions {
+    applyDefaultScope: (scope: InboxScope) => {
+        scope: InboxScope
+    } // inboxFiltersLogic
+    clearFilters: () => {
+        value: true
+    } // inboxFiltersLogic
+    setFilters: (filters: InboxFilterState) => {
+        filters: InboxFilterState
+    } // inboxFiltersLogic
+    setScope: (scope: InboxScope) => {
+        scope: InboxScope
+    } // inboxFiltersLogic
+    setSearchQuery: (searchQuery: string) => {
+        searchQuery: string
+    } // inboxFiltersLogic
+    setSort: (
+        field: InboxSortField,
+        direction: InboxSortDirection
+    ) => {
+        direction: InboxSortDirection
+        field: InboxSortField
+    } // inboxFiltersLogic
+    togglePriority: (priority: SignalReportPriority) => {
+        priority: SignalReportPriority
+    } // inboxFiltersLogic
+    toggleSourceProduct: (source: string) => {
+        source: string
+    } // inboxFiltersLogic
+    archiveReport: (
+        reportId: string,
+        reason: DismissalReasonValue,
+        note: string
+    ) => {
+        note: string
+        reason:
+            | 'already_fixed'
+            | 'analysis_wrong'
+            | 'other'
+            | 'report_unclear'
+            | 'wontfix_intentional'
+            | 'wontfix_irrelevant'
+        reportId: string
+    }
+    ensureLoaded: () => {
+        value: true
+    }
+    loadCount: () => any
+    loadCountFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadCountSuccess: (
+        count: number,
+        payload?: any
+    ) => {
+        count: number
+        payload?: any
+    }
+    loadMore: () => {
+        value: true
+    }
+    loadMoreReports: () => any
+    loadMoreReportsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadMoreReportsSuccess: (
+        reportsResponse: {
+            count: number
+            next?: string | null | undefined
+            previous?: string | null | undefined
+            results: SignalReport[]
+        },
+        payload?: any
+    ) => {
+        reportsResponse: {
+            count: number
+            next?: string | null | undefined
+            previous?: string | null | undefined
+            results: SignalReport[]
+        }
+        payload?: any
+    }
+    loadReports: () => any
+    loadReportsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadReportsSuccess: (
+        reportsResponse: CountedPaginatedResponse<SignalReport>,
+        payload?: any
+    ) => {
+        reportsResponse: CountedPaginatedResponse<SignalReport>
+        payload?: any
+    }
+    refresh: () => {
+        value: true
+    }
+    removeReport: (reportId: string) => {
+        reportId: string
+    }
+    restoreReport: (reportId: string) => {
+        reportId: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface reportListLogicMeta {
+    key: 'archived' | 'not-actionable' | 'pulls' | 'reports'
+    __keaTypeGenInternalSelectorTypes: {
+        listApiParams: (
+            searchQuery: string,
+            sortField: InboxSortField,
+            sortDirection: InboxSortDirection,
+            sourceProductFilter: string[],
+            priorityFilter: SignalReportPriority[],
+            scope: InboxScope,
+            user: UserType | null,
+            arg: any
+        ) => any
+        reports: (reportsResponse: CountedPaginatedResponse<SignalReport> | null) => SignalReport[]
+        hasMore: (reportsResponse: CountedPaginatedResponse<SignalReport> | null) => boolean
+        isLoaded: (reportsResponse: CountedPaginatedResponse<SignalReport> | null) => boolean
+    }
+}
+
+export type reportListLogicType = MakeLogicType<
+    reportListLogicValues,
+    reportListLogicActions,
+    ReportListLogicProps,
+    reportListLogicMeta
+>
+
 /**
  * Keyed per-tab report list. Mounted once per flat tab (pulls / reports / not-actionable),
  * each with its own fixed `listParams`, so every tab is its own filtered request with its
@@ -188,7 +354,16 @@ export const reportListLogic = kea<reportListLogicType>([
                 s.user,
                 (_, p) => p.listParams,
             ],
-            (searchQuery, sortField, sortDirection, sourceProductFilter, priorityFilter, scope, user, listParams) => {
+            (
+                searchQuery: string,
+                sortField: import('./inboxFiltersLogic').InboxSortField,
+                sortDirection: import('./inboxFiltersLogic').InboxSortDirection,
+                sourceProductFilter: string[],
+                priorityFilter: import('../types').SignalReportPriority[],
+                scope: InboxScope,
+                user: null | import('../../../types').UserType,
+                listParams
+            ) => {
                 const suggestedReviewer =
                     scope === INBOX_SCOPE_FOR_YOU ? (user?.uuid ?? undefined) : teammateUuidFromScope(scope)
                 return {
@@ -211,7 +386,10 @@ export const reportListLogic = kea<reportListLogicType>([
             (reportsResponse: CountedPaginatedResponse<SignalReport> | null): boolean =>
                 reportsResponse?.next !== null && reportsResponse?.next !== undefined,
         ],
-        isLoaded: [(s) => [s.reportsResponse], (reportsResponse): boolean => reportsResponse !== null],
+        isLoaded: [
+            (s) => [s.reportsResponse],
+            (reportsResponse: CountedPaginatedResponse<SignalReport> | null): boolean => reportsResponse !== null,
+        ],
     }),
 
     listeners(({ actions, values, props }) => ({
diff --git a/frontend/src/scenes/inbox/logics/scoutDetailLogic.ts b/frontend/src/scenes/inbox/logics/scoutDetailLogic.ts
index d6c664bc6ce0..c5dfcd0c3313 100644
--- a/frontend/src/scenes/inbox/logics/scoutDetailLogic.ts
+++ b/frontend/src/scenes/inbox/logics/scoutDetailLogic.ts
@@ -1,4 +1,4 @@
-import { connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { subscriptions } from 'kea-subscriptions'
 
@@ -12,7 +12,7 @@ import {
     SignalScoutEmissionReportLink,
     SignalScoutRunSummary,
 } from '../types'
-import type { scoutDetailLogicType } from './scoutDetailLogicType'
+import type { ScoutRollup } from '../utils/scoutRunsWindow'
 import { scoutFleetLogic } from './scoutFleetLogic'
 
 export interface ScoutDetailLogicProps {
@@ -56,6 +56,121 @@ export interface ScoutEmissionRow {
     report: LinkedSignalReport | null
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface scoutDetailLogicValues {
+    rollups: Map<string, ScoutRollup> // scoutFleetLogic
+    runsWindowComplete: boolean // scoutFleetLogic
+    runsWindowLoadedOnce: boolean // scoutFleetLogic
+    emissionReports: SignalScoutEmissionReportLink[]
+    emissionReportsLoading: boolean
+    emissionRows: ScoutEmissionRow[]
+    emissions: SignalScoutEmission[]
+    emissionsLoadFailed: boolean
+    emissionsLoading: boolean
+    emittedRuns: SignalScoutRunSummary[]
+    emittedRunsKey: string
+    reportBySourceId: Map<string, LinkedSignalReport>
+    reportRows: ScoutReportRow[]
+    scoutReports: SignalReport[]
+    scoutReportsLoading: boolean
+    touchedReports: {
+        action: ScoutReportAction
+        id: string
+    }[]
+    touchedReportsKey: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface scoutDetailLogicActions {
+    loadEmissionReports: () => any
+    loadEmissionReportsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadEmissionReportsSuccess: (
+        emissionReports: SignalScoutEmissionReportLink[],
+        payload?: any
+    ) => {
+        emissionReports: SignalScoutEmissionReportLink[]
+        payload?: any
+    }
+    loadEmissions: () => any
+    loadEmissionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadEmissionsSuccess: (
+        emissions: SignalScoutEmission[],
+        payload?: any
+    ) => {
+        emissions: SignalScoutEmission[]
+        payload?: any
+    }
+    loadScoutReports: () => any
+    loadScoutReportsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadScoutReportsSuccess: (
+        scoutReports: SignalReport[],
+        payload?: any
+    ) => {
+        scoutReports: SignalReport[]
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface scoutDetailLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        emittedRuns: (rollups: Map<string, ScoutRollup>, arg: any) => SignalScoutRunSummary[]
+        emittedRunsKey: (emittedRuns: SignalScoutRunSummary[]) => string
+        reportBySourceId: (emissionReports: SignalScoutEmissionReportLink[]) => Map<string, LinkedSignalReport>
+        touchedReports: (
+            rollups: Map<string, ScoutRollup>,
+            arg: any
+        ) => {
+            action: ScoutReportAction
+            id: string
+        }[]
+        touchedReportsKey: (
+            touchedReports: {
+                action: ScoutReportAction
+                id: string
+            }[]
+        ) => string
+        reportRows: (
+            scoutReports: SignalReport[],
+            touchedReports: {
+                action: ScoutReportAction
+                id: string
+            }[]
+        ) => ScoutReportRow[]
+        emissionRows: (
+            emissions: SignalScoutEmission[],
+            emittedRuns: SignalScoutRunSummary[],
+            reportBySourceId: Map<string, LinkedSignalReport>
+        ) => ScoutEmissionRow[]
+    }
+}
+
+export type scoutDetailLogicType = MakeLogicType<
+    scoutDetailLogicValues,
+    scoutDetailLogicActions,
+    ScoutDetailLogicProps,
+    scoutDetailLogicMeta
+>
+
 /**
  * Per-scout detail logic, keyed by skill_name. Reuses the singleton `scoutFleetLogic`'s
  * runs window (already polled while the detail page is open) to find this scout's emitted
@@ -175,7 +290,10 @@ export const scoutDetailLogic = kea<scoutDetailLogicType>([
         // never touches the shared rollup `runs` the header timeline reads (oldest-first).
         emittedRuns: [
             (s) => [s.rollups, (_, props) => props.skillName],
-            (rollups, skillName): SignalScoutRunSummary[] =>
+            (
+                rollups: Map<string, import('../utils/scoutRunsWindow').ScoutRollup>,
+                skillName
+            ): SignalScoutRunSummary[] =>
                 (rollups.get(skillName)?.runs ?? [])
                     .filter((run) => (run.emitted_count ?? 0) > 0)
                     .sort((a, b) => (b.created_at ?? '').localeCompare(a.created_at ?? ''))
@@ -186,7 +304,7 @@ export const scoutDetailLogic = kea<scoutDetailLogicType>([
         // `emitted_count` so a run that emits more findings while still in progress retriggers.
         emittedRunsKey: [
             (s) => [s.emittedRuns],
-            (emittedRuns): string =>
+            (emittedRuns: SignalScoutRunSummary[]): string =>
                 emittedRuns
                     .map((run) => `${run.run_id}:${run.emitted_count ?? 0}`)
                     .sort()
@@ -197,7 +315,7 @@ export const scoutDetailLogic = kea<scoutDetailLogicType>([
         // exact field the backend reverse-lookup keys on. Findings with a null report are skipped.
         reportBySourceId: [
             (s) => [s.emissionReports],
-            (emissionReports): Map<string, LinkedSignalReport> =>
+            (emissionReports: SignalScoutEmissionReportLink[]): Map<string, LinkedSignalReport> =>
                 new Map(
                     emissionReports
                         .filter((link) => link.report !== null)
@@ -209,7 +327,10 @@ export const scoutDetailLogic = kea<scoutDetailLogicType>([
         // the same report, so a report in both sets reads as "authored".
         touchedReports: [
             (s) => [s.rollups, (_, props) => props.skillName],
-            (rollups, skillName): { id: string; action: ScoutReportAction }[] => {
+            (
+                rollups: Map<string, import('../utils/scoutRunsWindow').ScoutRollup>,
+                skillName
+            ): { id: string; action: ScoutReportAction }[] => {
                 const rollup = rollups.get(skillName)
                 if (!rollup) {
                     return []
@@ -228,7 +349,12 @@ export const scoutDetailLogic = kea<scoutDetailLogicType>([
         // not on every runs-window poll that returns the same runs.
         touchedReportsKey: [
             (s) => [s.touchedReports],
-            (touchedReports): string =>
+            (
+                touchedReports: {
+                    action: ScoutReportAction
+                    id: string
+                }[]
+            ): string =>
                 touchedReports
                     .map(({ id, action }) => `${id}:${action}`)
                     .sort()
@@ -238,7 +364,13 @@ export const scoutDetailLogic = kea<scoutDetailLogicType>([
         // whose report fetch failed (deleted/inaccessible) is skipped.
         reportRows: [
             (s) => [s.scoutReports, s.touchedReports],
-            (scoutReports, touchedReports): ScoutReportRow[] => {
+            (
+                scoutReports: SignalReport[],
+                touchedReports: {
+                    action: ScoutReportAction
+                    id: string
+                }[]
+            ): ScoutReportRow[] => {
                 const actionById = new Map(touchedReports.map(({ id, action }) => [id, action]))
                 return scoutReports
                     .map((report) => {
@@ -253,7 +385,11 @@ export const scoutDetailLogic = kea<scoutDetailLogicType>([
         // report they grouped into (for the "In report" chip), newest first.
         emissionRows: [
             (s) => [s.emissions, s.emittedRuns, s.reportBySourceId],
-            (emissions, emittedRuns, reportBySourceId): ScoutEmissionRow[] => {
+            (
+                emissions: SignalScoutEmission[],
+                emittedRuns: SignalScoutRunSummary[],
+                reportBySourceId: Map<string, LinkedSignalReport>
+            ): ScoutEmissionRow[] => {
                 const runsById = new Map(emittedRuns.map((run) => [run.run_id, run]))
                 return emissions
                     .map((emission) => {
diff --git a/frontend/src/scenes/inbox/logics/scoutFleetLogic.ts b/frontend/src/scenes/inbox/logics/scoutFleetLogic.ts
index be8bb990d9b2..ca210d1924d9 100644
--- a/frontend/src/scenes/inbox/logics/scoutFleetLogic.ts
+++ b/frontend/src/scenes/inbox/logics/scoutFleetLogic.ts
@@ -1,4 +1,4 @@
-import { actions, events, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, events, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 
@@ -26,7 +26,6 @@ import {
     ScoutRollup,
     sortConfigsForDisplay,
 } from '../utils/scoutRunsWindow'
-import type { scoutFleetLogicType } from './scoutFleetLogicType'
 
 // Fleet runs are refetched on a slow cadence so "running now" / recent emissions
 // stay live without hammering the capped runs endpoint (desktop: 60s).
@@ -38,6 +37,189 @@ const RUNS_REFETCH_INTERVAL_MS = 60_000
 const RUNS_PAGE_LIMIT = 100
 const MAX_RUNS_PAGES = 15
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface scoutFleetLogicValues {
+    customScoutCount: number
+    deletingScoutIds: string[]
+    emittedFindingsSummary: {
+        count: number
+        latestAt: string | null
+        scoutCount: number
+    }
+    enabledCount: number
+    expanded: boolean
+    fleetFindingsSummary: FleetFindingsSummaryApi | null
+    fleetFindingsSummaryLoadedOnce: boolean
+    fleetFindingsSummaryLoading: boolean
+    fleetSummary: FleetSummary | null
+    hideDisabled: boolean
+    lastRunAt: string | null
+    rollups: Map<string, ScoutRollup>
+    runningChatPrompt: string | null
+    runsWindow: {
+        complete: boolean
+        runs: SignalScoutRunSummary[]
+    }
+    runsWindowComplete: boolean
+    runsWindowLoadedOnce: boolean
+    runsWindowLoading: boolean
+    scoutBannerMessage: string | null
+    scoutConfigs: SignalScoutConfig[] | null
+    scoutConfigsLoading: boolean
+    scoutMetadata: ScoutMetadataApi | null
+    scoutMetadataLoading: boolean
+    visibleConfigs: SignalScoutConfig[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface scoutFleetLogicActions {
+    deleteScout: (configId: string) => {
+        configId: string
+    }
+    deleteScoutFinished: (configId: string) => {
+        configId: string
+    }
+    loadFleetFindingsSummary: () => any
+    loadFleetFindingsSummaryFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadFleetFindingsSummarySuccess: (
+        fleetFindingsSummary: FleetFindingsSummaryApi | null,
+        payload?: any
+    ) => {
+        fleetFindingsSummary: FleetFindingsSummaryApi | null
+        payload?: any
+    }
+    loadRunsWindow: () => any
+    loadRunsWindowFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRunsWindowSuccess: (
+        runsWindow: {
+            complete: boolean
+            runs: SignalScoutRunSummary[]
+        },
+        payload?: any
+    ) => {
+        runsWindow: {
+            complete: boolean
+            runs: SignalScoutRunSummary[]
+        }
+        payload?: any
+    }
+    loadScoutConfigs: () => any
+    loadScoutConfigsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadScoutConfigsSuccess: (
+        scoutConfigs: SignalScoutConfig[],
+        payload?: any
+    ) => {
+        scoutConfigs: SignalScoutConfig[]
+        payload?: any
+    }
+    loadScoutMetadata: () => any
+    loadScoutMetadataFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadScoutMetadataSuccess: (
+        scoutMetadata: ScoutMetadataApi | null,
+        payload?: any
+    ) => {
+        scoutMetadata: ScoutMetadataApi | null
+        payload?: any
+    }
+    patchScoutConfigLocally: (
+        configId: string,
+        updates: SignalScoutConfigUpdate
+    ) => {
+        configId: string
+        updates: SignalScoutConfigUpdate
+    }
+    removeScoutConfigLocally: (configId: string) => {
+        configId: string
+    }
+    setExpanded: (expanded: boolean) => {
+        expanded: boolean
+    }
+    setHideDisabled: (hideDisabled: boolean) => {
+        hideDisabled: boolean
+    }
+    startRunsPolling: () => {
+        value: true
+    }
+    startScoutChatTask: (
+        prompt: string,
+        taskLabel: string,
+        fallbackTitle: string
+    ) => {
+        fallbackTitle: string
+        prompt: string
+        taskLabel: string
+    }
+    startScoutChatTaskFailure: () => {
+        value: true
+    }
+    startScoutChatTaskSuccess: () => {
+        value: true
+    }
+    stopRunsPolling: () => {
+        value: true
+    }
+    updateScoutConfig: (
+        configId: string,
+        updates: SignalScoutConfigUpdate
+    ) => {
+        configId: string
+        updates: SignalScoutConfigUpdate
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface scoutFleetLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        scoutBannerMessage: (scoutMetadata: ScoutMetadataApi | null) => string | null
+        rollups: (runsWindow: { complete: boolean; runs: SignalScoutRunSummary[] }) => Map<string, ScoutRollup>
+        fleetSummary: (
+            scoutConfigs: SignalScoutConfig[] | null,
+            rollups: Map<string, ScoutRollup>
+        ) => FleetSummary | null
+        enabledCount: (scoutConfigs: SignalScoutConfig[] | null) => number
+        lastRunAt: (scoutConfigs: SignalScoutConfig[] | null) => string | null
+        visibleConfigs: (scoutConfigs: SignalScoutConfig[] | null, hideDisabled: boolean) => SignalScoutConfig[]
+        runsWindowComplete: (runsWindow: { complete: boolean; runs: SignalScoutRunSummary[] }) => boolean
+        emittedFindingsSummary: (fleetFindingsSummary: FleetFindingsSummaryApi | null) => {
+            count: number
+            latestAt: string | null
+            scoutCount: number
+        }
+        customScoutCount: (scoutConfigs: SignalScoutConfig[] | null) => number
+    }
+}
+
+export type scoutFleetLogicType = MakeLogicType<
+    scoutFleetLogicValues,
+    scoutFleetLogicActions,
+    Record<string, any>,
+    scoutFleetLogicMeta
+>
+
 /**
  * Cloud port of desktop's scouts fleet hooks (`useScoutConfigs`, `useScoutRuns`,
  * `useScoutConfigMutations`, `useScoutChatTask`). Owns:
@@ -241,24 +423,26 @@ export const scoutFleetLogic = kea<scoutFleetLogicType>([
         // Editorial alpha/announcement banner from the signals-scout flag, or null when unset.
         scoutBannerMessage: [
             (s) => [s.scoutMetadata],
-            (scoutMetadata): string | null => scoutMetadata?.banner_message ?? null,
+            (scoutMetadata: ScoutMetadataApi | null): string | null => scoutMetadata?.banner_message ?? null,
         ],
         rollups: [
             (s) => [s.runsWindow],
-            (runsWindow): Map<string, ScoutRollup> => computeScoutRollups(runsWindow.runs),
+            (runsWindow: { complete: boolean; runs: SignalScoutRunSummary[] }): Map<string, ScoutRollup> =>
+                computeScoutRollups(runsWindow.runs),
         ],
         fleetSummary: [
             (s) => [s.scoutConfigs, s.rollups],
-            (scoutConfigs, rollups): FleetSummary | null =>
+            (scoutConfigs: SignalScoutConfig[] | null, rollups: Map<string, ScoutRollup>): FleetSummary | null =>
                 scoutConfigs ? computeFleetSummary(scoutConfigs, rollups) : null,
         ],
         enabledCount: [
             (s) => [s.scoutConfigs],
-            (scoutConfigs): number => scoutConfigs?.filter((config) => config.enabled).length ?? 0,
+            (scoutConfigs: SignalScoutConfig[] | null): number =>
+                scoutConfigs?.filter((config) => config.enabled).length ?? 0,
         ],
         lastRunAt: [
             (s) => [s.scoutConfigs],
-            (scoutConfigs): string | null => {
+            (scoutConfigs: SignalScoutConfig[] | null): string | null => {
                 let latest: string | null = null
                 for (const config of scoutConfigs ?? []) {
                     if (config.last_run_at && (!latest || config.last_run_at > latest)) {
@@ -270,12 +454,15 @@ export const scoutFleetLogic = kea<scoutFleetLogicType>([
         ],
         visibleConfigs: [
             (s) => [s.scoutConfigs, s.hideDisabled],
-            (scoutConfigs, hideDisabled): SignalScoutConfig[] => {
+            (scoutConfigs: SignalScoutConfig[] | null, hideDisabled: boolean): SignalScoutConfig[] => {
                 const sorted = sortConfigsForDisplay(scoutConfigs ?? [])
                 return hideDisabled ? sorted.filter((config) => config.enabled) : sorted
             },
         ],
-        runsWindowComplete: [(s) => [s.runsWindow], (runsWindow): boolean => runsWindow.complete],
+        runsWindowComplete: [
+            (s) => [s.runsWindow],
+            (runsWindow: { complete: boolean; runs: SignalScoutRunSummary[] }): boolean => runsWindow.complete,
+        ],
         // Fleet-wide findings tally for the "Scout findings" callout, read from the cheap backend
         // summary rather than the paginated runs window. The backend counts the same capped set the
         // findings page renders (most recent 120 emitted runs in the window), so the callout can't
@@ -292,7 +479,8 @@ export const scoutFleetLogic = kea<scoutFleetLogicType>([
         ],
         customScoutCount: [
             (s) => [s.scoutConfigs],
-            (scoutConfigs): number => scoutConfigs?.filter((config) => config.scout_origin === 'custom').length ?? 0,
+            (scoutConfigs: SignalScoutConfig[] | null): number =>
+                scoutConfigs?.filter((config) => config.scout_origin === 'custom').length ?? 0,
         ],
     }),
 
diff --git a/frontend/src/scenes/inbox/logics/scratchpadLogic.ts b/frontend/src/scenes/inbox/logics/scratchpadLogic.ts
index 7b180a7a3bad..f64ba5d33298 100644
--- a/frontend/src/scenes/inbox/logics/scratchpadLogic.ts
+++ b/frontend/src/scenes/inbox/logics/scratchpadLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { teamLogic } from 'scenes/teamLogic'
@@ -6,8 +6,6 @@ import { teamLogic } from 'scenes/teamLogic'
 import { signalsScoutScratchpadSearch } from 'products/signals/frontend/generated/api'
 import type { ScratchpadEntryApi } from 'products/signals/frontend/generated/api.schemas'
 
-import type { scratchpadLogicType } from './scratchpadLogicType'
-
 // The list view shows two ways to read the fleet's memory: newest-first (the API's
 // native order) or clustered by the key namespace scouts choose (`tags:*`, `dedupe:*`).
 export type ScratchpadGrouping = 'recent' | 'topic'
@@ -42,6 +40,63 @@ export function humanizeNamespace(namespace: string): string {
     return namespace.replace(/[-_]/g, ' ').replace(/\b\w/g, (char) => char.toUpperCase())
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface scratchpadLogicValues {
+    entries: ScratchpadEntryApi[] | null
+    entriesLoading: boolean
+    expandedNamespaces: string[]
+    grouping: ScratchpadGrouping
+    groups: ScratchpadNamespaceGroup[]
+    lastUpdatedAt: string | null
+    loadFailed: boolean
+    searchText: string
+    totalCount: number | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface scratchpadLogicActions {
+    loadEntries: (_payload: void) => void
+    loadEntriesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadEntriesSuccess: (
+        entries: ScratchpadEntryApi[],
+        payload?: void
+    ) => {
+        entries: ScratchpadEntryApi[]
+        payload?: void
+    }
+    setGrouping: (grouping: ScratchpadGrouping) => {
+        grouping: ScratchpadGrouping
+    }
+    setSearchText: (searchText: string) => {
+        searchText: string
+    }
+    toggleNamespace: (namespace: string) => {
+        namespace: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface scratchpadLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        totalCount: (entries: ScratchpadEntryApi[] | null) => number | null
+        lastUpdatedAt: (entries: ScratchpadEntryApi[] | null) => string | null
+        groups: (entries: ScratchpadEntryApi[] | null) => ScratchpadNamespaceGroup[]
+    }
+}
+
+export type scratchpadLogicType = MakeLogicType<
+    scratchpadLogicValues,
+    scratchpadLogicActions,
+    Record<string, any>,
+    scratchpadLogicMeta
+>
+
 /**
  * Read-only view over the scout fleet's durable memory (`SignalScratchpad`). Owns the entry list,
  * the debounced search text (wired straight to the endpoint's `?text=` ILIKE), and the recent /
@@ -105,14 +160,20 @@ export const scratchpadLogic = kea<scratchpadLogicType>([
     }),
 
     selectors({
-        totalCount: [(s) => [s.entries], (entries): number | null => (entries ? entries.length : null)],
+        totalCount: [
+            (s) => [s.entries],
+            (entries: ScratchpadEntryApi[] | null): number | null => (entries ? entries.length : null),
+        ],
         // Entries are newest-first, so the head's timestamp drives the callout's "updated when" hint.
-        lastUpdatedAt: [(s) => [s.entries], (entries): string | null => entries?.[0]?.updated_at ?? null],
+        lastUpdatedAt: [
+            (s) => [s.entries],
+            (entries: ScratchpadEntryApi[] | null): string | null => entries?.[0]?.updated_at ?? null,
+        ],
         // Entries arrive newest-first; preserve that order within each namespace cluster, and order
         // the clusters by their most recently touched entry so the liveliest topic floats to the top.
         groups: [
             (s) => [s.entries],
-            (entries): ScratchpadNamespaceGroup[] => {
+            (entries: ScratchpadEntryApi[] | null): ScratchpadNamespaceGroup[] => {
                 const byNamespace = new Map<string, ScratchpadEntryApi[]>()
                 for (const entry of entries ?? []) {
                     const namespace = scratchpadNamespaceOf(entry.key)
diff --git a/frontend/src/scenes/inbox/logics/signalTeamConfigLogic.ts b/frontend/src/scenes/inbox/logics/signalTeamConfigLogic.ts
index 02a5e1fbb06a..8cdd4362d61a 100644
--- a/frontend/src/scenes/inbox/logics/signalTeamConfigLogic.ts
+++ b/frontend/src/scenes/inbox/logics/signalTeamConfigLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, listeners, path, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -6,7 +6,36 @@ import { lemonToast } from '@posthog/lemon-ui'
 import api from 'lib/api'
 
 import type { SignalTeamConfig } from '../types'
-import type { signalTeamConfigLogicType } from './signalTeamConfigLogicType'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface signalTeamConfigLogicValues {
+    teamConfig: SignalTeamConfig | null
+    teamConfigLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface signalTeamConfigLogicActions {
+    loadTeamConfig: () => any
+    loadTeamConfigFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadTeamConfigSuccess: (
+        teamConfig: SignalTeamConfig,
+        payload?: any
+    ) => {
+        teamConfig: SignalTeamConfig
+        payload?: any
+    }
+    patchTeamConfig: (patch: Partial<SignalTeamConfig>) => {
+        patch: Partial<SignalTeamConfig>
+    }
+}
+
+export type signalTeamConfigLogicType = MakeLogicType<signalTeamConfigLogicValues, signalTeamConfigLogicActions>
 
 /**
  * Team-level Self-driving config (singleton per team). Wraps the
diff --git a/frontend/src/scenes/inbox/logics/userAutonomyLogic.ts b/frontend/src/scenes/inbox/logics/userAutonomyLogic.ts
index 508aa4733149..8e8be375dd43 100644
--- a/frontend/src/scenes/inbox/logics/userAutonomyLogic.ts
+++ b/frontend/src/scenes/inbox/logics/userAutonomyLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, listeners, path, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -6,7 +6,51 @@ import { lemonToast } from '@posthog/lemon-ui'
 import api from 'lib/api'
 
 import type { SignalReportPriority, SignalUserAutonomyConfig } from '../types'
-import type { userAutonomyLogicType } from './userAutonomyLogicType'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface userAutonomyLogicValues {
+    autonomyConfig: SignalUserAutonomyConfig | null
+    autonomyConfigLoading: boolean
+    slackPickersExpanded: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface userAutonomyLogicActions {
+    loadAutonomyConfig: () => any
+    loadAutonomyConfigFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAutonomyConfigSuccess: (
+        autonomyConfig: SignalUserAutonomyConfig | null,
+        payload?: any
+    ) => {
+        autonomyConfig: SignalUserAutonomyConfig | null
+        payload?: any
+    }
+    setAutostartPriority: (priority: SignalReportPriority | null) => {
+        priority: SignalReportPriority | null
+    }
+    setSlackPickersExpanded: (expanded: boolean) => {
+        expanded: boolean
+    }
+    updateSlackNotifications: (updates: {
+        channel?: string | null
+        integrationId?: number | null
+        minPriority?: SignalReportPriority | null
+    }) => {
+        updates: {
+            channel?: string | null | undefined
+            integrationId?: number | null | undefined
+            minPriority?: SignalReportPriority | null | undefined
+        }
+    }
+}
+
+export type userAutonomyLogicType = MakeLogicType<userAutonomyLogicValues, userAutonomyLogicActions>
 
 /**
  * Per-user Self-driving autonomy override. Wraps the `users/@me/signal_autonomy`
diff --git a/frontend/src/scenes/inbox/signalSourcesLogic.ts b/frontend/src/scenes/inbox/signalSourcesLogic.ts
index 436d83f5666a..9fdad9fcb73a 100644
--- a/frontend/src/scenes/inbox/signalSourcesLogic.ts
+++ b/frontend/src/scenes/inbox/signalSourcesLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -13,8 +13,9 @@ import { ExternalDataSource, ExternalDataSourceSchema, RecordingUniversalFilters
 
 import { sourcesDataLogic } from 'products/data_warehouse/frontend/shared/logics/sourcesDataLogic'
 
+import type { PaginatedResponse } from '../../lib/api'
+import type { FeatureFlagsSet } from '../../lib/logic/featureFlagLogic'
 import { captureSignalSourceConnected } from './inboxAnalytics'
-import type { signalSourcesLogicType } from './signalSourcesLogicType'
 import { SignalSourceConfig, SignalSourceConfigStatus, ToggleSignalSourceParams } from './types'
 
 export type DataWarehouseSource = 'Linear' | 'Zendesk' | 'Github' | 'PgAnalyze'
@@ -114,6 +115,1682 @@ function toggleSourceConfigState(
     ]
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface signalSourcesLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    dataWarehouseSources: PaginatedResponse<ExternalDataSource> | null // sourcesDataLogic
+    dataWarehouseSourcesLoading: boolean // sourcesDataLogic
+    conversationsConfig: SignalSourceConfig | null
+    dataSourceSetupProduct: ExternalDataSourceType | null
+    enabledSourcesCount: number
+    errorTrackingIsFullyEnabled: boolean
+    evalReportsConfig: SignalSourceConfig | null
+    githubIssuesConfig: SignalSourceConfig | null
+    hasNoSources: boolean
+    healthChecksConfig: SignalSourceConfig | null
+    isConversationsToggling: boolean
+    isErrorTrackingToggling: boolean
+    isEvalReportsToggling: boolean
+    isGithubIssuesToggling: boolean
+    isHealthChecksToggling: boolean
+    isLinearIssuesToggling: boolean
+    isPgAnalyzeIssuesToggling: boolean
+    isSessionAnalysisRunning: boolean
+    isSessionAnalysisToggling: boolean
+    isZendeskTicketsToggling: boolean
+    linearIssuesConfig: SignalSourceConfig | null
+    pgAnalyzeIssuesConfig: SignalSourceConfig | null
+    sessionAnalysisConfig: SignalSourceConfig | null
+    sessionAnalysisSetupOpen: boolean
+    sourceConfigs: SignalSourceConfig[] | null
+    sourceConfigsLoading: boolean
+    sourcesModalOpen: boolean
+    togglingSourceKeys: Set<string>
+    zendeskTicketsConfig: SignalSourceConfig | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface signalSourcesLogicActions {
+    loadSources: () => {
+        value: true
+    } // sourcesDataLogic
+    clearSessionAnalysisFilters: () => {
+        value: true
+    }
+    closeDataSourceSetup: () => {
+        value: true
+    }
+    closeSessionAnalysisSetup: () => {
+        value: true
+    }
+    closeSourcesModal: () => {
+        value: true
+    }
+    initiateDataWarehouseSourceToggle: (dwSource: DataWarehouseSource) => {
+        dwSource: DataWarehouseSource
+    }
+    loadSourceConfigs: () => any
+    loadSourceConfigsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSourceConfigsSuccess: (
+        sourceConfigs: SignalSourceConfig[],
+        payload?: any
+    ) => {
+        sourceConfigs: SignalSourceConfig[]
+        payload?: any
+    }
+    onDataSourceSetupComplete: (product: ExternalDataSourceType) => {
+        product:
+            | 'ActiveCampaign'
+            | 'AcuityScheduling'
+            | 'Adapty'
+            | 'Adjust'
+            | 'AdobeAnalytics'
+            | 'AdobeCommerce'
+            | 'AdpWorkforceNow'
+            | 'AdRoll'
+            | 'Adyen'
+            | 'AgileCRM'
+            | 'Aha'
+            | 'Ahrefs'
+            | 'AikidoSecurity'
+            | 'Airbyte'
+            | 'Aircall'
+            | 'AirOps'
+            | 'Airtable'
+            | 'Aiven'
+            | 'Akeneo'
+            | 'Algolia'
+            | 'Alguna'
+            | 'AlpacaBrokerAPI'
+            | 'AlphaVantage'
+            | 'AmazonAds'
+            | 'AmazonCloudWatch'
+            | 'AmazonEventBridge'
+            | 'AmazonKinesis'
+            | 'AmazonS3'
+            | 'AmazonSellingPartner'
+            | 'AmazonSNS'
+            | 'AmazonSQS'
+            | 'Amplitude'
+            | 'Anthropic'
+            | 'ApifyDataset'
+            | 'Apollo'
+            | 'Appcues'
+            | 'Appfigures'
+            | 'Appfollow'
+            | 'AppleSearchAds'
+            | 'AppLovin'
+            | 'AppsFlyer'
+            | 'Appstack'
+            | 'Apptivo'
+            | 'Appwrite'
+            | 'Asana'
+            | 'Ashby'
+            | 'AssemblyAI'
+            | 'Attentive'
+            | 'Attio'
+            | 'Auth0'
+            | 'Aviationstack'
+            | 'Aviator'
+            | 'Awin'
+            | 'AwsCloudTrail'
+            | 'AzureBlob'
+            | 'AzureDevOps'
+            | 'AzureTableStorage'
+            | 'Babelforce'
+            | 'Backblaze'
+            | 'BambooHR'
+            | 'Basecamp'
+            | 'Baserow'
+            | 'Baseten'
+            | 'Beamer'
+            | 'BigCommerce'
+            | 'BigMailer'
+            | 'BigQuery'
+            | 'BingAds'
+            | 'Bitly'
+            | 'BlandAI'
+            | 'Blogger'
+            | 'Bluetally'
+            | 'BoldSign'
+            | 'Box'
+            | 'Braintree'
+            | 'Braintrust'
+            | 'Branch'
+            | 'Braze'
+            | 'Breezometer'
+            | 'BreezyHR'
+            | 'Brevo'
+            | 'Brex'
+            | 'BrowseAI'
+            | 'Browserbase'
+            | 'BrowserUse'
+            | 'Bugsnag'
+            | 'BuildBetter'
+            | 'Buildkite'
+            | 'Bunny'
+            | 'Buzzsprout'
+            | 'CalCom'
+            | 'Calendly'
+            | 'CallRail'
+            | 'CampaignManager360'
+            | 'CampaignMonitor'
+            | 'Campayn'
+            | 'Canny'
+            | 'CapsuleCRM'
+            | 'CaptainData'
+            | 'CareQualityCommission'
+            | 'CartCom'
+            | 'CastorEDC'
+            | 'Chameleon'
+            | 'Chargebee'
+            | 'Chargedesk'
+            | 'Chargify'
+            | 'ChartHop'
+            | 'ChartMogul'
+            | 'Chatwoot'
+            | 'CheckoutCom'
+            | 'Chift'
+            | 'Chorus'
+            | 'Churnkey'
+            | 'Cimis'
+            | 'Cin7'
+            | 'CircleCI'
+            | 'CiscoMeraki'
+            | 'Clari'
+            | 'Clarifai'
+            | 'Clazar'
+            | 'Clerk'
+            | 'ClickHouse'
+            | 'ClickUp'
+            | 'Clockify'
+            | 'Clockodo'
+            | 'Close'
+            | 'Cloudbeds'
+            | 'Cloudflare'
+            | 'Coassemble'
+            | 'CockroachDB'
+            | 'Coda'
+            | 'Codefresh'
+            | 'Cody'
+            | 'Cohere'
+            | 'CoinApi'
+            | 'CoinGecko'
+            | 'CoinMarketCap'
+            | 'Commercetools'
+            | 'Concord'
+            | 'ConfigCat'
+            | 'Confluence'
+            | 'ConstantContact'
+            | 'ConvertKit'
+            | 'Convex'
+            | 'Copper'
+            | 'CosmosDB'
+            | 'Couchbase'
+            | 'Coupa'
+            | 'Criteo'
+            | 'Crunchbase'
+            | 'CultureAmp'
+            | 'Cursor'
+            | 'Curve'
+            | 'Custom'
+            | 'CustomerIO'
+            | 'Customerly'
+            | 'Databricks'
+            | 'Datadog'
+            | 'Datascope'
+            | 'Datorama'
+            | 'Db2'
+            | 'Dbt'
+            | 'Decagon'
+            | 'Deel'
+            | 'Deepgram'
+            | 'Delighted'
+            | 'DenoDeploy'
+            | 'Deputy'
+            | 'DevinAI'
+            | 'DigitalOcean'
+            | 'DingConnect'
+            | 'DisplayVideo360'
+            | 'Dixa'
+            | 'Dockerhub'
+            | 'Docuseal'
+            | 'Docusign'
+            | 'DoIt'
+            | 'Dolibarr'
+            | 'Dremio'
+            | 'Drip'
+            | 'Dropbox'
+            | 'DropboxSign'
+            | 'Dub'
+            | 'Dwolla'
+            | 'Dynamics365'
+            | 'DynamoDB'
+            | 'E2B'
+            | 'Easypost'
+            | 'Easypromos'
+            | 'Ebay'
+            | 'EConomic'
+            | 'Elasticemail'
+            | 'Elasticsearch'
+            | 'ElevenLabs'
+            | 'Eloqua'
+            | 'EmailOctopus'
+            | 'EmploymentHero'
+            | 'Encharge'
+            | 'Eventbrite'
+            | 'Eventee'
+            | 'Eventzilla'
+            | 'Everhour'
+            | 'ExchangeRatesApi'
+            | 'Expensify'
+            | 'EZOfficeInventory'
+            | 'FacebookPages'
+            | 'Factorial'
+            | 'Fastbill'
+            | 'Fastly'
+            | 'Fauna'
+            | 'Feishu'
+            | 'Fillout'
+            | 'Finage'
+            | 'FinancialModelling'
+            | 'Finnhub'
+            | 'Finnworlds'
+            | 'Fintoc'
+            | 'Firebase'
+            | 'Firebolt'
+            | 'Firecrawl'
+            | 'FireHydrant'
+            | 'FireworksAI'
+            | 'Fleetio'
+            | 'Flexmail'
+            | 'Flexport'
+            | 'FloatApp'
+            | 'Flowlu'
+            | 'FlyIo'
+            | 'Formbricks'
+            | 'FreeAgent'
+            | 'Freightview'
+            | 'FreshBooks'
+            | 'Freshcaller'
+            | 'Freshchat'
+            | 'Freshdesk'
+            | 'Freshsales'
+            | 'Freshservice'
+            | 'Front'
+            | 'Fulcrum'
+            | 'FullStory'
+            | 'GainsightPx'
+            | 'Giphy'
+            | 'GitBook'
+            | 'Github'
+            | 'GitLab'
+            | 'Gladly'
+            | 'Glassfrog'
+            | 'Gmail'
+            | 'GNews'
+            | 'GoCardless'
+            | 'Gojiberry'
+            | 'Goldcast'
+            | 'GoLogin'
+            | 'Gong'
+            | 'GoogleAdManager'
+            | 'GoogleAds'
+            | 'GoogleAnalytics'
+            | 'GoogleCalendar'
+            | 'GoogleChat'
+            | 'GoogleClassroom'
+            | 'GoogleCloudStorage'
+            | 'GoogleDirectory'
+            | 'GoogleDrive'
+            | 'GoogleForms'
+            | 'GooglePageSpeedInsights'
+            | 'GoogleSearchConsole'
+            | 'GoogleSheets'
+            | 'GoogleTasks'
+            | 'GoogleWebfonts'
+            | 'GoogleWorkspaceAdminReports'
+            | 'Gorgias'
+            | 'Grafana'
+            | 'Granola'
+            | 'Greenhouse'
+            | 'GreytHr'
+            | 'Gridly'
+            | 'Groq'
+            | 'GrowthBook'
+            | 'Guardian'
+            | 'Gumloop'
+            | 'Guru'
+            | 'Gusto'
+            | 'Harness'
+            | 'Harvey'
+            | 'Hatchet'
+            | 'Healthchecks'
+            | 'Heap'
+            | 'Height'
+            | 'Helicone'
+            | 'Hellobaton'
+            | 'HelpScout'
+            | 'Heroku'
+            | 'Hetzner'
+            | 'Hex'
+            | 'HeyGen'
+            | 'HiBob'
+            | 'HighLevel'
+            | 'Hightouch'
+            | 'HoorayHR'
+            | 'Hubplanner'
+            | 'Hubspot'
+            | 'HuggingFace'
+            | 'Humanitix'
+            | 'Huntr'
+            | 'Hyperspell'
+            | 'Ikas'
+            | 'IlluminaBasespace'
+            | 'Imagga'
+            | 'Impact'
+            | 'IncidentIo'
+            | 'Infisical'
+            | 'Inflowinventory'
+            | 'InforNexus'
+            | 'Inngest'
+            | 'Insightful'
+            | 'Insightly'
+            | 'Instagram'
+            | 'Instantly'
+            | 'Instatus'
+            | 'Intercom'
+            | 'Interzoid'
+            | 'Intruder'
+            | 'Invoiced'
+            | 'Invoiceninja'
+            | 'IP2Whois'
+            | 'Iterable'
+            | 'JamfPro'
+            | 'Jira'
+            | 'Jobber'
+            | 'JobNimbus'
+            | 'Jotform'
+            | 'JudgeMeReviews'
+            | 'JustCall'
+            | 'JustSift'
+            | 'K6Cloud'
+            | 'Kafka'
+            | 'KapaAI'
+            | 'Katana'
+            | 'Keka'
+            | 'Kernel'
+            | 'Kickscale'
+            | 'Kisi'
+            | 'Kissmetrics'
+            | 'Klarna'
+            | 'Klaus'
+            | 'Klaviyo'
+            | 'Knock'
+            | 'Koyeb'
+            | 'Kustomer'
+            | 'KYVE'
+            | 'Lago'
+            | 'LambdaLabs'
+            | 'Langfuse'
+            | 'LangSmith'
+            | 'Lattice'
+            | 'LaunchDarkly'
+            | 'Leadfeeder'
+            | 'Leexi'
+            | 'Lemlist'
+            | 'LemonSqueezy'
+            | 'LessAnnoyingCRM'
+            | 'Lever'
+            | 'Liana'
+            | 'Lightfield'
+            | 'LightspeedRetail'
+            | 'Linear'
+            | 'LingoDev'
+            | 'LinkedinAds'
+            | 'LinkedinPages'
+            | 'Linkrunner'
+            | 'Linnworks'
+            | 'Linode'
+            | 'LlamaCloud'
+            | 'Lob'
+            | 'Lokalise'
+            | 'Looker'
+            | 'Loops'
+            | 'Luma'
+            | 'M3ter'
+            | 'Mailchimp'
+            | 'MailerLite'
+            | 'MailerSend'
+            | 'Mailgun'
+            | 'Mailjet'
+            | 'Mailosaur'
+            | 'Mailtrap'
+            | 'Mantle'
+            | 'Marketo'
+            | 'Marketstack'
+            | 'Matomo'
+            | 'Maxio'
+            | 'Mem0'
+            | 'Mendeley'
+            | 'Mention'
+            | 'MercadoAds'
+            | 'Mercury'
+            | 'Merge'
+            | 'MetaAds'
+            | 'Metabase'
+            | 'Metorial'
+            | 'Metricool'
+            | 'Metriport'
+            | 'Metronome'
+            | 'MicrosoftDataverse'
+            | 'MicrosoftEntraId'
+            | 'MicrosoftLists'
+            | 'MicrosoftTeams'
+            | 'Mintlify'
+            | 'Miro'
+            | 'Missive'
+            | 'MistralAI'
+            | 'MixMax'
+            | 'Mixpanel'
+            | 'Mode'
+            | 'Mollie'
+            | 'Monday'
+            | 'MongoDB'
+            | 'Mono'
+            | 'MSSQL'
+            | 'Mux'
+            | 'MyHours'
+            | 'MySQL'
+            | 'N8n'
+            | 'Nasa'
+            | 'Navan'
+            | 'NebiusAI'
+            | 'Neon'
+            | 'Netlify'
+            | 'NetSuite'
+            | 'NewRelic'
+            | 'NewsApi'
+            | 'NewsData'
+            | 'NewYorkTimes'
+            | 'Nexiopay'
+            | 'NextdoorAds'
+            | 'NinjaOneRMM'
+            | 'NoCRM'
+            | 'Northflank'
+            | 'NorthpassLMS'
+            | 'Notion'
+            | 'Nutshell'
+            | 'Nylas'
+            | 'Okta'
+            | 'Omnisend'
+            | 'Oncehub'
+            | 'OneDrive'
+            | 'OneHundredMs'
+            | 'Onepagecrm'
+            | 'OneSignal'
+            | 'Onfleet'
+            | 'OpenAI'
+            | 'OpenAIAds'
+            | 'OpenAQ'
+            | 'OpenDataDc'
+            | 'OpenExchangeRates'
+            | 'OpenFDA'
+            | 'OpenRouter'
+            | 'OpenWeather'
+            | 'OpinionStage'
+            | 'Opsgenie'
+            | 'Optimizely'
+            | 'OPUSWatch'
+            | 'Oracle'
+            | 'OracleEbs'
+            | 'OracleFusion'
+            | 'Orb'
+            | 'Orbit'
+            | 'Ortto'
+            | 'Oura'
+            | 'Outbrain'
+            | 'Outlook'
+            | 'Outreach'
+            | 'Oveit'
+            | 'PabblySubscriptionsBilling'
+            | 'Paddle'
+            | 'PagerDuty'
+            | 'PandaDoc'
+            | 'Paperform'
+            | 'Papersign'
+            | 'Pardot'
+            | 'Partnerize'
+            | 'PartnerStack'
+            | 'PayFit'
+            | 'Paylocity'
+            | 'PayPal'
+            | 'Paystack'
+            | 'PeecAI'
+            | 'Pendo'
+            | 'Pennylane'
+            | 'Perigon'
+            | 'Perk'
+            | 'PersistIq'
+            | 'Persona'
+            | 'Personio'
+            | 'Pexels'
+            | 'PgAnalyze'
+            | 'Phyllo'
+            | 'Picqer'
+            | 'Pinecone'
+            | 'Pingdom'
+            | 'PinterestAds'
+            | 'Pipedrive'
+            | 'Pipeliner'
+            | 'PivotalTracker'
+            | 'Piwik'
+            | 'Plaid'
+            | 'Plain'
+            | 'PlanetScale'
+            | 'Planhat'
+            | 'PlatformSh'
+            | 'Plausible'
+            | 'Plunk'
+            | 'Pocket'
+            | 'Podium'
+            | 'Polar'
+            | 'Polygon'
+            | 'Poplar'
+            | 'Postgres'
+            | 'Postmark'
+            | 'PrestaShop'
+            | 'Pretix'
+            | 'Primetric'
+            | 'Printify'
+            | 'Productboard'
+            | 'Productive'
+            | 'PromptingCompany'
+            | 'Pylon'
+            | 'PyPI'
+            | 'Qdrant'
+            | 'Qonto'
+            | 'Qualaroo'
+            | 'Qualtrics'
+            | 'QuickBooks'
+            | 'Railz'
+            | 'Ramp'
+            | 'Razorpay'
+            | 'RB2B'
+            | 'RDStationMarketing'
+            | 'Recharge'
+            | 'Recreation'
+            | 'Recruitee'
+            | 'Recurly'
+            | 'Reddit'
+            | 'RedditAds'
+            | 'Redis'
+            | 'Redshift'
+            | 'ReferralHero'
+            | 'Render'
+            | 'RentCast'
+            | 'Repairshopr'
+            | 'Replicate'
+            | 'ReplyIo'
+            | 'Resend'
+            | 'RetailExpress'
+            | 'RetellAI'
+            | 'Retently'
+            | 'RevenueCat'
+            | 'RevolutMerchant'
+            | 'RingCentral'
+            | 'Rippling'
+            | 'RKICovid'
+            | 'Roark'
+            | 'RocketChat'
+            | 'Rocketlane'
+            | 'Rollbar'
+            | 'Rootly'
+            | 'Rss'
+            | 'RudderStack'
+            | 'Ruddr'
+            | 'RunPod'
+            | 'SafetyCulture'
+            | 'SageHR'
+            | 'SageIntacct'
+            | 'Sailthru'
+            | 'Salesflare'
+            | 'Salesforce'
+            | 'SalesforceMarketingCloud'
+            | 'SalesLoft'
+            | 'Sanity'
+            | 'SapConcur'
+            | 'SapErp'
+            | 'SAPFieldglass'
+            | 'SapHana'
+            | 'SapSuccessFactors'
+            | 'SavvyCal'
+            | 'ScaleAI'
+            | 'Scaleway'
+            | 'SearchAds360'
+            | 'Secoda'
+            | 'Segment'
+            | 'SendGrid'
+            | 'Sendowl'
+            | 'SendPulse'
+            | 'Senseforce'
+            | 'Sentry'
+            | 'Serpstat'
+            | 'ServiceNow'
+            | 'SevenShifts'
+            | 'SFTP'
+            | 'SharePoint'
+            | 'Sharetribe'
+            | 'Shippo'
+            | 'ShipStation'
+            | 'Shopify'
+            | 'ShopWired'
+            | 'Shortcut'
+            | 'Shortio'
+            | 'Shutterstock'
+            | 'SigmaComputing'
+            | 'SignNow'
+            | 'SigNoz'
+            | 'Sim'
+            | 'SimFin'
+            | 'SimpleCast'
+            | 'Simplesat'
+            | 'Singular'
+            | 'Skyvern'
+            | 'Slack'
+            | 'Slash'
+            | 'Smaily'
+            | 'SmartEngage'
+            | 'Smartreach'
+            | 'Smartsheet'
+            | 'Smartwaiver'
+            | 'SnapchatAds'
+            | 'Snowflake'
+            | 'SolarwindsServiceDesk'
+            | 'SonarCloud'
+            | 'SparkPost'
+            | 'SplitIo'
+            | 'SpotifyAds'
+            | 'SpotlerCRM'
+            | 'Square'
+            | 'Squarespace'
+            | 'Statsig'
+            | 'Statuspage'
+            | 'Stigg'
+            | 'StockData'
+            | 'Strava'
+            | 'StreamElements'
+            | 'Streamlabs'
+            | 'Stripe'
+            | 'Sumsub'
+            | 'Supabase'
+            | 'Superwall'
+            | 'SurveyMonkey'
+            | 'SurveySparrow'
+            | 'Survicate'
+            | 'Svix'
+            | 'Swonkie'
+            | 'Synthesia'
+            | 'Systeme'
+            | 'Taboola'
+            | 'Talkwalker'
+            | 'Tavus'
+            | 'TawkTo'
+            | 'Teachable'
+            | 'Teamtailor'
+            | 'Teamwork'
+            | 'Telli'
+            | 'Tempo'
+            | 'TemporalIO'
+            | 'TerraApi'
+            | 'Testrail'
+            | 'Thinkific'
+            | 'ThinkificCourses'
+            | 'ThriveLearning'
+            | 'Ticketmaster'
+            | 'TicketTailor'
+            | 'TickTick'
+            | 'TikTokAds'
+            | 'Tile38'
+            | 'Timely'
+            | 'Tinyemail'
+            | 'TMDb'
+            | 'Todoist'
+            | 'TogetherAI'
+            | 'Toggl'
+            | 'TrackPMS'
+            | 'Trello'
+            | 'Tremendous'
+            | 'TriggerDev'
+            | 'TrustPilot'
+            | 'Turso'
+            | 'TVMaze'
+            | 'TwelveData'
+            | 'TwelveLabs'
+            | 'Twenty'
+            | 'Twilio'
+            | 'Twitter'
+            | 'TwitterAds'
+            | 'TyntecSMS'
+            | 'Typeform'
+            | 'Ubidots'
+            | 'Unleash'
+            | 'Unstructured'
+            | 'UpPromote'
+            | 'Upstash'
+            | 'Uptick'
+            | 'USCensus'
+            | 'Uservoice'
+            | 'Vantage'
+            | 'Vapi'
+            | 'Veeqo'
+            | 'Vellum'
+            | 'Vercel'
+            | 'Vespa'
+            | 'VismaEconomic'
+            | 'Vitally'
+            | 'Vultr'
+            | 'VWO'
+            | 'Waiteraid'
+            | 'Wasabi'
+            | 'Watchmode'
+            | 'Webflow'
+            | 'WhenIWork'
+            | 'WikipediaPageviews'
+            | 'Windmill'
+            | 'WooCommerce'
+            | 'Wordpress'
+            | 'Workable'
+            | 'Workday'
+            | 'Workflowmax'
+            | 'WorkOS'
+            | 'Workramp'
+            | 'Wrike'
+            | 'Writesonic'
+            | 'Wufoo'
+            | 'Xero'
+            | 'Xsolla'
+            | 'YahooFinance'
+            | 'YandexMetrica'
+            | 'Ynab'
+            | 'Yotpo'
+            | 'Younium'
+            | 'YouSign'
+            | 'YouTubeAnalytics'
+            | 'YoutubeData'
+            | 'ZapierSupportedStorage'
+            | 'ZapSign'
+            | 'Zellify'
+            | 'Zendesk'
+            | 'ZendeskSell'
+            | 'ZendeskSunshine'
+            | 'Zenefits'
+            | 'Zenloop'
+            | 'Zep'
+            | 'ZohoAnalytics'
+            | 'ZohoBigin'
+            | 'ZohoBilling'
+            | 'ZohoBooks'
+            | 'ZohoCampaign'
+            | 'ZohoCRM'
+            | 'ZohoDesk'
+            | 'ZohoExpense'
+            | 'ZohoInventory'
+            | 'ZohoInvoice'
+            | 'ZonkaFeedback'
+            | 'Zoom'
+            | 'ZoomInfo'
+            | 'Zuora'
+    }
+    openDataSourceSetup: (product: ExternalDataSourceType) => {
+        product:
+            | 'ActiveCampaign'
+            | 'AcuityScheduling'
+            | 'Adapty'
+            | 'Adjust'
+            | 'AdobeAnalytics'
+            | 'AdobeCommerce'
+            | 'AdpWorkforceNow'
+            | 'AdRoll'
+            | 'Adyen'
+            | 'AgileCRM'
+            | 'Aha'
+            | 'Ahrefs'
+            | 'AikidoSecurity'
+            | 'Airbyte'
+            | 'Aircall'
+            | 'AirOps'
+            | 'Airtable'
+            | 'Aiven'
+            | 'Akeneo'
+            | 'Algolia'
+            | 'Alguna'
+            | 'AlpacaBrokerAPI'
+            | 'AlphaVantage'
+            | 'AmazonAds'
+            | 'AmazonCloudWatch'
+            | 'AmazonEventBridge'
+            | 'AmazonKinesis'
+            | 'AmazonS3'
+            | 'AmazonSellingPartner'
+            | 'AmazonSNS'
+            | 'AmazonSQS'
+            | 'Amplitude'
+            | 'Anthropic'
+            | 'ApifyDataset'
+            | 'Apollo'
+            | 'Appcues'
+            | 'Appfigures'
+            | 'Appfollow'
+            | 'AppleSearchAds'
+            | 'AppLovin'
+            | 'AppsFlyer'
+            | 'Appstack'
+            | 'Apptivo'
+            | 'Appwrite'
+            | 'Asana'
+            | 'Ashby'
+            | 'AssemblyAI'
+            | 'Attentive'
+            | 'Attio'
+            | 'Auth0'
+            | 'Aviationstack'
+            | 'Aviator'
+            | 'Awin'
+            | 'AwsCloudTrail'
+            | 'AzureBlob'
+            | 'AzureDevOps'
+            | 'AzureTableStorage'
+            | 'Babelforce'
+            | 'Backblaze'
+            | 'BambooHR'
+            | 'Basecamp'
+            | 'Baserow'
+            | 'Baseten'
+            | 'Beamer'
+            | 'BigCommerce'
+            | 'BigMailer'
+            | 'BigQuery'
+            | 'BingAds'
+            | 'Bitly'
+            | 'BlandAI'
+            | 'Blogger'
+            | 'Bluetally'
+            | 'BoldSign'
+            | 'Box'
+            | 'Braintree'
+            | 'Braintrust'
+            | 'Branch'
+            | 'Braze'
+            | 'Breezometer'
+            | 'BreezyHR'
+            | 'Brevo'
+            | 'Brex'
+            | 'BrowseAI'
+            | 'Browserbase'
+            | 'BrowserUse'
+            | 'Bugsnag'
+            | 'BuildBetter'
+            | 'Buildkite'
+            | 'Bunny'
+            | 'Buzzsprout'
+            | 'CalCom'
+            | 'Calendly'
+            | 'CallRail'
+            | 'CampaignManager360'
+            | 'CampaignMonitor'
+            | 'Campayn'
+            | 'Canny'
+            | 'CapsuleCRM'
+            | 'CaptainData'
+            | 'CareQualityCommission'
+            | 'CartCom'
+            | 'CastorEDC'
+            | 'Chameleon'
+            | 'Chargebee'
+            | 'Chargedesk'
+            | 'Chargify'
+            | 'ChartHop'
+            | 'ChartMogul'
+            | 'Chatwoot'
+            | 'CheckoutCom'
+            | 'Chift'
+            | 'Chorus'
+            | 'Churnkey'
+            | 'Cimis'
+            | 'Cin7'
+            | 'CircleCI'
+            | 'CiscoMeraki'
+            | 'Clari'
+            | 'Clarifai'
+            | 'Clazar'
+            | 'Clerk'
+            | 'ClickHouse'
+            | 'ClickUp'
+            | 'Clockify'
+            | 'Clockodo'
+            | 'Close'
+            | 'Cloudbeds'
+            | 'Cloudflare'
+            | 'Coassemble'
+            | 'CockroachDB'
+            | 'Coda'
+            | 'Codefresh'
+            | 'Cody'
+            | 'Cohere'
+            | 'CoinApi'
+            | 'CoinGecko'
+            | 'CoinMarketCap'
+            | 'Commercetools'
+            | 'Concord'
+            | 'ConfigCat'
+            | 'Confluence'
+            | 'ConstantContact'
+            | 'ConvertKit'
+            | 'Convex'
+            | 'Copper'
+            | 'CosmosDB'
+            | 'Couchbase'
+            | 'Coupa'
+            | 'Criteo'
+            | 'Crunchbase'
+            | 'CultureAmp'
+            | 'Cursor'
+            | 'Curve'
+            | 'Custom'
+            | 'CustomerIO'
+            | 'Customerly'
+            | 'Databricks'
+            | 'Datadog'
+            | 'Datascope'
+            | 'Datorama'
+            | 'Db2'
+            | 'Dbt'
+            | 'Decagon'
+            | 'Deel'
+            | 'Deepgram'
+            | 'Delighted'
+            | 'DenoDeploy'
+            | 'Deputy'
+            | 'DevinAI'
+            | 'DigitalOcean'
+            | 'DingConnect'
+            | 'DisplayVideo360'
+            | 'Dixa'
+            | 'Dockerhub'
+            | 'Docuseal'
+            | 'Docusign'
+            | 'DoIt'
+            | 'Dolibarr'
+            | 'Dremio'
+            | 'Drip'
+            | 'Dropbox'
+            | 'DropboxSign'
+            | 'Dub'
+            | 'Dwolla'
+            | 'Dynamics365'
+            | 'DynamoDB'
+            | 'E2B'
+            | 'Easypost'
+            | 'Easypromos'
+            | 'Ebay'
+            | 'EConomic'
+            | 'Elasticemail'
+            | 'Elasticsearch'
+            | 'ElevenLabs'
+            | 'Eloqua'
+            | 'EmailOctopus'
+            | 'EmploymentHero'
+            | 'Encharge'
+            | 'Eventbrite'
+            | 'Eventee'
+            | 'Eventzilla'
+            | 'Everhour'
+            | 'ExchangeRatesApi'
+            | 'Expensify'
+            | 'EZOfficeInventory'
+            | 'FacebookPages'
+            | 'Factorial'
+            | 'Fastbill'
+            | 'Fastly'
+            | 'Fauna'
+            | 'Feishu'
+            | 'Fillout'
+            | 'Finage'
+            | 'FinancialModelling'
+            | 'Finnhub'
+            | 'Finnworlds'
+            | 'Fintoc'
+            | 'Firebase'
+            | 'Firebolt'
+            | 'Firecrawl'
+            | 'FireHydrant'
+            | 'FireworksAI'
+            | 'Fleetio'
+            | 'Flexmail'
+            | 'Flexport'
+            | 'FloatApp'
+            | 'Flowlu'
+            | 'FlyIo'
+            | 'Formbricks'
+            | 'FreeAgent'
+            | 'Freightview'
+            | 'FreshBooks'
+            | 'Freshcaller'
+            | 'Freshchat'
+            | 'Freshdesk'
+            | 'Freshsales'
+            | 'Freshservice'
+            | 'Front'
+            | 'Fulcrum'
+            | 'FullStory'
+            | 'GainsightPx'
+            | 'Giphy'
+            | 'GitBook'
+            | 'Github'
+            | 'GitLab'
+            | 'Gladly'
+            | 'Glassfrog'
+            | 'Gmail'
+            | 'GNews'
+            | 'GoCardless'
+            | 'Gojiberry'
+            | 'Goldcast'
+            | 'GoLogin'
+            | 'Gong'
+            | 'GoogleAdManager'
+            | 'GoogleAds'
+            | 'GoogleAnalytics'
+            | 'GoogleCalendar'
+            | 'GoogleChat'
+            | 'GoogleClassroom'
+            | 'GoogleCloudStorage'
+            | 'GoogleDirectory'
+            | 'GoogleDrive'
+            | 'GoogleForms'
+            | 'GooglePageSpeedInsights'
+            | 'GoogleSearchConsole'
+            | 'GoogleSheets'
+            | 'GoogleTasks'
+            | 'GoogleWebfonts'
+            | 'GoogleWorkspaceAdminReports'
+            | 'Gorgias'
+            | 'Grafana'
+            | 'Granola'
+            | 'Greenhouse'
+            | 'GreytHr'
+            | 'Gridly'
+            | 'Groq'
+            | 'GrowthBook'
+            | 'Guardian'
+            | 'Gumloop'
+            | 'Guru'
+            | 'Gusto'
+            | 'Harness'
+            | 'Harvey'
+            | 'Hatchet'
+            | 'Healthchecks'
+            | 'Heap'
+            | 'Height'
+            | 'Helicone'
+            | 'Hellobaton'
+            | 'HelpScout'
+            | 'Heroku'
+            | 'Hetzner'
+            | 'Hex'
+            | 'HeyGen'
+            | 'HiBob'
+            | 'HighLevel'
+            | 'Hightouch'
+            | 'HoorayHR'
+            | 'Hubplanner'
+            | 'Hubspot'
+            | 'HuggingFace'
+            | 'Humanitix'
+            | 'Huntr'
+            | 'Hyperspell'
+            | 'Ikas'
+            | 'IlluminaBasespace'
+            | 'Imagga'
+            | 'Impact'
+            | 'IncidentIo'
+            | 'Infisical'
+            | 'Inflowinventory'
+            | 'InforNexus'
+            | 'Inngest'
+            | 'Insightful'
+            | 'Insightly'
+            | 'Instagram'
+            | 'Instantly'
+            | 'Instatus'
+            | 'Intercom'
+            | 'Interzoid'
+            | 'Intruder'
+            | 'Invoiced'
+            | 'Invoiceninja'
+            | 'IP2Whois'
+            | 'Iterable'
+            | 'JamfPro'
+            | 'Jira'
+            | 'Jobber'
+            | 'JobNimbus'
+            | 'Jotform'
+            | 'JudgeMeReviews'
+            | 'JustCall'
+            | 'JustSift'
+            | 'K6Cloud'
+            | 'Kafka'
+            | 'KapaAI'
+            | 'Katana'
+            | 'Keka'
+            | 'Kernel'
+            | 'Kickscale'
+            | 'Kisi'
+            | 'Kissmetrics'
+            | 'Klarna'
+            | 'Klaus'
+            | 'Klaviyo'
+            | 'Knock'
+            | 'Koyeb'
+            | 'Kustomer'
+            | 'KYVE'
+            | 'Lago'
+            | 'LambdaLabs'
+            | 'Langfuse'
+            | 'LangSmith'
+            | 'Lattice'
+            | 'LaunchDarkly'
+            | 'Leadfeeder'
+            | 'Leexi'
+            | 'Lemlist'
+            | 'LemonSqueezy'
+            | 'LessAnnoyingCRM'
+            | 'Lever'
+            | 'Liana'
+            | 'Lightfield'
+            | 'LightspeedRetail'
+            | 'Linear'
+            | 'LingoDev'
+            | 'LinkedinAds'
+            | 'LinkedinPages'
+            | 'Linkrunner'
+            | 'Linnworks'
+            | 'Linode'
+            | 'LlamaCloud'
+            | 'Lob'
+            | 'Lokalise'
+            | 'Looker'
+            | 'Loops'
+            | 'Luma'
+            | 'M3ter'
+            | 'Mailchimp'
+            | 'MailerLite'
+            | 'MailerSend'
+            | 'Mailgun'
+            | 'Mailjet'
+            | 'Mailosaur'
+            | 'Mailtrap'
+            | 'Mantle'
+            | 'Marketo'
+            | 'Marketstack'
+            | 'Matomo'
+            | 'Maxio'
+            | 'Mem0'
+            | 'Mendeley'
+            | 'Mention'
+            | 'MercadoAds'
+            | 'Mercury'
+            | 'Merge'
+            | 'MetaAds'
+            | 'Metabase'
+            | 'Metorial'
+            | 'Metricool'
+            | 'Metriport'
+            | 'Metronome'
+            | 'MicrosoftDataverse'
+            | 'MicrosoftEntraId'
+            | 'MicrosoftLists'
+            | 'MicrosoftTeams'
+            | 'Mintlify'
+            | 'Miro'
+            | 'Missive'
+            | 'MistralAI'
+            | 'MixMax'
+            | 'Mixpanel'
+            | 'Mode'
+            | 'Mollie'
+            | 'Monday'
+            | 'MongoDB'
+            | 'Mono'
+            | 'MSSQL'
+            | 'Mux'
+            | 'MyHours'
+            | 'MySQL'
+            | 'N8n'
+            | 'Nasa'
+            | 'Navan'
+            | 'NebiusAI'
+            | 'Neon'
+            | 'Netlify'
+            | 'NetSuite'
+            | 'NewRelic'
+            | 'NewsApi'
+            | 'NewsData'
+            | 'NewYorkTimes'
+            | 'Nexiopay'
+            | 'NextdoorAds'
+            | 'NinjaOneRMM'
+            | 'NoCRM'
+            | 'Northflank'
+            | 'NorthpassLMS'
+            | 'Notion'
+            | 'Nutshell'
+            | 'Nylas'
+            | 'Okta'
+            | 'Omnisend'
+            | 'Oncehub'
+            | 'OneDrive'
+            | 'OneHundredMs'
+            | 'Onepagecrm'
+            | 'OneSignal'
+            | 'Onfleet'
+            | 'OpenAI'
+            | 'OpenAIAds'
+            | 'OpenAQ'
+            | 'OpenDataDc'
+            | 'OpenExchangeRates'
+            | 'OpenFDA'
+            | 'OpenRouter'
+            | 'OpenWeather'
+            | 'OpinionStage'
+            | 'Opsgenie'
+            | 'Optimizely'
+            | 'OPUSWatch'
+            | 'Oracle'
+            | 'OracleEbs'
+            | 'OracleFusion'
+            | 'Orb'
+            | 'Orbit'
+            | 'Ortto'
+            | 'Oura'
+            | 'Outbrain'
+            | 'Outlook'
+            | 'Outreach'
+            | 'Oveit'
+            | 'PabblySubscriptionsBilling'
+            | 'Paddle'
+            | 'PagerDuty'
+            | 'PandaDoc'
+            | 'Paperform'
+            | 'Papersign'
+            | 'Pardot'
+            | 'Partnerize'
+            | 'PartnerStack'
+            | 'PayFit'
+            | 'Paylocity'
+            | 'PayPal'
+            | 'Paystack'
+            | 'PeecAI'
+            | 'Pendo'
+            | 'Pennylane'
+            | 'Perigon'
+            | 'Perk'
+            | 'PersistIq'
+            | 'Persona'
+            | 'Personio'
+            | 'Pexels'
+            | 'PgAnalyze'
+            | 'Phyllo'
+            | 'Picqer'
+            | 'Pinecone'
+            | 'Pingdom'
+            | 'PinterestAds'
+            | 'Pipedrive'
+            | 'Pipeliner'
+            | 'PivotalTracker'
+            | 'Piwik'
+            | 'Plaid'
+            | 'Plain'
+            | 'PlanetScale'
+            | 'Planhat'
+            | 'PlatformSh'
+            | 'Plausible'
+            | 'Plunk'
+            | 'Pocket'
+            | 'Podium'
+            | 'Polar'
+            | 'Polygon'
+            | 'Poplar'
+            | 'Postgres'
+            | 'Postmark'
+            | 'PrestaShop'
+            | 'Pretix'
+            | 'Primetric'
+            | 'Printify'
+            | 'Productboard'
+            | 'Productive'
+            | 'PromptingCompany'
+            | 'Pylon'
+            | 'PyPI'
+            | 'Qdrant'
+            | 'Qonto'
+            | 'Qualaroo'
+            | 'Qualtrics'
+            | 'QuickBooks'
+            | 'Railz'
+            | 'Ramp'
+            | 'Razorpay'
+            | 'RB2B'
+            | 'RDStationMarketing'
+            | 'Recharge'
+            | 'Recreation'
+            | 'Recruitee'
+            | 'Recurly'
+            | 'Reddit'
+            | 'RedditAds'
+            | 'Redis'
+            | 'Redshift'
+            | 'ReferralHero'
+            | 'Render'
+            | 'RentCast'
+            | 'Repairshopr'
+            | 'Replicate'
+            | 'ReplyIo'
+            | 'Resend'
+            | 'RetailExpress'
+            | 'RetellAI'
+            | 'Retently'
+            | 'RevenueCat'
+            | 'RevolutMerchant'
+            | 'RingCentral'
+            | 'Rippling'
+            | 'RKICovid'
+            | 'Roark'
+            | 'RocketChat'
+            | 'Rocketlane'
+            | 'Rollbar'
+            | 'Rootly'
+            | 'Rss'
+            | 'RudderStack'
+            | 'Ruddr'
+            | 'RunPod'
+            | 'SafetyCulture'
+            | 'SageHR'
+            | 'SageIntacct'
+            | 'Sailthru'
+            | 'Salesflare'
+            | 'Salesforce'
+            | 'SalesforceMarketingCloud'
+            | 'SalesLoft'
+            | 'Sanity'
+            | 'SapConcur'
+            | 'SapErp'
+            | 'SAPFieldglass'
+            | 'SapHana'
+            | 'SapSuccessFactors'
+            | 'SavvyCal'
+            | 'ScaleAI'
+            | 'Scaleway'
+            | 'SearchAds360'
+            | 'Secoda'
+            | 'Segment'
+            | 'SendGrid'
+            | 'Sendowl'
+            | 'SendPulse'
+            | 'Senseforce'
+            | 'Sentry'
+            | 'Serpstat'
+            | 'ServiceNow'
+            | 'SevenShifts'
+            | 'SFTP'
+            | 'SharePoint'
+            | 'Sharetribe'
+            | 'Shippo'
+            | 'ShipStation'
+            | 'Shopify'
+            | 'ShopWired'
+            | 'Shortcut'
+            | 'Shortio'
+            | 'Shutterstock'
+            | 'SigmaComputing'
+            | 'SignNow'
+            | 'SigNoz'
+            | 'Sim'
+            | 'SimFin'
+            | 'SimpleCast'
+            | 'Simplesat'
+            | 'Singular'
+            | 'Skyvern'
+            | 'Slack'
+            | 'Slash'
+            | 'Smaily'
+            | 'SmartEngage'
+            | 'Smartreach'
+            | 'Smartsheet'
+            | 'Smartwaiver'
+            | 'SnapchatAds'
+            | 'Snowflake'
+            | 'SolarwindsServiceDesk'
+            | 'SonarCloud'
+            | 'SparkPost'
+            | 'SplitIo'
+            | 'SpotifyAds'
+            | 'SpotlerCRM'
+            | 'Square'
+            | 'Squarespace'
+            | 'Statsig'
+            | 'Statuspage'
+            | 'Stigg'
+            | 'StockData'
+            | 'Strava'
+            | 'StreamElements'
+            | 'Streamlabs'
+            | 'Stripe'
+            | 'Sumsub'
+            | 'Supabase'
+            | 'Superwall'
+            | 'SurveyMonkey'
+            | 'SurveySparrow'
+            | 'Survicate'
+            | 'Svix'
+            | 'Swonkie'
+            | 'Synthesia'
+            | 'Systeme'
+            | 'Taboola'
+            | 'Talkwalker'
+            | 'Tavus'
+            | 'TawkTo'
+            | 'Teachable'
+            | 'Teamtailor'
+            | 'Teamwork'
+            | 'Telli'
+            | 'Tempo'
+            | 'TemporalIO'
+            | 'TerraApi'
+            | 'Testrail'
+            | 'Thinkific'
+            | 'ThinkificCourses'
+            | 'ThriveLearning'
+            | 'Ticketmaster'
+            | 'TicketTailor'
+            | 'TickTick'
+            | 'TikTokAds'
+            | 'Tile38'
+            | 'Timely'
+            | 'Tinyemail'
+            | 'TMDb'
+            | 'Todoist'
+            | 'TogetherAI'
+            | 'Toggl'
+            | 'TrackPMS'
+            | 'Trello'
+            | 'Tremendous'
+            | 'TriggerDev'
+            | 'TrustPilot'
+            | 'Turso'
+            | 'TVMaze'
+            | 'TwelveData'
+            | 'TwelveLabs'
+            | 'Twenty'
+            | 'Twilio'
+            | 'Twitter'
+            | 'TwitterAds'
+            | 'TyntecSMS'
+            | 'Typeform'
+            | 'Ubidots'
+            | 'Unleash'
+            | 'Unstructured'
+            | 'UpPromote'
+            | 'Upstash'
+            | 'Uptick'
+            | 'USCensus'
+            | 'Uservoice'
+            | 'Vantage'
+            | 'Vapi'
+            | 'Veeqo'
+            | 'Vellum'
+            | 'Vercel'
+            | 'Vespa'
+            | 'VismaEconomic'
+            | 'Vitally'
+            | 'Vultr'
+            | 'VWO'
+            | 'Waiteraid'
+            | 'Wasabi'
+            | 'Watchmode'
+            | 'Webflow'
+            | 'WhenIWork'
+            | 'WikipediaPageviews'
+            | 'Windmill'
+            | 'WooCommerce'
+            | 'Wordpress'
+            | 'Workable'
+            | 'Workday'
+            | 'Workflowmax'
+            | 'WorkOS'
+            | 'Workramp'
+            | 'Wrike'
+            | 'Writesonic'
+            | 'Wufoo'
+            | 'Xero'
+            | 'Xsolla'
+            | 'YahooFinance'
+            | 'YandexMetrica'
+            | 'Ynab'
+            | 'Yotpo'
+            | 'Younium'
+            | 'YouSign'
+            | 'YouTubeAnalytics'
+            | 'YoutubeData'
+            | 'ZapierSupportedStorage'
+            | 'ZapSign'
+            | 'Zellify'
+            | 'Zendesk'
+            | 'ZendeskSell'
+            | 'ZendeskSunshine'
+            | 'Zenefits'
+            | 'Zenloop'
+            | 'Zep'
+            | 'ZohoAnalytics'
+            | 'ZohoBigin'
+            | 'ZohoBilling'
+            | 'ZohoBooks'
+            | 'ZohoCampaign'
+            | 'ZohoCRM'
+            | 'ZohoDesk'
+            | 'ZohoExpense'
+            | 'ZohoInventory'
+            | 'ZohoInvoice'
+            | 'ZonkaFeedback'
+            | 'Zoom'
+            | 'ZoomInfo'
+            | 'Zuora'
+    }
+    openSessionAnalysisSetup: () => {
+        value: true
+    }
+    openSourcesModal: () => {
+        value: true
+    }
+    saveSessionAnalysisFilters: (filters: RecordingUniversalFilters) => {
+        filters: RecordingUniversalFilters
+    }
+    toggleConversations: () => {
+        value: true
+    }
+    toggleDataWarehouseSource: (dwSource: DataWarehouseSource) => {
+        dwSource: DataWarehouseSource
+    }
+    toggleErrorTracking: () => {
+        value: true
+    }
+    toggleErrorTrackingComplete: () => {
+        value: true
+    }
+    toggleEvalReports: () => {
+        value: true
+    }
+    toggleHealthChecks: () => {
+        value: true
+    }
+    toggleSessionAnalysis: () => {
+        value: true
+    }
+    toggleSignalSource: (params: ToggleSignalSourceParams) => {
+        params: ToggleSignalSourceParams
+    }
+    toggleSignalSourceFailure: (
+        params: ToggleSignalSourceParams,
+        error: string
+    ) => {
+        error: string
+        params: ToggleSignalSourceParams
+    }
+    toggleSignalSourceSuccess: (params: ToggleSignalSourceParams) => {
+        params: ToggleSignalSourceParams
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface signalSourcesLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        sessionAnalysisConfig: (sourceConfigs: SignalSourceConfig[] | null) => SignalSourceConfig | null
+        githubIssuesConfig: (sourceConfigs: SignalSourceConfig[] | null) => SignalSourceConfig | null
+        linearIssuesConfig: (sourceConfigs: SignalSourceConfig[] | null) => SignalSourceConfig | null
+        zendeskTicketsConfig: (sourceConfigs: SignalSourceConfig[] | null) => SignalSourceConfig | null
+        pgAnalyzeIssuesConfig: (sourceConfigs: SignalSourceConfig[] | null) => SignalSourceConfig | null
+        conversationsConfig: (sourceConfigs: SignalSourceConfig[] | null) => SignalSourceConfig | null
+        isSessionAnalysisToggling: (togglingSourceKeys: Set<string>) => boolean
+        isConversationsToggling: (togglingSourceKeys: Set<string>) => boolean
+        isGithubIssuesToggling: (togglingSourceKeys: Set<string>) => boolean
+        isLinearIssuesToggling: (togglingSourceKeys: Set<string>) => boolean
+        isZendeskTicketsToggling: (togglingSourceKeys: Set<string>) => boolean
+        isPgAnalyzeIssuesToggling: (togglingSourceKeys: Set<string>) => boolean
+        isErrorTrackingToggling: (togglingSourceKeys: Set<string>) => boolean
+        healthChecksConfig: (sourceConfigs: SignalSourceConfig[] | null) => SignalSourceConfig | null
+        isHealthChecksToggling: (togglingSourceKeys: Set<string>) => boolean
+        evalReportsConfig: (sourceConfigs: SignalSourceConfig[] | null) => SignalSourceConfig | null
+        isEvalReportsToggling: (togglingSourceKeys: Set<string>) => boolean
+        errorTrackingIsFullyEnabled: (sourceConfigs: SignalSourceConfig[] | null) => boolean
+        isSessionAnalysisRunning: (sessionAnalysisConfig: SignalSourceConfig | null) => boolean
+        enabledSourcesCount: (sourceConfigs: SignalSourceConfig[] | null) => number
+        hasNoSources: (sourceConfigs: SignalSourceConfig[] | null, enabledSourcesCount: number) => boolean
+    }
+}
+
+export type signalSourcesLogicType = MakeLogicType<
+    signalSourcesLogicValues,
+    signalSourcesLogicActions,
+    Record<string, any>,
+    signalSourcesLogicMeta
+>
+
 export const signalSourcesLogic = kea<signalSourcesLogicType>([
     path(['scenes', 'inbox', 'signalSourcesLogic']),
 
diff --git a/frontend/src/scenes/insights/EditorFilters/funnelDataWarehouseStepDefinitionPopoverLogic.ts b/frontend/src/scenes/insights/EditorFilters/funnelDataWarehouseStepDefinitionPopoverLogic.ts
index ff00228fa123..e48385998e1c 100644
--- a/frontend/src/scenes/insights/EditorFilters/funnelDataWarehouseStepDefinitionPopoverLogic.ts
+++ b/frontend/src/scenes/insights/EditorFilters/funnelDataWarehouseStepDefinitionPopoverLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import posthog from 'posthog-js'
 
 import { definitionPopoverLogic } from 'lib/components/DefinitionPopover/definitionPopoverLogic'
@@ -16,7 +16,13 @@ import { InsightLogicProps } from '~/types'
 
 import { DataWarehouseTableForInsight } from 'products/data_warehouse/frontend/types'
 
-import type { funnelDataWarehouseStepDefinitionPopoverLogicType } from './funnelDataWarehouseStepDefinitionPopoverLogicType'
+import type { TaxonomicDefinitionTypes } from '../../../lib/components/TaxonomicFilter/types'
+import type {
+    DatabaseSchemaField,
+    DatabaseSchemaSchema,
+    DatabaseSchemaSource,
+    FunnelsQuery,
+} from '../../../queries/schema/schema-general'
 
 export type FunnelFieldKey = 'id_field' | 'timestamp_field' | 'aggregation_target_field'
 
@@ -38,6 +44,132 @@ export interface FunnelDataWarehouseStepDefinitionPopoverLogicProps {
     insightProps: InsightLogicProps
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface funnelDataWarehouseStepDefinitionPopoverLogicValues {
+    definition: Partial<TaxonomicDefinitionTypes>; // definitionPopoverLogic
+    localDefinition: Partial<TaxonomicDefinitionTypes>; // definitionPopoverLogic
+    querySource: FunnelsQuery | null; // funnelDataLogic
+    activeField: DataWarehousePopoverField | undefined;
+    activeFieldIsHogQL: boolean;
+    activeFieldKey: FunnelFieldKey;
+    activeFieldKeyOptions: {
+        label: string;
+        value: FunnelFieldKey;
+    }[];
+    activeFieldOptions: ({
+        label: string;
+        value: string;
+    } | {
+        label: string;
+        type: DatabaseSerializedFieldType;
+        value: string;
+    })[];
+    activeFieldValue: string | undefined;
+    columnOptions: {
+        label: string;
+        type: DatabaseSerializedFieldType;
+        value: string;
+    }[];
+    dataWarehousePopoverFields: DataWarehousePopoverField[];
+    isAggregatingByGroup: boolean;
+    isAggregatingByHogQL: boolean;
+    linkedTables: string[];
+    previewExpressionColumns: TablePreviewExpressionColumn[];
+    previewSelectedKey: string | undefined;
+    previewTable: {
+        aggregation_target_field?: string | undefined;
+        distinct_id_field?: string | undefined;
+        fields: {
+            [k: string]: DatabaseSchemaField;
+        };
+        format?: string | undefined;
+        id: string;
+        id_field?: string | undefined;
+        name: string;
+        row_count?: number | undefined;
+        schema?: DatabaseSchemaSchema | undefined;
+        search_aliases?: string[] | undefined;
+        source?: DatabaseSchemaSource | undefined;
+        timestamp_field?: string | undefined;
+        type: "data_warehouse";
+        url_pattern?: string | undefined;
+    };
+    scopedLocalDefinition: Partial<TaxonomicDefinitionTypes>;
+    selectedItemMeta: any;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface funnelDataWarehouseStepDefinitionPopoverLogicActions {
+    setLocalDefinition: (item: Partial<TaxonomicDefinitionTypes>) => {
+        item: Partial<TaxonomicDefinitionTypes>;
+    }; // definitionPopoverLogic
+    selectTable: () => {
+        value: true;
+    };
+    setActiveFieldKey: (activeFieldKey: FunnelFieldKey) => {
+        activeFieldKey: FunnelFieldKey;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface funnelDataWarehouseStepDefinitionPopoverLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        dataWarehousePopoverFields: (dataWarehousePopoverFields: DataWarehousePopoverField[]) => DataWarehousePopoverField[];
+        selectedItemMeta: (arg: any) => any;
+        columnOptions: (table: DataWarehouseTableForInsight) => {
+            label: string;
+            type: DatabaseSerializedFieldType;
+            value: string;
+        }[];
+        linkedTables: (table: DataWarehouseTableForInsight) => string[];
+        activeFieldKeyOptions: (dataWarehousePopoverFields: DataWarehousePopoverField[]) => {
+            label: string;
+            value: FunnelFieldKey;
+        }[];
+        activeField: (dataWarehousePopoverFields: DataWarehousePopoverField[], activeFieldKey: FunnelFieldKey) => DataWarehousePopoverField | undefined;
+        scopedLocalDefinition: (definition: Partial<TaxonomicDefinitionTypes>, localDefinition: Partial<TaxonomicDefinitionTypes>, table: DataWarehouseTableForInsight, selectedItemMeta: any) => Partial<TaxonomicDefinitionTypes>;
+        activeFieldValue: (scopedLocalDefinition: Partial<TaxonomicDefinitionTypes>, activeFieldKey: FunnelFieldKey) => string | undefined;
+        previewTable: (table: DataWarehouseTableForInsight) => {
+            aggregation_target_field?: string | undefined;
+            distinct_id_field?: string | undefined;
+            fields: {
+                [k: string]: DatabaseSchemaField;
+            };
+            format?: string | undefined;
+            id: string;
+            id_field?: string | undefined;
+            name: string;
+            row_count?: number | undefined;
+            schema?: DatabaseSchemaSchema | undefined;
+            search_aliases?: string[] | undefined;
+            source?: DatabaseSchemaSource | undefined;
+            timestamp_field?: string | undefined;
+            type: "data_warehouse";
+            url_pattern?: string | undefined;
+        };
+        previewExpressionColumns: (table: DataWarehouseTableForInsight, dataWarehousePopoverFields: DataWarehousePopoverField[], scopedLocalDefinition: Partial<TaxonomicDefinitionTypes>) => TablePreviewExpressionColumn[];
+        previewSelectedKey: (previewExpressionColumns: TablePreviewExpressionColumn[], activeFieldKey: FunnelFieldKey, activeFieldValue: string | undefined) => string | undefined;
+        activeFieldOptions: (columnOptions: {
+            label: string;
+            type: DatabaseSerializedFieldType;
+            value: string;
+        }[], activeField: DataWarehousePopoverField | undefined, activeFieldKey: FunnelFieldKey) => ({
+            label: string;
+            value: string;
+        } | {
+            label: string;
+            type: DatabaseSerializedFieldType;
+            value: string;
+        })[];
+        activeFieldIsHogQL: (activeFieldValue: string | undefined, table: DataWarehouseTableForInsight) => boolean;
+        isAggregatingByGroup: (querySource: FunnelsQuery | null) => boolean;
+        isAggregatingByHogQL: (querySource: FunnelsQuery | null, isAggregatingByGroup: boolean) => boolean;
+    };
+}
+
+export type funnelDataWarehouseStepDefinitionPopoverLogicType = MakeLogicType<funnelDataWarehouseStepDefinitionPopoverLogicValues, funnelDataWarehouseStepDefinitionPopoverLogicActions, FunnelDataWarehouseStepDefinitionPopoverLogicProps, funnelDataWarehouseStepDefinitionPopoverLogicMeta>;
+
 export const funnelDataWarehouseStepDefinitionPopoverLogic = kea<funnelDataWarehouseStepDefinitionPopoverLogicType>([
     props({} as FunnelDataWarehouseStepDefinitionPopoverLogicProps),
     key((props) => props.table.name),
@@ -58,7 +190,10 @@ export const funnelDataWarehouseStepDefinitionPopoverLogic = kea<funnelDataWareh
         selectTable: true,
     })),
     selectors({
-        dataWarehousePopoverFields: [(_, props) => [props.dataWarehousePopoverFields], (fields) => fields],
+        dataWarehousePopoverFields: [
+            (_, props) => [props.dataWarehousePopoverFields],
+            (fields: DataWarehousePopoverField[]) => fields,
+        ],
         selectedItemMeta: [() => [(_, props) => props.selectedItemMeta], (selectedItemMeta) => selectedItemMeta],
     }),
     reducers({
@@ -77,7 +212,7 @@ export const funnelDataWarehouseStepDefinitionPopoverLogic = kea<funnelDataWareh
             // `{ name, id }` without re-attaching the full schema). Empty
             // array prevents the `Object.values(undefined)` crash; the
             // user reopens via the table picker to get full options.
-            (table) =>
+            (table: DataWarehouseTableForInsight) =>
                 table.fields
                     ? Object.values(table.fields).map((column) => ({
                           label: `${column.name} (${column.type})`,
@@ -88,7 +223,7 @@ export const funnelDataWarehouseStepDefinitionPopoverLogic = kea<funnelDataWareh
         ],
         linkedTables: [
             (_, p) => [p.table],
-            (table) =>
+            (table: DataWarehouseTableForInsight) =>
                 table.fields
                     ? Object.values(table.fields)
                           .filter((field) => LINKED_TABLE_TYPES.includes(field.type))
@@ -97,7 +232,7 @@ export const funnelDataWarehouseStepDefinitionPopoverLogic = kea<funnelDataWareh
         ],
         activeFieldKeyOptions: [
             (s) => [s.dataWarehousePopoverFields],
-            (dataWarehousePopoverFields) =>
+            (dataWarehousePopoverFields: DataWarehousePopoverField[]) =>
                 EDITABLE_FIELD_ORDER.map((key) => ({
                     value: key,
                     label: dataWarehousePopoverFields.find((f) => f.key === key)?.label ?? key,
@@ -105,24 +240,31 @@ export const funnelDataWarehouseStepDefinitionPopoverLogic = kea<funnelDataWareh
         ],
         activeField: [
             (s) => [s.dataWarehousePopoverFields, s.activeFieldKey],
-            (dataWarehousePopoverFields, activeFieldKey) =>
+            (dataWarehousePopoverFields: DataWarehousePopoverField[], activeFieldKey: FunnelFieldKey) =>
                 dataWarehousePopoverFields.find((f) => f.key === activeFieldKey),
         ],
         scopedLocalDefinition: [
             (s, p) => [s.definition, s.localDefinition, p.table, s.selectedItemMeta],
-            (definition, localDefinition, table, selectedItemMeta) =>
+            (
+                definition: Partial<import('lib/components/TaxonomicFilter/types').TaxonomicDefinitionTypes>,
+                localDefinition: Partial<import('lib/components/TaxonomicFilter/types').TaxonomicDefinitionTypes>,
+                table: DataWarehouseTableForInsight,
+                selectedItemMeta
+            ) =>
                 definition.name === table.name
                     ? localDefinition
                     : getDataWarehouseItemWithFieldDefaults(table, selectedItemMeta),
         ],
         activeFieldValue: [
             (s) => [s.scopedLocalDefinition, s.activeFieldKey],
-            (scopedLocalDefinition, activeFieldKey) =>
-                (scopedLocalDefinition as Partial<Record<FunnelFieldKey, string | undefined>>)[activeFieldKey],
+            (
+                scopedLocalDefinition: Partial<import('lib/components/TaxonomicFilter/types').TaxonomicDefinitionTypes>,
+                activeFieldKey: FunnelFieldKey
+            ) => (scopedLocalDefinition as Partial<Record<FunnelFieldKey, string | undefined>>)[activeFieldKey],
         ],
         previewTable: [
             (_, p) => [p.table],
-            (table) => ({
+            (table: DataWarehouseTableForInsight) => ({
                 ...table,
                 fields: table.fields
                     ? Object.fromEntries(
@@ -133,7 +275,11 @@ export const funnelDataWarehouseStepDefinitionPopoverLogic = kea<funnelDataWareh
         ],
         previewExpressionColumns: [
             (s, p) => [p.table, s.dataWarehousePopoverFields, s.scopedLocalDefinition],
-            (table, dataWarehousePopoverFields, scopedLocalDefinition): TablePreviewExpressionColumn[] => {
+            (
+                table: DataWarehouseTableForInsight,
+                dataWarehousePopoverFields: DataWarehousePopoverField[],
+                scopedLocalDefinition: Partial<import('lib/components/TaxonomicFilter/types').TaxonomicDefinitionTypes>
+            ): TablePreviewExpressionColumn[] => {
                 const tableFieldNames = new Set(
                     table.fields ? Object.values(table.fields).map((field) => field.name) : []
                 )
@@ -176,13 +322,25 @@ export const funnelDataWarehouseStepDefinitionPopoverLogic = kea<funnelDataWareh
         ],
         previewSelectedKey: [
             (s) => [s.previewExpressionColumns, s.activeFieldKey, s.activeFieldValue],
-            (previewExpressionColumns, activeFieldKey, activeFieldValue) =>
+            (
+                previewExpressionColumns: TablePreviewExpressionColumn[],
+                activeFieldKey: FunnelFieldKey,
+                activeFieldValue: string | undefined
+            ) =>
                 previewExpressionColumns.find((column) => column.key.startsWith(`__${activeFieldKey}_hogql_expression`))
                     ?.key ?? activeFieldValue,
         ],
         activeFieldOptions: [
             (s) => [s.columnOptions, s.activeField, s.activeFieldKey],
-            (columnOptions, activeField, activeFieldKey) => {
+            (
+                columnOptions: {
+                    label: string
+                    type: DatabaseSerializedFieldType
+                    value: string
+                }[],
+                activeField: DataWarehousePopoverField | undefined,
+                activeFieldKey: FunnelFieldKey
+            ) => {
                 const filteredColumnOptions = columnOptions.filter((column) =>
                     ALLOWED_COLUMN_TYPES_BY_FIELD_KEY[activeFieldKey].includes(column.type)
                 )
@@ -197,17 +355,20 @@ export const funnelDataWarehouseStepDefinitionPopoverLogic = kea<funnelDataWareh
         ],
         activeFieldIsHogQL: [
             (s, p) => [s.activeFieldValue, p.table],
-            (activeFieldValue, table) =>
+            (activeFieldValue: string | undefined, table: DataWarehouseTableForInsight) =>
                 !table.fields || !Object.values(table.fields).some((field) => field.name === activeFieldValue),
         ],
         isAggregatingByGroup: [
             (s) => [s.querySource],
-            (querySource) => querySource?.aggregation_group_type_index != null,
+            (querySource: null | import('~/queries/schema/schema-general').FunnelsQuery) =>
+                querySource?.aggregation_group_type_index != null,
         ],
         isAggregatingByHogQL: [
             (s) => [s.querySource, s.isAggregatingByGroup],
-            (querySource, isAggregatingByGroup) =>
-                Boolean(querySource?.funnelsFilter?.funnelAggregateByHogQL) && !isAggregatingByGroup,
+            (
+                querySource: null | import('~/queries/schema/schema-general').FunnelsQuery,
+                isAggregatingByGroup: boolean
+            ) => Boolean(querySource?.funnelsFilter?.funnelAggregateByHogQL) && !isAggregatingByGroup,
         ],
     }),
     listeners(({ values, props }) => ({
diff --git a/frontend/src/scenes/insights/EditorFilters/goalLinesLogic.ts b/frontend/src/scenes/insights/EditorFilters/goalLinesLogic.ts
index e42133e23e15..4acf1d195f9b 100644
--- a/frontend/src/scenes/insights/EditorFilters/goalLinesLogic.ts
+++ b/frontend/src/scenes/insights/EditorFilters/goalLinesLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers } from 'kea'
 import { subscriptions } from 'kea-subscriptions'
 
 import { keyForInsightLogicProps } from 'scenes/insights/sharedUtils'
@@ -13,11 +13,70 @@ import {
 import { isFunnelsQuery, isRetentionQuery, isTrendsQuery } from '~/queries/utils'
 import { InsightLogicProps } from '~/types'
 
+import type {
+    LifecycleQuery,
+    PathsQuery,
+    StickinessQuery,
+    WebOverviewQuery,
+    WebStatsTableQuery,
+} from '../../../queries/schema/schema-general'
 import { insightVizDataLogic } from '../insightVizDataLogic'
-import type { goalLinesLogicType } from './goalLinesLogicType'
+import type { QuerySourceUpdate } from '../insightVizDataLogic'
 
 export type PoeModeTypes = HogQLQueryModifiers['personsOnEventsMode'] | null
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface goalLinesLogicValues {
+    querySource:
+        | FunnelsQuery
+        | LifecycleQuery
+        | PathsQuery
+        | RetentionQuery
+        | StickinessQuery
+        | TrendsQuery
+        | WebOverviewQuery
+        | WebStatsTableQuery
+        | null // insightVizDataLogic
+    goalLines: GoalLine[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface goalLinesLogicActions {
+    updateQuerySource: (querySource: QuerySourceUpdate) => {
+        querySource: QuerySourceUpdate
+    } // insightVizDataLogic
+    addGoalLine: () => {
+        value: true
+    }
+    removeGoalLine: (goalLineIndex: number) => {
+        goalLineIndex: number
+    }
+    setGoalLines: (goalLines: GoalLine[]) => {
+        goalLines: GoalLine[]
+    }
+    updateGoalLine: (
+        goalLineIndex: number,
+        key: keyof GoalLine,
+        value: NonNullable<GoalLine[keyof GoalLine]>
+    ) => {
+        goalLineIndex: number
+        key: keyof GoalLine
+        value: NonNullable<boolean | number | string | undefined>
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface goalLinesLogicMeta {
+    key: string
+}
+
+export type goalLinesLogicType = MakeLogicType<
+    goalLinesLogicValues,
+    goalLinesLogicActions,
+    InsightLogicProps,
+    goalLinesLogicMeta
+>
+
 export const goalLinesLogic = kea<goalLinesLogicType>([
     props({} as InsightLogicProps),
     key(keyForInsightLogicProps('new')),
diff --git a/frontend/src/scenes/insights/EditorFilters/poeFilterLogic.ts b/frontend/src/scenes/insights/EditorFilters/poeFilterLogic.ts
index 080615b5e169..6c990aeb40d6 100644
--- a/frontend/src/scenes/insights/EditorFilters/poeFilterLogic.ts
+++ b/frontend/src/scenes/insights/EditorFilters/poeFilterLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers } from 'kea'
 import { subscriptions } from 'kea-subscriptions'
 
 import { keyForInsightLogicProps } from 'scenes/insights/sharedUtils'
@@ -6,11 +6,58 @@ import { keyForInsightLogicProps } from 'scenes/insights/sharedUtils'
 import { HogQLQueryModifiers } from '~/queries/schema/schema-general'
 import { InsightLogicProps } from '~/types'
 
+import type {
+    FunnelsQuery,
+    LifecycleQuery,
+    PathsQuery,
+    RetentionQuery,
+    StickinessQuery,
+    TrendsQuery,
+    WebOverviewQuery,
+    WebStatsTableQuery,
+} from '../../../queries/schema/schema-general'
 import { insightVizDataLogic } from '../insightVizDataLogic'
-import type { poeFilterLogicType } from './poeFilterLogicType'
+import type { QuerySourceUpdate } from '../insightVizDataLogic'
 
 export type PoeModeTypes = HogQLQueryModifiers['personsOnEventsMode'] | null
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface poeFilterLogicValues {
+    querySource:
+        | FunnelsQuery
+        | LifecycleQuery
+        | PathsQuery
+        | RetentionQuery
+        | StickinessQuery
+        | TrendsQuery
+        | WebOverviewQuery
+        | WebStatsTableQuery
+        | null // insightVizDataLogic
+    poeMode: PoeModeTypes
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface poeFilterLogicActions {
+    updateQuerySource: (querySource: QuerySourceUpdate) => {
+        querySource: QuerySourceUpdate
+    } // insightVizDataLogic
+    setPoeMode: (poeMode: PoeModeTypes) => {
+        poeMode: PoeModeTypes
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface poeFilterLogicMeta {
+    key: string
+}
+
+export type poeFilterLogicType = MakeLogicType<
+    poeFilterLogicValues,
+    poeFilterLogicActions,
+    InsightLogicProps,
+    poeFilterLogicMeta
+>
+
 export const poeFilterLogic = kea<poeFilterLogicType>([
     props({} as InsightLogicProps),
     key(keyForInsightLogicProps('new')),
diff --git a/frontend/src/scenes/insights/EmptyStates/sampleDataStateLogic.ts b/frontend/src/scenes/insights/EmptyStates/sampleDataStateLogic.ts
index 7ea7be9d833e..15b3905eb11d 100644
--- a/frontend/src/scenes/insights/EmptyStates/sampleDataStateLogic.ts
+++ b/frontend/src/scenes/insights/EmptyStates/sampleDataStateLogic.ts
@@ -1,10 +1,30 @@
-import { connect, kea, path, selectors } from 'kea'
+import { MakeLogicType, connect, kea, path, selectors } from 'kea'
 
 import { teamLogic } from 'scenes/teamLogic'
 
 import { isSharedView } from '~/exporter/exporterViewLogic'
 
-import type { sampleDataStateLogicType } from './sampleDataStateLogicType'
+import type { TeamPublicType, TeamType } from '../../../types'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sampleDataStateLogicValues {
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    shouldShowSampleData: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sampleDataStateLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        shouldShowSampleData: (currentTeam: TeamPublicType | TeamType | null) => boolean
+    }
+}
+
+export type sampleDataStateLogicType = MakeLogicType<
+    sampleDataStateLogicValues,
+    {},
+    Record<string, any>,
+    sampleDataStateLogicMeta
+>
 
 /**
  * Gates the pre-ingestion sample-data placeholder: only projects that never ingested an event see
@@ -22,8 +42,9 @@ export const sampleDataStateLogic = kea<sampleDataStateLogicType>([
             // omits `ingested_event`, so it reads as `undefined` and would otherwise falsely flag
             // every empty tile on a real, data-carrying project as "never ingested". External
             // viewers should just see the normal "No data" state.
-            (currentTeam): boolean =>
-                !isSharedView() && !!currentTeam && !currentTeam.ingested_event && !currentTeam.is_demo,
+            (
+                currentTeam: null | import('../../../types').TeamPublicType | import('../../../types').TeamType
+            ): boolean => !isSharedView() && !!currentTeam && !currentTeam.ingested_event && !currentTeam.is_demo,
         ],
     }),
 ])
diff --git a/frontend/src/scenes/insights/InsightNav/insightNavLogic.tsx b/frontend/src/scenes/insights/InsightNav/insightNavLogic.tsx
index d7d516bea15e..c91ee5f8b907 100644
--- a/frontend/src/scenes/insights/InsightNav/insightNavLogic.tsx
+++ b/frontend/src/scenes/insights/InsightNav/insightNavLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { router } from 'kea-router'
 
 import { FEATURE_FLAGS } from 'lib/constants'
@@ -69,8 +69,9 @@ import { BaseMathType, InsightLogicProps, InsightType, IntervalType } from '~/ty
 
 import { PRODUCT_ANALYTICS_DEFAULT_QUERY_TAGS } from 'products/product_analytics/frontend/constants'
 
+import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
+import type { Node } from '../../../queries/schema/schema-general'
 import { MathAvailability } from '../filters/ActionFilter/ActionFilterRow/ActionFilterRow'
-import type { insightNavLogicType } from './insightNavLogicType'
 
 export interface Tab {
     label: string | JSX.Element
@@ -400,6 +401,45 @@ function getCommonVisualizationProperties(
     return {} as Partial<EmptyCommonVisualizationProperties>
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightNavLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    filterTestAccountsDefault: boolean // filterTestAccountsDefaultsLogic
+    query: Node | null // insightDataLogic
+    activeView: InsightType
+    queryPropertyCache: QueryPropertyCache | null
+    tabs: Tab[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightNavLogicActions {
+    setQuery: (query: Node<Record<string, any>> | null) => {
+        query: Node<Record<string, any>> | null
+    } // insightDataLogic
+    setActiveView: (view: InsightType) => {
+        view: InsightType
+    }
+    updateQueryPropertyCache: (cache: QueryPropertyCache) => {
+        cache: QueryPropertyCache
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightNavLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        activeView: (query: Node<Record<string, any>> | null) => InsightType
+        tabs: (activeView: InsightType, query: Node<Record<string, any>> | null, featureFlags: FeatureFlagsSet) => Tab[]
+    }
+}
+
+export type insightNavLogicType = MakeLogicType<
+    insightNavLogicValues,
+    insightNavLogicActions,
+    InsightLogicProps,
+    insightNavLogicMeta
+>
+
 export const insightNavLogic = kea<insightNavLogicType>([
     props({} as InsightLogicProps),
     key(keyForInsightLogicProps('new')),
@@ -433,7 +473,7 @@ export const insightNavLogic = kea<insightNavLogicType>([
     selectors({
         activeView: [
             (s) => [s.query],
-            (query) => {
+            (query: null | import('~/queries/schema/schema-general').Node) => {
                 if (isDataTableNode(query)) {
                     return InsightType.JSON
                 } else if (containsHogQLQuery(query)) {
@@ -452,7 +492,11 @@ export const insightNavLogic = kea<insightNavLogicType>([
         ],
         tabs: [
             (s) => [s.activeView, s.query, s.featureFlags],
-            (activeView, query, featureFlags) => {
+            (
+                activeView: InsightType,
+                query: null | import('~/queries/schema/schema-general').Node,
+                featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet
+            ) => {
                 const tabs: Tab[] = [
                     {
                         label: 'Trends',
diff --git a/frontend/src/scenes/insights/dataRetention/dataRetentionBannerLogic.ts b/frontend/src/scenes/insights/dataRetention/dataRetentionBannerLogic.ts
index 734b23f11bf0..1f4d747eb880 100644
--- a/frontend/src/scenes/insights/dataRetention/dataRetentionBannerLogic.ts
+++ b/frontend/src/scenes/insights/dataRetention/dataRetentionBannerLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, path, reducers, selectors } from 'kea'
 
 import { dayjs } from 'lib/dayjs'
 import { organizationLogic } from 'scenes/organizationLogic'
@@ -6,7 +6,7 @@ import { teamLogic } from 'scenes/teamLogic'
 
 import { TeamType } from '~/types'
 
-import type { dataRetentionBannerLogicType } from './dataRetentionBannerLogicType'
+import type { OrganizationType, TeamPublicType } from '../../../types'
 
 const SNOOZE_DAYS = 30
 // Don't nag accounts that can't yet have at-risk data: only warn once the account is within 90 days of its
@@ -22,6 +22,45 @@ function retentionMonthsLabel(months: number): string {
     return `${months} month${months === 1 ? '' : 's'}`
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataRetentionBannerLogicValues {
+    currentOrganization: OrganizationType | null // organizationLogic
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    accountAgeEligible: boolean
+    isSnoozed: boolean
+    retentionEnforced: boolean
+    retentionMonths: number | null
+    retentionPeriodLabel: string | null
+    snoozedUntil: string | null
+    warningEligible: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataRetentionBannerLogicActions {
+    snooze: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataRetentionBannerLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        retentionEnforced: (currentTeam: TeamPublicType | TeamType | null) => boolean
+        retentionMonths: (currentTeam: TeamPublicType | TeamType | null) => number | null
+        retentionPeriodLabel: (retentionMonths: number | null) => string | null
+        isSnoozed: (snoozedUntil: string | null) => boolean
+        accountAgeEligible: (currentOrganization: OrganizationType | null, retentionMonths: number | null) => boolean
+        warningEligible: (retentionEnforced: boolean, accountAgeEligible: boolean, isSnoozed: boolean) => boolean
+    }
+}
+
+export type dataRetentionBannerLogicType = MakeLogicType<
+    dataRetentionBannerLogicValues,
+    dataRetentionBannerLogicActions,
+    Record<string, any>,
+    dataRetentionBannerLogicMeta
+>
+
 // Global (per-browser) snooze + plan-derived eligibility for the events data-retention warning. The per-insight
 // "does this query's range exceed retention" check lives in insightRetentionBannerLogic; this one stays a singleton
 // so the snooze is shared across every insight rather than dismissed once per insight.
@@ -45,23 +84,29 @@ export const dataRetentionBannerLogic = kea<dataRetentionBannerLogicType>([
     selectors({
         retentionEnforced: [
             (s) => [s.currentTeam],
-            (currentTeam): boolean => !!(currentTeam as TeamType | null)?.events_retention_enforced,
+            (currentTeam: TeamType | null | import('~/types').TeamPublicType): boolean =>
+                !!(currentTeam as TeamType | null)?.events_retention_enforced,
         ],
         retentionMonths: [
             (s) => [s.currentTeam],
-            (currentTeam): number | null => (currentTeam as TeamType | null)?.event_retention_months ?? null,
+            (currentTeam: TeamType | null | import('~/types').TeamPublicType): number | null =>
+                (currentTeam as TeamType | null)?.event_retention_months ?? null,
         ],
         retentionPeriodLabel: [
             (s) => [s.retentionMonths],
-            (retentionMonths): string | null => (retentionMonths ? retentionMonthsLabel(retentionMonths) : null),
+            (retentionMonths: number | null): string | null =>
+                retentionMonths ? retentionMonthsLabel(retentionMonths) : null,
         ],
         isSnoozed: [
             (s) => [s.snoozedUntil],
-            (snoozedUntil): boolean => !!snoozedUntil && dayjs(snoozedUntil).isAfter(dayjs()),
+            (snoozedUntil: string | null): boolean => !!snoozedUntil && dayjs(snoozedUntil).isAfter(dayjs()),
         ],
         accountAgeEligible: [
             (s) => [s.currentOrganization, s.retentionMonths],
-            (currentOrganization, retentionMonths): boolean => {
+            (
+                currentOrganization: null | import('~/types').OrganizationType,
+                retentionMonths: number | null
+            ): boolean => {
                 if (!currentOrganization?.created_at || !retentionMonths) {
                     return false
                 }
@@ -73,7 +118,7 @@ export const dataRetentionBannerLogic = kea<dataRetentionBannerLogicType>([
         ],
         warningEligible: [
             (s) => [s.retentionEnforced, s.accountAgeEligible, s.isSnoozed],
-            (retentionEnforced, accountAgeEligible, isSnoozed): boolean =>
+            (retentionEnforced: boolean, accountAgeEligible: boolean, isSnoozed: boolean): boolean =>
                 retentionEnforced && accountAgeEligible && !isSnoozed,
         ],
     }),
diff --git a/frontend/src/scenes/insights/dataRetention/insightRetentionBannerLogic.ts b/frontend/src/scenes/insights/dataRetention/insightRetentionBannerLogic.ts
index 473030b01f0c..31500ea19d59 100644
--- a/frontend/src/scenes/insights/dataRetention/insightRetentionBannerLogic.ts
+++ b/frontend/src/scenes/insights/dataRetention/insightRetentionBannerLogic.ts
@@ -1,4 +1,4 @@
-import { connect, kea, key, path, props, selectors } from 'kea'
+import { MakeLogicType, connect, kea, key, path, props, selectors } from 'kea'
 
 import { dayjs } from 'lib/dayjs'
 import { insightDataLogic } from 'scenes/insights/insightDataLogic'
@@ -8,8 +8,40 @@ import { keyForInsightLogicProps } from 'scenes/insights/sharedUtils'
 import { isDataVisualizationNode, isHogQLQuery } from '~/queries/utils'
 import { InsightLogicProps } from '~/types'
 
+import type { DateRange, Node } from '../../../queries/schema/schema-general'
 import { dataRetentionBannerLogic } from './dataRetentionBannerLogic'
-import type { insightRetentionBannerLogicType } from './insightRetentionBannerLogicType'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightRetentionBannerLogicValues {
+    retentionMonths: number | null // dataRetentionBannerLogic
+    warningEligible: boolean // dataRetentionBannerLogic
+    insightData: Record<string, any> // insightDataLogic
+    query: Node | null // insightDataLogic
+    dateRange: DateRange | null | undefined // insightVizDataLogic
+    rangeExceedsRetention: boolean
+    shouldShowBanner: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightRetentionBannerLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        rangeExceedsRetention: (
+            dateRange: DateRange | null | undefined,
+            insightData: Record<string, any>,
+            retentionMonths: number | null,
+            query: Node<Record<string, any>> | null
+        ) => boolean
+        shouldShowBanner: (warningEligible: boolean, rangeExceedsRetention: boolean) => boolean
+    }
+}
+
+export type insightRetentionBannerLogicType = MakeLogicType<
+    insightRetentionBannerLogicValues,
+    {},
+    InsightLogicProps,
+    insightRetentionBannerLogicMeta
+>
 
 // Per-insight half of the retention warning: does this insight's range reach past the team's retention window?
 // "All time" is treated as exceeding (it resolves to the earliest event, so a team with only recent data wouldn't
@@ -31,7 +63,12 @@ export const insightRetentionBannerLogic = kea<insightRetentionBannerLogicType>(
     selectors({
         rangeExceedsRetention: [
             (s) => [s.dateRange, s.insightData, s.retentionMonths, s.query],
-            (dateRange, insightData, retentionMonths, query): boolean => {
+            (
+                dateRange: null | import('../../../queries/schema').DateRange | undefined,
+                insightData: Record<string, any>,
+                retentionMonths: number | null,
+                query: null | import('../../../queries/schema').Node
+            ): boolean => {
                 if (!retentionMonths) {
                     return false
                 }
@@ -52,7 +89,8 @@ export const insightRetentionBannerLogic = kea<insightRetentionBannerLogicType>(
         ],
         shouldShowBanner: [
             (s) => [s.warningEligible, s.rangeExceedsRetention],
-            (warningEligible, rangeExceedsRetention): boolean => warningEligible && rangeExceedsRetention,
+            (warningEligible: boolean, rangeExceedsRetention: boolean): boolean =>
+                warningEligible && rangeExceedsRetention,
         ],
     }),
 ])
diff --git a/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterGroup/actionFilterGroupLogic.ts b/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterGroup/actionFilterGroupLogic.ts
index 82d45e626986..eaba82f5702b 100644
--- a/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterGroup/actionFilterGroupLogic.ts
+++ b/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterGroup/actionFilterGroupLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 
 import { TaxonomicFilterGroupType } from 'lib/components/TaxonomicFilter/types'
 import { uuid } from 'lib/utils/dom'
@@ -6,8 +6,9 @@ import { MathCategory, mathTypeToApiValues, mathsLogic } from 'scenes/trends/mat
 
 import { AnyPropertyFilter, EntityType, EntityTypes, FilterLogicalOperator } from '~/types'
 
+import type { ActionFilter, AnyDataWarehouseFilter, EntityFilter } from '../../../../../types'
+import type { MathDefinition } from '../../../../trends/mathsLogic'
 import { LocalFilter, entityFilterLogic } from '../entityFilterLogic'
-import type { actionFilterGroupLogicType } from './actionFilterGroupLogicType'
 
 export interface ActionFilterGroupLogicProps {
     filterUuid: string
@@ -28,6 +29,162 @@ function getMathProps(filter: LocalFilter): Record<string, any> {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface actionFilterGroupLogicValues {
+    localFilters: LocalFilter[]; // entityFilterLogic
+    mathDefinitions: Partial<Record<string, MathDefinition>>; // mathsLogic
+    groupFilter: LocalFilter | undefined;
+    isHogQLDropdownVisible: boolean;
+    nestedFilters: LocalFilter[];
+    operator: FilterLogicalOperator;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface actionFilterGroupLogicActions {
+    updateParentFilter: (filter: (ActionFilter | AnyDataWarehouseFilter | EntityFilter) & {
+        index: number;
+        table_name?: string;
+        [key: string]: any;
+    }) => {
+        custom_name?: string | null | undefined;
+        id: number | string | null;
+        index: number;
+        name?: string | null | undefined;
+        optionalInFunnel?: boolean | undefined;
+        order?: number | undefined;
+        table_name?: string | undefined;
+        type?: EntityType | undefined;
+        [key: string]: any;
+    } | {
+        custom_name?: string | null | undefined;
+        days?: string[] | undefined;
+        id: number | string | null;
+        index: number;
+        math?: string | undefined;
+        math_group_type_index?: number | null | undefined;
+        math_hogql?: string | null | undefined;
+        math_property?: string | null | undefined;
+        math_property_type?: TaxonomicFilterGroupType | null | undefined;
+        name?: string | null | undefined;
+        nestedFilters?: EntityFilter[] | null | undefined;
+        operator?: FilterLogicalOperator | null | undefined;
+        optionalInFunnel?: boolean | undefined;
+        order?: number | undefined;
+        properties?: AnyPropertyFilter[] | undefined;
+        table_name?: string | undefined;
+        type: EntityType;
+        [key: string]: any;
+    } | {
+        aggregation_target_field: string;
+        created_at_field: string;
+        custom_name?: string | null | undefined;
+        days?: string[] | undefined;
+        id: number | string | null;
+        index: number;
+        math?: string | undefined;
+        math_group_type_index?: number | null | undefined;
+        math_hogql?: string | null | undefined;
+        math_property?: string | null | undefined;
+        math_property_type?: TaxonomicFilterGroupType | null | undefined;
+        name?: string | null | undefined;
+        nestedFilters?: EntityFilter[] | null | undefined;
+        operator?: FilterLogicalOperator | null | undefined;
+        optionalInFunnel?: boolean | undefined;
+        order?: number | undefined;
+        properties?: AnyPropertyFilter[] | undefined;
+        table_name: string;
+        timestamp_field: string;
+        type: EntityType;
+        [key: string]: any;
+    } | {
+        aggregation_target_field: string;
+        custom_name?: string | null | undefined;
+        days?: string[] | undefined;
+        id: number | string | null;
+        id_field: string;
+        index: number;
+        math?: string | undefined;
+        math_group_type_index?: number | null | undefined;
+        math_hogql?: string | null | undefined;
+        math_property?: string | null | undefined;
+        math_property_type?: TaxonomicFilterGroupType | null | undefined;
+        name?: string | null | undefined;
+        nestedFilters?: EntityFilter[] | null | undefined;
+        operator?: FilterLogicalOperator | null | undefined;
+        optionalInFunnel?: boolean | undefined;
+        order?: number | undefined;
+        properties?: AnyPropertyFilter[] | undefined;
+        table_name: string;
+        timestamp_field: string;
+        type: EntityType;
+        [key: string]: any;
+    } | {
+        custom_name?: string | null | undefined;
+        days?: string[] | undefined;
+        distinct_id_field: string;
+        id: number | string | null;
+        id_field: string;
+        index: number;
+        math?: string | undefined;
+        math_group_type_index?: number | null | undefined;
+        math_hogql?: string | null | undefined;
+        math_property?: string | null | undefined;
+        math_property_type?: TaxonomicFilterGroupType | null | undefined;
+        name?: string | null | undefined;
+        nestedFilters?: EntityFilter[] | null | undefined;
+        operator?: FilterLogicalOperator | null | undefined;
+        optionalInFunnel?: boolean | undefined;
+        order?: number | undefined;
+        properties?: AnyPropertyFilter[] | undefined;
+        table_name: string;
+        timestamp_field: string;
+        type: EntityType;
+        [key: string]: any;
+    }; // entityFilterLogic
+    addNestedFilter: (id: string, name: string, type: EntityType) => {
+        id: string;
+        name: string;
+        type: EntityType;
+    };
+    removeNestedFilter: (nestedIndex: number) => {
+        nestedIndex: number;
+    };
+    setHogQLDropdownVisible: (visible: boolean) => {
+        visible: boolean;
+    };
+    setMath: (selectedMath: string | undefined, defaultMathHogQLExpression: string) => {
+        defaultMathHogQLExpression: string;
+        selectedMath: string | undefined;
+    };
+    setMathHogQL: (hogql: string) => {
+        hogql: string;
+    };
+    setMathProperty: (property: string, propertyType: TaxonomicFilterGroupType) => {
+        property: string;
+        propertyType: TaxonomicFilterGroupType;
+    };
+    updateNestedFilter: (nestedIndex: number, updates: Partial<LocalFilter>) => {
+        nestedIndex: number;
+        updates: Partial<LocalFilter>;
+    };
+    updateNestedFilterProperties: (nestedIndex: number, properties: AnyPropertyFilter[]) => {
+        nestedIndex: number;
+        properties: AnyPropertyFilter[];
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface actionFilterGroupLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        groupFilter: (localFilters: LocalFilter[], groupIndex: number) => LocalFilter | undefined;
+        nestedFilters: (groupFilter: LocalFilter | undefined) => LocalFilter[];
+        operator: (groupFilter: LocalFilter | undefined) => FilterLogicalOperator;
+    };
+}
+
+export type actionFilterGroupLogicType = MakeLogicType<actionFilterGroupLogicValues, actionFilterGroupLogicActions, ActionFilterGroupLogicProps, actionFilterGroupLogicMeta>;
+
 export const actionFilterGroupLogic = kea<actionFilterGroupLogicType>([
     path(['scenes', 'insights', 'filters', 'ActionFilter', 'ActionFilterGroup', 'actionFilterGroupLogic']),
     props({} as ActionFilterGroupLogicProps),
@@ -66,11 +223,11 @@ export const actionFilterGroupLogic = kea<actionFilterGroupLogicType>([
     selectors({
         groupFilter: [
             (s, p) => [s.localFilters, p.groupIndex],
-            (localFilters, groupIndex): LocalFilter | undefined => localFilters[groupIndex],
+            (localFilters: LocalFilter[], groupIndex: number): LocalFilter | undefined => localFilters[groupIndex],
         ],
         nestedFilters: [
             (s) => [s.groupFilter],
-            (groupFilter): LocalFilter[] =>
+            (groupFilter: LocalFilter | undefined): LocalFilter[] =>
                 ((groupFilter?.nestedFilters as LocalFilter[] | undefined) || []).map((val, i) => ({
                     ...val,
                     order: i,
@@ -78,7 +235,8 @@ export const actionFilterGroupLogic = kea<actionFilterGroupLogicType>([
         ],
         operator: [
             (s) => [s.groupFilter],
-            (groupFilter): FilterLogicalOperator => groupFilter?.operator || FilterLogicalOperator.Or,
+            (groupFilter: LocalFilter | undefined): FilterLogicalOperator =>
+                groupFilter?.operator || FilterLogicalOperator.Or,
         ],
     }),
 
diff --git a/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterGroup/nestedFilterLogic.ts b/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterGroup/nestedFilterLogic.ts
index 02836ca01439..0a68c2b03bb8 100644
--- a/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterGroup/nestedFilterLogic.ts
+++ b/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterGroup/nestedFilterLogic.ts
@@ -1,10 +1,9 @@
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 
 import { AnyPropertyFilter } from '~/types'
 
 import { LocalFilter } from '../entityFilterLogic'
 import { actionFilterGroupLogic } from './actionFilterGroupLogic'
-import type { nestedFilterLogicType } from './nestedFilterLogicType'
 
 export interface NestedFilterLogicProps {
     groupFilterUuid: string
@@ -13,6 +12,80 @@ export interface NestedFilterLogicProps {
     groupIndex: number
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface nestedFilterLogicValues {
+    entityFilterVisible: Record<number, boolean>
+    filterVisible: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface nestedFilterLogicActions {
+    removeNestedFilter: (nestedIndex: number) => {
+        nestedIndex: number
+    } // actionFilterGroupLogic
+    updateNestedFilter: (
+        nestedIndex: number,
+        updates: Partial<LocalFilter>
+    ) => {
+        nestedIndex: number
+        updates: Partial<LocalFilter>
+    } // actionFilterGroupLogic
+    updateNestedFilterProperties: (
+        nestedIndex: number,
+        properties: AnyPropertyFilter[]
+    ) => {
+        nestedIndex: number
+        properties: AnyPropertyFilter[]
+    } // actionFilterGroupLogic
+    convertFilterToGroup: () => {}
+    duplicateFilter: () => {}
+    removeLocalFilter: (filter: { index: number }) => {
+        filter: {
+            index: number
+        }
+    }
+    selectFilter: () => {}
+    setEntityFilterVisibility: (
+        index: number,
+        value: boolean
+    ) => {
+        index: number
+        value: boolean
+    }
+    updateFilter: (
+        filter: Partial<LocalFilter> & {
+            index: number
+        }
+    ) => {
+        filter: Partial<LocalFilter> & {
+            index: number
+        }
+    }
+    updateFilterMath: () => {}
+    updateFilterOptional: () => {}
+    updateFilterProperty: (filter: { index: number; properties: AnyPropertyFilter[] }) => {
+        filter: {
+            index: number
+            properties: AnyPropertyFilter[]
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface nestedFilterLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        entityFilterVisible: (filterVisible: boolean, nestedIndex: number) => Record<number, boolean>
+    }
+}
+
+export type nestedFilterLogicType = MakeLogicType<
+    nestedFilterLogicValues,
+    nestedFilterLogicActions,
+    NestedFilterLogicProps,
+    nestedFilterLogicMeta
+>
+
 /**
  * Minimal logic for nested filters within an ActionFilterGroup.
  * Implements only the actions required by ActionFilterRow and delegates
@@ -59,7 +132,7 @@ export const nestedFilterLogic = kea<nestedFilterLogicType>([
     selectors({
         entityFilterVisible: [
             (s, p) => [s.filterVisible, p.nestedIndex],
-            (filterVisible, nestedIndex): Record<number, boolean> => ({
+            (filterVisible: boolean, nestedIndex: number): Record<number, boolean> => ({
                 [nestedIndex]: filterVisible,
             }),
         ],
diff --git a/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterRow/types.ts b/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterRow/types.ts
index 21d789e2e2f4..b6bb68d8a282 100644
--- a/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterRow/types.ts
+++ b/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterRow/types.ts
@@ -16,7 +16,7 @@ import {
 } from '~/types'
 
 import { LocalFilter } from '../entityFilterLogic'
-import { entityFilterLogicType } from '../entityFilterLogicType'
+import type { entityFilterLogicType } from '../entityFilterLogic'
 
 export enum MathAvailability {
     All,
diff --git a/frontend/src/scenes/insights/filters/ActionFilter/entityFilterLogic.ts b/frontend/src/scenes/insights/filters/ActionFilter/entityFilterLogic.ts
index 4b93a57f8970..db5053570114 100644
--- a/frontend/src/scenes/insights/filters/ActionFilter/entityFilterLogic.ts
+++ b/frontend/src/scenes/insights/filters/ActionFilter/entityFilterLogic.ts
@@ -1,5 +1,5 @@
 import { deepEqual as equal } from 'fast-equals'
-import { actions, connect, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 
 import { convertPropertyGroupToProperties } from 'lib/components/PropertyFilters/utils'
 import { defaultDataWarehousePopoverFields } from 'lib/components/TaxonomicFilter/taxonomicFilterLogic'
@@ -21,7 +21,7 @@ import {
     FilterType,
 } from '~/types'
 
-import type { entityFilterLogicType } from './entityFilterLogicType'
+import type { TaxonomicFilterGroupType } from '../../../../lib/components/TaxonomicFilter/types'
 
 export type LocalFilter = ActionFilter & {
     order: number
@@ -113,6 +113,198 @@ export interface EntityFilterProps {
     dataWarehousePopoverFields?: DataWarehousePopoverField[]
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface entityFilterLogicValues {
+    entityFilterVisible: boolean[];
+    filters: FilterType;
+    localFilters: LocalFilter[];
+    modalVisible: boolean;
+    selectedFilter: ActionFilter | EntityFilter | null;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface entityFilterLogicActions {
+    addFilter: () => {
+        value: true;
+    };
+    convertFilterToGroup: (index: number) => {
+        index: number;
+    };
+    duplicateFilter: (filter: ActionFilter | EntityFilter) => {
+        filter: ActionFilter | EntityFilter;
+    };
+    hideModal: () => {
+        value: true;
+    };
+    removeLocalFilter: (filter: Partial<EntityFilter> & {
+        index: number;
+    }) => {
+        index: number;
+        type: EntityType | undefined;
+    };
+    renameFilter: (custom_name: string) => {
+        custom_name: string;
+    };
+    renameLocalFilter: (index: number, custom_name: string) => {
+        custom_name: string;
+        index: number;
+    };
+    selectFilter: (filter: ActionFilter | EntityFilter | null) => {
+        filter: ActionFilter | EntityFilter | null;
+    };
+    setEntityFilterVisibility: (index: number, value: boolean) => {
+        index: number;
+        value: boolean;
+    };
+    setFilters: (filters: LocalFilter[]) => {
+        filters: LocalFilter[];
+    };
+    setLocalFilters: (filters: FilterType) => {
+        filters: FilterType;
+    };
+    showModal: () => {
+        value: true;
+    };
+    splitLocalFilter: (index: number) => {
+        index: number;
+    };
+    updateFilter: (filter: (ActionFilter | AnyDataWarehouseFilter | EntityFilter) & {
+        index: number;
+        table_name?: string;
+        [key: string]: any;
+    }) => {
+        custom_name?: string | null | undefined;
+        id: number | string | null;
+        index: number;
+        name?: string | null | undefined;
+        optionalInFunnel?: boolean | undefined;
+        order?: number | undefined;
+        table_name?: string | undefined;
+        type?: EntityType | undefined;
+        [key: string]: any;
+    } | {
+        custom_name?: string | null | undefined;
+        days?: string[] | undefined;
+        id: number | string | null;
+        index: number;
+        math?: string | undefined;
+        math_group_type_index?: number | null | undefined;
+        math_hogql?: string | null | undefined;
+        math_property?: string | null | undefined;
+        math_property_type?: TaxonomicFilterGroupType | null | undefined;
+        name?: string | null | undefined;
+        nestedFilters?: EntityFilter[] | null | undefined;
+        operator?: FilterLogicalOperator | null | undefined;
+        optionalInFunnel?: boolean | undefined;
+        order?: number | undefined;
+        properties?: AnyPropertyFilter[] | undefined;
+        table_name?: string | undefined;
+        type: EntityType;
+        [key: string]: any;
+    } | {
+        aggregation_target_field: string;
+        custom_name?: string | null | undefined;
+        days?: string[] | undefined;
+        id: number | string | null;
+        id_field: string;
+        index: number;
+        math?: string | undefined;
+        math_group_type_index?: number | null | undefined;
+        math_hogql?: string | null | undefined;
+        math_property?: string | null | undefined;
+        math_property_type?: TaxonomicFilterGroupType | null | undefined;
+        name?: string | null | undefined;
+        nestedFilters?: EntityFilter[] | null | undefined;
+        operator?: FilterLogicalOperator | null | undefined;
+        optionalInFunnel?: boolean | undefined;
+        order?: number | undefined;
+        properties?: AnyPropertyFilter[] | undefined;
+        table_name: string;
+        timestamp_field: string;
+        type: EntityType;
+        [key: string]: any;
+    } | {
+        custom_name?: string | null | undefined;
+        days?: string[] | undefined;
+        distinct_id_field: string;
+        id: number | string | null;
+        id_field: string;
+        index: number;
+        math?: string | undefined;
+        math_group_type_index?: number | null | undefined;
+        math_hogql?: string | null | undefined;
+        math_property?: string | null | undefined;
+        math_property_type?: TaxonomicFilterGroupType | null | undefined;
+        name?: string | null | undefined;
+        nestedFilters?: EntityFilter[] | null | undefined;
+        operator?: FilterLogicalOperator | null | undefined;
+        optionalInFunnel?: boolean | undefined;
+        order?: number | undefined;
+        properties?: AnyPropertyFilter[] | undefined;
+        table_name: string;
+        timestamp_field: string;
+        type: EntityType;
+        [key: string]: any;
+    } | {
+        aggregation_target_field: string;
+        created_at_field: string;
+        custom_name?: string | null | undefined;
+        days?: string[] | undefined;
+        id: number | string | null;
+        index: number;
+        math?: string | undefined;
+        math_group_type_index?: number | null | undefined;
+        math_hogql?: string | null | undefined;
+        math_property?: string | null | undefined;
+        math_property_type?: TaxonomicFilterGroupType | null | undefined;
+        name?: string | null | undefined;
+        nestedFilters?: EntityFilter[] | null | undefined;
+        operator?: FilterLogicalOperator | null | undefined;
+        optionalInFunnel?: boolean | undefined;
+        order?: number | undefined;
+        properties?: AnyPropertyFilter[] | undefined;
+        table_name: string;
+        timestamp_field: string;
+        type: EntityType;
+        [key: string]: any;
+    };
+    updateFilterMath: (filter: Partial<ActionFilter> & {
+        index: number;
+    }) => {
+        index: number;
+        math: string | undefined;
+        math_group_type_index: number | null | undefined;
+        math_hogql: string | null | undefined;
+        math_property: string | null | undefined;
+        math_property_type: TaxonomicFilterGroupType | null | undefined;
+        type: EntityType;
+    };
+    updateFilterOptional: (filter: Partial<ActionFilter> & {
+        index: number;
+    }) => {
+        index: number;
+        optionalInFunnel: boolean | undefined;
+        type: EntityType;
+    };
+    updateFilterProperty: (filter: Partial<EntityFilter> & {
+        index?: number;
+        properties: AnyPropertyFilter[];
+    }) => {
+        index: number | undefined;
+        properties: AnyPropertyFilter[];
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface entityFilterLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        filters: (localFilters: LocalFilter[]) => FilterType;
+    };
+}
+
+export type entityFilterLogicType = MakeLogicType<entityFilterLogicValues, entityFilterLogicActions, EntityFilterProps, entityFilterLogicMeta>;
+
 export const entityFilterLogic = kea<entityFilterLogicType>([
     props({} as EntityFilterProps),
     key((props) => props.typeKey),
@@ -234,7 +426,7 @@ export const entityFilterLogic = kea<entityFilterLogicType>([
     })),
 
     selectors({
-        filters: [(s) => [s.localFilters], (localFilters): FilterType => toFilters(localFilters)],
+        filters: [(s) => [s.localFilters], (localFilters: LocalFilter[]): FilterType => toFilters(localFilters)],
     }),
 
     listeners(({ actions, values, props }) => ({
diff --git a/frontend/src/scenes/insights/filters/ActionFilter/renameModalLogic.ts b/frontend/src/scenes/insights/filters/ActionFilter/renameModalLogic.ts
index 759e346e8f58..57b1c14368ef 100644
--- a/frontend/src/scenes/insights/filters/ActionFilter/renameModalLogic.ts
+++ b/frontend/src/scenes/insights/filters/ActionFilter/renameModalLogic.ts
@@ -1,17 +1,39 @@
-import { actions, connect, kea, key, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, path, props, reducers } from 'kea'
 
 import { entityFilterLogic } from 'scenes/insights/filters/ActionFilter/entityFilterLogic'
 import { getDisplayNameFromEntityFilter } from 'scenes/insights/utils'
 
 import { EntityFilterTypes } from '~/types'
 
-import type { renameModalLogicType } from './renameModalLogicType'
+import type { ActionFilter, EntityFilter } from '../../../../types'
 
 export interface RenameModalProps {
     filter: EntityFilterTypes
     typeKey: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface renameModalLogicValues {
+    name: string;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface renameModalLogicActions {
+    selectFilter: (filter: ActionFilter | EntityFilter | null) => {
+        filter: ActionFilter | EntityFilter | null;
+    }; // entityFilterLogic
+    setName: (name: string) => {
+        name: string;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface renameModalLogicMeta {
+    key: string;
+}
+
+export type renameModalLogicType = MakeLogicType<renameModalLogicValues, renameModalLogicActions, RenameModalProps, renameModalLogicMeta>;
+
 export const renameModalLogic = kea<renameModalLogicType>([
     props({} as RenameModalProps),
     key((props) => props.typeKey),
diff --git a/frontend/src/scenes/insights/filters/BreakdownFilter/breakdownTagLogic.ts b/frontend/src/scenes/insights/filters/BreakdownFilter/breakdownTagLogic.ts
index ff5cd8089a4f..6691f43faf76 100644
--- a/frontend/src/scenes/insights/filters/BreakdownFilter/breakdownTagLogic.ts
+++ b/frontend/src/scenes/insights/filters/BreakdownFilter/breakdownTagLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 
 import {
     breakdownFilterToTaxonomicFilterType,
@@ -14,7 +14,15 @@ import { cohortsModel } from '~/models/cohortsModel'
 import { propertyDefinitionsModel } from '~/models/propertyDefinitionsModel'
 import { AvailableFeature, InsightLogicProps } from '~/types'
 
-import type { breakdownTagLogicType } from './breakdownTagLogicType'
+import type { TaxonomicFilterValue } from '../../../../lib/components/TaxonomicFilter/types'
+import type { Breakdown, BreakdownFilter } from '../../../../queries/schema/schema-general'
+import type {
+    CohortType,
+    PropertyDefinition,
+    PropertyDefinitionType,
+    TeamPublicType,
+    TeamType,
+} from '../../../../types'
 import { taxonomicBreakdownFilterLogic } from './taxonomicBreakdownFilterLogic'
 import { isURLNormalizeable } from './taxonomicBreakdownFilterUtils'
 
@@ -25,6 +33,168 @@ export interface BreakdownTagLogicProps {
     isTrends: boolean
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface breakdownTagLogicValues {
+    cohortsById: Partial<Record<number | string, CohortType>> // cohortsModel
+    getPropertyDefinition: (
+        s: TaxonomicFilterValue,
+        type: PropertyDefinitionType,
+        groupTypeIndex?: number
+    ) => PropertyDefinition | null // propertyDefinitionsModel
+    breakdownFilter: BreakdownFilter // taxonomicBreakdownFilterLogic
+    globalBinCount: number | undefined // taxonomicBreakdownFilterLogic
+    globalHistogramBinsUsed: boolean // taxonomicBreakdownFilterLogic
+    globalNormalizeBreakdownUrl: boolean // taxonomicBreakdownFilterLogic
+    globalPathCleaningEnabled: boolean // taxonomicBreakdownFilterLogic
+    isMultipleBreakdownsEnabled: boolean // taxonomicBreakdownFilterLogic
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean // userLogic
+    breakdown: number | string
+    breakdownType: string
+    hasAdvancedPaths: boolean
+    hasPathCleaningFilters: boolean
+    histogramBinCount: number | undefined
+    histogramBinsUsed: boolean
+    isHistogramable: boolean
+    isNormalizeable: boolean
+    isPathCleaningAvailable: boolean
+    localHistogramBinCount: number | undefined
+    localNormalizeBreakdownURL: boolean | undefined
+    multipleBreakdown: Breakdown | undefined
+    normalizeBreakdownURL: boolean
+    pathCleaningEnabled: boolean
+    propertyDefinition: PropertyDefinition | null
+    taxonomicBreakdownType: TaxonomicFilterGroupType | undefined
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface breakdownTagLogicActions {
+    removeBreakdownFromList: (
+        breakdown: number | string,
+        breakdownType: string
+    ) => {
+        breakdown: number | string
+        breakdownType: string
+    } // taxonomicBreakdownFilterLogic
+    setHistogramBinCountInList: (
+        breakdown: number | string,
+        breakdownType: string,
+        count: number | undefined
+    ) => {
+        breakdown: number | string
+        breakdownType: string
+        count: number | undefined
+    } // taxonomicBreakdownFilterLogic
+    setHistogramBinsUsedInList: (
+        breakdown: number | string,
+        breakdownType: string,
+        binsUsed: boolean,
+        binCount?: number | undefined
+    ) => {
+        binCount: number | undefined
+        binsUsed: boolean
+        breakdown: number | string
+        breakdownType: string
+    } // taxonomicBreakdownFilterLogic
+    setNormalizeBreakdownURLInList: (
+        breakdown: number | string,
+        breakdownType: string,
+        normalizeBreakdownURL: boolean
+    ) => {
+        breakdown: number | string
+        breakdownType: string
+        normalizeBreakdownURL: boolean
+    } // taxonomicBreakdownFilterLogic
+    setPathCleaningEnabledInList: (
+        breakdown: number | string,
+        breakdownType: string,
+        pathCleaningEnabled: boolean
+    ) => {
+        breakdown: number | string
+        breakdownType: string
+        pathCleaningEnabled: boolean
+    } // taxonomicBreakdownFilterLogic
+    removeBreakdown: () => {
+        value: true
+    }
+    setHistogramBinCount: (count: number) => {
+        count: number
+    }
+    setHistogramBinsUsed: (binsUsed: boolean) => {
+        binsUsed: boolean
+    }
+    setNormalizeBreakdownURL: (normalizeURL: boolean) => {
+        normalizeURL: boolean
+    }
+    setPathCleaningEnabled: (pathCleaningEnabled: boolean) => {
+        pathCleaningEnabled: boolean
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface breakdownTagLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        breakdown: (breakdown: number | string) => number | string
+        breakdownType: (breakdownType: string) => string
+        propertyDefinition: (
+            getPropertyDefinition: (
+                s: TaxonomicFilterValue,
+                type: PropertyDefinitionType,
+                groupTypeIndex?: number
+            ) => PropertyDefinition | null,
+            breakdown: number | string,
+            breakdownType: string
+        ) => PropertyDefinition | null
+        isHistogramable: (isTrends: boolean, propertyDefinition: PropertyDefinition | null) => boolean
+        isNormalizeable: (propertyDefinition: PropertyDefinition | null) => boolean
+        multipleBreakdown: (
+            breakdownFilter: BreakdownFilter,
+            breakdown: number | string,
+            breakdownType: string
+        ) => Breakdown | undefined
+        histogramBinsUsed: (
+            isMultipleBreakdownsEnabled: boolean,
+            multipleBreakdown: Breakdown | undefined,
+            globalHistogramBinsUsed: boolean
+        ) => boolean
+        histogramBinCount: (
+            isMultipleBreakdownsEnabled: boolean,
+            localHistogramBinCount: number | undefined,
+            globalBinCount: number | undefined,
+            multipleBreakdown: Breakdown | undefined
+        ) => number | undefined
+        normalizeBreakdownURL: (
+            isMultipleBreakdownsEnabled: boolean,
+            localNormalizeBreakdownURL: boolean | undefined,
+            globalNormalizeBreakdownUrl: boolean,
+            multipleBreakdown: Breakdown | undefined
+        ) => boolean
+        pathCleaningEnabled: (globalPathCleaningEnabled: boolean) => boolean
+        hasAdvancedPaths: (
+            hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean
+        ) => boolean
+        hasPathCleaningFilters: (currentTeam: TeamPublicType | TeamType | null) => boolean
+        isPathCleaningAvailable: (
+            isNormalizeable: boolean,
+            hasAdvancedPaths: boolean,
+            hasPathCleaningFilters: boolean
+        ) => boolean
+        taxonomicBreakdownType: (
+            isMultipleBreakdownsEnabled: boolean,
+            breakdownFilter: BreakdownFilter,
+            multipleBreakdown: Breakdown | undefined
+        ) => TaxonomicFilterGroupType | undefined
+    }
+}
+
+export type breakdownTagLogicType = MakeLogicType<
+    breakdownTagLogicValues,
+    breakdownTagLogicActions,
+    BreakdownTagLogicProps,
+    breakdownTagLogicMeta
+>
+
 export const breakdownTagLogic = kea<breakdownTagLogicType>([
     props({} as BreakdownTagLogicProps),
     key(({ insightProps, breakdown }) => `${keyForInsightLogicProps('new')(insightProps)}-${breakdown}`),
@@ -90,31 +260,44 @@ export const breakdownTagLogic = kea<breakdownTagLogicType>([
         ],
     }),
     selectors({
-        breakdown: [(_, props) => [props.breakdown], (breakdown) => breakdown],
-        breakdownType: [(_, props) => [props.breakdownType], (breakdownType) => breakdownType],
+        breakdown: [(_, props) => [props.breakdown], (breakdown: number | string) => breakdown],
+        breakdownType: [(_, props) => [props.breakdownType], (breakdownType: string) => breakdownType],
         propertyDefinition: [
             (s, p) => [s.getPropertyDefinition, p.breakdown, p.breakdownType],
-            (getPropertyDefinition, breakdown, breakdownType) =>
-                getPropertyDefinition(breakdown, propertyFilterTypeToPropertyDefinitionType(breakdownType)),
+            (
+                getPropertyDefinition: (
+                    s: import('lib/components/TaxonomicFilter/types').TaxonomicFilterValue,
+                    type: import('~/types').PropertyDefinitionType,
+                    groupTypeIndex?: number
+                ) => null | import('~/types').PropertyDefinition,
+                breakdown: number | string,
+                breakdownType: string
+            ) => getPropertyDefinition(breakdown, propertyFilterTypeToPropertyDefinitionType(breakdownType)),
         ],
         isHistogramable: [
             (s, p) => [p.isTrends, s.propertyDefinition],
-            (isTrends, propertyDefinition) => isTrends && !!propertyDefinition?.is_numerical,
+            (isTrends: boolean, propertyDefinition: null | import('~/types').PropertyDefinition) =>
+                isTrends && !!propertyDefinition?.is_numerical,
         ],
         isNormalizeable: [
             (s) => [s.propertyDefinition],
-            (propertyDefinition) => isURLNormalizeable(propertyDefinition?.name || ''),
+            (propertyDefinition: null | import('~/types').PropertyDefinition) =>
+                isURLNormalizeable(propertyDefinition?.name || ''),
         ],
         multipleBreakdown: [
             (s) => [s.breakdownFilter, s.breakdown, s.breakdownType],
-            ({ breakdowns }, breakdown, breakdownType) =>
+            ({ breakdowns }, breakdown: number | string, breakdownType: string) =>
                 breakdowns?.find(
                     (savedBreakdown) => savedBreakdown.property === breakdown && savedBreakdown.type === breakdownType
                 ),
         ],
         histogramBinsUsed: [
             (s) => [s.isMultipleBreakdownsEnabled, s.multipleBreakdown, s.globalHistogramBinsUsed],
-            (isMultipleBreakdownsEnabled, multipleBreakdown, globalHistogramBinsUsed) => {
+            (
+                isMultipleBreakdownsEnabled: boolean,
+                multipleBreakdown: import('../../../../queries/schema').Breakdown | undefined,
+                globalHistogramBinsUsed: boolean
+            ) => {
                 if (isMultipleBreakdownsEnabled) {
                     return multipleBreakdown?.histogram_bin_count != null
                 }
@@ -124,7 +307,12 @@ export const breakdownTagLogic = kea<breakdownTagLogicType>([
         ],
         histogramBinCount: [
             (s) => [s.isMultipleBreakdownsEnabled, s.localHistogramBinCount, s.globalBinCount, s.multipleBreakdown],
-            (isMultipleBreakdownsEnabled, localHistogramBinCount, globalBinCount, multipleBreakdown) => {
+            (
+                isMultipleBreakdownsEnabled: boolean,
+                localHistogramBinCount: number | undefined,
+                globalBinCount: number | undefined,
+                multipleBreakdown: import('../../../../queries/schema').Breakdown | undefined
+            ) => {
                 if (isMultipleBreakdownsEnabled) {
                     return localHistogramBinCount ?? multipleBreakdown?.histogram_bin_count ?? 10
                 }
@@ -140,10 +328,10 @@ export const breakdownTagLogic = kea<breakdownTagLogicType>([
                 s.multipleBreakdown,
             ],
             (
-                isMultipleBreakdownsEnabled,
-                localNormalizeBreakdownURL,
-                globalNormalizeBreakdownUrl,
-                multipleBreakdown
+                isMultipleBreakdownsEnabled: boolean,
+                localNormalizeBreakdownURL: boolean | undefined,
+                globalNormalizeBreakdownUrl: boolean,
+                multipleBreakdown: import('../../../../queries/schema').Breakdown | undefined
             ) => {
                 if (isMultipleBreakdownsEnabled) {
                     return localNormalizeBreakdownURL ?? multipleBreakdown?.normalize_url ?? true
@@ -154,24 +342,30 @@ export const breakdownTagLogic = kea<breakdownTagLogicType>([
         ],
         pathCleaningEnabled: [
             (s) => [s.globalPathCleaningEnabled],
-            (globalPathCleaningEnabled) => globalPathCleaningEnabled,
+            (globalPathCleaningEnabled: boolean) => globalPathCleaningEnabled,
         ],
         hasAdvancedPaths: [
             (s) => [s.hasAvailableFeature],
-            (hasAvailableFeature) => hasAvailableFeature(AvailableFeature.PATHS_ADVANCED),
+            (hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean) =>
+                hasAvailableFeature(AvailableFeature.PATHS_ADVANCED),
         ],
         hasPathCleaningFilters: [
             (s) => [s.currentTeam],
-            (currentTeam) => (currentTeam?.path_cleaning_filters || []).length > 0,
+            (currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType) =>
+                (currentTeam?.path_cleaning_filters || []).length > 0,
         ],
         isPathCleaningAvailable: [
             (s) => [s.isNormalizeable, s.hasAdvancedPaths, s.hasPathCleaningFilters],
-            (isNormalizeable, hasAdvancedPaths, hasPathCleaningFilters) =>
+            (isNormalizeable: boolean, hasAdvancedPaths: boolean, hasPathCleaningFilters: boolean) =>
                 isNormalizeable && hasAdvancedPaths && hasPathCleaningFilters,
         ],
         taxonomicBreakdownType: [
             (s) => [s.isMultipleBreakdownsEnabled, s.breakdownFilter, s.multipleBreakdown],
-            (isMultipleBreakdownsEnabled, breakdownFilter, multipleBreakdown): TaxonomicFilterGroupType | undefined => {
+            (
+                isMultipleBreakdownsEnabled: boolean,
+                breakdownFilter: import('../../../../queries/schema').BreakdownFilter,
+                multipleBreakdown: import('../../../../queries/schema').Breakdown | undefined
+            ): TaxonomicFilterGroupType | undefined => {
                 let breakdownType = isMultipleBreakdownsEnabled
                     ? filterToTaxonomicFilterType(
                           multipleBreakdown?.type,
diff --git a/frontend/src/scenes/insights/filters/BreakdownFilter/taxonomicBreakdownFilterLogic.ts b/frontend/src/scenes/insights/filters/BreakdownFilter/taxonomicBreakdownFilterLogic.ts
index 881c7a56aaaa..dbeaac0824a3 100644
--- a/frontend/src/scenes/insights/filters/BreakdownFilter/taxonomicBreakdownFilterLogic.ts
+++ b/frontend/src/scenes/insights/filters/BreakdownFilter/taxonomicBreakdownFilterLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, defaults, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, defaults, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 
 import {
     breakdownFilterToTaxonomicFilterType,
@@ -18,7 +18,9 @@ import { propertyDefinitionsModel } from '~/models/propertyDefinitionsModel'
 import { Breakdown, BreakdownFilter } from '~/queries/schema/schema-general'
 import { BreakdownType, ChartDisplayType, InsightLogicProps } from '~/types'
 
-import type { taxonomicBreakdownFilterLogicType } from './taxonomicBreakdownFilterLogicType'
+import type { FeatureFlagsSet } from '../../../../lib/logic/featureFlagLogic'
+import type { DatabaseSchemaField } from '../../../../queries/schema/schema-general'
+import type { PropertyDefinition, PropertyDefinitionType } from '../../../../types'
 import { isCohortBreakdown, isMultipleBreakdownType, isURLNormalizeable } from './taxonomicBreakdownFilterUtils'
 
 // Kept in sync with the `@maxItems` on `BreakdownFilter.breakdowns` in schema-general.ts.
@@ -34,6 +36,294 @@ export type TaxonomicBreakdownFilterLogicProps = {
     updateDisplay: ((display: ChartDisplayType | undefined) => void) | null
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface taxonomicBreakdownFilterLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    currentDataWarehouseSchemaColumns: DatabaseSchemaField[] // insightVizDataLogic
+    hasDataWarehouseSeries: boolean // insightVizDataLogic
+    isSingleSeriesDefinition: boolean // insightVizDataLogic
+    getPropertyDefinition: (
+        s: TaxonomicFilterValue,
+        type: PropertyDefinitionType,
+        groupTypeIndex?: number
+    ) => PropertyDefinition | null // propertyDefinitionsModel
+    __ignore: TaxonomicFilterGroupType | null
+    addBreakdownDisabledReason: string | null
+    breakdownArray: Breakdown[] | (number | string)[]
+    breakdownCohortArray: (number | string | Breakdown)[]
+    breakdownFilter: BreakdownFilter
+    breakdownHideOtherAggregation: boolean | null | undefined
+    breakdownLimit: number
+    breakdownOptionsOpened: boolean
+    hasGlobalBreakdownOptions: boolean
+    histogramBinCount: number | undefined
+    histogramBinsUsed: boolean
+    includeSessions: boolean
+    isMultipleBreakdownsEnabled: boolean
+    localBreakdownHideOtherAggregation: boolean | undefined
+    localBreakdownLimit: number | undefined
+    localHistogramBinCount: number | undefined
+    localNormalizeBreakdownURL: boolean | undefined
+    localPathCleaningEnabled: boolean | undefined
+    normalizeBreakdownUrl: boolean
+    pathCleaningEnabled: boolean
+    taxonomicBreakdownType:
+        | TaxonomicFilterGroupType.Metadata
+        | TaxonomicFilterGroupType.Actions
+        | TaxonomicFilterGroupType.CohortsWithAllUsers
+        | TaxonomicFilterGroupType.DataWarehouse
+        | TaxonomicFilterGroupType.DataWarehouseSourceTables
+        | TaxonomicFilterGroupType.DataWarehouseProperties
+        | TaxonomicFilterGroupType.DataWarehousePersonProperties
+        | TaxonomicFilterGroupType.Elements
+        | TaxonomicFilterGroupType.Events
+        | TaxonomicFilterGroupType.InternalEvents
+        | TaxonomicFilterGroupType.InternalEventProperties
+        | TaxonomicFilterGroupType.EventProperties
+        | TaxonomicFilterGroupType.EventFeatureFlags
+        | TaxonomicFilterGroupType.EventMetadata
+        | TaxonomicFilterGroupType.NumericalEventProperties
+        | TaxonomicFilterGroupType.PersonProperties
+        | TaxonomicFilterGroupType.PersonMetadata
+        | TaxonomicFilterGroupType.PageviewUrls
+        | TaxonomicFilterGroupType.PageviewEvents
+        | TaxonomicFilterGroupType.Screens
+        | TaxonomicFilterGroupType.ScreenEvents
+        | TaxonomicFilterGroupType.EmailAddresses
+        | TaxonomicFilterGroupType.AutocaptureEvents
+        | TaxonomicFilterGroupType.CustomEvents
+        | TaxonomicFilterGroupType.Wildcards
+        | TaxonomicFilterGroupType.GroupsPrefix
+        | TaxonomicFilterGroupType.Persons
+        | TaxonomicFilterGroupType.FeatureFlags
+        | TaxonomicFilterGroupType.Insights
+        | TaxonomicFilterGroupType.Experiments
+        | TaxonomicFilterGroupType.Plugins
+        | TaxonomicFilterGroupType.Dashboards
+        | TaxonomicFilterGroupType.GroupNamesPrefix
+        | TaxonomicFilterGroupType.SessionProperties
+        | TaxonomicFilterGroupType.HogQLExpression
+        | TaxonomicFilterGroupType.Notebooks
+        | TaxonomicFilterGroupType.LogEntries
+        | TaxonomicFilterGroupType.ErrorTrackingIssues
+        | TaxonomicFilterGroupType.Logs
+        | TaxonomicFilterGroupType.LogAttributes
+        | TaxonomicFilterGroupType.LogResourceAttributes
+        | TaxonomicFilterGroupType.MetricAttributes
+        | TaxonomicFilterGroupType.Spans
+        | TaxonomicFilterGroupType.SpanAttributes
+        | TaxonomicFilterGroupType.SpanResourceAttributes
+        | TaxonomicFilterGroupType.Replay
+        | TaxonomicFilterGroupType.ReplaySavedFilters
+        | TaxonomicFilterGroupType.RevenueAnalyticsProperties
+        | TaxonomicFilterGroupType.Resources
+        | TaxonomicFilterGroupType.ErrorTrackingProperties
+        | TaxonomicFilterGroupType.ActivityLogProperties
+        | TaxonomicFilterGroupType.MCPProperties
+        | TaxonomicFilterGroupType.MaxAIContext
+        | TaxonomicFilterGroupType.WorkflowVariables
+        | TaxonomicFilterGroupType.SuggestedFilters
+        | TaxonomicFilterGroupType.RecentFilters
+        | TaxonomicFilterGroupType.PinnedFilters
+        | TaxonomicFilterGroupType.Empty
+        | undefined
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface taxonomicBreakdownFilterLogicActions {
+    addBreakdown: (
+        breakdown: TaxonomicFilterValue,
+        taxonomicGroup: TaxonomicFilterGroup
+    ) => {
+        breakdown: TaxonomicFilterValue
+        taxonomicGroup: TaxonomicFilterGroup
+    }
+    removeBreakdown: (
+        breakdown: number | string,
+        breakdownType: string
+    ) => {
+        breakdown: number | string
+        breakdownType: string
+    }
+    replaceBreakdown: (
+        previousBreakdown: {
+            type: string
+            value: number | string
+        },
+        newBreakdown: {
+            group: TaxonomicFilterGroup
+            value: TaxonomicFilterValue
+        }
+    ) => {
+        newBreakdown: {
+            group: TaxonomicFilterGroup
+            value: TaxonomicFilterValue
+        }
+        previousBreakdown: {
+            type: string
+            value: number | string
+        }
+    }
+    setBreakdownHideOtherAggregation: (hidden: boolean) => {
+        hidden: boolean
+    }
+    setBreakdownLimit: (value: number | undefined) => {
+        value: number | undefined
+    }
+    setHistogramBinCount: (
+        breakdown: number | string,
+        breakdownType: string,
+        count: number | undefined
+    ) => {
+        breakdown: number | string
+        breakdownType: string
+        count: number | undefined
+    }
+    setHistogramBinsUsed: (
+        breakdown: number | string,
+        breakdownType: string,
+        binsUsed: boolean,
+        binCount?: number
+    ) => {
+        binCount: number | undefined
+        binsUsed: boolean
+        breakdown: number | string
+        breakdownType: string
+    }
+    setNormalizeBreakdownURL: (
+        breakdown: number | string,
+        breakdownType: string,
+        normalizeBreakdownURL: boolean
+    ) => {
+        breakdown: number | string
+        breakdownType: string
+        normalizeBreakdownURL: boolean
+    }
+    setPathCleaningEnabled: (
+        breakdown: number | string,
+        breakdownType: string,
+        pathCleaningEnabled: boolean
+    ) => {
+        breakdown: number | string
+        breakdownType: string
+        pathCleaningEnabled: boolean
+    }
+    toggleBreakdownOptions: (opened: boolean) => {
+        opened: boolean
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface taxonomicBreakdownFilterLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        isMultipleBreakdownsEnabled: (isTrends: boolean) => boolean
+        breakdownFilter: (breakdownFilter: BreakdownFilter) => BreakdownFilter
+        includeSessions: (isTrends: boolean) => boolean
+        addBreakdownDisabledReason: (
+            breakdownFilter: BreakdownFilter,
+            isMultipleBreakdownsEnabled: boolean,
+            hasDataWarehouseSeries: boolean,
+            isFunnels: boolean,
+            isTrends: boolean,
+            isSingleSeriesDefinition: boolean
+        ) => string | null
+        taxonomicBreakdownType: (
+            breakdownFilter: BreakdownFilter
+        ) =>
+            | TaxonomicFilterGroupType.Metadata
+            | TaxonomicFilterGroupType.Actions
+            | TaxonomicFilterGroupType.CohortsWithAllUsers
+            | TaxonomicFilterGroupType.DataWarehouse
+            | TaxonomicFilterGroupType.DataWarehouseSourceTables
+            | TaxonomicFilterGroupType.DataWarehouseProperties
+            | TaxonomicFilterGroupType.DataWarehousePersonProperties
+            | TaxonomicFilterGroupType.Elements
+            | TaxonomicFilterGroupType.Events
+            | TaxonomicFilterGroupType.InternalEvents
+            | TaxonomicFilterGroupType.InternalEventProperties
+            | TaxonomicFilterGroupType.EventProperties
+            | TaxonomicFilterGroupType.EventFeatureFlags
+            | TaxonomicFilterGroupType.EventMetadata
+            | TaxonomicFilterGroupType.NumericalEventProperties
+            | TaxonomicFilterGroupType.PersonProperties
+            | TaxonomicFilterGroupType.PersonMetadata
+            | TaxonomicFilterGroupType.PageviewUrls
+            | TaxonomicFilterGroupType.PageviewEvents
+            | TaxonomicFilterGroupType.Screens
+            | TaxonomicFilterGroupType.ScreenEvents
+            | TaxonomicFilterGroupType.EmailAddresses
+            | TaxonomicFilterGroupType.AutocaptureEvents
+            | TaxonomicFilterGroupType.CustomEvents
+            | TaxonomicFilterGroupType.Wildcards
+            | TaxonomicFilterGroupType.GroupsPrefix
+            | TaxonomicFilterGroupType.Persons
+            | TaxonomicFilterGroupType.FeatureFlags
+            | TaxonomicFilterGroupType.Insights
+            | TaxonomicFilterGroupType.Experiments
+            | TaxonomicFilterGroupType.Plugins
+            | TaxonomicFilterGroupType.Dashboards
+            | TaxonomicFilterGroupType.GroupNamesPrefix
+            | TaxonomicFilterGroupType.SessionProperties
+            | TaxonomicFilterGroupType.HogQLExpression
+            | TaxonomicFilterGroupType.Notebooks
+            | TaxonomicFilterGroupType.LogEntries
+            | TaxonomicFilterGroupType.ErrorTrackingIssues
+            | TaxonomicFilterGroupType.Logs
+            | TaxonomicFilterGroupType.LogAttributes
+            | TaxonomicFilterGroupType.LogResourceAttributes
+            | TaxonomicFilterGroupType.MetricAttributes
+            | TaxonomicFilterGroupType.Spans
+            | TaxonomicFilterGroupType.SpanAttributes
+            | TaxonomicFilterGroupType.SpanResourceAttributes
+            | TaxonomicFilterGroupType.Replay
+            | TaxonomicFilterGroupType.ReplaySavedFilters
+            | TaxonomicFilterGroupType.RevenueAnalyticsProperties
+            | TaxonomicFilterGroupType.Resources
+            | TaxonomicFilterGroupType.ErrorTrackingProperties
+            | TaxonomicFilterGroupType.ActivityLogProperties
+            | TaxonomicFilterGroupType.MCPProperties
+            | TaxonomicFilterGroupType.MaxAIContext
+            | TaxonomicFilterGroupType.WorkflowVariables
+            | TaxonomicFilterGroupType.SuggestedFilters
+            | TaxonomicFilterGroupType.RecentFilters
+            | TaxonomicFilterGroupType.PinnedFilters
+            | TaxonomicFilterGroupType.Empty
+            | undefined
+        breakdownArray: (
+            breakdownFilter: BreakdownFilter,
+            isMultipleBreakdownsEnabled: boolean
+        ) => Breakdown[] | (number | string)[]
+        breakdownCohortArray: (breakdownArray: Breakdown[] | (number | string)[]) => (number | string | Breakdown)[]
+        histogramBinsUsed: (breakdownFilter: BreakdownFilter) => boolean
+        histogramBinCount: (
+            breakdownFilter: BreakdownFilter,
+            localHistogramBinCount: number | undefined
+        ) => number | undefined
+        breakdownLimit: (breakdownFilter: BreakdownFilter, localBreakdownLimit: number | undefined) => number
+        hasGlobalBreakdownOptions: (breakdownFilter: BreakdownFilter) => boolean
+        normalizeBreakdownUrl: (
+            breakdownFilter: BreakdownFilter,
+            localNormalizeBreakdownURL: boolean | undefined
+        ) => boolean
+        pathCleaningEnabled: (
+            breakdownFilter: BreakdownFilter,
+            localPathCleaningEnabled: boolean | undefined
+        ) => boolean
+        breakdownHideOtherAggregation: (
+            breakdownFilter: BreakdownFilter,
+            localBreakdownHideOtherAggregation: boolean | undefined
+        ) => boolean | null | undefined
+    }
+}
+
+export type taxonomicBreakdownFilterLogicType = MakeLogicType<
+    taxonomicBreakdownFilterLogicValues,
+    taxonomicBreakdownFilterLogicActions,
+    TaxonomicBreakdownFilterLogicProps,
+    taxonomicBreakdownFilterLogicMeta
+>
+
 export const taxonomicBreakdownFilterLogic = kea<taxonomicBreakdownFilterLogicType>([
     props({} as TaxonomicBreakdownFilterLogicProps),
     key((props) => keyForInsightLogicProps('new')(props.insightProps)),
@@ -148,9 +438,9 @@ export const taxonomicBreakdownFilterLogic = kea<taxonomicBreakdownFilterLogicTy
         ],
     }),
     selectors({
-        isMultipleBreakdownsEnabled: [(_, p) => [p.isTrends], (isTrends) => isTrends],
-        breakdownFilter: [(_, p) => [p.breakdownFilter], (breakdownFilter) => breakdownFilter],
-        includeSessions: [(_, p) => [p.isTrends], (isTrends) => isTrends],
+        isMultipleBreakdownsEnabled: [(_, p) => [p.isTrends], (isTrends: boolean) => isTrends],
+        breakdownFilter: [(_, p) => [p.breakdownFilter], (breakdownFilter: BreakdownFilter) => breakdownFilter],
+        includeSessions: [(_, p) => [p.isTrends], (isTrends: boolean) => isTrends],
         addBreakdownDisabledReason: [
             (s, p) => [
                 s.breakdownFilter,
@@ -162,11 +452,11 @@ export const taxonomicBreakdownFilterLogic = kea<taxonomicBreakdownFilterLogicTy
             ],
             (
                 { breakdown, breakdowns, breakdown_type },
-                isMultipleBreakdownsEnabled,
-                hasDataWarehouseSeries,
-                isFunnels,
-                isTrends,
-                isSingleSeriesDefinition
+                isMultipleBreakdownsEnabled: boolean,
+                hasDataWarehouseSeries: boolean,
+                isFunnels: boolean,
+                isTrends: boolean,
+                isSingleSeriesDefinition: boolean
             ): string | null => {
                 if (isMultipleBreakdownsEnabled && (!breakdown_type || isMultipleBreakdownType(breakdown_type))) {
                     if (!!breakdowns && breakdowns.length >= MAX_TRENDS_BREAKDOWNS) {
@@ -195,7 +485,7 @@ export const taxonomicBreakdownFilterLogic = kea<taxonomicBreakdownFilterLogicTy
         ],
         taxonomicBreakdownType: [
             (s) => [s.breakdownFilter],
-            (breakdownFilter) => {
+            (breakdownFilter: BreakdownFilter) => {
                 let breakdownType = breakdownFilterToTaxonomicFilterType(breakdownFilter)
                 if (breakdownType === TaxonomicFilterGroupType.Cohorts) {
                     breakdownType = TaxonomicFilterGroupType.CohortsWithAllUsers
@@ -205,7 +495,7 @@ export const taxonomicBreakdownFilterLogic = kea<taxonomicBreakdownFilterLogicTy
         ],
         breakdownArray: [
             (s) => [s.breakdownFilter, s.isMultipleBreakdownsEnabled],
-            ({ breakdown, breakdowns }, isMultipleBreakdownsEnabled): (string | number)[] | Breakdown[] => {
+            ({ breakdown, breakdowns }, isMultipleBreakdownsEnabled: boolean): (string | number)[] | Breakdown[] => {
                 if (isMultipleBreakdownsEnabled && breakdowns) {
                     return breakdowns
                 }
@@ -215,7 +505,8 @@ export const taxonomicBreakdownFilterLogic = kea<taxonomicBreakdownFilterLogicTy
         ],
         breakdownCohortArray: [
             (s) => [s.breakdownArray],
-            (breakdownArray) => breakdownArray.map((b) => (isNaN(Number(b)) ? b : Number(b))),
+            (breakdownArray: Breakdown[] | (number | string)[]) =>
+                breakdownArray.map((b) => (isNaN(Number(b)) ? b : Number(b))),
         ],
         histogramBinsUsed: [
             (s) => [s.breakdownFilter],
@@ -223,32 +514,33 @@ export const taxonomicBreakdownFilterLogic = kea<taxonomicBreakdownFilterLogicTy
         ],
         histogramBinCount: [
             (s) => [s.breakdownFilter, s.localHistogramBinCount],
-            (breakdownFilter, localHistogramBinCount) =>
+            (breakdownFilter: BreakdownFilter, localHistogramBinCount: number | undefined) =>
                 localHistogramBinCount || breakdownFilter?.breakdown_histogram_bin_count,
         ],
         breakdownLimit: [
             (s) => [s.breakdownFilter, s.localBreakdownLimit],
-            (breakdownFilter, localBreakdownLimit) => localBreakdownLimit || breakdownFilter?.breakdown_limit || 25,
+            (breakdownFilter: BreakdownFilter, localBreakdownLimit: number | undefined) =>
+                localBreakdownLimit || breakdownFilter?.breakdown_limit || 25,
         ],
         // Cohort breakdowns are over a user-picked set, so there's nothing to truncate
         // and no long-tail to bucket as "Other". The global options panel is empty in that case.
         hasGlobalBreakdownOptions: [
             (s) => [s.breakdownFilter],
-            (breakdownFilter) => breakdownFilter?.breakdown_type !== 'cohort',
+            (breakdownFilter: BreakdownFilter) => breakdownFilter?.breakdown_type !== 'cohort',
         ],
         normalizeBreakdownUrl: [
             (s) => [s.breakdownFilter, s.localNormalizeBreakdownURL],
-            (breakdownFilter, localNormalizeBreakdownURL) =>
+            (breakdownFilter: BreakdownFilter, localNormalizeBreakdownURL: boolean | undefined) =>
                 localNormalizeBreakdownURL ?? breakdownFilter.breakdown_normalize_url ?? true,
         ],
         pathCleaningEnabled: [
             (s) => [s.breakdownFilter, s.localPathCleaningEnabled],
-            (breakdownFilter, localPathCleaningEnabled) =>
+            (breakdownFilter: BreakdownFilter, localPathCleaningEnabled: boolean | undefined) =>
                 localPathCleaningEnabled ?? breakdownFilter.breakdown_path_cleaning ?? false,
         ],
         breakdownHideOtherAggregation: [
             (s) => [s.breakdownFilter, s.localBreakdownHideOtherAggregation],
-            (breakdownFilter, localBreakdownHideOtherAggregation) =>
+            (breakdownFilter: BreakdownFilter, localBreakdownHideOtherAggregation: boolean | undefined) =>
                 localBreakdownHideOtherAggregation ?? breakdownFilter.breakdown_hide_other_aggregation,
         ],
     }),
diff --git a/frontend/src/scenes/insights/insightDataLogic.tsx b/frontend/src/scenes/insights/insightDataLogic.tsx
index 532e047b8e3a..f1212f32ec31 100644
--- a/frontend/src/scenes/insights/insightDataLogic.tsx
+++ b/frontend/src/scenes/insights/insightDataLogic.tsx
@@ -1,4 +1,5 @@
 import {
+    MakeLogicType,
     actions,
     afterMount,
     connect,
@@ -48,8 +49,38 @@ import { ExportContext, InsightLogicProps, InsightType } from '~/types'
 
 import { DATAWAREHOUSE_EDITOR_ITEM_ID } from 'products/data_warehouse/frontend/utils'
 
+import type { AlertType } from '../../../../products/alerts/frontend/types'
+import type {
+    DashboardFilter,
+    DataNode,
+    ErrorTrackingQueryResponse,
+    EventsQueryResponse,
+    HogQLAutocompleteResponse,
+    HogQLMetadataResponse,
+    HogQLQueryResponse,
+    HogQueryResponse,
+    LogAttributesQueryResponse,
+    LogValuesQueryResponse,
+    LogsQueryResponse,
+    MetricsQueryResponse,
+    QuerySchema,
+    QueryStatus,
+    RefreshType,
+    SessionsQueryResponse,
+    TraceSpansAggregationQueryResponse,
+    TraceSpansAttributeBreakdownQueryResponse,
+    TraceSpansQueryResponse,
+    TraceSpansTreeQueryResponse,
+} from '../../queries/schema/schema-general'
+import type {
+    AccessControlLevel,
+    DashboardTileBasicType,
+    InsightShortId,
+    QueryBasedInsightModel,
+    SetInsightOptions,
+    UserBasicType,
+} from '../../types'
 import { teamLogic } from '../teamLogic'
-import type { insightDataLogicType } from './insightDataLogicType'
 import { insightDataTimingLogic } from './insightDataTimingLogic'
 import { insightLogic } from './insightLogic'
 import { insightSceneLogic } from './insightSceneLogic'
@@ -61,6 +92,357 @@ export const isInsightSceneInstance = (props: InsightLogicProps): boolean =>
     sceneLogic.values.activeSceneId === Scene.Insight &&
     insightSceneLogic.findMounted()?.values.insightLogicRef?.logic.key === keyForInsightLogicProps('new')(props)
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightDataLogicValues {
+    getInsightRefreshButtonDisabledReason: () => string // dataNodeLogic
+    insightDataError: Record<string, any> | null // dataNodeLogic
+    insightDataLoading: boolean // dataNodeLogic
+    insightDataRaw:
+        | ErrorTrackingQueryResponse
+        | HogQLAutocompleteResponse
+        | HogQLMetadataResponse
+        | HogQLQueryResponse<any[]>
+        | HogQueryResponse
+        | LogAttributesQueryResponse
+        | LogValuesQueryResponse
+        | MetricsQueryResponse
+        | Record<string, any>
+        | SessionsQueryResponse
+        | TraceSpansAggregationQueryResponse
+        | TraceSpansAttributeBreakdownQueryResponse
+        | TraceSpansQueryResponse
+        | null // dataNodeLogic
+    insightLoadingTimeSeconds: number // dataNodeLogic
+    insightPollResponse: Record<string, QueryStatus | null> | null // dataNodeLogic
+    insightQuery: DataNode<Record<string, any>> // dataNodeLogic
+    queryId: string | null // dataNodeLogic
+    filterTestAccountsDefault: boolean // filterTestAccountsDefaultsLogic
+    insight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>> // insightLogic
+    savedInsight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>> // insightLogic
+    currentTeamId: number | null // teamLogic
+    canEditInSqlEditor: boolean
+    exportContext: ExportContext | undefined
+    generatedInsightMetadata: {
+        description: string
+        name: string
+    } | null
+    generatedInsightMetadataLoading: boolean
+    hogQL: string | null
+    hogQLVariables: Record<string, HogQLVariable> | undefined
+    insightData: Record<string, any>
+    internalQuery: Node | null
+    isDataWarehouseQuery: boolean
+    propsQuery: QuerySchema | null | undefined
+    query: Node | null
+    queryChanged: boolean
+    showDebugPanel: boolean
+    showQueryEditor: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightDataLogicActions {
+    loadData: (
+        refresh?: RefreshType | undefined,
+        alreadyRunningQueryId?: string | undefined,
+        overrideQuery?: DataNode<Record<string, any>> | undefined
+    ) => {
+        overrideQuery: DataNode<Record<string, any>> | undefined
+        pollOnly: boolean
+        queryId: string
+        refresh: RefreshType | undefined
+    } // dataNodeLogic
+    loadDataFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    } // dataNodeLogic
+    loadDataSuccess: (
+        response:
+            | ErrorTrackingQueryResponse
+            | HogQLAutocompleteResponse
+            | HogQLMetadataResponse
+            | HogQLQueryResponse<any[]>
+            | HogQueryResponse
+            | LogAttributesQueryResponse
+            | LogValuesQueryResponse
+            | MetricsQueryResponse
+            | Record<string, any>
+            | SessionsQueryResponse
+            | TraceSpansAggregationQueryResponse
+            | TraceSpansAttributeBreakdownQueryResponse
+            | TraceSpansQueryResponse
+            | null
+            | undefined,
+        payload?:
+            | {
+                  overrideQuery: DataNode<Record<string, any>> | undefined
+                  pollOnly: boolean
+                  queryId: string
+                  refresh: RefreshType | undefined
+              }
+            | undefined
+    ) => {
+        payload?: {
+            overrideQuery: DataNode<Record<string, any>> | undefined
+            pollOnly: boolean
+            queryId: string
+            refresh: RefreshType | undefined
+        }
+        response:
+            | ErrorTrackingQueryResponse
+            | HogQLAutocompleteResponse
+            | HogQLMetadataResponse
+            | HogQLQueryResponse<any[]>
+            | HogQueryResponse
+            | LogAttributesQueryResponse
+            | LogValuesQueryResponse
+            | MetricsQueryResponse
+            | Record<string, any>
+            | SessionsQueryResponse
+            | TraceSpansAggregationQueryResponse
+            | TraceSpansAttributeBreakdownQueryResponse
+            | TraceSpansQueryResponse
+            | null
+            | undefined
+    } // dataNodeLogic
+    setInsightData: (
+        response:
+            | ErrorTrackingQueryResponse
+            | EventsQueryResponse
+            | HogQLAutocompleteResponse
+            | HogQLMetadataResponse
+            | HogQLQueryResponse<any[]>
+            | HogQueryResponse
+            | LogAttributesQueryResponse
+            | LogsQueryResponse
+            | LogValuesQueryResponse
+            | MetricsQueryResponse
+            | Record<string, any>
+            | SessionsQueryResponse
+            | TraceSpansAggregationQueryResponse
+            | TraceSpansAttributeBreakdownQueryResponse
+            | TraceSpansQueryResponse
+            | TraceSpansTreeQueryResponse
+    ) =>
+        | ErrorTrackingQueryResponse
+        | EventsQueryResponse
+        | HogQLAutocompleteResponse
+        | HogQLMetadataResponse
+        | HogQLQueryResponse<any[]>
+        | HogQueryResponse
+        | LogAttributesQueryResponse
+        | LogsQueryResponse
+        | LogValuesQueryResponse
+        | MetricsQueryResponse
+        | Record<string, any>
+        | SessionsQueryResponse
+        | TraceSpansAggregationQueryResponse
+        | TraceSpansAttributeBreakdownQueryResponse
+        | TraceSpansQueryResponse
+        | TraceSpansTreeQueryResponse // dataNodeLogic
+    loadInsightSuccess: (
+        insight: {
+            _create_in_folder?: string | null | undefined
+            alerts?: AlertType[] | undefined
+            cache_target_age?: string | null | undefined
+            created_at: string
+            created_by: UserBasicType | null
+            dashboard_tiles: DashboardTileBasicType[] | null
+            dashboards: number[] | null
+            deleted: boolean
+            derived_name?: string | null | undefined
+            description?: string | undefined
+            disable_baseline?: boolean | undefined
+            favorited?: boolean | undefined
+            id: number
+            is_cached?: boolean | undefined
+            is_sample: boolean
+            last_modified_at: string
+            last_modified_by: UserBasicType | null
+            last_refresh: string | null
+            last_viewed_at?: string | null | undefined
+            name: string
+            next?: string | undefined
+            next_allowed_client_refresh?: string | null | undefined
+            order: number | null
+            query: Node<Record<string, any>> | null
+            query_status?: QueryStatus | undefined
+            result: any
+            saved: boolean
+            short_id: InsightShortId
+            tags?: string[] | undefined
+            timezone?: string | null | undefined
+            updated_at: string
+            user_access_level: AccessControlLevel
+            view_count?: number | undefined
+            viewers?: UserBasicType[] | undefined
+        },
+        payload?:
+            | {
+                  filtersOverride: DashboardFilter | null | undefined
+                  shortId: InsightShortId
+                  tileFiltersOverride: DashboardFilter | null | undefined
+                  variablesOverride: Record<string, HogQLVariable> | null | undefined
+              }
+            | undefined
+    ) => {
+        insight: {
+            _create_in_folder?: string | null | undefined
+            alerts?: AlertType[] | undefined
+            cache_target_age?: string | null | undefined
+            created_at: string
+            created_by: UserBasicType | null
+            dashboard_tiles: DashboardTileBasicType[] | null
+            dashboards: number[] | null
+            deleted: boolean
+            derived_name?: string | null | undefined
+            description?: string | undefined
+            disable_baseline?: boolean | undefined
+            favorited?: boolean | undefined
+            id: number
+            is_cached?: boolean | undefined
+            is_sample: boolean
+            last_modified_at: string
+            last_modified_by: UserBasicType | null
+            last_refresh: string | null
+            last_viewed_at?: string | null | undefined
+            name: string
+            next?: string | undefined
+            next_allowed_client_refresh?: string | null | undefined
+            order: number | null
+            query: Node<Record<string, any>> | null
+            query_status?: QueryStatus | undefined
+            result: any
+            saved: boolean
+            short_id: InsightShortId
+            tags?: string[] | undefined
+            timezone?: string | null | undefined
+            updated_at: string
+            user_access_level: AccessControlLevel
+            view_count?: number | undefined
+            viewers?: UserBasicType[] | undefined
+        }
+        payload?: {
+            filtersOverride: DashboardFilter | null | undefined
+            shortId: InsightShortId
+            tileFiltersOverride: DashboardFilter | null | undefined
+            variablesOverride: Record<string, HogQLVariable> | null | undefined
+        }
+    } // insightLogic
+    setInsight: (
+        insight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>>,
+        options: SetInsightOptions
+    ) => {
+        insight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>>
+        options: SetInsightOptions
+    } // insightLogic
+    setInsightMetadata: (
+        metadataUpdate: Partial<
+            Pick<QueryBasedInsightModel<Node<Record<string, any>>>, 'description' | 'favorited' | 'name' | 'tags'>
+        >
+    ) => {
+        metadataUpdate: Partial<
+            Pick<QueryBasedInsightModel<Node<Record<string, any>>>, 'description' | 'favorited' | 'name' | 'tags'>
+        >
+    } // insightLogic
+    renameInsightSuccess: (item: QueryBasedInsightModel<Node<Record<string, any>>>) => {
+        item: QueryBasedInsightModel<Node<Record<string, any>>>
+    } // insightsModel
+    cancelChanges: () => {
+        value: true
+    }
+    generateInsightMetadata: () => any
+    generateInsightMetadataFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    generateInsightMetadataSuccess: (
+        generatedInsightMetadata: {
+            description: string
+            name: string
+        } | null,
+        payload?: any
+    ) => {
+        generatedInsightMetadata: {
+            description: string
+            name: string
+        } | null
+        payload?: any
+    }
+    persistDisplayOptions: (query: Node) => {
+        query: Node<Record<string, any>>
+    }
+    setQuery: (query: Node | null) => {
+        query: Node<Record<string, any>> | null
+    }
+    syncQueryFromProps: (query: Node | null) => {
+        query: Node<Record<string, any>> | null
+    }
+    toggleDebugPanel: () => {
+        value: true
+    }
+    toggleQueryEditorPanel: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightDataLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        query: (
+            propsQuery: QuerySchema | null | undefined,
+            insight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>>,
+            internalQuery: Node<Record<string, any>> | null,
+            filterTestAccountsDefault: boolean,
+            isDataWarehouseQuery: boolean
+        ) => Node | null
+        isDataWarehouseQuery: (arg: any) => boolean
+        propsQuery: (arg: any) => QuerySchema | null | undefined
+        exportContext: (
+            query: Node<Record<string, any>> | null,
+            insight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>>
+        ) => ExportContext | undefined
+        queryChanged: (
+            query: Node<Record<string, any>> | null,
+            savedInsight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>>,
+            filterTestAccountsDefault: boolean
+        ) => boolean
+        insightData: (
+            insightDataRaw:
+                | ErrorTrackingQueryResponse
+                | HogQLAutocompleteResponse
+                | HogQLMetadataResponse
+                | HogQLQueryResponse<any[]>
+                | HogQueryResponse
+                | LogAttributesQueryResponse
+                | LogValuesQueryResponse
+                | MetricsQueryResponse
+                | Record<string, any>
+                | SessionsQueryResponse
+                | TraceSpansAggregationQueryResponse
+                | TraceSpansAttributeBreakdownQueryResponse
+                | TraceSpansQueryResponse
+                | null
+        ) => Record<string, any>
+        hogQL: (insightData: Record<string, any>, query: Node<Record<string, any>> | null) => string | null
+        hogQLVariables: (query: Node<Record<string, any>> | null) => Record<string, HogQLVariable> | undefined
+        canEditInSqlEditor: (hogQL: string | null, query: Node<Record<string, any>> | null) => boolean
+    }
+}
+
+export type insightDataLogicType = MakeLogicType<
+    insightDataLogicValues,
+    insightDataLogicActions,
+    InsightLogicProps,
+    insightDataLogicMeta
+>
+
 export const insightDataLogic = kea<insightDataLogicType>([
     props({} as InsightLogicProps),
     key(keyForInsightLogicProps('new')),
@@ -167,7 +549,13 @@ export const insightDataLogic = kea<insightDataLogicType>([
     selectors({
         query: [
             (s) => [s.propsQuery, s.insight, s.internalQuery, s.filterTestAccountsDefault, s.isDataWarehouseQuery],
-            (propsQuery, insight, internalQuery, filterTestAccountsDefault, isDataWarehouseQuery): Node | null =>
+            (
+                propsQuery: null | import('~/queries/schema/schema-general').QuerySchema | undefined,
+                insight: Partial<import('~/types').QueryBasedInsightModel<Node<Record<string, any>>>>,
+                internalQuery: Node | null,
+                filterTestAccountsDefault: boolean,
+                isDataWarehouseQuery: boolean
+            ): Node | null =>
                 internalQuery ||
                 propsQuery ||
                 insight.query ||
@@ -189,7 +577,10 @@ export const insightDataLogic = kea<insightDataLogicType>([
 
         exportContext: [
             (s) => [s.query, s.insight],
-            (query, insight) => {
+            (
+                query: Node | null,
+                insight: Partial<import('~/types').QueryBasedInsightModel<Node<Record<string, any>>>>
+            ) => {
                 if (!query) {
                     // if we're here without a query then an empty query context is not the problem
                     return undefined
@@ -210,7 +601,11 @@ export const insightDataLogic = kea<insightDataLogicType>([
 
         queryChanged: [
             (s) => [s.query, s.savedInsight, s.filterTestAccountsDefault],
-            (query, savedInsight, filterTestAccountsDefault) => {
+            (
+                query: Node | null,
+                savedInsight: Partial<import('~/types').QueryBasedInsightModel<Node<Record<string, any>>>>,
+                filterTestAccountsDefault: boolean
+            ) => {
                 let savedOrDefaultQuery
                 if (savedInsight.query) {
                     savedOrDefaultQuery = savedInsight.query as InsightVizNode | DataVisualizationNode
@@ -243,7 +638,23 @@ export const insightDataLogic = kea<insightDataLogicType>([
 
         insightData: [
             (s) => [s.insightDataRaw],
-            (insightDataRaw): Record<string, any> => {
+            (
+                insightDataRaw:
+                    | Record<string, any>
+                    | null
+                    | import('~/queries/schema/schema-general').ErrorTrackingQueryResponse
+                    | import('~/queries/schema/schema-general').HogQLAutocompleteResponse
+                    | import('~/queries/schema/schema-general').HogQLMetadataResponse
+                    | import('~/queries/schema/schema-general').HogQLQueryResponse<any[]>
+                    | import('~/queries/schema/schema-general').HogQueryResponse
+                    | import('~/queries/schema/schema-general').LogAttributesQueryResponse
+                    | import('~/queries/schema/schema-general').LogValuesQueryResponse
+                    | import('~/queries/schema/schema-general').MetricsQueryResponse
+                    | import('~/queries/schema/schema-general').SessionsQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansAggregationQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansAttributeBreakdownQueryResponse
+                    | import('~/queries/schema/schema-general').TraceSpansQueryResponse
+            ): Record<string, any> => {
                 // :TRICKY: The queries return results as `results`, but insights expect `result`
                 return {
                     ...insightDataRaw,
@@ -254,7 +665,7 @@ export const insightDataLogic = kea<insightDataLogicType>([
 
         hogQL: [
             (s) => [s.insightData, s.query],
-            (insightData, query): string | null => {
+            (insightData: Record<string, any>, query: Node | null): string | null => {
                 // Try to get it from the query itself, so we don't have to wait for the response
                 if (isDataVisualizationNode(query) && isHogQLQuery(query.source)) {
                     return query.source.query
@@ -271,7 +682,7 @@ export const insightDataLogic = kea<insightDataLogicType>([
         ],
         hogQLVariables: [
             (s) => [s.query],
-            (query): Record<string, HogQLVariable> | undefined => {
+            (query: Node | null): Record<string, HogQLVariable> | undefined => {
                 if (isDataVisualizationNode(query) && isHogQLQuery(query.source)) {
                     return query.source.variables
                 }
@@ -283,7 +694,7 @@ export const insightDataLogic = kea<insightDataLogicType>([
         ],
         canEditInSqlEditor: [
             (s) => [s.hogQL, s.query],
-            (hogQL, query): boolean =>
+            (hogQL: string | null, query: Node | null): boolean =>
                 // We need a resolved hogql string, and the insight must not already be SQL-authored
                 // (otherwise "Edit in SQL editor" is a no-op).
                 hogQL != null &&
diff --git a/frontend/src/scenes/insights/insightDataTimingLogic.ts b/frontend/src/scenes/insights/insightDataTimingLogic.ts
index 5ca29c283666..a585f6d606ce 100644
--- a/frontend/src/scenes/insights/insightDataTimingLogic.ts
+++ b/frontend/src/scenes/insights/insightDataTimingLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers } from 'kea'
 
 import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
 import { teamLogic } from 'scenes/teamLogic'
@@ -7,9 +7,137 @@ import { DataNodeLogicProps, dataNodeLogic } from '~/queries/nodes/DataNode/data
 import { insightVizDataNodeKey } from '~/queries/nodes/InsightViz/insightVizKeys'
 import { InsightLogicProps } from '~/types'
 
-import type { insightDataTimingLogicType } from './insightDataTimingLogicType'
+import type {
+    DataNode,
+    ErrorTrackingQueryResponse,
+    HogQLAutocompleteResponse,
+    HogQLMetadataResponse,
+    HogQLQueryResponse,
+    HogQueryResponse,
+    LogAttributesQueryResponse,
+    LogValuesQueryResponse,
+    MetricsQueryResponse,
+    RefreshType,
+    SessionsQueryResponse,
+    TraceSpansAggregationQueryResponse,
+    TraceSpansAttributeBreakdownQueryResponse,
+    TraceSpansQueryResponse,
+} from '../../queries/schema/schema-general'
 import { keyForInsightLogicProps } from './sharedUtils'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightDataTimingLogicValues {
+    query: DataNode<Record<string, any>> // dataNodeLogic
+    response:
+        | ErrorTrackingQueryResponse
+        | HogQLAutocompleteResponse
+        | HogQLMetadataResponse
+        | HogQLQueryResponse<any[]>
+        | HogQueryResponse
+        | LogAttributesQueryResponse
+        | LogValuesQueryResponse
+        | MetricsQueryResponse
+        | Record<string, any>
+        | SessionsQueryResponse
+        | TraceSpansAggregationQueryResponse
+        | TraceSpansAttributeBreakdownQueryResponse
+        | TraceSpansQueryResponse
+        | null // dataNodeLogic
+    currentTeamId: number | null // teamLogic
+    queryStartTimes: Record<string, number>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightDataTimingLogicActions {
+    loadData: (
+        refresh?: RefreshType | undefined,
+        alreadyRunningQueryId?: string | undefined,
+        overrideQuery?: DataNode<Record<string, any>> | undefined
+    ) => {
+        overrideQuery: DataNode<Record<string, any>> | undefined
+        pollOnly: boolean
+        queryId: string
+        refresh: RefreshType | undefined
+    } // dataNodeLogic
+    loadDataCancellation: (payload: { queryId: string }) => {
+        queryId: string
+    } // dataNodeLogic
+    loadDataFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    } // dataNodeLogic
+    loadDataSuccess: (
+        response:
+            | ErrorTrackingQueryResponse
+            | HogQLAutocompleteResponse
+            | HogQLMetadataResponse
+            | HogQLQueryResponse<any[]>
+            | HogQueryResponse
+            | LogAttributesQueryResponse
+            | LogValuesQueryResponse
+            | MetricsQueryResponse
+            | Record<string, any>
+            | SessionsQueryResponse
+            | TraceSpansAggregationQueryResponse
+            | TraceSpansAttributeBreakdownQueryResponse
+            | TraceSpansQueryResponse
+            | null
+            | undefined,
+        payload?:
+            | {
+                  overrideQuery: DataNode<Record<string, any>> | undefined
+                  pollOnly: boolean
+                  queryId: string
+                  refresh: RefreshType | undefined
+              }
+            | undefined
+    ) => {
+        payload?: {
+            overrideQuery: DataNode<Record<string, any>> | undefined
+            pollOnly: boolean
+            queryId: string
+            refresh: RefreshType | undefined
+        }
+        response:
+            | ErrorTrackingQueryResponse
+            | HogQLAutocompleteResponse
+            | HogQLMetadataResponse
+            | HogQLQueryResponse<any[]>
+            | HogQueryResponse
+            | LogAttributesQueryResponse
+            | LogValuesQueryResponse
+            | MetricsQueryResponse
+            | Record<string, any>
+            | SessionsQueryResponse
+            | TraceSpansAggregationQueryResponse
+            | TraceSpansAttributeBreakdownQueryResponse
+            | TraceSpansQueryResponse
+            | null
+            | undefined
+    } // dataNodeLogic
+    removeQuery: (queryId: string) => {
+        queryId: string
+    }
+    startQuery: (queryId: string) => {
+        queryId: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightDataTimingLogicMeta {
+    key: string
+}
+
+export type insightDataTimingLogicType = MakeLogicType<
+    insightDataTimingLogicValues,
+    insightDataTimingLogicActions,
+    InsightLogicProps,
+    insightDataTimingLogicMeta
+>
+
 export const insightDataTimingLogic = kea<insightDataTimingLogicType>([
     props({} as InsightLogicProps),
     key(keyForInsightLogicProps('new')),
diff --git a/frontend/src/scenes/insights/insightLogic.tsx b/frontend/src/scenes/insights/insightLogic.tsx
index 893cd7f442f5..c722623f26f4 100644
--- a/frontend/src/scenes/insights/insightLogic.tsx
+++ b/frontend/src/scenes/insights/insightLogic.tsx
@@ -1,4 +1,17 @@
-import { LogicWrapper, actions, connect, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    LogicWrapper,
+    actions,
+    connect,
+    events,
+    kea,
+    key,
+    listeners,
+    path,
+    props,
+    reducers,
+    selectors,
+} from 'kea'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 import posthog from 'posthog-js'
@@ -62,9 +75,15 @@ import {
 
 import { insightAlertsLogic } from 'products/alerts/frontend/logic/insightAlertsLogic'
 
+import type { AlertType } from '../../../../products/alerts/frontend/types'
+import type { FeatureFlagsSet } from '../../lib/logic/featureFlagLogic'
+import type { ProductIntentProperties } from '../../lib/utils/product-intents'
+import type { Noun } from '../../models/groupsModel'
+import type { QueryStatus } from '../../queries/schema/schema-general'
+import type { CohortType, DashboardTileBasicType, TeamPublicType, TeamType, UserBasicType, UserType } from '../../types'
 import { teamLogic } from '../teamLogic'
+import type { MathDefinition } from '../trends/mathsLogic'
 import { insightDataLogic, isInsightSceneInstance } from './insightDataLogic'
-import type { insightLogicType } from './insightLogicType'
 import { getInsightId } from './utils'
 import { insightsApi } from './utils/api'
 
@@ -81,6 +100,347 @@ export const createEmptyInsight = (
     result: null,
 })
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightLogicValues {
+    cohortsById: Partial<Record<number | string, CohortType>>; // cohortsModel
+    featureFlags: FeatureFlagsSet; // featureFlagLogic
+    aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun; // groupsModel
+    mathDefinitions: Partial<Record<string, MathDefinition>>; // mathsLogic
+    activeSceneId: string | null; // sceneLogic
+    currentTeam: TeamPublicType | TeamType | null; // teamLogic
+    currentTeamId: number | null; // teamLogic
+    user: UserType | null; // userLogic
+    accessDeniedToInsight: boolean;
+    canEditInsight: boolean;
+    derivedName: string;
+    editingDisabledReason: "Discard overrides to edit the insight." | null;
+    hasDashboardItemId: boolean;
+    hasOverrides: boolean;
+    highlightedSeries: IndexedTrendResult | null;
+    insight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>>;
+    insightChanged: boolean;
+    insightFeedback: "disliked" | "liked" | null;
+    insightId: number | null;
+    insightLoading: boolean;
+    insightName: string;
+    insightProps: InsightLogicProps;
+    insightSaving: boolean;
+    isInDashboardContext: boolean;
+    isInExperimentContext: boolean;
+    isInViewMode: boolean;
+    isSavingTags: boolean;
+    isUsingPathsV1: boolean;
+    isUsingPathsV2: boolean | string | undefined;
+    previousQuery: Node | null;
+    query: Node | null;
+    savedInsight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>>;
+    showPersonsModal: boolean;
+    suggestedQuery: Node | null;
+    supportsCreatingExperiment: boolean | null;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightLogicActions {
+    loadTags: () => any; // tagsModel
+    addProductIntent: (properties: ProductIntentProperties) => ProductIntentProperties; // teamLogic
+    confirmDeleteInsight: (dashboardId: number | null) => {
+        dashboardId: number | null;
+    };
+    deleteInsight: (dashboardId: number | null) => {
+        dashboardId: number | null;
+    };
+    duplicateInsight: (insight: QueryBasedInsightModel, redirectToInsight?: any) => {
+        insight: QueryBasedInsightModel<Node<Record<string, any>>>;
+        redirectToInsight: any;
+    };
+    handleInsightSuggested: (suggestedInsight: Node | null) => {
+        suggestedInsight: Node<Record<string, any>> | null;
+    };
+    highlightSeries: (series: IndexedTrendResult | null) => {
+        series: IndexedTrendResult | null;
+    };
+    loadInsight: (shortId: InsightShortId, filtersOverride?: DashboardFilter | null, variablesOverride?: Record<string, HogQLVariable> | null, tileFiltersOverride?: DashboardFilter | null) => {
+        filtersOverride: DashboardFilter | null | undefined;
+        shortId: InsightShortId;
+        tileFiltersOverride: DashboardFilter | null | undefined;
+        variablesOverride: Record<string, HogQLVariable> | null | undefined;
+    };
+    loadInsightFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadInsightSuccess: (insight: {
+        _create_in_folder?: string | null | undefined;
+        alerts?: AlertType[] | undefined;
+        cache_target_age?: string | null | undefined;
+        created_at: string;
+        created_by: UserBasicType | null;
+        dashboard_tiles: DashboardTileBasicType[] | null;
+        dashboards: number[] | null;
+        deleted: boolean;
+        derived_name?: string | null | undefined;
+        description?: string | undefined;
+        disable_baseline?: boolean | undefined;
+        favorited?: boolean | undefined;
+        id: number;
+        is_cached?: boolean | undefined;
+        is_sample: boolean;
+        last_modified_at: string;
+        last_modified_by: UserBasicType | null;
+        last_refresh: string | null;
+        last_viewed_at?: string | null | undefined;
+        name: string;
+        next?: string | undefined;
+        next_allowed_client_refresh?: string | null | undefined;
+        order: number | null;
+        query: Node<Record<string, any>> | null;
+        query_status?: QueryStatus | undefined;
+        result: any;
+        saved: boolean;
+        short_id: InsightShortId;
+        tags?: string[] | undefined;
+        timezone?: string | null | undefined;
+        updated_at: string;
+        user_access_level: AccessControlLevel;
+        view_count?: number | undefined;
+        viewers?: UserBasicType[] | undefined;
+    }, payload?: {
+        filtersOverride: DashboardFilter | null | undefined;
+        shortId: InsightShortId;
+        tileFiltersOverride: DashboardFilter | null | undefined;
+        variablesOverride: Record<string, HogQLVariable> | null | undefined;
+    }) => {
+        insight: {
+            _create_in_folder?: string | null | undefined;
+            alerts?: AlertType[] | undefined;
+            cache_target_age?: string | null | undefined;
+            created_at: string;
+            created_by: UserBasicType | null;
+            dashboard_tiles: DashboardTileBasicType[] | null;
+            dashboards: number[] | null;
+            deleted: boolean;
+            derived_name?: string | null | undefined;
+            description?: string | undefined;
+            disable_baseline?: boolean | undefined;
+            favorited?: boolean | undefined;
+            id: number;
+            is_cached?: boolean | undefined;
+            is_sample: boolean;
+            last_modified_at: string;
+            last_modified_by: UserBasicType | null;
+            last_refresh: string | null;
+            last_viewed_at?: string | null | undefined;
+            name: string;
+            next?: string | undefined;
+            next_allowed_client_refresh?: string | null | undefined;
+            order: number | null;
+            query: Node<Record<string, any>> | null;
+            query_status?: QueryStatus | undefined;
+            result: any;
+            saved: boolean;
+            short_id: InsightShortId;
+            tags?: string[] | undefined;
+            timezone?: string | null | undefined;
+            updated_at: string;
+            user_access_level: AccessControlLevel;
+            view_count?: number | undefined;
+            viewers?: UserBasicType[] | undefined;
+        };
+        payload?: {
+            filtersOverride: DashboardFilter | null | undefined;
+            shortId: InsightShortId;
+            tileFiltersOverride: DashboardFilter | null | undefined;
+            variablesOverride: Record<string, HogQLVariable> | null | undefined;
+        };
+    };
+    onReapplySuggestedInsight: () => {
+        value: true;
+    };
+    onRejectSuggestedInsight: () => {
+        value: true;
+    };
+    reloadSavedInsights: () => {
+        value: true;
+    };
+    saveAs: (redirectToViewMode?: boolean, persist?: boolean, folder?: string | null) => {
+        folder: string | null | undefined;
+        persist: boolean | undefined;
+        redirectToViewMode: boolean | undefined;
+    };
+    saveAsConfirmation: (name: string, redirectToViewMode?: any, persist?: any, folder?: string | null) => {
+        folder: string | null | undefined;
+        name: string;
+        persist: any;
+        redirectToViewMode: any;
+    };
+    saveInsight: (redirectToViewMode?: boolean, folder?: string | null) => {
+        folder: string | null;
+        redirectToViewMode: boolean;
+    };
+    saveInsightFailure: () => {
+        value: true;
+    };
+    saveInsightSuccess: () => {
+        value: true;
+    };
+    setAccessDeniedToInsight: () => {
+        value: true;
+    };
+    setInsight: (insight: Partial<QueryBasedInsightModel>, options: SetInsightOptions) => {
+        insight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>>;
+        options: SetInsightOptions;
+    };
+    setInsightFeedback: (feedback: "disliked" | "liked") => {
+        feedback: "disliked" | "liked";
+    };
+    setInsightMetadata: (metadataUpdate: Partial<Pick<QueryBasedInsightModel, "description" | "favorited" | "name" | "tags">>) => {
+        metadataUpdate: Partial<Pick<QueryBasedInsightModel<Node<Record<string, any>>>, "description" | "favorited" | "name" | "tags">>;
+    };
+    setInsightMetadataFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    setInsightMetadataLocal: (metadataUpdate: Partial<Pick<QueryBasedInsightModel, "description" | "favorited" | "name" | "tags">>) => {
+        metadataUpdate: Partial<Pick<QueryBasedInsightModel<Node<Record<string, any>>>, "description" | "favorited" | "name" | "tags">>;
+    };
+    setInsightMetadataSuccess: (insight: {
+        _create_in_folder?: string | null | undefined;
+        alerts?: AlertType[] | undefined;
+        cache_target_age?: string | null | undefined;
+        created_at?: string | undefined;
+        created_by?: UserBasicType | null | undefined;
+        dashboard_tiles?: DashboardTileBasicType[] | null | undefined;
+        dashboards?: number[] | null | undefined;
+        deleted?: boolean | undefined;
+        derived_name?: string | null | undefined;
+        description?: string | undefined;
+        disable_baseline?: boolean | undefined;
+        favorited?: boolean | undefined;
+        id?: number | undefined;
+        is_cached?: boolean | undefined;
+        is_sample?: boolean | undefined;
+        last_modified_at?: string | undefined;
+        last_modified_by?: UserBasicType | null | undefined;
+        last_refresh?: string | null | undefined;
+        last_viewed_at?: string | null | undefined;
+        name?: string | undefined;
+        next?: string | undefined;
+        next_allowed_client_refresh?: string | null | undefined;
+        order?: number | null | undefined;
+        query?: Node<Record<string, any>> | null | undefined;
+        query_status?: QueryStatus | undefined;
+        result?: any;
+        saved?: boolean | undefined;
+        short_id?: InsightShortId | undefined;
+        tags?: string[] | undefined;
+        timezone?: string | null | undefined;
+        updated_at?: string | undefined;
+        user_access_level?: AccessControlLevel | undefined;
+        view_count?: number | undefined;
+        viewers?: UserBasicType[] | undefined;
+    }, payload?: {
+        metadataUpdate: Partial<Pick<QueryBasedInsightModel<Node<Record<string, any>>>, "description" | "favorited" | "name" | "tags">>;
+    }) => {
+        insight: {
+            _create_in_folder?: string | null | undefined;
+            alerts?: AlertType[] | undefined;
+            cache_target_age?: string | null | undefined;
+            created_at?: string | undefined;
+            created_by?: UserBasicType | null | undefined;
+            dashboard_tiles?: DashboardTileBasicType[] | null | undefined;
+            dashboards?: number[] | null | undefined;
+            deleted?: boolean | undefined;
+            derived_name?: string | null | undefined;
+            description?: string | undefined;
+            disable_baseline?: boolean | undefined;
+            favorited?: boolean | undefined;
+            id?: number | undefined;
+            is_cached?: boolean | undefined;
+            is_sample?: boolean | undefined;
+            last_modified_at?: string | undefined;
+            last_modified_by?: UserBasicType | null | undefined;
+            last_refresh?: string | null | undefined;
+            last_viewed_at?: string | null | undefined;
+            name?: string | undefined;
+            next?: string | undefined;
+            next_allowed_client_refresh?: string | null | undefined;
+            order?: number | null | undefined;
+            query?: Node<Record<string, any>> | null | undefined;
+            query_status?: QueryStatus | undefined;
+            result?: any;
+            saved?: boolean | undefined;
+            short_id?: InsightShortId | undefined;
+            tags?: string[] | undefined;
+            timezone?: string | null | undefined;
+            updated_at?: string | undefined;
+            user_access_level?: AccessControlLevel | undefined;
+            view_count?: number | undefined;
+            viewers?: UserBasicType[] | undefined;
+        };
+        payload?: {
+            metadataUpdate: Partial<Pick<QueryBasedInsightModel<Node<Record<string, any>>>, "description" | "favorited" | "name" | "tags">>;
+        };
+    };
+    setPreviousQuery: (previousQuery: Node | null) => {
+        previousQuery: Node<Record<string, any>> | null;
+    };
+    setSuggestedQuery: (suggestedQuery: Node | null) => {
+        suggestedQuery: Node<Record<string, any>> | null;
+    };
+    updateInsight: (insightUpdate: Partial<QueryBasedInsightModel>, callback?: () => void) => {
+        callback: (() => void) | undefined;
+        insightUpdate: Partial<QueryBasedInsightModel<Node<Record<string, any>>>>;
+    };
+    updateInsightFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    updateInsightSuccess: (insight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>>, payload?: {
+        callback: (() => void) | undefined;
+        insightUpdate: Partial<QueryBasedInsightModel<Node<Record<string, any>>>>;
+    }) => {
+        insight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>>;
+        payload?: {
+            callback: (() => void) | undefined;
+            insightUpdate: Partial<QueryBasedInsightModel<Node<Record<string, any>>>>;
+        };
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        insightProps: (arg: any) => InsightLogicProps;
+        query: (arg: Node<Record<string, any>> | null) => Node | null;
+        isInDashboardContext: (arg: any) => boolean;
+        hasDashboardItemId: (arg: any) => boolean;
+        isInExperimentContext: (location: {
+            hash: string;
+            pathname: string;
+            search: string;
+        }) => boolean;
+        isInViewMode: (location: {
+            hash: string;
+            pathname: string;
+            search: string;
+        }) => boolean;
+        derivedName: (query: Node<Record<string, any>> | null, aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun, cohortsById: Partial<Record<number | string, CohortType>>, mathDefinitions: Partial<Record<string, MathDefinition>>) => string;
+        insightName: (insight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>>, derivedName: string) => string;
+        insightId: (insight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>>) => number | null;
+        canEditInsight: (insight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>>) => boolean;
+        insightChanged: (insight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>>, savedInsight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>>) => boolean;
+        showPersonsModal: (query: Node<Record<string, any>> | null, insightProps: InsightLogicProps<import("~/queries/schema/schema-general").QuerySchema>, featureFlags: FeatureFlagsSet) => boolean;
+        supportsCreatingExperiment: (insight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>>, activeSceneId: string | null) => boolean | null;
+        isUsingPathsV1: (featureFlags: FeatureFlagsSet) => boolean;
+        isUsingPathsV2: (featureFlags: FeatureFlagsSet) => boolean | string | undefined;
+        hasOverrides: (arg: any, arg2: any, arg3: any) => boolean;
+        editingDisabledReason: (hasOverrides: boolean) => "Discard overrides to edit the insight." | null;
+    };
+}
+
+export type insightLogicType = MakeLogicType<insightLogicValues, insightLogicActions, InsightLogicProps, insightLogicMeta>;
+
 export const insightLogic: LogicWrapper<insightLogicType> = kea<insightLogicType>([
     props({ filtersOverride: null, variablesOverride: null, tileFiltersOverride: null } as InsightLogicProps),
     key((props) => keyForInsightLogicProps('new')(props)),
@@ -452,7 +812,7 @@ export const insightLogic: LogicWrapper<insightLogicType> = kea<insightLogicType
         insightProps: [() => [(_, props) => props], (props): InsightLogicProps => props],
         query: [
             (s) => [(state) => insightDataLogic.findMounted(s.insightProps(state))?.values.query || null],
-            (node): Node | null => node,
+            (node: Node<Record<string, any>> | null): Node | null => node,
         ],
         isInDashboardContext: [() => [(_, props) => props], ({ dashboardId }) => !!dashboardId],
         hasDashboardItemId: [
@@ -467,18 +827,33 @@ export const insightLogic: LogicWrapper<insightLogicType> = kea<insightLogicType
         isInViewMode: [() => [router.selectors.location], ({ pathname }) => /\/insights\/[a-zA-Z0-9]+$/.test(pathname)],
         derivedName: [
             (s) => [s.query, s.aggregationLabel, s.cohortsById, s.mathDefinitions],
-            (query, aggregationLabel, cohortsById, mathDefinitions) =>
+            (
+                query: Node | null,
+                aggregationLabel: (
+                    groupTypeIndex: number | null | undefined,
+                    deferToUserWording?: boolean
+                ) => import('~/models/groupsModel').Noun,
+                cohortsById: Partial<Record<number | string, import('~/types').CohortType>>,
+                mathDefinitions: Partial<Record<string, import('scenes/trends/mathsLogic').MathDefinition>>
+            ) =>
                 summarizeInsight(query, {
                     aggregationLabel,
                     cohortsById,
                     mathDefinitions,
                 }).slice(0, 400),
         ],
-        insightName: [(s) => [s.insight, s.derivedName], (insight, derivedName) => insight.name ?? derivedName],
-        insightId: [(s) => [s.insight], (insight) => insight?.id || null],
+        insightName: [
+            (s) => [s.insight, s.derivedName],
+            (insight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>>, derivedName: string) =>
+                insight.name ?? derivedName,
+        ],
+        insightId: [
+            (s) => [s.insight],
+            (insight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>>) => insight?.id || null,
+        ],
         canEditInsight: [
             (s) => [s.insight],
-            (insight) =>
+            (insight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>>) =>
                 insight.user_access_level
                     ? accessLevelSatisfied(
                           AccessControlResourceType.Insight,
@@ -489,7 +864,10 @@ export const insightLogic: LogicWrapper<insightLogicType> = kea<insightLogicType
         ],
         insightChanged: [
             (s) => [s.insight, s.savedInsight],
-            (insight, savedInsight): boolean => {
+            (
+                insight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>>,
+                savedInsight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>>
+            ): boolean => {
                 return (
                     (insight.name || '') !== (savedInsight.name || '') ||
                     (insight.description || '') !== (savedInsight.description || '') ||
@@ -518,11 +896,13 @@ export const insightLogic: LogicWrapper<insightLogicType> = kea<insightLogicType
         ],
         isUsingPathsV1: [
             (s) => [s.featureFlags],
-            (featureFlags) => !featureFlags[FEATURE_FLAGS.PRODUCT_ANALYTICS_PATHS_V2],
+            (featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet) =>
+                !featureFlags[FEATURE_FLAGS.PRODUCT_ANALYTICS_PATHS_V2],
         ],
         isUsingPathsV2: [
             (s) => [s.featureFlags],
-            (featureFlags) => featureFlags[FEATURE_FLAGS.PRODUCT_ANALYTICS_PATHS_V2],
+            (featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet) =>
+                featureFlags[FEATURE_FLAGS.PRODUCT_ANALYTICS_PATHS_V2],
         ],
         hasOverrides: [
             () => [
@@ -544,7 +924,7 @@ export const insightLogic: LogicWrapper<insightLogicType> = kea<insightLogicType
         ],
         editingDisabledReason: [
             (s) => [s.hasOverrides],
-            (hasOverrides) => (hasOverrides ? 'Discard overrides to edit the insight.' : null),
+            (hasOverrides: boolean) => (hasOverrides ? 'Discard overrides to edit the insight.' : null),
         ],
     }),
     listeners(({ actions, values, props }) => ({
diff --git a/frontend/src/scenes/insights/insightModalsLogic.ts b/frontend/src/scenes/insights/insightModalsLogic.ts
index c9c3a38d12c6..26cf4e86a3bc 100644
--- a/frontend/src/scenes/insights/insightModalsLogic.ts
+++ b/frontend/src/scenes/insights/insightModalsLogic.ts
@@ -1,11 +1,61 @@
-import { actions, connect, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers } from 'kea'
 
 import { InsightLogicProps } from '~/types'
 
 import { insightLogic } from './insightLogic'
-import type { insightModalsLogicType } from './insightModalsLogicType'
 import { keyForInsightLogicProps } from './sharedUtils'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightModalsLogicValues {
+    isAddToDashboardModalOpen: boolean
+    isTerraformModalOpen: boolean
+    pendingAddToDashboardAfterSave: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightModalsLogicActions {
+    saveInsight: (
+        redirectToViewMode?: boolean | undefined,
+        folder?: string | null | undefined
+    ) => {
+        folder: string | null
+        redirectToViewMode: boolean
+    } // insightLogic
+    saveInsightFailure: () => {
+        value: true
+    } // insightLogic
+    saveInsightSuccess: () => {
+        value: true
+    } // insightLogic
+    closeAddToDashboardModal: () => {
+        value: true
+    }
+    closeTerraformModal: () => {
+        value: true
+    }
+    openAddToDashboardModal: () => {
+        value: true
+    }
+    openTerraformModal: () => {
+        value: true
+    }
+    saveAndAddToDashboard: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightModalsLogicMeta {
+    key: string
+}
+
+export type insightModalsLogicType = MakeLogicType<
+    insightModalsLogicValues,
+    insightModalsLogicActions,
+    InsightLogicProps,
+    insightModalsLogicMeta
+>
+
 export const insightModalsLogic = kea<insightModalsLogicType>([
     props({} as InsightLogicProps),
     key(keyForInsightLogicProps('new')),
diff --git a/frontend/src/scenes/insights/insightSceneLogic.tsx b/frontend/src/scenes/insights/insightSceneLogic.tsx
index 6ad9a3e9a7d2..5a6f97519cd3 100644
--- a/frontend/src/scenes/insights/insightSceneLogic.tsx
+++ b/frontend/src/scenes/insights/insightSceneLogic.tsx
@@ -1,4 +1,16 @@
-import { BuiltLogic, actions, connect, kea, listeners, path, reducers, selectors, sharedListeners } from 'kea'
+import {
+    MakeLogicType,
+    BuiltLogic,
+    actions,
+    connect,
+    kea,
+    listeners,
+    path,
+    reducers,
+    selectors,
+    sharedListeners,
+} from 'kea'
+import type { BreakPointFunction } from 'kea'
 import { urlToAction } from 'kea-router'
 import { objectsEqual } from 'kea-test-utils'
 
@@ -10,7 +22,7 @@ import { isEmptyObject, isObject } from 'lib/utils/guards'
 import { isDashboardFilterEmpty } from 'scenes/dashboard/dashboardFilterEmpty'
 import { dashboardLogic } from 'scenes/dashboard/dashboardLogic'
 import { createEmptyInsight, insightLogic } from 'scenes/insights/insightLogic'
-import { insightLogicType } from 'scenes/insights/insightLogicType'
+import type { insightLogicType } from 'scenes/insights/insightLogic'
 import { MaxContextInput, createMaxContextHelpers } from 'scenes/max/maxTypes'
 import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
 import { sceneLogic } from 'scenes/sceneLogic'
@@ -55,9 +67,11 @@ import {
 import { AlertType } from 'products/alerts/frontend/types'
 import { PRODUCT_ANALYTICS_DEFAULT_QUERY_TAGS } from 'products/product_analytics/frontend/constants'
 
+import type { FeatureFlagsSet } from '../../lib/logic/featureFlagLogic'
+import type { QuerySchema } from '../../queries/schema/schema-general'
+import type { TeamPublicType, TeamType } from '../../types'
 import { insightDataLogic } from './insightDataLogic'
-import { insightDataLogicType } from './insightDataLogicType'
-import type { insightSceneLogicType } from './insightSceneLogicType'
+import type { insightDataLogicType } from './insightDataLogic'
 import { getInsightIconTypeFromQuery, parseDraftQueryFromURL } from './utils'
 
 const NEW_INSIGHT = 'new' as const
@@ -99,6 +113,124 @@ function withDefaultProductAnalyticsTags(query: Node): Node {
     return query
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightSceneLogicValues {
+    featureFlags: FeatureFlagsSet; // featureFlagLogic
+    filterTestAccountsDefault: boolean; // filterTestAccountsDefaultsLogic
+    disableNavigationHooks: boolean | undefined; // preflightLogic
+    scenePanelIsPresent: boolean; // sceneLayoutLogic
+    activeSceneId: string | null; // sceneLogic
+    currentTeam: TeamPublicType | TeamType | null; // teamLogic
+    currentTeamId: number | null; // teamLogic
+    alertId: AlertType["id"] | null;
+    breadcrumbs: Breadcrumb[];
+    dashboardId: DashboardType["id"] | null;
+    dashboardName: DashboardType["name"] | null;
+    filtersOverride: DashboardFilter | null;
+    freshQuery: boolean;
+    hasOverrides: boolean;
+    insight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>> | null | undefined;
+    insightData: Record<string, any> | null | undefined;
+    insightDataLogicRef: {
+        logic: BuiltLogic<insightDataLogicType>;
+        unmount: () => void;
+    } | null;
+    insightDataSelector: ((state: any, props?: InsightLogicProps<QuerySchema> | undefined) => Record<string, any>) | undefined;
+    insightId: InsightId | null;
+    insightLogicRef: {
+        logic: BuiltLogic<insightLogicType>;
+        unmount: () => void;
+    } | null;
+    insightMode: ItemMode;
+    insightQuery: Node<Record<string, any>> | null | undefined;
+    insightQuerySelector: ((state: any, props?: InsightLogicProps<QuerySchema> | undefined) => Node<Record<string, any>> | null) | undefined;
+    insightSelector: ((state: any, props?: InsightLogicProps<QuerySchema> | undefined) => Partial<QueryBasedInsightModel<Node<Record<string, any>>>>) | undefined;
+    itemId: number | string | null;
+    maxContext: MaxContextInput[];
+    projectTreeRef: ProjectTreeRef;
+    sceneSource: InsightSceneSource | null;
+    sidePanelContext: SidePanelSceneContext | null;
+    tileFiltersOverride: TileFilters | null;
+    variablesOverride: Record<string, HogQLVariable> | null;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightSceneLogicActions {
+    setScenePanelIsPresent: (active: boolean) => {
+        active: boolean;
+    }; // sceneLayoutLogic
+    setFreshQuery: (freshQuery: boolean) => {
+        freshQuery: boolean;
+    };
+    setInsightDataLogicRef: (logic: BuiltLogic<insightDataLogicType> | null, unmount: (() => void) | null) => {
+        logic: BuiltLogic<insightDataLogicType> | null;
+        unmount: (() => void) | null;
+    };
+    setInsightId: (insightId: InsightShortId) => {
+        insightId: InsightShortId;
+    };
+    setInsightLogicRef: (logic: BuiltLogic<insightLogicType> | null, unmount: (() => void) | null) => {
+        logic: BuiltLogic<insightLogicType> | null;
+        unmount: (() => void) | null;
+    };
+    setInsightMode: (insightMode: ItemMode, source: InsightEventSource | null) => {
+        insightMode: ItemMode;
+        source: InsightEventSource | null;
+    };
+    setSceneState: (insightId: InsightShortId, insightMode: ItemMode, itemId: string | undefined, alertId: AlertType["id"] | undefined, filtersOverride: DashboardFilter | undefined, variablesOverride: Record<string, HogQLVariable> | undefined, tileFiltersOverride: TileFilters | undefined, dashboardId: DashboardType["id"] | undefined, dashboardName: DashboardType["name"] | undefined, sceneSource: InsightSceneSource | null) => {
+        alertId: string | undefined;
+        dashboardId: number | undefined;
+        dashboardName: string | undefined;
+        filtersOverride: DashboardFilter | undefined;
+        insightId: InsightShortId;
+        insightMode: ItemMode;
+        itemId: string | undefined;
+        sceneSource: InsightSceneSource | null;
+        tileFiltersOverride: TileFilters | undefined;
+        variablesOverride: Record<string, HogQLVariable> | undefined;
+    };
+    upgradeQuery: (query: Node) => {
+        query: Node<Record<string, any>>;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightSceneLogicMeta {
+    sharedListeners: {
+        "reloadInsightLogic": (payload: any, breakpoint: BreakPointFunction, action: {
+            type: string;
+            payload: any;
+        }, previousState: any) => void | Promise<void>;
+    };
+    __keaTypeGenInternalSelectorTypes: {
+        insightQuerySelector: (insightDataLogicRef: {
+            logic: BuiltLogic<insightDataLogicType>;
+            unmount: () => void;
+        } | null) => ((state: any, props?: InsightLogicProps<QuerySchema> | undefined) => Node<Record<string, any>> | null) | undefined;
+        insightQuery: (arg: Node<Record<string, any>> | null | undefined) => Node<Record<string, any>> | null | undefined;
+        insightDataSelector: (insightDataLogicRef: {
+            logic: BuiltLogic<insightDataLogicType>;
+            unmount: () => void;
+        } | null) => ((state: any, props?: InsightLogicProps<QuerySchema> | undefined) => Record<string, any>) | undefined;
+        insightData: (arg: Record<string, any> | null | undefined) => Record<string, any> | null | undefined;
+        insightSelector: (insightLogicRef: {
+            logic: BuiltLogic<insightLogicType>;
+            unmount: () => void;
+        } | null) => ((state: any, props?: InsightLogicProps<QuerySchema> | undefined) => Partial<QueryBasedInsightModel<Node<Record<string, any>>>>) | undefined;
+        insight: (arg: Partial<QueryBasedInsightModel<Node<Record<string, any>>>> | null | undefined) => Partial<QueryBasedInsightModel<Node<Record<string, any>>>> | null | undefined;
+        breadcrumbs: (insightLogicRef: {
+            logic: BuiltLogic<insightLogicType>;
+            unmount: () => void;
+        } | null, insight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>> | null | undefined, insightQuery: Node<Record<string, any>> | null | undefined, dashboardId: number | null, dashboardName: string | null, sceneSource: InsightSceneSource | null) => Breadcrumb[];
+        projectTreeRef: (insightId: InsightId) => ProjectTreeRef;
+        sidePanelContext: (insight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>> | null | undefined) => SidePanelSceneContext | null;
+        maxContext: (insight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>> | null | undefined, filtersOverride: DashboardFilter | null, variablesOverride: Record<string, HogQLVariable> | null) => MaxContextInput[];
+        hasOverrides: (filtersOverride: DashboardFilter | null, variablesOverride: Record<string, HogQLVariable> | null, tileFiltersOverride: TileFilters | null) => boolean;
+    };
+}
+
+export type insightSceneLogicType = MakeLogicType<insightSceneLogicValues, insightSceneLogicActions, Record<string, any>, insightSceneLogicMeta>;
+
 export const insightSceneLogic = kea<insightSceneLogicType>([
     path(['scenes', 'insights', 'insightSceneLogic']),
     connect(() => ({
@@ -242,7 +374,12 @@ export const insightSceneLogic = kea<insightSceneLogicType>([
     selectors({
         insightQuerySelector: [
             (s) => [s.insightDataLogicRef],
-            (insightDataLogicRef) => insightDataLogicRef?.logic.selectors.query,
+            (
+                insightDataLogicRef: {
+                    logic: BuiltLogic<insightDataLogicType>
+                    unmount: () => void
+                } | null
+            ) => insightDataLogicRef?.logic.selectors.query,
         ],
         insightQuery: [
             (s) => [
@@ -254,11 +391,16 @@ export const insightSceneLogic = kea<insightSceneLogicType>([
                     }
                 },
             ],
-            (insightQuery) => insightQuery,
+            (insightQuery: Node<Record<string, any>> | null | undefined) => insightQuery,
         ],
         insightDataSelector: [
             (s) => [s.insightDataLogicRef],
-            (insightDataLogicRef) => insightDataLogicRef?.logic.selectors.insightData,
+            (
+                insightDataLogicRef: {
+                    logic: BuiltLogic<insightDataLogicType>
+                    unmount: () => void
+                } | null
+            ) => insightDataLogicRef?.logic.selectors.insightData,
         ],
         insightData: [
             (s) => [
@@ -270,9 +412,17 @@ export const insightSceneLogic = kea<insightSceneLogicType>([
                     }
                 },
             ],
-            (insightData) => insightData,
+            (insightData: Record<string, any> | null | undefined) => insightData,
+        ],
+        insightSelector: [
+            (s) => [s.insightLogicRef],
+            (
+                insightLogicRef: {
+                    logic: BuiltLogic<insightLogicType>
+                    unmount: () => void
+                } | null
+            ) => insightLogicRef?.logic.selectors.insight,
         ],
-        insightSelector: [(s) => [s.insightLogicRef], (insightLogicRef) => insightLogicRef?.logic.selectors.insight],
         insight: [
             (s) => [
                 (state, props) => {
@@ -284,11 +434,21 @@ export const insightSceneLogic = kea<insightSceneLogicType>([
                     }
                 },
             ],
-            (insight) => insight,
+            (insight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>> | null | undefined) => insight,
         ],
         breadcrumbs: [
             (s) => [s.insightLogicRef, s.insight, s.insightQuery, s.dashboardId, s.dashboardName, s.sceneSource],
-            (insightLogicRef, insight, insightQuery, dashboardId, dashboardName, sceneSource): Breadcrumb[] => {
+            (
+                insightLogicRef: {
+                    logic: BuiltLogic<insightLogicType>
+                    unmount: () => void
+                } | null,
+                insight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>> | null | undefined,
+                insightQuery: Node<Record<string, any>> | null | undefined,
+                dashboardId: DashboardType['id'] | null,
+                dashboardName: DashboardType['name'] | null,
+                sceneSource: InsightSceneSource | null
+            ): Breadcrumb[] => {
                 const dashboardLabel = dashboardName ?? 'Dashboard'
                 return [
                     ...(dashboardId !== null
@@ -346,14 +506,16 @@ export const insightSceneLogic = kea<insightSceneLogicType>([
         ],
         projectTreeRef: [
             (s) => [s.insightId],
-            (insightId): ProjectTreeRef => ({
+            (insightId: InsightId | null): ProjectTreeRef => ({
                 type: 'insight',
                 ref: insightId && insightId !== 'new' && !insightId.startsWith('new-') ? String(insightId) : null,
             }),
         ],
         [SIDE_PANEL_CONTEXT_KEY]: [
             (s) => [s.insight],
-            (insight): SidePanelSceneContext | null => {
+            (
+                insight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>> | null | undefined
+            ): SidePanelSceneContext | null => {
                 if (!insight?.id) {
                     // An unsaved insight has no numeric id yet. Still declare the Insight scope so
                     // sidePanelContextLogic does not fall back to the URL-based guesser (which would
@@ -379,7 +541,11 @@ export const insightSceneLogic = kea<insightSceneLogicType>([
         ],
         maxContext: [
             (s) => [s.insight, s.filtersOverride, s.variablesOverride],
-            (insight: Partial<QueryBasedInsightModel>, filtersOverride, variablesOverride): MaxContextInput[] => {
+            (
+                insight: Partial<QueryBasedInsightModel>,
+                filtersOverride: DashboardFilter | null,
+                variablesOverride: Record<string, HogQLVariable> | null
+            ): MaxContextInput[] => {
                 if (!insight || !insight.short_id || !insight.query) {
                     return []
                 }
@@ -393,7 +559,11 @@ export const insightSceneLogic = kea<insightSceneLogicType>([
         ],
         hasOverrides: [
             (s) => [s.filtersOverride, s.variablesOverride, s.tileFiltersOverride],
-            (filtersOverride, variablesOverride, tileFiltersOverride) =>
+            (
+                filtersOverride: DashboardFilter | null,
+                variablesOverride: Record<string, HogQLVariable> | null,
+                tileFiltersOverride: TileFilters | null
+            ) =>
                 !isDashboardFilterEmpty(filtersOverride) ||
                 (isObject(variablesOverride) && !isEmptyObject(variablesOverride)) ||
                 !isDashboardFilterEmpty(tileFiltersOverride),
diff --git a/frontend/src/scenes/insights/insightUsageLogic.ts b/frontend/src/scenes/insights/insightUsageLogic.ts
index e2d41e607dbf..9f5c8075da7e 100644
--- a/frontend/src/scenes/insights/insightUsageLogic.ts
+++ b/frontend/src/scenes/insights/insightUsageLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers } from 'kea'
 import { subscriptions } from 'kea-subscriptions'
 
 import api from 'lib/api'
@@ -12,13 +12,59 @@ import { insightVizDataNodeKey } from '~/queries/nodes/InsightViz/insightVizKeys
 import { Node } from '~/queries/schema/schema-general'
 import { InsightLogicProps } from '~/types'
 
+import type { DataNode } from '../../queries/schema/schema-general'
+import type { QueryBasedInsightModel } from '../../types'
 import { insightLogic } from './insightLogic'
 import { insightSceneLogic } from './insightSceneLogic'
-import type { insightUsageLogicType } from './insightUsageLogicType'
 import { keyForInsightLogicProps } from './sharedUtils'
 
 const IS_TEST_MODE = process.env.NODE_ENV === 'test'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightUsageLogicValues {
+    query: DataNode<Record<string, any>> // dataNodeLogic
+    insight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>> // insightLogic
+    currentProjectId: number | null // projectLogic
+    isFirstLoad: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightUsageLogicActions {
+    reportInsightViewed: (
+        insightModel: Partial<QueryBasedInsightModel<Node<Record<string, any>>>>,
+        query: Node<Record<string, any>> | null,
+        isFirstLoad: boolean,
+        delay?: number | undefined
+    ) => {
+        delay: number | undefined
+        insightModel: Partial<QueryBasedInsightModel<Node<Record<string, any>>>>
+        isFirstLoad: boolean
+        query: Node<Record<string, any>> | null
+    } // eventUsageLogic
+    onQueryChange: (
+        query: Node | null,
+        previousQuery?: Node | null
+    ) => {
+        previousQuery: Node<Record<string, any>> | null | undefined
+        query: Node<Record<string, any>> | null
+    }
+    setNotFirstLoad: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightUsageLogicMeta {
+    key: string
+}
+
+export type insightUsageLogicType = MakeLogicType<
+    insightUsageLogicValues,
+    insightUsageLogicActions,
+    InsightLogicProps,
+    insightUsageLogicMeta
+>
+
 export const insightUsageLogic = kea<insightUsageLogicType>([
     props({} as InsightLogicProps),
     key(keyForInsightLogicProps('new')),
diff --git a/frontend/src/scenes/insights/insightVizDataLogic.ts b/frontend/src/scenes/insights/insightVizDataLogic.ts
index 9e5ed776bf76..f88ee2b85a3b 100644
--- a/frontend/src/scenes/insights/insightVizDataLogic.ts
+++ b/frontend/src/scenes/insights/insightVizDataLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import posthog from 'posthog-js'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -111,7 +111,42 @@ import {
     SlowQueryPossibilities,
 } from '~/types'
 
-import type { insightVizDataLogicType } from './insightVizDataLogicType'
+import type { DataColorTheme } from '../../lib/colors'
+import type { FeatureFlagsSet } from '../../lib/logic/featureFlagLogic'
+import type {
+    Breakdown,
+    DataNode,
+    DataWarehouseNode,
+    DatabaseSchemaDataWarehouseTable,
+    DatabaseSchemaViewTable,
+    ErrorTrackingQueryResponse,
+    EventsQueryResponse,
+    FunnelPathsFilter,
+    GoalLine,
+    HogQLAutocompleteResponse,
+    HogQLMetadataResponse,
+    HogQLQueryResponse,
+    HogQueryResponse,
+    LifecycleFilter,
+    LogAttributesQueryResponse,
+    LogValuesQueryResponse,
+    LogsQueryResponse,
+    MetricsQueryResponse,
+    PathsFilter,
+    PathsQuery,
+    RefreshType,
+    ResultCustomizationBy,
+    RetentionFilter,
+    SessionsQueryResponse,
+    StickinessFilter,
+    TraceSpansAggregationQueryResponse,
+    TraceSpansAttributeBreakdownQueryResponse,
+    TraceSpansQueryResponse,
+    TraceSpansTreeQueryResponse,
+    WebOverviewQuery,
+    WebStatsTableQuery,
+} from '../../queries/schema/schema-general'
+import type { AnyPropertyFilter, GroupTypeIndex, PropertyGroupFilter } from '../../types'
 
 const SHOW_TIMEOUT_MESSAGE_AFTER = 5000
 
@@ -127,6 +162,1030 @@ const DISPLAYS_WITH_IN_CHART_LEGEND = [
 
 export type QuerySourceUpdate = Omit<Partial<InsightQueryNode>, 'kind'>
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightVizDataLogicValues {
+    getTheme: (themeId: number | string | null | undefined) => DataColorTheme | null // dataThemeLogic
+    dataWarehouseTablesMap: Record<string, DatabaseSchemaDataWarehouseTable | DatabaseSchemaViewTable> // databaseTableListLogic
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    filterTestAccountsDefault: boolean // filterTestAccountsDefaultsLogic
+    insightData: Record<string, any> // insightDataLogic
+    insightDataError: Record<string, any> | null // insightDataLogic
+    insightDataLoading: boolean // insightDataLogic
+    insightQuery: DataNode<Record<string, any>> // insightDataLogic
+    query: Node | null // insightDataLogic
+    activeUsersMath: BaseMathType.MonthlyActiveUsers | BaseMathType.WeeklyActiveUsers | null
+    aggregationGroupTypeIndex: GroupTypeIndex | null | undefined
+    allEventNames: string[]
+    breakdownFilter: BreakdownFilter | null | undefined
+    compareFilter: CompareFilter | null | undefined
+    currentDataWarehouseSchemaColumns: DatabaseSchemaField[]
+    dateRange: DateRange | null | undefined
+    detailedResultsAggregationType: AggregationType | undefined
+    display: ChartDisplayType | null | undefined
+    enabledIntervals: Intervals
+    erroredQueryId: any
+    formula: string | null | undefined
+    formulaNodes: TrendsFormulaNode[]
+    formulas: string[] | null | undefined
+    funnelPathsFilter: FunnelPathsFilter | null | undefined
+    funnelsFilter: FunnelsFilter | null | undefined
+    goalLines: GoalLine[] | null | undefined
+    hasDataWarehouseSeries: boolean
+    hasDetailedResultsTable: boolean
+    hasFormula: boolean
+    hasLegend: boolean
+    hasOnlyDataWarehouseSeries: boolean
+    insightFilter: InsightFilter | null | undefined
+    interval: IntervalType | null | undefined
+    isAllEventsQuery: boolean
+    isBreakdownSeries: boolean
+    isFirstTimeForUserQuery: boolean
+    isFormulaModeOpenedExplicitly: boolean
+    isFunnels: boolean
+    isIntervalManuallySet: boolean
+    isLifecycle: boolean
+    isNonTimeSeriesDisplay: boolean
+    isPaths: boolean
+    isRetention: boolean
+    isSingleSeriesDefinition: boolean
+    isSingleSeriesOutput: boolean
+    isStickiness: boolean
+    isStrictFunnelQuery: boolean
+    isTrends: boolean
+    isTrendsLike: boolean
+    isUsingSessionAnalysis: boolean | Breakdown
+    isWebAnalytics: boolean
+    isWebOverview: boolean
+    isWebStatsTable: boolean
+    labelGroupType: LabelGroupType
+    legendPosition: string | null | undefined
+    lifecycleFilter: LifecycleFilter | null | undefined
+    localQuerySource: InsightQueryNode
+    pathsFilter: PathsFilter | null
+    properties: PropertyGroupFilter | AnyPropertyFilter[] | null | undefined
+    querySource:
+        | FunnelsQuery
+        | LifecycleQuery
+        | PathsQuery
+        | RetentionQuery
+        | StickinessQuery
+        | TrendsQuery
+        | WebOverviewQuery
+        | WebStatsTableQuery
+        | null
+    resultCustomizationBy: ResultCustomizationBy | null | undefined
+    retentionFilter: RetentionFilter | null
+    samplingFactor: number | null | undefined
+    series: (AnyEntityNode<AnyDataWarehouseNode> | GroupNode<DataWarehouseNode>)[] | null | undefined
+    shouldShowSessionAnalysisWarning: boolean
+    showAlertThresholdLines: boolean | null | undefined
+    showAnnotations: boolean | null | undefined
+    showLabelOnSeries: boolean | null | undefined
+    showLegend: boolean | null | undefined
+    showMultipleYAxes: boolean | null | undefined
+    showPercentStackView: boolean | null | undefined
+    showPercentagesOnSeries: boolean | null | undefined
+    showValuesOnSeries: boolean | null | undefined
+    slowQueryPossibilities: SlowQueryPossibilities[]
+    stickinessFilter: StickinessFilter | null | undefined
+    supportsBarValueStacking: boolean
+    supportsCompare: boolean
+    supportsDisplay: boolean
+    supportsPercentStackView: boolean
+    supportsResultCustomizationBy: boolean
+    supportsValueOnSeries: boolean
+    theme: DataColorTheme | null
+    timedOutQueryId: string | null
+    timezone: any
+    trendsFilter: TrendsFilter | null | undefined
+    usesInChartLegend: boolean
+    validationError: string | null
+    validationErrorCode: string | null
+    valueOnSeries: boolean
+    vizSpecificOptions: VizSpecificOptions | null | undefined
+    yAxisScaleType: string | null | undefined
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightVizDataLogicActions {
+    cancelChanges: () => {
+        value: true
+    } // insightDataLogic
+    loadData: (
+        refresh?: RefreshType | undefined,
+        alreadyRunningQueryId?: string | undefined,
+        overrideQuery?: DataNode<Record<string, any>> | undefined
+    ) => {
+        overrideQuery: DataNode<Record<string, any>> | undefined
+        pollOnly: boolean
+        queryId: string
+        refresh: RefreshType | undefined
+    } // insightDataLogic
+    loadDataFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    } // insightDataLogic
+    loadDataSuccess: (
+        response:
+            | ErrorTrackingQueryResponse
+            | HogQLAutocompleteResponse
+            | HogQLMetadataResponse
+            | HogQLQueryResponse<any[]>
+            | HogQueryResponse
+            | LogAttributesQueryResponse
+            | LogValuesQueryResponse
+            | MetricsQueryResponse
+            | Record<string, any>
+            | SessionsQueryResponse
+            | TraceSpansAggregationQueryResponse
+            | TraceSpansAttributeBreakdownQueryResponse
+            | TraceSpansQueryResponse
+            | null
+            | undefined,
+        payload?:
+            | {
+                  overrideQuery: DataNode<Record<string, any>> | undefined
+                  pollOnly: boolean
+                  queryId: string
+                  refresh: RefreshType | undefined
+              }
+            | undefined
+    ) => {
+        payload?: {
+            overrideQuery: DataNode<Record<string, any>> | undefined
+            pollOnly: boolean
+            queryId: string
+            refresh: RefreshType | undefined
+        }
+        response:
+            | ErrorTrackingQueryResponse
+            | HogQLAutocompleteResponse
+            | HogQLMetadataResponse
+            | HogQLQueryResponse<any[]>
+            | HogQueryResponse
+            | LogAttributesQueryResponse
+            | LogValuesQueryResponse
+            | MetricsQueryResponse
+            | Record<string, any>
+            | SessionsQueryResponse
+            | TraceSpansAggregationQueryResponse
+            | TraceSpansAttributeBreakdownQueryResponse
+            | TraceSpansQueryResponse
+            | null
+            | undefined
+    } // insightDataLogic
+    setInsightData: (
+        response:
+            | ErrorTrackingQueryResponse
+            | EventsQueryResponse
+            | HogQLAutocompleteResponse
+            | HogQLMetadataResponse
+            | HogQLQueryResponse<any[]>
+            | HogQueryResponse
+            | LogAttributesQueryResponse
+            | LogsQueryResponse
+            | LogValuesQueryResponse
+            | MetricsQueryResponse
+            | Record<string, any>
+            | SessionsQueryResponse
+            | TraceSpansAggregationQueryResponse
+            | TraceSpansAttributeBreakdownQueryResponse
+            | TraceSpansQueryResponse
+            | TraceSpansTreeQueryResponse
+    ) =>
+        | ErrorTrackingQueryResponse
+        | EventsQueryResponse
+        | HogQLAutocompleteResponse
+        | HogQLMetadataResponse
+        | HogQLQueryResponse<any[]>
+        | HogQueryResponse
+        | LogAttributesQueryResponse
+        | LogsQueryResponse
+        | LogValuesQueryResponse
+        | MetricsQueryResponse
+        | Record<string, any>
+        | SessionsQueryResponse
+        | TraceSpansAggregationQueryResponse
+        | TraceSpansAttributeBreakdownQueryResponse
+        | TraceSpansQueryResponse
+        | TraceSpansTreeQueryResponse // insightDataLogic
+    setQuery: (query: Node<Record<string, any>> | null) => {
+        query: Node<Record<string, any>> | null
+    } // insightDataLogic
+    removeFormulaNode: (formulas: TrendsFormulaNode[]) => {
+        formulas: TrendsFormulaNode[]
+    }
+    saveInsight: (redirectToViewMode?: any) => {
+        redirectToViewMode: any
+    }
+    setDetailedResultsAggregationType: (detailedResultsAggregationType: AggregationType) => {
+        detailedResultsAggregationType: AggregationType
+    }
+    setIsIntervalManuallySet: (isIntervalManuallySet: boolean) => {
+        isIntervalManuallySet: boolean
+    }
+    setTimedOutQueryId: (id: string | null) => {
+        id: string | null
+    }
+    toggleFormulaMode: () => {
+        value: true
+    }
+    updateBreakdownFilter: (breakdownFilter: BreakdownFilter) => {
+        breakdownFilter: BreakdownFilter
+    }
+    updateCompareFilter: (compareFilter: CompareFilter) => {
+        compareFilter: CompareFilter
+    }
+    updateDateRange: (
+        dateRange: DateRange,
+        ignoreDebounce?: boolean
+    ) => {
+        dateRange: DateRange
+        ignoreDebounce: boolean
+    }
+    updateDisplay: (display: ChartDisplayType | undefined) => {
+        display: ChartDisplayType | undefined
+    }
+    updateInsightFilter: (insightFilter: InsightFilter) => {
+        insightFilter: InsightFilter
+    }
+    updateQuerySource: (querySource: QuerySourceUpdate) => {
+        querySource: QuerySourceUpdate
+    }
+    updateVizSpecificOptions: (vizSpecificOptions: VizSpecificOptions) => {
+        vizSpecificOptions: VizSpecificOptions
+    }
+    zoomDateRange: (
+        dateFrom: string,
+        dateTo: string
+    ) => {
+        dateFrom: string
+        dateTo: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightVizDataLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        querySource: (
+            query: Node<Record<string, any>> | null
+        ) =>
+            | FunnelsQuery
+            | LifecycleQuery
+            | PathsQuery
+            | RetentionQuery
+            | StickinessQuery
+            | TrendsQuery
+            | WebOverviewQuery
+            | WebStatsTableQuery
+            | null
+        localQuerySource: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null,
+            filterTestAccountsDefault: boolean
+        ) => InsightQueryNode
+        isTrends: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => boolean
+        isFunnels: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => boolean
+        isRetention: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => boolean
+        isPaths: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => boolean
+        isStickiness: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => boolean
+        isLifecycle: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => boolean
+        isWebStatsTable: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => boolean
+        isWebOverview: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => boolean
+        isWebAnalytics: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => boolean
+        isTrendsLike: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => boolean
+        supportsDisplay: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => boolean
+        supportsCompare: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null,
+            display: ChartDisplayType | null | undefined,
+            dateRange: DateRange | null | undefined
+        ) => boolean
+        supportsPercentStackView: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => boolean
+        supportsBarValueStacking: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => boolean
+        supportsValueOnSeries: (
+            isTrends: boolean,
+            isFunnels: boolean,
+            isStickiness: boolean,
+            isLifecycle: boolean,
+            display: ChartDisplayType | null | undefined
+        ) => boolean
+        supportsResultCustomizationBy: (isTrends: boolean, display: ChartDisplayType | null | undefined) => boolean
+        dateRange: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => DateRange | null | undefined
+        breakdownFilter: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => BreakdownFilter | null | undefined
+        compareFilter: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => CompareFilter | null | undefined
+        display: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => ChartDisplayType | null | undefined
+        formula: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => string | null | undefined
+        formulas: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => string[] | null | undefined
+        formulaNodes: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => TrendsFormulaNode[]
+        series: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => (AnyEntityNode<AnyDataWarehouseNode> | GroupNode<DataWarehouseNode>)[] | null | undefined
+        interval: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => IntervalType | null | undefined
+        properties: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => PropertyGroupFilter | AnyPropertyFilter[] | null | undefined
+        samplingFactor: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => number | null | undefined
+        showAlertThresholdLines: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => boolean | null | undefined
+        showAnnotations: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => boolean | null | undefined
+        showLegend: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => boolean | null | undefined
+        legendPosition: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => string | null | undefined
+        showValuesOnSeries: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => boolean | null | undefined
+        showPercentagesOnSeries: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => boolean | null | undefined
+        showLabelOnSeries: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => boolean | null | undefined
+        showPercentStackView: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => boolean | null | undefined
+        yAxisScaleType: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => string | null | undefined
+        showMultipleYAxes: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => boolean | null | undefined
+        resultCustomizationBy: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => ResultCustomizationBy | null | undefined
+        aggregationGroupTypeIndex: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => GroupTypeIndex | null | undefined
+        labelGroupType: (aggregationGroupTypeIndex: GroupTypeIndex | null | undefined) => LabelGroupType
+        goalLines: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => GoalLine[] | null | undefined
+        insightFilter: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => InsightFilter | null | undefined
+        trendsFilter: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => TrendsFilter | null | undefined
+        detailedResultsAggregationType: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => AggregationType | undefined
+        funnelsFilter: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => FunnelsFilter | null | undefined
+        retentionFilter: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => RetentionFilter | null
+        pathsFilter: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => PathsFilter | null
+        stickinessFilter: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => StickinessFilter | null | undefined
+        lifecycleFilter: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => LifecycleFilter | null | undefined
+        funnelPathsFilter: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => FunnelPathsFilter | null | undefined
+        vizSpecificOptions: (query: Node<Record<string, any>> | null) => VizSpecificOptions | null | undefined
+        isUsingSessionAnalysis: (
+            series: (AnyEntityNode<AnyDataWarehouseNode> | GroupNode<DataWarehouseNode>)[] | null | undefined,
+            breakdownFilter: BreakdownFilter | null | undefined,
+            properties: PropertyGroupFilter | AnyPropertyFilter[] | null | undefined
+        ) => boolean | Breakdown
+        shouldShowSessionAnalysisWarning: (
+            isUsingSessionAnalysis: boolean | Breakdown,
+            query: Node<Record<string, any>> | null
+        ) => boolean
+        isNonTimeSeriesDisplay: (display: ChartDisplayType | null | undefined) => boolean
+        isSingleSeriesOutput: (
+            isTrends: boolean,
+            formula: string | null | undefined,
+            formulas: string[] | null | undefined,
+            formulaNodes: TrendsFormulaNode[],
+            series: (AnyEntityNode<AnyDataWarehouseNode> | GroupNode<DataWarehouseNode>)[] | null | undefined,
+            breakdownFilter: BreakdownFilter | null | undefined
+        ) => boolean
+        isBreakdownSeries: (breakdownFilter: BreakdownFilter | null | undefined) => boolean
+        isSingleSeriesDefinition: (
+            isTrends: boolean,
+            formula: string | null | undefined,
+            formulas: string[] | null | undefined,
+            formulaNodes: TrendsFormulaNode[],
+            series: (AnyEntityNode<AnyDataWarehouseNode> | GroupNode<DataWarehouseNode>)[] | null | undefined
+        ) => boolean
+        hasDataWarehouseSeries: (
+            series: (AnyEntityNode<AnyDataWarehouseNode> | GroupNode<DataWarehouseNode>)[] | null | undefined
+        ) => boolean
+        hasOnlyDataWarehouseSeries: (
+            series: (AnyEntityNode<AnyDataWarehouseNode> | GroupNode<DataWarehouseNode>)[] | null | undefined
+        ) => boolean
+        currentDataWarehouseSchemaColumns: (
+            series: (AnyEntityNode<AnyDataWarehouseNode> | GroupNode<DataWarehouseNode>)[] | null | undefined,
+            isSingleSeriesOutput: boolean,
+            isTrends: boolean,
+            hasDataWarehouseSeries: boolean,
+            isBreakdownSeries: boolean,
+            dataWarehouseTablesMap: Record<string, DatabaseSchemaDataWarehouseTable | DatabaseSchemaViewTable>
+        ) => DatabaseSchemaField[]
+        valueOnSeries: (
+            isTrends: boolean,
+            isStickiness: boolean,
+            isLifecycle: boolean,
+            insightFilter: InsightFilter | null | undefined
+        ) => boolean
+        hasLegend: (
+            isTrends: boolean,
+            isStickiness: boolean,
+            isLifecycle: boolean,
+            display: ChartDisplayType | null | undefined
+        ) => boolean
+        usesInChartLegend: (
+            featureFlags: FeatureFlagsSet,
+            isTrends: boolean,
+            isStickiness: boolean,
+            isLifecycle: boolean,
+            display: ChartDisplayType | null | undefined
+        ) => boolean
+        hasDetailedResultsTable: (
+            isTrends: boolean,
+            isStickiness: boolean,
+            display: ChartDisplayType | null | undefined
+        ) => boolean
+        hasFormula: (formulaNodes: TrendsFormulaNode[], isFormulaModeOpenedExplicitly: boolean) => boolean
+        activeUsersMath: (
+            series: (AnyEntityNode<AnyDataWarehouseNode> | GroupNode<DataWarehouseNode>)[] | null | undefined
+        ) => BaseMathType.MonthlyActiveUsers | BaseMathType.WeeklyActiveUsers | null
+        enabledIntervals: (
+            activeUsersMath: BaseMathType.WeeklyActiveUsers | BaseMathType.MonthlyActiveUsers | null,
+            isTrends: boolean,
+            featureFlags: FeatureFlagsSet
+        ) => Intervals
+        erroredQueryId: (insightDataError: Record<string, any> | null) => any
+        validationError: (insightDataError: Record<string, any> | null) => string | null
+        validationErrorCode: (insightDataError: Record<string, any> | null) => string | null
+        timezone: (insightData: Record<string, any>) => any
+        allEventNames: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null,
+            actions: import('~/types').ActionType[]
+        ) => string[]
+        theme: (
+            getTheme: (themeId: number | string | null | undefined) => DataColorTheme | null,
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => DataColorTheme | null
+        isAllEventsQuery: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => boolean
+        isFirstTimeForUserQuery: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => boolean
+        isStrictFunnelQuery: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => boolean
+        slowQueryPossibilities: (
+            isAllEventsQuery: boolean,
+            isFirstTimeForUserQuery: boolean,
+            isStrictFunnelQuery: boolean
+        ) => SlowQueryPossibilities[]
+    }
+}
+
+export type insightVizDataLogicType = MakeLogicType<
+    insightVizDataLogicValues,
+    insightVizDataLogicActions,
+    InsightLogicProps,
+    insightVizDataLogicMeta
+>
+
 export const insightVizDataLogic = kea<insightVizDataLogicType>([
     props({} as InsightLogicProps),
     key(keyForInsightLogicProps('new')),
@@ -200,7 +1259,7 @@ export const insightVizDataLogic = kea<insightVizDataLogicType>([
     selectors({
         querySource: [
             (s) => [s.query],
-            (query) => {
+            (query: Node | null) => {
                 if (!isNodeWithSource(query) || !isInsightQueryNode(query.source)) {
                     return null
                 }
@@ -221,24 +1280,202 @@ export const insightVizDataLogic = kea<insightVizDataLogicType>([
         ],
         localQuerySource: [
             (s) => [s.querySource, s.filterTestAccountsDefault],
-            (querySource, filterTestAccountsDefault) =>
-                querySource ? querySource : queryFromKind(NodeKind.TrendsQuery, filterTestAccountsDefault).source,
-        ],
-
-        isTrends: [(s) => [s.querySource], (q) => isTrendsQuery(q)],
-        isFunnels: [(s) => [s.querySource], (q) => isFunnelsQuery(q)],
-        isRetention: [(s) => [s.querySource], (q) => isRetentionQuery(q)],
-        isPaths: [(s) => [s.querySource], (q) => isPathsQuery(q)],
-        isStickiness: [(s) => [s.querySource], (q) => isStickinessQuery(q)],
-        isLifecycle: [(s) => [s.querySource], (q) => isLifecycleQuery(q)],
-        isWebStatsTable: [(s) => [s.querySource], (q) => isWebStatsTableQuery(q)],
-        isWebOverview: [(s) => [s.querySource], (q) => isWebOverviewQuery(q)],
-        isWebAnalytics: [(s) => [s.querySource], (q) => isWebAnalyticsInsightQuery(q)],
-        isTrendsLike: [(s) => [s.querySource], (q) => isTrendsQuery(q) || isLifecycleQuery(q) || isStickinessQuery(q)], // this is for filtering out world map
-        supportsDisplay: [(s) => [s.querySource], (q) => isTrendsQuery(q) || isStickinessQuery(q)],
+            (
+                querySource:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery,
+                filterTestAccountsDefault: boolean
+            ) => (querySource ? querySource : queryFromKind(NodeKind.TrendsQuery, filterTestAccountsDefault).source),
+        ],
+
+        isTrends: [
+            (s) => [s.querySource],
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => isTrendsQuery(q),
+        ],
+        isFunnels: [
+            (s) => [s.querySource],
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => isFunnelsQuery(q),
+        ],
+        isRetention: [
+            (s) => [s.querySource],
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => isRetentionQuery(q),
+        ],
+        isPaths: [
+            (s) => [s.querySource],
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => isPathsQuery(q),
+        ],
+        isStickiness: [
+            (s) => [s.querySource],
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => isStickinessQuery(q),
+        ],
+        isLifecycle: [
+            (s) => [s.querySource],
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => isLifecycleQuery(q),
+        ],
+        isWebStatsTable: [
+            (s) => [s.querySource],
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => isWebStatsTableQuery(q),
+        ],
+        isWebOverview: [
+            (s) => [s.querySource],
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => isWebOverviewQuery(q),
+        ],
+        isWebAnalytics: [
+            (s) => [s.querySource],
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => isWebAnalyticsInsightQuery(q),
+        ],
+        isTrendsLike: [
+            (s) => [s.querySource],
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => isTrendsQuery(q) || isLifecycleQuery(q) || isStickinessQuery(q),
+        ], // this is for filtering out world map
+        supportsDisplay: [
+            (s) => [s.querySource],
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => isTrendsQuery(q) || isStickinessQuery(q),
+        ],
         supportsCompare: [
             (s) => [s.querySource, s.display, s.dateRange],
-            (q, display, dateRange) => {
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery,
+                display: ChartDisplayType | null | undefined,
+                dateRange: DateRange | null | undefined
+            ) => {
                 if (dateRange?.date_from === 'all') {
                     return false
                 }
@@ -253,11 +1490,45 @@ export const insightVizDataLogic = kea<insightVizDataLogicType>([
                 return false
             },
         ],
-        supportsPercentStackView: [(s) => [s.querySource], (q) => supportsPercentStackView(q)],
-        supportsBarValueStacking: [(s) => [s.querySource], (q) => supportsBarValueStacking(q)],
+        supportsPercentStackView: [
+            (s) => [s.querySource],
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => supportsPercentStackView(q),
+        ],
+        supportsBarValueStacking: [
+            (s) => [s.querySource],
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => supportsBarValueStacking(q),
+        ],
         supportsValueOnSeries: [
             (s) => [s.isTrends, s.isFunnels, s.isStickiness, s.isLifecycle, s.display],
-            (isTrends, isFunnels, isStickiness, isLifecycle, display) => {
+            (
+                isTrends: boolean,
+                isFunnels: boolean,
+                isStickiness: boolean,
+                isLifecycle: boolean,
+                display: ChartDisplayType | null | undefined
+            ) => {
                 if (isTrends || isStickiness) {
                     return !NON_VALUES_ON_SERIES_DISPLAY_TYPES.includes(display || ChartDisplayType.ActionsLineGraph)
                 } else if (isLifecycle || isFunnels) {
@@ -268,14 +1539,70 @@ export const insightVizDataLogic = kea<insightVizDataLogicType>([
         ],
         supportsResultCustomizationBy: [
             (s) => [s.isTrends, s.display],
-            (isTrends, display) =>
+            (isTrends: boolean, display: ChartDisplayType | null | undefined) =>
                 isTrends && [ChartDisplayType.ActionsLineGraph].includes(display || ChartDisplayType.ActionsLineGraph),
         ],
 
-        dateRange: [(s) => [s.querySource], (q) => (q ? q.dateRange : null)],
-        breakdownFilter: [(s) => [s.querySource], (q) => (q ? getBreakdown(q) : null)],
-        compareFilter: [(s) => [s.querySource], (q) => (q ? getCompareFilter(q) : null)],
-        display: [(s) => [s.querySource], (q) => (q ? getDisplay(q) : null)],
+        dateRange: [
+            (s) => [s.querySource],
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => (q ? q.dateRange : null),
+        ],
+        breakdownFilter: [
+            (s) => [s.querySource],
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => (q ? getBreakdown(q) : null),
+        ],
+        compareFilter: [
+            (s) => [s.querySource],
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => (q ? getCompareFilter(q) : null),
+        ],
+        display: [
+            (s) => [s.querySource],
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => (q ? getDisplay(q) : null),
+        ],
         formula: [
             (s) => [s.querySource],
             (querySource: InsightQueryNode | null) => (querySource ? getFormula(querySource) : null),
@@ -296,54 +1623,424 @@ export const insightVizDataLogic = kea<insightVizDataLogicType>([
                     : []
             },
         ],
-        series: [(s) => [s.querySource], (q) => (q ? getSeries(q) : null)],
-        interval: [(s) => [s.querySource], (q) => (q ? getInterval(q) : null)],
-        properties: [(s) => [s.querySource], (q) => (q ? q.properties : null)],
-        samplingFactor: [(s) => [s.querySource], (q) => (q && 'samplingFactor' in q ? q.samplingFactor : null)],
-        showAlertThresholdLines: [(s) => [s.querySource], (q) => (q ? getShowAlertThresholdLines(q) : null)],
-        showAnnotations: [(s) => [s.querySource], (q) => (q ? getShowAnnotations(q) : null)],
-        showLegend: [(s) => [s.querySource], (q) => (q ? getShowLegend(q) : null)],
-        legendPosition: [(s) => [s.querySource], (q) => (q ? getLegendPosition(q) : null)],
-        showValuesOnSeries: [(s) => [s.querySource], (q) => (q ? getShowValuesOnSeries(q) : null)],
-        showPercentagesOnSeries: [(s) => [s.querySource], (q) => (q ? getShowPercentagesOnSeries(q) : null)],
-        showLabelOnSeries: [(s) => [s.querySource], (q) => (q ? getShowLabelsOnSeries(q) : null)],
-        showPercentStackView: [(s) => [s.querySource], (q) => (q ? getShowPercentStackView(q) : null)],
-        yAxisScaleType: [(s) => [s.querySource], (q) => (q ? getYAxisScaleType(q) : null)],
-        showMultipleYAxes: [(s) => [s.querySource], (q) => (q ? getShowMultipleYAxes(q) : null)],
-        resultCustomizationBy: [(s) => [s.querySource], (q) => (q ? getResultCustomizationBy(q) : null)],
-        aggregationGroupTypeIndex: [(s) => [s.querySource], (q) => (q ? getAggregationGroupTypeIndex(q) : null)],
+        series: [
+            (s) => [s.querySource],
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => (q ? getSeries(q) : null),
+        ],
+        interval: [
+            (s) => [s.querySource],
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => (q ? getInterval(q) : null),
+        ],
+        properties: [
+            (s) => [s.querySource],
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => (q ? q.properties : null),
+        ],
+        samplingFactor: [
+            (s) => [s.querySource],
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => (q && 'samplingFactor' in q ? q.samplingFactor : null),
+        ],
+        showAlertThresholdLines: [
+            (s) => [s.querySource],
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => (q ? getShowAlertThresholdLines(q) : null),
+        ],
+        showAnnotations: [
+            (s) => [s.querySource],
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => (q ? getShowAnnotations(q) : null),
+        ],
+        showLegend: [
+            (s) => [s.querySource],
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => (q ? getShowLegend(q) : null),
+        ],
+        legendPosition: [
+            (s) => [s.querySource],
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => (q ? getLegendPosition(q) : null),
+        ],
+        showValuesOnSeries: [
+            (s) => [s.querySource],
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => (q ? getShowValuesOnSeries(q) : null),
+        ],
+        showPercentagesOnSeries: [
+            (s) => [s.querySource],
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => (q ? getShowPercentagesOnSeries(q) : null),
+        ],
+        showLabelOnSeries: [
+            (s) => [s.querySource],
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => (q ? getShowLabelsOnSeries(q) : null),
+        ],
+        showPercentStackView: [
+            (s) => [s.querySource],
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => (q ? getShowPercentStackView(q) : null),
+        ],
+        yAxisScaleType: [
+            (s) => [s.querySource],
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => (q ? getYAxisScaleType(q) : null),
+        ],
+        showMultipleYAxes: [
+            (s) => [s.querySource],
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => (q ? getShowMultipleYAxes(q) : null),
+        ],
+        resultCustomizationBy: [
+            (s) => [s.querySource],
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => (q ? getResultCustomizationBy(q) : null),
+        ],
+        aggregationGroupTypeIndex: [
+            (s) => [s.querySource],
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => (q ? getAggregationGroupTypeIndex(q) : null),
+        ],
         labelGroupType: [
             (s) => [s.aggregationGroupTypeIndex],
-            (aggregationGroupTypeIndex): LabelGroupType => aggregationGroupTypeIndex ?? 'people',
+            (aggregationGroupTypeIndex: null | import('~/types').GroupTypeIndex | undefined): LabelGroupType =>
+                aggregationGroupTypeIndex ?? 'people',
         ],
         goalLines: [
             (s) => [s.querySource],
-            (q) => (isTrendsQuery(q) || isFunnelsQuery(q) || isRetentionQuery(q) ? getGoalLines(q) : null),
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => (isTrendsQuery(q) || isFunnelsQuery(q) || isRetentionQuery(q) ? getGoalLines(q) : null),
         ],
         insightFilter: [
             (s) => [s.querySource],
-            (q) => (q && !isWebAnalyticsInsightQuery(q) ? filterForQuery(q) : null),
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => (q && !isWebAnalyticsInsightQuery(q) ? filterForQuery(q) : null),
+        ],
+        trendsFilter: [
+            (s) => [s.querySource],
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => (isTrendsQuery(q) ? q.trendsFilter : null),
         ],
-        trendsFilter: [(s) => [s.querySource], (q) => (isTrendsQuery(q) ? q.trendsFilter : null)],
         detailedResultsAggregationType: [
             (s) => [s.querySource],
-            (querySource): AggregationType | undefined => {
+            (
+                querySource:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ): AggregationType | undefined => {
                 if (isTrendsQuery(querySource)) {
                     return querySource.trendsFilter?.detailedResultsAggregationType as AggregationType | undefined
                 }
             },
         ],
-        funnelsFilter: [(s) => [s.querySource], (q) => (isFunnelsQuery(q) ? q.funnelsFilter : null)],
-        retentionFilter: [(s) => [s.querySource], (q) => (isRetentionQuery(q) ? q.retentionFilter : null)],
-        pathsFilter: [(s) => [s.querySource], (q) => (isPathsQuery(q) ? q.pathsFilter : null)],
-        stickinessFilter: [(s) => [s.querySource], (q) => (isStickinessQuery(q) ? q.stickinessFilter : null)],
-        lifecycleFilter: [(s) => [s.querySource], (q) => (isLifecycleQuery(q) ? q.lifecycleFilter : null)],
-        funnelPathsFilter: [(s) => [s.querySource], (q) => (isPathsQuery(q) ? q.funnelPathsFilter : null)],
+        funnelsFilter: [
+            (s) => [s.querySource],
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => (isFunnelsQuery(q) ? q.funnelsFilter : null),
+        ],
+        retentionFilter: [
+            (s) => [s.querySource],
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => (isRetentionQuery(q) ? q.retentionFilter : null),
+        ],
+        pathsFilter: [
+            (s) => [s.querySource],
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => (isPathsQuery(q) ? q.pathsFilter : null),
+        ],
+        stickinessFilter: [
+            (s) => [s.querySource],
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => (isStickinessQuery(q) ? q.stickinessFilter : null),
+        ],
+        lifecycleFilter: [
+            (s) => [s.querySource],
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => (isLifecycleQuery(q) ? q.lifecycleFilter : null),
+        ],
+        funnelPathsFilter: [
+            (s) => [s.querySource],
+            (
+                q:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => (isPathsQuery(q) ? q.funnelPathsFilter : null),
+        ],
         vizSpecificOptions: [(s) => [s.query], (q: Node) => (isInsightVizNode(q) ? q.vizSpecificOptions : null)],
 
         isUsingSessionAnalysis: [
             (s) => [s.series, s.breakdownFilter, s.properties],
-            (series, breakdownFilter, properties) => {
+            (
+                series:
+                    | (
+                          | AnyEntityNode<AnyDataWarehouseNode>
+                          | GroupNode<import('~/queries/schema/schema-general').DataWarehouseNode>
+                      )[]
+                    | null
+                    | undefined,
+                breakdownFilter: BreakdownFilter | null | undefined,
+                properties:
+                    | import('~/types').AnyPropertyFilter[]
+                    | null
+                    | import('~/types').PropertyGroupFilter
+                    | undefined
+            ) => {
                 const using_session_breakdown =
                     breakdownFilter?.breakdown_type === 'session' ||
                     breakdownFilter?.breakdowns?.find((breakdown) => breakdown.type === 'session')
@@ -368,12 +2065,15 @@ export const insightVizDataLogic = kea<insightVizDataLogicType>([
         ],
         shouldShowSessionAnalysisWarning: [
             (s) => [s.isUsingSessionAnalysis, s.query],
-            (isUsingSessionAnalysis, query) =>
-                isUsingSessionAnalysis && !(isInsightVizNode(query) && query.suppressSessionAnalysisWarning),
+            (
+                isUsingSessionAnalysis: boolean | import('~/queries/schema/schema-general').Breakdown,
+                query: Node | null
+            ) => isUsingSessionAnalysis && !(isInsightVizNode(query) && query.suppressSessionAnalysisWarning),
         ],
         isNonTimeSeriesDisplay: [
             (s) => [s.display],
-            (display) => !!display && NON_TIME_SERIES_DISPLAY_TYPES.includes(display),
+            (display: ChartDisplayType | null | undefined) =>
+                !!display && NON_TIME_SERIES_DISPLAY_TYPES.includes(display),
         ],
 
         // Whether the insight will produce a single visual output (one line/bar).
@@ -398,7 +2098,7 @@ export const insightVizDataLogic = kea<insightVizDataLogicType>([
         ],
         isBreakdownSeries: [
             (s) => [s.breakdownFilter],
-            (breakdownFilter): boolean => {
+            (breakdownFilter: BreakdownFilter | null | undefined): boolean => {
                 return !!breakdownFilter?.breakdown || (breakdownFilter?.breakdowns?.length ?? 0) > 0
             },
         ],
@@ -425,11 +2125,27 @@ export const insightVizDataLogic = kea<insightVizDataLogicType>([
 
         hasDataWarehouseSeries: [
             (s) => [s.series],
-            (series): boolean => (series || []).length > 0 && !!series?.some((node) => isAnyDataWarehouseNode(node)),
+            (
+                series:
+                    | (
+                          | AnyEntityNode<AnyDataWarehouseNode>
+                          | GroupNode<import('~/queries/schema/schema-general').DataWarehouseNode>
+                      )[]
+                    | null
+                    | undefined
+            ): boolean => (series || []).length > 0 && !!series?.some((node) => isAnyDataWarehouseNode(node)),
         ],
         hasOnlyDataWarehouseSeries: [
             (s) => [s.series],
-            (series): boolean => {
+            (
+                series:
+                    | (
+                          | AnyEntityNode<AnyDataWarehouseNode>
+                          | GroupNode<import('~/queries/schema/schema-general').DataWarehouseNode>
+                      )[]
+                    | null
+                    | undefined
+            ): boolean => {
                 return !!series && series.length > 0 && series.every((node) => isAnyDataWarehouseNode(node))
             },
         ],
@@ -444,12 +2160,22 @@ export const insightVizDataLogic = kea<insightVizDataLogicType>([
                 s.dataWarehouseTablesMap,
             ],
             (
-                series,
-                isSingleSeriesOutput,
-                isTrends,
-                hasDataWarehouseSeries,
-                isBreakdownSeries,
-                dataWarehouseTablesMap
+                series:
+                    | (
+                          | AnyEntityNode<AnyDataWarehouseNode>
+                          | GroupNode<import('~/queries/schema/schema-general').DataWarehouseNode>
+                      )[]
+                    | null
+                    | undefined,
+                isSingleSeriesOutput: boolean,
+                isTrends: boolean,
+                hasDataWarehouseSeries: boolean,
+                isBreakdownSeries: boolean,
+                dataWarehouseTablesMap: Record<
+                    string,
+                    | import('~/queries/schema/schema-general').DatabaseSchemaDataWarehouseTable
+                    | import('~/queries/schema/schema-general').DatabaseSchemaViewTable
+                >
             ): DatabaseSchemaField[] => {
                 if (!hasDataWarehouseSeries || (isTrends && !isSingleSeriesOutput && !isBreakdownSeries)) {
                     return []
@@ -465,7 +2191,12 @@ export const insightVizDataLogic = kea<insightVizDataLogicType>([
 
         valueOnSeries: [
             (s) => [s.isTrends, s.isStickiness, s.isLifecycle, s.insightFilter],
-            (isTrends, isStickiness, isLifecycle, insightFilter): boolean => {
+            (
+                isTrends: boolean,
+                isStickiness: boolean,
+                isLifecycle: boolean,
+                insightFilter: InsightFilter | null | undefined
+            ): boolean => {
                 return !!(
                     ((isTrends || isStickiness || isLifecycle) &&
                         (insightFilter as TrendsFilter)?.showValuesOnSeries) ||
@@ -478,7 +2209,12 @@ export const insightVizDataLogic = kea<insightVizDataLogicType>([
 
         hasLegend: [
             (s) => [s.isTrends, s.isStickiness, s.isLifecycle, s.display],
-            (isTrends, isStickiness, isLifecycle, display) =>
+            (
+                isTrends: boolean,
+                isStickiness: boolean,
+                isLifecycle: boolean,
+                display: ChartDisplayType | null | undefined
+            ) =>
                 (isTrends || isStickiness || isLifecycle) &&
                 !(display && DISPLAY_TYPES_WITHOUT_LEGEND.includes(display)),
         ],
@@ -488,7 +2224,13 @@ export const insightVizDataLogic = kea<insightVizDataLogicType>([
         // InsightDisplayConfig (which control to show) and InsightVizDisplay (suppress side legend).
         usesInChartLegend: [
             (s) => [s.featureFlags, s.isTrends, s.isStickiness, s.isLifecycle, s.display],
-            (featureFlags, isTrends, isStickiness, isLifecycle, display): boolean => {
+            (
+                featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet,
+                isTrends: boolean,
+                isStickiness: boolean,
+                isLifecycle: boolean,
+                display: ChartDisplayType | null | undefined
+            ): boolean => {
                 // Lifecycle always uses config.legend inside TimeSeriesBarChart — no flag gate needed.
                 if (isLifecycle) {
                     return true
@@ -518,12 +2260,23 @@ export const insightVizDataLogic = kea<insightVizDataLogicType>([
 
         activeUsersMath: [
             (s) => [s.series],
-            (series): BaseMathType.MonthlyActiveUsers | BaseMathType.WeeklyActiveUsers | null =>
-                getActiveUsersMath(series),
+            (
+                series:
+                    | (
+                          | AnyEntityNode<AnyDataWarehouseNode>
+                          | GroupNode<import('~/queries/schema/schema-general').DataWarehouseNode>
+                      )[]
+                    | null
+                    | undefined
+            ): BaseMathType.MonthlyActiveUsers | BaseMathType.WeeklyActiveUsers | null => getActiveUsersMath(series),
         ],
         enabledIntervals: [
             (s) => [s.activeUsersMath, s.isTrends, s.featureFlags],
-            (activeUsersMath, isTrends, featureFlags): Intervals => {
+            (
+                activeUsersMath: BaseMathType.MonthlyActiveUsers | BaseMathType.WeeklyActiveUsers | null,
+                isTrends: boolean,
+                featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet
+            ): Intervals => {
                 const enabledIntervals: Intervals = { ...intervals }
 
                 if (featureFlags[FEATURE_FLAGS.PRODUCT_ANALYTICS_QUARTER_YEAR_INTERVALS]) {
@@ -570,36 +2323,73 @@ export const insightVizDataLogic = kea<insightVizDataLogicType>([
 
         erroredQueryId: [
             (s) => [s.insightDataError],
-            (insightDataError) => {
+            (insightDataError: Record<string, any> | null) => {
                 return insightDataError?.queryId || null
             },
         ],
         validationError: [
             (s) => [s.insightDataError],
-            (insightDataError): string | null => extractValidationError(insightDataError),
+            (insightDataError: Record<string, any> | null): string | null => extractValidationError(insightDataError),
         ],
         validationErrorCode: [
             (s) => [s.insightDataError],
-            (insightDataError): string | null => extractValidationErrorCode(insightDataError),
+            (insightDataError: Record<string, any> | null): string | null =>
+                extractValidationErrorCode(insightDataError),
         ],
 
-        timezone: [(s) => [s.insightData], (insightData) => insightData?.timezone || 'UTC'],
+        timezone: [(s) => [s.insightData], (insightData: Record<string, any>) => insightData?.timezone || 'UTC'],
 
         // all events used in the insight (useful for fetching only relevant property definitions)
         allEventNames: [
             (s) => [s.querySource, actionsModel.selectors.actions],
-            (querySource, actions) => (querySource ? getAllEventNames(querySource, actions) : []),
+            (
+                querySource:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery,
+                actions: import('~/types').ActionType[]
+            ) => (querySource ? getAllEventNames(querySource, actions) : []),
         ],
 
         theme: [
             (s) => [s.getTheme, s.querySource],
-            (getTheme, querySource) =>
-                getTheme(querySource && 'dataColorTheme' in querySource ? querySource.dataColorTheme : undefined),
+            (
+                getTheme: (
+                    themeId: number | string | null | undefined
+                ) => null | import('../../lib/colors').DataColorTheme,
+                querySource:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => getTheme(querySource && 'dataColorTheme' in querySource ? querySource.dataColorTheme : undefined),
         ],
 
         isAllEventsQuery: [
             (s) => [s.querySource],
-            (querySource) => {
+            (
+                querySource:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => {
                 return (
                     (querySource?.kind === NodeKind.TrendsQuery || querySource?.kind === NodeKind.FunnelsQuery) &&
                     querySource?.series?.some((s: { name?: string }) => s.name === 'All events')
@@ -608,7 +2398,18 @@ export const insightVizDataLogic = kea<insightVizDataLogicType>([
         ],
         isFirstTimeForUserQuery: [
             (s) => [s.querySource],
-            (querySource) => {
+            (
+                querySource:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => {
                 return (
                     querySource?.kind === NodeKind.TrendsQuery &&
                     querySource?.series?.some((s: { math?: string }) =>
@@ -619,7 +2420,18 @@ export const insightVizDataLogic = kea<insightVizDataLogicType>([
         ],
         isStrictFunnelQuery: [
             (s) => [s.querySource],
-            (querySource) => {
+            (
+                querySource:
+                    | FunnelsQuery
+                    | LifecycleQuery
+                    | RetentionQuery
+                    | StickinessQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => {
                 return (
                     querySource?.kind === NodeKind.FunnelsQuery &&
                     querySource?.funnelsFilter?.funnelOrderType === 'strict'
@@ -628,7 +2440,11 @@ export const insightVizDataLogic = kea<insightVizDataLogicType>([
         ],
         slowQueryPossibilities: [
             (s) => [s.isAllEventsQuery, s.isFirstTimeForUserQuery, s.isStrictFunnelQuery],
-            (isAllEventsQuery, isFirstTimeForUserQuery, isStrictFunnelQuery): SlowQueryPossibilities[] => {
+            (
+                isAllEventsQuery: boolean,
+                isFirstTimeForUserQuery: boolean,
+                isStrictFunnelQuery: boolean
+            ): SlowQueryPossibilities[] => {
                 const possibilities: SlowQueryPossibilities[] = []
                 if (isAllEventsQuery) {
                     possibilities.push('all_events')
diff --git a/frontend/src/scenes/insights/summarizeInsight.ts b/frontend/src/scenes/insights/summarizeInsight.ts
index 998fd9c56848..1c838b04dd99 100644
--- a/frontend/src/scenes/insights/summarizeInsight.ts
+++ b/frontend/src/scenes/insights/summarizeInsight.ts
@@ -10,12 +10,12 @@ import {
 } from 'scenes/insights/utils'
 import { retentionOptions } from 'scenes/retention/constants'
 import { MathCategory, apiValueToMathType, mathsLogic } from 'scenes/trends/mathsLogic'
-import { mathsLogicType } from 'scenes/trends/mathsLogicType'
+import type { mathsLogicType } from 'scenes/trends/mathsLogic'
 
 import { cohortsModel } from '~/models/cohortsModel'
-import { cohortsModelType } from '~/models/cohortsModelType'
+import type { cohortsModelType } from '~/models/cohortsModel'
 import { groupsModel } from '~/models/groupsModel'
-import { groupsModelType } from '~/models/groupsModelType'
+import type { groupsModelType } from '~/models/groupsModel'
 import { extractDisplayLabel } from '~/queries/nodes/DataTable/utils'
 import {
     Breakdown,
diff --git a/frontend/src/scenes/insights/views/BoxPlot/boxPlotChartLogic.tsx b/frontend/src/scenes/insights/views/BoxPlot/boxPlotChartLogic.tsx
index 72b7a62c8587..b623c5885500 100644
--- a/frontend/src/scenes/insights/views/BoxPlot/boxPlotChartLogic.tsx
+++ b/frontend/src/scenes/insights/views/BoxPlot/boxPlotChartLogic.tsx
@@ -1,12 +1,23 @@
-import { connect, kea, key, path, props, selectors } from 'kea'
+import { MakeLogicType, connect, kea, key, path, props, selectors } from 'kea'
 
 import { insightVizDataLogic } from 'scenes/insights/insightVizDataLogic'
 
 import { BoxPlotDatum } from '~/queries/schema/schema-general'
 import { InsightLogicProps } from '~/types'
 
+import type {
+    FunnelsQuery,
+    LifecycleQuery,
+    PathsQuery,
+    RetentionQuery,
+    StickinessQuery,
+    TrendsFilter,
+    TrendsQuery,
+    WebOverviewQuery,
+    WebStatsTableQuery,
+} from '../../../../queries/schema/schema-general'
+import type { IntervalType } from '../../../../types'
 import { keyForInsightLogicProps } from '../../sharedUtils'
-import type { boxPlotChartLogicType } from './boxPlotChartLogicType'
 
 export interface BoxPlotChartDatum {
     min: number
@@ -26,6 +37,42 @@ export interface BoxPlotSeriesData {
     rawData: BoxPlotDatum[]
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface boxPlotChartLogicValues {
+    insightData: Record<string, any> // insightVizDataLogic
+    interval: IntervalType | null | undefined // insightVizDataLogic
+    querySource:
+        | FunnelsQuery
+        | LifecycleQuery
+        | PathsQuery
+        | RetentionQuery
+        | StickinessQuery
+        | TrendsQuery
+        | WebOverviewQuery
+        | WebStatsTableQuery
+        | null // insightVizDataLogic
+    trendsFilter: TrendsFilter | null | undefined // insightVizDataLogic
+    yAxisScaleType: string | null | undefined // insightVizDataLogic
+    boxplotData: BoxPlotDatum[]
+    dateLabels: string[]
+    seriesGroups: BoxPlotSeriesData[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface boxPlotChartLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        boxplotData: (insightData: Record<string, any>) => BoxPlotDatum[]
+        seriesGroups: (
+            boxplotData: BoxPlotDatum[],
+            trendsFilter: TrendsFilter | null | undefined
+        ) => BoxPlotSeriesData[]
+        dateLabels: (seriesGroups: BoxPlotSeriesData[]) => string[]
+    }
+}
+
+export type boxPlotChartLogicType = MakeLogicType<boxPlotChartLogicValues, {}, InsightLogicProps, boxPlotChartLogicMeta>
+
 export const boxPlotChartLogic = kea<boxPlotChartLogicType>([
     props({} as InsightLogicProps),
     key(keyForInsightLogicProps('new')),
@@ -39,7 +86,7 @@ export const boxPlotChartLogic = kea<boxPlotChartLogicType>([
     selectors({
         boxplotData: [
             (s) => [s.insightData],
-            (insightData): BoxPlotDatum[] => {
+            (insightData: Record<string, any>): BoxPlotDatum[] => {
                 const result = insightData?.result ?? insightData?.results
                 // TODO: remove boxplot_data fallback once cached responses have rotated (added 2026-04-16)
                 const data = Array.isArray(result) && result.length > 0 ? result : insightData?.boxplot_data
@@ -51,7 +98,10 @@ export const boxPlotChartLogic = kea<boxPlotChartLogicType>([
         ],
         seriesGroups: [
             (s) => [s.boxplotData, s.trendsFilter],
-            (boxplotData: BoxPlotDatum[], trendsFilter): BoxPlotSeriesData[] => {
+            (
+                boxplotData: BoxPlotDatum[],
+                trendsFilter: null | import('~/queries/schema/schema-general').TrendsFilter | undefined
+            ): BoxPlotSeriesData[] => {
                 const excludeOutliers = trendsFilter?.excludeBoxPlotOutliers !== false
                 const groupMap = new Map<number, { label: string; data: BoxPlotDatum[] }>()
 
diff --git a/frontend/src/scenes/insights/views/CalendarHeatMap/calendarHeatMapLogic.tsx b/frontend/src/scenes/insights/views/CalendarHeatMap/calendarHeatMapLogic.tsx
index 7c3ac1cfd77f..81199a9fe9d0 100644
--- a/frontend/src/scenes/insights/views/CalendarHeatMap/calendarHeatMapLogic.tsx
+++ b/frontend/src/scenes/insights/views/CalendarHeatMap/calendarHeatMapLogic.tsx
@@ -1,12 +1,28 @@
-import { actions, connect, kea, key, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, path, props, reducers, selectors } from 'kea'
 
 import { insightVizDataLogic } from 'scenes/insights/insightVizDataLogic'
 import { teamLogic } from 'scenes/teamLogic'
 
 import { InsightLogicProps, TrendResult } from '~/types'
 
+import type { DataColorTheme } from '../../../../lib/colors'
+import type {
+    AnyDataWarehouseNode,
+    AnyEntityNode,
+    BreakdownFilter,
+    DataWarehouseNode,
+    FunnelsQuery,
+    GroupNode,
+    LifecycleQuery,
+    PathsQuery,
+    RetentionQuery,
+    StickinessQuery,
+    TrendsFilter,
+    TrendsQuery,
+    WebOverviewQuery,
+    WebStatsTableQuery,
+} from '../../../../queries/schema/schema-general'
 import { keyForInsightLogicProps } from '../../sharedUtils'
-import type { calendarHeatMapLogicType } from './calendarHeatMapLogicType'
 import { DaysAbbreviated, HoursAbbreviated } from './utils'
 
 export interface CalendarHeatMapProcessedData {
@@ -22,6 +38,71 @@ export interface CalendarHeatMapProcessedData {
     minColumnAggregation: number
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface calendarHeatMapLogicValues {
+    breakdownFilter: BreakdownFilter | null | undefined // insightVizDataLogic
+    insightData: Record<string, any> // insightVizDataLogic
+    querySource:
+        | FunnelsQuery
+        | LifecycleQuery
+        | PathsQuery
+        | RetentionQuery
+        | StickinessQuery
+        | TrendsQuery
+        | WebOverviewQuery
+        | WebStatsTableQuery
+        | null // insightVizDataLogic
+    series: (AnyEntityNode<AnyDataWarehouseNode> | GroupNode<DataWarehouseNode>)[] | null | undefined // insightVizDataLogic
+    theme: DataColorTheme | null // insightVizDataLogic
+    trendsFilter: TrendsFilter | null | undefined // insightVizDataLogic
+    weekStartDay: number // teamLogic
+    columnLabels: string[]
+    currentTooltip: [number, number, number] | null
+    isTooltipShown: boolean
+    processedData: CalendarHeatMapProcessedData
+    rowLabels: string[]
+    tooltipCoordinates: [number, number] | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface calendarHeatMapLogicActions {
+    hideTooltip: () => {
+        value: true
+    }
+    showTooltip: (
+        row: number,
+        column: number,
+        value: number
+    ) => {
+        column: number
+        row: number
+        value: number
+    }
+    updateTooltipCoordinates: (
+        x: number,
+        y: number
+    ) => {
+        x: number
+        y: number
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface calendarHeatMapLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        processedData: (insightData: Record<string, any>, weekStartDay: number) => CalendarHeatMapProcessedData
+        rowLabels: (weekStartDay: number) => string[]
+    }
+}
+
+export type calendarHeatMapLogicType = MakeLogicType<
+    calendarHeatMapLogicValues,
+    calendarHeatMapLogicActions,
+    InsightLogicProps,
+    calendarHeatMapLogicMeta
+>
+
 export const calendarHeatMapLogic = kea<calendarHeatMapLogicType>([
     props({} as InsightLogicProps),
     key(keyForInsightLogicProps('new')),
@@ -63,7 +144,7 @@ export const calendarHeatMapLogic = kea<calendarHeatMapLogicType>([
     selectors({
         processedData: [
             (s) => [s.insightData, s.weekStartDay],
-            (insightData, weekStartDay): CalendarHeatMapProcessedData => {
+            (insightData: Record<string, any>, weekStartDay: number): CalendarHeatMapProcessedData => {
                 // Default empty data structure
                 const emptyData = {
                     matrix: Array(7)
@@ -193,7 +274,7 @@ export const calendarHeatMapLogic = kea<calendarHeatMapLogicType>([
         ],
         rowLabels: [
             (s) => [s.weekStartDay],
-            (weekStartDay): string[] => {
+            (weekStartDay: number): string[] => {
                 return Array.from({ length: DaysAbbreviated.values.length }, (_, i) => {
                     const adjustedDay = (i + weekStartDay) % DaysAbbreviated.values.length
                     return DaysAbbreviated.values[adjustedDay]
diff --git a/frontend/src/scenes/insights/views/InsightsTable/insightsTableDataLogic.ts b/frontend/src/scenes/insights/views/InsightsTable/insightsTableDataLogic.ts
index 0be48f09b35b..688432b68e20 100644
--- a/frontend/src/scenes/insights/views/InsightsTable/insightsTableDataLogic.ts
+++ b/frontend/src/scenes/insights/views/InsightsTable/insightsTableDataLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, path, props, reducers, selectors } from 'kea'
 
 import { insightVizDataLogic } from 'scenes/insights/insightVizDataLogic'
 import { keyForInsightLogicProps } from 'scenes/insights/sharedUtils'
@@ -7,7 +7,13 @@ import { IndexedTrendResult } from 'scenes/trends/types'
 
 import { ChartDisplayType, CompareLabelType, InsightLogicProps } from '~/types'
 
-import type { insightsTableDataLogicType } from './insightsTableDataLogicType'
+import type {
+    AnyDataWarehouseNode,
+    AnyEntityNode,
+    CompareFilter,
+    DataWarehouseNode,
+    GroupNode,
+} from '../../../../queries/schema/schema-general'
 
 export enum AggregationType {
     Total = 'total',
@@ -19,6 +25,71 @@ export function compareResultKey(item: IndexedTrendResult): string {
     return JSON.stringify([item.action?.order ?? 0, item.label ?? '', item.breakdown_value ?? ''])
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightsTableDataLogicValues {
+    display: ChartDisplayType | null | undefined // insightVizDataLogic
+    isTrends: boolean // insightVizDataLogic
+    persistedAggregationType: AggregationType | undefined // insightVizDataLogic
+    series: (AnyEntityNode<AnyDataWarehouseNode> | GroupNode<DataWarehouseNode>)[] | null | undefined // insightVizDataLogic
+    compareFilter: CompareFilter | null | undefined // trendsDataLogic
+    indexedResults: IndexedTrendResult[] // trendsDataLogic
+    aggregation: AggregationType
+    allowAggregation: boolean
+    displayResults: IndexedTrendResult[]
+    getPreviousResult: (item: IndexedTrendResult) => IndexedTrendResult | undefined
+    isColumnPinned: (columnKey: string) => boolean
+    pinnedBreakdownColumns: string[]
+    pinnedColumns: string[]
+    previousResultMap: Map<string, IndexedTrendResult>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightsTableDataLogicActions {
+    setDetailedResultsAggregationType: (detailedResultsAggregationType: AggregationType) => {
+        detailedResultsAggregationType: AggregationType
+    } // insightVizDataLogic
+    toggleColumnPin: (columnKey: string) => {
+        columnKey: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightsTableDataLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        pinnedColumns: (pinnedBreakdownColumns: string[]) => string[]
+        isColumnPinned: (pinnedBreakdownColumns: string[]) => (columnKey: string) => boolean
+        allowAggregation: (
+            isTrends: boolean,
+            display: ChartDisplayType | null | undefined,
+            series: (AnyEntityNode<AnyDataWarehouseNode> | GroupNode<DataWarehouseNode>)[] | null | undefined
+        ) => boolean
+        aggregation: (
+            series: (AnyEntityNode<AnyDataWarehouseNode> | GroupNode<DataWarehouseNode>)[] | null | undefined,
+            persistedAggregationType: AggregationType | undefined
+        ) => AggregationType
+        previousResultMap: (
+            compareFilter: CompareFilter | null | undefined,
+            indexedResults: IndexedTrendResult[]
+        ) => Map<string, IndexedTrendResult>
+        getPreviousResult: (
+            compareFilter: CompareFilter | null | undefined,
+            previousResultMap: Map<string, IndexedTrendResult>
+        ) => (item: IndexedTrendResult) => IndexedTrendResult | undefined
+        displayResults: (
+            compareFilter: CompareFilter | null | undefined,
+            indexedResults: IndexedTrendResult[]
+        ) => IndexedTrendResult[]
+    }
+}
+
+export type insightsTableDataLogicType = MakeLogicType<
+    insightsTableDataLogicValues,
+    insightsTableDataLogicActions,
+    InsightLogicProps,
+    insightsTableDataLogicMeta
+>
+
 export const insightsTableDataLogic = kea<insightsTableDataLogicType>([
     props({} as InsightLogicProps),
     key(keyForInsightLogicProps('new')),
@@ -56,13 +127,13 @@ export const insightsTableDataLogic = kea<insightsTableDataLogicType>([
     selectors({
         pinnedColumns: [
             (s) => [s.pinnedBreakdownColumns],
-            (pinnedBreakdownColumns): string[] => {
+            (pinnedBreakdownColumns: string[]): string[] => {
                 return ['label', ...pinnedBreakdownColumns]
             },
         ],
         isColumnPinned: [
             (s) => [s.pinnedBreakdownColumns],
-            (pinnedBreakdownColumns) =>
+            (pinnedBreakdownColumns: string[]) =>
                 (columnKey: string): boolean => {
                     return pinnedBreakdownColumns.includes(columnKey)
                 },
@@ -72,7 +143,21 @@ export const insightsTableDataLogic = kea<insightsTableDataLogicType>([
          * Except when view type is Table or WorldMap */
         allowAggregation: [
             (s) => [s.isTrends, s.display, s.series],
-            (isTrends, display, series) => {
+            (
+                isTrends: boolean,
+                display: ChartDisplayType | null | undefined,
+                series:
+                    | (
+                          | import('../../../../queries/schema').AnyEntityNode<
+                                import('../../../../queries/schema').AnyDataWarehouseNode
+                            >
+                          | import('../../../../queries/schema').GroupNode<
+                                import('../../../../queries/schema').DataWarehouseNode
+                            >
+                      )[]
+                    | null
+                    | undefined
+            ) => {
                 if (isTrends && (display === ChartDisplayType.ActionsTable || display === ChartDisplayType.WorldMap)) {
                     return true
                 }
@@ -82,7 +167,20 @@ export const insightsTableDataLogic = kea<insightsTableDataLogicType>([
         ],
         aggregation: [
             (s) => [s.series, s.persistedAggregationType],
-            (series, persistedAggregationType) => {
+            (
+                series:
+                    | (
+                          | import('../../../../queries/schema').AnyEntityNode<
+                                import('../../../../queries/schema').AnyDataWarehouseNode
+                            >
+                          | import('../../../../queries/schema').GroupNode<
+                                import('../../../../queries/schema').DataWarehouseNode
+                            >
+                      )[]
+                    | null
+                    | undefined,
+                persistedAggregationType: AggregationType | undefined
+            ) => {
                 if (persistedAggregationType) {
                     return persistedAggregationType
                 }
@@ -93,7 +191,10 @@ export const insightsTableDataLogic = kea<insightsTableDataLogicType>([
         ],
         previousResultMap: [
             (s) => [s.compareFilter, s.indexedResults],
-            (compareFilter, indexedResults): Map<string, IndexedTrendResult> => {
+            (
+                compareFilter: null | import('../../../../queries/schema').CompareFilter | undefined,
+                indexedResults: IndexedTrendResult[]
+            ): Map<string, IndexedTrendResult> => {
                 if (!compareFilter?.compare) {
                     return new Map()
                 }
@@ -108,7 +209,10 @@ export const insightsTableDataLogic = kea<insightsTableDataLogicType>([
         ],
         getPreviousResult: [
             (s) => [s.compareFilter, s.previousResultMap],
-            (compareFilter, previousResultMap) =>
+            (
+                compareFilter: null | import('../../../../queries/schema').CompareFilter | undefined,
+                previousResultMap: Map<string, IndexedTrendResult>
+            ) =>
                 (item: IndexedTrendResult): IndexedTrendResult | undefined => {
                     if (!compareFilter?.compare) {
                         return undefined
@@ -118,7 +222,10 @@ export const insightsTableDataLogic = kea<insightsTableDataLogicType>([
         ],
         displayResults: [
             (s) => [s.compareFilter, s.indexedResults],
-            (compareFilter, indexedResults): IndexedTrendResult[] => {
+            (
+                compareFilter: null | import('../../../../queries/schema').CompareFilter | undefined,
+                indexedResults: IndexedTrendResult[]
+            ): IndexedTrendResult[] => {
                 if (compareFilter?.compare) {
                     return indexedResults.filter((r) => r.compare_label === CompareLabelType.Current)
                 }
diff --git a/frontend/src/scenes/insights/views/RegionMap/regionMapLogic.tsx b/frontend/src/scenes/insights/views/RegionMap/regionMapLogic.tsx
index 22efc3d37873..5861d2fe17ac 100644
--- a/frontend/src/scenes/insights/views/RegionMap/regionMapLogic.tsx
+++ b/frontend/src/scenes/insights/views/RegionMap/regionMapLogic.tsx
@@ -1,11 +1,27 @@
-import { actions, connect, kea, key, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, path, props, reducers, selectors } from 'kea'
 
 import { insightVizDataLogic } from 'scenes/insights/insightVizDataLogic'
 
 import { InsightLogicProps, TrendResult } from '~/types'
 
+import type { DataColorTheme } from '../../../../lib/colors'
+import type {
+    AnyDataWarehouseNode,
+    AnyEntityNode,
+    BreakdownFilter,
+    DataWarehouseNode,
+    FunnelsQuery,
+    GroupNode,
+    LifecycleQuery,
+    PathsQuery,
+    RetentionQuery,
+    StickinessQuery,
+    TrendsFilter,
+    TrendsQuery,
+    WebOverviewQuery,
+    WebStatsTableQuery,
+} from '../../../../queries/schema/schema-general'
 import { keyForInsightLogicProps } from '../../sharedUtils'
-import type { regionMapLogicType } from './regionMapLogicType'
 
 const getTrendResults = (insightData: Record<string, any> | null | undefined): TrendResult[] =>
     Array.isArray(insightData?.result) ? (insightData.result as TrendResult[]) : []
@@ -13,6 +29,71 @@ const getTrendResults = (insightData: Record<string, any> | null | undefined): T
 const getSeriesValue = (series: TrendResult | null | undefined): number =>
     series?.aggregated_value ?? series?.count ?? 0
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface regionMapLogicValues {
+    breakdownFilter: BreakdownFilter | null | undefined // insightVizDataLogic
+    insightData: Record<string, any> // insightVizDataLogic
+    querySource:
+        | FunnelsQuery
+        | LifecycleQuery
+        | PathsQuery
+        | RetentionQuery
+        | StickinessQuery
+        | TrendsQuery
+        | WebOverviewQuery
+        | WebStatsTableQuery
+        | null // insightVizDataLogic
+    series: (AnyEntityNode<AnyDataWarehouseNode> | GroupNode<DataWarehouseNode>)[] | null | undefined // insightVizDataLogic
+    theme: DataColorTheme | null // insightVizDataLogic
+    trendsFilter: TrendsFilter | null | undefined // insightVizDataLogic
+    currentTooltip: [string, string, string, TrendResult | null] | null
+    isTooltipShown: boolean
+    maxAggregatedValue: number
+    subdivisionCodeToSeries: Record<string, TrendResult>
+    tooltipCoordinates: [number, number] | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface regionMapLogicActions {
+    hideTooltip: () => {
+        value: true
+    }
+    showTooltip: (
+        regionCode: string,
+        regionName: string,
+        countryCode: string,
+        regionSeries: TrendResult | null
+    ) => {
+        countryCode: string
+        regionCode: string
+        regionName: string
+        regionSeries: TrendResult | null
+    }
+    updateTooltipCoordinates: (
+        x: number,
+        y: number
+    ) => {
+        x: number
+        y: number
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface regionMapLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        subdivisionCodeToSeries: (insightData: Record<string, any>) => Record<string, TrendResult>
+        maxAggregatedValue: (insightData: Record<string, any>) => number
+    }
+}
+
+export type regionMapLogicType = MakeLogicType<
+    regionMapLogicValues,
+    regionMapLogicActions,
+    InsightLogicProps,
+    regionMapLogicMeta
+>
+
 export const regionMapLogic = kea<regionMapLogicType>([
     props({} as InsightLogicProps),
     key(keyForInsightLogicProps('new')),
@@ -62,7 +143,7 @@ export const regionMapLogic = kea<regionMapLogicType>([
     selectors({
         subdivisionCodeToSeries: [
             (s) => [s.insightData],
-            (insightData): Record<string, TrendResult> => {
+            (insightData: Record<string, any>): Record<string, TrendResult> => {
                 const results = getTrendResults(insightData)
                 if (results.length === 0) {
                     return {}
@@ -83,7 +164,7 @@ export const regionMapLogic = kea<regionMapLogicType>([
         ],
         maxAggregatedValue: [
             (s) => [s.insightData],
-            (insightData) => {
+            (insightData: Record<string, any>) => {
                 return getTrendResults(insightData).reduce((max, series) => Math.max(max, getSeriesValue(series)), 0)
             },
         ],
diff --git a/frontend/src/scenes/insights/views/WorldMap/worldMapLogic.tsx b/frontend/src/scenes/insights/views/WorldMap/worldMapLogic.tsx
index beb4a7471c36..2e9bdb1dc5ec 100644
--- a/frontend/src/scenes/insights/views/WorldMap/worldMapLogic.tsx
+++ b/frontend/src/scenes/insights/views/WorldMap/worldMapLogic.tsx
@@ -1,11 +1,88 @@
-import { actions, connect, kea, key, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, path, props, reducers, selectors } from 'kea'
 
 import { insightVizDataLogic } from 'scenes/insights/insightVizDataLogic'
 
 import { InsightLogicProps, TrendResult } from '~/types'
 
+import type { DataColorTheme } from '../../../../lib/colors'
+import type {
+    AnyDataWarehouseNode,
+    AnyEntityNode,
+    BreakdownFilter,
+    DataWarehouseNode,
+    FunnelsQuery,
+    GroupNode,
+    LifecycleQuery,
+    PathsQuery,
+    RetentionQuery,
+    StickinessQuery,
+    TrendsFilter,
+    TrendsQuery,
+    WebOverviewQuery,
+    WebStatsTableQuery,
+} from '../../../../queries/schema/schema-general'
 import { keyForInsightLogicProps } from '../../sharedUtils'
-import type { worldMapLogicType } from './worldMapLogicType'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface worldMapLogicValues {
+    breakdownFilter: BreakdownFilter | null | undefined // insightVizDataLogic
+    insightData: Record<string, any> // insightVizDataLogic
+    querySource:
+        | FunnelsQuery
+        | LifecycleQuery
+        | PathsQuery
+        | RetentionQuery
+        | StickinessQuery
+        | TrendsQuery
+        | WebOverviewQuery
+        | WebStatsTableQuery
+        | null // insightVizDataLogic
+    series: (AnyEntityNode<AnyDataWarehouseNode> | GroupNode<DataWarehouseNode>)[] | null | undefined // insightVizDataLogic
+    theme: DataColorTheme | null // insightVizDataLogic
+    trendsFilter: TrendsFilter | null | undefined // insightVizDataLogic
+    countryCodeToSeries: Record<string, TrendResult>
+    currentTooltip: [string, TrendResult | null] | null
+    isTooltipShown: boolean
+    maxAggregatedValue: number
+    tooltipCoordinates: [number, number] | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface worldMapLogicActions {
+    hideTooltip: () => {
+        value: true
+    }
+    showTooltip: (
+        countryCode: string,
+        countrySeries: TrendResult | null
+    ) => {
+        countryCode: string
+        countrySeries: TrendResult | null
+    }
+    updateTooltipCoordinates: (
+        x: number,
+        y: number
+    ) => {
+        x: number
+        y: number
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface worldMapLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        countryCodeToSeries: (insightData: Record<string, any>) => Record<string, TrendResult>
+        maxAggregatedValue: (insightData: Record<string, any>) => number
+    }
+}
+
+export type worldMapLogicType = MakeLogicType<
+    worldMapLogicValues,
+    worldMapLogicActions,
+    InsightLogicProps,
+    worldMapLogicMeta
+>
 
 export const worldMapLogic = kea<worldMapLogicType>([
     props({} as InsightLogicProps),
@@ -46,7 +123,7 @@ export const worldMapLogic = kea<worldMapLogicType>([
     selectors({
         countryCodeToSeries: [
             (s) => [s.insightData],
-            (insightData): Record<string, TrendResult> =>
+            (insightData: Record<string, any>): Record<string, TrendResult> =>
                 Object.fromEntries(
                     Array.isArray(insightData?.result)
                         ? (insightData?.result as TrendResult[]).map((series) => [series.breakdown_value, series])
@@ -55,7 +132,7 @@ export const worldMapLogic = kea<worldMapLogicType>([
         ],
         maxAggregatedValue: [
             (s) => [s.insightData],
-            (insightData) =>
+            (insightData: Record<string, any>) =>
                 Array.isArray(insightData?.result)
                     ? Math.max(...(insightData?.result as TrendResult[]).map((series) => series.aggregated_value))
                     : 0,
diff --git a/frontend/src/scenes/instance/AsyncMigrations/asyncMigrationParameterFormLogic.ts b/frontend/src/scenes/instance/AsyncMigrations/asyncMigrationParameterFormLogic.ts
index 5137d127408c..b962eceab688 100644
--- a/frontend/src/scenes/instance/AsyncMigrations/asyncMigrationParameterFormLogic.ts
+++ b/frontend/src/scenes/instance/AsyncMigrations/asyncMigrationParameterFormLogic.ts
@@ -1,10 +1,76 @@
-import { kea, key, path, props } from 'kea'
+import { MakeLogicType, kea, key, path, props } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 
 import { isNumber } from 'lib/utils/guards'
 import { AsyncMigrationModalProps, asyncMigrationsLogic } from 'scenes/instance/AsyncMigrations/asyncMigrationsLogic'
 
-import type { asyncMigrationParameterFormLogicType } from './asyncMigrationParameterFormLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface asyncMigrationParameterFormLogicValues {
+    isParametersSubmitting: boolean
+    isParametersValid: boolean
+    parameters: Record<string, number>
+    parametersAllErrors: Record<string, any>
+    parametersChanged: boolean
+    parametersErrors: DeepPartialMap<Record<string, number>, ValidationErrorType>
+    parametersHasErrors: boolean
+    parametersManualErrors: Record<string, any>
+    parametersTouched: boolean
+    parametersTouches: Record<string, boolean>
+    parametersValidationErrors: DeepPartialMap<Record<string, number>, ValidationErrorType>
+    showParametersErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface asyncMigrationParameterFormLogicActions {
+    resetParameters: (values?: Record<string, number>) => {
+        values?: Record<string, number>
+    }
+    setParametersManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setParametersValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setParametersValues: (values: DeepPartial<Record<string, number>>) => {
+        values: DeepPartial<Record<string, number>>
+    }
+    submitParameters: () => {
+        value: boolean
+    }
+    submitParametersFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitParametersRequest: (parameters: Record<string, number>) => {
+        parameters: Record<string, number>
+    }
+    submitParametersSuccess: (parameters: Record<string, number>) => {
+        parameters: Record<string, number>
+    }
+    touchParametersField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface asyncMigrationParameterFormLogicMeta {
+    key: number
+}
+
+export type asyncMigrationParameterFormLogicType = MakeLogicType<
+    asyncMigrationParameterFormLogicValues,
+    asyncMigrationParameterFormLogicActions,
+    AsyncMigrationModalProps,
+    asyncMigrationParameterFormLogicMeta
+>
 
 export const asyncMigrationParameterFormLogic = kea<asyncMigrationParameterFormLogicType>([
     path(['scenes', 'instance', 'AsyncMigrations', 'asyncMigrationParameterFormLogic']),
diff --git a/frontend/src/scenes/instance/AsyncMigrations/asyncMigrationsLogic.ts b/frontend/src/scenes/instance/AsyncMigrations/asyncMigrationsLogic.ts
index 67b436defb77..b9987ee277cf 100644
--- a/frontend/src/scenes/instance/AsyncMigrations/asyncMigrationsLogic.ts
+++ b/frontend/src/scenes/instance/AsyncMigrations/asyncMigrationsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, urlToAction } from 'kea-router'
 
@@ -10,7 +10,7 @@ import { userLogic } from 'scenes/userLogic'
 
 import { InstanceSetting } from '~/types'
 
-import type { asyncMigrationsLogicType } from './asyncMigrationsLogicType'
+import type { PreflightStatus } from '../../../types'
 
 export type TabName = 'overview' | 'internal_metrics'
 
@@ -71,6 +71,135 @@ export interface AsyncMigrationModalProps {
     message: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface asyncMigrationsLogicValues {
+    preflight: PreflightStatus | null // preflightLogic
+    actionableMigrations: AsyncMigration[]
+    activeAsyncMigrationModal: AsyncMigrationModalProps | null
+    activeTab: AsyncMigrationsTab
+    asyncMigrationErrors: Record<number, AsyncMigrationError[]>
+    asyncMigrationErrorsLoading: Record<number, boolean>
+    asyncMigrationSettings: InstanceSetting[]
+    asyncMigrationSettingsLoading: boolean
+    asyncMigrations: AsyncMigration[]
+    asyncMigrationsLoading: boolean
+    futureMigrations: AsyncMigration[]
+    isAnyMigrationRunning: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface asyncMigrationsLogicActions {
+    closeAsyncMigrationsModal: () => {
+        value: true
+    }
+    forceStopMigration: (migration: AsyncMigration) => {
+        migration: AsyncMigration
+    }
+    forceStopMigrationWithoutRollback: (migration: AsyncMigration) => {
+        migration: AsyncMigration
+    }
+    loadAsyncMigrationErrors: (migrationId: number) => {
+        migrationId: number
+    }
+    loadAsyncMigrationErrorsFailure: (
+        migrationId: number,
+        error: any
+    ) => {
+        error: any
+        migrationId: number
+    }
+    loadAsyncMigrationErrorsSuccess: (
+        migrationId: number,
+        errors: AsyncMigrationError[]
+    ) => {
+        errors: AsyncMigrationError[]
+        migrationId: number
+    }
+    loadAsyncMigrationSettings: () => any
+    loadAsyncMigrationSettingsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAsyncMigrationSettingsSuccess: (
+        asyncMigrationSettings: InstanceSetting[],
+        payload?: any
+    ) => {
+        asyncMigrationSettings: InstanceSetting[]
+        payload?: any
+    }
+    loadAsyncMigrations: () => any
+    loadAsyncMigrationsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAsyncMigrationsSuccess: (
+        asyncMigrations: AsyncMigration[],
+        payload?: any
+    ) => {
+        asyncMigrations: AsyncMigration[]
+        payload?: any
+    }
+    openAsyncMigrationsModal: (
+        migration: AsyncMigration,
+        endpoint: string,
+        message: string
+    ) => {
+        endpoint: string
+        message: string
+        migration: AsyncMigration
+    }
+    resumeMigration: (migration: AsyncMigration) => {
+        migration: AsyncMigration
+    }
+    rollbackMigration: (migration: AsyncMigration) => {
+        migration: AsyncMigration
+    }
+    setActiveTab: (tab: AsyncMigrationsTab) => {
+        tab: AsyncMigrationsTab
+    }
+    triggerMigration: (migration: AsyncMigration) => {
+        migration: AsyncMigration
+    }
+    updateMigrationStatus: (
+        migration: AsyncMigration,
+        endpoint: string,
+        message: string
+    ) => {
+        endpoint: string
+        message: string
+        migration: AsyncMigration
+    }
+    updateSetting: (
+        settingKey: string,
+        newValue: string
+    ) => {
+        newValue: string
+        settingKey: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface asyncMigrationsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        isAnyMigrationRunning: (asyncMigrations: AsyncMigration[]) => boolean
+        actionableMigrations: (asyncMigrations: AsyncMigration[]) => AsyncMigration[]
+        futureMigrations: (asyncMigrations: AsyncMigration[]) => AsyncMigration[]
+    }
+}
+
+export type asyncMigrationsLogicType = MakeLogicType<
+    asyncMigrationsLogicValues,
+    asyncMigrationsLogicActions,
+    Record<string, any>,
+    asyncMigrationsLogicMeta
+>
+
 export const asyncMigrationsLogic = kea<asyncMigrationsLogicType>([
     path(['scenes', 'instance', 'AsyncMigrations', 'asyncMigrationsLogic']),
     connect(() => ({
@@ -165,18 +294,18 @@ export const asyncMigrationsLogic = kea<asyncMigrationsLogicType>([
     selectors({
         isAnyMigrationRunning: [
             (s) => [s.asyncMigrations],
-            (asyncMigrations) =>
+            (asyncMigrations: AsyncMigration[]) =>
                 asyncMigrations.some((migration) =>
                     [AsyncMigrationStatus.Running, AsyncMigrationStatus.Starting].includes(migration.status)
                 ),
         ],
         actionableMigrations: [
             (s) => [s.asyncMigrations],
-            (asyncMigrations) => asyncMigrations.filter((migration) => migration.is_available),
+            (asyncMigrations: AsyncMigration[]) => asyncMigrations.filter((migration) => migration.is_available),
         ],
         futureMigrations: [
             (s) => [s.asyncMigrations],
-            (asyncMigrations) => asyncMigrations.filter((migration) => !migration.is_available),
+            (asyncMigrations: AsyncMigration[]) => asyncMigrations.filter((migration) => !migration.is_available),
         ],
     }),
 
diff --git a/frontend/src/scenes/instance/DeadLetterQueue/deadLetterQueueLogic.ts b/frontend/src/scenes/instance/DeadLetterQueue/deadLetterQueueLogic.ts
index ce7b9c2afb63..9bd0070fbf0e 100644
--- a/frontend/src/scenes/instance/DeadLetterQueue/deadLetterQueueLogic.ts
+++ b/frontend/src/scenes/instance/DeadLetterQueue/deadLetterQueueLogic.ts
@@ -1,11 +1,10 @@
-import { actions, afterMount, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
 import { userLogic } from 'scenes/userLogic'
 
 import { AppMetricsV2RequestParams, SystemStatusRow } from './../../../types'
-import type { deadLetterQueueLogicType } from './deadLetterQueueLogicType'
 
 export type TabName = 'overview' | 'internal_metrics'
 
@@ -27,6 +26,67 @@ const DEFAULT_FILTERS: MetricsFilters = {
     interval: 'day',
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface deadLetterQueueLogicValues {
+    activeTab: DeadLetterQueueTab
+    deadLetterQueueMetrics: DeadLetterQueueMetricRow[]
+    deadLetterQueueMetricsLoading: boolean
+    filters: MetricsFilters
+    rowsPerMetric: Record<string, string[][]>
+    singleValueMetrics: DeadLetterQueueMetricRow[]
+    tableMetrics: DeadLetterQueueMetricRow[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface deadLetterQueueLogicActions {
+    addRowsToMetric: (
+        key: string,
+        rows: string[][]
+    ) => {
+        key: string
+        rows: string[][]
+    }
+    loadDeadLetterQueueMetrics: () => any
+    loadDeadLetterQueueMetricsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadDeadLetterQueueMetricsSuccess: (
+        deadLetterQueueMetrics: DeadLetterQueueMetricRow[],
+        payload?: any
+    ) => {
+        deadLetterQueueMetrics: DeadLetterQueueMetricRow[]
+        payload?: any
+    }
+    loadMoreRows: (key: string) => {
+        key: string
+    }
+    setActiveTab: (tabKey: DeadLetterQueueTab) => {
+        tabKey: DeadLetterQueueTab
+    }
+    setFilters: (filters: Partial<MetricsFilters>) => {
+        filters: Partial<MetricsFilters>
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface deadLetterQueueLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        singleValueMetrics: (deadLetterQueueMetrics: DeadLetterQueueMetricRow[]) => DeadLetterQueueMetricRow[]
+        tableMetrics: (deadLetterQueueMetrics: DeadLetterQueueMetricRow[]) => DeadLetterQueueMetricRow[]
+    }
+}
+
+export type deadLetterQueueLogicType = MakeLogicType<
+    deadLetterQueueLogicValues,
+    deadLetterQueueLogicActions,
+    Record<string, any>,
+    deadLetterQueueLogicMeta
+>
+
 export const deadLetterQueueLogic = kea<deadLetterQueueLogicType>([
     path(['scenes', 'instance', 'DeadLetterQueue', 'deadLetterQueueLogic']),
 
diff --git a/frontend/src/scenes/instance/QueryPerformance/queryPerformanceLogic.ts b/frontend/src/scenes/instance/QueryPerformance/queryPerformanceLogic.ts
index 65c8ee04f667..e7d7a9034450 100644
--- a/frontend/src/scenes/instance/QueryPerformance/queryPerformanceLogic.ts
+++ b/frontend/src/scenes/instance/QueryPerformance/queryPerformanceLogic.ts
@@ -1,11 +1,9 @@
-import { actions, afterMount, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
 import { userLogic } from 'scenes/userLogic'
 
-import type { queryPerformanceLogicType } from './queryPerformanceLogicType'
-
 export interface PrecomputationTeam {
     team_id: number
     team_name: string
@@ -153,6 +151,177 @@ export interface SlowestQuery {
     sub_queries: SlowestQuery[]
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface queryPerformanceLogicValues {
+    cacheHealth: CacheHealthResponse | null
+    cacheHealthLoading: boolean
+    cachePartitionRows: CachePartitionRow[]
+    exceptionCodeFilter: string
+    experimentIdFilter: string
+    experimentsTab: ExperimentsTab
+    hoursBack: number
+    metricTypeFilter: string
+    overviewHoursBack: number
+    precomputationTeams: PrecomputationTeam[]
+    precomputationTeamsLoading: boolean
+    precomputeOverview: PrecomputeOverviewResponse | null
+    precomputeOverviewLoading: boolean
+    precomputeTimeseries: PrecomputeTimeseriesResponse | null
+    precomputeTimeseriesLoading: boolean
+    search: string
+    slowestQueries: SlowestQuery[]
+    slowestQueriesLoading: boolean
+    teamIdFilter: string
+    timeseriesHoursBack: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface queryPerformanceLogicActions {
+    loadCacheHealth: () => any
+    loadCacheHealthFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadCacheHealthSuccess: (
+        cacheHealth: CacheHealthResponse | null,
+        payload?: any
+    ) => {
+        cacheHealth: CacheHealthResponse | null
+        payload?: any
+    }
+    loadPrecomputationTeams: () => any
+    loadPrecomputationTeamsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPrecomputationTeamsSuccess: (
+        precomputationTeams: PrecomputationTeam[],
+        payload?: any
+    ) => {
+        precomputationTeams: PrecomputationTeam[]
+        payload?: any
+    }
+    loadPrecomputeOverview: () => any
+    loadPrecomputeOverviewFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPrecomputeOverviewSuccess: (
+        precomputeOverview: PrecomputeOverviewResponse | null,
+        payload?: any
+    ) => {
+        precomputeOverview: PrecomputeOverviewResponse | null
+        payload?: any
+    }
+    loadPrecomputeTimeseries: () => any
+    loadPrecomputeTimeseriesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPrecomputeTimeseriesSuccess: (
+        precomputeTimeseries: PrecomputeTimeseriesResponse | null,
+        payload?: any
+    ) => {
+        precomputeTimeseries: PrecomputeTimeseriesResponse | null
+        payload?: any
+    }
+    loadSlowestQueries: () => any
+    loadSlowestQueriesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSlowestQueriesSuccess: (
+        slowestQueries: SlowestQuery[],
+        payload?: any
+    ) => {
+        slowestQueries: SlowestQuery[]
+        payload?: any
+    }
+    setExceptionCodeFilter: (exceptionCode: string) => {
+        exceptionCode: string
+    }
+    setExperimentIdFilter: (experimentId: string) => {
+        experimentId: string
+    }
+    setExperimentsTab: (tab: ExperimentsTab) => {
+        tab: ExperimentsTab
+    }
+    setHoursBack: (hours: number) => {
+        hours: number
+    }
+    setMetricTypeFilter: (metricType: string) => {
+        metricType: string
+    }
+    setOverviewHoursBack: (hours: number) => {
+        hours: number
+    }
+    setPrecomputation: (
+        teamId: number,
+        enabled: boolean
+    ) => {
+        enabled: boolean
+        teamId: number
+    }
+    setPrecomputationFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    setPrecomputationSuccess: (
+        precomputationTeams: PrecomputationTeam[],
+        payload?: {
+            enabled: boolean
+            teamId: number
+        }
+    ) => {
+        precomputationTeams: PrecomputationTeam[]
+        payload?: {
+            enabled: boolean
+            teamId: number
+        }
+    }
+    setSearch: (search: string) => {
+        search: string
+    }
+    setTeamIdFilter: (teamId: string) => {
+        teamId: string
+    }
+    setTimeseriesHoursBack: (hours: number) => {
+        hours: number
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface queryPerformanceLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        cachePartitionRows: (cacheHealth: CacheHealthResponse | null) => CachePartitionRow[]
+    }
+}
+
+export type queryPerformanceLogicType = MakeLogicType<
+    queryPerformanceLogicValues,
+    queryPerformanceLogicActions,
+    Record<string, any>,
+    queryPerformanceLogicMeta
+>
+
 export const queryPerformanceLogic = kea<queryPerformanceLogicType>([
     path(['scenes', 'instance', 'QueryPerformance', 'queryPerformanceLogic']),
     actions({
@@ -305,7 +474,7 @@ export const queryPerformanceLogic = kea<queryPerformanceLogicType>([
     selectors({
         cachePartitionRows: [
             (s) => [s.cacheHealth],
-            (cacheHealth): CachePartitionRow[] => {
+            (cacheHealth: CacheHealthResponse | null): CachePartitionRow[] => {
                 const byPartition: Record<string, CachePartitionRow> = {}
                 for (const table of cacheHealth?.tables ?? []) {
                     for (const partition of table.partitions) {
diff --git a/frontend/src/scenes/instance/SystemStatus/staffUsersLogic.ts b/frontend/src/scenes/instance/SystemStatus/staffUsersLogic.ts
index 762169e69560..821faeb72308 100644
--- a/frontend/src/scenes/instance/SystemStatus/staffUsersLogic.ts
+++ b/frontend/src/scenes/instance/SystemStatus/staffUsersLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, events, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 
@@ -8,7 +8,101 @@ import { userLogic } from 'scenes/userLogic'
 
 import { UserType } from '~/types'
 
-import type { staffUsersLogicType } from './staffUsersLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface staffUsersLogicValues {
+    user: UserType | null // userLogic
+    allUsers: UserType[]
+    allUsersLoading: boolean
+    nonStaffUsers: UserType[]
+    staffUserToBeDeleted: UserType | null
+    staffUsers: UserType[]
+    staffUsersToBeAdded: string[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface staffUsersLogicActions {
+    loadUser: (resetOnFailure?: boolean | undefined) => {
+        resetOnFailure: boolean | undefined
+    } // userLogic
+    addStaffUsers: () => {
+        value: true
+    }
+    addStaffUsersFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    addStaffUsersSuccess: (
+        allUsers: UserType[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        allUsers: UserType[]
+        payload?: {
+            value: true
+        }
+    }
+    deleteStaffUser: (userUuid: string) => {
+        userUuid: string
+    }
+    deleteStaffUserFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteStaffUserSuccess: (
+        allUsers: UserType[],
+        payload?: {
+            userUuid: string
+        }
+    ) => {
+        allUsers: UserType[]
+        payload?: {
+            userUuid: string
+        }
+    }
+    loadAllUsers: () => any
+    loadAllUsersFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAllUsersSuccess: (
+        allUsers: UserType[],
+        payload?: any
+    ) => {
+        allUsers: UserType[]
+        payload?: any
+    }
+    setStaffUserToBeDeleted: (user: UserType | null) => {
+        user: UserType | null
+    }
+    setStaffUsersToBeAdded: (userUuids: string[]) => {
+        userUuids: string[]
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface staffUsersLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        staffUsers: (allUsers: UserType[]) => UserType[]
+        nonStaffUsers: (allUsers: UserType[]) => UserType[]
+    }
+}
+
+export type staffUsersLogicType = MakeLogicType<
+    staffUsersLogicValues,
+    staffUsersLogicActions,
+    Record<string, any>,
+    staffUsersLogicMeta
+>
 
 export const staffUsersLogic = kea<staffUsersLogicType>([
     path(['scenes', 'instance', 'SystemStatus', 'staffUsersLogic']),
@@ -76,8 +170,14 @@ export const staffUsersLogic = kea<staffUsersLogicType>([
         ],
     }),
     selectors({
-        staffUsers: [(s) => [s.allUsers], (allUsers): UserType[] => allUsers.filter((user) => user.is_staff)],
-        nonStaffUsers: [(s) => [s.allUsers], (allUsers): UserType[] => allUsers.filter((user) => !user.is_staff)],
+        staffUsers: [
+            (s) => [s.allUsers],
+            (allUsers: UserType[]): UserType[] => allUsers.filter((user) => user.is_staff),
+        ],
+        nonStaffUsers: [
+            (s) => [s.allUsers],
+            (allUsers: UserType[]): UserType[] => allUsers.filter((user) => !user.is_staff),
+        ],
     }),
     events(({ actions }) => ({
         afterMount: [actions.loadAllUsers],
diff --git a/frontend/src/scenes/instance/SystemStatus/systemStatusLogic.ts b/frontend/src/scenes/instance/SystemStatus/systemStatusLogic.ts
index 98a2fc082314..dc133e62fd7e 100644
--- a/frontend/src/scenes/instance/SystemStatus/systemStatusLogic.ts
+++ b/frontend/src/scenes/instance/SystemStatus/systemStatusLogic.ts
@@ -1,4 +1,4 @@
-import { actions, events, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, events, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, urlToAction } from 'kea-router'
 
@@ -11,8 +11,6 @@ import { userLogic } from 'scenes/userLogic'
 
 import { InstanceSetting, SystemStatus, SystemStatusQueriesResult, SystemStatusRow } from '~/types'
 
-import type { systemStatusLogicType } from './systemStatusLogicType'
-
 export enum ConfigMode {
     View = 'view',
     Edit = 'edit',
@@ -67,6 +65,116 @@ const EDITABLE_INSTANCE_SETTINGS = [
     'SENTRY_ORGANIZATION',
 ]
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface systemStatusLogicValues {
+    editableInstanceSettings: InstanceSetting[]
+    error: string | null
+    instanceConfigEditingState: Record<string, boolean | number | string>
+    instanceConfigMode: ConfigMode
+    instanceSettings: InstanceSetting[]
+    instanceSettingsLoading: boolean
+    openSections: string[]
+    overview: SystemStatusRow[]
+    queries: SystemStatusQueriesResult | null
+    queriesLoading: boolean
+    systemStatus: SystemStatus | null
+    systemStatusLoading: boolean
+    tab: InstanceStatusTabName
+    updatedInstanceConfigCount: number | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface systemStatusLogicActions {
+    clearInstanceConfigEditing: () => {
+        value: true
+    }
+    increaseUpdatedInstanceConfigCount: () => {
+        value: true
+    }
+    loadInstanceSettings: () => any
+    loadInstanceSettingsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadInstanceSettingsSuccess: (
+        instanceSettings: InstanceSetting[],
+        payload?: any
+    ) => {
+        instanceSettings: InstanceSetting[]
+        payload?: any
+    }
+    loadQueries: () => any
+    loadQueriesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadQueriesSuccess: (
+        queries: SystemStatusQueriesResult | null,
+        payload?: any
+    ) => {
+        queries: SystemStatusQueriesResult | null
+        payload?: any
+    }
+    loadSystemStatus: () => any
+    loadSystemStatusFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSystemStatusSuccess: (
+        systemStatus: SystemStatus | null,
+        payload?: any
+    ) => {
+        systemStatus: SystemStatus | null
+        payload?: any
+    }
+    saveInstanceConfig: () => {
+        value: true
+    }
+    setInstanceConfigMode: (mode: ConfigMode) => {
+        mode: ConfigMode
+    }
+    setOpenSections: (sections: string[]) => {
+        sections: string[]
+    }
+    setTab: (tab: InstanceStatusTabName) => {
+        tab: InstanceStatusTabName
+    }
+    setUpdatedInstanceConfigCount: (count: number | null) => {
+        count: number | null
+    }
+    updateInstanceConfigValue: (
+        key: string,
+        value?: boolean | number | string
+    ) => {
+        key: string
+        value: boolean | number | string | undefined
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface systemStatusLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        overview: (systemStatus: SystemStatus | null) => SystemStatusRow[]
+        editableInstanceSettings: (instanceSettings: InstanceSetting[]) => InstanceSetting[]
+    }
+}
+
+export type systemStatusLogicType = MakeLogicType<
+    systemStatusLogicValues,
+    systemStatusLogicActions,
+    Record<string, any>,
+    systemStatusLogicMeta
+>
+
 // Note: This logic does some heavy calculations - avoid connecting it outside of system status pages!
 export const systemStatusLogic = kea<systemStatusLogicType>([
     path(['scenes', 'instance', 'SystemStatus', 'systemStatusLogic']),
@@ -170,7 +278,7 @@ export const systemStatusLogic = kea<systemStatusLogicType>([
         ],
         editableInstanceSettings: [
             (s) => [s.instanceSettings],
-            (instanceSettings): InstanceSetting[] =>
+            (instanceSettings: InstanceSetting[]): InstanceSetting[] =>
                 instanceSettings.filter((item) => item.editable && EDITABLE_INSTANCE_SETTINGS.includes(item.key)),
         ],
     })),
diff --git a/frontend/src/scenes/integrations/aws-s3/awsS3SetupModalLogic.ts b/frontend/src/scenes/integrations/aws-s3/awsS3SetupModalLogic.ts
index e8ed8f446acb..1e68bb94395f 100644
--- a/frontend/src/scenes/integrations/aws-s3/awsS3SetupModalLogic.ts
+++ b/frontend/src/scenes/integrations/aws-s3/awsS3SetupModalLogic.ts
@@ -1,5 +1,6 @@
-import { connect, kea, path, props } from 'kea'
+import { MakeLogicType, connect, kea, path, props } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 
 import api from 'lib/api'
 import { integrationsLogic } from 'lib/integrations/integrationsLogic'
@@ -7,14 +8,122 @@ import { lemonToast } from 'lib/lemon-ui/LemonToast'
 
 import { IntegrationType } from '~/types'
 
-import type { awsS3SetupModalLogicType } from './awsS3SetupModalLogicType'
-
 export interface AwsS3SetupModalLogicProps {
     isOpen: boolean
     integration?: IntegrationType | null
     onComplete: (integrationId?: number) => void
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface awsS3SetupModalLogicValues {
+    awsS3Integration: {
+        awsAccessKeyId: string
+        awsSecretAccessKey: string
+        name: string
+    }
+    awsS3IntegrationAllErrors: Record<string, any>
+    awsS3IntegrationChanged: boolean
+    awsS3IntegrationErrors: DeepPartialMap<
+        {
+            awsAccessKeyId: string
+            awsSecretAccessKey: string
+            name: string
+        },
+        ValidationErrorType
+    >
+    awsS3IntegrationHasErrors: boolean
+    awsS3IntegrationManualErrors: Record<string, any>
+    awsS3IntegrationTouched: boolean
+    awsS3IntegrationTouches: Record<string, boolean>
+    awsS3IntegrationValidationErrors: DeepPartialMap<
+        {
+            awsAccessKeyId: string
+            awsSecretAccessKey: string
+            name: string
+        },
+        ValidationErrorType
+    >
+    isAwsS3IntegrationSubmitting: boolean
+    isAwsS3IntegrationValid: boolean
+    showAwsS3IntegrationErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface awsS3SetupModalLogicActions {
+    loadIntegrations: () => any // integrationsLogic
+    resetAwsS3Integration: (values?: { awsAccessKeyId: string; awsSecretAccessKey: string; name: string }) => {
+        values?: {
+            awsAccessKeyId: string
+            awsSecretAccessKey: string
+            name: string
+        }
+    }
+    setAwsS3IntegrationManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setAwsS3IntegrationValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setAwsS3IntegrationValues: (
+        values: DeepPartial<{
+            awsAccessKeyId: string
+            awsSecretAccessKey: string
+            name: string
+        }>
+    ) => {
+        values: DeepPartial<{
+            awsAccessKeyId: string
+            awsSecretAccessKey: string
+            name: string
+        }>
+    }
+    submitAwsS3Integration: () => {
+        value: boolean
+    }
+    submitAwsS3IntegrationFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitAwsS3IntegrationRequest: (awsS3Integration: {
+        awsAccessKeyId: string
+        awsSecretAccessKey: string
+        name: string
+    }) => {
+        awsS3Integration: {
+            awsAccessKeyId: string
+            awsSecretAccessKey: string
+            name: string
+        }
+    }
+    submitAwsS3IntegrationSuccess: (awsS3Integration: {
+        awsAccessKeyId: string
+        awsSecretAccessKey: string
+        name: string
+    }) => {
+        awsS3Integration: {
+            awsAccessKeyId: string
+            awsSecretAccessKey: string
+            name: string
+        }
+    }
+    touchAwsS3IntegrationField: (key: string) => {
+        key: string
+    }
+}
+
+export type awsS3SetupModalLogicType = MakeLogicType<
+    awsS3SetupModalLogicValues,
+    awsS3SetupModalLogicActions,
+    AwsS3SetupModalLogicProps
+>
+
 export const awsS3SetupModalLogic = kea<awsS3SetupModalLogicType>([
     path(['integrations', 'aws-s3', 'awsS3SetupModalLogic']),
     props({} as AwsS3SetupModalLogicProps),
diff --git a/frontend/src/scenes/integrations/azure-blob/azureBlobSetupModalLogic.ts b/frontend/src/scenes/integrations/azure-blob/azureBlobSetupModalLogic.ts
index e531f7000125..8c55eb406373 100644
--- a/frontend/src/scenes/integrations/azure-blob/azureBlobSetupModalLogic.ts
+++ b/frontend/src/scenes/integrations/azure-blob/azureBlobSetupModalLogic.ts
@@ -1,5 +1,6 @@
-import { connect, kea, path, props } from 'kea'
+import { MakeLogicType, connect, kea, path, props } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 
 import api from 'lib/api'
 import { integrationsLogic } from 'lib/integrations/integrationsLogic'
@@ -7,14 +8,98 @@ import { lemonToast } from 'lib/lemon-ui/LemonToast'
 
 import { IntegrationType } from '~/types'
 
-import type { azureBlobSetupModalLogicType } from './azureBlobSetupModalLogicType'
-
 export interface AzureBlobSetupModalLogicProps {
     isOpen: boolean
     integration?: IntegrationType | null
     onComplete: (integrationId?: number) => void
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface azureBlobSetupModalLogicValues {
+    azureBlobIntegration: {
+        connectionString: string
+    }
+    azureBlobIntegrationAllErrors: Record<string, any>
+    azureBlobIntegrationChanged: boolean
+    azureBlobIntegrationErrors: DeepPartialMap<
+        {
+            connectionString: string
+        },
+        ValidationErrorType
+    >
+    azureBlobIntegrationHasErrors: boolean
+    azureBlobIntegrationManualErrors: Record<string, any>
+    azureBlobIntegrationTouched: boolean
+    azureBlobIntegrationTouches: Record<string, boolean>
+    azureBlobIntegrationValidationErrors: DeepPartialMap<
+        {
+            connectionString: string
+        },
+        ValidationErrorType
+    >
+    isAzureBlobIntegrationSubmitting: boolean
+    isAzureBlobIntegrationValid: boolean
+    showAzureBlobIntegrationErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface azureBlobSetupModalLogicActions {
+    loadIntegrations: () => any // integrationsLogic
+    resetAzureBlobIntegration: (values?: { connectionString: string }) => {
+        values?: {
+            connectionString: string
+        }
+    }
+    setAzureBlobIntegrationManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setAzureBlobIntegrationValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setAzureBlobIntegrationValues: (
+        values: DeepPartial<{
+            connectionString: string
+        }>
+    ) => {
+        values: DeepPartial<{
+            connectionString: string
+        }>
+    }
+    submitAzureBlobIntegration: () => {
+        value: boolean
+    }
+    submitAzureBlobIntegrationFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitAzureBlobIntegrationRequest: (azureBlobIntegration: { connectionString: string }) => {
+        azureBlobIntegration: {
+            connectionString: string
+        }
+    }
+    submitAzureBlobIntegrationSuccess: (azureBlobIntegration: { connectionString: string }) => {
+        azureBlobIntegration: {
+            connectionString: string
+        }
+    }
+    touchAzureBlobIntegrationField: (key: string) => {
+        key: string
+    }
+}
+
+export type azureBlobSetupModalLogicType = MakeLogicType<
+    azureBlobSetupModalLogicValues,
+    azureBlobSetupModalLogicActions,
+    AzureBlobSetupModalLogicProps
+>
+
 export const azureBlobSetupModalLogic = kea<azureBlobSetupModalLogicType>([
     path(['integrations', 'azure-blob', 'azureBlobSetupModalLogic']),
     props({} as AzureBlobSetupModalLogicProps),
diff --git a/frontend/src/scenes/integrations/databricks/databricksSetupModalLogic.ts b/frontend/src/scenes/integrations/databricks/databricksSetupModalLogic.ts
index 2f592398886c..e688bb09ceba 100644
--- a/frontend/src/scenes/integrations/databricks/databricksSetupModalLogic.ts
+++ b/frontend/src/scenes/integrations/databricks/databricksSetupModalLogic.ts
@@ -1,5 +1,6 @@
-import { connect, kea, path, props } from 'kea'
+import { MakeLogicType, connect, kea, path, props } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 
 import api from 'lib/api'
 import { integrationsLogic } from 'lib/integrations/integrationsLogic'
@@ -7,14 +8,122 @@ import { lemonToast } from 'lib/lemon-ui/LemonToast'
 
 import { IntegrationType } from '~/types'
 
-import type { databricksSetupModalLogicType } from './databricksSetupModalLogicType'
-
 export interface DatabricksSetupModalLogicProps {
     isOpen: boolean
     integration?: IntegrationType | null
     onComplete: (integrationId?: number) => void
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface databricksSetupModalLogicValues {
+    databricksIntegration: {
+        clientId: string
+        clientSecret: string
+        serverHostname: string
+    }
+    databricksIntegrationAllErrors: Record<string, any>
+    databricksIntegrationChanged: boolean
+    databricksIntegrationErrors: DeepPartialMap<
+        {
+            clientId: string
+            clientSecret: string
+            serverHostname: string
+        },
+        ValidationErrorType
+    >
+    databricksIntegrationHasErrors: boolean
+    databricksIntegrationManualErrors: Record<string, any>
+    databricksIntegrationTouched: boolean
+    databricksIntegrationTouches: Record<string, boolean>
+    databricksIntegrationValidationErrors: DeepPartialMap<
+        {
+            clientId: string
+            clientSecret: string
+            serverHostname: string
+        },
+        ValidationErrorType
+    >
+    isDatabricksIntegrationSubmitting: boolean
+    isDatabricksIntegrationValid: boolean
+    showDatabricksIntegrationErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface databricksSetupModalLogicActions {
+    loadIntegrations: () => any // integrationsLogic
+    resetDatabricksIntegration: (values?: { clientId: string; clientSecret: string; serverHostname: string }) => {
+        values?: {
+            clientId: string
+            clientSecret: string
+            serverHostname: string
+        }
+    }
+    setDatabricksIntegrationManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setDatabricksIntegrationValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setDatabricksIntegrationValues: (
+        values: DeepPartial<{
+            clientId: string
+            clientSecret: string
+            serverHostname: string
+        }>
+    ) => {
+        values: DeepPartial<{
+            clientId: string
+            clientSecret: string
+            serverHostname: string
+        }>
+    }
+    submitDatabricksIntegration: () => {
+        value: boolean
+    }
+    submitDatabricksIntegrationFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitDatabricksIntegrationRequest: (databricksIntegration: {
+        clientId: string
+        clientSecret: string
+        serverHostname: string
+    }) => {
+        databricksIntegration: {
+            clientId: string
+            clientSecret: string
+            serverHostname: string
+        }
+    }
+    submitDatabricksIntegrationSuccess: (databricksIntegration: {
+        clientId: string
+        clientSecret: string
+        serverHostname: string
+    }) => {
+        databricksIntegration: {
+            clientId: string
+            clientSecret: string
+            serverHostname: string
+        }
+    }
+    touchDatabricksIntegrationField: (key: string) => {
+        key: string
+    }
+}
+
+export type databricksSetupModalLogicType = MakeLogicType<
+    databricksSetupModalLogicValues,
+    databricksSetupModalLogicActions,
+    DatabricksSetupModalLogicProps
+>
+
 export const databricksSetupModalLogic = kea<databricksSetupModalLogicType>([
     path(['integrations', 'databricks', 'databricksSetupModalLogic']),
     props({} as DatabricksSetupModalLogicProps),
diff --git a/frontend/src/scenes/integrations/gitlab/gitlabSetupModalLogic.ts b/frontend/src/scenes/integrations/gitlab/gitlabSetupModalLogic.ts
index 0c0f5c0af967..b3b97db065cd 100644
--- a/frontend/src/scenes/integrations/gitlab/gitlabSetupModalLogic.ts
+++ b/frontend/src/scenes/integrations/gitlab/gitlabSetupModalLogic.ts
@@ -1,17 +1,126 @@
-import { connect, kea, path, props } from 'kea'
+import { MakeLogicType, connect, kea, path, props } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 
 import api from 'lib/api'
 import { integrationsLogic } from 'lib/integrations/integrationsLogic'
 import { lemonToast } from 'lib/lemon-ui/LemonToast'
 
-import type { gitlabSetupModalLogicType } from './gitlabSetupModalLogicType'
-
 export interface GitLabSetupModalLogicProps {
     isOpen: boolean
     onComplete: (integrationId?: number) => void
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface gitlabSetupModalLogicValues {
+    gitlabIntegration: {
+        hostname: string
+        projectAccessToken: string
+        projectId: string
+    }
+    gitlabIntegrationAllErrors: Record<string, any>
+    gitlabIntegrationChanged: boolean
+    gitlabIntegrationErrors: DeepPartialMap<
+        {
+            hostname: string
+            projectAccessToken: string
+            projectId: string
+        },
+        ValidationErrorType
+    >
+    gitlabIntegrationHasErrors: boolean
+    gitlabIntegrationManualErrors: Record<string, any>
+    gitlabIntegrationTouched: boolean
+    gitlabIntegrationTouches: Record<string, boolean>
+    gitlabIntegrationValidationErrors: DeepPartialMap<
+        {
+            hostname: string
+            projectAccessToken: string
+            projectId: string
+        },
+        ValidationErrorType
+    >
+    isGitlabIntegrationSubmitting: boolean
+    isGitlabIntegrationValid: boolean
+    showGitlabIntegrationErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface gitlabSetupModalLogicActions {
+    loadIntegrations: () => any // integrationsLogic
+    resetGitlabIntegration: (values?: { hostname: string; projectAccessToken: string; projectId: string }) => {
+        values?: {
+            hostname: string
+            projectAccessToken: string
+            projectId: string
+        }
+    }
+    setGitlabIntegrationManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setGitlabIntegrationValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setGitlabIntegrationValues: (
+        values: DeepPartial<{
+            hostname: string
+            projectAccessToken: string
+            projectId: string
+        }>
+    ) => {
+        values: DeepPartial<{
+            hostname: string
+            projectAccessToken: string
+            projectId: string
+        }>
+    }
+    submitGitlabIntegration: () => {
+        value: boolean
+    }
+    submitGitlabIntegrationFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitGitlabIntegrationRequest: (gitlabIntegration: {
+        hostname: string
+        projectAccessToken: string
+        projectId: string
+    }) => {
+        gitlabIntegration: {
+            hostname: string
+            projectAccessToken: string
+            projectId: string
+        }
+    }
+    submitGitlabIntegrationSuccess: (gitlabIntegration: {
+        hostname: string
+        projectAccessToken: string
+        projectId: string
+    }) => {
+        gitlabIntegration: {
+            hostname: string
+            projectAccessToken: string
+            projectId: string
+        }
+    }
+    touchGitlabIntegrationField: (key: string) => {
+        key: string
+    }
+}
+
+export type gitlabSetupModalLogicType = MakeLogicType<
+    gitlabSetupModalLogicValues,
+    gitlabSetupModalLogicActions,
+    GitLabSetupModalLogicProps
+>
+
 export const gitlabSetupModalLogic = kea<gitlabSetupModalLogicType>([
     path(['integrations', 'gitlab', 'gitlabSetupModalLogic']),
     props({} as GitLabSetupModalLogicProps),
diff --git a/frontend/src/scenes/integrations/google-cloud-service-account/googleCloudServiceAccountSetupModalLogic.ts b/frontend/src/scenes/integrations/google-cloud-service-account/googleCloudServiceAccountSetupModalLogic.ts
index c5b766ae6030..a55dc9a3431d 100644
--- a/frontend/src/scenes/integrations/google-cloud-service-account/googleCloudServiceAccountSetupModalLogic.ts
+++ b/frontend/src/scenes/integrations/google-cloud-service-account/googleCloudServiceAccountSetupModalLogic.ts
@@ -1,5 +1,6 @@
-import { actions, reducers, connect, listeners, kea, path, props } from 'kea'
+import { MakeLogicType, actions, reducers, connect, listeners, kea, path, props } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 
 import api from 'lib/api'
 import { integrationsLogic } from 'lib/integrations/integrationsLogic'
@@ -7,8 +8,6 @@ import { lemonToast } from 'lib/lemon-ui/LemonToast'
 
 import { IntegrationType } from '~/types'
 
-import type { googleCloudServiceAccountSetupModalLogicType } from './googleCloudServiceAccountSetupModalLogicType'
-
 export type ServiceAccountMode = 'impersonated' | 'key_file'
 
 export interface GoogleCloudServiceAccountSetupModalLogicProps {
@@ -17,6 +16,157 @@ export interface GoogleCloudServiceAccountSetupModalLogicProps {
     onComplete: (integrationId?: number) => void
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface googleCloudServiceAccountSetupModalLogicValues {
+    googleCloudServiceAccountIntegration: {
+        jsonKeyFile: null
+        privateKey: string | null
+        privateKeyId: string | null
+        projectId: string
+        serviceAccountEmail: string
+        tokenUri: string | null
+    }
+    googleCloudServiceAccountIntegrationAllErrors: Record<string, any>
+    googleCloudServiceAccountIntegrationChanged: boolean
+    googleCloudServiceAccountIntegrationErrors: DeepPartialMap<
+        {
+            jsonKeyFile: null
+            privateKey: string | null
+            privateKeyId: string | null
+            projectId: string
+            serviceAccountEmail: string
+            tokenUri: string | null
+        },
+        ValidationErrorType
+    >
+    googleCloudServiceAccountIntegrationHasErrors: boolean
+    googleCloudServiceAccountIntegrationManualErrors: Record<string, any>
+    googleCloudServiceAccountIntegrationTouched: boolean
+    googleCloudServiceAccountIntegrationTouches: Record<string, boolean>
+    googleCloudServiceAccountIntegrationValidationErrors: DeepPartialMap<
+        {
+            jsonKeyFile: null
+            privateKey: string | null
+            privateKeyId: string | null
+            projectId: string
+            serviceAccountEmail: string
+            tokenUri: string | null
+        },
+        ValidationErrorType
+    >
+    isGoogleCloudServiceAccountIntegrationSubmitting: boolean
+    isGoogleCloudServiceAccountIntegrationValid: boolean
+    serviceAccountMode: ServiceAccountMode
+    showGoogleCloudServiceAccountIntegrationErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface googleCloudServiceAccountSetupModalLogicActions {
+    loadIntegrations: () => any // integrationsLogic
+    resetGoogleCloudServiceAccountIntegration: (values?: {
+        jsonKeyFile: null
+        privateKey: string | null
+        privateKeyId: string | null
+        projectId: string
+        serviceAccountEmail: string
+        tokenUri: string | null
+    }) => {
+        values?: {
+            jsonKeyFile: null
+            privateKey: string | null
+            privateKeyId: string | null
+            projectId: string
+            serviceAccountEmail: string
+            tokenUri: string | null
+        }
+    }
+    setGoogleCloudServiceAccountIntegrationManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setGoogleCloudServiceAccountIntegrationValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setGoogleCloudServiceAccountIntegrationValues: (
+        values: DeepPartial<{
+            jsonKeyFile: null
+            privateKey: string | null
+            privateKeyId: string | null
+            projectId: string
+            serviceAccountEmail: string
+            tokenUri: string | null
+        }>
+    ) => {
+        values: DeepPartial<{
+            jsonKeyFile: null
+            privateKey: string | null
+            privateKeyId: string | null
+            projectId: string
+            serviceAccountEmail: string
+            tokenUri: string | null
+        }>
+    }
+    setServiceAccountMode: (mode: ServiceAccountMode) => {
+        mode: ServiceAccountMode
+    }
+    submitGoogleCloudServiceAccountIntegration: () => {
+        value: boolean
+    }
+    submitGoogleCloudServiceAccountIntegrationFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitGoogleCloudServiceAccountIntegrationRequest: (googleCloudServiceAccountIntegration: {
+        jsonKeyFile: null
+        privateKey: string | null
+        privateKeyId: string | null
+        projectId: string
+        serviceAccountEmail: string
+        tokenUri: string | null
+    }) => {
+        googleCloudServiceAccountIntegration: {
+            jsonKeyFile: null
+            privateKey: string | null
+            privateKeyId: string | null
+            projectId: string
+            serviceAccountEmail: string
+            tokenUri: string | null
+        }
+    }
+    submitGoogleCloudServiceAccountIntegrationSuccess: (googleCloudServiceAccountIntegration: {
+        jsonKeyFile: null
+        privateKey: string | null
+        privateKeyId: string | null
+        projectId: string
+        serviceAccountEmail: string
+        tokenUri: string | null
+    }) => {
+        googleCloudServiceAccountIntegration: {
+            jsonKeyFile: null
+            privateKey: string | null
+            privateKeyId: string | null
+            projectId: string
+            serviceAccountEmail: string
+            tokenUri: string | null
+        }
+    }
+    touchGoogleCloudServiceAccountIntegrationField: (key: string) => {
+        key: string
+    }
+}
+
+export type googleCloudServiceAccountSetupModalLogicType = MakeLogicType<
+    googleCloudServiceAccountSetupModalLogicValues,
+    googleCloudServiceAccountSetupModalLogicActions,
+    GoogleCloudServiceAccountSetupModalLogicProps
+>
+
 export const googleCloudServiceAccountSetupModalLogic = kea<googleCloudServiceAccountSetupModalLogicType>([
     path(['integrations', 'googleCloudServiceAccount', 'googleCloudServiceAccountSetupModalLogic']),
     props({} as GoogleCloudServiceAccountSetupModalLogicProps),
diff --git a/frontend/src/scenes/integrations/integrationsLandingSceneLogic.ts b/frontend/src/scenes/integrations/integrationsLandingSceneLogic.ts
index 0fccc95d14a5..62c98a597516 100644
--- a/frontend/src/scenes/integrations/integrationsLandingSceneLogic.ts
+++ b/frontend/src/scenes/integrations/integrationsLandingSceneLogic.ts
@@ -1,9 +1,35 @@
-import { actions, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers, selectors } from 'kea'
 import { urlToAction } from 'kea-router'
 
 import { INTEGRATIONS_BY_SLUG } from './definitions'
 import { Integration } from './integrationDefinition'
-import type { integrationsLandingSceneLogicType } from './integrationsLandingSceneLogicType'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface integrationsLandingSceneLogicValues {
+    integration: Integration | null
+    slug: string | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface integrationsLandingSceneLogicActions {
+    setSlug: (slug: string | null) => {
+        slug: string | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface integrationsLandingSceneLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        integration: (slug: string | null) => Integration | null
+    }
+}
+
+export type integrationsLandingSceneLogicType = MakeLogicType<
+    integrationsLandingSceneLogicValues,
+    integrationsLandingSceneLogicActions,
+    Record<string, any>,
+    integrationsLandingSceneLogicMeta
+>
 
 export const integrationsLandingSceneLogic = kea<integrationsLandingSceneLogicType>([
     path(['scenes', 'integrations', 'integrationsLandingSceneLogic']),
@@ -21,7 +47,7 @@ export const integrationsLandingSceneLogic = kea<integrationsLandingSceneLogicTy
     selectors({
         integration: [
             (s) => [s.slug],
-            (slug): Integration | null => (slug ? (INTEGRATIONS_BY_SLUG[slug] ?? null) : null),
+            (slug: string | null): Integration | null => (slug ? (INTEGRATIONS_BY_SLUG[slug] ?? null) : null),
         ],
     }),
     urlToAction(({ actions }) => ({
diff --git a/frontend/src/scenes/integrations/postgresql/postgreSQLSetupModalLogic.ts b/frontend/src/scenes/integrations/postgresql/postgreSQLSetupModalLogic.ts
index a77d2d2a4be7..e2a8a87a8221 100644
--- a/frontend/src/scenes/integrations/postgresql/postgreSQLSetupModalLogic.ts
+++ b/frontend/src/scenes/integrations/postgresql/postgreSQLSetupModalLogic.ts
@@ -1,5 +1,6 @@
-import { connect, kea, path, props } from 'kea'
+import { MakeLogicType, connect, kea, path, props } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 
 import api from 'lib/api'
 import { integrationsLogic } from 'lib/integrations/integrationsLogic'
@@ -7,14 +8,170 @@ import { lemonToast } from 'lib/lemon-ui/LemonToast'
 
 import type { IntegrationType } from '~/types'
 
-import type { postgreSQLSetupModalLogicType } from './postgreSQLSetupModalLogicType'
-
 export interface PostgreSQLSetupModalLogicProps {
     isOpen: boolean
     integration?: IntegrationType | null
     onComplete: (integrationId?: number) => void
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface postgreSQLSetupModalLogicValues {
+    isPostgreSQLIntegrationSubmitting: boolean
+    isPostgreSQLIntegrationValid: boolean
+    postgreSQLIntegration: {
+        host: string | null
+        password: string | null
+        port: number
+        ssl_mode: string
+        ssl_root_cert: string | null
+        use_system_ca: false
+        user: string | null
+    }
+    postgreSQLIntegrationAllErrors: Record<string, any>
+    postgreSQLIntegrationChanged: boolean
+    postgreSQLIntegrationErrors: DeepPartialMap<
+        {
+            host: string | null
+            password: string | null
+            port: number
+            ssl_mode: string
+            ssl_root_cert: string | null
+            use_system_ca: false
+            user: string | null
+        },
+        ValidationErrorType
+    >
+    postgreSQLIntegrationHasErrors: boolean
+    postgreSQLIntegrationManualErrors: Record<string, any>
+    postgreSQLIntegrationTouched: boolean
+    postgreSQLIntegrationTouches: Record<string, boolean>
+    postgreSQLIntegrationValidationErrors: DeepPartialMap<
+        {
+            host: string | null
+            password: string | null
+            port: number
+            ssl_mode: string
+            ssl_root_cert: string | null
+            use_system_ca: false
+            user: string | null
+        },
+        ValidationErrorType
+    >
+    showPostgreSQLIntegrationErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface postgreSQLSetupModalLogicActions {
+    loadIntegrations: () => any // integrationsLogic
+    resetPostgreSQLIntegration: (values?: {
+        host: string | null
+        password: string | null
+        port: number
+        ssl_mode: string
+        ssl_root_cert: string | null
+        use_system_ca: false
+        user: string | null
+    }) => {
+        values?: {
+            host: string | null
+            password: string | null
+            port: number
+            ssl_mode: string
+            ssl_root_cert: string | null
+            use_system_ca: false
+            user: string | null
+        }
+    }
+    setPostgreSQLIntegrationManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setPostgreSQLIntegrationValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setPostgreSQLIntegrationValues: (
+        values: DeepPartial<{
+            host: string | null
+            password: string | null
+            port: number
+            ssl_mode: string
+            ssl_root_cert: string | null
+            use_system_ca: false
+            user: string | null
+        }>
+    ) => {
+        values: DeepPartial<{
+            host: string | null
+            password: string | null
+            port: number
+            ssl_mode: string
+            ssl_root_cert: string | null
+            use_system_ca: false
+            user: string | null
+        }>
+    }
+    submitPostgreSQLIntegration: () => {
+        value: boolean
+    }
+    submitPostgreSQLIntegrationFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitPostgreSQLIntegrationRequest: (postgreSQLIntegration: {
+        host: string | null
+        password: string | null
+        port: number
+        ssl_mode: string
+        ssl_root_cert: string | null
+        use_system_ca: false
+        user: string | null
+    }) => {
+        postgreSQLIntegration: {
+            host: string | null
+            password: string | null
+            port: number
+            ssl_mode: string
+            ssl_root_cert: string | null
+            use_system_ca: false
+            user: string | null
+        }
+    }
+    submitPostgreSQLIntegrationSuccess: (postgreSQLIntegration: {
+        host: string | null
+        password: string | null
+        port: number
+        ssl_mode: string
+        ssl_root_cert: string | null
+        use_system_ca: false
+        user: string | null
+    }) => {
+        postgreSQLIntegration: {
+            host: string | null
+            password: string | null
+            port: number
+            ssl_mode: string
+            ssl_root_cert: string | null
+            use_system_ca: false
+            user: string | null
+        }
+    }
+    touchPostgreSQLIntegrationField: (key: string) => {
+        key: string
+    }
+}
+
+export type postgreSQLSetupModalLogicType = MakeLogicType<
+    postgreSQLSetupModalLogicValues,
+    postgreSQLSetupModalLogicActions,
+    PostgreSQLSetupModalLogicProps
+>
+
 export const postgreSQLSetupModalLogic = kea<postgreSQLSetupModalLogicType>([
     path(['integrations', 'postgreSQL', 'postgreSQLSetupModalLogic']),
     props({} as PostgreSQLSetupModalLogicProps),
diff --git a/frontend/src/scenes/integrations/s3-compatible/s3CompatibleSetupModalLogic.ts b/frontend/src/scenes/integrations/s3-compatible/s3CompatibleSetupModalLogic.ts
index 468a55bbd83c..b631e1acd783 100644
--- a/frontend/src/scenes/integrations/s3-compatible/s3CompatibleSetupModalLogic.ts
+++ b/frontend/src/scenes/integrations/s3-compatible/s3CompatibleSetupModalLogic.ts
@@ -1,5 +1,6 @@
-import { connect, kea, path, props } from 'kea'
+import { MakeLogicType, connect, kea, path, props } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 
 import api from 'lib/api'
 import { integrationsLogic } from 'lib/integrations/integrationsLogic'
@@ -7,14 +8,137 @@ import { lemonToast } from 'lib/lemon-ui/LemonToast'
 
 import { IntegrationType } from '~/types'
 
-import type { s3CompatibleSetupModalLogicType } from './s3CompatibleSetupModalLogicType'
-
 export interface S3CompatibleSetupModalLogicProps {
     isOpen: boolean
     integration?: IntegrationType | null
     onComplete: (integrationId?: number) => void
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface s3CompatibleSetupModalLogicValues {
+    isS3CompatibleIntegrationSubmitting: boolean
+    isS3CompatibleIntegrationValid: boolean
+    s3CompatibleIntegration: {
+        awsAccessKeyId: string
+        awsSecretAccessKey: string
+        endpointUrl: string
+        name: string
+    }
+    s3CompatibleIntegrationAllErrors: Record<string, any>
+    s3CompatibleIntegrationChanged: boolean
+    s3CompatibleIntegrationErrors: DeepPartialMap<
+        {
+            awsAccessKeyId: string
+            awsSecretAccessKey: string
+            endpointUrl: string
+            name: string
+        },
+        ValidationErrorType
+    >
+    s3CompatibleIntegrationHasErrors: boolean
+    s3CompatibleIntegrationManualErrors: Record<string, any>
+    s3CompatibleIntegrationTouched: boolean
+    s3CompatibleIntegrationTouches: Record<string, boolean>
+    s3CompatibleIntegrationValidationErrors: DeepPartialMap<
+        {
+            awsAccessKeyId: string
+            awsSecretAccessKey: string
+            endpointUrl: string
+            name: string
+        },
+        ValidationErrorType
+    >
+    showS3CompatibleIntegrationErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface s3CompatibleSetupModalLogicActions {
+    loadIntegrations: () => any // integrationsLogic
+    resetS3CompatibleIntegration: (values?: {
+        awsAccessKeyId: string
+        awsSecretAccessKey: string
+        endpointUrl: string
+        name: string
+    }) => {
+        values?: {
+            awsAccessKeyId: string
+            awsSecretAccessKey: string
+            endpointUrl: string
+            name: string
+        }
+    }
+    setS3CompatibleIntegrationManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setS3CompatibleIntegrationValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setS3CompatibleIntegrationValues: (
+        values: DeepPartial<{
+            awsAccessKeyId: string
+            awsSecretAccessKey: string
+            endpointUrl: string
+            name: string
+        }>
+    ) => {
+        values: DeepPartial<{
+            awsAccessKeyId: string
+            awsSecretAccessKey: string
+            endpointUrl: string
+            name: string
+        }>
+    }
+    submitS3CompatibleIntegration: () => {
+        value: boolean
+    }
+    submitS3CompatibleIntegrationFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitS3CompatibleIntegrationRequest: (s3CompatibleIntegration: {
+        awsAccessKeyId: string
+        awsSecretAccessKey: string
+        endpointUrl: string
+        name: string
+    }) => {
+        s3CompatibleIntegration: {
+            awsAccessKeyId: string
+            awsSecretAccessKey: string
+            endpointUrl: string
+            name: string
+        }
+    }
+    submitS3CompatibleIntegrationSuccess: (s3CompatibleIntegration: {
+        awsAccessKeyId: string
+        awsSecretAccessKey: string
+        endpointUrl: string
+        name: string
+    }) => {
+        s3CompatibleIntegration: {
+            awsAccessKeyId: string
+            awsSecretAccessKey: string
+            endpointUrl: string
+            name: string
+        }
+    }
+    touchS3CompatibleIntegrationField: (key: string) => {
+        key: string
+    }
+}
+
+export type s3CompatibleSetupModalLogicType = MakeLogicType<
+    s3CompatibleSetupModalLogicValues,
+    s3CompatibleSetupModalLogicActions,
+    S3CompatibleSetupModalLogicProps
+>
+
 export const s3CompatibleSetupModalLogic = kea<s3CompatibleSetupModalLogicType>([
     path(['integrations', 's3-compatible', 's3CompatibleSetupModalLogic']),
     props({} as S3CompatibleSetupModalLogicProps),
diff --git a/frontend/src/scenes/marketing-analytics/Onboarding/marketingOnboardingLogic.ts b/frontend/src/scenes/marketing-analytics/Onboarding/marketingOnboardingLogic.ts
index 83c89069aaf5..155f1c0eac8d 100644
--- a/frontend/src/scenes/marketing-analytics/Onboarding/marketingOnboardingLogic.ts
+++ b/frontend/src/scenes/marketing-analytics/Onboarding/marketingOnboardingLogic.ts
@@ -1,12 +1,51 @@
-import { actions, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers, selectors } from 'kea'
 
 import { MARKETING_ONBOARDING_STORAGE_KEYS } from './constants'
-import type { marketingOnboardingLogicType } from './marketingOnboardingLogicType'
 
 export type MarketingOnboardingStep = 'welcome' | 'add-source' | 'conversion-goals' | 'done'
 
 const STEP_ORDER: MarketingOnboardingStep[] = ['welcome', 'add-source', 'conversion-goals', 'done']
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface marketingOnboardingLogicValues {
+    currentStep: MarketingOnboardingStep
+    isLastStep: boolean
+    showOnboarding: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface marketingOnboardingLogicActions {
+    completeOnboarding: () => {
+        value: true
+    }
+    goToNextStep: () => {
+        value: true
+    }
+    resetOnboarding: () => {
+        value: true
+    }
+    setShowOnboarding: (show: boolean) => {
+        show: boolean
+    }
+    setStep: (step: MarketingOnboardingStep) => {
+        step: MarketingOnboardingStep
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface marketingOnboardingLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        isLastStep: (currentStep: MarketingOnboardingStep) => boolean
+    }
+}
+
+export type marketingOnboardingLogicType = MakeLogicType<
+    marketingOnboardingLogicValues,
+    marketingOnboardingLogicActions,
+    Record<string, any>,
+    marketingOnboardingLogicMeta
+>
+
 export const marketingOnboardingLogic = kea<marketingOnboardingLogicType>([
     path(['scenes', 'marketing-analytics', 'Onboarding', 'marketingOnboardingLogic']),
 
@@ -42,7 +81,10 @@ export const marketingOnboardingLogic = kea<marketingOnboardingLogicType>([
     }),
 
     selectors({
-        isLastStep: [(s) => [s.currentStep], (currentStep): boolean => currentStep === 'conversion-goals'],
+        isLastStep: [
+            (s) => [s.currentStep],
+            (currentStep: MarketingOnboardingStep): boolean => currentStep === 'conversion-goals',
+        ],
     }),
 
     listeners(({ actions, values }) => ({
diff --git a/frontend/src/scenes/max/feedbackPromptLogic.ts b/frontend/src/scenes/max/feedbackPromptLogic.ts
index f8dd22bae3a8..458d39031887 100644
--- a/frontend/src/scenes/max/feedbackPromptLogic.ts
+++ b/frontend/src/scenes/max/feedbackPromptLogic.ts
@@ -1,10 +1,9 @@
-import { actions, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import posthog from 'posthog-js'
 
 import { FEATURE_FLAGS } from 'lib/constants'
 import { getFeatureFlagPayload } from 'lib/logic/featureFlagLogic'
 
-import type { feedbackPromptLogicType } from './feedbackPromptLogicType'
 import { maxThreadLogic } from './maxThreadLogic'
 import { FeedbackRating, FeedbackTriggerType, captureFeedback } from './utils'
 
@@ -41,6 +40,83 @@ export interface FeedbackPromptLogicProps {
     conversationId: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface feedbackPromptLogicValues {
+    canShowPrompt: boolean
+    currentTriggerType: FeedbackTriggerType
+    feedbackConfig: FeedbackConfig | null
+    isDetailedFeedbackVisible: boolean
+    isPromptVisible: boolean
+    isThankYouVisible: boolean
+    lastTriggeredIntervalIndex: number
+    messageInterval: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface feedbackPromptLogicActions {
+    checkShouldShowPrompt: (
+        messageCount: number,
+        retryCount: number,
+        cancelCount: number
+    ) => {
+        cancelCount: number
+        messageCount: number
+        retryCount: number
+    }
+    completeDetailedFeedback: () => {
+        value: true
+    }
+    hideDetailedFeedback: () => {
+        value: true
+    }
+    hidePrompt: () => {
+        value: true
+    }
+    hideThankYou: () => {
+        value: true
+    }
+    implicitDismissDetailedFeedback: () => {
+        value: true
+    }
+    implicitDismissPrompt: () => {
+        value: true
+    }
+    recordFeedbackShown: () => {
+        value: true
+    }
+    setLastTriggeredIntervalIndex: (index: number) => {
+        index: number
+    }
+    showDetailedFeedback: () => {
+        value: true
+    }
+    showPrompt: (triggerType: FeedbackTriggerType) => {
+        triggerType: FeedbackTriggerType
+    }
+    showThankYou: () => {
+        value: true
+    }
+    submitRating: (rating: FeedbackRating) => {
+        rating: FeedbackRating
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface feedbackPromptLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        canShowPrompt: (feedbackConfig: FeedbackConfig | null) => boolean
+        messageInterval: (feedbackConfig: FeedbackConfig | null) => number
+    }
+}
+
+export type feedbackPromptLogicType = MakeLogicType<
+    feedbackPromptLogicValues,
+    feedbackPromptLogicActions,
+    FeedbackPromptLogicProps,
+    feedbackPromptLogicMeta
+>
+
 export const feedbackPromptLogic = kea<feedbackPromptLogicType>([
     path(['scenes', 'max', 'feedbackPromptLogic']),
 
@@ -134,7 +210,7 @@ export const feedbackPromptLogic = kea<feedbackPromptLogicType>([
         ],
         canShowPrompt: [
             (s) => [s.feedbackConfig],
-            (feedbackConfig): boolean => {
+            (feedbackConfig: FeedbackConfig | null): boolean => {
                 if (!feedbackConfig) {
                     return false
                 }
@@ -145,7 +221,10 @@ export const feedbackPromptLogic = kea<feedbackPromptLogicType>([
                 return Date.now() - parseInt(lastShown, 10) > feedbackConfig.cooldownMs
             },
         ],
-        messageInterval: [(s) => [s.feedbackConfig], (feedbackConfig): number => feedbackConfig?.messageInterval ?? 10],
+        messageInterval: [
+            (s) => [s.feedbackConfig],
+            (feedbackConfig: FeedbackConfig | null): number => feedbackConfig?.messageInterval ?? 10,
+        ],
     }),
 
     listeners(({ actions, values, props }) => ({
diff --git a/frontend/src/scenes/max/floatingMaxPositionLogic.tsx b/frontend/src/scenes/max/floatingMaxPositionLogic.tsx
index 17f0b3c9c178..6947197b48c5 100644
--- a/frontend/src/scenes/max/floatingMaxPositionLogic.tsx
+++ b/frontend/src/scenes/max/floatingMaxPositionLogic.tsx
@@ -1,6 +1,4 @@
-import { actions, kea, listeners, path, reducers } from 'kea'
-
-import type { floatingMaxPositionLogicType } from './floatingMaxPositionLogicType'
+import { MakeLogicType, actions, kea, listeners, path, reducers } from 'kea'
 
 export interface FloatingMaxPosition {
     side: 'left' | 'right'
@@ -8,6 +6,23 @@ export interface FloatingMaxPosition {
 
 const FLOATING_MAX_POSITION_STORAGE_KEY = 'floating_max_position'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface floatingMaxPositionLogicValues {
+    position: FloatingMaxPosition
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface floatingMaxPositionLogicActions {
+    setPosition: (position: FloatingMaxPosition) => {
+        position: FloatingMaxPosition
+    }
+}
+
+export type floatingMaxPositionLogicType = MakeLogicType<
+    floatingMaxPositionLogicValues,
+    floatingMaxPositionLogicActions
+>
+
 export const floatingMaxPositionLogic = kea<floatingMaxPositionLogicType>([
     path(['scenes', 'max', 'floatingMaxPositionLogic']),
 
diff --git a/frontend/src/scenes/max/handsFreeLogic.ts b/frontend/src/scenes/max/handsFreeLogic.ts
index 414760d1dc8d..56eb0af9f5ef 100644
--- a/frontend/src/scenes/max/handsFreeLogic.ts
+++ b/frontend/src/scenes/max/handsFreeLogic.ts
@@ -1,13 +1,12 @@
 // Hands-free conversational mode for Max — STT via ElevenLabs Scribe (browser → WS direct),
 // TTS via the browser's native speechSynthesis. Built for mobile-web use (gym, walking).
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import posthog from 'posthog-js'
 
 import api from 'lib/api'
 import { FEATURE_FLAGS } from 'lib/constants'
 import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
 
-import type { handsFreeLogicType } from './handsFreeLogicType'
 import { AssistantSummary, buildSpokenText } from './handsFreeUtils'
 import { maxLogic } from './maxLogic'
 import { maxThreadLogic } from './maxThreadLogic'
@@ -65,6 +64,74 @@ async function loadScribeSdk(): Promise<{
     return cachedSdkPromise
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface handsFreeLogicValues {
+    threadLogicKey: string // maxLogic
+    canUseHandsFree: boolean
+    connection: HandsFreeConnection
+    error: string | null
+    isActive: boolean
+    partialTranscript: string
+    sdkAvailable: boolean | null
+    status: HandsFreeStatus
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface handsFreeLogicActions {
+    cancelSpeaking: () => {
+        value: true
+    }
+    commitTranscript: (text: string) => {
+        text: string
+    }
+    enterHandsFree: () => {
+        value: true
+    }
+    exitHandsFree: (reason?: string) => {
+        reason: string
+    }
+    interruptSpeaking: () => {
+        value: true
+    }
+    setConnection: (connection: HandsFreeConnection) => {
+        connection: HandsFreeConnection
+    }
+    setError: (error: string | null) => {
+        error: string | null
+    }
+    setPartialTranscript: (text: string) => {
+        text: string
+    }
+    setSdkAvailable: (available: boolean) => {
+        available: boolean
+    }
+    setStatus: (status: HandsFreeStatus) => {
+        status: HandsFreeStatus
+    }
+    speakAssistantResponse: (summary: AssistantSummary) => {
+        summary: AssistantSummary
+    }
+    toggleHandsFree: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface handsFreeLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        isActive: (status: HandsFreeStatus) => boolean
+        canUseHandsFree: (sdkAvailable: boolean | null) => boolean
+    }
+}
+
+export type handsFreeLogicType = MakeLogicType<
+    handsFreeLogicValues,
+    handsFreeLogicActions,
+    HandsFreeLogicProps,
+    handsFreeLogicMeta
+>
+
 export const handsFreeLogic = kea<handsFreeLogicType>([
     props({} as HandsFreeLogicProps),
     key((props) => props.panelId as string),
@@ -132,10 +199,10 @@ export const handsFreeLogic = kea<handsFreeLogicType>([
     }),
 
     selectors({
-        isActive: [(s) => [s.status], (status) => status !== 'off'],
+        isActive: [(s) => [s.status], (status: HandsFreeStatus) => status !== 'off'],
         // Render the mic button when the probe hasn't completed yet (null) or has succeeded (true).
         // Hide it only once we've confirmed the SDK can't be used.
-        canUseHandsFree: [(s) => [s.sdkAvailable], (sdkAvailable) => sdkAvailable !== false],
+        canUseHandsFree: [(s) => [s.sdkAvailable], (sdkAvailable: boolean | null) => sdkAvailable !== false],
     }),
 
     listeners(({ actions, values, cache, props }) => ({
diff --git a/frontend/src/scenes/max/logics/maxMessageRatingsLogic.ts b/frontend/src/scenes/max/logics/maxMessageRatingsLogic.ts
index 13ff571f08c6..98d97294a6d1 100644
--- a/frontend/src/scenes/max/logics/maxMessageRatingsLogic.ts
+++ b/frontend/src/scenes/max/logics/maxMessageRatingsLogic.ts
@@ -1,12 +1,49 @@
-import { actions, kea, listeners, path, reducers, selectors } from 'kea'
-
-import type { maxMessageRatingsLogicType } from './maxMessageRatingsLogicType'
+import { MakeLogicType, actions, kea, listeners, path, reducers, selectors } from 'kea'
 
 export type MaxMessageRating = 'good' | 'bad'
 export type MaxMessageRatingOrNull = MaxMessageRating | null
 
 const MAX_STORED_RATINGS = 1000
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface maxMessageRatingsLogicValues {
+    ratingForTraceId: (traceId: string | null | undefined) => MaxMessageRatingOrNull
+    ratingsByTraceId: Record<string, MaxMessageRating>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface maxMessageRatingsLogicActions {
+    clearAllRatings: () => {
+        value: true
+    }
+    clearRatingForTraceId: (payload: { traceId: string }) => {
+        traceId: string
+    }
+    pruneOldRatings: () => {
+        value: true
+    }
+    setRatingForTraceId: (payload: { rating: MaxMessageRating; traceId: string }) => {
+        rating: MaxMessageRating
+        traceId: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface maxMessageRatingsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        ratingForTraceId: (
+            ratingsByTraceId: Record<string, MaxMessageRating>
+        ) => (traceId: string | null | undefined) => MaxMessageRatingOrNull
+    }
+}
+
+export type maxMessageRatingsLogicType = MakeLogicType<
+    maxMessageRatingsLogicValues,
+    maxMessageRatingsLogicActions,
+    Record<string, any>,
+    maxMessageRatingsLogicMeta
+>
+
 /**
  * Persists Max AI message ratings ("good"/"bad") keyed by trace ID.
  *
diff --git a/frontend/src/scenes/max/logics/maxWebAnalyticsNudgeLogic.ts b/frontend/src/scenes/max/logics/maxWebAnalyticsNudgeLogic.ts
index ba4866dc5d91..36de995f3a98 100644
--- a/frontend/src/scenes/max/logics/maxWebAnalyticsNudgeLogic.ts
+++ b/frontend/src/scenes/max/logics/maxWebAnalyticsNudgeLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, selectors } from 'kea'
 import { router } from 'kea-router'
 import { subscriptions } from 'kea-subscriptions'
 import posthog from 'posthog-js'
@@ -13,11 +13,11 @@ import { recentItemsModel } from '~/models/recentItemsModel'
 import { HumanMessage } from '~/queries/schema/schema-assistant-messages'
 import { ConversationTopic } from '~/types'
 
+import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
 import { maxGlobalLogic } from '../maxGlobalLogic'
 import type { ThreadMessage } from '../maxThreadLogic'
 import { isHumanMessage } from '../utils'
 import { isWebAnalyticsRelatedMessage, isWebAnalyticsRelatedQuestion } from '../utils/detectWebAnalyticsQuery'
-import type { maxWebAnalyticsNudgeLogicType } from './maxWebAnalyticsNudgeLogicType'
 import { maxWebAnalyticsNudgeSessionLogic } from './maxWebAnalyticsNudgeSessionLogic'
 
 const WEB_ANALYTICS_RECENT_DAYS = 30
@@ -61,6 +61,95 @@ export interface NudgeReportProperties {
     trigger: NudgeTrigger
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface maxWebAnalyticsNudgeLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    dismissedThisSession: boolean // maxWebAnalyticsNudgeSessionLogic
+    eligibleReportedThisSession: boolean // maxWebAnalyticsNudgeSessionLogic
+    shownForMessageId: string | null // maxWebAnalyticsNudgeSessionLogic
+    sceneLogViewsByRef: Record<string, string> // recentItemsModel
+    sceneLogViewsHasLoaded: boolean // recentItemsModel
+    finalAnswerGroup: ThreadMessage[]
+    groupHasWebChart: boolean
+    isEligible: boolean
+    isWebAnalyticsAnswer: boolean
+    lastHumanQuestion: string | null
+    reportProperties: NudgeReportProperties
+    shouldShowNudge: boolean
+    topicIsWebAnalytics: boolean
+    trigger: NudgeTrigger
+    variant: string | null
+    visitedWebAnalyticsRecently: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface maxWebAnalyticsNudgeLogicActions {
+    markEligibleReported: () => {
+        value: true
+    } // maxWebAnalyticsNudgeSessionLogic
+    markNudgeDismissed: () => {
+        value: true
+    } // maxWebAnalyticsNudgeSessionLogic
+    markNudgeShown: (messageId: string) => {
+        messageId: string
+    } // maxWebAnalyticsNudgeSessionLogic
+    evaluateReporting: () => {
+        value: true
+    }
+    nudgeClicked: () => {
+        value: true
+    }
+    nudgeDismissed: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface maxWebAnalyticsNudgeLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        variant: (featureFlags: FeatureFlagsSet) => string | null
+        finalAnswerGroup: (threadGrouped: ThreadMessage[]) => ThreadMessage[]
+        lastHumanQuestion: (threadGrouped: ThreadMessage[]) => string | null
+        groupHasWebChart: (finalAnswerGroup: ThreadMessage[]) => boolean
+        topicIsWebAnalytics: (conversationTopic: ConversationTopic | null) => boolean
+        trigger: (topicIsWebAnalytics: boolean, groupHasWebChart: boolean) => NudgeTrigger
+        isWebAnalyticsAnswer: (
+            topicIsWebAnalytics: boolean,
+            groupHasWebChart: boolean,
+            lastHumanQuestion: string | null
+        ) => boolean
+        visitedWebAnalyticsRecently: (sceneLogViewsByRef: Record<string, string>) => boolean
+        isEligible: (
+            isWebAnalyticsAnswer: boolean,
+            visitedWebAnalyticsRecently: boolean,
+            sceneLogViewsHasLoaded: boolean,
+            isCompleted: boolean,
+            isSharedThread: boolean
+        ) => boolean
+        shouldShowNudge: (
+            isEligible: boolean,
+            variant: string | null,
+            dismissedThisSession: boolean,
+            shownForMessageId: string | null,
+            messageId: string
+        ) => boolean
+        reportProperties: (
+            variant: string | null,
+            trigger: NudgeTrigger,
+            conversationId: string | null,
+            messageId: string
+        ) => NudgeReportProperties
+    }
+}
+
+export type maxWebAnalyticsNudgeLogicType = MakeLogicType<
+    maxWebAnalyticsNudgeLogicValues,
+    maxWebAnalyticsNudgeLogicActions,
+    MaxWebAnalyticsNudgeLogicProps,
+    maxWebAnalyticsNudgeLogicMeta
+>
+
 export const maxWebAnalyticsNudgeLogic = kea<maxWebAnalyticsNudgeLogicType>([
     path(['scenes', 'max', 'logics', 'maxWebAnalyticsNudgeLogic']),
     props({} as MaxWebAnalyticsNudgeLogicProps),
@@ -87,7 +176,7 @@ export const maxWebAnalyticsNudgeLogic = kea<maxWebAnalyticsNudgeLogicType>([
     selectors({
         variant: [
             (s) => [s.featureFlags],
-            (featureFlags): string | null => {
+            (featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet): string | null => {
                 const value = featureFlags[FEATURE_FLAGS.MAX_WEB_ANALYTICS_NUDGE]
                 return typeof value === 'string' ? value : null
             },
diff --git a/frontend/src/scenes/max/logics/maxWebAnalyticsNudgeSessionLogic.ts b/frontend/src/scenes/max/logics/maxWebAnalyticsNudgeSessionLogic.ts
index ec9538fd5ef1..4e598d63b097 100644
--- a/frontend/src/scenes/max/logics/maxWebAnalyticsNudgeSessionLogic.ts
+++ b/frontend/src/scenes/max/logics/maxWebAnalyticsNudgeSessionLogic.ts
@@ -1,9 +1,7 @@
-import { actions, afterMount, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, listeners, path, reducers } from 'kea'
 
 import { permanentlyMount } from 'lib/utils/kea-logic-builders'
 
-import type { maxWebAnalyticsNudgeSessionLogicType } from './maxWebAnalyticsNudgeSessionLogicType'
-
 const STORAGE_KEY = 'posthog-ai-web-analytics-nudge-session'
 
 export interface NudgeSessionState {
@@ -38,6 +36,34 @@ function writeState(state: NudgeSessionState): void {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface maxWebAnalyticsNudgeSessionLogicValues {
+    dismissedThisSession: boolean
+    eligibleReportedThisSession: boolean
+    shownForMessageId: string | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface maxWebAnalyticsNudgeSessionLogicActions {
+    hydrateFromStorage: (state: NudgeSessionState) => {
+        state: NudgeSessionState
+    }
+    markEligibleReported: () => {
+        value: true
+    }
+    markNudgeDismissed: () => {
+        value: true
+    }
+    markNudgeShown: (messageId: string) => {
+        messageId: string
+    }
+}
+
+export type maxWebAnalyticsNudgeSessionLogicType = MakeLogicType<
+    maxWebAnalyticsNudgeSessionLogicValues,
+    maxWebAnalyticsNudgeSessionLogicActions
+>
+
 export const maxWebAnalyticsNudgeSessionLogic = kea<maxWebAnalyticsNudgeSessionLogicType>([
     path(['scenes', 'max', 'logics', 'maxWebAnalyticsNudgeSessionLogic']),
 
diff --git a/frontend/src/scenes/max/maxBillingContextLogic.tsx b/frontend/src/scenes/max/maxBillingContextLogic.tsx
index 475b5c057fad..ff3b84114e4f 100644
--- a/frontend/src/scenes/max/maxBillingContextLogic.tsx
+++ b/frontend/src/scenes/max/maxBillingContextLogic.tsx
@@ -1,4 +1,4 @@
-import { connect, kea, path, selectors } from 'kea'
+import { MakeLogicType, connect, kea, path, selectors } from 'kea'
 import { objectsEqual } from 'kea-test-utils'
 
 import { dayjs } from 'lib/dayjs'
@@ -13,7 +13,8 @@ import { teamLogic } from 'scenes/teamLogic'
 
 import { BillingType, HogFunctionType, TeamType } from '~/types'
 
-import type { maxBillingContextLogicType } from './maxBillingContextLogicType'
+import type { FeatureFlagsSet } from '../../lib/logic/featureFlagLogic'
+import type { TeamPublicType } from '../../types'
 
 export const DEFAULT_BILLING_DATE_FROM = dayjs().subtract(1, 'month').subtract(1, 'day').format('YYYY-MM-DD')
 export const DEFAULT_BILLING_DATE_TO = dayjs().subtract(1, 'day').format('YYYY-MM-DD')
@@ -245,6 +246,27 @@ export const billingToMaxContext = (
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface maxBillingContextLogicValues {
+    billing: BillingType | null; // billingLogic
+    billingSpendResponse: BillingSpendResponse | null; // billingSpendLogic
+    billingUsageResponse: BillingUsageResponse | null; // billingUsageLogic
+    featureFlags: FeatureFlagsSet; // featureFlagLogic
+    hogFunctions: HogFunctionType[]; // hogFunctionsListLogic
+    isAdminOrOwner: boolean | null; // organizationLogic
+    currentTeam: TeamPublicType | TeamType | null; // teamLogic
+    billingContext: MaxBillingContext | null;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface maxBillingContextLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        billingContext: (billing: any, billingUsageResponse: any, billingSpendResponse: any, isAdminOrOwner: any, currentTeam: any, featureFlags: any, hogFunctions: any) => MaxBillingContext | null;
+    };
+}
+
+export type maxBillingContextLogicType = MakeLogicType<maxBillingContextLogicValues, {}, Record<string, any>, maxBillingContextLogicMeta>;
+
 export const maxBillingContextLogic = kea<maxBillingContextLogicType>([
     path(['scenes', 'max', 'maxBillingContextLogic']),
     connect(() => ({
diff --git a/frontend/src/scenes/max/maxChangelogLogic.ts b/frontend/src/scenes/max/maxChangelogLogic.ts
index d21dafa88da5..7f06a56b34a2 100644
--- a/frontend/src/scenes/max/maxChangelogLogic.ts
+++ b/frontend/src/scenes/max/maxChangelogLogic.ts
@@ -1,10 +1,11 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 
 import { incidentStatusLogic } from 'lib/components/HelpMenu/incidentStatusLogic'
 import { FEATURE_FLAGS } from 'lib/constants'
 import { featureFlagLogic, getFeatureFlagPayload } from 'lib/logic/featureFlagLogic'
 
-import type { maxChangelogLogicType } from './maxChangelogLogicType'
+import type { ComponentIncidentAlert } from '../../lib/components/HelpMenu/incidentStatusLogic'
+import type { FeatureFlagsSet } from '../../lib/logic/featureFlagLogic'
 
 export interface ChangelogEntry {
     title: string
@@ -94,6 +95,70 @@ function clearDismissedFromStorage(): void {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface maxChangelogLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    aiIncidentAlerts: ComponentIncidentAlert[] // incidentStatusLogic
+    alerts: AlertEntry[]
+    entries: ChangelogEntry[]
+    entriesHash: string | null
+    entriesOverride: ChangelogEntry[] | null
+    hasAlerts: boolean
+    hasEntries: boolean
+    hasUnread: boolean
+    isDismissed: boolean
+    isDismissedOverride: boolean | null
+    isOpen: boolean
+    isVisible: boolean
+    lastSeenHash: string | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface maxChangelogLogicActions {
+    closeChangelog: () => {
+        value: true
+    }
+    dismissChangelog: () => {
+        value: true
+    }
+    enableChangelog: () => {
+        value: true
+    }
+    openChangelog: () => {
+        value: true
+    }
+    setEntries: (entries: ChangelogEntry[]) => {
+        entries: ChangelogEntry[]
+    }
+    setIsDismissed: (isDismissed: boolean) => {
+        isDismissed: boolean
+    }
+    setLastSeenHash: (hash: string | null) => {
+        hash: string | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface maxChangelogLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        entries: (entriesOverride: ChangelogEntry[] | null, featureFlags: FeatureFlagsSet) => ChangelogEntry[]
+        alerts: (aiIncidentAlerts: ComponentIncidentAlert[]) => AlertEntry[]
+        entriesHash: (entries: ChangelogEntry[]) => string | null
+        hasEntries: (entries: ChangelogEntry[]) => boolean
+        hasAlerts: (alerts: AlertEntry[]) => boolean
+        hasUnread: (entriesHash: string | null, lastSeenHash: string | null) => boolean
+        isDismissed: (isDismissedOverride: boolean | null, entriesHash: string | null) => boolean
+        isVisible: (hasEntries: boolean, hasAlerts: boolean, isDismissed: boolean, isOpen: boolean) => boolean
+    }
+}
+
+export type maxChangelogLogicType = MakeLogicType<
+    maxChangelogLogicValues,
+    maxChangelogLogicActions,
+    Record<string, any>,
+    maxChangelogLogicMeta
+>
+
 export const maxChangelogLogic = kea<maxChangelogLogicType>([
     path(['scenes', 'max', 'maxChangelogLogic']),
 
@@ -148,7 +213,10 @@ export const maxChangelogLogic = kea<maxChangelogLogicType>([
         // Derive entries from feature flag payload, with override for testing
         entries: [
             (s) => [s.entriesOverride, s.featureFlags],
-            (entriesOverride, featureFlags): ChangelogEntry[] => {
+            (
+                entriesOverride: ChangelogEntry[] | null,
+                featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet
+            ): ChangelogEntry[] => {
                 if (entriesOverride !== null) {
                     return entriesOverride
                 }
@@ -161,20 +229,26 @@ export const maxChangelogLogic = kea<maxChangelogLogicType>([
             },
         ],
         // Derive alerts from ongoing incident.io incidents tagged to PostHog AI
-        alerts: [(s) => [s.aiIncidentAlerts], (aiIncidentAlerts): AlertEntry[] => aiIncidentAlerts],
+        alerts: [
+            (s) => [s.aiIncidentAlerts],
+            (
+                aiIncidentAlerts: import('lib/components/HelpMenu/incidentStatusLogic').ComponentIncidentAlert[]
+            ): AlertEntry[] => aiIncidentAlerts,
+        ],
         entriesHash: [
             (s) => [s.entries],
-            (entries): string | null => (entries.length > 0 ? generateEntriesHash(entries) : null),
+            (entries: ChangelogEntry[]): string | null => (entries.length > 0 ? generateEntriesHash(entries) : null),
         ],
-        hasEntries: [(s) => [s.entries], (entries): boolean => entries.length > 0],
-        hasAlerts: [(s) => [s.alerts], (alerts): boolean => alerts.length > 0],
+        hasEntries: [(s) => [s.entries], (entries: ChangelogEntry[]): boolean => entries.length > 0],
+        hasAlerts: [(s) => [s.alerts], (alerts: AlertEntry[]): boolean => alerts.length > 0],
         hasUnread: [
             (s) => [s.entriesHash, s.lastSeenHash],
-            (entriesHash, lastSeenHash): boolean => !!entriesHash && entriesHash !== lastSeenHash,
+            (entriesHash: string | null, lastSeenHash: string | null): boolean =>
+                !!entriesHash && entriesHash !== lastSeenHash,
         ],
         isDismissed: [
             (s) => [s.isDismissedOverride, s.entriesHash],
-            (isDismissedOverride, entriesHash): boolean => {
+            (isDismissedOverride: boolean | null, entriesHash: string | null): boolean => {
                 if (isDismissedOverride !== null) {
                     return isDismissedOverride
                 }
@@ -183,7 +257,7 @@ export const maxChangelogLogic = kea<maxChangelogLogicType>([
         ],
         isVisible: [
             (s) => [s.hasEntries, s.hasAlerts, s.isDismissed, s.isOpen],
-            (hasEntries, hasAlerts, isDismissed, isOpen): boolean =>
+            (hasEntries: boolean, hasAlerts: boolean, isDismissed: boolean, isOpen: boolean): boolean =>
                 hasAlerts || (hasEntries && (!isDismissed || isOpen)),
         ],
     }),
diff --git a/frontend/src/scenes/max/maxContextLogic.ts b/frontend/src/scenes/max/maxContextLogic.ts
index e16be5505b26..ae75a246be81 100644
--- a/frontend/src/scenes/max/maxContextLogic.ts
+++ b/frontend/src/scenes/max/maxContextLogic.ts
@@ -1,5 +1,7 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import type { BuiltLogic } from 'kea'
 import { router } from 'kea-router'
+import type { LocationChangedPayload } from 'kea-router/lib/types'
 import posthog from 'posthog-js'
 
 import { IconBug, IconCheckbox, IconDashboard, IconGraph, IconNotebook } from '@posthog/icons'
@@ -17,7 +19,9 @@ import { ActionType, DashboardType, EventDefinition, InsightShortId, QueryBasedI
 
 import type { RevenueAnalyticsQuery } from 'products/revenue_analytics/frontend/revenueAnalyticsLogic'
 
-import type { maxContextLogicType } from './maxContextLogicType'
+import type { Node } from '../../queries/schema/schema-general'
+import type { LoadedScene } from '../sceneTypes'
+import type { ToolRegistration } from './max-constants'
 import { maxGlobalLogic } from './maxGlobalLogic'
 import {
     InsightWithQuery,
@@ -92,6 +96,157 @@ const reportSceneContextError = (error: unknown): void => {
 
 export type LoadedEntitiesMap = { dashboard: number[]; insight: string[] }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface maxContextLogicValues {
+    toolMap: {
+        [x: string]: ToolRegistration;
+    }; // maxGlobalLogic
+    activeLoadedScene: LoadedScene | null; // sceneLogic
+    activeSceneId: string | null; // sceneLogic
+    activeSceneLogic: BuiltLogic | null; // sceneLogic
+    compiledContext: MaxUIContext | null;
+    contextActions: MaxActionContext[];
+    contextDashboards: MaxDashboardContext[];
+    contextErrorTrackingIssues: MaxErrorTrackingIssueContext[];
+    contextEvaluations: MaxEvaluationContext[];
+    contextEvents: MaxEventContext[];
+    contextInsights: MaxInsightContext[];
+    contextNotebooks: MaxNotebookContext[];
+    contextOptions: MaxContextTaxonomicFilterOption[];
+    hasData: boolean;
+    loadedEntities: LoadedEntitiesMap;
+    mainTaxonomicGroupType: TaxonomicFilterGroupType;
+    rawSceneContext: MaxContextItem[];
+    sceneContext: MaxContextItem[];
+    taxonomicGroupTypes: TaxonomicFilterGroupType[];
+    toolContextItems: Array<{
+        icon: any;
+        text: string;
+    }>;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface maxContextLogicActions {
+    locationChanged: ({ method, pathname, search, searchParams, hash, hashParams, initial, url, routerState, }: LocationChangedPayload) => {
+        hash: string;
+        hashParams: Record<string, any>;
+        initial: boolean;
+        method: "POP" | "PUSH" | "REPLACE";
+        pathname: string;
+        routerState: Record<string, any>;
+        search: string;
+        searchParams: Record<string, any>;
+        url: string;
+    }; // router
+    addOrUpdateContextAction: (data: ActionType) => {
+        data: ActionType;
+    };
+    addOrUpdateContextDashboard: (data: DashboardType<QueryBasedInsightModel>) => {
+        data: DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>>;
+    };
+    addOrUpdateContextErrorTrackingIssue: (data: {
+        id: string;
+        name?: string | null;
+    }) => {
+        data: {
+            id: string;
+            name?: string | null | undefined;
+        };
+    };
+    addOrUpdateContextEvaluation: (data: {
+        description?: string | null;
+        evaluation_type: EvaluationRuntime;
+        hog_source?: string | null;
+        id: string;
+        name?: string | null;
+    }) => {
+        data: {
+            description?: string | null | undefined;
+            evaluation_type: EvaluationRuntime;
+            hog_source?: string | null | undefined;
+            id: string;
+            name?: string | null | undefined;
+        };
+    };
+    addOrUpdateContextEvent: (data: EventDefinition) => {
+        data: EventDefinition;
+    };
+    addOrUpdateContextInsight: (data: InsightWithQuery, filtersOverride?: DashboardFilter, variablesOverride?: Record<string, HogQLVariable>) => {
+        data: InsightWithQuery;
+        filtersOverride: DashboardFilter | undefined;
+        variablesOverride: Record<string, HogQLVariable> | undefined;
+    };
+    addOrUpdateContextNotebook: (data: {
+        short_id: string;
+        title?: string | null;
+    }) => {
+        data: {
+            short_id: string;
+            title?: string | null | undefined;
+        };
+    };
+    handleTaxonomicFilterChange: (value: number | string, groupType: TaxonomicFilterGroupType, item: TaxonomicItem) => {
+        groupType: TaxonomicFilterGroupType;
+        item: TaxonomicItem;
+        value: number | string;
+    };
+    loadAndProcessDashboard: (data: DashboardItemInfo) => {
+        data: DashboardItemInfo;
+    };
+    loadAndProcessInsight: (data: InsightItemInfo, filtersOverride?: DashboardFilter, variablesOverride?: Record<string, HogQLVariable>, revenueAnalyticsQuery?: RevenueAnalyticsQuery) => {
+        data: InsightItemInfo;
+        filtersOverride: DashboardFilter | undefined;
+        revenueAnalyticsQuery: RevenueAnalyticsQuery | undefined;
+        variablesOverride: Record<string, HogQLVariable> | undefined;
+    };
+    removeContextAction: (id: number | string) => {
+        id: number | string;
+    };
+    removeContextDashboard: (id: number | string) => {
+        id: number | string;
+    };
+    removeContextErrorTrackingIssue: (id: string) => {
+        id: string;
+    };
+    removeContextEvaluation: (id: string) => {
+        id: string;
+    };
+    removeContextEvent: (id: number | string) => {
+        id: number | string;
+    };
+    removeContextInsight: (id: number | string) => {
+        id: number | string;
+    };
+    removeContextNotebook: (id: string) => {
+        id: string;
+    };
+    resetContext: () => {
+        value: true;
+    };
+    setSelectedContextOption: (value: string) => {
+        value: string;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface maxContextLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        rawSceneContext: (arg: MaxContextInput[]) => MaxContextItem[];
+        sceneContext: (rawSceneContext: any) => MaxContextItem[];
+        contextOptions: (sceneContext: any) => MaxContextTaxonomicFilterOption[];
+        mainTaxonomicGroupType: (contextOptions: any) => TaxonomicFilterGroupType;
+        taxonomicGroupTypes: (contextOptions: any) => TaxonomicFilterGroupType[];
+        compiledContext: (hasData: any, contextInsights: any, contextDashboards: any, contextEvents: any, contextActions: any, contextErrorTrackingIssues: any, contextNotebooks: any, contextEvaluations: any, sceneContext: any) => MaxUIContext | null;
+        hasData: (contextInsights: any, contextDashboards: any, contextEvents: any, contextActions: any, contextErrorTrackingIssues: any, contextNotebooks: any, contextEvaluations: any, sceneContext: any) => boolean;
+        toolContextItems: (toolMap: any) => Array<{
+            icon: any;
+            text: string;
+        }>;
+    };
+}
+
+export type maxContextLogicType = MakeLogicType<maxContextLogicValues, maxContextLogicActions, Record<string, any>, maxContextLogicMeta>;
+
 export const maxContextLogic = kea<maxContextLogicType>([
     path(['scenes', 'max', 'maxContextLogic']),
     connect(() => ({
diff --git a/frontend/src/scenes/max/maxGlobalLogic.tsx b/frontend/src/scenes/max/maxGlobalLogic.tsx
index 32b291aef2b6..97585487038f 100644
--- a/frontend/src/scenes/max/maxGlobalLogic.tsx
+++ b/frontend/src/scenes/max/maxGlobalLogic.tsx
@@ -1,6 +1,7 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
+import type { LocationChangedPayload } from 'kea-router/lib/types'
 
 import api from 'lib/api'
 import { FEATURE_FLAGS, OrganizationMembershipLevel } from 'lib/constants'
@@ -20,9 +21,11 @@ import { Conversation, ConversationDetail, SidePanelTab } from '~/types'
 import { conversationsDestroy } from 'products/conversations/frontend/generated/api'
 import { requestAiAccessCreate } from 'products/platform_features/frontend/generated/api'
 
+import type { FeatureFlagsSet } from '../../lib/logic/featureFlagLogic'
+import type { OrganizationType, PreflightStatus } from '../../types'
+import type { SceneConfig } from '../sceneTypes'
 import { TOOL_DEFINITIONS, ToolRegistration } from './max-constants'
 import { PHAI_VIEW_MODE_KEY } from './max-storage-keys'
-import type { maxGlobalLogicType } from './maxGlobalLogicType'
 import { SIDE_PANEL_PANEL_ID, maxLogic, mergeConversationHistory, mergeConversations } from './maxLogic'
 
 /**
@@ -91,6 +94,157 @@ export const STATIC_TOOLS: ToolRegistration[] = [
     },
 ]
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface maxGlobalLogicValues {
+    featureFlags: FeatureFlagsSet; // featureFlagLogic
+    currentOrganization: OrganizationType | null; // organizationLogic
+    isCloudOrDev: boolean | undefined; // preflightLogic
+    preflight: PreflightStatus | null; // preflightLogic
+    sceneConfig: SceneConfig | null; // sceneLogic
+    sceneId: string | null; // sceneLogic
+    selectedTab: SidePanelTab | null; // sidePanelStateLogic
+    sidePanelOpen: boolean; // sidePanelStateLogic
+    currentTeamIdStrict: number | string; // teamLogic
+    aiAccessRequested: boolean;
+    aiAccessRequestedByOrg: Record<string, boolean>;
+    availableStaticTools: ToolRegistration[];
+    conversationHistory: ConversationDetail[];
+    conversationHistoryLoading: boolean;
+    currentConversationId: string | null;
+    dataProcessingAccepted: boolean;
+    dataProcessingApprovalDisabledReason: string | null;
+    dataProcessingDismissed: boolean;
+    editInsightToolRegistered: true;
+    effectivePhaiView: PhaiViewMode;
+    isMaxAvailable: boolean;
+    isOrganizationCreatedRecently: boolean;
+    isPhaiSandboxFlagOn: boolean;
+    liabilityNoticeDismissed: boolean;
+    phaiViewMode: PhaiViewMode;
+    registeredToolMap: Record<string, ToolRegistration>;
+    requestingAiAccess: boolean;
+    shouldShowLiabilityNotice: boolean;
+    toolMap: {
+        [x: string]: ToolRegistration;
+    };
+    toolSuggestions: string[];
+    tools: ToolRegistration[];
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface maxGlobalLogicActions {
+    locationChanged: ({ method, pathname, search, searchParams, hash, hashParams, initial, url, routerState, }: LocationChangedPayload) => {
+        hash: string;
+        hashParams: Record<string, any>;
+        initial: boolean;
+        method: "POP" | "PUSH" | "REPLACE";
+        pathname: string;
+        routerState: Record<string, any>;
+        search: string;
+        searchParams: Record<string, any>;
+        url: string;
+    }; // router
+    openSidePanel: (tab: SidePanelTab, options?: string | undefined) => {
+        options: string | undefined;
+        tab: SidePanelTab;
+    }; // sidePanelStateLogic
+    acceptDataProcessing: (testOnlyOverride?: boolean) => {
+        testOnlyOverride: boolean | undefined;
+    };
+    askSidePanelMax: (prompt: string) => {
+        prompt: string;
+    };
+    deleteConversation: (id: string) => {
+        id: string;
+    };
+    deregisterTool: (key: string) => {
+        key: string;
+    };
+    dismissDataProcessing: () => {
+        value: true;
+    };
+    dismissLiabilityNotice: () => {
+        value: true;
+    };
+    loadConversation: (conversationId: string) => string;
+    loadConversationFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadConversationHistory: (_?: {
+        /** If true, the current thread will not be updated with the retrieved conversation. */
+        doNotUpdateCurrentThread?: boolean;
+    }) => {
+        doNotUpdateCurrentThread?: boolean;
+    };
+    loadConversationHistoryFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadConversationHistorySuccess: (conversationHistory: ConversationDetail[], payload?: {
+        doNotUpdateCurrentThread?: boolean;
+    }) => {
+        conversationHistory: ConversationDetail[];
+        payload?: {
+            doNotUpdateCurrentThread?: boolean;
+        };
+    };
+    loadConversationSuccess: (conversationHistory: ConversationDetail[], payload?: string) => {
+        conversationHistory: ConversationDetail[];
+        payload?: string;
+    };
+    markAiAccessRequested: (organizationId: string) => {
+        organizationId: string;
+    };
+    openSidePanelMax: (conversationId?: string) => {
+        conversationId: string | undefined;
+    };
+    openSidePanelMaxWithTaskBind: (taskId: string) => {
+        taskId: string;
+    };
+    prependOrReplaceConversation: (conversation: Conversation | ConversationDetail) => {
+        conversation: Conversation | ConversationDetail;
+    };
+    registerTool: (tool: ToolRegistration) => {
+        tool: ToolRegistration;
+    };
+    requestAiAccess: () => {
+        value: true;
+    };
+    requestAiAccessError: () => {
+        value: true;
+    };
+    setPhaiViewMode: (mode: PhaiViewMode) => {
+        mode: PhaiViewMode;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface maxGlobalLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        currentConversationId: (searchParams: Record<string, any>) => string | null;
+        dataProcessingAccepted: (currentOrganization: OrganizationType | null) => boolean;
+        isMaxAvailable: (isCloudOrDev: boolean | undefined, preflight: PreflightStatus | null) => boolean;
+        dataProcessingApprovalDisabledReason: (currentOrganization: OrganizationType | null) => string | null;
+        aiAccessRequested: (aiAccessRequestedByOrg: Record<string, boolean>, currentOrganization: OrganizationType | null) => boolean;
+        isOrganizationCreatedRecently: (currentOrganization: OrganizationType | null) => boolean;
+        shouldShowLiabilityNotice: (isOrganizationCreatedRecently: boolean, liabilityNoticeDismissed: boolean) => boolean;
+        isPhaiSandboxFlagOn: (featureFlags: FeatureFlagsSet) => boolean;
+        effectivePhaiView: (isPhaiSandboxFlagOn: boolean, phaiViewMode: PhaiViewMode) => PhaiViewMode;
+        availableStaticTools: (featureFlags: FeatureFlagsSet) => ToolRegistration[];
+        toolMap: (registeredToolMap: Record<string, ToolRegistration>, availableStaticTools: ToolRegistration[]) => {
+            [x: string]: ToolRegistration;
+        };
+        tools: (toolMap: {
+            [x: string]: ToolRegistration;
+        }) => ToolRegistration[];
+        editInsightToolRegistered: (registeredToolMap: Record<string, ToolRegistration>) => true;
+        toolSuggestions: (tools: ToolRegistration[]) => string[];
+    };
+}
+
+export type maxGlobalLogicType = MakeLogicType<maxGlobalLogicValues, maxGlobalLogicActions, Record<string, any>, maxGlobalLogicMeta>;
+
 export const maxGlobalLogic = kea<maxGlobalLogicType>([
     path(['scenes', 'max', 'maxGlobalLogic']),
     connect(() => ({
@@ -305,11 +459,12 @@ export const maxGlobalLogic = kea<maxGlobalLogicType>([
     selectors({
         currentConversationId: [
             () => [router.selectors.searchParams],
-            (searchParams): string | null => searchParams?.chat ?? null,
+            (searchParams: Record<string, any>): string | null => searchParams?.chat ?? null,
         ],
         dataProcessingAccepted: [
             (s) => [s.currentOrganization],
-            (currentOrganization): boolean => !!currentOrganization?.is_ai_data_processing_approved,
+            (currentOrganization: null | import('~/types').OrganizationType): boolean =>
+                !!currentOrganization?.is_ai_data_processing_approved,
         ],
         // On Cloud/dev a provider key is always present. On a self-hosted (hobby) instance Max only
         // works once ANTHROPIC_API_KEY is configured, so we surface a "set the key" state instead.
@@ -317,11 +472,12 @@ export const maxGlobalLogic = kea<maxGlobalLogicType>([
         // before preflight resolves — once loaded we gate on cloud/dev or the key being present.
         isMaxAvailable: [
             (s) => [s.isCloudOrDev, s.preflight],
-            (isCloudOrDev, preflight): boolean => !preflight || !!isCloudOrDev || !!preflight.anthropic_available,
+            (isCloudOrDev: boolean | undefined, preflight: null | import('~/types').PreflightStatus): boolean =>
+                !preflight || !!isCloudOrDev || !!preflight.anthropic_available,
         ],
         dataProcessingApprovalDisabledReason: [
             (s) => [s.currentOrganization],
-            (currentOrganization): string | null =>
+            (currentOrganization: null | import('~/types').OrganizationType): string | null =>
                 !currentOrganization?.membership_level ||
                 currentOrganization.membership_level < OrganizationMembershipLevel.Admin
                     ? `Ask an admin or owner of ${currentOrganization?.name} to approve this`
@@ -329,36 +485,40 @@ export const maxGlobalLogic = kea<maxGlobalLogicType>([
         ],
         aiAccessRequested: [
             (s) => [s.aiAccessRequestedByOrg, s.currentOrganization],
-            (aiAccessRequestedByOrg, currentOrganization): boolean =>
-                !!(currentOrganization && aiAccessRequestedByOrg[currentOrganization.id]),
+            (
+                aiAccessRequestedByOrg: Record<string, boolean>,
+                currentOrganization: null | import('~/types').OrganizationType
+            ): boolean => !!(currentOrganization && aiAccessRequestedByOrg[currentOrganization.id]),
         ],
         isOrganizationCreatedRecently: [
             (s) => [s.currentOrganization],
-            (currentOrganization): boolean => {
+            (currentOrganization: null | import('~/types').OrganizationType): boolean => {
                 const orgCreatedAt = currentOrganization?.created_at
                 return orgCreatedAt ? dayjs().diff(dayjs(orgCreatedAt), 'day') <= 15 : false
             },
         ],
         shouldShowLiabilityNotice: [
             (s) => [s.isOrganizationCreatedRecently, s.liabilityNoticeDismissed],
-            (isOrganizationCreatedRecently, liabilityNoticeDismissed): boolean =>
+            (isOrganizationCreatedRecently: boolean, liabilityNoticeDismissed: boolean): boolean =>
                 isOrganizationCreatedRecently && !liabilityNoticeDismissed,
         ],
         // Gates the new-vs-legacy toggle: only flagged users can switch, and the new surface only
         // exists for them.
         isPhaiSandboxFlagOn: [
             (s) => [s.featureFlags],
-            (featureFlags): boolean => !!featureFlags[FEATURE_FLAGS.PHAI_SANDBOX_MODE],
+            (featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet): boolean =>
+                !!featureFlags[FEATURE_FLAGS.PHAI_SANDBOX_MODE],
         ],
         // The implementation the Max scene actually renders: the user's choice while the flag is on,
         // always legacy otherwise (so non-flagged users are unaffected regardless of any stored value).
         effectivePhaiView: [
             (s) => [s.isPhaiSandboxFlagOn, s.phaiViewMode],
-            (isPhaiSandboxFlagOn, phaiViewMode): PhaiViewMode => (isPhaiSandboxFlagOn ? phaiViewMode : 'legacy'),
+            (isPhaiSandboxFlagOn: boolean, phaiViewMode: PhaiViewMode): PhaiViewMode =>
+                isPhaiSandboxFlagOn ? phaiViewMode : 'legacy',
         ],
         availableStaticTools: [
             (s) => [s.featureFlags],
-            (featureFlags): ToolRegistration[] => {
+            (featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet): ToolRegistration[] => {
                 const staticTools = STATIC_TOOLS.filter((tool) => {
                     // Only register the static tools that either aren't flagged or have their flag enabled
                     const toolDefinition = TOOL_DEFINITIONS[tool.identifier]
@@ -369,19 +529,22 @@ export const maxGlobalLogic = kea<maxGlobalLogicType>([
         ],
         toolMap: [
             (s) => [s.registeredToolMap, s.availableStaticTools],
-            (registeredToolMap, availableStaticTools) => ({
+            (registeredToolMap: Record<string, ToolRegistration>, availableStaticTools: ToolRegistration[]) => ({
                 ...Object.fromEntries(availableStaticTools.map((tool) => [tool.identifier, tool])),
                 ...registeredToolMap,
             }),
         ],
-        tools: [(s) => [s.toolMap], (toolMap): ToolRegistration[] => Object.values(toolMap)],
+        tools: [
+            (s) => [s.toolMap],
+            (toolMap: { [x: string]: ToolRegistration }): ToolRegistration[] => Object.values(toolMap),
+        ],
         editInsightToolRegistered: [
             (s) => [s.registeredToolMap],
-            (registeredToolMap) => !!registeredToolMap.create_insight,
+            (registeredToolMap: Record<string, ToolRegistration>) => !!registeredToolMap.create_insight,
         ],
         toolSuggestions: [
             (s) => [s.tools],
-            (tools): string[] => {
+            (tools: ToolRegistration[]): string[] => {
                 const suggestions: string[] = []
                 for (const tool of tools) {
                     if (tool.suggestions) {
diff --git a/frontend/src/scenes/max/maxLogic.tsx b/frontend/src/scenes/max/maxLogic.tsx
index 8758fdf878ce..30b4e5a26d28 100644
--- a/frontend/src/scenes/max/maxLogic.tsx
+++ b/frontend/src/scenes/max/maxLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { router, urlToAction } from 'kea-router'
 
 import { IconBook } from '@posthog/icons'
@@ -27,10 +27,11 @@ import {
     SidePanelTab,
 } from '~/types'
 
+import type { ActionType } from '../../types'
+import type { ToolRegistration } from './max-constants'
 import { PENDING_AI_PROMPT_KEY } from './max-storage-keys'
 import { maxContextLogic } from './maxContextLogic'
 import { maxGlobalLogic } from './maxGlobalLogic'
-import type { maxLogicType } from './maxLogicType'
 import { MaxUIContext } from './maxTypes'
 
 /** Maximum age for restored prompts (5 minutes) */
@@ -149,6 +150,211 @@ function sceneTabId(panelId?: string, syncUrl?: boolean): string | null {
     return syncUrl !== false && panelId && panelId !== SIDE_PANEL_PANEL_ID ? panelId : null
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface maxLogicValues {
+    actions: ActionType[] // actionsModel
+    conversationHistory: ConversationDetail[] // maxGlobalLogic
+    conversationHistoryLoading: boolean // maxGlobalLogic
+    dataProcessingAccepted: boolean // maxGlobalLogic
+    dataProcessingApprovalDisabledReason: string | null // maxGlobalLogic
+    toolSuggestions: string[] // maxGlobalLogic
+    tools: ToolRegistration[] // maxGlobalLogic
+    searchParams: Record<string, any> // router
+    chatDraftFor: (tabId: string | undefined) => string // tabUiStateLogic
+    activeStreamingThreads: number
+    activeSuggestionGroup: SuggestionGroup | null
+    autoRun: boolean
+    backButtonDisabled: boolean
+    backToScreen: 'history' | null
+    breadcrumbs: Breadcrumb[]
+    chatTitle: string | null
+    conversation: ConversationDetail | null
+    conversationHistoryVisible: boolean
+    conversationId: string | null
+    conversationLoading: boolean
+    fillInHint: string | null
+    focusCounter: number
+    frontendConversationId: string
+    headline: string | undefined
+    messagesLoading: boolean
+    onAcceptSessionFilters: ((filters: RecordingUniversalFilters) => void) | null
+    panelId: any
+    pendingBindTaskId: string | null
+    question: string
+    threadLogicKey: string
+    threadLogicProps: {
+        conversation: ConversationDetail | null
+        conversationId: string
+        panelId: any
+    }
+    threadVisible: boolean
+    toolDescriptions: (string | undefined)[]
+    toolHeadlines: (string | undefined)[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface maxLogicActions {
+    resetContext: () => {
+        value: true
+    } // maxContextLogic
+    deleteConversation: (id: string) => {
+        id: string
+    } // maxGlobalLogic
+    loadConversationHistory: (
+        _?:
+            | {
+                  doNotUpdateCurrentThread?: boolean
+              }
+            | undefined
+    ) => {
+        doNotUpdateCurrentThread?: boolean
+    } // maxGlobalLogic
+    loadConversationHistorySuccess: (
+        conversationHistory: ConversationDetail[],
+        payload?:
+            | {
+                  doNotUpdateCurrentThread?: boolean
+              }
+            | undefined
+    ) => {
+        conversationHistory: ConversationDetail[]
+        payload?: {
+            doNotUpdateCurrentThread?: boolean
+        }
+    } // maxGlobalLogic
+    prependOrReplaceConversation: (conversation: Conversation | ConversationDetail) => {
+        conversation: Conversation | ConversationDetail
+    } // maxGlobalLogic
+    setChatDraftForTab: (
+        tabId: string | undefined,
+        draft: string
+    ) => {
+        draft: string
+        tabId: string
+    } // tabUiStateLogic
+    askMax: (
+        prompt: string | null,
+        addToThread?: boolean,
+        uiContext?: Partial<MaxUIContext>
+    ) => {
+        addToThread: boolean
+        prompt: string | null
+        uiContext: Partial<MaxUIContext> | undefined
+    }
+    decrActiveStreamingThreads: () => {
+        value: true
+    }
+    focusInput: () => {
+        value: true
+    }
+    goBack: () => {
+        value: true
+    }
+    incrActiveStreamingThreads: () => {
+        value: true
+    }
+    loadThread: (conversation: ConversationDetail) => {
+        conversation: ConversationDetail
+    }
+    openConversation: (conversationId: string) => {
+        conversationId: string
+    }
+    pollConversation: (
+        conversationId: string,
+        currentRecursionDepth?: number,
+        leadingTimeout?: number
+    ) => {
+        conversationId: string
+        currentRecursionDepth: number
+        leadingTimeout: number
+    }
+    scrollThreadToBottom: (behavior?: 'instant' | 'smooth') => {
+        behavior: 'instant' | 'smooth' | undefined
+    }
+    setActiveGroup: (group: SuggestionGroup | null) => {
+        group: SuggestionGroup | null
+    }
+    setAutoRun: (autoRun: boolean) => {
+        autoRun: boolean
+    }
+    setBackScreen: (screen: 'history') => {
+        screen: 'history'
+    }
+    setConversationId: (conversationId: string) => {
+        conversationId: string
+    }
+    setFillInHint: (hint: string | null) => {
+        hint: string | null
+    }
+    setPendingBindTaskId: (taskId: string | null) => {
+        taskId: string | null
+    }
+    setQuestion: (question: string) => {
+        question: string
+    }
+    startNewConversation: () => {
+        value: true
+    }
+    toggleConversationHistory: (visible?: boolean) => {
+        visible: boolean | undefined
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface maxLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        panelId: (arg: any) => any
+        onAcceptSessionFilters: (
+            arg: ((filters: RecordingUniversalFilters) => void) | null
+        ) => ((filters: RecordingUniversalFilters) => void) | null
+        conversation: (
+            conversationHistory: ConversationDetail[],
+            conversationId: string | null
+        ) => ConversationDetail | null
+        toolHeadlines: (tools: ToolRegistration[]) => (string | undefined)[]
+        toolDescriptions: (tools: ToolRegistration[]) => (string | undefined)[]
+        headline: (
+            conversation: ConversationDetail | null,
+            toolHeadlines: (string | undefined)[],
+            frontendConversationId: string
+        ) => string | undefined
+        conversationLoading: (
+            conversationHistory: ConversationDetail[],
+            conversationHistoryLoading: boolean,
+            conversationId: string | null,
+            conversation: ConversationDetail | null
+        ) => boolean
+        messagesLoading: (conversation: ConversationDetail | null, conversationId: string | null) => boolean
+        threadVisible: (conversationId: string | null) => boolean
+        backButtonDisabled: (threadVisible: boolean, conversationHistoryVisible: boolean) => boolean
+        chatTitle: (
+            conversationId: string | null,
+            conversation: ConversationDetail | null,
+            conversationHistoryVisible: boolean
+        ) => string | null
+        threadLogicKey: (conversationId: string | null, frontendConversationId: string) => string
+        threadLogicProps: (
+            panelId: any,
+            conversation: ConversationDetail | null,
+            threadLogicKey: string
+        ) => {
+            conversation: ConversationDetail | null
+            conversationId: string
+            panelId: any
+        }
+        breadcrumbs: (
+            conversationId: string | null,
+            chatTitle: string | null,
+            conversationHistoryVisible: boolean,
+            searchParams: Record<string, any>,
+            activeStreamingThreads: number
+        ) => Breadcrumb[]
+    }
+}
+
+export type maxLogicType = MakeLogicType<maxLogicValues, maxLogicActions, MaxLogicProps, maxLogicMeta>
+
 export const maxLogic = kea<maxLogicType>([
     props({} as MaxLogicProps),
     key((props) => props.panelId || SCENE_PANEL_ID),
@@ -319,7 +525,7 @@ export const maxLogic = kea<maxLogicType>([
         ],
         conversation: [
             (s) => [s.conversationHistory, s.conversationId],
-            (conversationHistory, conversationId) => {
+            (conversationHistory: ConversationDetail[], conversationId: string | null) => {
                 if (conversationId) {
                     return conversationHistory.find((c) => c.id === conversationId) ?? null
                 }
@@ -327,16 +533,25 @@ export const maxLogic = kea<maxLogicType>([
             },
         ],
 
-        toolHeadlines: [(s) => [s.tools], (tools) => tools.map((tool) => tool.introOverride?.headline).filter(Boolean)],
+        toolHeadlines: [
+            (s) => [s.tools],
+            (tools: import('./max-constants').ToolRegistration[]) =>
+                tools.map((tool) => tool.introOverride?.headline).filter(Boolean),
+        ],
 
         toolDescriptions: [
             (s) => [s.tools],
-            (tools) => tools.map((tool) => tool.introOverride?.description).filter(Boolean),
+            (tools: import('./max-constants').ToolRegistration[]) =>
+                tools.map((tool) => tool.introOverride?.description).filter(Boolean),
         ],
 
         headline: [
             (s) => [s.conversation, s.toolHeadlines, s.frontendConversationId],
-            (conversation, toolHeadlines, frontendConversationId) => {
+            (
+                conversation: ConversationDetail | null,
+                toolHeadlines: (string | undefined)[],
+                frontendConversationId: string
+            ) => {
                 if (inStorybook() || inStorybookTestRunner()) {
                     return HEADLINES[0] // Preventing UI snapshots from being different every time
                 }
@@ -354,30 +569,39 @@ export const maxLogic = kea<maxLogicType>([
 
         conversationLoading: [
             (s) => [s.conversationHistory, s.conversationHistoryLoading, s.conversationId, s.conversation],
-            (conversationHistory, conversationHistoryLoading, conversationId, conversation) => {
+            (
+                conversationHistory: ConversationDetail[],
+                conversationHistoryLoading: boolean,
+                conversationId: string | null,
+                conversation: ConversationDetail | null
+            ) => {
                 return !conversationHistory.length && conversationHistoryLoading && !!conversationId && !conversation
             },
         ],
 
         messagesLoading: [
             (s) => [s.conversation, s.conversationId],
-            (conversation, conversationId) => {
+            (conversation: ConversationDetail | null, conversationId: string | null) => {
                 return !!conversationId && !!conversation && conversation.messages === undefined
             },
         ],
 
-        threadVisible: [(s) => [s.conversationId], (conversationId) => !!conversationId],
+        threadVisible: [(s) => [s.conversationId], (conversationId: string | null) => !!conversationId],
 
         backButtonDisabled: [
             (s) => [s.threadVisible, s.conversationHistoryVisible],
-            (threadVisible, conversationHistoryVisible) => {
+            (threadVisible: boolean, conversationHistoryVisible: boolean) => {
                 return !threadVisible && !conversationHistoryVisible
             },
         ],
 
         chatTitle: [
             (s) => [s.conversationId, s.conversation, s.conversationHistoryVisible],
-            (conversationId, conversation, conversationHistoryVisible) => {
+            (
+                conversationId: string | null,
+                conversation: ConversationDetail | null,
+                conversationHistoryVisible: boolean
+            ) => {
                 if (conversationHistoryVisible) {
                     return CHAT_TITLE_HISTORY
                 }
@@ -393,7 +617,7 @@ export const maxLogic = kea<maxLogicType>([
 
         threadLogicKey: [
             (s) => [s.conversationId, s.frontendConversationId],
-            (conversationId, frontendConversationId) => {
+            (conversationId: string | null, frontendConversationId: string) => {
                 if (conversationId) {
                     return conversationId
                 }
@@ -403,7 +627,7 @@ export const maxLogic = kea<maxLogicType>([
 
         threadLogicProps: [
             (s) => [s.panelId, s.conversation, s.threadLogicKey],
-            (panelId, conversation, threadLogicKey) => ({
+            (panelId, conversation: ConversationDetail | null, threadLogicKey: string) => ({
                 panelId,
                 conversationId: threadLogicKey,
                 conversation,
@@ -419,11 +643,11 @@ export const maxLogic = kea<maxLogicType>([
                 s.activeStreamingThreads,
             ],
             (
-                conversationId,
-                chatTitle,
-                conversationHistoryVisible,
-                searchParams,
-                activeStreamingThreads
+                conversationId: string | null,
+                chatTitle: string | null,
+                conversationHistoryVisible: boolean,
+                searchParams: Record<string, any>,
+                activeStreamingThreads: number
             ): Breadcrumb[] => {
                 const isStreaming = activeStreamingThreads > 0
                 const hasConversationBreadcrumb = !conversationHistoryVisible && conversationId
diff --git a/frontend/src/scenes/max/maxThreadLogic.tsx b/frontend/src/scenes/max/maxThreadLogic.tsx
index 54776d4831bf..0134bdc38414 100644
--- a/frontend/src/scenes/max/maxThreadLogic.tsx
+++ b/frontend/src/scenes/max/maxThreadLogic.tsx
@@ -1,5 +1,6 @@
 import { createParser } from 'eventsource-parser'
 import {
+    MakeLogicType,
     BuiltLogic,
     actions,
     afterMount,
@@ -72,6 +73,8 @@ import {
 } from 'products/posthog_ai/frontend/api/logics'
 import { LogEntry, parseLogEvent } from 'products/posthog_ai/frontend/lib/parse-logs'
 
+import type { PermissionRequestRecord } from '../../../../products/posthog_ai/frontend/types/streamTypes'
+import type { FeatureFlagsSet } from '../../lib/logic/featureFlagLogic'
 import { handsFreeLogic } from './handsFreeLogic'
 import { summariseAssistantThread } from './handsFreeUtils'
 import {
@@ -85,7 +88,6 @@ import { PENDING_AI_PROMPT_KEY } from './max-storage-keys'
 import { MaxBillingContext, maxBillingContextLogic } from './maxBillingContextLogic'
 import { maxGlobalLogic } from './maxGlobalLogic'
 import { SCENE_PANEL_ID, SIDE_PANEL_PANEL_ID, maxLogic } from './maxLogic'
-import type { maxThreadLogicType } from './maxThreadLogicType'
 import { AttachedContext, MaxUIContext } from './maxTypes'
 import { posthogAiContextLogic } from './posthogAiContextLogic'
 import { MAX_SLASH_COMMANDS, SlashCommand } from './slash-commands'
@@ -126,6 +128,436 @@ export interface MaxThreadLogicProps {
     skipInitialLoad?: boolean
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface maxThreadLogicValues {
+    featureFlags: FeatureFlagsSet; // featureFlagLogic
+    billingContext: MaxBillingContext | null; // maxBillingContextLogic
+    compiledContext: MaxUIContext | null; // maxContextLogic
+    availableStaticTools: ToolRegistration[]; // maxGlobalLogic
+    dataProcessingAccepted: boolean; // maxGlobalLogic
+    toolMap: {
+        [x: string]: ToolRegistration;
+    }; // maxGlobalLogic
+    tools: ToolRegistration[]; // maxGlobalLogic
+    activeStreamingThreads: number; // maxLogic
+    activeThreadKey: string; // maxLogic
+    autoRun: boolean; // maxLogic
+    parentConversationId: string | null; // maxLogic
+    pendingBindTaskId: string | null; // maxLogic
+    question: string; // maxLogic
+    sandboxAttachments: AttachedContext[]; // posthogAiContextLogic
+    pendingSandboxPermissionRequest: PermissionRequestRecord | null; // runStreamLogic
+    sandboxCurrentMode: string | null; // runStreamLogic
+    sceneId: string | null; // sceneLogic
+    activeDangerousOperationApproval: {
+        payload: Record<string, any>;
+        preview: string;
+        proposalId: string;
+        status: "pending_approval";
+        toolName: string;
+    } | null;
+    activeMultiQuestionForm: MultiQuestionForm | null;
+    agentMode: AgentMode | null;
+    agentModeLockedByUser: boolean;
+    cancelCount: number;
+    cancelLoading: boolean;
+    contextDisabledReason: string | undefined;
+    conversation: Conversation | null;
+    conversationId: string;
+    conversationLoading: boolean;
+    currentThinkingMessage: string | null;
+    effectiveApprovalStatuses: Record<string, {
+        feedback?: string;
+        status: ApprovalDecisionStatus;
+    }>;
+    filteredCommands: SlashCommand[];
+    formPending: boolean;
+    inputDisabled: boolean;
+    isAnotherAgenticIterationScheduled: boolean;
+    isConvertedConversation: boolean;
+    isImpersonatingExistingConversation: boolean;
+    isSandboxMode: boolean;
+    isSharedThread: boolean;
+    multiQuestionFormPending: boolean;
+    pendingApprovalProposalId: string | null;
+    pendingApprovalsData: Record<string, PendingApproval>;
+    pendingPrompt: string | null;
+    queueData: {
+        limit: number;
+        messages: ConversationQueueMessage[];
+    };
+    queueDataLoading: boolean;
+    queueDisabledReason: string | undefined;
+    queueIsFull: boolean;
+    queueLimit: number;
+    queueSubmitting: boolean;
+    queuedMessages: ConversationQueueMessage[];
+    queueingEnabled: boolean;
+    resolvedApprovalStatuses: Record<string, {
+        feedback?: string;
+        status: "approved" | "auto_rejected" | "rejected";
+    }>;
+    retryCount: number;
+    sandboxConversationKey: string;
+    sandboxEntries: LogEntry[];
+    showContextUI: boolean;
+    showDeepResearchModeToggle: boolean;
+    streamingActive: boolean;
+    submissionDisabledReason: string | undefined;
+    supportOverrideEnabled: boolean;
+    threadGrouped: ThreadMessage[];
+    threadLoading: boolean;
+    threadMessageCount: number;
+    threadRaw: ThreadMessage[];
+    toolCallUpdateMap: Map<string, string[]>;
+    traceId: string | null;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface maxThreadLogicActions {
+    loadConversation: (conversationId: string) => string; // maxGlobalLogic
+    askMax: (prompt: string | null, addToThread?: boolean | undefined, uiContext?: Partial<MaxUIContext> | undefined) => {
+        addToThread: boolean;
+        prompt: string | null;
+        uiContext: Partial<MaxUIContext> | undefined;
+    }; // maxLogic
+    decrActiveStreamingThreads: () => {
+        value: true;
+    }; // maxLogic
+    incrActiveStreamingThreads: () => {
+        value: true;
+    }; // maxLogic
+    loadConversationHistory: (_?: {
+        doNotUpdateCurrentThread?: boolean;
+    } | undefined) => {
+        doNotUpdateCurrentThread?: boolean;
+    }; // maxLogic
+    loadConversationHistorySuccess: (conversationHistory: ConversationDetail[], payload?: {
+        doNotUpdateCurrentThread?: boolean;
+    } | undefined) => {
+        conversationHistory: ConversationDetail[];
+        payload?: {
+            doNotUpdateCurrentThread?: boolean;
+        };
+    }; // maxLogic
+    setAutoRun: (autoRun: boolean) => {
+        autoRun: boolean;
+    }; // maxLogic
+    setConversationId: (conversationId: string) => {
+        conversationId: string;
+    }; // maxLogic
+    setPendingBindTaskId: (taskId: string | null) => {
+        taskId: string | null;
+    }; // maxLogic
+    setQuestion: (question: string) => {
+        question: string;
+    }; // maxLogic
+    updateGlobalConversationCache: (conversation: Conversation | ConversationDetail) => {
+        conversation: Conversation | ConversationDetail;
+    }; // maxLogic
+    clearSandboxAttachments: () => {
+        value: true;
+    }; // posthogAiContextLogic
+    bootstrapSandboxRun: (payload: {
+        justCreatedRun?: boolean;
+        runId: string;
+        taskId: string;
+        traceId?: string;
+    }) => {
+        justCreatedRun?: boolean | undefined;
+        runId: string;
+        taskId: string;
+        traceId?: string | undefined;
+    }; // runStreamLogic
+    cancelSandboxRun: (run?: {
+        runId: string;
+        taskId: string;
+    } | undefined) => {
+        run: {
+            runId: string;
+            taskId: string;
+        } | undefined;
+    }; // runStreamLogic
+    openSandboxSse: (payload: {
+        runId: string;
+        startLatest?: boolean;
+        taskId: string;
+        traceId?: string;
+    }) => {
+        runId: string;
+        startLatest?: boolean | undefined;
+        taskId: string;
+        traceId?: string | undefined;
+    }; // runStreamLogic
+    pushSandboxError: (errorMessage: string, variant?: "crash" | "error" | undefined) => {
+        errorMessage: string;
+        variant: "crash" | "error";
+    }; // runStreamLogic
+    pushSandboxHumanMessage: (content: string) => {
+        content: string;
+    }; // runStreamLogic
+    resetSandboxStream: () => {
+        value: true;
+    }; // runStreamLogic
+    setSandboxRunOpening: (opening: boolean) => {
+        opening: boolean;
+    }; // runStreamLogic
+    activateCommand: (command: SlashCommand) => {
+        command: SlashCommand;
+    };
+    addMessage: (message: ThreadMessage) => {
+        message: ThreadMessage;
+    };
+    addPendingApprovalData: (approval: PendingApproval) => {
+        approval: PendingApproval;
+    };
+    appendMessageToConversation: (message: string) => {
+        message: string;
+    };
+    appendSandboxEntry: (entry: LogEntry) => {
+        entry: LogEntry;
+    };
+    clearPendingApproval: () => {
+        value: true;
+    };
+    clearQueuedMessages: () => {
+        value: true;
+    };
+    completeThreadGeneration: () => {
+        value: true;
+    };
+    consumeQueuedMessage: (message: ConversationQueueMessage) => {
+        message: ConversationQueueMessage;
+    };
+    continueAfterApproval: (proposalId: string) => {
+        proposalId: string;
+    };
+    continueAfterForm: (formAnswers: MultiQuestionFormAnswers) => {
+        formAnswers: MultiQuestionFormAnswers;
+    };
+    continueAfterFormDismissal: () => {
+        value: true;
+    };
+    continueAfterRejection: (proposalId: string, feedback?: string) => {
+        feedback: string | undefined;
+        proposalId: string;
+    };
+    continueWithClientToolResult: (result: Record<string, unknown>, toolCallId: string) => {
+        result: Record<string, unknown>;
+        toolCallId: string;
+    };
+    deleteQueuedMessage: (queueId: string) => {
+        queueId: string;
+    };
+    endStreaming: () => {
+        value: true;
+    };
+    enqueueQueuedMessage: (payload: {
+        agentMode?: AgentMode | null;
+        billingContext?: MaxBillingContext | null;
+        content: string;
+        contextualTools?: Record<string, any>;
+        uiContext?: MaxUIContext;
+    }) => {
+        agentMode?: AgentMode | null | undefined;
+        billingContext?: MaxBillingContext | null | undefined;
+        content: string;
+        contextualTools?: Record<string, any> | undefined;
+        uiContext?: MaxUIContext | undefined;
+    };
+    executePendingClientToolCall: () => {
+        value: true;
+    };
+    finalizeStreamingMessages: () => {
+        value: true;
+    };
+    loadPendingApprovalsData: (approvals: PendingApproval[]) => {
+        approvals: PendingApproval[];
+    };
+    loadQueueData: () => any;
+    loadQueueDataFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadQueueDataSuccess: (queueData: {
+        limit: number;
+        messages: ConversationQueueMessage[];
+    }, payload?: any) => {
+        queueData: {
+            limit: number;
+            messages: ConversationQueueMessage[];
+        };
+        payload?: any;
+    };
+    prewarmSandbox: () => {
+        value: true;
+    };
+    processNotebookUpdate: (notebookId: string, notebookContent: JSONContent) => {
+        notebookContent: JSONContent;
+        notebookId: string;
+    };
+    reconnectToStream: () => {
+        value: true;
+    };
+    refreshSandboxEntries: () => {
+        value: true;
+    };
+    releaseSandboxPrewarm: () => {
+        value: true;
+    };
+    replaceMessage: (index: number, message: ThreadMessage) => {
+        index: number;
+        message: ThreadMessage;
+    };
+    resetCancelCount: () => {
+        value: true;
+    };
+    resetRetryCount: () => {
+        value: true;
+    };
+    resetSandboxEntries: () => {
+        value: true;
+    };
+    resetThread: () => {
+        value: true;
+    };
+    retryLastMessage: () => {
+        value: true;
+    };
+    selectCommand: (command: SlashCommand) => {
+        command: SlashCommand;
+    };
+    setAgentMode: (agentMode: AgentMode | null) => {
+        agentMode: AgentMode | null;
+    };
+    setCancelLoading: (cancelLoading: boolean) => {
+        cancelLoading: boolean;
+    };
+    setConversation: (conversation: Conversation) => {
+        conversation: Conversation;
+    };
+    setForAnotherAgenticIteration: (value: boolean) => {
+        value: boolean;
+    };
+    setIsSandboxMode: (isSandboxMode: boolean) => {
+        isSandboxMode: boolean;
+    };
+    setMessageStatus: (index: number, status: MessageStatus) => {
+        index: number;
+        status: MessageStatus;
+    };
+    setPendingApproval: (proposalId: string) => {
+        proposalId: string;
+    };
+    setQueueLimit: (limit: number) => {
+        limit: number;
+    };
+    setQueuedMessages: (messages: ConversationQueueMessage[]) => {
+        messages: ConversationQueueMessage[];
+    };
+    setResolvedApprovalStatus: (proposalId: string, status: "approved" | "auto_rejected" | "rejected", feedback?: string) => {
+        feedback: string | undefined;
+        proposalId: string;
+        status: "approved" | "auto_rejected" | "rejected";
+    };
+    setSupportOverrideEnabled: (enabled: boolean) => {
+        enabled: boolean;
+    };
+    setThread: (thread: ThreadMessage[]) => {
+        thread: ThreadMessage[];
+    };
+    setToolCallUpdate: (update: AssistantUpdateEvent | SubagentUpdateEvent, toolMap: Record<string, ToolRegistration>) => {
+        toolMap: Record<string, ToolRegistration>;
+        update: AssistantUpdateEvent | SubagentUpdateEvent;
+    };
+    setTraceId: (traceId: string) => {
+        traceId: string;
+    };
+    stopGeneration: () => {
+        value: true;
+    };
+    streamConversation: (streamData: {
+        agent_mode: AgentMode | null;
+        content: string | null;
+        contextual_tools?: Record<string, any>;
+        conversation?: string;
+        is_sandbox?: boolean;
+        resume_payload?: ResumePayload | null;
+        ui_context?: any;
+    }, generationAttempt: number, addToThread?: boolean) => {
+        addToThread: boolean;
+        generationAttempt: number;
+        streamData: {
+            agent_mode: AgentMode | null;
+            content: string | null;
+            contextual_tools?: Record<string, any> | undefined;
+            conversation?: string | undefined;
+            is_sandbox?: boolean | undefined;
+            resume_payload?: ResumePayload | null | undefined;
+            ui_context?: any;
+        };
+    };
+    syncAgentModeFromConversation: (agentMode: AgentMode | null) => {
+        agentMode: AgentMode | null;
+    };
+    updateQueuedMessage: (queueId: string, content: string) => {
+        content: string;
+        queueId: string;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface maxThreadLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        conversationId: (conversation: Conversation | null, conversationId: string) => string;
+        sandboxConversationKey: (conversationId: string) => string;
+        isConvertedConversation: (conversation: Conversation | null, threadRaw: ThreadMessage[]) => boolean;
+        effectiveApprovalStatuses: (resolvedApprovalStatuses: Record<string, {
+            feedback?: string;
+            status: "approved" | "auto_rejected" | "rejected";
+        }>, pendingApprovalsData: Record<string, PendingApproval>) => Record<string, {
+            feedback?: string;
+            status: ApprovalDecisionStatus;
+        }>;
+        isSharedThread: (conversation: Conversation | null, user: null | import("~/types").UserType) => boolean;
+        isImpersonatingExistingConversation: (conversation: Conversation | null, supportOverrideEnabled: boolean, user: null | import("~/types").UserType) => boolean;
+        threadLoading: (conversationLoading: boolean, streamingActive: boolean) => boolean;
+        queueingEnabled: (featureFlags: FeatureFlagsSet, isSandboxMode: boolean) => boolean;
+        queueIsFull: (queuedMessages: ConversationQueueMessage[], queueLimit: number) => boolean;
+        queueDisabledReason: (queueingEnabled: boolean, threadLoading: boolean, queueIsFull: boolean) => string | undefined;
+        threadGrouped: (threadRaw: ThreadMessage[], threadLoading: boolean, toolCallUpdateMap: Map<string, string[]>, pendingApprovalsData: Record<string, PendingApproval>, resolvedApprovalStatuses: Record<string, {
+            feedback?: string;
+            status: "approved" | "auto_rejected" | "rejected";
+        }>, currentThinkingMessage: string | null) => ThreadMessage[];
+        threadMessageCount: (threadRaw: ThreadMessage[]) => number;
+        formPending: (threadRaw: ThreadMessage[]) => boolean;
+        multiQuestionFormPending: (threadRaw: ThreadMessage[]) => boolean;
+        activeMultiQuestionForm: (threadRaw: ThreadMessage[]) => MultiQuestionForm | null;
+        activeDangerousOperationApproval: (pendingApprovalProposalId: string | null, pendingApprovalsData: Record<string, PendingApproval>, resolvedApprovalStatuses: Record<string, {
+            feedback?: string;
+            status: "approved" | "auto_rejected" | "rejected";
+        }>) => {
+            payload: Record<string, any>;
+            preview: string;
+            proposalId: string;
+            status: "pending_approval";
+            toolName: string;
+        } | null;
+        inputDisabled: (formPending: boolean, multiQuestionFormPending: boolean, threadLoading: boolean, dataProcessingAccepted: boolean, isSharedThread: boolean, isImpersonatingExistingConversation: boolean, pendingApprovalProposalId: string | null, resolvedApprovalStatuses: Record<string, {
+            feedback?: string;
+            status: "approved" | "auto_rejected" | "rejected";
+        }>) => boolean;
+        contextDisabledReason: (formPending: boolean, multiQuestionFormPending: boolean, threadLoading: boolean, activeStreamingThreads: number, isImpersonatingExistingConversation: boolean) => string | undefined;
+        submissionDisabledReason: (contextDisabledReason: string | undefined, question: string, queueDisabledReason: string | undefined) => string | undefined;
+        filteredCommands: (question: string, featureFlags: FeatureFlagsSet, threadLoading: boolean, conversation: Conversation | null) => SlashCommand[];
+        showDeepResearchModeToggle: (conversation: Conversation | null, featureFlags: FeatureFlagsSet) => boolean;
+        showContextUI: (conversation: Conversation | null, featureFlags: FeatureFlagsSet) => boolean;
+    };
+}
+
+export type maxThreadLogicType = MakeLogicType<maxThreadLogicValues, maxThreadLogicActions, MaxThreadLogicProps, maxThreadLogicMeta>;
+
 export const maxThreadLogic = kea<maxThreadLogicType>([
     // Mirror maxLogic's key fallback: the bare /ai scene has no panelId, and both logics must
     // resolve to the same `scene` instance (maxThreadLogic connects to maxLogic({ panelId })).
@@ -1798,12 +2230,13 @@ export const maxThreadLogic = kea<maxThreadLogicType>([
     selectors({
         conversationId: [
             (s, p) => [s.conversation, p.conversationId],
-            (conversation, propsConversationId) => (conversation?.id ? conversation.id : propsConversationId),
+            (conversation: Conversation | null, propsConversationId: string) =>
+                conversation?.id ? conversation.id : propsConversationId,
         ],
 
         // The exact id this instance was keyed with. React must bind the per-conversation sandbox
         // logics with the same id connect() used above, or the two would resolve different instances.
-        sandboxConversationKey: [(_, p) => [p.conversationId], (conversationId): string => conversationId],
+        sandboxConversationKey: [(_, p) => [p.conversationId], (conversationId: string): string => conversationId],
 
         // A converted conversation: now on the sandbox runtime but still carrying its legacy
         // LangGraph history. Drives the dual render (full legacy thread → "history was converted"
@@ -1811,12 +2244,22 @@ export const maxThreadLogic = kea<maxThreadLogicType>([
         // thinking-loader injected into `threadGrouped` can't be mistaken for legacy content.
         isConvertedConversation: [
             (s) => [s.conversation, s.threadRaw],
-            (conversation, threadRaw): boolean => conversation?.agent_runtime === 'sandbox' && threadRaw.length > 0,
+            (conversation: Conversation | null, threadRaw: ThreadMessage[]): boolean =>
+                conversation?.agent_runtime === 'sandbox' && threadRaw.length > 0,
         ],
 
         effectiveApprovalStatuses: [
             (s) => [s.resolvedApprovalStatuses, s.pendingApprovalsData],
-            (resolved, pendingApprovalsData): Record<string, { status: ApprovalDecisionStatus; feedback?: string }> => {
+            (
+                resolved: Record<
+                    string,
+                    {
+                        feedback?: string
+                        status: 'approved' | 'auto_rejected' | 'rejected'
+                    }
+                >,
+                pendingApprovalsData: Record<string, PendingApproval>
+            ): Record<string, { status: ApprovalDecisionStatus; feedback?: string }> => {
                 // Get statuses from pending approvals data
                 const baseStatuses: Record<string, { status: ApprovalDecisionStatus; feedback?: string }> = {}
                 for (const [proposalId, approval] of Object.entries(pendingApprovalsData)) {
@@ -1833,13 +2276,18 @@ export const maxThreadLogic = kea<maxThreadLogicType>([
 
         isSharedThread: [
             (s) => [s.conversation, userLogic.selectors.user],
-            (conversation, user): boolean => !!conversation?.user && !!user && conversation.user.uuid !== user.uuid,
+            (conversation: Conversation | null, user: null | import('~/types').UserType): boolean =>
+                !!conversation?.user && !!user && conversation.user.uuid !== user.uuid,
         ],
 
         // Whether the current user is impersonating and viewing an existing conversation
         isImpersonatingExistingConversation: [
             (s) => [s.conversation, s.supportOverrideEnabled, userLogic.selectors.user],
-            (conversation, supportOverrideEnabled, user): boolean => {
+            (
+                conversation: Conversation | null,
+                supportOverrideEnabled: boolean,
+                user: null | import('~/types').UserType
+            ): boolean => {
                 // Only when user is impersonating
                 if (!user?.is_impersonated) {
                     return false
@@ -1862,7 +2310,7 @@ export const maxThreadLogic = kea<maxThreadLogicType>([
 
         threadLoading: [
             (s) => [s.conversationLoading, s.streamingActive],
-            (conversationLoading, streamingActive) => conversationLoading || streamingActive,
+            (conversationLoading: boolean, streamingActive: boolean) => conversationLoading || streamingActive,
         ],
 
         queueingEnabled: [
@@ -1870,19 +2318,19 @@ export const maxThreadLogic = kea<maxThreadLogicType>([
             // aren't flag-gated, and the sandbox runtime drives the drain itself); LangGraph stays
             // behind the rollout flag.
             (s) => [s.featureFlags, s.isSandboxMode],
-            (featureFlags, isSandboxMode): boolean =>
+            (featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet, isSandboxMode: boolean): boolean =>
                 !!featureFlags[FEATURE_FLAGS.POSTHOG_AI_QUEUE_MESSAGES_SYSTEM] || isSandboxMode,
         ],
 
         queueIsFull: [
             (s) => [s.queuedMessages, s.queueLimit],
-            (queuedMessages, queueLimit): boolean =>
+            (queuedMessages: ConversationQueueMessage[], queueLimit: number): boolean =>
                 queueLimit !== null && queueLimit > 0 ? queuedMessages.length >= queueLimit : false,
         ],
 
         queueDisabledReason: [
             (s) => [s.queueingEnabled, s.threadLoading, s.queueIsFull],
-            (queueingEnabled, threadLoading, queueIsFull): string | undefined =>
+            (queueingEnabled: boolean, threadLoading: boolean, queueIsFull: boolean): string | undefined =>
                 queueingEnabled && threadLoading && queueIsFull ? 'Queue is full' : undefined,
         ],
 
@@ -1896,12 +2344,18 @@ export const maxThreadLogic = kea<maxThreadLogicType>([
                 s.currentThinkingMessage,
             ],
             (
-                thread,
-                threadLoading,
-                toolCallUpdateMap,
-                pendingApprovalsData,
-                resolvedApprovalStatuses,
-                currentThinkingMessage
+                thread: ThreadMessage[],
+                threadLoading: boolean,
+                toolCallUpdateMap: Map<string, string[]>,
+                pendingApprovalsData: Record<string, PendingApproval>,
+                resolvedApprovalStatuses: Record<
+                    string,
+                    {
+                        feedback?: string
+                        status: 'approved' | 'auto_rejected' | 'rejected'
+                    }
+                >,
+                currentThinkingMessage: string | null
             ): ThreadMessage[] => {
                 // Filter out messages that shouldn't be displayed
                 let processedThread: ThreadMessage[] = []
@@ -1984,11 +2438,11 @@ export const maxThreadLogic = kea<maxThreadLogicType>([
             },
         ],
 
-        threadMessageCount: [(s) => [s.threadRaw], (threadRaw) => threadRaw.length],
+        threadMessageCount: [(s) => [s.threadRaw], (threadRaw: ThreadMessage[]) => threadRaw.length],
 
         formPending: [
             (s) => [s.threadRaw],
-            (threadRaw) => {
+            (threadRaw: ThreadMessage[]) => {
                 const lastMessage = threadRaw[threadRaw.length - 1]
                 if (lastMessage && isAssistantMessage(lastMessage)) {
                     return !!lastMessage.meta?.form
@@ -1999,7 +2453,7 @@ export const maxThreadLogic = kea<maxThreadLogicType>([
 
         multiQuestionFormPending: [
             (s) => [s.threadRaw],
-            (threadRaw) => {
+            (threadRaw: ThreadMessage[]) => {
                 return threadEndsWithMultiQuestionForm(threadRaw)
             },
         ],
@@ -2007,7 +2461,7 @@ export const maxThreadLogic = kea<maxThreadLogicType>([
         // Returns the multi-question form data if one is pending
         activeMultiQuestionForm: [
             (s) => [s.threadRaw],
-            (threadRaw): MultiQuestionForm | null => {
+            (threadRaw: ThreadMessage[]): MultiQuestionForm | null => {
                 if (!threadEndsWithMultiQuestionForm(threadRaw)) {
                     return null
                 }
@@ -2026,7 +2480,17 @@ export const maxThreadLogic = kea<maxThreadLogicType>([
         // Returns the pending dangerous operation approval data if one is pending
         activeDangerousOperationApproval: [
             (s) => [s.pendingApprovalProposalId, s.pendingApprovalsData, s.resolvedApprovalStatuses],
-            (pendingApprovalProposalId, pendingApprovalsData, resolvedApprovalStatuses) => {
+            (
+                pendingApprovalProposalId: string | null,
+                pendingApprovalsData: Record<string, PendingApproval>,
+                resolvedApprovalStatuses: Record<
+                    string,
+                    {
+                        feedback?: string
+                        status: 'approved' | 'auto_rejected' | 'rejected'
+                    }
+                >
+            ) => {
                 if (!pendingApprovalProposalId || resolvedApprovalStatuses[pendingApprovalProposalId]?.status) {
                     return null
                 }
@@ -2056,14 +2520,20 @@ export const maxThreadLogic = kea<maxThreadLogicType>([
                 s.resolvedApprovalStatuses,
             ],
             (
-                formPending,
-                multiQuestionFormPending,
-                threadLoading,
-                dataProcessingAccepted,
-                isSharedThread,
-                isImpersonatingExistingConversation,
-                pendingApprovalProposalId,
-                resolvedApprovalStatuses
+                formPending: boolean,
+                multiQuestionFormPending: boolean,
+                threadLoading: boolean,
+                dataProcessingAccepted: boolean,
+                isSharedThread: boolean,
+                isImpersonatingExistingConversation: boolean,
+                pendingApprovalProposalId: string | null,
+                resolvedApprovalStatuses: Record<
+                    string,
+                    {
+                        feedback?: string
+                        status: 'approved' | 'auto_rejected' | 'rejected'
+                    }
+                >
             ) => {
                 // Check if there's an unresolved pending approval
                 const hasPendingApproval =
@@ -2089,11 +2559,11 @@ export const maxThreadLogic = kea<maxThreadLogicType>([
                 s.isImpersonatingExistingConversation,
             ],
             (
-                formPending,
-                multiQuestionFormPending,
-                threadLoading,
-                activeStreamingThreads,
-                isImpersonatingExistingConversation
+                formPending: boolean,
+                multiQuestionFormPending: boolean,
+                threadLoading: boolean,
+                activeStreamingThreads: number,
+                isImpersonatingExistingConversation: boolean
             ): string | undefined => {
                 // Allow users to cancel the generation
                 if (threadLoading) {
@@ -2124,7 +2594,11 @@ export const maxThreadLogic = kea<maxThreadLogicType>([
 
         submissionDisabledReason: [
             (s) => [s.contextDisabledReason, s.question, s.queueDisabledReason],
-            (contextDisabledReason, question, queueDisabledReason): string | undefined => {
+            (
+                contextDisabledReason: string | undefined,
+                question: string,
+                queueDisabledReason: string | undefined
+            ): string | undefined => {
                 // Context-related reasons take precedence (form pending, streaming, etc.)
                 if (contextDisabledReason) {
                     return contextDisabledReason
@@ -2165,7 +2639,7 @@ export const maxThreadLogic = kea<maxThreadLogicType>([
 
         showDeepResearchModeToggle: [
             (s) => [s.conversation, s.featureFlags],
-            (conversation, featureFlags) =>
+            (conversation: Conversation | null, featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet) =>
                 // if a conversation is already marked as research, or has already started (has title/is in progress), don't show the toggle
                 !!featureFlags[FEATURE_FLAGS.MAX_DEEP_RESEARCH] &&
                 conversation?.type !== ConversationType.DeepResearch &&
@@ -2175,7 +2649,7 @@ export const maxThreadLogic = kea<maxThreadLogicType>([
 
         showContextUI: [
             (s) => [s.conversation, s.featureFlags],
-            (conversation, featureFlags) =>
+            (conversation: Conversation | null, featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet) =>
                 featureFlags[FEATURE_FLAGS.MAX_DEEP_RESEARCH]
                     ? conversation?.type !== ConversationType.DeepResearch
                     : true,
diff --git a/frontend/src/scenes/max/messages/maxErrorTrackingWidgetLogic.ts b/frontend/src/scenes/max/messages/maxErrorTrackingWidgetLogic.ts
index 58c63bddf95d..2681c31ef51c 100644
--- a/frontend/src/scenes/max/messages/maxErrorTrackingWidgetLogic.ts
+++ b/frontend/src/scenes/max/messages/maxErrorTrackingWidgetLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, key, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, key, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { performQuery } from '~/queries/query'
@@ -8,13 +8,73 @@ import {
 } from '~/queries/schema/schema-assistant-error-tracking'
 import { ErrorTrackingQuery, NodeKind } from '~/queries/schema/schema-general'
 
-import type { maxErrorTrackingWidgetLogicType } from './maxErrorTrackingWidgetLogicType'
-
 export interface MaxErrorTrackingWidgetLogicProps {
     toolCallId: string
     filters: MaxErrorTrackingSearchResponse | null | undefined
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface maxErrorTrackingWidgetLogicValues {
+    hasMore: boolean
+    isLoading: boolean
+    issues: MaxErrorTrackingIssuePreview[]
+    moreIssuesResponse: {
+        hasMore: boolean
+        issues: MaxErrorTrackingIssuePreview[]
+        nextCursor: string | null
+    } | null
+    moreIssuesResponseLoading: boolean
+    nextCursor: string | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface maxErrorTrackingWidgetLogicActions {
+    loadMoreIssues: () => {
+        value: true
+    }
+    loadMoreIssuesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadMoreIssuesSuccess: (
+        moreIssuesResponse: {
+            hasMore: boolean
+            issues: MaxErrorTrackingIssuePreview[]
+            nextCursor: string | null
+        } | null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        moreIssuesResponse: {
+            hasMore: boolean
+            issues: MaxErrorTrackingIssuePreview[]
+            nextCursor: string | null
+        } | null
+        payload?: {
+            value: true
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface maxErrorTrackingWidgetLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        isLoading: (moreIssuesResponseLoading: boolean) => boolean
+    }
+}
+
+export type maxErrorTrackingWidgetLogicType = MakeLogicType<
+    maxErrorTrackingWidgetLogicValues,
+    maxErrorTrackingWidgetLogicActions,
+    MaxErrorTrackingWidgetLogicProps,
+    maxErrorTrackingWidgetLogicMeta
+>
+
 export const maxErrorTrackingWidgetLogic = kea<maxErrorTrackingWidgetLogicType>([
     path(['scenes', 'max', 'messages', 'maxErrorTrackingWidgetLogic']),
     props({} as MaxErrorTrackingWidgetLogicProps),
diff --git a/frontend/src/scenes/max/posthogAiContextLogic.tsx b/frontend/src/scenes/max/posthogAiContextLogic.tsx
index 03aeb5252b56..a004d8fda82c 100644
--- a/frontend/src/scenes/max/posthogAiContextLogic.tsx
+++ b/frontend/src/scenes/max/posthogAiContextLogic.tsx
@@ -1,4 +1,5 @@
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import type { BuiltLogic } from 'kea'
 import posthog from 'posthog-js'
 import type { ReactNode } from 'react'
 
@@ -8,7 +9,6 @@ import { IconAction, IconEvent } from 'lib/lemon-ui/icons'
 import { sceneLogic } from 'scenes/sceneLogic'
 
 import { AttachedContext, MaxContextInput, MaxContextType } from './maxTypes'
-import type { posthogAiContextLogicType } from './posthogAiContextLogicType'
 import { activeSceneLogicHasMaxContext } from './utils'
 
 export interface PosthogAiContextLogicProps {
@@ -73,6 +73,47 @@ function labelForItem(item: AttachedContext): string {
     return `${item.type} ${item.id ?? ''}`.trim()
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface posthogAiContextLogicValues {
+    activeSceneLogic: BuiltLogic | null; // sceneLogic
+    attachments: AttachedContext[];
+    chipsForDisplay: {
+        icon: ReactNode;
+        key: string;
+        label: string;
+    }[];
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface posthogAiContextLogicActions {
+    attach: (item: AttachedContext) => {
+        item: AttachedContext;
+    };
+    clearAttachments: () => {
+        value: true;
+    };
+    detach: (key: string) => {
+        key: string;
+    };
+    syncSceneAttachments: () => {
+        value: true;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface posthogAiContextLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        chipsForDisplay: (attachments: AttachedContext[]) => {
+            icon: ReactNode;
+            key: string;
+            label: string;
+        }[];
+    };
+}
+
+export type posthogAiContextLogicType = MakeLogicType<posthogAiContextLogicValues, posthogAiContextLogicActions, PosthogAiContextLogicProps, posthogAiContextLogicMeta>;
+
 /**
  * Sandbox-runtime context store. Holds one flat `attachments` reducer plus a scene-pull
  * listener that reads the existing scenes' `maxContext` selectors and projects their rich
@@ -121,7 +162,7 @@ export const posthogAiContextLogic = kea<posthogAiContextLogicType>([
             (s) => [s.attachments],
             // No onRemove closures here — removal dispatches `detach(key)` on the consumer's
             // bound instance, so chips stay instance-agnostic data.
-            (attachments): { key: string; label: string; icon: ReactNode }[] =>
+            (attachments: AttachedContext[]): { key: string; label: string; icon: ReactNode }[] =>
                 attachments.map((item) => ({
                     key: attachedContextKey(item),
                     label: labelForItem(item),
diff --git a/frontend/src/scenes/models/dagsLogic.ts b/frontend/src/scenes/models/dagsLogic.ts
index 6446f24b55d5..912805b6616b 100644
--- a/frontend/src/scenes/models/dagsLogic.ts
+++ b/frontend/src/scenes/models/dagsLogic.ts
@@ -1,4 +1,4 @@
-import { kea, listeners, path } from 'kea'
+import { MakeLogicType, kea, listeners, path } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -7,8 +7,6 @@ import api from 'lib/api'
 
 import { DataModelingDAG, DataModelingSyncInterval } from '~/types'
 
-import type { dagsLogicType } from './dagsLogicType'
-
 export const SYNC_FREQUENCY_OPTIONS: { value: DataModelingSyncInterval; label: string }[] = [
     { value: '15min', label: '15 minutes' },
     { value: '30min', label: '30 minutes' },
@@ -20,6 +18,63 @@ export const SYNC_FREQUENCY_OPTIONS: { value: DataModelingSyncInterval; label: s
     { value: '30day', label: 'Monthly' },
 ]
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dagsLogicValues {
+    dags: DataModelingDAG[]
+    dagsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dagsLogicActions {
+    deleteDag: (dag: DataModelingDAG) => DataModelingDAG
+    deleteDagFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteDagSuccess: (
+        dags: DataModelingDAG[],
+        payload?: DataModelingDAG
+    ) => {
+        dags: DataModelingDAG[]
+        payload?: DataModelingDAG
+    }
+    loadDags: () => any
+    loadDagsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadDagsSuccess: (
+        dags: DataModelingDAG[],
+        payload?: any
+    ) => {
+        dags: DataModelingDAG[]
+        payload?: any
+    }
+    updateDag: (dag: DataModelingDAG) => DataModelingDAG
+    updateDagFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateDagSuccess: (
+        dags: DataModelingDAG[],
+        payload?: DataModelingDAG
+    ) => {
+        dags: DataModelingDAG[]
+        payload?: DataModelingDAG
+    }
+}
+
+export type dagsLogicType = MakeLogicType<dagsLogicValues, dagsLogicActions>
+
 export const dagsLogic = kea<dagsLogicType>([
     path(['scenes', 'models', 'dagsLogic']),
     loaders(({ values }) => ({
diff --git a/frontend/src/scenes/models/modelsSceneLogic.ts b/frontend/src/scenes/models/modelsSceneLogic.ts
index 4b8409eef426..e41e2916d7c6 100644
--- a/frontend/src/scenes/models/modelsSceneLogic.ts
+++ b/frontend/src/scenes/models/modelsSceneLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, urlToAction } from 'kea-router'
 
@@ -8,12 +8,62 @@ import { urls } from 'scenes/urls'
 
 import { DataModelingNode } from '~/types'
 
-import type { modelsSceneLogicType } from './modelsSceneLogicType'
+import type { DataWarehouseSavedQuery } from '../../types'
 
 export const MODELS_SCENE_TABS = ['views', 'dags'] as const
 export type ModelsSceneTab = (typeof MODELS_SCENE_TABS)[number]
 export const DEFAULT_MODELS_SCENE_TAB: ModelsSceneTab = 'views'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface modelsSceneLogicValues {
+    dataWarehouseSavedQueries: DataWarehouseSavedQuery[] // dataWarehouseViewsLogic
+    dataWarehouseSavedQueriesLoading: boolean // dataWarehouseViewsLogic
+    currentTab: ModelsSceneTab
+    nodes: DataModelingNode[]
+    nodesLoading: boolean
+    savedQueryIdToNodeId: Record<string, string>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface modelsSceneLogicActions {
+    loadDataWarehouseSavedQueries: () => any // dataWarehouseViewsLogic
+    _setCurrentTab: (tab: ModelsSceneTab) => {
+        tab: 'dags' | 'views'
+    }
+    loadNodes: () => any
+    loadNodesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadNodesSuccess: (
+        nodes: DataModelingNode[],
+        payload?: any
+    ) => {
+        nodes: DataModelingNode[]
+        payload?: any
+    }
+    setCurrentTab: (tab: ModelsSceneTab) => {
+        tab: 'dags' | 'views'
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface modelsSceneLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        savedQueryIdToNodeId: (nodes: DataModelingNode[]) => Record<string, string>
+    }
+}
+
+export type modelsSceneLogicType = MakeLogicType<
+    modelsSceneLogicValues,
+    modelsSceneLogicActions,
+    Record<string, any>,
+    modelsSceneLogicMeta
+>
+
 export const modelsSceneLogic = kea<modelsSceneLogicType>([
     path(['scenes', 'models', 'modelsSceneLogic']),
     connect(() => ({
diff --git a/frontend/src/scenes/models/nodeDetailSceneLogic.ts b/frontend/src/scenes/models/nodeDetailSceneLogic.ts
index 5672d53b6554..e7d904f53f3f 100644
--- a/frontend/src/scenes/models/nodeDetailSceneLogic.ts
+++ b/frontend/src/scenes/models/nodeDetailSceneLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api, { CountedPaginatedResponse } from 'lib/api'
@@ -7,7 +7,7 @@ import { urls } from 'scenes/urls'
 
 import { Breadcrumb, DataModelingEdge, DataModelingJob, DataModelingNode, DataWarehouseSavedQuery } from '~/types'
 
-import type { nodeDetailSceneLogicType } from './nodeDetailSceneLogicType'
+import type { DataModelingNodeType } from '../../types'
 
 export interface NodeDetailSceneLogicProps {
     id: string
@@ -22,6 +22,179 @@ export interface LineageGraphData {
     currentNodeId: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface nodeDetailSceneLogicValues {
+    breadcrumbs: Breadcrumb[]
+    effectiveLastRunAt: string | null
+    effectiveLastRunStatus: string | null
+    hasMaterialization: boolean
+    jobsOffset: number
+    lineageGraph: LineageGraphData | null
+    lineageGraphLoading: boolean
+    lineageModalOpen: boolean
+    materializationJobs: CountedPaginatedResponse<DataModelingJob> | null
+    materializationJobsLoading: boolean
+    node: DataModelingNode | null
+    nodeLoading: boolean
+    nodeType: DataModelingNodeType | null
+    savedQuery: DataWarehouseSavedQuery | null
+    savedQueryLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface nodeDetailSceneLogicActions {
+    updateDataWarehouseSavedQuerySuccess: (
+        dataWarehouseSavedQueries: DataWarehouseSavedQuery[],
+        payload?:
+            | (Partial<DataWarehouseSavedQuery> & {
+                  edited_history_id?: string
+                  folder_id?: string | null
+                  id: string
+                  lifecycle?: string
+                  shouldRematerialize?: boolean
+                  soft_update?: boolean
+                  sync_frequency?: string
+                  types?: string[][]
+              })
+            | undefined
+    ) => {
+        dataWarehouseSavedQueries: DataWarehouseSavedQuery[]
+        payload?: Partial<DataWarehouseSavedQuery> & {
+            edited_history_id?: string
+            folder_id?: string | null
+            id: string
+            lifecycle?: string
+            shouldRematerialize?: boolean
+            soft_update?: boolean
+            sync_frequency?: string
+            types?: string[][]
+        }
+    } // dataWarehouseViewsLogic
+    closeLineageModal: () => {
+        value: true
+    }
+    loadLineageGraph: () => any
+    loadLineageGraphFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadLineageGraphSuccess: (
+        lineageGraph: {
+            currentNodeId: string
+            edges: DataModelingEdge[]
+            nodes: DataModelingNode[]
+        } | null,
+        payload?: any
+    ) => {
+        lineageGraph: {
+            currentNodeId: string
+            edges: DataModelingEdge[]
+            nodes: DataModelingNode[]
+        } | null
+        payload?: any
+    }
+    loadMaterializationJobs: () => any
+    loadMaterializationJobsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadMaterializationJobsSuccess: (
+        materializationJobs: CountedPaginatedResponse<DataModelingJob> | null,
+        payload?: any
+    ) => {
+        materializationJobs: CountedPaginatedResponse<DataModelingJob> | null
+        payload?: any
+    }
+    loadNode: () => any
+    loadNodeFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadNodeSuccess: (
+        node: DataModelingNode,
+        payload?: any
+    ) => {
+        node: DataModelingNode
+        payload?: any
+    }
+    loadSavedQuery: () => any
+    loadSavedQueryFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSavedQuerySuccess: (
+        savedQuery: DataWarehouseSavedQuery | null,
+        payload?: any
+    ) => {
+        savedQuery: DataWarehouseSavedQuery | null
+        payload?: any
+    }
+    openLineageModal: () => {
+        value: true
+    }
+    setJobsOffset: (offset: number) => {
+        offset: number
+    }
+    updateNodeDescription: (description: string) => {
+        description: string
+    }
+    updateNodeDescriptionFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateNodeDescriptionSuccess: (
+        node: DataModelingNode,
+        payload?: {
+            description: string
+        }
+    ) => {
+        node: DataModelingNode
+        payload?: {
+            description: string
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface nodeDetailSceneLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        breadcrumbs: (node: DataModelingNode | null) => Breadcrumb[]
+        nodeType: (node: DataModelingNode | null) => DataModelingNodeType | null
+        hasMaterialization: (node: DataModelingNode | null, savedQuery: DataWarehouseSavedQuery | null) => boolean
+        effectiveLastRunAt: (
+            node: DataModelingNode | null,
+            materializationJobs: CountedPaginatedResponse<DataModelingJob> | null
+        ) => string | null
+        effectiveLastRunStatus: (
+            node: DataModelingNode | null,
+            materializationJobs: CountedPaginatedResponse<DataModelingJob> | null
+        ) => string | null
+    }
+}
+
+export type nodeDetailSceneLogicType = MakeLogicType<
+    nodeDetailSceneLogicValues,
+    nodeDetailSceneLogicActions,
+    NodeDetailSceneLogicProps,
+    nodeDetailSceneLogicMeta
+>
+
 export const nodeDetailSceneLogic = kea<nodeDetailSceneLogicType>([
     props({} as NodeDetailSceneLogicProps),
     key((props) => props.id),
diff --git a/frontend/src/scenes/notebooks/AddExperimentsToNotebookModal/addExperimentsToNotebookModalLogic.ts b/frontend/src/scenes/notebooks/AddExperimentsToNotebookModal/addExperimentsToNotebookModalLogic.ts
index 05baced7bea9..e4819a24bfd5 100644
--- a/frontend/src/scenes/notebooks/AddExperimentsToNotebookModal/addExperimentsToNotebookModalLogic.ts
+++ b/frontend/src/scenes/notebooks/AddExperimentsToNotebookModal/addExperimentsToNotebookModalLogic.ts
@@ -73,9 +73,21 @@ export interface addExperimentsToNotebookModalLogicActions {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface addExperimentsToNotebookModalLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        filters: (rawModalFilters: ExperimentsModalFilters) => ExperimentsModalFilters
+        count: (experiments: CountedPaginatedResponse<Experiment>) => number
+        modalPage: (filters: ExperimentsModalFilters) => number
+        sorting: (filters: ExperimentsModalFilters) => Sorting | null
+    }
+}
+
 export type addExperimentsToNotebookModalLogicType = MakeLogicType<
     addExperimentsToNotebookModalLogicValues,
-    addExperimentsToNotebookModalLogicActions
+    addExperimentsToNotebookModalLogicActions,
+    Record<string, any>,
+    addExperimentsToNotebookModalLogicMeta
 >
 
 export const addExperimentsToNotebookModalLogic = kea<addExperimentsToNotebookModalLogicType>([
diff --git a/frontend/src/scenes/notebooks/Nodes/NotebookNodeFlagLogic.tsx b/frontend/src/scenes/notebooks/Nodes/NotebookNodeFlagLogic.tsx
index c34003097055..1fdd5e5b9c28 100644
--- a/frontend/src/scenes/notebooks/Nodes/NotebookNodeFlagLogic.tsx
+++ b/frontend/src/scenes/notebooks/Nodes/NotebookNodeFlagLogic.tsx
@@ -40,10 +40,26 @@ export interface notebookNodeFlagLogicActions {
     } // featureFlagLogic
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface notebookNodeFlagLogicMeta {
+    key: number | 'link' | 'new'
+    __keaTypeGenInternalSelectorTypes: {
+        shouldDisableInsertEarlyAccessFeature: (
+            featureFlag: FeatureFlagType,
+            hasEarlyAccessFeatures: boolean
+        ) => (nextNode: RichContentNode | null) => boolean
+        shouldDisableInsertSurvey: (
+            featureFlag: FeatureFlagType,
+            hasSurveys: boolean | null
+        ) => (nextNode: RichContentNode | null) => boolean
+    }
+}
+
 export type notebookNodeFlagLogicType = MakeLogicType<
     notebookNodeFlagLogicValues,
     notebookNodeFlagLogicActions,
-    NotebookNodeFlagLogicProps
+    NotebookNodeFlagLogicProps,
+    notebookNodeFlagLogicMeta
 >
 
 export const notebookNodeFlagLogic = kea<notebookNodeFlagLogicType>([
diff --git a/frontend/src/scenes/notebooks/Nodes/NotebookNodePersonFeed/notebookNodePersonFeedLogic.ts b/frontend/src/scenes/notebooks/Nodes/NotebookNodePersonFeed/notebookNodePersonFeedLogic.ts
index 217be703fd48..c6b2b2a545f4 100644
--- a/frontend/src/scenes/notebooks/Nodes/NotebookNodePersonFeed/notebookNodePersonFeedLogic.ts
+++ b/frontend/src/scenes/notebooks/Nodes/NotebookNodePersonFeed/notebookNodePersonFeedLogic.ts
@@ -84,10 +84,26 @@ export interface notebookNodePersonFeedLogicActions {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface notebookNodePersonFeedLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        canSummarize: (isCloudOrDev: boolean | undefined) => boolean
+        numSessionsWithRecording: (sessionIdsWithRecording: string[]) => number
+        numSummaries: (summaries: Record<string, SessionSummaryContent>) => number
+        summariesLoading: (sessionSummaryLoading: boolean) => boolean
+        numFailedSummaries: (summaryErrors: string[]) => number
+        numProcessedSessions: (numSummaries: number, numFailedSummaries: number) => number
+        progressText: (numProcessedSessions: number, numSessionsWithRecording: number) => string
+        sessionIdsWithRecording: (sessions: TimelineEntry[] | null) => string[]
+    }
+}
+
 export type notebookNodePersonFeedLogicType = MakeLogicType<
     notebookNodePersonFeedLogicValues,
     notebookNodePersonFeedLogicActions,
-    NotebookNodePersonFeedLogicProps
+    NotebookNodePersonFeedLogicProps,
+    notebookNodePersonFeedLogicMeta
 >
 
 export const notebookNodePersonFeedLogic = kea<notebookNodePersonFeedLogicType>([
diff --git a/frontend/src/scenes/notebooks/Nodes/NotebookNodePlaylist.tsx b/frontend/src/scenes/notebooks/Nodes/NotebookNodePlaylist.tsx
index 89d6dfb96052..f0b0e559340d 100644
--- a/frontend/src/scenes/notebooks/Nodes/NotebookNodePlaylist.tsx
+++ b/frontend/src/scenes/notebooks/Nodes/NotebookNodePlaylist.tsx
@@ -8,7 +8,7 @@ import { useOnMountEffect } from 'lib/hooks/useOnMountEffect'
 import { createPostHogWidgetNode } from 'scenes/notebooks/Nodes/NodeWrapper'
 import { RecordingsUniversalFiltersEmbed } from 'scenes/session-recordings/filters/RecordingsUniversalFiltersEmbed'
 import { sessionRecordingPlayerLogic } from 'scenes/session-recordings/player/sessionRecordingPlayerLogic'
-import { sessionRecordingPlayerLogicType } from 'scenes/session-recordings/player/sessionRecordingPlayerLogicType'
+import type { sessionRecordingPlayerLogicType } from 'scenes/session-recordings/player/sessionRecordingPlayerLogic'
 import { SessionRecordingsPlaylist } from 'scenes/session-recordings/playlist/SessionRecordingsPlaylist'
 import {
     DEFAULT_RECORDING_FILTERS,
diff --git a/frontend/src/scenes/notebooks/Nodes/NotebookNodeTaskCreate.tsx b/frontend/src/scenes/notebooks/Nodes/NotebookNodeTaskCreate.tsx
index 8e8a9543b04c..a26712ef5d97 100644
--- a/frontend/src/scenes/notebooks/Nodes/NotebookNodeTaskCreate.tsx
+++ b/frontend/src/scenes/notebooks/Nodes/NotebookNodeTaskCreate.tsx
@@ -8,7 +8,7 @@ import { createPostHogWidgetNode } from 'scenes/notebooks/Nodes/NodeWrapper'
 import { NotebookNodeProps, NotebookNodeType } from 'scenes/notebooks/types'
 
 import { tasksLogic } from 'products/posthog_ai/frontend/logics/tasksLogic'
-import { tasksLogicType } from 'products/posthog_ai/frontend/logics/tasksLogicType'
+import type { tasksLogicType } from 'products/posthog_ai/frontend/logics/tasksLogic'
 import { OriginProduct, TaskUpsertProps } from 'products/posthog_ai/frontend/types/taskTypes'
 
 import { notebookNodeLogic } from './notebookNodeLogic'
diff --git a/frontend/src/scenes/notebooks/Nodes/notebookNodeLogic.ts b/frontend/src/scenes/notebooks/Nodes/notebookNodeLogic.ts
index 6ea09064674f..4ac01089530c 100644
--- a/frontend/src/scenes/notebooks/Nodes/notebookNodeLogic.ts
+++ b/frontend/src/scenes/notebooks/Nodes/notebookNodeLogic.ts
@@ -1122,10 +1122,89 @@ export interface notebookNodeLogicActions {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface notebookNodeLogicMeta {
+    key: any
+    __keaTypeGenInternalSelectorTypes: {
+        notebookLogic: (notebookLogic: BuiltLogic<notebookLogicType>) => BuiltLogic<notebookLogicType>
+        nodeAttributes: (attributes: any) => NotebookNodeAttributes<any>
+        nodeId: (attributes: any) => string
+        nodeType: (nodeType: NotebookNodeType) => NotebookNodeType
+        Settings: (arg: any) => NotebookNodeSettings | null
+        settingsPlacement: (arg: any) => NotebookNodeSettingsPlacement
+        title: (titlePlaceholder: string, nodeAttributes: any) => any
+        children: (nodeAttributes: any) => NotebookNodeResource[]
+        exportedGlobals: (nodeAttributes: any) => {
+            name: string
+            type: string
+        }[]
+        pythonExecution: (nodeAttributes: any) => PythonExecutionResult | null
+        displayedGlobals: (
+            exportedGlobals: {
+                name: string
+                type: string
+            }[],
+            pythonExecution: PythonExecutionResult | null
+        ) => {
+            hogqlQuery?: string
+            name: string
+            type: string
+        }[]
+        pythonNodeIndex: (pythonNodeSummaries: PythonNodeSummary[], nodeId: string) => number
+        duckSqlNodeIndex: (duckSqlNodeSummaries: DuckSqlNodeSummary[], nodeId: string) => number
+        duckSqlReturnVariable: (
+            duckSqlNodeSummaries: DuckSqlNodeSummary[],
+            nodeId: string,
+            nodeAttributes: any
+        ) => string
+        hogqlSqlNodeIndex: (hogqlSqlNodeSummaries: HogqlSqlNodeSummary[], nodeId: string) => number
+        hogqlSqlReturnVariable: (
+            hogqlSqlNodeSummaries: HogqlSqlNodeSummary[],
+            nodeId: string,
+            nodeAttributes: any
+        ) => string
+        dataframeRowCount: (dataframeResult: NotebookDataframeResult | null) => number
+        duckSqlTablesUsed: (dependencyGraph: NotebookDependencyGraph, nodeId: string) => string[]
+        duckSqlUpstreamTableSources: (
+            dependencyGraph: NotebookDependencyGraph,
+            nodeId: string
+        ) => Record<string, NotebookDependencyUsage>
+        duckSqlReturnVariableUsage: (
+            dependencyGraph: NotebookDependencyGraph,
+            nodeId: string,
+            duckSqlReturnVariable: string
+        ) => NotebookDependencyUsage[]
+        hogqlReturnVariableUsage: (
+            dependencyGraph: NotebookDependencyGraph,
+            nodeId: string,
+            hogqlSqlReturnVariable: string
+        ) => NotebookDependencyUsage[]
+        sqlV2ReturnVariable: (sqlV2NodeSummaries: SqlV2NodeSummary[], nodeId: string, nodeAttributes: any) => string
+        sqlV2ReturnVariableUsage: (
+            dependencyGraph: NotebookDependencyGraph,
+            nodeId: string,
+            sqlV2ReturnVariable: string
+        ) => NotebookDependencyUsage[]
+        usageByVariable: (
+            dependencyGraph: NotebookDependencyGraph,
+            exportedGlobals: {
+                name: string
+                type: string
+            }[],
+            nodeId: string
+        ) => Record<string, NotebookDependencyUsage[]>
+        sendMessage: (
+            messageListeners: NotebookNodeMessagesListeners
+        ) => <T extends keyof NotebookNodeMessages>(message: T, payload: NotebookNodeMessages[T]) => boolean
+        sourceComment: (comments: CommentType[] | null, nodeId: string) => CommentType | null | undefined
+    }
+}
+
 export type notebookNodeLogicType = MakeLogicType<
     notebookNodeLogicValues,
     notebookNodeLogicActions,
-    NotebookNodeLogicProps
+    NotebookNodeLogicProps,
+    notebookNodeLogicMeta
 >
 
 export const notebookNodeLogic = kea<notebookNodeLogicType>([
diff --git a/frontend/src/scenes/notebooks/Nodes/notebookNodeSQLV2Logic.ts b/frontend/src/scenes/notebooks/Nodes/notebookNodeSQLV2Logic.ts
index e2740d294648..5f4d3fcbc792 100644
--- a/frontend/src/scenes/notebooks/Nodes/notebookNodeSQLV2Logic.ts
+++ b/frontend/src/scenes/notebooks/Nodes/notebookNodeSQLV2Logic.ts
@@ -86,74 +86,81 @@ export interface NotebookNodeSQLV2LogicProps {
 
 // Generated by kea-typegen. Update if you're an agent, ignore if you're human.
 export interface notebookNodeSQLV2LogicValues {
-    activeOperation: NotebookOperation | null // notebookOperationsLogic
-    isBusy: boolean // notebookOperationsLogic
-    isRunning: boolean
-    operationBlockReason: string | null
-    page: number
-    pageLoading: boolean
-    pageResult: NotebookNodeSQLV2Page | null
-    pageSize: number
-    runError: string | null
+    activeOperation: NotebookOperation | null; // notebookOperationsLogic
+    isBusy: boolean; // notebookOperationsLogic
+    isInterrupting: boolean;
+    isRunning: boolean;
+    operationBlockReason: string | null;
+    page: number;
+    pageLoading: boolean;
+    pageResult: NotebookNodeSQLV2Page | null;
+    pageSize: number;
+    runError: string | null;
 }
 
 // Generated by kea-typegen. Update if you're an agent, ignore if you're human.
 export interface notebookNodeSQLV2LogicActions {
     finishNodeOperations: (nodeId: string) => {
-        nodeId: string
-    } // notebookOperationsLogic
+        nodeId: string;
+    }; // notebookOperationsLogic
     finishOperation: (id: string) => {
-        id: string
-    } // notebookOperationsLogic
+        id: string;
+    }; // notebookOperationsLogic
     startOperation: (operation: NotebookOperation) => {
-        operation: NotebookOperation
-    } // notebookOperationsLogic
+        operation: NotebookOperation;
+    }; // notebookOperationsLogic
+    interruptRun: () => {
+        value: true;
+    };
     pollResult: (runId: string) => {
-        runId: string
-    }
+        runId: string;
+    };
     resetPaging: () => {
-        value: true
-    }
-    runQuery: (
-        code: string,
-        refs?: Record<string, SqlV2RunRef>,
-        opts?: RunQueryOptions
-    ) => {
-        code: string
-        opts: RunQueryOptions
-        refs: Record<string, SqlV2RunRef>
-    }
+        value: true;
+    };
+    runQuery: (code: string, refs?: Record<string, SqlV2RunRef>, opts?: RunQueryOptions) => {
+        code: string;
+        opts: RunQueryOptions;
+        refs: Record<string, SqlV2RunRef>;
+    };
+    setIsInterrupting: (isInterrupting: boolean) => {
+        isInterrupting: boolean;
+    };
     setIsRunning: (isRunning: boolean) => {
-        isRunning: boolean
-    }
+        isRunning: boolean;
+    };
     setPage: (page: number) => {
-        page: number
-    }
+        page: number;
+    };
     setPageLoading: (pageLoading: boolean) => {
-        pageLoading: boolean
-    }
+        pageLoading: boolean;
+    };
     setPageResult: (pageResult: NotebookNodeSQLV2Page | null) => {
-        pageResult: NotebookNodeSQLV2Page | null
-    }
+        pageResult: NotebookNodeSQLV2Page | null;
+    };
     setPageSize: (pageSize: number) => {
-        pageSize: number
-    }
+        pageSize: number;
+    };
     setRunError: (runError: string | null) => {
-        runError: string | null
-    }
+        runError: string | null;
+    };
     startPolling: (runId: string) => {
-        runId: string
-    }
+        runId: string;
+    };
     stopPolling: () => {
-        value: true
-    }
+        value: true;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface notebookNodeSQLV2LogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        operationBlockReason: (activeOperation: NotebookOperation | null) => string | null;
+    };
 }
 
-export type notebookNodeSQLV2LogicType = MakeLogicType<
-    notebookNodeSQLV2LogicValues,
-    notebookNodeSQLV2LogicActions,
-    NotebookNodeSQLV2LogicProps
->
+export type notebookNodeSQLV2LogicType = MakeLogicType<notebookNodeSQLV2LogicValues, notebookNodeSQLV2LogicActions, NotebookNodeSQLV2LogicProps, notebookNodeSQLV2LogicMeta>;
 
 export const notebookNodeSQLV2Logic = kea<notebookNodeSQLV2LogicType>([
     path((key) => ['scenes', 'notebooks', 'Nodes', 'notebookNodeSQLV2Logic', key]),
diff --git a/frontend/src/scenes/notebooks/Notebook/MarkdownNotebookInlineAI.tsx b/frontend/src/scenes/notebooks/Notebook/MarkdownNotebookInlineAI.tsx
index 388b84ae82fa..c131c0ab0acc 100644
--- a/frontend/src/scenes/notebooks/Notebook/MarkdownNotebookInlineAI.tsx
+++ b/frontend/src/scenes/notebooks/Notebook/MarkdownNotebookInlineAI.tsx
@@ -2,7 +2,7 @@ import { useActions, useMountedLogic, useValues } from 'kea'
 import { useContext, useEffect, useMemo, useRef } from 'react'
 
 import { maxLogic } from 'scenes/max/maxLogic'
-import type { maxLogicType } from 'scenes/max/maxLogicType'
+import type { maxLogicType } from 'scenes/max/maxLogic'
 import { MaxThreadLogicProps, ThreadMessage, maxThreadLogic } from 'scenes/max/maxThreadLogic'
 import type { MaxUIContext } from 'scenes/max/maxTypes'
 
diff --git a/frontend/src/scenes/notebooks/Notebook/notebookCollabLogic.ts b/frontend/src/scenes/notebooks/Notebook/notebookCollabLogic.ts
index 9d16010500b7..cbbfc6dcf0af 100644
--- a/frontend/src/scenes/notebooks/Notebook/notebookCollabLogic.ts
+++ b/frontend/src/scenes/notebooks/Notebook/notebookCollabLogic.ts
@@ -1,4 +1,5 @@
 import { EventSourceMessage } from '@microsoft/fetch-event-source'
+import type { Editor } from '@tiptap/core'
 import { getVersion, receiveTransaction, sendableSteps } from '@tiptap/pm/collab'
 import { Step } from '@tiptap/pm/transform'
 import { MakeLogicType, actions, beforeUnmount, kea, key, listeners, path, props, reducers, selectors } from 'kea'
@@ -11,7 +12,6 @@ import { getCurrentTeamId } from 'lib/utils/getAppContext'
 
 import { notebooksCollabPresenceCreate } from 'products/notebooks/frontend/generated/api'
 
-import type { Editor } from '../../../../../node_modules/.pnpm/@tiptap+core@3.20.6_@tiptap+pm@3.20.6/node_modules/@tiptap/core/dist/index'
 import {
     getNotebookRemoteParticipants,
     type NotebookRemoteParticipant,
@@ -150,10 +150,19 @@ export interface notebookCollabLogicProps {
     shortId: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface notebookCollabLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        remoteParticipants: (remotePresence: Record<string, ClientPresence>) => NotebookRemoteParticipant[]
+    }
+}
+
 export type notebookCollabLogicType = MakeLogicType<
     notebookCollabLogicValues,
     notebookCollabLogicActions,
-    notebookCollabLogicProps
+    notebookCollabLogicProps,
+    notebookCollabLogicMeta
 >
 
 export const notebookCollabLogic = kea<notebookCollabLogicType>([
diff --git a/frontend/src/scenes/notebooks/Notebook/notebookKernelInfoLogic.ts b/frontend/src/scenes/notebooks/Notebook/notebookKernelInfoLogic.ts
index 34ed7dbe0221..0cbf193e06fd 100644
--- a/frontend/src/scenes/notebooks/Notebook/notebookKernelInfoLogic.ts
+++ b/frontend/src/scenes/notebooks/Notebook/notebookKernelInfoLogic.ts
@@ -191,10 +191,44 @@ export interface notebookKernelInfoLogicActions {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface notebookKernelInfoLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        isRunning: (kernelInfo: NotebookKernelInfo | null) => boolean
+        statusInfo: (
+            kernelInfo: NotebookKernelInfo | null,
+            actionInFlight: KernelActionInFlight
+        ) => {
+            label: string
+            tone: 'danger' | 'default' | 'success' | 'warning'
+        } | null
+        isStarting: (kernelInfo: NotebookKernelInfo | null, actionInFlight: KernelActionInFlight) => boolean
+        isBusyStatus: (isStarting: boolean, actionInFlight: KernelActionInFlight) => boolean
+        hasActionInFlight: (actionInFlight: KernelActionInFlight) => boolean
+        isModalKernel: (kernelInfo: NotebookKernelInfo | null) => boolean
+        selectedCpu: (cpuIndex: number) => number
+        selectedMemory: (memoryIndex: number) => number
+        currentCpu: (kernelInfo: NotebookKernelInfo | null, selectedCpu: number) => number
+        currentMemory: (kernelInfo: NotebookKernelInfo | null, selectedMemory: number) => number
+        currentIdleTimeout: (kernelInfo: NotebookKernelInfo | null) => number
+        hasConfigChanges: (
+            kernelInfo: NotebookKernelInfo | null,
+            selectedCpu: number,
+            selectedMemory: number,
+            idleTimeoutSeconds: number,
+            currentCpu: number,
+            currentMemory: number,
+            currentIdleTimeout: number
+        ) => boolean
+    }
+}
+
 export type notebookKernelInfoLogicType = MakeLogicType<
     notebookKernelInfoLogicValues,
     notebookKernelInfoLogicActions,
-    NotebookKernelInfoLogicProps
+    NotebookKernelInfoLogicProps,
+    notebookKernelInfoLogicMeta
 >
 
 export const notebookKernelInfoLogic = kea<notebookKernelInfoLogicType>([
diff --git a/frontend/src/scenes/notebooks/Notebook/notebookLogic.ts b/frontend/src/scenes/notebooks/Notebook/notebookLogic.ts
index eb19cd7eae0a..efa7154704ed 100644
--- a/frontend/src/scenes/notebooks/Notebook/notebookLogic.ts
+++ b/frontend/src/scenes/notebooks/Notebook/notebookLogic.ts
@@ -1,4 +1,5 @@
 import { EventSourceMessage } from '@microsoft/fetch-event-source'
+import type { Range } from '@tiptap/core'
 import { sendableSteps } from '@tiptap/pm/collab'
 import {
     MakeLogicType,
@@ -73,7 +74,6 @@ import {
 import { notebooksCollabPresenceCreate } from 'products/notebooks/frontend/generated/api'
 import type { NotebookCollabCursorApi } from 'products/notebooks/frontend/generated/api.schemas'
 
-import type { Range } from '../../../../../node_modules/.pnpm/@tiptap+core@3.20.6_@tiptap+pm@3.20.6/node_modules/@tiptap/core/dist/index'
 import type { TTEditor } from '../../../lib/components/RichContentEditor/types'
 import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
 import type { UserType } from '../../../types'
@@ -409,7 +409,7 @@ export interface notebookLogicActions {
     } // commentsLogic
     setItemContext: (
         context: Record<string, any> | null,
-        callback?: (event: { sent: boolean }) => void
+        callback?: ((event: { sent: boolean }) => void) | undefined
     ) => {
         callback: ((event: { sent: boolean }) => void) | undefined
         context: Record<string, any> | null
@@ -436,7 +436,7 @@ export interface notebookLogicActions {
     } // notebooksModel
     openSidePanel: (
         tab: SidePanelTab,
-        options?: string
+        options?: string | undefined
     ) => {
         options: string | undefined
         tab: SidePanelTab
@@ -727,7 +727,119 @@ export interface notebookLogicActions {
     }
 }
 
-export type notebookLogicType = MakeLogicType<notebookLogicValues, notebookLogicActions, NotebookLogicProps>
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface notebookLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        canvasFiltersOverride: (arg: any) => any
+        shortId: (shortId: string) => string
+        mode: (arg: any) => NotebookLogicMode
+        isTemplate: (shortId: string) => boolean
+        isLocalOnly: (arg: any, isTemplate: boolean) => boolean
+        collabEnabled: (featureFlags: FeatureFlagsSet, isLocalOnly: boolean, content: JSONContent) => boolean
+        markdownRealtimeEnabled: (
+            arg: any,
+            mode: NotebookLogicMode,
+            isLocalOnly: boolean,
+            notebook: NotebookType | null,
+            content: JSONContent,
+            featureFlags: FeatureFlagsSet
+        ) => boolean
+        notebookMissing: (notebook: NotebookType | null, notebookLoading: boolean, mode: NotebookLogicMode) => boolean
+        markdownRemoteCarets: (
+            markdownRemotePresence: Record<string, NotebookRemotePresenceState>
+        ) => RemoteNotebookCaret[]
+        markdownRemoteParticipants: (
+            markdownRemotePresence: Record<string, NotebookRemotePresenceState>
+        ) => NotebookRemoteParticipant[]
+        notebookPresenceParticipants: (
+            user: UserType | null,
+            markdownRemoteParticipants: NotebookPresenceState[],
+            remoteParticipants: NotebookPresenceState[],
+            markdownAIPresenceActive: boolean
+        ) => NotebookPresenceParticipant[]
+        content: (
+            notebook: NotebookType | null,
+            localContent: JSONContent | null,
+            previewContent: JSONContent | null,
+            featureFlags: FeatureFlagsSet
+        ) => JSONContent
+        markdownEditorMarkdown: (content: JSONContent) => string
+        markdownEditorNodeId: (content: JSONContent) => string
+        markdownEditorValue: (markdownEditorDraft: string | null, markdownEditorMarkdown: string) => string
+        title: (notebook: NotebookType | null, content: JSONContent) => string
+        syncStatus: (
+            notebook: NotebookType | null,
+            notebookLoading: boolean,
+            localContent: JSONContent | null,
+            isLocalOnly: boolean,
+            previewContent: JSONContent | null
+        ) => NotebookSyncStatus
+        editingNodeLogics: (
+            editingNodeIds: Record<string, true>,
+            nodeLogics: Record<string, BuiltLogic<notebookNodeLogicType>>,
+            isShared: boolean
+        ) => any[]
+        editingNodeLogicsForLeft: (
+            editingNodeLogics: any[],
+            containerSize: 'medium' | 'small',
+            content: JSONContent
+        ) => BuiltLogic<notebookNodeLogicType>[]
+        findNodeLogic: (
+            nodeLogics: Record<string, BuiltLogic<notebookNodeLogicType>>
+        ) => (type: NotebookNodeType, attributes: Record<string, any>) => notebookNodeLogicType | null
+        findNodeLogicById: (nodeLogics: Record<string, BuiltLogic<notebookNodeLogicType>>) => (id: string) => any
+        nodeLogicsWithChildren: (
+            nodeLogics: Record<string, BuiltLogic<notebookNodeLogicType>>,
+            content: JSONContent
+        ) => any[]
+        pythonNodeSummaries: (content: JSONContent) => PythonNodeSummary[]
+        duckSqlNodeSummaries: (content: JSONContent) => DuckSqlNodeSummary[]
+        hogqlSqlNodeSummaries: (content: JSONContent) => HogqlSqlNodeSummary[]
+        sqlV2NodeSummaries: (content: JSONContent) => SqlV2NodeSummary[]
+        dependencyGraph: (content: JSONContent) => NotebookDependencyGraph
+        pythonNodeIndices: (content: JSONContent) => Map<string, number>
+        sqlNodeIndices: (content: JSONContent) => Map<string, number>
+        duckSqlNodeIndices: (content: JSONContent) => Map<string, number>
+        hogqlSqlNodeIndices: (content: JSONContent) => Map<string, number>
+        isShowingLeftColumn: (
+            editingNodeLogicsForLeft: BuiltLogic<notebookNodeLogicType>[],
+            showHistory: boolean,
+            showTableOfContents: boolean,
+            showKernelInfo: boolean,
+            containerSize: 'medium' | 'small',
+            content: JSONContent
+        ) => boolean
+        isEditable: (
+            shouldBeEditable: boolean,
+            previewContent: JSONContent | null,
+            notebook: NotebookType | null,
+            mode: NotebookLogicMode
+        ) => boolean
+        isShared: (arg: any) => boolean
+        cachedInsightsByShortId: (arg: any) => Record<string, InsightModel>
+        cachedInlineQueryResultsByNodeId: (arg: any) => Record<string, AnyResponseType>
+        getSharedCachedInsight: (
+            isShared: boolean,
+            cachedInsightsByShortId: Record<string, InsightModel>
+        ) => (shortId: string | null | undefined) => InsightModel | null
+        getSharedCachedInlineQueryResults: (
+            isShared: boolean,
+            cachedInlineQueryResultsByNodeId: Record<string, AnyResponseType>
+        ) => (nodeId: string | null | undefined) => AnyResponseType | null
+        insightShortIdsInNotebook: (content: JSONContent) => any[] | undefined
+        experimentIdsInNotebook: (content: JSONContent) => number[]
+        personUUIDFromCanvasOverride: (arg: any) => string | null
+        activeCommentMarkId: (selectedCommentId: string | null, comments: CommentType[] | null) => string | null
+    }
+}
+
+export type notebookLogicType = MakeLogicType<
+    notebookLogicValues,
+    notebookLogicActions,
+    NotebookLogicProps,
+    notebookLogicMeta
+>
 
 export const notebookLogic = kea<notebookLogicType>([
     props({} as NotebookLogicProps),
diff --git a/frontend/src/scenes/notebooks/Notebook/notebookOperationsLogic.ts b/frontend/src/scenes/notebooks/Notebook/notebookOperationsLogic.ts
index fb31217a755c..5cd3559702d0 100644
--- a/frontend/src/scenes/notebooks/Notebook/notebookOperationsLogic.ts
+++ b/frontend/src/scenes/notebooks/Notebook/notebookOperationsLogic.ts
@@ -31,10 +31,20 @@ export interface notebookOperationsLogicActions {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface notebookOperationsLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        activeOperation: (operations: Record<string, NotebookOperation>) => NotebookOperation | null
+        isBusy: (operations: Record<string, NotebookOperation>) => boolean
+    }
+}
+
 export type notebookOperationsLogicType = MakeLogicType<
     notebookOperationsLogicValues,
     notebookOperationsLogicActions,
-    NotebookOperationsLogicProps
+    NotebookOperationsLogicProps,
+    notebookOperationsLogicMeta
 >
 
 /**
diff --git a/frontend/src/scenes/notebooks/NotebookPanel/notebookPanelLogic.ts b/frontend/src/scenes/notebooks/NotebookPanel/notebookPanelLogic.ts
index ac517958a68d..86645114c35b 100644
--- a/frontend/src/scenes/notebooks/NotebookPanel/notebookPanelLogic.ts
+++ b/frontend/src/scenes/notebooks/NotebookPanel/notebookPanelLogic.ts
@@ -1,3 +1,4 @@
+import type { FocusPosition } from '@tiptap/core'
 import { MakeLogicType, actions, beforeUnmount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { HTMLProps } from 'react'
 
@@ -7,7 +8,6 @@ import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
 import { sidePanelStateLogic } from '~/layout/navigation-3000/sidepanel/sidePanelStateLogic'
 import { SidePanelTab } from '~/types'
 
-import type { FocusPosition } from '../../../../../node_modules/.pnpm/@tiptap+core@3.20.6_@tiptap+pm@3.20.6/node_modules/@tiptap/core/dist/index'
 import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
 import { NotebookNodeResource } from '../types'
 
@@ -26,12 +26,12 @@ export interface notebookPanelLogicValues {
 
 // Generated by kea-typegen. Update if you're an agent, ignore if you're human.
 export interface notebookPanelLogicActions {
-    closeSidePanel: (tab?: SidePanelTab) => {
+    closeSidePanel: (tab?: SidePanelTab | undefined) => {
         tab: SidePanelTab | undefined
     } // sidePanelStateLogic
     openSidePanel: (
         tab: SidePanelTab,
-        options?: string
+        options?: string | undefined
     ) => {
         options: string | undefined
         tab: SidePanelTab
@@ -61,7 +61,20 @@ export interface notebookPanelLogicActions {
     }
 }
 
-export type notebookPanelLogicType = MakeLogicType<notebookPanelLogicValues, notebookPanelLogicActions>
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface notebookPanelLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        visibility: (selectedTab: SidePanelTab | null, sidePanelOpen: boolean) => 'hidden' | 'visible'
+        dropProperties: (dropMode: boolean) => Pick<HTMLProps<HTMLDivElement>, 'onDragEnter' | 'onDragLeave' | 'style'>
+    }
+}
+
+export type notebookPanelLogicType = MakeLogicType<
+    notebookPanelLogicValues,
+    notebookPanelLogicActions,
+    Record<string, any>,
+    notebookPanelLogicMeta
+>
 
 export const notebookPanelLogic = kea<notebookPanelLogicType>([
     path(['scenes', 'notebooks', 'Notebook', 'notebookPanelLogic']),
diff --git a/frontend/src/scenes/notebooks/NotebookSelectButton/notebookSelectButtonLogic.ts b/frontend/src/scenes/notebooks/NotebookSelectButton/notebookSelectButtonLogic.ts
index ddf1798c1bec..70eecba05696 100644
--- a/frontend/src/scenes/notebooks/NotebookSelectButton/notebookSelectButtonLogic.ts
+++ b/frontend/src/scenes/notebooks/NotebookSelectButton/notebookSelectButtonLogic.ts
@@ -85,10 +85,23 @@ export interface notebookSelectButtonLogicActions {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface notebookSelectButtonLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        notebooksNotContainingResource: (
+            allNotebooks: NotebookListItemType[],
+            notebooksContainingResource: NotebookListItemType[]
+        ) => NotebookListItemType[]
+        notebooksLoading: (allNotebooksLoading: boolean, notebooksContainingResourceLoading: boolean) => boolean
+    }
+}
+
 export type notebookSelectButtonLogicType = MakeLogicType<
     notebookSelectButtonLogicValues,
     notebookSelectButtonLogicActions,
-    NotebookSelectButtonLogicProps
+    NotebookSelectButtonLogicProps,
+    notebookSelectButtonLogicMeta
 >
 
 export const notebookSelectButtonLogic = kea<notebookSelectButtonLogicType>([
diff --git a/frontend/src/scenes/notebooks/NotebooksTable/notebooksTableLogic.ts b/frontend/src/scenes/notebooks/NotebooksTable/notebooksTableLogic.ts
index 4f6f4cf49d90..0e13cf846977 100644
--- a/frontend/src/scenes/notebooks/NotebooksTable/notebooksTableLogic.ts
+++ b/frontend/src/scenes/notebooks/NotebooksTable/notebooksTableLogic.ts
@@ -49,10 +49,12 @@ export interface notebooksTableLogicValues {
 export interface notebooksTableLogicActions {
     deleteNotebookSuccess: (
         notebooks: NotebookListItemType[],
-        payload?: {
-            shortId: string
-            title: string | undefined
-        }
+        payload?:
+            | {
+                  shortId: string
+                  title: string | undefined
+              }
+            | undefined
     ) => {
         notebooks: NotebookListItemType[]
         payload?: {
@@ -92,7 +94,28 @@ export interface notebooksTableLogicActions {
     }
 }
 
-export type notebooksTableLogicType = MakeLogicType<notebooksTableLogicValues, notebooksTableLogicActions>
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface notebooksTableLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        notebooksAndTemplates: (
+            notebooks: NotebookListItemType[],
+            notebookTemplates: NotebookType[],
+            filters: NotebooksListFilters
+        ) => NotebookListItemType[]
+        notebooks: (notebooksResponse: CountedPaginatedResponse<NotebookListItemType> | null) => NotebookListItemType[]
+        pagination: (
+            page: number,
+            notebooksResponse: CountedPaginatedResponse<NotebookListItemType> | null
+        ) => PaginationManual
+    }
+}
+
+export type notebooksTableLogicType = MakeLogicType<
+    notebooksTableLogicValues,
+    notebooksTableLogicActions,
+    Record<string, any>,
+    notebooksTableLogicMeta
+>
 
 export const notebooksTableLogic = kea<notebooksTableLogicType>([
     path(['scenes', 'notebooks', 'NotebooksTable', 'notebooksTableLogic']),
diff --git a/frontend/src/scenes/notebooks/Suggestions/insertionSuggestionsLogic.ts b/frontend/src/scenes/notebooks/Suggestions/insertionSuggestionsLogic.ts
index c2a118077539..09ede8444176 100644
--- a/frontend/src/scenes/notebooks/Suggestions/insertionSuggestionsLogic.ts
+++ b/frontend/src/scenes/notebooks/Suggestions/insertionSuggestionsLogic.ts
@@ -35,9 +35,21 @@ export interface insertionSuggestionsLogicActions {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insertionSuggestionsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        activeSuggestion: (
+            suggestions: InsertionSuggestion[],
+            previousNode: RichContentNode | null
+        ) => InsertionSuggestion
+    }
+}
+
 export type insertionSuggestionsLogicType = MakeLogicType<
     insertionSuggestionsLogicValues,
-    insertionSuggestionsLogicActions
+    insertionSuggestionsLogicActions,
+    Record<string, any>,
+    insertionSuggestionsLogicMeta
 >
 
 export const insertionSuggestionsLogic = kea<insertionSuggestionsLogicType>([
diff --git a/frontend/src/scenes/notebooks/notebookSceneLogic.ts b/frontend/src/scenes/notebooks/notebookSceneLogic.ts
index 151131fd6b05..a739a9ff4d53 100644
--- a/frontend/src/scenes/notebooks/notebookSceneLogic.ts
+++ b/frontend/src/scenes/notebooks/notebookSceneLogic.ts
@@ -37,10 +37,10 @@ export interface notebookSceneLogicActions {
     } // notebookLogic
     createNotebook: (
         location: NotebookTarget,
-        title?: string,
-        content?: JSONContent[],
-        onCreate?: (notebook: BuiltLogic<notebookLogicType>) => void,
-        shortId?: string
+        title?: string | undefined,
+        content?: JSONContent[] | undefined,
+        onCreate?: ((notebook: BuiltLogic<notebookLogicType>) => void) | undefined,
+        shortId?: string | undefined
     ) => {
         content: JSONContent[] | undefined
         location: NotebookTarget
@@ -50,10 +50,23 @@ export interface notebookSceneLogicActions {
     } // notebooksModel
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface notebookSceneLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        notebookId: (shortId: string) => string
+        loading: (notebookLoading: boolean, notebooksLoading: boolean) => boolean
+        breadcrumbs: (notebook: NotebookType | null, loading: boolean) => Breadcrumb[]
+        projectTreeRef: (arg: string) => ProjectTreeRef | null
+        sidePanelContext: (notebookId: string, isLocalOnly: boolean) => SidePanelSceneContext | null
+    }
+}
+
 export type notebookSceneLogicType = MakeLogicType<
     notebookSceneLogicValues,
     notebookSceneLogicActions,
-    NotebookSceneLogicProps
+    NotebookSceneLogicProps,
+    notebookSceneLogicMeta
 >
 
 export const notebookSceneLogic = kea<notebookSceneLogicType>([
diff --git a/frontend/src/scenes/oauth/oauthAuthorizeLogic.ts b/frontend/src/scenes/oauth/oauthAuthorizeLogic.ts
index 830405645037..876662621f2f 100644
--- a/frontend/src/scenes/oauth/oauthAuthorizeLogic.ts
+++ b/frontend/src/scenes/oauth/oauthAuthorizeLogic.ts
@@ -1,5 +1,6 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { router, urlToAction } from 'kea-router'
 
@@ -11,8 +12,6 @@ import { userLogic } from 'scenes/userLogic'
 
 import type { OAuthApplicationPublicMetadata, OrganizationBasicType, TeamBasicType, UserType } from '~/types'
 
-import type { oauthAuthorizeLogicType } from './oauthAuthorizeLogicType'
-
 export type OAuthAuthorizationFormValues = {
     scoped_organizations: number[]
     scoped_teams: number[]
@@ -146,6 +145,220 @@ const oauthAuthorize = async (
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface oauthAuthorizeLogicValues {
+    user: UserType | null // userLogic
+    adjustableScopeRows: OAuthScopeRow[]
+    allOrganizations: OrganizationBasicType[]
+    allScopesRequired: boolean
+    allTeams: TeamBasicType[] | null
+    allTeamsLoading: boolean
+    authorizationComplete: boolean
+    consentResourceScopes: string[]
+    effectiveScopes: string[]
+    filteredTeams: TeamBasicType[] | null
+    identityScopeDescriptions: string[]
+    isCanceling: boolean
+    isMcpResource: boolean
+    isOauthAuthorizationSubmitting: boolean
+    isOauthAuthorizationValid: boolean
+    isRedirecting: boolean
+    newProjectLoading: boolean
+    oauthApplication: OAuthApplicationPublicMetadata | null
+    oauthApplicationLoading: boolean
+    oauthAuthorization: OAuthAuthorizationFormValues
+    oauthAuthorizationAllErrors: Record<string, any>
+    oauthAuthorizationChanged: boolean
+    oauthAuthorizationErrors: DeepPartialMap<OAuthAuthorizationFormValues, ValidationErrorType>
+    oauthAuthorizationHasErrors: boolean
+    oauthAuthorizationManualErrors: Record<string, any>
+    oauthAuthorizationTouched: boolean
+    oauthAuthorizationTouches: Record<string, boolean>
+    oauthAuthorizationValidationErrors: DeepPartialMap<OAuthAuthorizationFormValues, ValidationErrorType>
+    redirectDomain: string
+    redirectUrl: string
+    requiredAccessLevel: 'organization' | 'team' | null
+    requiredScopeLevels: Map<string, RequiredLevel>
+    requiredScopeRows: OAuthScopeRow[]
+    scopeAccessSelections: {
+        bulk: ScopeAccessLevel | null
+        overrides: Record<string, ScopeAccessLevel>
+    }
+    scopeRows: OAuthScopeRow[]
+    scopes: string[]
+    scopesWereDefaulted: boolean
+    selectedOrganization: string | null
+    showCreateProject: boolean
+    showOauthAuthorizationErrors: boolean
+    showReadOnlyBulkAction: boolean
+    sortedTeams: TeamBasicType[] | null
+    teamHint: number | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface oauthAuthorizeLogicActions {
+    cancel: () => {}
+    createNewProject: (name: string) => {
+        name: string
+    }
+    loadAllTeams: () => any
+    loadAllTeamsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAllTeamsSuccess: (
+        allTeams: TeamBasicType[],
+        payload?: any
+    ) => {
+        allTeams: TeamBasicType[]
+        payload?: any
+    }
+    loadOAuthApplication: () => any
+    loadOAuthApplicationFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadOAuthApplicationSuccess: (
+        oauthApplication: OAuthApplicationPublicMetadata | null,
+        payload?: any
+    ) => {
+        oauthApplication: OAuthApplicationPublicMetadata | null
+        payload?: any
+    }
+    resetOauthAuthorization: (values?: OAuthAuthorizationFormValues) => {
+        values?: OAuthAuthorizationFormValues
+    }
+    setAllScopeAccess: (level: ScopeAccessLevel) => {
+        level: ScopeAccessLevel
+    }
+    setAuthorizationComplete: (complete: boolean) => {
+        complete: boolean
+    }
+    setCanceling: (canceling: boolean) => {
+        canceling: boolean
+    }
+    setIsMcpResource: (isMcpResource: boolean) => {
+        isMcpResource: boolean
+    }
+    setNewProjectLoading: (loading: boolean) => {
+        loading: boolean
+    }
+    setOauthAuthorizationManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setOauthAuthorizationValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setOauthAuthorizationValues: (values: DeepPartial<OAuthAuthorizationFormValues>) => {
+        values: DeepPartial<OAuthAuthorizationFormValues>
+    }
+    setRedirecting: (redirectUrl: string) => {
+        redirectUrl: string
+    }
+    setRequiredAccessLevel: (requiredAccessLevel: 'organization' | 'team' | null) => {
+        requiredAccessLevel: 'organization' | 'team' | null
+    }
+    setScopeAccess: (
+        scopeObject: string,
+        level: ScopeAccessLevel
+    ) => {
+        level: ScopeAccessLevel
+        scopeObject: string
+    }
+    setScopes: (scopes: string[]) => {
+        scopes: string[]
+    }
+    setScopesWereDefaulted: (scopesWereDefaulted: boolean) => {
+        scopesWereDefaulted: boolean
+    }
+    setSelectedOrganization: (
+        organizationId: string,
+        preferredTeamId?: number
+    ) => {
+        organizationId: string
+        preferredTeamId: number | undefined
+    }
+    setShowCreateProject: (show: boolean) => {
+        show: boolean
+    }
+    setTeamHint: (teamId: number | null) => {
+        teamId: number | null
+    }
+    submitOauthAuthorization: () => {
+        value: boolean
+    }
+    submitOauthAuthorizationFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitOauthAuthorizationRequest: (oauthAuthorization: OAuthAuthorizationFormValues) => {
+        oauthAuthorization: OAuthAuthorizationFormValues
+    }
+    submitOauthAuthorizationSuccess: (oauthAuthorization: OAuthAuthorizationFormValues) => {
+        oauthAuthorization: OAuthAuthorizationFormValues
+    }
+    touchOauthAuthorizationField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface oauthAuthorizeLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        allOrganizations: (user: UserType | null) => OrganizationBasicType[]
+        sortedTeams: (
+            allTeams: TeamBasicType[] | null,
+            allOrganizations: OrganizationBasicType[],
+            user: UserType | null
+        ) => TeamBasicType[] | null
+        filteredTeams: (
+            sortedTeams: TeamBasicType[] | null,
+            selectedOrganization: string | null
+        ) => TeamBasicType[] | null
+        identityScopeDescriptions: (scopes: string[]) => string[]
+        requiredScopeLevels: (oauthApplication: OAuthApplicationPublicMetadata | null) => Map<string, RequiredLevel>
+        consentResourceScopes: (scopes: string[], oauthApplication: OAuthApplicationPublicMetadata | null) => string[]
+        scopeRows: (
+            consentResourceScopes: string[],
+            scopeAccessSelections: {
+                bulk: ScopeAccessLevel | null
+                overrides: Record<string, ScopeAccessLevel>
+            },
+            requiredScopeLevels: Map<string, RequiredLevel>
+        ) => OAuthScopeRow[]
+        requiredScopeRows: (scopeRows: OAuthScopeRow[]) => OAuthScopeRow[]
+        adjustableScopeRows: (scopeRows: OAuthScopeRow[]) => OAuthScopeRow[]
+        allScopesRequired: (scopeRows: OAuthScopeRow[]) => boolean
+        showReadOnlyBulkAction: (adjustableScopeRows: OAuthScopeRow[]) => boolean
+        effectiveScopes: (
+            scopes: string[],
+            scopeRows: OAuthScopeRow[],
+            oauthApplication: OAuthApplicationPublicMetadata | null
+        ) => string[]
+        redirectDomain: (oauthApplication: OAuthApplicationPublicMetadata | null) => string
+    }
+}
+
+export type oauthAuthorizeLogicType = MakeLogicType<
+    oauthAuthorizeLogicValues,
+    oauthAuthorizeLogicActions,
+    Record<string, any>,
+    oauthAuthorizeLogicMeta
+>
+
 export const oauthAuthorizeLogic = kea<oauthAuthorizeLogicType>([
     path(['oauth', 'authorize']),
     connect(() => ({
diff --git a/frontend/src/scenes/onboarding/legacy/error-tracking/onboardingErrorTrackingAlertsLogic.ts b/frontend/src/scenes/onboarding/legacy/error-tracking/onboardingErrorTrackingAlertsLogic.ts
index a13d5edcea64..944a3c4a0ea7 100644
--- a/frontend/src/scenes/onboarding/legacy/error-tracking/onboardingErrorTrackingAlertsLogic.ts
+++ b/frontend/src/scenes/onboarding/legacy/error-tracking/onboardingErrorTrackingAlertsLogic.ts
@@ -1,5 +1,6 @@
-import { actions, afterMount, connect, kea, path, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, path, reducers } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { router } from 'kea-router'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -9,8 +10,8 @@ import { integrationsLogic } from 'lib/integrations/integrationsLogic'
 
 import { HogFunctionConfigurationType } from '~/types'
 
+import type { IntegrationType } from '../../../../types'
 import { onboardingLogic } from '../onboardingLogic'
-import type { onboardingErrorTrackingAlertsLogicType } from './onboardingErrorTrackingAlertsLogicType'
 
 export type ErrorTrackingAlertIntegrationType = 'slack' | 'microsoft-teams' | 'discord'
 
@@ -59,6 +60,138 @@ const DEFAULT_SLACK_INPUTS: Record<string, any> = {
     text: { value: 'New issue created: {event.properties.name}' },
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface onboardingErrorTrackingAlertsLogicValues {
+    slackAvailable: boolean | undefined // integrationsLogic
+    slackIntegrations: IntegrationType[] | undefined // integrationsLogic
+    connectionConfig: {
+        discordWebhookUrl: string | undefined
+        microsoftTeamsWebhookUrl: string | undefined
+        slackChannelId: string | undefined
+        slackWorkspaceId: number | undefined
+    }
+    connectionConfigAllErrors: Record<string, any>
+    connectionConfigChanged: boolean
+    connectionConfigErrors: DeepPartialMap<
+        {
+            discordWebhookUrl: string | undefined
+            microsoftTeamsWebhookUrl: string | undefined
+            slackChannelId: string | undefined
+            slackWorkspaceId: number | undefined
+        },
+        ValidationErrorType
+    >
+    connectionConfigHasErrors: boolean
+    connectionConfigManualErrors: Record<string, any>
+    connectionConfigTouched: boolean
+    connectionConfigTouches: Record<string, boolean>
+    connectionConfigValidationErrors: DeepPartialMap<
+        {
+            discordWebhookUrl: string | undefined
+            microsoftTeamsWebhookUrl: string | undefined
+            slackChannelId: string | undefined
+            slackWorkspaceId: number | undefined
+        },
+        ValidationErrorType
+    >
+    integration: ErrorTrackingAlertIntegrationType | null
+    isConnectionConfigSubmitting: boolean
+    isConnectionConfigValid: boolean
+    showConnectionConfigErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface onboardingErrorTrackingAlertsLogicActions {
+    goToNextStep: () => {
+        value: true
+    } // onboardingLogic
+    resetConnectionConfig: (values?: {
+        discordWebhookUrl: string | undefined
+        microsoftTeamsWebhookUrl: string | undefined
+        slackChannelId: string | undefined
+        slackWorkspaceId: number | undefined
+    }) => {
+        values?: {
+            discordWebhookUrl: string | undefined
+            microsoftTeamsWebhookUrl: string | undefined
+            slackChannelId: string | undefined
+            slackWorkspaceId: number | undefined
+        }
+    }
+    setConnectionConfigManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setConnectionConfigValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setConnectionConfigValues: (
+        values: DeepPartial<{
+            discordWebhookUrl: string | undefined
+            microsoftTeamsWebhookUrl: string | undefined
+            slackChannelId: string | undefined
+            slackWorkspaceId: number | undefined
+        }>
+    ) => {
+        values: DeepPartial<{
+            discordWebhookUrl: string | undefined
+            microsoftTeamsWebhookUrl: string | undefined
+            slackChannelId: string | undefined
+            slackWorkspaceId: number | undefined
+        }>
+    }
+    setIntegration: (integration: ErrorTrackingAlertIntegrationType | null) => {
+        integration: ErrorTrackingAlertIntegrationType | null
+    }
+    submitConnectionConfig: () => {
+        value: boolean
+    }
+    submitConnectionConfigFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitConnectionConfigRequest: (connectionConfig: {
+        discordWebhookUrl: string | undefined
+        microsoftTeamsWebhookUrl: string | undefined
+        slackChannelId: string | undefined
+        slackWorkspaceId: number | undefined
+    }) => {
+        connectionConfig: {
+            discordWebhookUrl: string | undefined
+            microsoftTeamsWebhookUrl: string | undefined
+            slackChannelId: string | undefined
+            slackWorkspaceId: number | undefined
+        }
+    }
+    submitConnectionConfigSuccess: (connectionConfig: {
+        discordWebhookUrl: string | undefined
+        microsoftTeamsWebhookUrl: string | undefined
+        slackChannelId: string | undefined
+        slackWorkspaceId: number | undefined
+    }) => {
+        connectionConfig: {
+            discordWebhookUrl: string | undefined
+            microsoftTeamsWebhookUrl: string | undefined
+            slackChannelId: string | undefined
+            slackWorkspaceId: number | undefined
+        }
+    }
+    touchConnectionConfigField: (key: string) => {
+        key: string
+    }
+}
+
+export type onboardingErrorTrackingAlertsLogicType = MakeLogicType<
+    onboardingErrorTrackingAlertsLogicValues,
+    onboardingErrorTrackingAlertsLogicActions
+>
+
 export const onboardingErrorTrackingAlertsLogic = kea<onboardingErrorTrackingAlertsLogicType>([
     path(['scenes', 'onboarding', 'error-tracking', 'onboardingErrorTrackingAlertsLogic']),
     connect(() => ({
diff --git a/frontend/src/scenes/onboarding/legacy/error-tracking/source-maps/sourceMapsStepLogic.ts b/frontend/src/scenes/onboarding/legacy/error-tracking/source-maps/sourceMapsStepLogic.ts
index 87ddd22227e2..429b6832d7fd 100644
--- a/frontend/src/scenes/onboarding/legacy/error-tracking/source-maps/sourceMapsStepLogic.ts
+++ b/frontend/src/scenes/onboarding/legacy/error-tracking/source-maps/sourceMapsStepLogic.ts
@@ -1,13 +1,69 @@
-import { actions, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
 import { ErrorTrackingSymbolSet } from 'lib/components/Errors/types'
 
-import type { sourceMapsStepLogicType } from './sourceMapsStepLogicType'
-
 export type SourceMapOption = 'cli' | 'no-minification' | 'public-source-maps' | string
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sourceMapsStepLogicValues {
+    hasSourceMap: boolean
+    instructionsModalOpen: boolean
+    lastSymbolSet: ErrorTrackingSymbolSet | null
+    lastSymbolSetLoading: boolean
+    selectedOption: SourceMapOption | null
+    shouldShowContinue: boolean
+    shouldShowSourceMapStatus: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sourceMapsStepLogicActions {
+    loadLastSymbolSet: () => {
+        value: true
+    }
+    loadLastSymbolSetFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadLastSymbolSetSuccess: (
+        lastSymbolSet: ErrorTrackingSymbolSet,
+        payload?: {
+            value: true
+        }
+    ) => {
+        lastSymbolSet: ErrorTrackingSymbolSet
+        payload?: {
+            value: true
+        }
+    }
+    setInstructionsModalOpen: (open: boolean) => {
+        open: boolean
+    }
+    setSelectedOption: (option: SourceMapOption | null) => {
+        option: string | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sourceMapsStepLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        hasSourceMap: (lastSymbolSet: ErrorTrackingSymbolSet | null) => boolean
+        shouldShowContinue: (hasSourceMap: boolean, selectedOption: string | null) => boolean
+        shouldShowSourceMapStatus: (selectedOption: string | null) => boolean
+    }
+}
+
+export type sourceMapsStepLogicType = MakeLogicType<
+    sourceMapsStepLogicValues,
+    sourceMapsStepLogicActions,
+    Record<string, any>,
+    sourceMapsStepLogicMeta
+>
+
 export const sourceMapsStepLogic = kea<sourceMapsStepLogicType>([
     path(['scenes', 'onboarding', 'error-tracking', 'source-maps', 'sourceMapsStepLogic']),
 
diff --git a/frontend/src/scenes/onboarding/legacy/exit/onboardingExitLogic.ts b/frontend/src/scenes/onboarding/legacy/exit/onboardingExitLogic.ts
index 81a6fb7b734b..19c81b6c7c38 100644
--- a/frontend/src/scenes/onboarding/legacy/exit/onboardingExitLogic.ts
+++ b/frontend/src/scenes/onboarding/legacy/exit/onboardingExitLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { router } from 'kea-router'
 import posthog from 'posthog-js'
 
@@ -10,8 +10,8 @@ import { userLogic } from 'scenes/userLogic'
 import { invitesDelegateCreate } from '~/generated/core/api'
 import { UserType } from '~/types'
 
+import type { OnboardingStepKey } from '../../../../types'
 import { onboardingLogic } from '../onboardingLogic'
-import type { onboardingExitLogicType } from './onboardingExitLogicType'
 
 const isValidEmail = (email: string): boolean => /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email.trim())
 
@@ -57,6 +57,74 @@ function extractErrorDetail(error: unknown, fallback: string): string {
     return err.message || fallback
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface onboardingExitLogicValues {
+    currentStepKey: OnboardingStepKey | null // onboardingLogic
+    onCompleteOnboardingRedirectUrl: string // onboardingLogic
+    currentOrganizationId: string // organizationLogic
+    canSubmitDelegation: boolean
+    isExitModalOpen: boolean
+    isSubmitting: boolean
+    message: string
+    orgIdAtOpen: string | null
+    targetEmail: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface onboardingExitLogicActions {
+    loadUser: (resetOnFailure?: boolean | undefined) => {
+        resetOnFailure: boolean | undefined
+    } // userLogic
+    loadUserSuccess: (
+        user: UserType | null,
+        payload?:
+            | {
+                  resetOnFailure: boolean | undefined
+              }
+            | undefined
+    ) => {
+        payload?: {
+            resetOnFailure: boolean | undefined
+        }
+        user: UserType | null
+    } // userLogic
+    captureOrgIdAtOpen: (orgId: string | null) => {
+        orgId: string | null
+    }
+    closeExitModal: () => {
+        value: true
+    }
+    openExitModal: () => {
+        value: true
+    }
+    setIsSubmitting: (isSubmitting: boolean) => {
+        isSubmitting: boolean
+    }
+    setMessage: (message: string) => {
+        message: string
+    }
+    setTargetEmail: (targetEmail: string) => {
+        targetEmail: string
+    }
+    submitDelegation: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface onboardingExitLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        canSubmitDelegation: (targetEmail: string) => boolean
+    }
+}
+
+export type onboardingExitLogicType = MakeLogicType<
+    onboardingExitLogicValues,
+    onboardingExitLogicActions,
+    Record<string, any>,
+    onboardingExitLogicMeta
+>
+
 export const onboardingExitLogic = kea<onboardingExitLogicType>([
     path(['scenes', 'onboarding', 'onboardingExitLogic']),
     connect(() => ({
diff --git a/frontend/src/scenes/onboarding/legacy/onboardingLogic.tsx b/frontend/src/scenes/onboarding/legacy/onboardingLogic.tsx
index 9bc0192cc1e3..4f7cd09e9223 100644
--- a/frontend/src/scenes/onboarding/legacy/onboardingLogic.tsx
+++ b/frontend/src/scenes/onboarding/legacy/onboardingLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -25,9 +25,19 @@ import { sidePanelStateLogic } from '~/layout/navigation-3000/sidepanel/sidePane
 import { ProductKey } from '~/queries/schema/schema-general'
 import { Breadcrumb, OnboardingProduct, OnboardingStepKey } from '~/types'
 
+import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
+import type {
+    BillingProductV2Type,
+    BillingType,
+    OrganizationType,
+    PreflightStatus,
+    SidePanelTab,
+    TeamPublicType,
+    TeamType,
+    UserType,
+} from '../../../types'
 import { onboardingEventUsageLogic } from '../onboardingEventUsageLogic'
 import { arraysEqual, parseProductsParam, stepKeyToTitle } from './onboardingFlowUtils'
-import type { onboardingLogicType } from './onboardingLogicType'
 import { appendSharedTrailingSteps } from './sharedSteps'
 import { onboardingProviderRegistry } from './stepProviderRegistry'
 import { type OnboardingFlowContext, type OnboardingStepDescriptor } from './types'
@@ -41,6 +51,183 @@ export interface OnboardingLogicProps {
     onCompleteOnboarding?: (key: ProductKey) => void
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface onboardingLogicValues {
+    billing: BillingType | null // billingLogic
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    receivedFeatureFlags: boolean // featureFlagLogic
+    currentOrganization: OrganizationType | null // organizationLogic
+    isCloudOrDev: boolean | undefined // preflightLogic
+    preflight: PreflightStatus | null // preflightLogic
+    modalMode: boolean // sidePanelStateLogic
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    user: UserType | null // userLogic
+    billingProduct: BillingProductV2Type | null
+    breadcrumbs: Breadcrumb[]
+    canInviteTeammates: boolean
+    currentFlowStep: OnboardingStepDescriptor | null
+    currentStepKey: OnboardingStepKey | null
+    currentStepProductKey: ProductKey | null
+    flow: OnboardingStepDescriptor[]
+    flowIndex: number
+    hasNextStep: boolean
+    hasPreviousStep: boolean
+    isCompleting: boolean
+    onCompleteOnboardingRedirectUrl: string
+    onCompleteOnboardingRedirectUrlOverride: string | null
+    onboardingFlowVariant: string
+    onboardingStepKeys: OnboardingStepKey[]
+    product: OnboardingProduct | null
+    productKey: ProductKey | null
+    secondaryProductKeys: ProductKey[]
+    shouldShowBillingStep: boolean
+    stepId: string
+    subscribedDuringOnboarding: boolean
+    totalOnboardingSteps: number
+    visitedStepIds: string[]
+    waitForBilling: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface onboardingLogicActions {
+    loadBillingSuccess: (
+        billing: BillingType,
+        payload?: any
+    ) => {
+        billing: BillingType
+        payload?: any
+    } // billingLogic
+    openGlobalSetup: () => {
+        value: true
+    } // globalSetupLogic
+    reportContextOnboardingCompleted: (productKey: string) => {
+        productKey: string
+    } // onboardingEventUsageLogic
+    openSidePanel: (
+        tab: SidePanelTab,
+        options?: string | undefined
+    ) => {
+        options: string | undefined
+        tab: SidePanelTab
+    } // sidePanelStateLogic
+    recordProductIntentOnboardingComplete: (args_0: { product_type: ProductKey }) => {
+        product_type: ProductKey
+    } // teamLogic
+    updateCurrentTeam: (payload: Partial<TeamType>) => Partial<TeamType> // teamLogic
+    updateCurrentTeamSuccess: (
+        currentTeam: TeamPublicType | TeamType,
+        payload?: Partial<TeamType> | undefined
+    ) => {
+        currentTeam: TeamPublicType | TeamType
+        payload?: Partial<TeamType>
+    } // teamLogic
+    clearProductKey: () => {
+        value: true
+    }
+    completeContextOnboarding: () => {
+        value: true
+    }
+    completeOnboarding: (options?: { redirectUrlOverride?: string }) => {
+        redirectUrlOverride: string | undefined
+    }
+    goToNextStep: () => {
+        value: true
+    }
+    goToPreviousStep: () => {
+        value: true
+    }
+    markStepsVisited: (stepIds: string[]) => {
+        stepIds: string[]
+    }
+    resetOnboardingFlowState: () => {
+        value: true
+    }
+    setIsCompleting: (isCompleting: boolean) => {
+        isCompleting: boolean
+    }
+    setOnCompleteOnboardingRedirectUrl: (url: string | null) => {
+        url: string | null
+    }
+    setProduct: (product: OnboardingProduct | null) => {
+        product: OnboardingProduct | null
+    }
+    setProductKey: (productKey: ProductKey | null) => {
+        productKey: ProductKey | null
+    }
+    setSecondaryProductKeys: (keys: ProductKey[]) => {
+        keys: ProductKey[]
+    }
+    setStepId: (stepId: string) => {
+        stepId: string
+    }
+    setSubscribedDuringOnboarding: (subscribedDuringOnboarding: boolean) => {
+        subscribedDuringOnboarding: boolean
+    }
+    setTeamPropertiesForProduct: (productKey: ProductKey) => {
+        productKey: ProductKey
+    }
+    setWaitForBilling: (waitForBilling: boolean) => {
+        waitForBilling: boolean
+    }
+    skipOnboarding: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface onboardingLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        onboardingFlowVariant: (featureFlags: FeatureFlagsSet) => string
+        canInviteTeammates: (currentOrganization: OrganizationType | null, user: UserType | null) => boolean
+        billingProduct: (billing: BillingType | null, productKey: ProductKey | null) => BillingProductV2Type | null
+        shouldShowBillingStep: (
+            subscribedDuringOnboarding: boolean,
+            isCloudOrDev: boolean | undefined,
+            billing: BillingType | null,
+            billingProduct: BillingProductV2Type | null,
+            stepId: string
+        ) => boolean
+        flow: (
+            productKey: ProductKey | null,
+            secondaryProductKeys: ProductKey[],
+            currentTeam: TeamPublicType | TeamType | null,
+            billing: BillingType | null,
+            billingProduct: BillingProductV2Type | null,
+            shouldShowBillingStep: boolean,
+            isCloudOrDev: boolean | undefined,
+            subscribedDuringOnboarding: boolean,
+            canInviteTeammates: boolean
+        ) => OnboardingStepDescriptor[]
+        onboardingStepKeys: (flow: OnboardingStepDescriptor[]) => OnboardingStepKey[]
+        currentFlowStep: (flow: OnboardingStepDescriptor[], stepId: string) => OnboardingStepDescriptor | null
+        flowIndex: (flow: OnboardingStepDescriptor[], currentFlowStep: OnboardingStepDescriptor | null) => number
+        currentStepKey: (currentFlowStep: OnboardingStepDescriptor | null) => OnboardingStepKey | null
+        currentStepProductKey: (
+            currentFlowStep: OnboardingStepDescriptor | null,
+            productKey: ProductKey | null
+        ) => ProductKey | null
+        totalOnboardingSteps: (flow: OnboardingStepDescriptor[]) => number
+        hasNextStep: (flow: OnboardingStepDescriptor[], flowIndex: number) => boolean
+        hasPreviousStep: (flowIndex: number) => boolean
+        breadcrumbs: (
+            productKey: ProductKey | null,
+            currentFlowStep: OnboardingStepDescriptor | null,
+            secondaryProductKeys: ProductKey[]
+        ) => Breadcrumb[]
+        onCompleteOnboardingRedirectUrl: (
+            productKey: ProductKey | null,
+            onCompleteOnboardingRedirectUrlOverride: string | null
+        ) => string
+    }
+}
+
+export type onboardingLogicType = MakeLogicType<
+    onboardingLogicValues,
+    onboardingLogicActions,
+    OnboardingLogicProps,
+    onboardingLogicMeta
+>
+
 export const onboardingLogic = kea<onboardingLogicType>([
     props({} as OnboardingLogicProps),
     path(['scenes', 'onboarding', 'onboardingLogic']),
@@ -177,11 +364,15 @@ export const onboardingLogic = kea<onboardingLogicType>([
     selectors({
         onboardingFlowVariant: [
             (s) => [s.featureFlags],
-            (featureFlags): string => resolveOnboardingFlowVariant(featureFlags),
+            (featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet): string =>
+                resolveOnboardingFlowVariant(featureFlags),
         ],
         canInviteTeammates: [
             (s) => [s.currentOrganization, s.user],
-            (currentOrganization, user): boolean => {
+            (
+                currentOrganization: null | import('~/types').OrganizationType,
+                user: null | import('~/types').UserType
+            ): boolean => {
                 if (currentOrganization?.members_can_invite) {
                     return true
                 }
@@ -191,11 +382,18 @@ export const onboardingLogic = kea<onboardingLogicType>([
         ],
         billingProduct: [
             (s) => [s.billing, s.productKey],
-            (billing, productKey) => billing?.products?.find((p) => p.type === productKey) ?? null,
+            (billing: null | import('~/types').BillingType, productKey: ProductKey | null) =>
+                billing?.products?.find((p) => p.type === productKey) ?? null,
         ],
         shouldShowBillingStep: [
             (s) => [s.subscribedDuringOnboarding, s.isCloudOrDev, s.billing, s.billingProduct, s.stepId],
-            (subscribedDuringOnboarding, isCloudOrDev, billing, billingProduct, stepId): boolean => {
+            (
+                subscribedDuringOnboarding: boolean,
+                isCloudOrDev: boolean | undefined,
+                billing: null | import('~/types').BillingType,
+                billingProduct: null | import('~/types').BillingProductV2Type,
+                stepId: string
+            ): boolean => {
                 if (!isCloudOrDev || !billing?.products || !billingProduct) {
                     return false
                 }
@@ -225,15 +423,15 @@ export const onboardingLogic = kea<onboardingLogicType>([
                 s.canInviteTeammates,
             ],
             (
-                primary,
-                secondaries,
-                currentTeam,
-                billing,
-                billingProduct,
-                shouldShowBilling,
-                isCloudOrDev,
-                subscribedDuringOnboarding,
-                canInviteTeammates
+                primary: ProductKey | null,
+                secondaries: ProductKey[],
+                currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType,
+                billing: null | import('~/types').BillingType,
+                billingProduct: null | import('~/types').BillingProductV2Type,
+                shouldShowBilling: boolean,
+                isCloudOrDev: boolean | undefined,
+                subscribedDuringOnboarding: boolean,
+                canInviteTeammates: boolean
             ): OnboardingStepDescriptor[] => {
                 if (!primary) {
                     return []
@@ -343,7 +541,7 @@ export const onboardingLogic = kea<onboardingLogicType>([
         ],
         currentFlowStep: [
             (s) => [s.flow, s.stepId],
-            (flow: OnboardingStepDescriptor[], stepId): OnboardingStepDescriptor | null => {
+            (flow: OnboardingStepDescriptor[], stepId: string): OnboardingStepDescriptor | null => {
                 if (!flow.length) {
                     // If the user explicitly asked for a step (URL has `?step=...`) but the
                     // flow hasn't been built yet (billing/team still loading), we MUST NOT
@@ -377,26 +575,33 @@ export const onboardingLogic = kea<onboardingLogicType>([
         ],
         flowIndex: [
             (s) => [s.flow, s.currentFlowStep],
-            (flow, currentFlowStep): number =>
+            (flow: OnboardingStepDescriptor[], currentFlowStep: OnboardingStepDescriptor | null): number =>
                 currentFlowStep ? flow.findIndex((step) => step.id === currentFlowStep.id) : -1,
         ],
         currentStepKey: [
             (s) => [s.currentFlowStep],
-            (currentFlowStep): OnboardingStepKey | null => currentFlowStep?.stepKey ?? null,
+            (currentFlowStep: OnboardingStepDescriptor | null): OnboardingStepKey | null =>
+                currentFlowStep?.stepKey ?? null,
         ],
         currentStepProductKey: [
             (s) => [s.currentFlowStep, s.productKey],
-            (currentFlowStep, productKey): ProductKey | null => currentFlowStep?.productKey ?? productKey,
+            (currentFlowStep: OnboardingStepDescriptor | null, productKey: ProductKey | null): ProductKey | null =>
+                currentFlowStep?.productKey ?? productKey,
         ],
-        totalOnboardingSteps: [(s) => [s.flow], (flow) => flow.length],
+        totalOnboardingSteps: [(s) => [s.flow], (flow: OnboardingStepDescriptor[]) => flow.length],
         hasNextStep: [
             (s) => [s.flow, s.flowIndex],
-            (flow, flowIndex): boolean => flowIndex >= 0 && flowIndex < flow.length - 1,
+            (flow: OnboardingStepDescriptor[], flowIndex: number): boolean =>
+                flowIndex >= 0 && flowIndex < flow.length - 1,
         ],
-        hasPreviousStep: [(s) => [s.flowIndex], (flowIndex): boolean => flowIndex > 0],
+        hasPreviousStep: [(s) => [s.flowIndex], (flowIndex: number): boolean => flowIndex > 0],
         breadcrumbs: [
             (s) => [s.productKey, s.currentFlowStep, s.secondaryProductKeys],
-            (productKey, currentFlowStep, secondaryProductKeys): Breadcrumb[] => {
+            (
+                productKey: ProductKey | null,
+                currentFlowStep: OnboardingStepDescriptor | null,
+                secondaryProductKeys: ProductKey[]
+            ): Breadcrumb[] => {
                 const stepName = stepKeyToTitle(currentFlowStep?.stepKey ?? undefined)
                 return [
                     {
diff --git a/frontend/src/scenes/onboarding/legacy/onboardingProductConfigurationLogic.ts b/frontend/src/scenes/onboarding/legacy/onboardingProductConfigurationLogic.ts
index 01e5c1ed582b..ad35ff9ff335 100644
--- a/frontend/src/scenes/onboarding/legacy/onboardingProductConfigurationLogic.ts
+++ b/frontend/src/scenes/onboarding/legacy/onboardingProductConfigurationLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers } from 'kea'
 
 import { LemonSelectOptions } from '@posthog/lemon-ui'
 
@@ -6,8 +6,6 @@ import { teamLogic } from 'scenes/teamLogic'
 
 import { TeamType } from '~/types'
 
-import type { onboardingProductConfigurationLogicType } from './onboardingProductConfigurationLogicType'
-
 export interface ProductConfigOptionBase {
     title: string
     description: string
@@ -33,6 +31,27 @@ export interface ProductConfigurationSelect extends ProductConfigOptionBase {
 
 export type ProductConfigOption = ProductConfigurationToggle | ProductConfigurationSelect
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface onboardingProductConfigurationLogicValues {
+    configOptions: any[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface onboardingProductConfigurationLogicActions {
+    updateCurrentTeam: (payload: Partial<TeamType>) => Partial<TeamType> // teamLogic
+    saveConfiguration: () => {
+        value: true
+    }
+    setConfigOptions: (configOptions: ProductConfigOption[]) => {
+        configOptions: ProductConfigOption[]
+    }
+}
+
+export type onboardingProductConfigurationLogicType = MakeLogicType<
+    onboardingProductConfigurationLogicValues,
+    onboardingProductConfigurationLogicActions
+>
+
 export const onboardingProductConfigurationLogic = kea<onboardingProductConfigurationLogicType>([
     path(() => ['scenes', 'onboarding', 'onboardingProductConfigurationLogic']),
     connect(() => ({
diff --git a/frontend/src/scenes/onboarding/legacy/productSelection/productSelectionLogic.ts b/frontend/src/scenes/onboarding/legacy/productSelection/productSelectionLogic.ts
index 2771020f6a62..d6788adb6615 100644
--- a/frontend/src/scenes/onboarding/legacy/productSelection/productSelectionLogic.ts
+++ b/frontend/src/scenes/onboarding/legacy/productSelection/productSelectionLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { router } from 'kea-router'
 
 import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
@@ -16,16 +16,139 @@ import { urls } from 'scenes/urls'
 import { ProductIntentContext, ProductKey } from '~/queries/schema/schema-general'
 import { OnboardingStepKey } from '~/types'
 
+import type { ProductIntentProperties } from '../../../../lib/utils/product-intents'
+import type { TeamPublicType, TeamType } from '../../../../types'
+import type { UseCaseDefinition } from '../productRecommendations'
 import {
     getBrowsingHistoryFromPostHog,
     getBrowsingHistoryLabels,
     mapBrowsingHistoryToProducts,
 } from './browsingHistoryMapping'
-import type { productSelectionLogicType } from './productSelectionLogicType'
 
 export type OnboardingStep = 'choose_path' | 'product_selection'
 export type RecommendationSource = 'use_case' | 'browsing_history' | 'manual' | 'simplified' | 'multiproduct'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface productSelectionLogicValues {
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    browsingHistory: string[]
+    browsingHistoryLabels: string[]
+    browsingHistoryProducts: ProductKey[]
+    canContinue: boolean
+    currentStep: OnboardingStep
+    firstProductOnboarding: ProductKey | null
+    hasBrowsingHistory: boolean
+    otherProducts: ProductKey[]
+    recommendationSource: RecommendationSource
+    recommendationSourceLabel: string
+    recommendedProducts: ProductKey[]
+    selectedProducts: ProductKey[]
+    selectedUseCase: UseCaseOption | null
+    showAllProducts: boolean
+    useCaseProducts: ProductKey[]
+    useCases: readonly UseCaseDefinition[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface productSelectionLogicActions {
+    reportOnboardingProductSelectionPath: (
+        path: 'ai' | 'browsing_history' | 'manual' | 'use_case',
+        properties?:
+            | {
+                  hasBrowsingHistory?: boolean
+                  recommendedProducts?: string[]
+                  useCase?: string
+              }
+            | undefined
+    ) => {
+        path: 'ai' | 'browsing_history' | 'manual' | 'use_case'
+        properties:
+            | {
+                  hasBrowsingHistory?: boolean | undefined
+                  recommendedProducts?: string[] | undefined
+                  useCase?: string | undefined
+              }
+            | undefined
+    } // eventUsageLogic
+    reportOnboardingProductToggled: (
+        productKey: string,
+        selected: boolean,
+        recommendationSource: string
+    ) => {
+        productKey: string
+        recommendationSource: string
+        selected: boolean
+    } // eventUsageLogic
+    reportOnboardingStarted: (entrypoint: string) => {
+        entrypoint: string
+    } // eventUsageLogic
+    setOnCompleteOnboardingRedirectUrl: (url: string | null) => {
+        url: string | null
+    } // onboardingLogic
+    addProductIntent: (properties: ProductIntentProperties) => ProductIntentProperties // teamLogic
+    clearUseCase: () => {
+        value: true
+    }
+    handleStartOnboarding: () => {
+        value: true
+    }
+    selectPickMyself: () => {
+        value: true
+    }
+    selectSingleProduct: (productKey: ProductKey) => {
+        productKey: ProductKey
+    }
+    selectUseCase: (useCase: UseCaseOption) => {
+        useCase: UseCaseOption
+    }
+    setBrowsingHistory: (browsingHistory: string[]) => {
+        browsingHistory: string[]
+    }
+    setFirstProductOnboarding: (productKey: ProductKey | null) => {
+        productKey: ProductKey | null
+    }
+    setRecommendationSource: (source: RecommendationSource) => {
+        source: RecommendationSource
+    }
+    setSelectedProducts: (productKeys: ProductKey[]) => {
+        productKeys: ProductKey[]
+    }
+    setShowAllProducts: (show: boolean) => {
+        show: boolean
+    }
+    setStep: (step: OnboardingStep) => {
+        step: OnboardingStep
+    }
+    toggleProduct: (productKey: ProductKey) => {
+        productKey: ProductKey
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface productSelectionLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        browsingHistoryProducts: (browsingHistory: string[]) => ProductKey[]
+        browsingHistoryLabels: (browsingHistory: string[]) => string[]
+        hasBrowsingHistory: (browsingHistory: string[]) => boolean
+        useCaseProducts: (selectedUseCase: UseCaseOption | null) => ProductKey[]
+        recommendedProducts: (
+            recommendationSource: RecommendationSource,
+            browsingHistoryProducts: ProductKey[],
+            useCaseProducts: ProductKey[]
+        ) => ProductKey[]
+        otherProducts: (recommendedProducts: ProductKey[]) => ProductKey[]
+        canContinue: (selectedProducts: ProductKey[]) => boolean
+        recommendationSourceLabel: (recommendationSource: RecommendationSource) => string
+    }
+}
+
+export type productSelectionLogicType = MakeLogicType<
+    productSelectionLogicValues,
+    productSelectionLogicActions,
+    Record<string, any>,
+    productSelectionLogicMeta
+>
+
 export const productSelectionLogic = kea<productSelectionLogicType>([
     path(['scenes', 'onboarding', 'productSelection', 'productSelectionLogic']),
 
@@ -129,19 +252,22 @@ export const productSelectionLogic = kea<productSelectionLogicType>([
     selectors({
         browsingHistoryProducts: [
             (s) => [s.browsingHistory],
-            (browsingHistory): ProductKey[] => mapBrowsingHistoryToProducts(browsingHistory),
+            (browsingHistory: string[]): ProductKey[] => mapBrowsingHistoryToProducts(browsingHistory),
         ],
 
         browsingHistoryLabels: [
             (s) => [s.browsingHistory],
-            (browsingHistory): string[] => getBrowsingHistoryLabels(browsingHistory),
+            (browsingHistory: string[]): string[] => getBrowsingHistoryLabels(browsingHistory),
         ],
 
-        hasBrowsingHistory: [(s) => [s.browsingHistory], (browsingHistory): boolean => browsingHistory.length > 0],
+        hasBrowsingHistory: [
+            (s) => [s.browsingHistory],
+            (browsingHistory: string[]): boolean => browsingHistory.length > 0,
+        ],
 
         useCaseProducts: [
             (s) => [s.selectedUseCase],
-            (selectedUseCase): ProductKey[] => {
+            (selectedUseCase: UseCaseOption | null): ProductKey[] => {
                 if (!selectedUseCase) {
                     return []
                 }
@@ -151,7 +277,11 @@ export const productSelectionLogic = kea<productSelectionLogicType>([
 
         recommendedProducts: [
             (s) => [s.recommendationSource, s.browsingHistoryProducts, s.useCaseProducts],
-            (source, browsingProducts, useCaseProducts): ProductKey[] => {
+            (
+                source: RecommendationSource,
+                browsingProducts: ProductKey[],
+                useCaseProducts: ProductKey[]
+            ): ProductKey[] => {
                 switch (source) {
                     case 'use_case':
                         return [...new Set([...useCaseProducts, ...browsingProducts])]
@@ -165,7 +295,7 @@ export const productSelectionLogic = kea<productSelectionLogicType>([
 
         otherProducts: [
             (s) => [s.recommendedProducts],
-            (recommendedProducts): ProductKey[] => {
+            (recommendedProducts: ProductKey[]): ProductKey[] => {
                 const allProducts = Object.keys(availableOnboardingProducts) as ProductKey[]
                 return allProducts.filter((p) => !recommendedProducts.includes(p))
             },
@@ -173,11 +303,14 @@ export const productSelectionLogic = kea<productSelectionLogicType>([
 
         useCases: [() => [], () => USE_CASE_OPTIONS],
 
-        canContinue: [(s) => [s.selectedProducts], (selectedProducts): boolean => selectedProducts.length > 0],
+        canContinue: [
+            (s) => [s.selectedProducts],
+            (selectedProducts: ProductKey[]): boolean => selectedProducts.length > 0,
+        ],
 
         recommendationSourceLabel: [
             (s) => [s.recommendationSource],
-            (source): string => {
+            (source: RecommendationSource): string => {
                 switch (source) {
                     case 'use_case':
                         return 'based on your goal'
diff --git a/frontend/src/scenes/onboarding/legacy/sdks/OnboardingInstallStep/wizardInstallStepLogic.ts b/frontend/src/scenes/onboarding/legacy/sdks/OnboardingInstallStep/wizardInstallStepLogic.ts
index 1ba7379a59fa..b61eabf803a9 100644
--- a/frontend/src/scenes/onboarding/legacy/sdks/OnboardingInstallStep/wizardInstallStepLogic.ts
+++ b/frontend/src/scenes/onboarding/legacy/sdks/OnboardingInstallStep/wizardInstallStepLogic.ts
@@ -1,6 +1,22 @@
-import { actions, kea, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers } from 'kea'
 
-import type { wizardInstallStepLogicType } from './wizardInstallStepLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface wizardInstallStepLogicValues {
+    manualModalOpen: boolean
+    sdkInstructionsOpen: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface wizardInstallStepLogicActions {
+    setManualModalOpen: (open: boolean) => {
+        open: boolean
+    }
+    setSdkInstructionsOpen: (open: boolean) => {
+        open: boolean
+    }
+}
+
+export type wizardInstallStepLogicType = MakeLogicType<wizardInstallStepLogicValues, wizardInstallStepLogicActions>
 
 export const wizardInstallStepLogic = kea<wizardInstallStepLogicType>([
     path(['scenes', 'onboarding', 'wizardInstallStepLogic']),
diff --git a/frontend/src/scenes/onboarding/legacy/sdks/sdk-install-instructions/nextJsInstructionsLogic.ts b/frontend/src/scenes/onboarding/legacy/sdks/sdk-install-instructions/nextJsInstructionsLogic.ts
index a2a3eb62187d..21b19af15f07 100644
--- a/frontend/src/scenes/onboarding/legacy/sdks/sdk-install-instructions/nextJsInstructionsLogic.ts
+++ b/frontend/src/scenes/onboarding/legacy/sdks/sdk-install-instructions/nextJsInstructionsLogic.ts
@@ -1,6 +1,4 @@
-import { actions, kea, path, reducers } from 'kea'
-
-import type { nextJsInstructionsLogicType } from './nextJsInstructionsLogicType'
+import { MakeLogicType, actions, kea, path, reducers } from 'kea'
 
 export type NextJSRouter = 'instrumentation-client' | 'app' | 'pages'
 
@@ -8,6 +6,20 @@ export interface NextJsInstructionsLogicProps {
     initialRouter?: NextJSRouter
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface nextJsInstructionsLogicValues {
+    nextJsRouter: NextJSRouter
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface nextJsInstructionsLogicActions {
+    setNextJsRouter: (router: any) => {
+        router: any
+    }
+}
+
+export type nextJsInstructionsLogicType = MakeLogicType<nextJsInstructionsLogicValues, nextJsInstructionsLogicActions>
+
 export const nextJsInstructionsLogic = kea<nextJsInstructionsLogicType>([
     path(['scenes', 'onboarding', 'sdks', 'nextJsInstructionsLogic']),
     actions({
diff --git a/frontend/src/scenes/onboarding/legacy/sdks/sdksLogic.tsx b/frontend/src/scenes/onboarding/legacy/sdks/sdksLogic.tsx
index e59d39db05a9..05a3d7eadca5 100644
--- a/frontend/src/scenes/onboarding/legacy/sdks/sdksLogic.tsx
+++ b/frontend/src/scenes/onboarding/legacy/sdks/sdksLogic.tsx
@@ -1,6 +1,7 @@
-import { actions, afterMount, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { urlToAction } from 'kea-router'
+import type { ComponentType } from 'react'
 
 import api from 'lib/api'
 import { LemonSelectOptions } from 'lib/lemon-ui/LemonSelect/LemonSelect'
@@ -14,9 +15,10 @@ import { ProductKey } from '~/queries/schema/schema-general'
 import { hogql } from '~/queries/utils'
 import { SDK, SDKInstructionsMap, SDKTag, SDKTagOverrides } from '~/types'
 
+import type { FeatureFlagsSet } from '../../../../lib/logic/featureFlagLogic'
+import type { SDKKey, UserType } from '../../../../types'
 import { onboardingLogic } from '../onboardingLogic'
 import { ALL_SDKS } from './allSDKs'
-import type { sdksLogicType } from './sdksLogicType'
 
 /*
 To add SDK instructions for your product:
@@ -41,6 +43,114 @@ Products that will often be installed in multiple places, eg. web and mobile
 */
 export const multiInstallProducts = [ProductKey.PRODUCT_ANALYTICS, ProductKey.FEATURE_FLAGS]
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sdksLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    eventHosts: string[] // liveEventsLogic
+    productKey: ProductKey | null // onboardingLogic
+    isUserNonTechnical: boolean // userLogic
+    user: UserType | null // userLogic
+    availableSDKInstructionsMap: SDKInstructionsMap
+    combinedSnippetAndLiveEventsHosts: string[]
+    filteredSDKs: SDK[]
+    hasSnippetEvents: boolean | null
+    hasSnippetEventsLoading: boolean
+    panel: 'instructions' | 'options'
+    sdkTagOverrides: SDKTagOverrides
+    sdks: SDK[] | null
+    searchTerm: string
+    selectedSDK: SDK | null
+    selectedTag: SDKTag | null
+    showSideBySide: boolean | null
+    showSourceOptionsSelect: boolean
+    snippetHosts: string[]
+    sourceFilter: string | null
+    sourceOptions: LemonSelectOptions<string>
+    tags: string[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sdksLogicActions {
+    reportSDKSelected: (sdk: SDK) => {
+        sdk: SDK
+    } // eventUsageLogic
+    filterSDKs: () => {
+        value: true
+    }
+    loadSnippetEvents: () => any
+    loadSnippetEventsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSnippetEventsSuccess: (
+        hasSnippetEvents: boolean,
+        payload?: any
+    ) => {
+        hasSnippetEvents: boolean
+        payload?: any
+    }
+    resetSDKs: () => {
+        value: true
+    }
+    selectSDK: (sdk: SDK) => {
+        sdk: SDK
+    }
+    setAvailableSDKInstructionsMap: (sdkInstructionMap: SDKInstructionsMap) => {
+        sdkInstructionMap: Partial<Record<SDKKey, ComponentType<{}>>>
+    }
+    setHasSnippetEvents: (hasSnippetEvents: boolean) => {
+        hasSnippetEvents: boolean
+    }
+    setPanel: (panel: 'instructions' | 'options') => {
+        panel: 'instructions' | 'options'
+    }
+    setSDKTagOverrides: (sdkTagOverrides: SDKTagOverrides) => {
+        sdkTagOverrides: Partial<Record<SDKKey, SDKTag[]>>
+    }
+    setSDKs: (sdks: SDK[]) => {
+        sdks: SDK[]
+    }
+    setSearchTerm: (searchTerm: string) => {
+        searchTerm: string
+    }
+    setSelectedSDK: (sdk: SDK | null) => {
+        sdk: SDK | null
+    }
+    setSelectedTag: (selectedTag: SDKTag | null) => {
+        selectedTag: SDKTag | null
+    }
+    setShowSideBySide: (showSideBySide: boolean) => {
+        showSideBySide: boolean
+    }
+    setSnippetHosts: (snippetHosts: string[]) => {
+        snippetHosts: string[]
+    }
+    setSourceFilter: (sourceFilter: string | null) => {
+        sourceFilter: string | null
+    }
+    setSourceOptions: (sourceOptions: LemonSelectOptions<string>) => {
+        sourceOptions: LemonSelectOptions<string>
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sdksLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        showSourceOptionsSelect: (
+            sourceOptions: LemonSelectOptions<string>,
+            availableSDKInstructionsMap: Partial<Record<SDKKey, ComponentType<{}>>>
+        ) => boolean
+        combinedSnippetAndLiveEventsHosts: (snippetHosts: string[], eventHosts: string[]) => string[]
+        tags: (sdks: SDK[] | null) => string[]
+        filteredSDKs: (sdks: SDK[] | null, searchTerm: string, selectedTag: SDKTag | null) => SDK[]
+    }
+}
+
+export type sdksLogicType = MakeLogicType<sdksLogicValues, sdksLogicActions, Record<string, any>, sdksLogicMeta>
+
 export const sdksLogic = kea<sdksLogicType>([
     path(['scenes', 'onboarding', 'sdks', 'sdksLogic']),
     connect(() => ({
diff --git a/frontend/src/scenes/onboarding/onboardingEventUsageLogic.ts b/frontend/src/scenes/onboarding/onboardingEventUsageLogic.ts
index 36a815ed6411..92f61388107b 100644
--- a/frontend/src/scenes/onboarding/onboardingEventUsageLogic.ts
+++ b/frontend/src/scenes/onboarding/onboardingEventUsageLogic.ts
@@ -1,10 +1,9 @@
-import { actions, connect, kea, listeners, path } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path } from 'kea'
 import posthog from 'posthog-js'
 
 import { FEATURE_FLAGS } from 'lib/constants'
 import { featureFlagLogic, type FeatureFlagsSet } from 'lib/logic/featureFlagLogic'
 
-import type { onboardingEventUsageLogicType } from './onboardingEventUsageLogicType'
 import { resolveOnboardingFlowVariant } from './onboardingVariants'
 
 /** Steps of the context-first onboarding flow (`ContextOnboarding.tsx`), in order. */
@@ -56,6 +55,125 @@ export function resetCloudRunExperimentExposureForTests(): void {
     reportedDashboardCtaShownRuns.clear()
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface onboardingEventUsageLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface onboardingEventUsageLogicActions {
+    reportContextOnboardingCloudRunCompleted: (props: {
+        durationSeconds: number | null
+        prOpened: boolean
+        prUrl: string | null
+        runId: string
+        status: 'cancelled' | 'completed' | 'failed'
+        taskId: string
+    }) => {
+        durationSeconds: number | null
+        prOpened: boolean
+        prUrl: string | null
+        runId: string
+        status: 'cancelled' | 'completed' | 'failed'
+        taskId: string
+    }
+    reportContextOnboardingCloudRunQueued: (props: { repository: string; runId: string; taskId: string }) => {
+        repository: string
+        runId: string
+        taskId: string
+    }
+    reportContextOnboardingCompleted: (productKey: string) => {
+        productKey: string
+    }
+    reportContextOnboardingInstallModeSelected: (mode: 'cloud' | 'local') => {
+        mode: 'cloud' | 'local'
+    }
+    reportContextOnboardingPlanSelected: (plan: 'free' | 'pay_as_you_go') => {
+        plan: 'free' | 'pay_as_you_go'
+    }
+    reportContextOnboardingSourceToggled: (
+        productKey: string,
+        toggle: string,
+        enabled: boolean
+    ) => {
+        enabled: boolean
+        productKey: string
+        toggle: string
+    }
+    reportContextOnboardingStarted: () => {
+        value: true
+    }
+    reportContextOnboardingStepCompleted: (stepId: ContextOnboardingStepId) => {
+        stepId: ContextOnboardingStepId
+    }
+    reportContextOnboardingStepSkipped: (stepId: ContextOnboardingStepId) => {
+        stepId: ContextOnboardingStepId
+    }
+    reportContextOnboardingStepViewed: (stepId: ContextOnboardingStepId) => {
+        stepId: ContextOnboardingStepId
+    }
+    reportWizardSyncDashboardCtaClicked: (props: {
+        mode: 'cloud' | 'local'
+        runKey: string
+        surface: 'fab' | 'inline'
+    }) => {
+        mode: 'cloud' | 'local'
+        runKey: string
+        surface: 'fab' | 'inline'
+    }
+    reportWizardSyncDashboardCtaShown: (props: {
+        mode: 'cloud' | 'local'
+        runKey: string
+        surface: 'fab' | 'inline'
+    }) => {
+        mode: 'cloud' | 'local'
+        runKey: string
+        surface: 'fab' | 'inline'
+    }
+    reportWizardSyncExpanded: (props: { mode: 'cloud' | 'local'; phase: string; runKey: string }) => {
+        mode: 'cloud' | 'local'
+        phase: string
+        runKey: string
+    }
+    reportWizardSyncHandoffShown: (props: {
+        mode: 'cloud' | 'local'
+        prOpened: boolean
+        runKey: string
+        surface: 'fab' | 'inline'
+    }) => {
+        mode: 'cloud' | 'local'
+        prOpened: boolean
+        runKey: string
+        surface: 'fab' | 'inline'
+    }
+    reportWizardSyncMinimized: (props: { mode: 'cloud' | 'local'; phase: string; runKey: string }) => {
+        mode: 'cloud' | 'local'
+        phase: string
+        runKey: string
+    }
+    reportWizardSyncRestored: (props: { mode: 'cloud' | 'local'; phase: string; runKey: string }) => {
+        mode: 'cloud' | 'local'
+        phase: string
+        runKey: string
+    }
+    reportWizardSyncRunDismissed: (props: {
+        elapsedSeconds: number
+        mode: 'cloud' | 'local'
+        phase: string
+        runKey: string
+    }) => {
+        elapsedSeconds: number
+        mode: 'cloud' | 'local'
+        phase: string
+        runKey: string
+    }
+}
+
+export type onboardingEventUsageLogicType = MakeLogicType<
+    onboardingEventUsageLogicValues,
+    onboardingEventUsageLogicActions
+>
+
 /**
  * Funnel events for the context-first onboarding flow (v2) — a dedicated logic rather than more
  * surface on the giant `eventUsageLogic`, following `sessionRecordingEventUsageLogic`'s split.
diff --git a/frontend/src/scenes/onboarding/shared/sdkHealth/sdkHealthLogic.tsx b/frontend/src/scenes/onboarding/shared/sdkHealth/sdkHealthLogic.tsx
index 0b507d794b20..1a348877bf17 100644
--- a/frontend/src/scenes/onboarding/shared/sdkHealth/sdkHealthLogic.tsx
+++ b/frontend/src/scenes/onboarding/shared/sdkHealth/sdkHealthLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { subscriptions } from 'kea-subscriptions'
 
@@ -8,8 +8,6 @@ import api from 'lib/api'
 import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
 import { teamLogic } from 'scenes/teamLogic'
 
-import type { sdkHealthLogicType } from './sdkHealthLogicType'
-
 // Supported SDK types for version detection and health monitoring
 export type SdkType =
     | 'web'
@@ -115,6 +113,69 @@ export type AugmentedTeamSdkVersionsInfo = {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sdkHealthLogicValues {
+    isCloudOrDev: boolean | undefined // preflightLogic
+    currentTeamId: number | null // teamLogic
+    augmentedData: AugmentedTeamSdkVersionsInfo
+    hasErrors: boolean
+    needsAttention: boolean
+    needsUpdatingCount: number
+    report: SdkHealthReportResponse | null
+    reportLoading: boolean
+    sdkHealth: SdkHealthStatus
+    snoozedUntil: string | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sdkHealthLogicActions {
+    loadReport: (options?: { forceRefresh?: boolean }) => {
+        forceRefresh?: boolean
+    }
+    loadReportFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadReportSuccess: (
+        report: SdkHealthReportResponse | null,
+        payload?: {
+            forceRefresh?: boolean
+        }
+    ) => {
+        report: SdkHealthReportResponse | null
+        payload?: {
+            forceRefresh?: boolean
+        }
+    }
+    snoozeSdkHealth: () => {
+        value: true
+    }
+    unsnooze: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sdkHealthLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        augmentedData: (report: SdkHealthReportResponse | null) => AugmentedTeamSdkVersionsInfo
+        needsUpdatingCount: (report: SdkHealthReportResponse | null) => number
+        needsAttention: (report: SdkHealthReportResponse | null, snoozedUntil: string | null) => boolean
+        sdkHealth: (report: SdkHealthReportResponse | null) => SdkHealthStatus
+        hasErrors: (report: SdkHealthReportResponse | null, reportLoading: boolean) => boolean
+    }
+}
+
+export type sdkHealthLogicType = MakeLogicType<
+    sdkHealthLogicValues,
+    sdkHealthLogicActions,
+    Record<string, any>,
+    sdkHealthLogicMeta
+>
+
 /**
  * SDK Health - PostHog SDK Health Monitoring
  *
diff --git a/frontend/src/scenes/onboarding/shared/sdkHealth/sdkHealthSceneLogic.tsx b/frontend/src/scenes/onboarding/shared/sdkHealth/sdkHealthSceneLogic.tsx
index 42fd646be6e5..b7d1cbd44c94 100644
--- a/frontend/src/scenes/onboarding/shared/sdkHealth/sdkHealthSceneLogic.tsx
+++ b/frontend/src/scenes/onboarding/shared/sdkHealth/sdkHealthSceneLogic.tsx
@@ -1,4 +1,4 @@
-import { kea, path, selectors } from 'kea'
+import { MakeLogicType, kea, path, selectors } from 'kea'
 
 import { sceneConfigurations } from 'scenes/scenes'
 import { Scene } from 'scenes/sceneTypes'
@@ -6,7 +6,12 @@ import { urls } from 'scenes/urls'
 
 import { Breadcrumb } from '~/types'
 
-import type { sdkHealthSceneLogicType } from './sdkHealthSceneLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sdkHealthSceneLogicValues {
+    breadcrumbs: Breadcrumb[]
+}
+
+export type sdkHealthSceneLogicType = MakeLogicType<sdkHealthSceneLogicValues, {}>
 
 export const sdkHealthSceneLogic = kea<sdkHealthSceneLogicType>([
     path(['scenes', 'onboarding', 'shared', 'sdkHealth', 'sdkHealthSceneLogic']),
diff --git a/frontend/src/scenes/onboarding/shared/setupWizardStatusLogic.ts b/frontend/src/scenes/onboarding/shared/setupWizardStatusLogic.ts
index 1de14c3d6026..72cede8230f7 100644
--- a/frontend/src/scenes/onboarding/shared/setupWizardStatusLogic.ts
+++ b/frontend/src/scenes/onboarding/shared/setupWizardStatusLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, getContext, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, getContext, kea, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { subscriptions } from 'kea-subscriptions'
 
@@ -9,8 +9,8 @@ import { isSharedView } from '~/exporter/exporterViewLogic'
 import { tasksList, tasksRunsList } from 'products/tasks/frontend/generated/api'
 import type { TaskRunDetailDTOApi } from 'products/tasks/frontend/generated/api.schemas'
 
-import type { setupWizardStatusLogicType } from './setupWizardStatusLogicType'
 import { activeCloudRunLogic } from './wizard-sync/activeCloudRunLogic'
+import type { CloudRunHandle } from './wizard-sync/activeCloudRunLogic'
 import {
     InstallationMode,
     InstallationProgress,
@@ -86,6 +86,64 @@ export function statusFromProgress(progress: InstallationProgress | null): Setup
     return null
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface setupWizardStatusLogicValues {
+    activeCloudRun: CloudRunHandle | null // activeCloudRunLogic
+    currentTeamId: number | null // teamLogic
+    hasActiveSession: boolean // wizardActiveSessionDetectorLogic
+    discoveredRun: DiscoveredSetupRun | null
+    discoveredRunLoading: boolean
+    liveProgress: InstallationProgress | null
+    liveRunHandle: SetupRunHandle | null
+    setupStatus: SetupWizardStatus | null
+    setupStatusLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface setupWizardStatusLogicActions {
+    liveProgressUpdated: (progress: InstallationProgress | null) => {
+        progress: InstallationProgress | null
+    }
+    loadDiscoveredRun: () => any
+    loadDiscoveredRunFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadDiscoveredRunSuccess: (
+        discoveredRun: DiscoveredSetupRun | null,
+        payload?: any
+    ) => {
+        discoveredRun: DiscoveredSetupRun | null
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface setupWizardStatusLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        liveRunHandle: (
+            activeCloudRun: CloudRunHandle | null,
+            discoveredRun: DiscoveredSetupRun | null
+        ) => SetupRunHandle | null
+        setupStatus: (
+            liveProgress: InstallationProgress | null,
+            discoveredRun: DiscoveredSetupRun | null,
+            hasActiveSession: boolean
+        ) => SetupWizardStatus | null
+        setupStatusLoading: (discoveredRunLoading: boolean) => boolean
+    }
+}
+
+export type setupWizardStatusLogicType = MakeLogicType<
+    setupWizardStatusLogicValues,
+    setupWizardStatusLogicActions,
+    Record<string, any>,
+    setupWizardStatusLogicMeta
+>
+
 /**
  * App-wide status of the onboarding wizard's setup task run (the cloud run that installs PostHog
  * in the user's codebase and opens a pull request).
@@ -198,7 +256,10 @@ export const setupWizardStatusLogic = kea<setupWizardStatusLogicType>([
     selectors({
         liveRunHandle: [
             (s) => [s.activeCloudRun, s.discoveredRun],
-            (activeCloudRun, discoveredRun): SetupRunHandle | null => {
+            (
+                activeCloudRun: null | import('./wizard-sync/activeCloudRunLogic').CloudRunHandle,
+                discoveredRun: DiscoveredSetupRun | null
+            ): SetupRunHandle | null => {
                 if (activeCloudRun) {
                     return { taskId: activeCloudRun.taskId, runId: activeCloudRun.runId }
                 }
@@ -208,7 +269,11 @@ export const setupWizardStatusLogic = kea<setupWizardStatusLogicType>([
         ],
         setupStatus: [
             (s) => [s.liveProgress, s.discoveredRun, s.hasActiveSession],
-            (liveProgress, discoveredRun, hasActiveSession): SetupWizardStatus | null => {
+            (
+                liveProgress: InstallationProgress | null,
+                discoveredRun: DiscoveredSetupRun | null,
+                hasActiveSession: boolean
+            ): SetupWizardStatus | null => {
                 const live = statusFromProgress(liveProgress)
                 const discovered = discoveredRun?.status ?? null
                 if (live?.kind === 'pull_request') {
@@ -237,7 +302,10 @@ export const setupWizardStatusLogic = kea<setupWizardStatusLogicType>([
                 return hasActiveSession ? { kind: 'installing', mode: 'local' } : null
             },
         ],
-        setupStatusLoading: [(s) => [s.discoveredRunLoading], (discoveredRunLoading): boolean => discoveredRunLoading],
+        setupStatusLoading: [
+            (s) => [s.discoveredRunLoading],
+            (discoveredRunLoading: boolean): boolean => discoveredRunLoading,
+        ],
     }),
     subscriptions(({ actions, cache }) => ({
         // The afterMount load no-ops when the logic mounts before the team is known; (re)load once
diff --git a/frontend/src/scenes/onboarding/shared/wizard-sync/activeCloudRunLogic.ts b/frontend/src/scenes/onboarding/shared/wizard-sync/activeCloudRunLogic.ts
index d40efa213c2d..63acb6f96358 100644
--- a/frontend/src/scenes/onboarding/shared/wizard-sync/activeCloudRunLogic.ts
+++ b/frontend/src/scenes/onboarding/shared/wizard-sync/activeCloudRunLogic.ts
@@ -1,9 +1,7 @@
-import { actions, connect, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, path, reducers, selectors } from 'kea'
 
 import { projectLogic } from 'scenes/projectLogic'
 
-import type { activeCloudRunLogicType } from './activeCloudRunLogicType'
-
 export interface CloudRunHandle {
     taskId: string
     runId: string
@@ -21,6 +19,52 @@ export function scopedCloudRun(handle: CloudRunHandle | null, currentProjectId:
     return handle?.projectId != null && handle.projectId === currentProjectId ? handle : null
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface activeCloudRunLogicValues {
+    currentProjectId: number | null // projectLogic
+    activeCloudRun: CloudRunHandle | null
+    panelMounted: boolean
+    persistedCloudRun: CloudRunHandle | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface activeCloudRunLogicActions {
+    clearActiveCloudRun: () => {
+        value: true
+    }
+    setActiveCloudRun: (
+        taskId: string,
+        runId: string,
+        startedAt: string,
+        projectId: number
+    ) => {
+        projectId: number
+        runId: string
+        startedAt: string
+        taskId: string
+    }
+    setPanelMounted: (mounted: boolean) => {
+        mounted: boolean
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface activeCloudRunLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        activeCloudRun: (
+            persistedCloudRun: CloudRunHandle | null,
+            currentProjectId: number | null
+        ) => CloudRunHandle | null
+    }
+}
+
+export type activeCloudRunLogicType = MakeLogicType<
+    activeCloudRunLogicValues,
+    activeCloudRunLogicActions,
+    Record<string, any>,
+    activeCloudRunLogicMeta
+>
+
 /**
  * Holds the active cloud-run handle app-wide so the global progress FAB can keep showing a run after
  * the user advances past (or unmounts) the install step. Persisted so it also survives a refresh during
@@ -74,7 +118,7 @@ export const activeCloudRunLogic = kea<activeCloudRunLogicType>([
     selectors({
         activeCloudRun: [
             (s) => [s.persistedCloudRun, s.currentProjectId],
-            (persistedCloudRun, currentProjectId): CloudRunHandle | null =>
+            (persistedCloudRun: CloudRunHandle | null, currentProjectId: number | null): CloudRunHandle | null =>
                 scopedCloudRun(persistedCloudRun, currentProjectId),
         ],
     }),
diff --git a/frontend/src/scenes/onboarding/shared/wizard-sync/finishedLocalRunLogic.ts b/frontend/src/scenes/onboarding/shared/wizard-sync/finishedLocalRunLogic.ts
index f6e62b474f64..e89a06553b2a 100644
--- a/frontend/src/scenes/onboarding/shared/wizard-sync/finishedLocalRunLogic.ts
+++ b/frontend/src/scenes/onboarding/shared/wizard-sync/finishedLocalRunLogic.ts
@@ -1,10 +1,9 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 
 import { projectLogic } from 'scenes/projectLogic'
 
 import type { WizardSessionDTOApi } from 'products/wizard/frontend/generated/api.schemas'
 
-import type { finishedLocalRunLogicType } from './finishedLocalRunLogicType'
 import { wizardDashboardLogic } from './wizardDashboardLogic'
 
 /** A terminal local wizard run, snapshotted so its handoff outlives the session stream. */
@@ -19,6 +18,50 @@ export interface FinishedLocalRunHandle {
     error: { message?: string } | null
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface finishedLocalRunLogicValues {
+    currentProjectId: number | null // projectLogic
+    dismissedSessionId: string | null
+    finishedLocalRun: FinishedLocalRunHandle | null
+    persistedFinishedLocalRun: FinishedLocalRunHandle | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface finishedLocalRunLogicActions {
+    detectWizardDashboard: (args_0: { startedAt: string }) => {
+        startedAt: string
+    } // wizardDashboardLogic
+    dismissLocalRun: (sessionId: string) => {
+        sessionId: string
+    }
+    recordFinishedLocalRun: (session: WizardSessionDTOApi) => {
+        session: WizardSessionDTOApi
+    }
+    setFinishedLocalRun: (handle: FinishedLocalRunHandle) => {
+        handle: FinishedLocalRunHandle
+    }
+    supersedeFinishedLocalRun: (sessionId: string) => {
+        sessionId: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface finishedLocalRunLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        finishedLocalRun: (
+            persistedFinishedLocalRun: FinishedLocalRunHandle | null,
+            currentProjectId: number | null
+        ) => FinishedLocalRunHandle | null
+    }
+}
+
+export type finishedLocalRunLogicType = MakeLogicType<
+    finishedLocalRunLogicValues,
+    finishedLocalRunLogicActions,
+    Record<string, any>,
+    finishedLocalRunLogicMeta
+>
+
 /**
  * Keeps a finished local wizard run on screen until the user dismisses it. The live session stream
  * gates itself off shortly after a run goes terminal (INC-886), which used to take the FAB down with
@@ -65,7 +108,10 @@ export const finishedLocalRunLogic = kea<finishedLocalRunLogicType>([
     selectors({
         finishedLocalRun: [
             (s) => [s.persistedFinishedLocalRun, s.currentProjectId],
-            (persistedFinishedLocalRun, currentProjectId): FinishedLocalRunHandle | null =>
+            (
+                persistedFinishedLocalRun: FinishedLocalRunHandle | null,
+                currentProjectId: number | null
+            ): FinishedLocalRunHandle | null =>
                 persistedFinishedLocalRun && persistedFinishedLocalRun.projectId === currentProjectId
                     ? persistedFinishedLocalRun
                     : null,
diff --git a/frontend/src/scenes/onboarding/shared/wizard-sync/installationProgressLogic.ts b/frontend/src/scenes/onboarding/shared/wizard-sync/installationProgressLogic.ts
index 4bf896507439..4b5a61e437ba 100644
--- a/frontend/src/scenes/onboarding/shared/wizard-sync/installationProgressLogic.ts
+++ b/frontend/src/scenes/onboarding/shared/wizard-sync/installationProgressLogic.ts
@@ -1,4 +1,17 @@
-import { actions, afterMount, beforeUnmount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    afterMount,
+    beforeUnmount,
+    connect,
+    kea,
+    key,
+    listeners,
+    path,
+    props,
+    reducers,
+    selectors,
+} from 'kea'
 
 import { elapsedSecondsFrom } from 'lib/utils/datetime'
 import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
@@ -6,9 +19,10 @@ import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
 import type { WizardSessionDTOApi } from 'products/wizard/frontend/generated/api.schemas'
 import { wizardSessionStreamLogic } from 'products/wizard/frontend/wizardSessionStreamLogic'
 
+import type { WizardConnectionStatus } from '../../../../../../products/wizard/frontend/wizardSessionStreamLogic'
 import { activeCloudRunLogic } from './activeCloudRunLogic'
+import type { CloudRunHandle } from './activeCloudRunLogic'
 import { finishedLocalRunLogic, FinishedLocalRunHandle } from './finishedLocalRunLogic'
-import type { installationProgressLogicType } from './installationProgressLogicType'
 import {
     taskRunPrMerged,
     taskRunPrUrl,
@@ -16,6 +30,7 @@ import {
     TaskRunProgressStep,
     TaskRunStreamState,
 } from './taskRunStreamLogic'
+import type { TaskRunConnectionStatus } from './taskRunStreamLogic'
 import { isSessionActive, wizardActiveSessionDetectorLogic } from './wizardActiveSessionDetectorLogic'
 import { wizardDashboardLogic } from './wizardDashboardLogic'
 
@@ -334,6 +349,105 @@ export function progressFromFinishedLocalRun(handle: FinishedLocalRunHandle): In
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface installationProgressLogicValues {
+    activeCloudRun: CloudRunHandle | null // activeCloudRunLogic
+    dismissedSessionId: string | null // finishedLocalRunLogic
+    isStalled: boolean // taskRunStreamLogic
+    progressSteps: TaskRunProgressStep[] // taskRunStreamLogic
+    taskConnectionStatus: TaskRunConnectionStatus // taskRunStreamLogic
+    taskRunState: TaskRunStreamState | null // taskRunStreamLogic
+    latestSession: WizardSessionDTOApi | null // wizardSessionStreamLogic
+    sessionConnectionStatus: WizardConnectionStatus // wizardSessionStreamLogic
+    installationProgress: InstallationProgress
+    sessionIsCurrent: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface installationProgressLogicActions {
+    reportWizardSyncSessionDetected: (props: {
+        runPhase: string
+        skillId: string
+        taskCount: number
+        workflowId: string
+    }) => {
+        runPhase: string
+        skillId: string
+        taskCount: number
+        workflowId: string
+    } // eventUsageLogic
+    reportWizardSyncSessionFinished: (props: {
+        completedTaskCount: number
+        elapsedSeconds: number
+        outcome: string
+        skillId: string
+        taskCount: number
+        workflowId: string
+    }) => {
+        completedTaskCount: number
+        elapsedSeconds: number
+        outcome: string
+        skillId: string
+        taskCount: number
+        workflowId: string
+    } // eventUsageLogic
+    recordFinishedLocalRun: (session: WizardSessionDTOApi) => {
+        session: WizardSessionDTOApi
+    } // finishedLocalRunLogic
+    supersedeFinishedLocalRun: (sessionId: string) => {
+        sessionId: string
+    } // finishedLocalRunLogic
+    connectTaskRun: () => {
+        value: true
+    } // taskRunStreamLogic
+    disconnectTaskRun: () => {
+        value: true
+    } // taskRunStreamLogic
+    taskRunStreamCompleted: () => {
+        value: true
+    } // taskRunStreamLogic
+    detectWizardDashboard: (args_0: { startedAt: string }) => {
+        startedAt: string
+    } // wizardDashboardLogic
+    connectSession: () => {
+        value: true
+    } // wizardSessionStreamLogic
+    disconnectSession: () => {
+        value: true
+    } // wizardSessionStreamLogic
+    sessionUpdated: (session: WizardSessionDTOApi) => {
+        session: WizardSessionDTOApi
+    } // wizardSessionStreamLogic
+    markSessionCurrent: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface installationProgressLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        installationProgress: (
+            taskRunState: TaskRunStreamState | null,
+            progressSteps: TaskRunProgressStep[],
+            taskConnectionStatus: TaskRunConnectionStatus,
+            latestSession: WizardSessionDTOApi | null,
+            sessionConnectionStatus: WizardConnectionStatus,
+            sessionIsCurrent: boolean,
+            isStalled: boolean,
+            dismissedSessionId: string | null,
+            arg: any
+        ) => InstallationProgress
+    }
+}
+
+export type installationProgressLogicType = MakeLogicType<
+    installationProgressLogicValues,
+    installationProgressLogicActions,
+    InstallationProgressLogicProps,
+    installationProgressLogicMeta
+>
+
 /**
  * The Installation layer: one normalized `InstallationProgress` the UI renders, hiding which underlying
  * stream(s) feed it.
@@ -403,14 +517,14 @@ export const installationProgressLogic = kea<installationProgressLogicType>([
                 (_, props) => props.mode,
             ],
             (
-                taskRunState,
-                progressSteps,
-                taskConnectionStatus,
-                latestSession,
-                sessionConnectionStatus,
-                sessionIsCurrent,
-                isStalled,
-                dismissedSessionId,
+                taskRunState: TaskRunStreamState | null,
+                progressSteps: TaskRunProgressStep[],
+                taskConnectionStatus: import('./taskRunStreamLogic').TaskRunConnectionStatus,
+                latestSession: WizardSessionDTOApi | null,
+                sessionConnectionStatus: import('products/wizard/frontend/wizardSessionStreamLogic').WizardConnectionStatus,
+                sessionIsCurrent: boolean,
+                isStalled: boolean,
+                dismissedSessionId: string | null,
                 mode
             ): InstallationProgress =>
                 mode === 'cloud'
diff --git a/frontend/src/scenes/onboarding/shared/wizard-sync/taskRunStreamLogic.ts b/frontend/src/scenes/onboarding/shared/wizard-sync/taskRunStreamLogic.ts
index f8b2d09e136a..c5b26b132e1d 100644
--- a/frontend/src/scenes/onboarding/shared/wizard-sync/taskRunStreamLogic.ts
+++ b/frontend/src/scenes/onboarding/shared/wizard-sync/taskRunStreamLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers } from 'kea'
 
 import { logSyncDebug } from 'lib/wizard-sync/wizardSyncDebugLogic'
 import { projectLogic } from 'scenes/projectLogic'
@@ -8,7 +8,7 @@ import type { TaskRunDetailDTOApi } from 'products/tasks/frontend/generated/api.
 
 import { onboardingEventUsageLogic } from '../../onboardingEventUsageLogic'
 import { activeCloudRunLogic } from './activeCloudRunLogic'
-import type { taskRunStreamLogicType } from './taskRunStreamLogicType'
+import type { CloudRunHandle } from './activeCloudRunLogic'
 
 export type TaskRunConnectionStatus = 'idle' | 'connecting' | 'open' | 'closed' | 'error'
 
@@ -172,6 +172,76 @@ export function cloudRunCompletionReport(
 // wizard tracker's once-per-session report guards.
 const reportedTerminalRuns = new Set<string>()
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface taskRunStreamLogicValues {
+    activeCloudRun: CloudRunHandle | null // activeCloudRunLogic
+    currentProjectId: number | null // projectLogic
+    connectionStatus: TaskRunConnectionStatus
+    isComplete: boolean
+    isStalled: boolean
+    lastError: string | null
+    progressSteps: TaskRunProgressStep[]
+    taskRunState: TaskRunStreamState | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface taskRunStreamLogicActions {
+    reportContextOnboardingCloudRunCompleted: (props: {
+        durationSeconds: number | null
+        prOpened: boolean
+        prUrl: string | null
+        runId: string
+        status: 'cancelled' | 'completed' | 'failed'
+        taskId: string
+    }) => {
+        durationSeconds: number | null
+        prOpened: boolean
+        prUrl: string | null
+        runId: string
+        status: 'cancelled' | 'completed' | 'failed'
+        taskId: string
+    } // onboardingEventUsageLogic
+    connect: () => {
+        value: true
+    }
+    connectionErrored: (error: string) => {
+        error: string
+    }
+    connectionOpened: () => {
+        value: true
+    }
+    connectionSkipped: () => {
+        value: true
+    }
+    disconnect: () => {
+        value: true
+    }
+    progressStepUpdated: (step: TaskRunProgressStep) => {
+        step: TaskRunProgressStep
+    }
+    runStalled: () => {
+        value: true
+    }
+    streamCompleted: () => {
+        value: true
+    }
+    taskRunStateUpdated: (state: TaskRunStreamState) => {
+        state: TaskRunStreamState
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface taskRunStreamLogicMeta {
+    key: string
+}
+
+export type taskRunStreamLogicType = MakeLogicType<
+    taskRunStreamLogicValues,
+    taskRunStreamLogicActions,
+    TaskRunStreamLogicProps,
+    taskRunStreamLogicMeta
+>
+
 /**
  * Raw SSE consumer for a single TaskRun (the cloud-run pipeline: provision → clone → wizard → agent →
  * PR). A private source for the Installation layer — `installationProgressLogic` merges this with the
diff --git a/frontend/src/scenes/onboarding/shared/wizard-sync/wizardActiveSessionDetectorLogic.ts b/frontend/src/scenes/onboarding/shared/wizard-sync/wizardActiveSessionDetectorLogic.ts
index b555ccff6384..7b0ef98032b6 100644
--- a/frontend/src/scenes/onboarding/shared/wizard-sync/wizardActiveSessionDetectorLogic.ts
+++ b/frontend/src/scenes/onboarding/shared/wizard-sync/wizardActiveSessionDetectorLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { subscriptions } from 'kea-subscriptions'
 import posthog from 'posthog-js'
 
@@ -11,8 +11,6 @@ import { projectLogic } from 'scenes/projectLogic'
 import { wizardSessionsLatestRetrieve } from 'products/wizard/frontend/generated/api'
 import type { WizardSessionDTOApi } from 'products/wizard/frontend/generated/api.schemas'
 
-import type { wizardActiveSessionDetectorLogicType } from './wizardActiveSessionDetectorLogicType'
-
 const WORKFLOW_ID = 'posthog-integration'
 
 // Cheap REST repoll cadence used to surface a wizard run that was kicked off
@@ -65,6 +63,54 @@ export function isSessionActive(session: WizardSessionDTOApi | null | undefined)
     return true
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface wizardActiveSessionDetectorLogicValues {
+    currentProjectId: number | null // projectLogic
+    hasActiveSession: boolean
+    lastError: string | null
+    permanentlyDisabled: boolean
+    shouldStream: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface wizardActiveSessionDetectorLogicActions {
+    cancelScheduledMarkInactive: () => {
+        value: true
+    }
+    check: () => {
+        value: true
+    }
+    markActive: () => {
+        value: true
+    }
+    markInactive: () => {
+        value: true
+    }
+    markPermanentlyDisabled: () => {
+        value: true
+    }
+    scheduleMarkInactive: () => {
+        value: true
+    }
+    setLastError: (error: string | null) => {
+        error: string | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface wizardActiveSessionDetectorLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        shouldStream: (hasActiveSession: boolean) => boolean
+    }
+}
+
+export type wizardActiveSessionDetectorLogicType = MakeLogicType<
+    wizardActiveSessionDetectorLogicValues,
+    wizardActiveSessionDetectorLogicActions,
+    Record<string, any>,
+    wizardActiveSessionDetectorLogicMeta
+>
+
 /**
  * Decides whether the global wizard FAB should subscribe to the SSE stream.
  *
@@ -122,7 +168,7 @@ export const wizardActiveSessionDetectorLogic = kea<wizardActiveSessionDetectorL
         ],
     }),
     selectors({
-        shouldStream: [(s) => [s.hasActiveSession], (hasActiveSession): boolean => hasActiveSession],
+        shouldStream: [(s) => [s.hasActiveSession], (hasActiveSession: boolean): boolean => hasActiveSession],
     }),
     listeners(({ actions, values, cache }) => ({
         check: async () => {
diff --git a/frontend/src/scenes/onboarding/shared/wizard-sync/wizardCloudRunLogic.ts b/frontend/src/scenes/onboarding/shared/wizard-sync/wizardCloudRunLogic.ts
index 94ebefd0c338..5046a819f28d 100644
--- a/frontend/src/scenes/onboarding/shared/wizard-sync/wizardCloudRunLogic.ts
+++ b/frontend/src/scenes/onboarding/shared/wizard-sync/wizardCloudRunLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 
 import { lemonToast } from '@posthog/lemon-ui'
 
@@ -9,6 +9,8 @@ import { urls } from 'scenes/urls'
 
 import { IntegrationType, OnboardingStepKey } from '~/types'
 
+import type { ProductKey } from '../../../../queries/schema/schema-general'
+import type { SDK } from '../../../../types'
 // Deliberate shared → legacy imports: onboardingLogic is the onboarding state machine both variants
 // run on (step key for the GitHub-connect return URL), and sdksLogic carries the user's manual SDK
 // pick (the cloud wizard's skill hint). Both no-op gracefully in flows that don't set them.
@@ -16,7 +18,6 @@ import { onboardingLogic } from '../../legacy/onboardingLogic'
 import { sdksLogic } from '../../legacy/sdks/sdksLogic'
 import { onboardingEventUsageLogic } from '../../onboardingEventUsageLogic'
 import { activeCloudRunLogic } from './activeCloudRunLogic'
-import type { wizardCloudRunLogicType } from './wizardCloudRunLogicType'
 
 export type CloudRunStatus =
     | 'idle' // No request in flight — show connect / repo-pick / start UI.
@@ -30,6 +31,82 @@ export type CloudRunStatus =
 // the user's machine.
 export const WIZARD_CLOUD_RUN_WORKFLOW_ID = 'posthog-integration'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface wizardCloudRunLogicValues {
+    integrations: IntegrationType[] | null // integrationsLogic
+    currentStepProductKey: ProductKey | null // onboardingLogic
+    selectedSDK: SDK | null // sdksLogic
+    currentProjectId: number | string // teamLogic
+    cloudRunRunId: string | null
+    cloudRunStatus: CloudRunStatus
+    cloudRunTaskId: string | null
+    connectGitHubUrl: string
+    githubIntegration: IntegrationType | null
+    isGithubConnected: boolean
+    selectedRepository: string | null
+    skillId: string | undefined
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface wizardCloudRunLogicActions {
+    clearActiveCloudRun: () => {
+        value: true
+    } // activeCloudRunLogic
+    setActiveCloudRun: (
+        taskId: string,
+        runId: string,
+        startedAt: string,
+        projectId: number
+    ) => {
+        projectId: number
+        runId: string
+        startedAt: string
+        taskId: string
+    } // activeCloudRunLogic
+    loadIntegrations: () => any // integrationsLogic
+    reportContextOnboardingCloudRunQueued: (props: { repository: string; runId: string; taskId: string }) => {
+        repository: string
+        runId: string
+        taskId: string
+    } // onboardingEventUsageLogic
+    setCloudRunHandle: (
+        taskId: string,
+        runId: string
+    ) => {
+        runId: string
+        taskId: string
+    }
+    setSelectedRepository: (repository: string | null) => {
+        repository: string | null
+    }
+    startCloudRun: () => {
+        value: true
+    }
+    startCloudRunFailure: () => {
+        value: true
+    }
+    startCloudRunSuccess: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface wizardCloudRunLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        githubIntegration: (integrations: IntegrationType[] | null) => IntegrationType | null
+        isGithubConnected: (githubIntegration: IntegrationType | null) => boolean
+        connectGitHubUrl: (currentStepProductKey: ProductKey | null) => string
+        skillId: (selectedSDK: SDK | null) => string | undefined
+    }
+}
+
+export type wizardCloudRunLogicType = MakeLogicType<
+    wizardCloudRunLogicValues,
+    wizardCloudRunLogicActions,
+    Record<string, any>,
+    wizardCloudRunLogicMeta
+>
+
 /**
  * Drives the "open a PR for me" option on the install step:
  *   - resolves the team's GitHub integration (or the URL to connect one)
@@ -112,10 +189,13 @@ export const wizardCloudRunLogic = kea<wizardCloudRunLogicType>([
             (integrations: IntegrationType[] | null): IntegrationType | null =>
                 integrations?.find((i) => i.kind === 'github') ?? null,
         ],
-        isGithubConnected: [(s) => [s.githubIntegration], (githubIntegration): boolean => !!githubIntegration],
+        isGithubConnected: [
+            (s) => [s.githubIntegration],
+            (githubIntegration: IntegrationType | null): boolean => !!githubIntegration,
+        ],
         connectGitHubUrl: [
             (s) => [s.currentStepProductKey],
-            (currentStepProductKey): string => {
+            (currentStepProductKey: null | import('../../../../queries/schema').ProductKey): string => {
                 // Full-page redirect to install/authorize the GitHub App, then back to
                 // the install step. integrationsLogic's callback appends the new
                 // integration id, and loadIntegrations() repopulates githubIntegration,
@@ -129,7 +209,10 @@ export const wizardCloudRunLogic = kea<wizardCloudRunLogicType>([
         ],
         // The cloud wizard auto-detects the framework, so this is a hint rather than a
         // requirement — only set when the user happens to have picked an SDK manually.
-        skillId: [(s) => [s.selectedSDK], (selectedSDK): string | undefined => selectedSDK?.key],
+        skillId: [
+            (s) => [s.selectedSDK],
+            (selectedSDK: null | import('~/types').SDK): string | undefined => selectedSDK?.key,
+        ],
     }),
     listeners(({ values, actions }) => ({
         startCloudRun: async () => {
diff --git a/frontend/src/scenes/onboarding/shared/wizard-sync/wizardDashboardLogic.ts b/frontend/src/scenes/onboarding/shared/wizard-sync/wizardDashboardLogic.ts
index 6a9b8b103abe..ed1239f14781 100644
--- a/frontend/src/scenes/onboarding/shared/wizard-sync/wizardDashboardLogic.ts
+++ b/frontend/src/scenes/onboarding/shared/wizard-sync/wizardDashboardLogic.ts
@@ -1,4 +1,4 @@
-import { connect, kea, path } from 'kea'
+import { MakeLogicType, connect, kea, path } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { projectLogic } from 'scenes/projectLogic'
@@ -6,8 +6,6 @@ import { projectLogic } from 'scenes/projectLogic'
 import { dashboardsList } from 'products/dashboards/frontend/generated/api'
 import type { DashboardBasicApi } from 'products/dashboards/frontend/generated/api.schemas'
 
-import type { wizardDashboardLogicType } from './wizardDashboardLogicType'
-
 // The wizard stamps started_at from its own clock (the user's machine or the sandbox), while
 // dashboard created_at is server time — tolerate a skewed CLI clock so a dashboard created in the
 // first seconds of a run isn't filtered out.
@@ -48,6 +46,40 @@ export function pickWizardDashboard(dashboards: DashboardCandidate[], startedAt:
     return top ? { id: top.id, name: top.name ?? null } : null
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface wizardDashboardLogicValues {
+    currentProjectId: number | null // projectLogic
+    detectedDashboard: DetectedDashboard | null
+    detectedDashboardLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface wizardDashboardLogicActions {
+    detectWizardDashboard: ({ startedAt }: { startedAt: string }) => {
+        startedAt: string
+    }
+    detectWizardDashboardFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    detectWizardDashboardSuccess: (
+        detectedDashboard: DetectedDashboard | null,
+        payload?: {
+            startedAt: string
+        }
+    ) => {
+        detectedDashboard: DetectedDashboard | null
+        payload?: {
+            startedAt: string
+        }
+    }
+}
+
+export type wizardDashboardLogicType = MakeLogicType<wizardDashboardLogicValues, wizardDashboardLogicActions>
+
 /**
  * Detects the dashboard the wizard was instructed to build, so completed-run surfaces can hand the
  * user straight to it. Fired by the Installation layer when a run (local or cloud) completes;
diff --git a/frontend/src/scenes/onboarding/shared/wizard-sync/wizardSyncUiLogic.ts b/frontend/src/scenes/onboarding/shared/wizard-sync/wizardSyncUiLogic.ts
index 3058929c06d4..1cc5153438a2 100644
--- a/frontend/src/scenes/onboarding/shared/wizard-sync/wizardSyncUiLogic.ts
+++ b/frontend/src/scenes/onboarding/shared/wizard-sync/wizardSyncUiLogic.ts
@@ -1,6 +1,28 @@
-import { actions, kea, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers } from 'kea'
 
-import type { wizardSyncUiLogicType } from './wizardSyncUiLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface wizardSyncUiLogicValues {
+    dialogOpen: boolean
+    dismissedKey: string | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface wizardSyncUiLogicActions {
+    closeDialog: () => {
+        value: true
+    }
+    dismiss: (key: string) => {
+        key: string
+    }
+    openDialog: () => {
+        value: true
+    }
+    restore: () => {
+        value: true
+    }
+}
+
+export type wizardSyncUiLogicType = MakeLogicType<wizardSyncUiLogicValues, wizardSyncUiLogicActions>
 
 /**
  * UI state for the detached wizard sync widget, shared app-wide (mounted by WizardSyncFab):
diff --git a/frontend/src/scenes/organization/ConfirmOrganization/confirmOrganizationLogic.ts b/frontend/src/scenes/organization/ConfirmOrganization/confirmOrganizationLogic.ts
index 81854f718cd5..c71353fff064 100644
--- a/frontend/src/scenes/organization/ConfirmOrganization/confirmOrganizationLogic.ts
+++ b/frontend/src/scenes/organization/ConfirmOrganization/confirmOrganizationLogic.ts
@@ -1,13 +1,12 @@
-import { actions, kea, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { urlToAction } from 'kea-router'
 
 import api from 'lib/api'
 import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
 import { getRelativeNextPath } from 'lib/utils/url'
 
-import type { confirmOrganizationLogicType } from './confirmOrganizationLogicType'
-
 export interface ConfirmOrganizationFormValues {
     organization_name?: string
     first_name?: string
@@ -16,6 +15,74 @@ export interface ConfirmOrganizationFormValues {
     referral_source_ai_prompt?: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface confirmOrganizationLogicValues {
+    confirmOrganization: ConfirmOrganizationFormValues
+    confirmOrganizationAllErrors: Record<string, any>
+    confirmOrganizationChanged: boolean
+    confirmOrganizationErrors: DeepPartialMap<ConfirmOrganizationFormValues, ValidationErrorType>
+    confirmOrganizationHasErrors: boolean
+    confirmOrganizationManualErrors: Record<string, any>
+    confirmOrganizationTouched: boolean
+    confirmOrganizationTouches: Record<string, boolean>
+    confirmOrganizationValidationErrors: DeepPartialMap<ConfirmOrganizationFormValues, ValidationErrorType>
+    email: string
+    isConfirmOrganizationSubmitting: boolean
+    isConfirmOrganizationValid: boolean
+    showConfirmOrganizationErrors: boolean
+    showNewOrgWarning: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface confirmOrganizationLogicActions {
+    resetConfirmOrganization: (values?: ConfirmOrganizationFormValues) => {
+        values?: ConfirmOrganizationFormValues
+    }
+    setConfirmOrganizationManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setConfirmOrganizationValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setConfirmOrganizationValues: (values: DeepPartial<ConfirmOrganizationFormValues>) => {
+        values: DeepPartial<ConfirmOrganizationFormValues>
+    }
+    setEmail: (email: string) => {
+        email: string
+    }
+    setShowNewOrgWarning: (show: boolean) => {
+        show: boolean
+    }
+    submitConfirmOrganization: () => {
+        value: boolean
+    }
+    submitConfirmOrganizationFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitConfirmOrganizationRequest: (confirmOrganization: ConfirmOrganizationFormValues) => {
+        confirmOrganization: ConfirmOrganizationFormValues
+    }
+    submitConfirmOrganizationSuccess: (confirmOrganization: ConfirmOrganizationFormValues) => {
+        confirmOrganization: ConfirmOrganizationFormValues
+    }
+    touchConfirmOrganizationField: (key: string) => {
+        key: string
+    }
+}
+
+export type confirmOrganizationLogicType = MakeLogicType<
+    confirmOrganizationLogicValues,
+    confirmOrganizationLogicActions
+>
+
 export const confirmOrganizationLogic = kea<confirmOrganizationLogicType>([
     path(['scenes', 'organization', 'confirmOrganizationLogic']),
 
diff --git a/frontend/src/scenes/organization/membersExportLogic.ts b/frontend/src/scenes/organization/membersExportLogic.ts
index ca10c9da5ab7..be098ad17622 100644
--- a/frontend/src/scenes/organization/membersExportLogic.ts
+++ b/frontend/src/scenes/organization/membersExportLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, selectors } from 'kea'
 
 import { downloadBlob } from 'lib/components/ExportButton/exporter'
 import { dayjs } from 'lib/dayjs'
@@ -11,7 +11,7 @@ import { organizationLogic } from 'scenes/organizationLogic'
 
 import { OrganizationMemberType } from '~/types'
 
-import type { membersExportLogicType } from './membersExportLogicType'
+import type { OrganizationType } from '../../types'
 import { membersLogic } from './membersLogic'
 
 function escapeCsvField(value: string): string {
@@ -63,6 +63,38 @@ function buildOrganizationMembersCsv(members: OrganizationMemberType[]): string
     return lines.join('\r\n')
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface membersExportLogicValues {
+    membersLoading: boolean // membersLogic
+    sortedMembers: OrganizationMemberType[] | null // membersLogic
+    currentOrganization: OrganizationType | null // organizationLogic
+    downloadMembersListDisabledReason: string | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface membersExportLogicActions {
+    downloadMembersList: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface membersExportLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        downloadMembersListDisabledReason: (
+            membersLoading: boolean,
+            sortedMembers: OrganizationMemberType[] | null
+        ) => string | null
+    }
+}
+
+export type membersExportLogicType = MakeLogicType<
+    membersExportLogicValues,
+    membersExportLogicActions,
+    Record<string, any>,
+    membersExportLogicMeta
+>
+
 export const membersExportLogic = kea<membersExportLogicType>([
     path(['scenes', 'organization', 'membersExportLogic']),
     connect(() => ({
@@ -74,7 +106,7 @@ export const membersExportLogic = kea<membersExportLogicType>([
     selectors({
         downloadMembersListDisabledReason: [
             (s) => [s.membersLoading, s.sortedMembers],
-            (membersLoading, sortedMembers): string | null =>
+            (membersLoading: boolean, sortedMembers: OrganizationMemberType[] | null): string | null =>
                 membersLoading && !sortedMembers?.length
                     ? 'Loading members...'
                     : !sortedMembers?.length
diff --git a/frontend/src/scenes/organization/membersLogic.tsx b/frontend/src/scenes/organization/membersLogic.tsx
index a281e613311f..23c3f7a9003b 100644
--- a/frontend/src/scenes/organization/membersLogic.tsx
+++ b/frontend/src/scenes/organization/membersLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -11,8 +11,6 @@ import { userLogic } from 'scenes/userLogic'
 
 import { OrganizationMemberScopedApiKeysResponse, OrganizationMemberType, UserType } from '~/types'
 
-import type { membersLogicType } from './membersLogicType'
-
 const PAGINATION_LIMIT = 200
 
 function meAsMember(user: UserType): OrganizationMemberType {
@@ -37,6 +35,195 @@ function meAsMember(user: UserType): OrganizationMemberType {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface membersLogicValues {
+    user: UserType | null // userLogic
+    filteredMembers: OrganizationMemberType[]
+    me: OrganizationMemberType | null
+    meFirstMembers: OrganizationMemberType[]
+    memberCount: number
+    members: OrganizationMemberType[] | null
+    membersLoading: boolean
+    otherMembers: OrganizationMemberType[]
+    scopedApiKeys: OrganizationMemberScopedApiKeysResponse | null
+    scopedApiKeysLoading: boolean
+    search: string
+    searchedMembers: OrganizationMemberType[] | null
+    searchedMembersLoading: boolean
+    selectableMembers: (membersToExclude?: (number | string)[], by?: 'id' | 'uuid') => OrganizationMemberType[]
+    sortedMembers: OrganizationMemberType[] | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface membersLogicActions {
+    changeMemberAccessLevel: (
+        member: OrganizationMemberType,
+        level: OrganizationMembershipLevel
+    ) => {
+        level: OrganizationMembershipLevel
+        member: OrganizationMemberType
+    }
+    changeMemberAccessLevelFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    changeMemberAccessLevelSuccess: (
+        members: OrganizationMemberType[] | null,
+        payload?: {
+            level: OrganizationMembershipLevel
+            member: OrganizationMemberType
+        }
+    ) => {
+        members: OrganizationMemberType[] | null
+        payload?: {
+            level: OrganizationMembershipLevel
+            member: OrganizationMemberType
+        }
+    }
+    ensureAllMembersLoaded: () => {
+        value: true
+    }
+    loadAllMembers: () => {
+        value: true
+    }
+    loadAllMembersFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAllMembersSuccess: (
+        members: OrganizationMemberType[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        members: OrganizationMemberType[]
+        payload?: {
+            value: true
+        }
+    }
+    loadMemberScopedApiKeys: (member: OrganizationMemberType) => {
+        member: OrganizationMemberType
+    }
+    loadMemberScopedApiKeysFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadMemberScopedApiKeysSuccess: (
+        scopedApiKeys: OrganizationMemberScopedApiKeysResponse | null,
+        payload?: {
+            member: OrganizationMemberType
+        }
+    ) => {
+        scopedApiKeys: OrganizationMemberScopedApiKeysResponse | null
+        payload?: {
+            member: OrganizationMemberType
+        }
+    }
+    loadMemberUpdates: () => {
+        value: true
+    }
+    loadMemberUpdatesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadMemberUpdatesSuccess: (
+        members: OrganizationMemberType[] | null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        members: OrganizationMemberType[] | null
+        payload?: {
+            value: true
+        }
+    }
+    loadSearchedMembers: () => {
+        value: true
+    }
+    loadSearchedMembersFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSearchedMembersSuccess: (
+        searchedMembers: OrganizationMemberType[] | null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        searchedMembers: OrganizationMemberType[] | null
+        payload?: {
+            value: true
+        }
+    }
+    postRemoveMember: (userUuid: string) => {
+        userUuid: string
+    }
+    removeMember: (member: OrganizationMemberType) => OrganizationMemberType
+    removeMemberFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    removeMemberSuccess: (
+        members: OrganizationMemberType[] | null,
+        payload?: OrganizationMemberType
+    ) => {
+        members: OrganizationMemberType[] | null
+        payload?: OrganizationMemberType
+    }
+    setSearch: (search: any) => {
+        search: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface membersLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        sortedMembers: (members: OrganizationMemberType[] | null) => OrganizationMemberType[] | null
+        meFirstMembers: (
+            sortedMembers: OrganizationMemberType[] | null,
+            user: UserType | null
+        ) => OrganizationMemberType[]
+        me: (user: UserType | null) => OrganizationMemberType | null
+        otherMembers: (filteredMembers: OrganizationMemberType[], user: UserType | null) => OrganizationMemberType[]
+        selectableMembers: (
+            me: OrganizationMemberType | null,
+            otherMembers: OrganizationMemberType[],
+            search: string
+        ) => (membersToExclude?: (number | string)[], by?: 'id' | 'uuid') => OrganizationMemberType[]
+        filteredMembers: (
+            meFirstMembers: OrganizationMemberType[],
+            searchedMembers: OrganizationMemberType[] | null,
+            search: string
+        ) => OrganizationMemberType[]
+        memberCount: (user: UserType | null, sortedMembers: OrganizationMemberType[] | null) => number
+    }
+}
+
+export type membersLogicType = MakeLogicType<
+    membersLogicValues,
+    membersLogicActions,
+    Record<string, any>,
+    membersLogicMeta
+>
+
 export const membersLogic = kea<membersLogicType>([
     path(['scenes', 'organization', 'membersLogic']),
     connect(() => ({
@@ -156,7 +343,7 @@ export const membersLogic = kea<membersLogicType>([
     selectors({
         sortedMembers: [
             (s) => [s.members],
-            (members): OrganizationMemberType[] | null => {
+            (members: OrganizationMemberType[] | null): OrganizationMemberType[] | null => {
                 if (!members) {
                     return null
                 }
@@ -165,7 +352,7 @@ export const membersLogic = kea<membersLogicType>([
         ],
         meFirstMembers: [
             (s) => [s.sortedMembers, s.user],
-            (members, user): OrganizationMemberType[] => {
+            (members: OrganizationMemberType[] | null, user: UserType | null): OrganizationMemberType[] => {
                 const me = user && members?.find((member) => member.user.uuid === user.uuid)
                 const result: OrganizationMemberType[] = me ? [me] : []
                 for (const member of members ?? []) {
@@ -176,15 +363,18 @@ export const membersLogic = kea<membersLogicType>([
                 return result
             },
         ],
-        me: [(s) => [s.user], (user): OrganizationMemberType | null => (user ? meAsMember(user) : null)],
+        me: [
+            (s) => [s.user],
+            (user: UserType | null): OrganizationMemberType | null => (user ? meAsMember(user) : null),
+        ],
         otherMembers: [
             (s) => [s.filteredMembers, s.user],
-            (filteredMembers, user): OrganizationMemberType[] =>
+            (filteredMembers: OrganizationMemberType[], user: UserType | null): OrganizationMemberType[] =>
                 user ? filteredMembers.filter((member) => member.user.uuid !== user.uuid) : filteredMembers,
         ],
         selectableMembers: [
             (s) => [s.me, s.otherMembers, s.search],
-            (me, otherMembers, search) =>
+            (me: OrganizationMemberType | null, otherMembers: OrganizationMemberType[], search: string) =>
                 (membersToExclude: (string | number)[] = [], by: 'id' | 'uuid' = 'id'): OrganizationMemberType[] => {
                     const members = me && !search.trim() ? [me, ...otherMembers] : otherMembers
                     return members.filter((member) => !membersToExclude.includes(member.user[by]))
@@ -192,7 +382,11 @@ export const membersLogic = kea<membersLogicType>([
         ],
         filteredMembers: [
             (s) => [s.meFirstMembers, s.searchedMembers, s.search],
-            (members, searched, search): OrganizationMemberType[] => {
+            (
+                members: OrganizationMemberType[],
+                searched: OrganizationMemberType[] | null,
+                search: string
+            ): OrganizationMemberType[] => {
                 // When a search term is set, return the (server-filtered) searchedMembers
                 // — this avoids polluting the canonical `members` store with a filtered
                 // subset, so other consumers (rolesLogic, hedgehogModeLogic) keep seeing
@@ -206,7 +400,7 @@ export const membersLogic = kea<membersLogicType>([
         ],
         memberCount: [
             (s) => [s.user, s.sortedMembers],
-            (user, members): number => {
+            (user: UserType | null, members: OrganizationMemberType[] | null): number => {
                 // Typically we can rely on the app context but just in case we use the loaded members if present
                 const count = user?.organization?.member_count
                 return Math.max(count ?? 0, members?.length ?? 0)
diff --git a/frontend/src/scenes/organizationLogic.tsx b/frontend/src/scenes/organizationLogic.tsx
index f2977a5af3dc..8bb3f61d246b 100644
--- a/frontend/src/scenes/organizationLogic.tsx
+++ b/frontend/src/scenes/organizationLogic.tsx
@@ -1,6 +1,7 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
+import type { LocationChangedPayload } from 'kea-router/lib/types'
 import posthog from 'posthog-js'
 
 import api, { ApiConfig, ApiError } from 'lib/api'
@@ -14,7 +15,6 @@ import { getAppContext } from 'lib/utils/getAppContext'
 import { sidePanelStateLogic } from '~/layout/navigation-3000/sidepanel/sidePanelStateLogic'
 import { AvailableFeature, OrganizationType } from '~/types'
 
-import type { organizationLogicType } from './organizationLogicType'
 import { urls } from './urls'
 import { userLogic } from './userLogic'
 
@@ -36,6 +36,159 @@ export type OrganizationUpdatePayload = Partial<
     >
 >
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface organizationLogicValues {
+    hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean // userLogic
+    currentOrganization: OrganizationType | null
+    currentOrganizationId: string
+    currentOrganizationLoading: boolean
+    isAdminOrOwner: boolean | null
+    isCurrentOrganizationNew: boolean
+    isCurrentOrganizationUnavailable: boolean
+    isNotActiveReason: string | null
+    migrateAccessControlVersionLoading: boolean
+    organizationBeingDeleted: string | null
+    projectCreationForbiddenReason: string | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface organizationLogicActions {
+    locationChanged: ({
+        method,
+        pathname,
+        search,
+        searchParams,
+        hash,
+        hashParams,
+        initial,
+        url,
+        routerState,
+    }: LocationChangedPayload) => {
+        hash: string
+        hashParams: Record<string, any>
+        initial: boolean
+        method: 'POP' | 'PUSH' | 'REPLACE'
+        pathname: string
+        routerState: Record<string, any>
+        search: string
+        searchParams: Record<string, any>
+        url: string
+    } // router
+    loadUser: (resetOnFailure?: boolean | undefined) => {
+        resetOnFailure: boolean | undefined
+    } // userLogic
+    completeOnboarding: () => any
+    completeOnboardingFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    completeOnboardingSuccess: (
+        currentOrganization: OrganizationType | null,
+        payload?: any
+    ) => {
+        currentOrganization: OrganizationType | null
+        payload?: any
+    }
+    createOrganization: (name: string) => string
+    createOrganizationFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    createOrganizationSuccess: (
+        currentOrganization: OrganizationType | null,
+        payload?: string
+    ) => {
+        currentOrganization: OrganizationType | null
+        payload?: string
+    }
+    deleteOrganization: ({ organizationId, redirectPath }: { organizationId: string; redirectPath?: string }) => {
+        organizationId: string
+        redirectPath: string | undefined
+    }
+    deleteOrganizationFailure: (error: string) => {
+        error: string
+    }
+    deleteOrganizationSuccess: ({ redirectPath }: { redirectPath?: string }) => {
+        redirectPath: string | undefined
+    }
+    loadCurrentOrganization: () => any
+    loadCurrentOrganizationFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadCurrentOrganizationSuccess: (
+        currentOrganization: OrganizationType | null,
+        payload?: any
+    ) => {
+        currentOrganization: OrganizationType | null
+        payload?: any
+    }
+    migrateAccessControlVersion: () => any
+    migrateAccessControlVersionFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    migrateAccessControlVersionSuccess: (
+        currentOrganization: OrganizationType | null,
+        payload?: any
+    ) => {
+        currentOrganization: OrganizationType | null
+        payload?: any
+    }
+    updateOrganization: (payload: OrganizationUpdatePayload) => OrganizationUpdatePayload
+    updateOrganizationFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateOrganizationSuccess: (
+        currentOrganization: OrganizationType | null,
+        payload?: OrganizationUpdatePayload
+    ) => {
+        currentOrganization: OrganizationType | null
+        payload?: OrganizationUpdatePayload
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface organizationLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        currentOrganizationId: (currentOrganization: OrganizationType | null) => string
+        isCurrentOrganizationUnavailable: (
+            currentOrganization: OrganizationType | null,
+            currentOrganizationLoading: boolean
+        ) => boolean
+        projectCreationForbiddenReason: (
+            currentOrganization: OrganizationType | null,
+            hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean
+        ) => string | null
+        isAdminOrOwner: (currentOrganization: OrganizationType | null) => boolean | null
+        isCurrentOrganizationNew: (currentOrganization: OrganizationType | null) => boolean
+        isNotActiveReason: (currentOrganization: OrganizationType | null) => string | null
+    }
+}
+
+export type organizationLogicType = MakeLogicType<
+    organizationLogicValues,
+    organizationLogicActions,
+    Record<string, any>,
+    organizationLogicMeta
+>
+
 export const organizationLogic = kea<organizationLogicType>([
     path(['scenes', 'organizationLogic']),
     actions({
@@ -113,7 +266,7 @@ export const organizationLogic = kea<organizationLogicType>([
     selectors({
         currentOrganizationId: [
             (s) => [s.currentOrganization],
-            (currentOrganization): string => {
+            (currentOrganization: OrganizationType | null): string => {
                 if (!currentOrganization || !currentOrganization.id) {
                     // TODO: Fix callers that access currentOrganizationId before the organization is loaded,
                     // then restore the throw. Temporarily falling back to "@current" to avoid crashes.
@@ -128,12 +281,15 @@ export const organizationLogic = kea<organizationLogicType>([
         ],
         isCurrentOrganizationUnavailable: [
             (s) => [s.currentOrganization, s.currentOrganizationLoading],
-            (currentOrganization, currentOrganizationLoading): boolean =>
+            (currentOrganization: OrganizationType | null, currentOrganizationLoading: boolean): boolean =>
                 !currentOrganization?.membership_level && !currentOrganizationLoading,
         ],
         projectCreationForbiddenReason: [
             (s) => [s.currentOrganization, s.hasAvailableFeature],
-            (currentOrganization, hasAvailableFeature): string | null => {
+            (
+                currentOrganization: OrganizationType | null,
+                hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean
+            ): string | null => {
                 const isAdminOrAbove =
                     !!currentOrganization?.membership_level &&
                     currentOrganization.membership_level >= OrganizationMembershipLevel.Admin
@@ -149,7 +305,7 @@ export const organizationLogic = kea<organizationLogicType>([
         ],
         isAdminOrOwner: [
             (s) => [s.currentOrganization],
-            (currentOrganization): boolean | null =>
+            (currentOrganization: OrganizationType | null): boolean | null =>
                 !!(
                     currentOrganization?.membership_level &&
                     [OrganizationMembershipLevel.Admin, OrganizationMembershipLevel.Owner].includes(
@@ -159,14 +315,15 @@ export const organizationLogic = kea<organizationLogicType>([
         ],
         isCurrentOrganizationNew: [
             (s) => [s.currentOrganization],
-            (currentOrganization): boolean => {
+            (currentOrganization: OrganizationType | null): boolean => {
                 const orgCreatedAt = currentOrganization?.created_at
                 return orgCreatedAt ? dayjs().diff(dayjs(orgCreatedAt), 'month') < 3 : false
             },
         ],
         isNotActiveReason: [
             (s) => [s.currentOrganization],
-            (currentOrganization): string | null => currentOrganization?.is_not_active_reason ?? null,
+            (currentOrganization: OrganizationType | null): string | null =>
+                currentOrganization?.is_not_active_reason ?? null,
         ],
     }),
     listeners(({ actions, values }) => ({
diff --git a/frontend/src/scenes/paths-v2/pathsDataLogic.ts b/frontend/src/scenes/paths-v2/pathsDataLogic.ts
index 482e9a7171e2..812d73de8a4c 100644
--- a/frontend/src/scenes/paths-v2/pathsDataLogic.ts
+++ b/frontend/src/scenes/paths-v2/pathsDataLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, selectors } from 'kea'
 import { router } from 'kea-router'
 
 import { TaxonomicFilterGroupType } from 'lib/components/TaxonomicFilter/types'
@@ -16,7 +16,23 @@ import { InsightActorsQuery, InsightVizNode, NodeKind, PathsLink, PathsQuery } f
 import { isPathsQuery } from '~/queries/utils'
 import { InsightLogicProps, PathType } from '~/types'
 
-import type { pathsDataLogicType } from './pathsDataLogicType'
+import type { DataColorTheme } from '../../lib/colors'
+import type { FeatureFlagsSet } from '../../lib/logic/featureFlagLogic'
+import type {
+    DataNode,
+    DateRange,
+    FunnelPathsFilter,
+    FunnelsQuery,
+    InsightFilter,
+    LifecycleQuery,
+    PathsFilter,
+    RetentionQuery,
+    StickinessQuery,
+    TrendsQuery,
+    WebOverviewQuery,
+    WebStatsTableQuery,
+} from '../../queries/schema/schema-general'
+import type { QuerySourceUpdate } from '../insights/insightVizDataLogic'
 import { PathNodeData } from './pathUtils'
 import { Paths, PathsNode } from './types'
 
@@ -24,6 +40,67 @@ export const DEFAULT_STEP_LIMIT = 5
 
 const DEFAULT_PATH_LOGIC_KEY = 'default_path_key'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface pathsDataLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    dateRange: DateRange | null | undefined // insightVizDataLogic
+    funnelPathsFilter: FunnelPathsFilter | null | undefined // insightVizDataLogic
+    insightData: Record<string, any> // insightVizDataLogic
+    insightDataError: Record<string, any> | null // insightVizDataLogic
+    insightDataLoading: boolean // insightVizDataLogic
+    insightQuery: DataNode<Record<string, any>> // insightVizDataLogic
+    pathsFilter: PathsFilter | null // insightVizDataLogic
+    theme: DataColorTheme | null // insightVizDataLogic
+    vizQuerySource:
+        | FunnelsQuery
+        | LifecycleQuery
+        | PathsQuery
+        | RetentionQuery
+        | StickinessQuery
+        | TrendsQuery
+        | WebOverviewQuery
+        | WebStatsTableQuery
+        | null // insightVizDataLogic
+    paths: Paths
+    results: PathsLink[]
+    taxonomicGroupTypes: TaxonomicFilterGroupType[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface pathsDataLogicActions {
+    updateInsightFilter: (insightFilter: InsightFilter) => {
+        insightFilter: InsightFilter
+    } // insightVizDataLogic
+    updateQuerySource: (querySource: QuerySourceUpdate) => {
+        querySource: QuerySourceUpdate
+    } // insightVizDataLogic
+    openPersonsModal: (props: { path_dropoff_key?: string; path_end_key?: string; path_start_key?: string }) => {
+        path_dropoff_key?: string | undefined
+        path_end_key?: string | undefined
+        path_start_key?: string | undefined
+    }
+    viewPathToFunnel: (pathItemCard: PathNodeData) => {
+        pathItemCard: PathNodeData
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface pathsDataLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        results: (insightQuery: DataNode<Record<string, any>>, insightData: Record<string, any>) => PathsLink[]
+        paths: (results: PathsLink[]) => Paths
+        taxonomicGroupTypes: (pathsFilter: PathsFilter | null) => TaxonomicFilterGroupType[]
+    }
+}
+
+export type pathsDataLogicType = MakeLogicType<
+    pathsDataLogicValues,
+    pathsDataLogicActions,
+    InsightLogicProps,
+    pathsDataLogicMeta
+>
+
 export const pathsDataLogic = kea<pathsDataLogicType>([
     path((key) => ['scenes', 'paths', 'pathsDataLogic', key]),
     props({} as InsightLogicProps),
@@ -58,13 +135,16 @@ export const pathsDataLogic = kea<pathsDataLogicType>([
     selectors({
         results: [
             (s) => [s.insightQuery, s.insightData],
-            (insightQuery, insightData): PathsLink[] => {
+            (
+                insightQuery: import('~/queries/schema/schema-general').DataNode<Record<string, any>>,
+                insightData: Record<string, any>
+            ): PathsLink[] => {
                 return isPathsQuery(insightQuery) ? (insightData?.result ?? []) : []
             },
         ],
         paths: [
             (s) => [s.results],
-            (results): Paths => {
+            (results: PathsLink[]): Paths => {
                 const nodes: Record<string, PathsNode> = {}
                 for (const path of results) {
                     if (!nodes[path.source]) {
@@ -83,7 +163,7 @@ export const pathsDataLogic = kea<pathsDataLogicType>([
         ],
         taxonomicGroupTypes: [
             (s) => [s.pathsFilter],
-            (pathsFilter) => {
+            (pathsFilter: null | import('~/queries/schema/schema-general').PathsFilter) => {
                 const taxonomicGroupTypes: TaxonomicFilterGroupType[] = []
                 if (pathsFilter?.includeEventTypes) {
                     if (pathsFilter.includeEventTypes.includes(PathType.PageView)) {
diff --git a/frontend/src/scenes/paths/PathNodeCardButton.tsx b/frontend/src/scenes/paths/PathNodeCardButton.tsx
index ecf5fd030149..9737943337c9 100644
--- a/frontend/src/scenes/paths/PathNodeCardButton.tsx
+++ b/frontend/src/scenes/paths/PathNodeCardButton.tsx
@@ -11,7 +11,7 @@ import { userLogic } from 'scenes/userLogic'
 import { PathsFilter } from '~/queries/schema/schema-general'
 import { AvailableFeature } from '~/types'
 
-import { pathsDataLogicType } from './pathsDataLogicType'
+import type { pathsDataLogicType } from './pathsDataLogic'
 import { PathNodeData, pageUrl } from './pathUtils'
 
 type PathNodeCardButton = {
diff --git a/frontend/src/scenes/paths/PathNodeCardMenu.tsx b/frontend/src/scenes/paths/PathNodeCardMenu.tsx
index 7d2fcc54eb5b..9fee51ecdfe9 100644
--- a/frontend/src/scenes/paths/PathNodeCardMenu.tsx
+++ b/frontend/src/scenes/paths/PathNodeCardMenu.tsx
@@ -7,7 +7,7 @@ import { IconTrendingFlat, IconTrendingFlatDown } from 'lib/lemon-ui/icons'
 import { humanFriendlyDuration } from 'lib/utils/durations'
 
 import { PATH_NODE_CARD_WIDTH } from './constants'
-import { pathsDataLogicType } from './pathsDataLogicType'
+import type { pathsDataLogicType } from './pathsDataLogic'
 
 type PathNodeCardMenuProps = {
     name: string
diff --git a/frontend/src/scenes/paths/pathsDataLogic.ts b/frontend/src/scenes/paths/pathsDataLogic.ts
index 1b5c6bf12b04..056161905190 100644
--- a/frontend/src/scenes/paths/pathsDataLogic.ts
+++ b/frontend/src/scenes/paths/pathsDataLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, selectors } from 'kea'
 
 import { TaxonomicFilterGroupType } from 'lib/components/TaxonomicFilter/types'
 import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
@@ -15,7 +15,23 @@ import { InsightActorsQuery, InsightVizNode, NodeKind, PathsLink, PathsQuery } f
 import { isPathsQuery } from '~/queries/utils'
 import { ActionFilter, InsightLogicProps, PathType, PropertyFilterType, PropertyOperator } from '~/types'
 
-import type { pathsDataLogicType } from './pathsDataLogicType'
+import type { DataColorTheme } from '../../lib/colors'
+import type { FeatureFlagsSet } from '../../lib/logic/featureFlagLogic'
+import type {
+    DataNode,
+    DateRange,
+    FunnelPathsFilter,
+    FunnelsQuery,
+    InsightFilter,
+    LifecycleQuery,
+    PathsFilter,
+    RetentionQuery,
+    StickinessQuery,
+    TrendsQuery,
+    WebOverviewQuery,
+    WebStatsTableQuery,
+} from '../../queries/schema/schema-general'
+import type { QuerySourceUpdate } from '../insights/insightVizDataLogic'
 import { PathNodeData } from './pathUtils'
 import { Paths, PathsNode } from './types'
 
@@ -50,6 +66,67 @@ export const DEFAULT_STEP_LIMIT = 5
 
 const DEFAULT_PATH_LOGIC_KEY = 'default_path_key'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface pathsDataLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    dateRange: DateRange | null | undefined // insightVizDataLogic
+    funnelPathsFilter: FunnelPathsFilter | null | undefined // insightVizDataLogic
+    insightData: Record<string, any> // insightVizDataLogic
+    insightDataError: Record<string, any> | null // insightVizDataLogic
+    insightDataLoading: boolean // insightVizDataLogic
+    insightQuery: DataNode<Record<string, any>> // insightVizDataLogic
+    pathsFilter: PathsFilter | null // insightVizDataLogic
+    theme: DataColorTheme | null // insightVizDataLogic
+    vizQuerySource:
+        | FunnelsQuery
+        | LifecycleQuery
+        | PathsQuery
+        | RetentionQuery
+        | StickinessQuery
+        | TrendsQuery
+        | WebOverviewQuery
+        | WebStatsTableQuery
+        | null // insightVizDataLogic
+    paths: Paths
+    results: PathsLink[]
+    taxonomicGroupTypes: TaxonomicFilterGroupType[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface pathsDataLogicActions {
+    updateInsightFilter: (insightFilter: InsightFilter) => {
+        insightFilter: InsightFilter
+    } // insightVizDataLogic
+    updateQuerySource: (querySource: QuerySourceUpdate) => {
+        querySource: QuerySourceUpdate
+    } // insightVizDataLogic
+    openPersonsModal: (props: { path_dropoff_key?: string; path_end_key?: string; path_start_key?: string }) => {
+        path_dropoff_key?: string | undefined
+        path_end_key?: string | undefined
+        path_start_key?: string | undefined
+    }
+    viewPathToFunnel: (pathItemCard: PathNodeData) => {
+        pathItemCard: PathNodeData
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface pathsDataLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        results: (insightQuery: DataNode<Record<string, any>>, insightData: Record<string, any>) => PathsLink[]
+        paths: (results: PathsLink[]) => Paths
+        taxonomicGroupTypes: (pathsFilter: PathsFilter | null) => TaxonomicFilterGroupType[]
+    }
+}
+
+export type pathsDataLogicType = MakeLogicType<
+    pathsDataLogicValues,
+    pathsDataLogicActions,
+    InsightLogicProps,
+    pathsDataLogicMeta
+>
+
 export const pathsDataLogic = kea<pathsDataLogicType>([
     path((key) => ['scenes', 'paths', 'pathsDataLogic', key]),
     props({} as InsightLogicProps),
@@ -84,13 +161,16 @@ export const pathsDataLogic = kea<pathsDataLogicType>([
     selectors({
         results: [
             (s) => [s.insightQuery, s.insightData],
-            (insightQuery, insightData): PathsLink[] => {
+            (
+                insightQuery: import('~/queries/schema/schema-general').DataNode<Record<string, any>>,
+                insightData: Record<string, any>
+            ): PathsLink[] => {
                 return isPathsQuery(insightQuery) ? (insightData?.result ?? []) : []
             },
         ],
         paths: [
             (s) => [s.results],
-            (results): Paths => {
+            (results: PathsLink[]): Paths => {
                 const nodes: Record<string, PathsNode> = {}
                 for (const path of results) {
                     if (!nodes[path.source]) {
@@ -109,7 +189,7 @@ export const pathsDataLogic = kea<pathsDataLogicType>([
         ],
         taxonomicGroupTypes: [
             (s) => [s.pathsFilter],
-            (pathsFilter) => {
+            (pathsFilter: null | import('~/queries/schema/schema-general').PathsFilter) => {
                 const taxonomicGroupTypes: TaxonomicFilterGroupType[] = []
                 if (pathsFilter?.includeEventTypes) {
                     if (pathsFilter?.includeEventTypes.includes(PathType.PageView)) {
diff --git a/frontend/src/scenes/paths/pathsInteractionLogic.ts b/frontend/src/scenes/paths/pathsInteractionLogic.ts
index 094441a8aca8..a35d64588f19 100644
--- a/frontend/src/scenes/paths/pathsInteractionLogic.ts
+++ b/frontend/src/scenes/paths/pathsInteractionLogic.ts
@@ -1,10 +1,9 @@
-import { actions, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 
 import { keyForInsightLogicProps } from 'scenes/insights/sharedUtils'
 
 import { InsightLogicProps } from '~/types'
 
-import type { pathsInteractionLogicType } from './pathsInteractionLogicType'
 import {
     PathNodeData,
     activateNodes,
@@ -20,6 +19,80 @@ export type HoverTarget =
 const DEFAULT_KEY = 'default_paths_interaction_key'
 const CLEAR_HOVER_DEBOUNCE_MS = 30
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface pathsInteractionLogicValues {
+    activeIndices: {
+        linkIndices: Set<number>
+        nodeIndices: Set<number>
+    }
+    canvasHeight: number
+    cardHovered: boolean
+    hoverTarget: HoverTarget | null
+    nodes: PathNodeData[]
+    resolvedNodeCards: PathNodeData[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface pathsInteractionLogicActions {
+    clearHover: () => {
+        value: true
+    }
+    hoverLink: (
+        sourceIndex: number,
+        targetIndex: number,
+        linkIndex: number
+    ) => {
+        linkIndex: number
+        sourceIndex: number
+        targetIndex: number
+    }
+    hoverNode: (nodeIndex: number) => {
+        nodeIndex: number
+    }
+    requestClearHover: () => {
+        value: true
+    }
+    setCardHovered: (hovered: boolean) => {
+        hovered: boolean
+    }
+    setNodes: (
+        nodes: PathNodeData[],
+        canvasHeight: number
+    ) => {
+        canvasHeight: number
+        nodes: PathNodeData[]
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface pathsInteractionLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        activeIndices: (
+            hoverTarget: HoverTarget | null,
+            nodes: PathNodeData[]
+        ) => {
+            linkIndices: Set<number>
+            nodeIndices: Set<number>
+        }
+        resolvedNodeCards: (
+            nodes: PathNodeData[],
+            activeIndices: {
+                linkIndices: Set<number>
+                nodeIndices: Set<number>
+            },
+            canvasHeight: number
+        ) => PathNodeData[]
+    }
+}
+
+export type pathsInteractionLogicType = MakeLogicType<
+    pathsInteractionLogicValues,
+    pathsInteractionLogicActions,
+    InsightLogicProps,
+    pathsInteractionLogicMeta
+>
+
 export const pathsInteractionLogic = kea<pathsInteractionLogicType>([
     path((key) => ['scenes', 'paths', 'pathsInteractionLogic', key]),
     props({} as InsightLogicProps),
diff --git a/frontend/src/scenes/persons-management/personsManagementSceneLogic.tsx b/frontend/src/scenes/persons-management/personsManagementSceneLogic.tsx
index 3ff246972ca5..e0bdcc704660 100644
--- a/frontend/src/scenes/persons-management/personsManagementSceneLogic.tsx
+++ b/frontend/src/scenes/persons-management/personsManagementSceneLogic.tsx
@@ -1,4 +1,4 @@
-import { connect, kea, path, selectors } from 'kea'
+import { MakeLogicType, connect, kea, path, selectors } from 'kea'
 
 import { FEATURE_FLAGS } from 'lib/constants'
 import { GroupsAccessStatus } from 'lib/introductions/groupsAccessLogic'
@@ -9,7 +9,9 @@ import { urls } from 'scenes/urls'
 
 import { groupsModel } from '~/models/groupsModel'
 
-import type { personsManagementSceneLogicType } from './personsManagementSceneLogicType'
+import type { FeatureFlagsSet } from '../../lib/logic/featureFlagLogic'
+import type { Noun } from '../../models/groupsModel'
+import type { GroupType, GroupTypeIndex } from '../../types'
 
 export type PersonsManagementTab = {
     key: string
@@ -19,6 +21,40 @@ export type PersonsManagementTab = {
     tooltipDocLink?: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface personsManagementSceneLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun // groupsModel
+    groupTypes: Map<GroupTypeIndex, GroupType> // groupsModel
+    groupTypesLoading: boolean // groupsModel
+    groupsAccessStatus: GroupsAccessStatus // groupsModel
+    crmFeatureFlag: boolean | string | undefined
+    groupTabs: PersonsManagementTab[]
+    lemonTabs: LemonTab<string>[]
+    tabs: PersonsManagementTab[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface personsManagementSceneLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        tabs: (groupTabs: PersonsManagementTab[]) => PersonsManagementTab[]
+        crmFeatureFlag: (featureFlags: FeatureFlagsSet) => boolean | string | undefined
+        groupTabs: (
+            groupTypes: Map<GroupTypeIndex, GroupType>,
+            groupsAccessStatus: GroupsAccessStatus,
+            aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun
+        ) => PersonsManagementTab[]
+        lemonTabs: (tabs: PersonsManagementTab[]) => LemonTab<string>[]
+    }
+}
+
+export type personsManagementSceneLogicType = MakeLogicType<
+    personsManagementSceneLogicValues,
+    {},
+    Record<string, any>,
+    personsManagementSceneLogicMeta
+>
+
 export const personsManagementSceneLogic = kea<personsManagementSceneLogicType>([
     path(['scenes', 'persons-management', 'personsManagementSceneLogic']),
     connect(() => ({
@@ -32,7 +68,7 @@ export const personsManagementSceneLogic = kea<personsManagementSceneLogicType>(
     selectors({
         tabs: [
             (s) => [s.groupTabs],
-            (groupTabs): PersonsManagementTab[] => {
+            (groupTabs: PersonsManagementTab[]): PersonsManagementTab[] => {
                 return [
                     {
                         key: 'persons',
@@ -50,10 +86,21 @@ export const personsManagementSceneLogic = kea<personsManagementSceneLogicType>(
                 ]
             },
         ],
-        crmFeatureFlag: [(s) => [s.featureFlags], (featureFlags) => featureFlags[FEATURE_FLAGS.CRM_ITERATION_ONE]],
+        crmFeatureFlag: [
+            (s) => [s.featureFlags],
+            (featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet) =>
+                featureFlags[FEATURE_FLAGS.CRM_ITERATION_ONE],
+        ],
         groupTabs: [
             (s) => [s.groupTypes, s.groupsAccessStatus, s.aggregationLabel],
-            (groupTypes, groupsAccessStatus, aggregationLabel): PersonsManagementTab[] => {
+            (
+                groupTypes: Map<import('../../types').GroupTypeIndex, import('../../types').GroupType>,
+                groupsAccessStatus: GroupsAccessStatus,
+                aggregationLabel: (
+                    groupTypeIndex: number | null | undefined,
+                    deferToUserWording?: boolean
+                ) => import('~/models/groupsModel').Noun
+            ): PersonsManagementTab[] => {
                 const showGroupsIntroductionPage = [
                     GroupsAccessStatus.HasAccess,
                     GroupsAccessStatus.HasGroupTypes,
@@ -80,7 +127,7 @@ export const personsManagementSceneLogic = kea<personsManagementSceneLogicType>(
 
         lemonTabs: [
             (s) => [s.tabs],
-            (tabs): LemonTab<string>[] =>
+            (tabs: PersonsManagementTab[]): LemonTab<string>[] =>
                 tabs.map((tab) => ({
                     key: tab.key,
                     label: <span data-attr={`persons-management-${tab.key}-tab`}>{tab.label}</span>,
diff --git a/frontend/src/scenes/persons/mergeSplitPersonLogic.ts b/frontend/src/scenes/persons/mergeSplitPersonLogic.ts
index fefef6fc34bc..6365b0d516a8 100644
--- a/frontend/src/scenes/persons/mergeSplitPersonLogic.ts
+++ b/frontend/src/scenes/persons/mergeSplitPersonLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, events, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, key, listeners, path, props, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 
@@ -8,7 +8,8 @@ import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
 
 import { PersonType } from '~/types'
 
-import type { mergeSplitPersonLogicType } from './mergeSplitPersonLogicType'
+import type { CountedPaginatedResponse } from '../../lib/api'
+import type { PersonListParams } from '../../types'
 import { personsLogic } from './personsLogic'
 
 export interface SplitPersonLogicProps {
@@ -20,6 +21,74 @@ export type PersonUuids = NonNullable<PersonType['uuid']>[]
 
 export type SplitMode = 'all' | 'partial'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface mergeSplitPersonLogicValues {
+    persons: CountedPaginatedResponse<PersonType> & {
+        offset: number
+    } // personsLogic
+    distinctIdsToSplit: string[]
+    executed: boolean
+    executedLoading: boolean
+    person: PersonType
+    selectedPersonToAssignSplit: string | null
+    splitMode: SplitMode
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface mergeSplitPersonLogicActions {
+    loadPersons: (url?: string | null | undefined) => {
+        url: string | null
+    } // personsLogic
+    setListFilters: (payload: PersonListParams) => {
+        payload: PersonListParams
+    } // personsLogic
+    setPerson: (person: PersonType | null) => {
+        person: PersonType | null
+    } // personsLogic
+    setSplitMergeModalShown: (shown: boolean) => {
+        shown: boolean
+    } // personsLogic
+    cancel: () => {
+        value: true
+    }
+    execute: () => any
+    executeFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    executeSuccess: (
+        executed: boolean,
+        payload?: any
+    ) => {
+        executed: boolean
+        payload?: any
+    }
+    setDistinctIdsToSplit: (ids: string[]) => {
+        ids: string[]
+    }
+    setSelectedPersonToAssignSplit: (id: string) => {
+        id: string
+    }
+    setSplitMode: (mode: SplitMode) => {
+        mode: SplitMode
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface mergeSplitPersonLogicMeta {
+    key: string
+}
+
+export type mergeSplitPersonLogicType = MakeLogicType<
+    mergeSplitPersonLogicValues,
+    mergeSplitPersonLogicActions,
+    SplitPersonLogicProps,
+    mergeSplitPersonLogicMeta
+>
+
 export const mergeSplitPersonLogic = kea<mergeSplitPersonLogicType>([
     props({} as SplitPersonLogicProps),
     key((props) => `${props.person.id ?? 'new'}`),
diff --git a/frontend/src/scenes/persons/personDeleteModalLogic.tsx b/frontend/src/scenes/persons/personDeleteModalLogic.tsx
index b2e19f2dbfc0..22a2b694fdc1 100644
--- a/frontend/src/scenes/persons/personDeleteModalLogic.tsx
+++ b/frontend/src/scenes/persons/personDeleteModalLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, kea, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, kea, path, props, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
@@ -9,13 +9,72 @@ import { toParams } from 'lib/utils/url'
 import { PersonType } from '~/types'
 
 import { asDisplay } from './person-utils'
-import type { personDeleteModalLogicType } from './personDeleteModalLogicType'
 
 export interface PersonDeleteModalLogicProps {
     person: PersonType
 }
 export type PersonDeleteCallback = (person: PersonType, deleteEvents: boolean) => void
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface personDeleteModalLogicValues {
+    deleteConfirmationText: string
+    deletedPerson: PersonType | null
+    deletedPersonLoading: boolean
+    personDeleteCallback: PersonDeleteCallback | null
+    personDeleteModal: PersonType | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface personDeleteModalLogicActions {
+    deletePerson: (
+        person: PersonType,
+        deleteEvents: boolean,
+        deleteRecordings: boolean
+    ) => {
+        deleteEvents: boolean
+        deleteRecordings: boolean
+        person: PersonType
+    }
+    deletePersonFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deletePersonSuccess: (
+        deletedPerson: PersonType,
+        payload?: {
+            deleteEvents: boolean
+            deleteRecordings: boolean
+            person: PersonType
+        }
+    ) => {
+        deletedPerson: PersonType
+        payload?: {
+            deleteEvents: boolean
+            deleteRecordings: boolean
+            person: PersonType
+        }
+    }
+    setDeleteConfirmationText: (deleteConfirmationText: string) => {
+        deleteConfirmationText: string
+    }
+    showPersonDeleteModal: (
+        person: PersonType | null,
+        callback?: PersonDeleteCallback
+    ) => {
+        callback: PersonDeleteCallback | undefined
+        person: PersonType | null
+    }
+}
+
+export type personDeleteModalLogicType = MakeLogicType<
+    personDeleteModalLogicValues,
+    personDeleteModalLogicActions,
+    PersonDeleteModalLogicProps
+>
+
 export const personDeleteModalLogic = kea<personDeleteModalLogicType>([
     path(['scenes', 'persons', 'personDeleteModalLogic']),
     props({} as PersonDeleteModalLogicProps),
diff --git a/frontend/src/scenes/persons/personEmailsLogic.ts b/frontend/src/scenes/persons/personEmailsLogic.ts
index c188c64cc009..0958fa1e9b80 100644
--- a/frontend/src/scenes/persons/personEmailsLogic.ts
+++ b/frontend/src/scenes/persons/personEmailsLogic.ts
@@ -1,15 +1,50 @@
-import { kea, key, path, props } from 'kea'
+import { MakeLogicType, kea, key, path, props } from 'kea'
 import { lazyLoaders } from 'kea-loaders'
 
 import { getPersonMessageAssets, MessageAsset } from 'products/workflows/frontend/Workflows/messageAssetsApi'
 
-import type { personEmailsLogicType } from './personEmailsLogicType'
-
 export interface PersonEmailsLogicProps {
     teamId: number
     personId: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface personEmailsLogicValues {
+    emails: MessageAsset[]
+    emailsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface personEmailsLogicActions {
+    loadEmails: () => any
+    loadEmailsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadEmailsSuccess: (
+        emails: MessageAsset[],
+        payload?: any
+    ) => {
+        emails: MessageAsset[]
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface personEmailsLogicMeta {
+    key: string
+}
+
+export type personEmailsLogicType = MakeLogicType<
+    personEmailsLogicValues,
+    personEmailsLogicActions,
+    PersonEmailsLogicProps,
+    personEmailsLogicMeta
+>
+
 export const personEmailsLogic = kea<personEmailsLogicType>([
     path(['scenes', 'persons', 'personEmailsLogic']),
     props({} as PersonEmailsLogicProps),
diff --git a/frontend/src/scenes/persons/personLogic.tsx b/frontend/src/scenes/persons/personLogic.tsx
index a1e962f85996..cb99f6f7af74 100644
--- a/frontend/src/scenes/persons/personLogic.tsx
+++ b/frontend/src/scenes/persons/personLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, path, props, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, path, props, selectors } from 'kea'
 import { lazyLoaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
@@ -14,7 +14,6 @@ import { CUSTOMER_ANALYTICS_DEFAULT_QUERY_TAGS } from 'products/customer_analyti
 import { revenueAnalyticsLogic } from 'products/revenue_analytics/frontend/revenueAnalyticsLogic'
 
 import { getHogqlQueryStringForPersonId, parsePersonFromHogQLRow } from './person-utils'
-import type { personLogicType } from './personLogicType'
 
 export interface PersonLogicProps {
     id: string | undefined
@@ -26,6 +25,95 @@ export interface Info {
     eventCount: number
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface personLogicValues {
+    isRevenueAnalyticsEnabled: boolean // revenueAnalyticsLogic
+    breadcrumbs: Breadcrumb[]
+    info: Info | null
+    infoLoading: boolean
+    person: PersonType | null
+    personLoading: boolean
+    revenueData: {
+        lifetimeValue: number | null
+        mrr: number | null
+    } | null
+    revenueDataLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface personLogicActions {
+    loadInfo: () => {
+        value: true
+    }
+    loadInfoFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadInfoSuccess: (
+        info: Info | null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        info: Info | null
+        payload?: {
+            value: true
+        }
+    }
+    loadPerson: () => {
+        value: true
+    }
+    loadPersonFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPersonSuccess: (
+        person: PersonType | null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        person: PersonType | null
+        payload?: {
+            value: true
+        }
+    }
+    loadRevenueData: () => any
+    loadRevenueDataFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRevenueDataSuccess: (
+        revenueData: {
+            lifetimeValue: any
+            mrr: any
+        } | null,
+        payload?: any
+    ) => {
+        revenueData: {
+            lifetimeValue: any
+            mrr: any
+        } | null
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface personLogicMeta {
+    key: string
+}
+
+export type personLogicType = MakeLogicType<personLogicValues, personLogicActions, PersonLogicProps, personLogicMeta>
+
 export const personLogic = kea<personLogicType>([
     props({} as PersonLogicProps),
     key((props) => props.distinctId ?? props.id ?? 'undefined'),
diff --git a/frontend/src/scenes/persons/personsLogic.tsx b/frontend/src/scenes/persons/personsLogic.tsx
index c03b1d97067d..b812f3a5278d 100644
--- a/frontend/src/scenes/persons/personsLogic.tsx
+++ b/frontend/src/scenes/persons/personsLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, connect, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { decodeParams, router, urlToAction } from 'kea-router'
 import posthog from 'posthog-js'
@@ -36,6 +36,8 @@ import {
 
 import { CUSTOMER_ANALYTICS_DEFAULT_QUERY_TAGS } from 'products/customer_analytics/frontend/constants'
 
+import type { FeatureFlagsSet } from '../../lib/logic/featureFlagLogic'
+import type { TeamPublicType, TeamType } from '../../types'
 import {
     asDisplay,
     coercePropertyValue,
@@ -43,7 +45,6 @@ import {
     parsePersonFromHogQLRow,
     pickBestPersonDistinctId,
 } from './person-utils'
-import type { personsLogicType } from './personsLogicType'
 
 export interface PersonsLogicProps {
     cohort?: number | 'new'
@@ -104,6 +105,219 @@ function createInitialSurveyResponsesPayload(personId: string): DataTableNode {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface personsLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    activeTab: PersonsTabType | null
+    apiDocsURL:
+        | 'https://posthog.com/docs/api/cohorts#get-api-projects-project_id-cohorts-id-persons'
+        | 'https://posthog.com/docs/api/persons'
+    breadcrumbs: Breadcrumb[]
+    cohortId: number | 'new' | undefined
+    cohorts: CohortType[] | null
+    cohortsLoading: boolean
+    currentTab: PersonsTabType
+    defaultTab: PersonsTabType.PROFILE | PersonsTabType.PROPERTIES
+    distinctId: string | null
+    eventsQuery: DataTableNode | null
+    eventsQueryIsDirty: boolean
+    exceptionsQuery: DataTableNode | null
+    exporterProps: TriggerExportProps[]
+    feedEnabled: boolean
+    hiddenListProperties: AnyPropertyFilter[]
+    listFilters: PersonListParams
+    person: PersonType | null
+    personError: string | null
+    personLoading: boolean
+    persons: CountedPaginatedResponse<PersonType> & {
+        offset: number
+    }
+    personsLoading: boolean
+    primaryDistinctId: string | null
+    sidePanelContext: SidePanelSceneContext
+    splitMergeModalShown: boolean
+    surveyResponsesQuery: DataTableNode | null
+    urlId: any
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface personsLogicActions {
+    reportPersonDetailViewed: (person: PersonType) => {
+        person: PersonType
+    } // eventUsageLogic
+    deleteProperty: (key: string) => {
+        key: string
+    }
+    editProperty: (
+        key: string,
+        newValue?: boolean | number | string | null
+    ) => {
+        key: string
+        newValue: boolean | number | string | null | undefined
+    }
+    loadCohorts: () => any
+    loadCohortsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadCohortsSuccess: (
+        cohorts: CohortType[] | null,
+        payload?: any
+    ) => {
+        cohorts: CohortType[] | null
+        payload?: any
+    }
+    loadPerson: (id: string) => {
+        id: string
+    }
+    loadPersonFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPersonSuccess: (
+        person: PersonType | null,
+        payload?: {
+            id: string
+        }
+    ) => {
+        person: PersonType | null
+        payload?: {
+            id: string
+        }
+    }
+    loadPersonUUID: (uuid: string) => {
+        uuid: string
+    }
+    loadPersonUUIDFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPersonUUIDSuccess: (
+        person: PersonType | null,
+        payload?: {
+            uuid: string
+        }
+    ) => {
+        person: PersonType | null
+        payload?: {
+            uuid: string
+        }
+    }
+    loadPersons: (url?: string | null) => {
+        url: string | null
+    }
+    loadPersonsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPersonsSuccess: (
+        persons: CountedPaginatedResponse<PersonType> & {
+            offset: number
+        },
+        payload?: {
+            url: string | null
+        }
+    ) => {
+        persons: CountedPaginatedResponse<PersonType> & {
+            offset: number
+        }
+        payload?: {
+            url: string | null
+        }
+    }
+    navigateToCohort: (cohort: CohortType) => {
+        cohort: CohortType
+    }
+    navigateToTab: (tab: PersonsTabType) => {
+        tab: PersonsTabType
+    }
+    resetEventsQuery: () => {
+        value: true
+    }
+    setActiveTab: (tab: PersonsTabType) => {
+        tab: PersonsTabType
+    }
+    setDistinctId: (distinctId: string) => {
+        distinctId: string
+    }
+    setEventsQuery: (eventsQuery: DataTableNode | null) => {
+        eventsQuery: DataTableNode | null
+    }
+    setExceptionsQuery: (exceptionsQuery: DataTableNode | null) => {
+        exceptionsQuery: DataTableNode | null
+    }
+    setHiddenListProperties: (payload: AnyPropertyFilter[]) => {
+        payload: AnyPropertyFilter[]
+    }
+    setListFilters: (payload: PersonListParams) => {
+        payload: PersonListParams
+    }
+    setPerson: (person: PersonType | null) => {
+        person: PersonType | null
+    }
+    setPersons: (persons: PersonType[]) => {
+        persons: PersonType[]
+    }
+    setSplitMergeModalShown: (shown: boolean) => {
+        shown: boolean
+    }
+    setSurveyResponsesQuery: (surveyResponsesQuery: DataTableNode | null) => {
+        surveyResponsesQuery: DataTableNode | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface personsLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        apiDocsURL: (
+            arg: any
+        ) =>
+            | 'https://posthog.com/docs/api/cohorts#get-api-projects-project_id-cohorts-id-persons'
+            | 'https://posthog.com/docs/api/persons'
+        cohortId: (arg: any) => number | 'new' | undefined
+        currentTab: (
+            activeTab: PersonsTabType | null,
+            defaultTab: PersonsTabType.PROFILE | PersonsTabType.PROPERTIES
+        ) => PersonsTabType
+        defaultTab: (feedEnabled: boolean) => PersonsTabType.PROFILE | PersonsTabType.PROPERTIES
+        breadcrumbs: (
+            person: PersonType | null,
+            location: {
+                hash: string
+                pathname: string
+                search: string
+            }
+        ) => Breadcrumb[]
+        sidePanelContext: (person: PersonType | null) => SidePanelSceneContext
+        exporterProps: (listFilters: PersonListParams, arg: any) => TriggerExportProps[]
+        urlId: (arg: any) => any
+        feedEnabled: (featureFlags: FeatureFlagsSet) => boolean
+        primaryDistinctId: (person: PersonType | null) => string | null
+        eventsQueryIsDirty: (eventsQuery: DataTableNode | null, person: PersonType | null) => boolean
+    }
+}
+
+export type personsLogicType = MakeLogicType<
+    personsLogicValues,
+    personsLogicActions,
+    PersonsLogicProps,
+    personsLogicMeta
+>
+
 export const personsLogic = kea<personsLogicType>([
     props({} as PersonsLogicProps),
     key((props) => {
@@ -359,14 +573,25 @@ export const personsLogic = kea<personsLogicType>([
                     : 'https://posthog.com/docs/api/persons',
         ],
         cohortId: [() => [(_, props) => props.cohort], (cohort: PersonsLogicProps['cohort']) => cohort],
-        currentTab: [(s) => [s.activeTab, s.defaultTab], (activeTab, defaultTab) => activeTab || defaultTab],
+        currentTab: [
+            (s) => [s.activeTab, s.defaultTab],
+            (activeTab: PersonsTabType | null, defaultTab: PersonsTabType.PROFILE | PersonsTabType.PROPERTIES) =>
+                activeTab || defaultTab,
+        ],
         defaultTab: [
             (s) => [s.feedEnabled],
-            (feedEnabled) => (feedEnabled ? PersonsTabType.PROFILE : PersonsTabType.PROPERTIES),
+            (feedEnabled: boolean) => (feedEnabled ? PersonsTabType.PROFILE : PersonsTabType.PROPERTIES),
         ],
         breadcrumbs: [
             (s) => [s.person, router.selectors.location],
-            (person, location): Breadcrumb[] => {
+            (
+                person: PersonType | null,
+                location: {
+                    hash: string
+                    pathname: string
+                    search: string
+                }
+            ): Breadcrumb[] => {
                 const showPerson = person && location.pathname.match(/\/person\/.+/)
                 const breadcrumbs: Breadcrumb[] = [
                     {
@@ -389,7 +614,7 @@ export const personsLogic = kea<personsLogicType>([
 
         [SIDE_PANEL_CONTEXT_KEY]: [
             (s) => [s.person],
-            (person): SidePanelSceneContext => {
+            (person: PersonType | null): SidePanelSceneContext => {
                 return {
                     activity_scope: ActivityScope.PERSON,
                     // TODO: Is this correct? It doesn't seem to work...
@@ -400,7 +625,7 @@ export const personsLogic = kea<personsLogicType>([
 
         exporterProps: [
             (s) => [s.listFilters, (_, { cohort }) => cohort],
-            (listFilters, cohort: number | 'new' | undefined): TriggerExportProps[] => [
+            (listFilters: PersonListParams, cohort: number | 'new' | undefined): TriggerExportProps[] => [
                 {
                     export_format: ExporterFormat.CSV,
                     export_context: {
@@ -412,14 +637,18 @@ export const personsLogic = kea<personsLogicType>([
             ],
         ],
         urlId: [() => [(_, props) => props.urlId], (urlId) => urlId],
-        feedEnabled: [(s) => [s.featureFlags], (featureFlags) => !!featureFlags[FEATURE_FLAGS.CUSTOMER_ANALYTICS]],
+        feedEnabled: [
+            (s) => [s.featureFlags],
+            (featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet) =>
+                !!featureFlags[FEATURE_FLAGS.CUSTOMER_ANALYTICS],
+        ],
         primaryDistinctId: [
             (s) => [s.person],
-            (person): string | null => pickBestPersonDistinctId(person?.distinct_ids) ?? null,
+            (person: PersonType | null): string | null => pickBestPersonDistinctId(person?.distinct_ids) ?? null,
         ],
         eventsQueryIsDirty: [
             (s) => [s.eventsQuery, s.person],
-            (eventsQuery, person): boolean => {
+            (eventsQuery: DataTableNode | null, person: PersonType | null): boolean => {
                 if (!eventsQuery || !person?.id) {
                     return false
                 }
diff --git a/frontend/src/scenes/persons/personsSceneLogic.ts b/frontend/src/scenes/persons/personsSceneLogic.ts
index 93ce31ea324a..7a389a34bffd 100644
--- a/frontend/src/scenes/persons/personsSceneLogic.ts
+++ b/frontend/src/scenes/persons/personsSceneLogic.ts
@@ -1,5 +1,5 @@
 import { deepEqual as equal } from 'fast-equals'
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { urlToAction } from 'kea-router'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -15,7 +15,7 @@ import { defaultDataTableColumns } from '~/queries/nodes/DataTable/utils'
 import { DataTableNode, NodeKind, ProductKey } from '~/queries/schema/schema-general'
 import { Breadcrumb } from '~/types'
 
-import type { personsSceneLogicType } from './personsSceneLogicType'
+import type { TeamPublicType, TeamType } from '../../types'
 
 export const PEOPLE_LIST_CONTEXT_KEY = 'people-list'
 
@@ -37,6 +37,43 @@ function buildDefaultQuery(personLastSeenAtEnabled: boolean): DataTableNode {
 
 export const PEOPLE_LIST_DEFAULT_QUERY = buildDefaultQuery(false)
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface personsSceneLogicValues {
+    currentTeam: TeamPublicType | TeamType | null; // teamLogic
+    breadcrumbs: Breadcrumb[];
+    defaultColumns: string[];
+    defaultQuery: DataTableNode;
+    isBannerLoading: boolean;
+    query: DataTableNode;
+    showDisplayNameNudge: boolean;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface personsSceneLogicActions {
+    resetDeletedDistinctId: (distinct_id: string) => {
+        distinct_id: string;
+    };
+    setIsBannerLoading: (isBannerLoading: boolean) => {
+        isBannerLoading: boolean;
+    };
+    setQuery: (query: DataTableNode) => {
+        query: DataTableNode;
+    };
+    setShowDisplayNameNudge: (showDisplayNameNudge: boolean) => {
+        showDisplayNameNudge: boolean;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface personsSceneLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        defaultQuery: (currentTeam: TeamPublicType | TeamType | null) => DataTableNode;
+        defaultColumns: (defaultQuery: DataTableNode) => string[];
+    };
+}
+
+export type personsSceneLogicType = MakeLogicType<personsSceneLogicValues, personsSceneLogicActions, Record<string, any>, personsSceneLogicMeta>;
+
 export const personsSceneLogic = kea<personsSceneLogicType>([
     path(['scenes', 'persons', 'personsSceneLogic']),
 
@@ -83,10 +120,10 @@ export const personsSceneLogic = kea<personsSceneLogicType>([
     selectors({
         defaultQuery: [
             (s) => [s.currentTeam],
-            (currentTeam): DataTableNode =>
+            (currentTeam: TeamPublicType | TeamType | null): DataTableNode =>
                 buildDefaultQuery(currentTeam?.extra_settings?.person_last_seen_at_enabled === true),
         ],
-        defaultColumns: [(s) => [s.defaultQuery], (defaultQuery): string[] => defaultQuery.defaultColumns ?? []],
+        defaultColumns: [(s) => [s.defaultQuery], (defaultQuery: DataTableNode): string[] => defaultQuery.defaultColumns ?? []],
         breadcrumbs: [
             () => [],
             (): Breadcrumb[] => [
diff --git a/frontend/src/scenes/persons/relatedFeatureFlagsLogic.ts b/frontend/src/scenes/persons/relatedFeatureFlagsLogic.ts
index fb3e01b7bb7a..c561b88e6beb 100644
--- a/frontend/src/scenes/persons/relatedFeatureFlagsLogic.ts
+++ b/frontend/src/scenes/persons/relatedFeatureFlagsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { urlToAction } from 'kea-router'
 
@@ -10,8 +10,9 @@ import { urls } from 'scenes/urls'
 
 import { FeatureFlagReleaseType, FeatureFlagType } from '~/types'
 
+import type { PaginationManual } from '../../../@posthog/lemon-ui/src/index'
+import type { FeatureFlagsResult } from '../feature-flags/featureFlagsLogic'
 import { FeatureFlagMatchReason } from './RelatedFeatureFlags'
-import type { relatedFeatureFlagsLogicType } from './relatedFeatureFlagsLogicType'
 
 export interface RelatedFeatureFlag extends FeatureFlagType {
     value: boolean | string
@@ -36,6 +37,96 @@ export interface RelatedFlagsFilters {
     reason?: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface relatedFeatureFlagsLogicValues {
+    featureFlags: FeatureFlagsResult // featureFlagsLogic
+    featureFlagsLoading: boolean // featureFlagsLogic
+    pagination: PaginationManual // featureFlagsLogic
+    currentProjectId: number | null // projectLogic
+    filteredMappedFlags: RelatedFeatureFlag[]
+    filters: Partial<RelatedFlagsFilters>
+    isLoading: boolean
+    mappedRelatedFeatureFlags: RelatedFeatureFlag[]
+    relatedFeatureFlags: RelatedFeatureFlagResponse | null
+    relatedFeatureFlagsLoading: boolean
+    searchTerm: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface relatedFeatureFlagsLogicActions {
+    loadFeatureFlags: () => any // featureFlagsLogic
+    setFeatureFlagsFilters: (
+        filters: Partial<FeatureFlagsFilters>,
+        replace?: boolean | undefined
+    ) => {
+        filters: Partial<FeatureFlagsFilters>
+        replace: boolean | undefined
+    } // featureFlagsLogic
+    loadRelatedFeatureFlags: () => {
+        value: true
+    }
+    loadRelatedFeatureFlagsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRelatedFeatureFlagsSuccess: (
+        relatedFeatureFlags: RelatedFeatureFlagResponse | null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        relatedFeatureFlags: RelatedFeatureFlagResponse | null
+        payload?: {
+            value: true
+        }
+    }
+    setFilters: (
+        filters: Partial<RelatedFlagsFilters>,
+        replace?: boolean
+    ) => {
+        filters: Partial<RelatedFlagsFilters>
+        replace: boolean | undefined
+    }
+    setSearchTerm: (searchTerm: string) => {
+        searchTerm: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface relatedFeatureFlagsLogicProps {
+    distinctId: string | null
+    groups?: {
+        [key: string]: string
+    }
+    groupTypeIndex?: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface relatedFeatureFlagsLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        isLoading: (relatedFeatureFlagsLoading: boolean, featureFlagsLoading: boolean) => boolean
+        mappedRelatedFeatureFlags: (
+            relatedFeatureFlags: RelatedFeatureFlagResponse | null,
+            featureFlags: FeatureFlagsResult
+        ) => RelatedFeatureFlag[]
+        filteredMappedFlags: (
+            mappedRelatedFeatureFlags: RelatedFeatureFlag[],
+            filters: Partial<RelatedFlagsFilters>
+        ) => RelatedFeatureFlag[]
+    }
+}
+
+export type relatedFeatureFlagsLogicType = MakeLogicType<
+    relatedFeatureFlagsLogicValues,
+    relatedFeatureFlagsLogicActions,
+    relatedFeatureFlagsLogicProps,
+    relatedFeatureFlagsLogicMeta
+>
+
 export const relatedFeatureFlagsLogic = kea<relatedFeatureFlagsLogicType>([
     path(['scenes', 'persons', 'relatedFeatureFlagsLogic']),
     props(
@@ -108,7 +199,10 @@ export const relatedFeatureFlagsLogic = kea<relatedFeatureFlagsLogicType>([
         ],
         mappedRelatedFeatureFlags: [
             (selectors) => [selectors.relatedFeatureFlags, selectors.featureFlags],
-            (relatedFlags, featureFlags): RelatedFeatureFlag[] => {
+            (
+                relatedFlags: RelatedFeatureFlagResponse | null,
+                featureFlags: import('scenes/feature-flags/featureFlagsLogic').FeatureFlagsResult
+            ): RelatedFeatureFlag[] => {
                 if (relatedFlags && featureFlags) {
                     let flags = featureFlags.results
                         .map((flag) => ({ ...relatedFlags[flag.key], ...flag }))
@@ -132,7 +226,7 @@ export const relatedFeatureFlagsLogic = kea<relatedFeatureFlagsLogicType>([
         ],
         filteredMappedFlags: [
             (selectors) => [selectors.mappedRelatedFeatureFlags, selectors.filters],
-            (featureFlags, filters: Partial<RelatedFlagsFilters>) => {
+            (featureFlags: RelatedFeatureFlag[], filters: Partial<RelatedFlagsFilters>) => {
                 if (Object.keys(filters).length === 0) {
                     return featureFlags
                 }
diff --git a/frontend/src/scenes/product-tours/productTourLogic.ts b/frontend/src/scenes/product-tours/productTourLogic.ts
index 85603ead67d8..9f8ac663f673 100644
--- a/frontend/src/scenes/product-tours/productTourLogic.ts
+++ b/frontend/src/scenes/product-tours/productTourLogic.ts
@@ -1,5 +1,5 @@
 import { deepEqual as equal } from 'fast-equals'
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, router, urlToAction } from 'kea-router'
@@ -31,9 +31,9 @@ import {
 
 import { DEFAULT_APPEARANCE } from './constants'
 import { prepareStepsForRender } from './editor/generateStepHtml'
-import type { productTourLogicType } from './productTourLogicType'
 import { isAnnouncement, productToursLogic } from './productToursLogic'
 import { getUpdatedStepOrderHistory, hasIncompleteTargeting, resolveStepTranslation } from './stepUtils'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 
 export const DEFAULT_TARGETING_FILTERS: FeatureFlagType['filters'] = {
     ...NEW_FLAG.filters,
@@ -170,6 +170,197 @@ function buildDraftPayload(formValues: ProductTourForm): Record<string, any> {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface productTourLogicValues {
+    _selectedLanguage: string | null;
+    breadcrumbs: Breadcrumb[];
+    dateRange: DateRange | null;
+    draftActionInProgress: "discard" | "publish" | null;
+    draftSaveStatus: "saved" | "saving" | "unsaved" | null;
+    editTab: ProductTourEditTab;
+    entityKeyword: string;
+    hasCustomTargeting: boolean;
+    hasDraft: boolean;
+    isEditingProductTour: boolean;
+    isEditingTranslation: boolean;
+    isProductTourFormSubmitting: boolean;
+    isProductTourFormValid: boolean;
+    isToolbarModalOpen: boolean;
+    launchValidationIssues: LaunchValidationIssue[];
+    productTour: ProductTour | null;
+    productTourForm: ProductTourForm;
+    productTourFormAllErrors: Record<string, any>;
+    productTourFormChanged: boolean;
+    productTourFormErrors: DeepPartialMap<ProductTourForm, ValidationErrorType>;
+    productTourFormHasErrors: boolean;
+    productTourFormManualErrors: Record<string, any>;
+    productTourFormTouched: boolean;
+    productTourFormTouches: Record<string, boolean>;
+    productTourFormValidationErrors: DeepPartialMap<ProductTourForm, ValidationErrorType>;
+    productTourLoading: boolean;
+    productTourMissing: boolean;
+    selectedLanguage: string | null;
+    selectedStep: ProductTourStep | null;
+    selectedStepIndex: number;
+    showProductTourFormErrors: boolean;
+    targetingFlagFilters: FeatureFlagFilters | undefined;
+    toolbarMode: "edit" | "preview";
+    tourStats: ProductTourStats | null;
+    tourStatsLoading: boolean;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface productTourLogicActions {
+    reportProductTourViewed: (tour: ProductTour) => {
+        tour: ProductTour;
+    }; // eventUsageLogic
+    loadProductTours: () => any; // productToursLogic
+    closeToolbarModal: () => {
+        value: true;
+    };
+    discardDraft: () => {
+        value: true;
+    };
+    draftAutoSave: () => {
+        value: true;
+    };
+    editingProductTour: (editing: boolean) => {
+        editing: boolean;
+    };
+    handleToolbarTabVisibility: () => {
+        value: true;
+    };
+    launchProductTour: () => {
+        value: true;
+    };
+    loadProductTour: () => any;
+    loadProductTourFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadProductTourSuccess: (productTour: ProductTour | null, payload?: any) => {
+        productTour: ProductTour | null;
+        payload?: any;
+    };
+    loadTourStats: () => any;
+    loadTourStatsFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadTourStatsSuccess: (tourStats: {
+        stepStats: {
+            stepOrder: number;
+            totalCompleted: number;
+            totalShown: number;
+            uniqueCompleted: number;
+            uniqueShown: number;
+        }[];
+        totalCompleted: number;
+        totalDismissed: number;
+        totalShown: number;
+        uniqueCompleted: number;
+        uniqueDismissed: number;
+        uniqueShown: number;
+    } | null, payload?: any) => {
+        tourStats: {
+            stepStats: {
+                stepOrder: number;
+                totalCompleted: number;
+                totalShown: number;
+                uniqueCompleted: number;
+                uniqueShown: number;
+            }[];
+            totalCompleted: number;
+            totalDismissed: number;
+            totalShown: number;
+            uniqueCompleted: number;
+            uniqueDismissed: number;
+            uniqueShown: number;
+        } | null;
+        payload?: any;
+    };
+    openToolbarModal: (toolbarMode?: "edit" | "preview") => {
+        toolbarMode: "edit" | "preview";
+    };
+    removeLanguage: (langCode: string) => {
+        langCode: string;
+    };
+    resetProductTourForm: (values?: ProductTourForm) => {
+        values?: ProductTourForm;
+    };
+    resumeProductTour: () => {
+        value: true;
+    };
+    setDateRange: (dateRange: DateRange) => {
+        dateRange: DateRange;
+    };
+    setDraftActionInProgress: (action: "discard" | "publish" | null) => {
+        action: "discard" | "publish" | null;
+    };
+    setDraftSaveStatus: (status: "saved" | "saving" | "unsaved" | null) => {
+        status: "saved" | "saving" | "unsaved" | null;
+    };
+    setEditTab: (tab: ProductTourEditTab) => {
+        tab: ProductTourEditTab;
+    };
+    setProductTourFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>;
+    };
+    setProductTourFormValue: (key: FieldName, value: any) => {
+        name: FieldName;
+        value: any;
+    };
+    setProductTourFormValues: (values: DeepPartial<ProductTourForm>) => {
+        values: DeepPartial<ProductTourForm>;
+    };
+    setSelectedLanguage: (langCode: string) => {
+        langCode: string;
+    };
+    setSelectedStepIndex: (index: number) => {
+        index: number;
+    };
+    stopProductTour: () => {
+        value: true;
+    };
+    submitProductTourForm: () => {
+        value: boolean;
+    };
+    submitProductTourFormFailure: (error: Error, errors: Record<string, any>) => {
+        error: Error;
+        errors: Record<string, any>;
+    };
+    submitProductTourFormRequest: (productTourForm: ProductTourForm) => {
+        productTourForm: ProductTourForm;
+    };
+    submitProductTourFormSuccess: (productTourForm: ProductTourForm) => {
+        productTourForm: ProductTourForm;
+    };
+    touchProductTourFormField: (key: string) => {
+        key: string;
+    };
+    updateSelectedStep: (updates: Partial<ProductTourStep>) => {
+        updates: Partial<ProductTourStep>;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface productTourLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        breadcrumbs: (productTour: ProductTour | null) => Breadcrumb[];
+        targetingFlagFilters: (productTourForm: ProductTourForm) => FeatureFlagFilters | undefined;
+        hasCustomTargeting: (targetingFlagFilters: FeatureFlagFilters | undefined) => boolean;
+        selectedLanguage: (_selectedLanguage: string | null, productTourForm: ProductTourForm) => string | null;
+        isEditingTranslation: (selectedLanguage: string | null, productTourForm: ProductTourForm) => boolean;
+        selectedStep: (productTourForm: ProductTourForm, selectedStepIndex: number, selectedLanguage: string | null, isEditingTranslation: boolean) => ProductTourStep | null;
+        entityKeyword: (productTour: ProductTour | null) => string;
+        hasDraft: (productTour: ProductTour | null) => boolean;
+        launchValidationIssues: (productTour: ProductTour | null) => LaunchValidationIssue[];
+    };
+}
+
+export type productTourLogicType = MakeLogicType<productTourLogicValues, productTourLogicActions, ProductTourLogicProps, productTourLogicMeta>;
+
 export const productTourLogic = kea<productTourLogicType>([
     path(['scenes', 'product-tours', 'productTourLogic']),
     props({} as ProductTourLogicProps),
diff --git a/frontend/src/scenes/product-tours/productToursLogic.ts b/frontend/src/scenes/product-tours/productToursLogic.ts
index f5caf015ff67..05d285eaa57e 100644
--- a/frontend/src/scenes/product-tours/productToursLogic.ts
+++ b/frontend/src/scenes/product-tours/productToursLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 
@@ -27,7 +27,6 @@ import {
     SurveyPosition,
 } from '~/types'
 
-import type { productToursLogicType } from './productToursLogicType'
 import { getExplainerStepContent } from './stepUtils'
 
 export const BUTTON_ACTION_OPTIONS: { value: ProductTourButtonAction; label: string }[] = [
@@ -247,6 +246,134 @@ export interface ProductToursFilters {
     archived: boolean
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface productToursLogicValues {
+    breadcrumbs: Breadcrumb[]
+    duplicatedProductTour: ProductTour | null
+    duplicatedProductTourLoading: boolean
+    filteredProductTours: ProductTour[]
+    filters: ProductToursFilters
+    productTours: ProductTour[]
+    productToursLoading: boolean
+    searchTerm: string
+    tab: ProductToursTabs
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface productToursLogicActions {
+    reportProductTourCreated: (
+        tour: ProductTour,
+        creationSource?: 'app' | 'toolbar' | undefined
+    ) => {
+        creationSource: 'app' | 'toolbar' | undefined
+        tour: ProductTour
+    } // eventUsageLogic
+    reportProductTourListViewed: () => {
+        value: true
+    } // eventUsageLogic
+    createAnnouncement: (name: string) => {
+        name: string
+    }
+    createBanner: (name: string) => {
+        name: string
+    }
+    createTour: (name: string) => {
+        name: string
+    }
+    deleteProductTour: (id: string) => string
+    deleteProductTourFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteProductTourSuccess: (
+        productTours: ProductTour[],
+        payload?: string
+    ) => {
+        productTours: ProductTour[]
+        payload?: string
+    }
+    duplicateProductTour: (tour: ProductTour) => ProductTour
+    duplicateProductTourFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    duplicateProductTourSuccess: (
+        duplicatedProductTour: ProductTour | null,
+        payload?: ProductTour
+    ) => {
+        duplicatedProductTour: ProductTour | null
+        payload?: ProductTour
+    }
+    loadProductTours: () => any
+    loadProductToursFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadProductToursSuccess: (
+        productTours: ProductTour[],
+        payload?: any
+    ) => {
+        productTours: ProductTour[]
+        payload?: any
+    }
+    setFilters: (filters: Partial<ProductToursFilters>) => {
+        filters: Partial<ProductToursFilters>
+    }
+    setSearchTerm: (searchTerm: string) => {
+        searchTerm: string
+    }
+    setTab: (tab: ProductToursTabs) => {
+        tab: ProductToursTabs
+    }
+    updateProductTour: ({ id, updatePayload }: { id: string; updatePayload: Partial<ProductTour> }) => {
+        id: string
+        updatePayload: Partial<ProductTour>
+    }
+    updateProductTourFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateProductTourSuccess: (
+        productTours: ProductTour[],
+        payload?: {
+            id: string
+            updatePayload: Partial<ProductTour>
+        }
+    ) => {
+        productTours: ProductTour[]
+        payload?: {
+            id: string
+            updatePayload: Partial<ProductTour>
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface productToursLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        filteredProductTours: (productTours: ProductTour[], filters: ProductToursFilters) => ProductTour[]
+    }
+}
+
+export type productToursLogicType = MakeLogicType<
+    productToursLogicValues,
+    productToursLogicActions,
+    Record<string, any>,
+    productToursLogicMeta
+>
+
 export const productToursLogic = kea<productToursLogicType>([
     path(['scenes', 'product-tours', 'productToursLogic']),
     connect(() => ({
diff --git a/frontend/src/scenes/project-homepage/ai-first/aiFirstHomepageLogic.ts b/frontend/src/scenes/project-homepage/ai-first/aiFirstHomepageLogic.ts
index 9bd2d6df212d..459c0460711c 100644
--- a/frontend/src/scenes/project-homepage/ai-first/aiFirstHomepageLogic.ts
+++ b/frontend/src/scenes/project-homepage/ai-first/aiFirstHomepageLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 import posthog from 'posthog-js'
 
@@ -26,7 +26,9 @@ import { emptySceneParams } from '~/scenes/scenes'
 import { Scene, SceneTab } from '~/scenes/sceneTypes'
 import { DashboardBasicType } from '~/types'
 
-import type { aiFirstHomepageLogicType } from './aiFirstHomepageLogicType'
+import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
+import type { Node } from '../../../queries/schema/schema-general'
+import type { DashboardType, QueryBasedInsightModel, TeamPublicType, TeamType } from '../../../types'
 import { HOMEPAGE_IDLE_DRAFT_KEY, HOMEPAGE_TAB_ID } from './constants'
 
 export type HomepageMode = 'idle' | 'search' | 'ai'
@@ -79,6 +81,109 @@ function savePreviousHomepage(tab: SceneTab | null): void {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiFirstHomepageLogicValues {
+    dashboardsLoading: boolean; // dashboardsModel
+    pinnedDashboards: (DashboardBasicType | DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>>)[]; // dashboardsModel
+    featureFlags: FeatureFlagsSet; // featureFlagLogic
+    conversationId: string | null; // maxLogic
+    threadLogicKey: string; // maxLogic
+    cachedStarred: FileSystemEntry[]; // projectTreeDataLogic
+    shortcutDataHasLoaded: boolean; // projectTreeDataLogic
+    cachedRecents: FileSystemEntry[]; // recentItemsModel
+    recentsHasLoaded: boolean; // recentItemsModel
+    homepage: SceneTab | null; // sceneLogic
+    chatDraftFor: (tabId: string | undefined) => string; // tabUiStateLogic
+    currentTeam: TeamPublicType | TeamType | null; // teamLogic
+    animationPhase: AnimationPhase;
+    capabilities: Capability[];
+    capabilityGrouping: CapabilityGrouping | null;
+    fillInHint: string | null;
+    gridItems: HomepageGridItem[];
+    layoutState: LayoutState;
+    mode: HomepageMode;
+    pinnedDashboardItems: HomepageGridItem[];
+    previousHomepage: SceneTab | null;
+    query: string;
+    recentItems: FileSystemEntry[];
+    recentItemsLoading: boolean;
+    selectedCapability: string | null;
+    starredItems: FileSystemEntry[];
+    starredItemsLoading: boolean;
+    threadStarted: boolean;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiFirstHomepageLogicActions {
+    enterHandsFree: () => {
+        value: true;
+    }; // handsFreeLogic
+    openConversation: (conversationId: string) => {
+        conversationId: string;
+    }; // maxLogic
+    setQuestion: (question: string) => {
+        question: string;
+    }; // maxLogic
+    startNewConversation: () => {
+        value: true;
+    }; // maxLogic
+    setHomepage: (tab: SceneTab | null) => {
+        tab: SceneTab | null;
+    }; // sceneLogic
+    setChatDraftForTab: (tabId: string | undefined, draft: string) => {
+        draft: string;
+        tabId: string;
+    }; // tabUiStateLogic
+    enterAiMode: (trigger: string) => {
+        trigger: string;
+    };
+    returnToIdle: () => {
+        value: true;
+    };
+    revertToPreviousHomepage: () => {
+        value: true;
+    };
+    setAnimationPhase: (phase: AnimationPhase) => {
+        phase: AnimationPhase;
+    };
+    setFillInHint: (hint: string | null) => {
+        hint: string | null;
+    };
+    setPreviousHomepage: (tab: SceneTab | null) => {
+        tab: SceneTab | null;
+    };
+    setQuery: (query: string) => {
+        query: string;
+    };
+    setSelectedCapability: (key: string | null) => {
+        key: string | null;
+    };
+    startHandsFreeChat: () => {
+        value: true;
+    };
+    submitQuery: (mode: "ai" | "search") => {
+        mode: "ai" | "search";
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiFirstHomepageLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        recentItems: (cachedRecents: FileSystemEntry[]) => FileSystemEntry[];
+        recentItemsLoading: (recentsHasLoaded: boolean) => boolean;
+        starredItems: (cachedStarred: FileSystemEntry[]) => FileSystemEntry[];
+        starredItemsLoading: (shortcutDataHasLoaded: boolean) => boolean;
+        mode: (layoutState: LayoutState) => HomepageMode;
+        animationPhase: (layoutState: LayoutState) => AnimationPhase;
+        capabilityGrouping: (featureFlags: FeatureFlagsSet) => CapabilityGrouping | null;
+        capabilities: (capabilityGrouping: CapabilityGrouping | null) => Capability[];
+        pinnedDashboardItems: (pinnedDashboards: (DashboardBasicType | DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>>)[]) => HomepageGridItem[];
+        gridItems: (pinnedDashboardItems: HomepageGridItem[], recentItems: FileSystemEntry[], starredItems: FileSystemEntry[]) => HomepageGridItem[];
+    };
+}
+
+export type aiFirstHomepageLogicType = MakeLogicType<aiFirstHomepageLogicValues, aiFirstHomepageLogicActions, Record<string, any>, aiFirstHomepageLogicMeta>;
+
 export const aiFirstHomepageLogic = kea<aiFirstHomepageLogicType>([
     path(['scenes', 'project-homepage', 'ai-first', 'aiFirstHomepageLogic']),
 
@@ -194,32 +299,45 @@ export const aiFirstHomepageLogic = kea<aiFirstHomepageLogicType>([
     selectors({
         recentItems: [
             (s) => [s.cachedRecents],
-            (cachedRecents): FileSystemEntry[] => cachedRecents.slice(0, GRID_LIMIT),
+            (cachedRecents: FileSystemEntry[]): FileSystemEntry[] => cachedRecents.slice(0, GRID_LIMIT),
         ],
-        recentItemsLoading: [(s) => [s.recentsHasLoaded], (recentsHasLoaded): boolean => !recentsHasLoaded],
+        recentItemsLoading: [(s) => [s.recentsHasLoaded], (recentsHasLoaded: boolean): boolean => !recentsHasLoaded],
         starredItems: [
             (s) => [s.cachedStarred],
-            (cachedStarred): FileSystemEntry[] => cachedStarred.filter((e) => e.type !== 'folder').slice(0, GRID_LIMIT),
+            (cachedStarred: FileSystemEntry[]): FileSystemEntry[] =>
+                cachedStarred.filter((e) => e.type !== 'folder').slice(0, GRID_LIMIT),
         ],
         starredItemsLoading: [
             (s) => [s.shortcutDataHasLoaded],
-            (shortcutDataHasLoaded): boolean => !shortcutDataHasLoaded,
+            (shortcutDataHasLoaded: boolean): boolean => !shortcutDataHasLoaded,
+        ],
+        mode: [(s) => [s.layoutState], (layoutState: LayoutState): HomepageMode => layoutState.mode],
+        animationPhase: [
+            (s) => [s.layoutState],
+            (layoutState: LayoutState): AnimationPhase => layoutState.animationPhase,
         ],
-        mode: [(s) => [s.layoutState], (layoutState): HomepageMode => layoutState.mode],
-        animationPhase: [(s) => [s.layoutState], (layoutState): AnimationPhase => layoutState.animationPhase],
         capabilityGrouping: [
             (s) => [s.featureFlags],
-            (featureFlags): CapabilityGrouping | null =>
+            (featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet): CapabilityGrouping | null =>
                 capabilityGroupingFromVariant(featureFlags[FEATURE_FLAGS.MAX_HOMEPAGE_CAPABILITIES]),
         ],
         capabilities: [
             (s) => [s.capabilityGrouping],
-            (capabilityGrouping): Capability[] =>
+            (capabilityGrouping: CapabilityGrouping | null): Capability[] =>
                 capabilityGrouping ? capabilitiesForGrouping(capabilityGrouping) : [],
         ],
         pinnedDashboardItems: [
             (s) => [s.pinnedDashboards],
-            (pinnedDashboards): HomepageGridItem[] =>
+            (
+                pinnedDashboards: (
+                    | DashboardBasicType
+                    | import('~/types').DashboardType<
+                          import('~/types').QueryBasedInsightModel<
+                              import('~/queries/schema/schema-general').Node<Record<string, any>>
+                          >
+                      >
+                )[]
+            ): HomepageGridItem[] =>
                 pinnedDashboards.slice(0, GRID_LIMIT).map(
                     (d: DashboardBasicType): HomepageGridItem => ({
                         id: `dashboard-${d.id}`,
@@ -232,7 +350,11 @@ export const aiFirstHomepageLogic = kea<aiFirstHomepageLogicType>([
         ],
         gridItems: [
             (s) => [s.pinnedDashboardItems, s.recentItems, s.starredItems],
-            (pinnedDashboardItems, recentItems, starredItems): HomepageGridItem[] => {
+            (
+                pinnedDashboardItems: HomepageGridItem[],
+                recentItems: FileSystemEntry[],
+                starredItems: FileSystemEntry[]
+            ): HomepageGridItem[] => {
                 const toGridItem = (entry: FileSystemEntry, kind: HomepageGridItemKind): HomepageGridItem => {
                     const name = splitPath(entry.path).pop()
                     return {
diff --git a/frontend/src/scenes/project-homepage/projectHomepageLogic.tsx b/frontend/src/scenes/project-homepage/projectHomepageLogic.tsx
index b5a3d8bffabc..8a12bb1e18d9 100644
--- a/frontend/src/scenes/project-homepage/projectHomepageLogic.tsx
+++ b/frontend/src/scenes/project-homepage/projectHomepageLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, connect, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -13,7 +13,67 @@ export type RecentItem =
     | (QueryBasedInsightModel & { itemType: 'insight' })
     | (DashboardBasicType & { itemType: 'dashboard' })
 
-import type { projectHomepageLogicType } from './projectHomepageLogicType'
+import type { Node } from '../../queries/schema/schema-general'
+import type { DashboardType } from '../../types'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface projectHomepageLogicValues {
+    dashboardsLoading: boolean // dashboardsModel
+    rawDashboards: Record<string, DashboardBasicType | DashboardType<QueryBasedInsightModel>> // dashboardsModel
+    currentProjectId: number | null // projectLogic
+    breadcrumbs: Breadcrumb[]
+    expandedInsightIds: Set<string>
+    maxContext: MaxContextInput[]
+    recentDashboards: DashboardBasicType[]
+    recentInsights: QueryBasedInsightModel[]
+    recentInsightsLoading: boolean
+    recentItems: RecentItem[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface projectHomepageLogicActions {
+    loadRecentInsights: () => any
+    loadRecentInsightsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRecentInsightsSuccess: (
+        recentInsights: QueryBasedInsightModel<Node<Record<string, any>>>[],
+        payload?: any
+    ) => {
+        recentInsights: QueryBasedInsightModel<Node<Record<string, any>>>[]
+        payload?: any
+    }
+    toggleInsightExpanded: (insightShortId: string) => {
+        insightShortId: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface projectHomepageLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        recentItems: (
+            recentInsights: QueryBasedInsightModel<Node<Record<string, any>>>[],
+            recentDashboards: DashboardBasicType[]
+        ) => RecentItem[]
+        recentDashboards: (
+            rawDashboards: Record<
+                string,
+                DashboardBasicType | DashboardType<QueryBasedInsightModel<Node<Record<string, any>>>>
+            >
+        ) => DashboardBasicType[]
+    }
+}
+
+export type projectHomepageLogicType = MakeLogicType<
+    projectHomepageLogicValues,
+    projectHomepageLogicActions,
+    Record<string, any>,
+    projectHomepageLogicMeta
+>
 
 export const projectHomepageLogic = kea<projectHomepageLogicType>([
     path(['scenes', 'project-homepage', 'projectHomepageLogic']),
@@ -60,7 +120,7 @@ export const projectHomepageLogic = kea<projectHomepageLogicType>([
         ],
         recentItems: [
             (s) => [s.recentInsights, s.recentDashboards],
-            (recentInsights, recentDashboards): RecentItem[] => {
+            (recentInsights: QueryBasedInsightModel[], recentDashboards: DashboardBasicType[]): RecentItem[] => {
                 return [
                     ...recentInsights.map((i) => ({ ...i, itemType: 'insight' as const })),
                     ...recentDashboards.map((d) => ({ ...d, itemType: 'dashboard' as const })),
@@ -73,7 +133,12 @@ export const projectHomepageLogic = kea<projectHomepageLogicType>([
         ],
         recentDashboards: [
             (s) => [s.rawDashboards],
-            (rawDashboards): DashboardBasicType[] => {
+            (
+                rawDashboards: Record<
+                    string,
+                    DashboardBasicType | import('~/types').DashboardType<QueryBasedInsightModel>
+                >
+            ): DashboardBasicType[] => {
                 return Object.values(rawDashboards).filter((d) => d.last_viewed_at && !d.deleted)
             },
         ],
diff --git a/frontend/src/scenes/projectLogic.ts b/frontend/src/scenes/projectLogic.ts
index 0655e5206461..07ae69af26aa 100644
--- a/frontend/src/scenes/projectLogic.ts
+++ b/frontend/src/scenes/projectLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 
@@ -11,11 +11,156 @@ import { identifierToHuman } from 'lib/utils/strings'
 
 import { ProjectType } from '~/types'
 
+import type { OrganizationBasicType } from '../types'
 import { organizationLogic } from './organizationLogic'
-import type { projectLogicType } from './projectLogicType'
 import { urls } from './urls'
 import { userLogic } from './userLogic'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface projectLogicValues {
+    otherOrganizations: OrganizationBasicType[] // userLogic
+    currentProject: ProjectType | null
+    currentProjectId: number | null
+    currentProjectLoading: boolean
+    moveProjectDisabledReason: "You can't move the project because you aren't a member of another organization" | null
+    projectBeingDeleted: ProjectType | null
+    projectBeingMoved: ProjectType | null
+    projectBeingMovedLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface projectLogicActions {
+    loadCurrentOrganization: () => any // organizationLogic
+    loadUser: (resetOnFailure?: boolean | undefined) => {
+        resetOnFailure: boolean | undefined
+    } // userLogic
+    switchTeam: (
+        teamId: number | string,
+        destination?: string | undefined
+    ) => {
+        destination: string | undefined
+        teamId: number | string
+    } // userLogic
+    updateCurrentOrganization: (
+        organizationId: string,
+        destination?: string | undefined
+    ) => {
+        destination: string | undefined
+        organizationId: string
+    } // userLogic
+    createProject: ({ name }: { name: string }) => {
+        name: string
+    }
+    createProjectFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    createProjectSuccess: (
+        currentProject: ProjectType | null,
+        payload?: {
+            name: string
+        }
+    ) => {
+        currentProject: ProjectType | null
+        payload?: {
+            name: string
+        }
+    }
+    deleteProject: (project: ProjectType) => {
+        project: ProjectType
+    }
+    deleteProjectFailure: () => {
+        value: true
+    }
+    deleteProjectSuccess: () => {
+        value: true
+    }
+    guardPendingDeletion: (
+        pathname: string,
+        isPendingDeletion: boolean | null | undefined
+    ) => {
+        isPendingDeletion: boolean | null | undefined
+        pathname: string
+    }
+    loadCurrentProject: () => any
+    loadCurrentProjectFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadCurrentProjectSuccess: (
+        currentProject: ProjectType | null,
+        payload?: any
+    ) => {
+        currentProject: ProjectType | null
+        payload?: any
+    }
+    moveProject: (
+        project: ProjectType,
+        organizationId: string
+    ) => {
+        organizationId: string
+        project: ProjectType
+    }
+    moveProjectFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    moveProjectSuccess: (
+        projectBeingMoved: ProjectType,
+        payload?: {
+            organizationId: string
+            project: ProjectType
+        }
+    ) => {
+        projectBeingMoved: ProjectType
+        payload?: {
+            organizationId: string
+            project: ProjectType
+        }
+    }
+    updateCurrentProject: (payload: Partial<ProjectType>) => Partial<ProjectType>
+    updateCurrentProjectFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateCurrentProjectSuccess: (
+        currentProject: ProjectType,
+        payload?: Partial<ProjectType>
+    ) => {
+        currentProject: ProjectType
+        payload?: Partial<ProjectType>
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface projectLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        currentProjectId: (currentProject: ProjectType | null) => number | null
+        moveProjectDisabledReason: (
+            otherOrganizations: OrganizationBasicType[]
+        ) => "You can't move the project because you aren't a member of another organization" | null
+    }
+}
+
+export type projectLogicType = MakeLogicType<
+    projectLogicValues,
+    projectLogicActions,
+    Record<string, any>,
+    projectLogicMeta
+>
+
 export const projectLogic = kea<projectLogicType>([
     path(['scenes', 'projectLogic']),
     actions({
@@ -117,10 +262,13 @@ export const projectLogic = kea<projectLogicType>([
         ],
     })),
     selectors({
-        currentProjectId: [(s) => [s.currentProject], (currentProject) => currentProject?.id || null],
+        currentProjectId: [
+            (s) => [s.currentProject],
+            (currentProject: ProjectType | null) => currentProject?.id || null,
+        ],
         moveProjectDisabledReason: [
             (s) => [s.otherOrganizations],
-            (otherOrganizations) =>
+            (otherOrganizations: import('~/types').OrganizationBasicType[]) =>
                 otherOrganizations.length === 0
                     ? "You can't move the project because you aren't a member of another organization"
                     : null,
diff --git a/frontend/src/scenes/resource-transfer/interProjectCopyLogic.ts b/frontend/src/scenes/resource-transfer/interProjectCopyLogic.ts
index 5ac75e2bcda8..406a5b3c574f 100644
--- a/frontend/src/scenes/resource-transfer/interProjectCopyLogic.ts
+++ b/frontend/src/scenes/resource-transfer/interProjectCopyLogic.ts
@@ -1,10 +1,30 @@
-import { kea, path, selectors } from 'kea'
+import { MakeLogicType, kea, path, selectors } from 'kea'
 
 import { FEATURE_FLAGS } from 'lib/constants'
 import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
 import { organizationLogic } from 'scenes/organizationLogic'
 
-import type { interProjectCopyLogicType } from './interProjectCopyLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface interProjectCopyLogicValues {
+    canCopyToProject: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface interProjectCopyLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        canCopyToProject: (
+            currentOrganization: null | import('../../types').OrganizationType,
+            featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet
+        ) => boolean
+    }
+}
+
+export type interProjectCopyLogicType = MakeLogicType<
+    interProjectCopyLogicValues,
+    {},
+    Record<string, any>,
+    interProjectCopyLogicMeta
+>
 
 export const interProjectCopyLogic = kea<interProjectCopyLogicType>([
     path(['scenes', 'resource-transfer', 'interProjectCopyLogic']),
@@ -12,7 +32,10 @@ export const interProjectCopyLogic = kea<interProjectCopyLogicType>([
     selectors({
         canCopyToProject: [
             () => [organizationLogic.selectors.currentOrganization, featureFlagLogic.selectors.featureFlags],
-            (currentOrganization, featureFlags): boolean => {
+            (
+                currentOrganization: null | import('../../types').OrganizationType,
+                featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet
+            ): boolean => {
                 const hasMultipleProjects = (currentOrganization?.teams?.length ?? 0) > 1
                 const interProjectTransfersEnabled = !!featureFlags[FEATURE_FLAGS.INTER_PROJECT_TRANSFERS]
                 return hasMultipleProjects && interProjectTransfersEnabled
diff --git a/frontend/src/scenes/resource-transfer/resourceTransferLogic.ts b/frontend/src/scenes/resource-transfer/resourceTransferLogic.ts
index 807477cc1c25..9da28ff53ac9 100644
--- a/frontend/src/scenes/resource-transfer/resourceTransferLogic.ts
+++ b/frontend/src/scenes/resource-transfer/resourceTransferLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -8,7 +8,7 @@ import { teamLogic } from 'scenes/teamLogic'
 
 import { TeamBasicType } from '~/types'
 
-import type { resourceTransferLogicType } from './resourceTransferLogicType'
+import type { OrganizationType } from '../../types'
 
 export interface ResourceTransferLogicProps {
     resourceKind: string
@@ -57,6 +57,97 @@ export interface TransferResponse {
     count: number
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface resourceTransferLogicValues {
+    currentOrganization: OrganizationType | null // organizationLogic
+    currentTeamId: number | null // teamLogic
+    destinationTeamId: number | null
+    preview: PreviewResponse | null
+    previewLoading: boolean
+    rootResourceName: string | null
+    substitutionChoices: Record<string, SubstitutionChoice>
+    substitutionPayload: {
+        destination_resource_id: string
+        destination_resource_kind: string
+        source_resource_id: string
+        source_resource_kind: string
+    }[]
+    teamOptions: any
+    transferResult: TransferResponse | null
+    transferResultLoading: boolean
+    userFacingResources: PreviewResource[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface resourceTransferLogicActions {
+    initializeSubstitutionChoices: (choices: Record<string, SubstitutionChoice>) => {
+        choices: Record<string, SubstitutionChoice>
+    }
+    loadPreview: () => any
+    loadPreviewFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPreviewSuccess: (
+        preview: PreviewResponse,
+        payload?: any
+    ) => {
+        preview: PreviewResponse
+        payload?: any
+    }
+    setDestinationTeamId: (teamId: unknown) => {
+        teamId: number | null
+    }
+    setSubstitutionChoice: (
+        resourceKey: string,
+        choice: unknown
+    ) => {
+        choice: SubstitutionChoice
+        resourceKey: string
+    }
+    submitTransfer: () => any
+    submitTransferFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    submitTransferSuccess: (
+        transferResult: TransferResponse,
+        payload?: any
+    ) => {
+        transferResult: TransferResponse
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface resourceTransferLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        teamOptions: (currentOrganization: any, currentTeamId: any) => any
+        rootResourceName: (preview: any, resourceKind: any, resourceId: any) => string | null
+        userFacingResources: (preview: any, resourceKind: any, resourceId: any) => PreviewResource[]
+        substitutionPayload: (substitutionChoices: any) => {
+            destination_resource_id: string
+            destination_resource_kind: string
+            source_resource_id: string
+            source_resource_kind: string
+        }[]
+    }
+}
+
+export type resourceTransferLogicType = MakeLogicType<
+    resourceTransferLogicValues,
+    resourceTransferLogicActions,
+    ResourceTransferLogicProps,
+    resourceTransferLogicMeta
+>
+
 export const resourceTransferLogic = kea<resourceTransferLogicType>([
     path(['scenes', 'resource-transfer', 'resourceTransferLogic']),
     props({} as ResourceTransferLogicProps),
diff --git a/frontend/src/scenes/resource-transfer/resourceTransferRowLogic.ts b/frontend/src/scenes/resource-transfer/resourceTransferRowLogic.ts
index 0b1aceb4e631..33782c55e2fb 100644
--- a/frontend/src/scenes/resource-transfer/resourceTransferRowLogic.ts
+++ b/frontend/src/scenes/resource-transfer/resourceTransferRowLogic.ts
@@ -1,16 +1,71 @@
-import { actions, connect, kea, key, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, path, props, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
 
+import type { OrganizationType } from '../../types'
 import { type ResourceTransferLogicProps, type SearchResponse, resourceTransferLogic } from './resourceTransferLogic'
-import type { resourceTransferRowLogicType } from './resourceTransferRowLogicType'
 
 export interface ResourceTransferRowLogicProps {
     resourceKey: string
     transferLogicProps: ResourceTransferLogicProps
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface resourceTransferRowLogicValues {
+    currentOrganization: OrganizationType | null // resourceTransferLogic
+    destinationTeamId: number | null // resourceTransferLogic
+    isSearching: boolean
+    searchResults: SearchResponse | null
+    searchResultsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface resourceTransferRowLogicActions {
+    searchResources: (
+        resourceKind: string,
+        query: string
+    ) => {
+        query: string
+        resourceKind: string
+    }
+    searchResourcesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    searchResourcesSuccess: (
+        searchResults: SearchResponse,
+        payload?: {
+            query: string
+            resourceKind: string
+        }
+    ) => {
+        searchResults: SearchResponse
+        payload?: {
+            query: string
+            resourceKind: string
+        }
+    }
+    setIsSearching: (isSearching: boolean) => {
+        isSearching: boolean
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface resourceTransferRowLogicMeta {
+    key: string
+}
+
+export type resourceTransferRowLogicType = MakeLogicType<
+    resourceTransferRowLogicValues,
+    resourceTransferRowLogicActions,
+    ResourceTransferRowLogicProps,
+    resourceTransferRowLogicMeta
+>
+
 export const resourceTransferRowLogic = kea<resourceTransferRowLogicType>([
     path(['scenes', 'resource-transfer', 'resourceTransferRowLogic']),
     props({} as ResourceTransferRowLogicProps),
diff --git a/frontend/src/scenes/retention/retentionGraphLogic.ts b/frontend/src/scenes/retention/retentionGraphLogic.ts
index 4629f500c624..a44a2c57d3bf 100644
--- a/frontend/src/scenes/retention/retentionGraphLogic.ts
+++ b/frontend/src/scenes/retention/retentionGraphLogic.ts
@@ -1,4 +1,4 @@
-import { connect, kea, key, path, props, selectors } from 'kea'
+import { MakeLogicType, connect, kea, key, path, props, selectors } from 'kea'
 
 import { dayjs } from 'lib/dayjs'
 import { insightVizDataLogic } from 'scenes/insights/insightVizDataLogic'
@@ -10,13 +10,118 @@ import { teamLogic } from 'scenes/teamLogic'
 import { DateRange, RetentionFilter, RetentionQuery } from '~/queries/schema/schema-general'
 import { InsightLogicProps, RetentionPeriod } from '~/types'
 
+import type {
+    FunnelsQuery,
+    LifecycleQuery,
+    PathsQuery,
+    StickinessQuery,
+    TrendsQuery,
+    WebOverviewQuery,
+    WebStatsTableQuery,
+} from '../../queries/schema/schema-general'
+import type { LabelGroupType } from '../../types'
 import { dateOptionToTimeIntervalMap } from './constants'
-import type { retentionGraphLogicType } from './retentionGraphLogicType'
 import { MeanRetentionValue, retentionLogic } from './retentionLogic'
 import { formatRetentionCohortLabel } from './utils'
 
 const DEFAULT_RETENTION_LOGIC_KEY = 'default_retention_key'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface retentionGraphLogicValues {
+    dateRange: DateRange | null | undefined // insightVizDataLogic
+    labelGroupType: LabelGroupType // insightVizDataLogic
+    querySource:
+        | FunnelsQuery
+        | LifecycleQuery
+        | PathsQuery
+        | RetentionQuery
+        | StickinessQuery
+        | TrendsQuery
+        | WebOverviewQuery
+        | WebStatsTableQuery
+        | null // insightVizDataLogic
+    retentionFilter: RetentionFilter | null // insightVizDataLogic
+    breakdownDisplayNames: Record<string, string> // retentionLogic
+    filteredResults: ProcessedRetentionPayload[] // retentionLogic
+    hasValidBreakdown: boolean // retentionLogic
+    isPropertyValueAggregation: boolean // retentionLogic
+    results: ProcessedRetentionPayload[] // retentionLogic
+    retentionMeans: Record<string, MeanRetentionValue> // retentionLogic
+    selectedBreakdownValue: boolean | number | string | null // retentionLogic
+    timezone: string // teamLogic
+    filteredTrendSeries: RetentionTrendPayload[]
+    incompletenessOffsetFromEnd: number
+    intervalViewSeries: RetentionTrendPayload[]
+    shouldShowMeanPerBreakdown: boolean
+    showTrendLines: boolean
+    trendSeries: RetentionTrendPayload[]
+    xAxisLabels: string[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface retentionGraphLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        trendSeries: (
+            results: ProcessedRetentionPayload[],
+            retentionFilter: RetentionFilter | null,
+            isPropertyValueAggregation: boolean
+        ) => RetentionTrendPayload[]
+        intervalViewSeries: (
+            filteredResults: ProcessedRetentionPayload[],
+            retentionFilter: RetentionFilter | null,
+            hasValidBreakdown: boolean,
+            breakdownDisplayNames: Record<string, string>,
+            isPropertyValueAggregation: boolean
+        ) => RetentionTrendPayload[]
+        showTrendLines: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => boolean
+        incompletenessOffsetFromEnd: (
+            dateRange: DateRange | null | undefined,
+            retentionFilter: RetentionFilter | null,
+            trendSeries: RetentionTrendPayload[],
+            timezone: string
+        ) => number
+        shouldShowMeanPerBreakdown: (
+            hasValidBreakdown: boolean,
+            selectedBreakdownValue: boolean | number | string | null
+        ) => boolean
+        filteredTrendSeries: (
+            hasValidBreakdown: boolean,
+            trendSeries: RetentionTrendPayload[],
+            selectedBreakdownValue: boolean | number | string | null,
+            retentionMeans: Record<string, MeanRetentionValue>,
+            retentionFilter: RetentionFilter | null,
+            shouldShowMeanPerBreakdown: boolean,
+            breakdownDisplayNames: Record<string, string>,
+            intervalViewSeries: RetentionTrendPayload[],
+            isPropertyValueAggregation: boolean
+        ) => RetentionTrendPayload[]
+        xAxisLabels: (
+            retentionFilter: RetentionFilter | null,
+            results: ProcessedRetentionPayload[],
+            filteredResults: ProcessedRetentionPayload[]
+        ) => string[]
+    }
+}
+
+export type retentionGraphLogicType = MakeLogicType<
+    retentionGraphLogicValues,
+    {},
+    InsightLogicProps,
+    retentionGraphLogicMeta
+>
+
 export const retentionGraphLogic = kea<retentionGraphLogicType>([
     props({} as InsightLogicProps),
     key(keyForInsightLogicProps(DEFAULT_RETENTION_LOGIC_KEY)),
diff --git a/frontend/src/scenes/retention/retentionLogic.ts b/frontend/src/scenes/retention/retentionLogic.ts
index f9c5ef5cb1a3..8313b22885c6 100644
--- a/frontend/src/scenes/retention/retentionLogic.ts
+++ b/frontend/src/scenes/retention/retentionLogic.ts
@@ -1,5 +1,5 @@
 import { mean, sum } from 'd3'
-import { actions, connect, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 
 import { CUSTOM_OPTION_KEY } from 'lib/components/DateFilter/types'
 import { FEATURE_FLAGS } from 'lib/constants'
@@ -17,7 +17,22 @@ import { RetentionFilter, RetentionResult } from '~/queries/schema/schema-genera
 import { isRetentionQuery, hasBreakdownFilter } from '~/queries/utils'
 import { BreakdownKeyType, CohortType, DateMappingOption, InsightLogicProps, RetentionPeriod } from '~/types'
 
-import type { retentionLogicType } from './retentionLogicType'
+import type { FeatureFlagsSet } from '../../lib/logic/featureFlagLogic'
+import type {
+    BreakdownFilter,
+    DataNode,
+    DateRange,
+    FunnelsQuery,
+    InsightFilter,
+    LifecycleQuery,
+    PathsQuery,
+    RetentionQuery,
+    StickinessQuery,
+    TrendsQuery,
+    WebOverviewQuery,
+    WebStatsTableQuery,
+} from '../../queries/schema/schema-general'
+import type { QuerySourceUpdate } from '../insights/insightVizDataLogic'
 
 const DEFAULT_RETENTION_LOGIC_KEY = 'default_retention_key'
 export const OVERALL_MEAN_KEY = '__overall__'
@@ -34,6 +49,117 @@ export interface MeanRetentionValue {
     isOverall?: boolean
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface retentionLogicValues {
+    cohortsById: Partial<Record<number | string, CohortType>> // cohortsModel
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    breakdownFilter: BreakdownFilter | null | undefined // insightVizDataLogic
+    dateRange: DateRange | null | undefined // insightVizDataLogic
+    insightData: Record<string, any> // insightVizDataLogic
+    insightQuery: DataNode<Record<string, any>> // insightVizDataLogic
+    querySource:
+        | FunnelsQuery
+        | LifecycleQuery
+        | PathsQuery
+        | RetentionQuery
+        | StickinessQuery
+        | TrendsQuery
+        | WebOverviewQuery
+        | WebStatsTableQuery
+        | null // insightVizDataLogic
+    retentionFilter: RetentionFilter | null // insightVizDataLogic
+    timezone: string // teamLogic
+    breakdownDisplayNames: Record<string, string>
+    breakdownValues: (number | string | null | undefined)[]
+    dateMappings: DateMappingOption[]
+    filteredResults: ProcessedRetentionPayload[]
+    hasValidBreakdown: boolean
+    isPropertyValueAggregation: boolean
+    isRetentionDWHEnabled: boolean
+    localCustomBrackets: (number | string)[]
+    results: ProcessedRetentionPayload[]
+    retentionMeans: Record<string, MeanRetentionValue>
+    selectedBreakdownValue: boolean | number | string | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface retentionLogicActions {
+    updateBreakdownFilter: (breakdownFilter: BreakdownFilter) => {
+        breakdownFilter: BreakdownFilter
+    } // insightVizDataLogic
+    updateDateRange: (
+        dateRange: DateRange,
+        ignoreDebounce?: boolean | undefined
+    ) => {
+        dateRange: DateRange
+        ignoreDebounce: boolean
+    } // insightVizDataLogic
+    updateInsightFilter: (insightFilter: InsightFilter) => {
+        insightFilter: InsightFilter
+    } // insightVizDataLogic
+    updateQuerySource: (querySource: QuerySourceUpdate) => {
+        querySource: QuerySourceUpdate
+    } // insightVizDataLogic
+    addCustomBracket: () => {}
+    removeCustomBracket: (index: number) => {
+        index: number
+    }
+    setLocalCustomBrackets: (brackets: (number | string)[]) => {
+        brackets: (number | string)[]
+    }
+    setSelectedBreakdownValue: (value: boolean | number | string | null) => {
+        value: boolean | number | string | null
+    }
+    updateLocalCustomBracket: (
+        index: number,
+        value: number | undefined
+    ) => {
+        index: number
+        value: number | undefined
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface retentionLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        hasValidBreakdown: (breakdownFilter: BreakdownFilter | null | undefined) => boolean
+        isRetentionDWHEnabled: (featureFlags: FeatureFlagsSet) => boolean
+        isPropertyValueAggregation: (retentionFilter: RetentionFilter | null) => boolean
+        results: (
+            insightQuery: DataNode<Record<string, any>>,
+            insightData: Record<string, any>,
+            retentionFilter: RetentionFilter | null,
+            timezone: string,
+            isPropertyValueAggregation: boolean
+        ) => ProcessedRetentionPayload[]
+        filteredResults: (
+            results: ProcessedRetentionPayload[],
+            selectedBreakdownValue: boolean | number | string | null
+        ) => ProcessedRetentionPayload[]
+        retentionMeans: (
+            results: ProcessedRetentionPayload[],
+            retentionFilter: RetentionFilter | null,
+            hasValidBreakdown: boolean,
+            isPropertyValueAggregation: boolean
+        ) => Record<string, MeanRetentionValue>
+        dateMappings: (retentionFilter: RetentionFilter | null) => DateMappingOption[]
+        breakdownValues: (results: ProcessedRetentionPayload[]) => (number | string | null | undefined)[]
+        breakdownDisplayNames: (
+            breakdownValues: (number | string | null | undefined)[],
+            breakdownFilter: BreakdownFilter | null | undefined,
+            cohortsById: Partial<Record<number | string, CohortType>>
+        ) => Record<string, string>
+    }
+}
+
+export type retentionLogicType = MakeLogicType<
+    retentionLogicValues,
+    retentionLogicActions,
+    InsightLogicProps,
+    retentionLogicMeta
+>
+
 export const retentionLogic = kea<retentionLogicType>([
     props({} as InsightLogicProps),
     key(keyForInsightLogicProps(DEFAULT_RETENTION_LOGIC_KEY)),
@@ -149,10 +275,15 @@ export const retentionLogic = kea<retentionLogicType>([
         ],
     }),
     selectors({
-        hasValidBreakdown: [(s) => [s.breakdownFilter], (breakdownFilter) => hasBreakdownFilter(breakdownFilter)],
+        hasValidBreakdown: [
+            (s) => [s.breakdownFilter],
+            (breakdownFilter: null | import('~/queries/schema/schema-general').BreakdownFilter | undefined) =>
+                hasBreakdownFilter(breakdownFilter),
+        ],
         isRetentionDWHEnabled: [
             (s) => [s.featureFlags],
-            (featureFlags): boolean => !!featureFlags[FEATURE_FLAGS.PRODUCT_ANALYTICS_RETENTION_DWH],
+            (featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet): boolean =>
+                !!featureFlags[FEATURE_FLAGS.PRODUCT_ANALYTICS_RETENTION_DWH],
         ],
         isPropertyValueAggregation: [
             (s) => [s.retentionFilter],
@@ -162,11 +293,11 @@ export const retentionLogic = kea<retentionLogicType>([
         results: [
             (s) => [s.insightQuery, s.insightData, s.retentionFilter, s.timezone, s.isPropertyValueAggregation],
             (
-                insightQuery,
-                insightData,
-                retentionFilter,
-                timezone,
-                isPropertyValueAggregation
+                insightQuery: import('~/queries/schema/schema-general').DataNode<Record<string, any>>,
+                insightData: Record<string, any>,
+                retentionFilter: RetentionFilter | null,
+                timezone: string,
+                isPropertyValueAggregation: boolean
             ): ProcessedRetentionPayload[] => {
                 if (isPropertyValueAggregation && !retentionFilter?.aggregationProperty) {
                     return []
@@ -216,7 +347,7 @@ export const retentionLogic = kea<retentionLogicType>([
 
         filteredResults: [
             (s) => [s.results, s.selectedBreakdownValue],
-            (results, selectedBreakdownValue) => {
+            (results: ProcessedRetentionPayload[], selectedBreakdownValue: boolean | number | string | null) => {
                 if (!results || results.length === 0) {
                     return []
                 }
@@ -373,7 +504,7 @@ export const retentionLogic = kea<retentionLogicType>([
         ],
         breakdownValues: [
             (s) => [s.results],
-            (results) => {
+            (results: ProcessedRetentionPayload[]) => {
                 if (!results || results.length === 0) {
                     return []
                 }
diff --git a/frontend/src/scenes/retention/retentionModalLogic.ts b/frontend/src/scenes/retention/retentionModalLogic.ts
index 14b0d6c526ec..edafd00ba78f 100644
--- a/frontend/src/scenes/retention/retentionModalLogic.ts
+++ b/frontend/src/scenes/retention/retentionModalLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { router } from 'kea-router'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -22,11 +22,120 @@ import {
 import { isInsightActorsQuery, isLifecycleQuery, isRetentionQuery, isStickinessQuery } from '~/queries/utils'
 import { InsightLogicProps } from '~/types'
 
-import type { retentionModalLogicType } from './retentionModalLogicType'
+import type { DataColorTheme } from '../../lib/colors'
+import type { FeatureFlagsSet } from '../../lib/logic/featureFlagLogic'
+import type {
+    FunnelsQuery,
+    LifecycleQuery,
+    PathsQuery,
+    RetentionFilter,
+    StickinessQuery,
+    TrendsQuery,
+    WebOverviewQuery,
+    WebStatsTableQuery,
+} from '../../queries/schema/schema-general'
 import { retentionPeopleLogic } from './retentionPeopleLogic'
 
 const DEFAULT_RETENTION_LOGIC_KEY = 'default_retention_key'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface retentionModalLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun // groupsModel
+    querySource:
+        | FunnelsQuery
+        | LifecycleQuery
+        | PathsQuery
+        | RetentionQuery
+        | StickinessQuery
+        | TrendsQuery
+        | WebOverviewQuery
+        | WebStatsTableQuery
+        | null // insightVizDataLogic
+    retentionFilter: RetentionFilter | null // insightVizDataLogic
+    theme: DataColorTheme | null // insightVizDataLogic
+    actorsQuery: ActorsQuery | null
+    aggregationTargetLabel: Noun
+    exploreUrl: string | null
+    insightEventsQueryUrl: string | null
+    isCohortModalOpen: boolean
+    selectedBreakdownValue: number | string | null
+    selectedColumnIndex: number | null
+    selectedInterval: number | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface retentionModalLogicActions {
+    loadPeople: (
+        selectedInterval: number,
+        breakdownValue?: number | string | null | undefined
+    ) => {
+        breakdownValue: number | string | null | undefined
+        selectedInterval: number
+    } // retentionPeopleLogic
+    closeModal: () => {
+        value: true
+    }
+    openModal: (
+        rowIndex: number,
+        breakdownValue?: number | string | null,
+        columnIndex?: number | null
+    ) => {
+        breakdownValue: number | string | null | undefined
+        columnIndex: number | null | undefined
+        rowIndex: number
+    }
+    saveAsCohort: (cohortName: string) => {
+        cohortName: string
+    }
+    setIsCohortModalOpen: (isOpen: boolean) => {
+        isOpen: boolean
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface retentionModalLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        aggregationTargetLabel: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null,
+            aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun
+        ) => Noun
+        actorsQuery: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null,
+            selectedInterval: number | null,
+            selectedBreakdownValue: number | string | null
+        ) => ActorsQuery | null
+        insightEventsQueryUrl: (actorsQuery: ActorsQuery | null) => string | null
+        exploreUrl: (actorsQuery: ActorsQuery | null) => string | null
+    }
+}
+
+export type retentionModalLogicType = MakeLogicType<
+    retentionModalLogicValues,
+    retentionModalLogicActions,
+    InsightLogicProps,
+    retentionModalLogicMeta
+>
+
 export const retentionModalLogic = kea<retentionModalLogicType>([
     props({} as InsightLogicProps),
     key(keyForInsightLogicProps(DEFAULT_RETENTION_LOGIC_KEY)),
@@ -87,7 +196,19 @@ export const retentionModalLogic = kea<retentionModalLogicType>([
     selectors({
         aggregationTargetLabel: [
             (s) => [s.querySource, s.aggregationLabel],
-            (querySource, aggregationLabel): Noun => {
+            (
+                querySource:
+                    | RetentionQuery
+                    | null
+                    | import('~/queries/schema/schema-general').FunnelsQuery
+                    | import('~/queries/schema/schema-general').LifecycleQuery
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').StickinessQuery
+                    | import('~/queries/schema/schema-general').TrendsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery,
+                aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun
+            ): Noun => {
                 const aggregation_group_type_index =
                     isLifecycleQuery(querySource) || isStickinessQuery(querySource)
                         ? undefined
@@ -110,7 +231,7 @@ export const retentionModalLogic = kea<retentionModalLogicType>([
         ],
         insightEventsQueryUrl: [
             (s) => [s.actorsQuery],
-            (actorsQuery): string | null => {
+            (actorsQuery: ActorsQuery | null): string | null => {
                 if (!actorsQuery) {
                     return null
                 }
diff --git a/frontend/src/scenes/retention/retentionPeopleLogic.ts b/frontend/src/scenes/retention/retentionPeopleLogic.ts
index 1b4c7e4db333..78e30219b399 100644
--- a/frontend/src/scenes/retention/retentionPeopleLogic.ts
+++ b/frontend/src/scenes/retention/retentionPeopleLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -11,10 +11,170 @@ import { queryNodeToFilter } from '~/queries/nodes/InsightQuery/utils/queryNodeT
 import { NodeKind, RetentionQuery } from '~/queries/schema/schema-general'
 import { InsightLogicProps } from '~/types'
 
-import type { retentionPeopleLogicType } from './retentionPeopleLogicType'
+import type {
+    DataNode,
+    ErrorTrackingQueryResponse,
+    FunnelsQuery,
+    HogQLAutocompleteResponse,
+    HogQLMetadataResponse,
+    HogQLQueryResponse,
+    HogQueryResponse,
+    LifecycleQuery,
+    LogAttributesQueryResponse,
+    LogValuesQueryResponse,
+    MetricsQueryResponse,
+    PathsQuery,
+    RefreshType,
+    SessionsQueryResponse,
+    StickinessQuery,
+    TraceSpansAggregationQueryResponse,
+    TraceSpansAttributeBreakdownQueryResponse,
+    TraceSpansQueryResponse,
+    TrendsQuery,
+    WebOverviewQuery,
+    WebStatsTableQuery,
+} from '../../queries/schema/schema-general'
+import type { FilterType } from '../../types'
 
 const DEFAULT_RETENTION_LOGIC_KEY = 'default_retention_key'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface retentionPeopleLogicValues {
+    querySource:
+        | FunnelsQuery
+        | LifecycleQuery
+        | PathsQuery
+        | RetentionQuery
+        | StickinessQuery
+        | TrendsQuery
+        | WebOverviewQuery
+        | WebStatsTableQuery
+        | null // insightVizDataLogic
+    apiFilters: Partial<FilterType>
+    people: RetentionTablePeoplePayload
+    peopleLoading: boolean
+    peopleLoadingMore: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface retentionPeopleLogicActions {
+    loadDataSuccess: (
+        response:
+            | ErrorTrackingQueryResponse
+            | HogQLAutocompleteResponse
+            | HogQLMetadataResponse
+            | HogQLQueryResponse<any[]>
+            | HogQueryResponse
+            | LogAttributesQueryResponse
+            | LogValuesQueryResponse
+            | MetricsQueryResponse
+            | Record<string, any>
+            | SessionsQueryResponse
+            | TraceSpansAggregationQueryResponse
+            | TraceSpansAttributeBreakdownQueryResponse
+            | TraceSpansQueryResponse
+            | null
+            | undefined,
+        payload?:
+            | {
+                  overrideQuery: DataNode<Record<string, any>> | undefined
+                  pollOnly: boolean
+                  queryId: string
+                  refresh: RefreshType | undefined
+              }
+            | undefined
+    ) => {
+        payload?: {
+            overrideQuery: DataNode<Record<string, any>> | undefined
+            pollOnly: boolean
+            queryId: string
+            refresh: RefreshType | undefined
+        }
+        response:
+            | ErrorTrackingQueryResponse
+            | HogQLAutocompleteResponse
+            | HogQLMetadataResponse
+            | HogQLQueryResponse<any[]>
+            | HogQueryResponse
+            | LogAttributesQueryResponse
+            | LogValuesQueryResponse
+            | MetricsQueryResponse
+            | Record<string, any>
+            | SessionsQueryResponse
+            | TraceSpansAggregationQueryResponse
+            | TraceSpansAttributeBreakdownQueryResponse
+            | TraceSpansQueryResponse
+            | null
+            | undefined
+    } // insightVizDataLogic
+    clearPeople: () => {
+        value: true
+    }
+    loadMorePeople: (
+        selectedInterval: number,
+        breakdownValue?: number | string | null
+    ) => {
+        breakdownValue: number | string | null | undefined
+        selectedInterval: number
+    }
+    loadMorePeopleSuccess: (payload: RetentionTablePeoplePayload) => {
+        payload: RetentionTablePeoplePayload
+    }
+    loadPeople: (
+        selectedInterval: number,
+        breakdownValue?: number | string | null
+    ) => {
+        breakdownValue: number | string | null | undefined
+        selectedInterval: number
+    }
+    loadPeopleFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPeopleSuccess: (
+        people: RetentionTablePeoplePayload,
+        payload?: {
+            breakdownValue: number | string | null | undefined
+            selectedInterval: number
+        }
+    ) => {
+        people: RetentionTablePeoplePayload
+        payload?: {
+            breakdownValue: number | string | null | undefined
+            selectedInterval: number
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface retentionPeopleLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        apiFilters: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => Partial<FilterType>
+    }
+}
+
+export type retentionPeopleLogicType = MakeLogicType<
+    retentionPeopleLogicValues,
+    retentionPeopleLogicActions,
+    InsightLogicProps,
+    retentionPeopleLogicMeta
+>
+
 export const retentionPeopleLogic = kea<retentionPeopleLogicType>([
     props({} as InsightLogicProps),
     key(keyForInsightLogicProps(DEFAULT_RETENTION_LOGIC_KEY)),
@@ -64,7 +224,21 @@ export const retentionPeopleLogic = kea<retentionPeopleLogicType>([
         ],
     }),
     selectors(() => ({
-        apiFilters: [(s) => [s.querySource], (querySource) => (querySource ? queryNodeToFilter(querySource) : {})],
+        apiFilters: [
+            (s) => [s.querySource],
+            (
+                querySource:
+                    | RetentionQuery
+                    | null
+                    | import('~/queries/schema/schema-general').FunnelsQuery
+                    | import('~/queries/schema/schema-general').LifecycleQuery
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').StickinessQuery
+                    | import('~/queries/schema/schema-general').TrendsQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => (querySource ? queryNodeToFilter(querySource) : {}),
+        ],
     })),
     listeners(({ actions, values }) => ({
         loadDataSuccess: () => {
diff --git a/frontend/src/scenes/retention/retentionTableLogic.ts b/frontend/src/scenes/retention/retentionTableLogic.ts
index 96925686a9f6..50afb51e9bba 100644
--- a/frontend/src/scenes/retention/retentionTableLogic.ts
+++ b/frontend/src/scenes/retention/retentionTableLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 
 import { capitalizeFirstLetter } from 'lib/utils/strings'
 import { insightVizDataLogic } from 'scenes/insights/insightVizDataLogic'
@@ -8,14 +8,96 @@ import { InsightQueryNode } from '~/queries/schema/schema-general'
 import { isRetentionQuery } from '~/queries/utils'
 import { InsightLogicProps, InsightType } from '~/types'
 
+import type { DataColorTheme } from '../../lib/colors'
+import type { DataNode, DateRange, RetentionFilter, VizSpecificOptions } from '../../queries/schema/schema-general'
 import { dateOptionPlurals } from './constants'
 import { retentionLogic } from './retentionLogic'
-import type { retentionTableLogicType } from './retentionTableLogicType'
+import type { MeanRetentionValue } from './retentionLogic'
 import { NO_BREAKDOWN_VALUE, ProcessedRetentionPayload, RetentionTableRow } from './types'
 import { formatRetentionCohortLabel } from './utils'
 
 const DEFAULT_RETENTION_LOGIC_KEY = 'default_retention_key'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface retentionTableLogicValues {
+    dateRange: DateRange | null | undefined // insightVizDataLogic
+    insightQuery: DataNode<Record<string, any>> // insightVizDataLogic
+    retentionFilter: RetentionFilter | null // insightVizDataLogic
+    theme: DataColorTheme | null // insightVizDataLogic
+    vizSpecificOptions: VizSpecificOptions | null | undefined // insightVizDataLogic
+    breakdownDisplayNames: Record<string, string> // retentionLogic
+    filteredResults: ProcessedRetentionPayload[] // retentionLogic
+    isPropertyValueAggregation: boolean // retentionLogic
+    results: ProcessedRetentionPayload[] // retentionLogic
+    retentionMeans: Record<string, MeanRetentionValue> // retentionLogic
+    selectedBreakdownValue: boolean | number | string | null // retentionLogic
+    expandedBreakdowns: Record<string, boolean>
+    hideSizeColumn: boolean | undefined
+    hoveredColumn: number | null
+    retentionVizOptions:
+        | {
+              hideLineGraph?: boolean | undefined
+              hideSizeColumn?: boolean | undefined
+              useSmallLayout?: boolean | undefined
+          }
+        | undefined
+    tableHeaders: string[]
+    tableRows: RetentionTableRow[]
+    tableRowsSplitByBreakdownValue: Record<string, RetentionTableRow[]>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface retentionTableLogicActions {
+    setSelectedBreakdownValue: (value: boolean | number | string | null) => {
+        value: boolean | number | string | null
+    } // retentionLogic
+    setExpandedBreakdowns: (expandedBreakdowns: Record<string, boolean>) => {
+        expandedBreakdowns: Record<string, boolean>
+    }
+    setHoveredColumn: (columnIndex: number | null) => {
+        columnIndex: number | null
+    }
+    toggleBreakdown: (breakdownValue: string) => {
+        breakdownValue: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface retentionTableLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        retentionVizOptions: (vizSpecificOptions: VizSpecificOptions | null | undefined) =>
+            | {
+                  hideLineGraph?: boolean | undefined
+                  hideSizeColumn?: boolean | undefined
+                  useSmallLayout?: boolean | undefined
+              }
+            | undefined
+        hideSizeColumn: (
+            retentionVizOptions:
+                | {
+                      hideLineGraph?: boolean | undefined
+                      hideSizeColumn?: boolean | undefined
+                      useSmallLayout?: boolean | undefined
+                  }
+                | undefined
+        ) => boolean | undefined
+        tableRows: (
+            filteredResults: ProcessedRetentionPayload[],
+            retentionFilter: RetentionFilter | null
+        ) => RetentionTableRow[]
+        tableHeaders: (results: ProcessedRetentionPayload[], insightQuery: DataNode<Record<string, any>>) => string[]
+        tableRowsSplitByBreakdownValue: (tableRows: RetentionTableRow[]) => Record<string, RetentionTableRow[]>
+    }
+}
+
+export type retentionTableLogicType = MakeLogicType<
+    retentionTableLogicValues,
+    retentionTableLogicActions,
+    InsightLogicProps,
+    retentionTableLogicMeta
+>
+
 export const retentionTableLogic = kea<retentionTableLogicType>([
     props({} as InsightLogicProps),
     key(keyForInsightLogicProps(DEFAULT_RETENTION_LOGIC_KEY)),
@@ -75,13 +157,28 @@ export const retentionTableLogic = kea<retentionTableLogicType>([
     selectors({
         retentionVizOptions: [
             (s) => [s.vizSpecificOptions],
-            (vizSpecificOptions) => vizSpecificOptions?.[InsightType.RETENTION],
+            (vizSpecificOptions: null | import('~/queries/schema/schema-general').VizSpecificOptions | undefined) =>
+                vizSpecificOptions?.[InsightType.RETENTION],
+        ],
+        hideSizeColumn: [
+            (s) => [s.retentionVizOptions],
+            (
+                retentionVizOptions:
+                    | {
+                          hideLineGraph?: boolean | undefined
+                          hideSizeColumn?: boolean | undefined
+                          useSmallLayout?: boolean | undefined
+                      }
+                    | undefined
+            ) => retentionVizOptions?.hideSizeColumn,
         ],
-        hideSizeColumn: [(s) => [s.retentionVizOptions], (retentionVizOptions) => retentionVizOptions?.hideSizeColumn],
 
         tableRows: [
             (s) => [s.filteredResults, s.retentionFilter],
-            (filteredResults, retentionFilter): RetentionTableRow[] => {
+            (
+                filteredResults: ProcessedRetentionPayload[],
+                retentionFilter: null | import('~/queries/schema/schema-general').RetentionFilter
+            ): RetentionTableRow[] => {
                 const { period } = retentionFilter || {}
 
                 return filteredResults.map((currentResult: ProcessedRetentionPayload) => {
@@ -131,7 +228,7 @@ export const retentionTableLogic = kea<retentionTableLogicType>([
         ],
         tableRowsSplitByBreakdownValue: [
             (s) => [s.tableRows],
-            (tableRows) => {
+            (tableRows: RetentionTableRow[]) => {
                 return tableRows.reduce(
                     (acc, row) => {
                         const breakdownValue = row.breakdown_value ?? NO_BREAKDOWN_VALUE
diff --git a/frontend/src/scenes/saved-insights/addSavedInsightsModalLogic.ts b/frontend/src/scenes/saved-insights/addSavedInsightsModalLogic.ts
index f8ce734c1b82..879a45617748 100644
--- a/frontend/src/scenes/saved-insights/addSavedInsightsModalLogic.ts
+++ b/frontend/src/scenes/saved-insights/addSavedInsightsModalLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
@@ -18,7 +18,9 @@ import { userLogic } from 'scenes/userLogic'
 import { getQueryBasedInsightModel } from '~/queries/nodes/InsightViz/utils'
 import type { QueryBasedInsightModel } from '~/types'
 
-import type { addSavedInsightsModalLogicType } from './addSavedInsightsModalLogicType'
+import type { FeatureFlagsSet } from '../../lib/logic/featureFlagLogic'
+import type { Node } from '../../queries/schema/schema-general'
+import type { UserType } from '../../types'
 import { SavedInsightFilters, cleanFilters } from './savedInsightsLogic'
 
 interface InsightListParams {
@@ -38,6 +40,138 @@ interface InsightListParams {
 
 export const INSIGHTS_PER_PAGE = 15
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface addSavedInsightsModalLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    currentTeamId: number | null // teamLogic
+    user: UserType | null // userLogic
+    count: number
+    dashboardUpdatesInProgress: Record<number, boolean>
+    filters: SavedInsightFilters
+    hasFilteredUI: boolean
+    hasLoadedInsights: boolean
+    hasSmartDefaults: boolean
+    insights: {
+        count: number
+        results: QueryBasedInsightModel<Node<Record<string, any>>>[]
+    }
+    insightsLoading: boolean
+    insightsPerPage: number
+    modalPage: number
+    rawModalFilters: Partial<SavedInsightFilters> | null
+    sorting: Sorting | null
+    userInsights: {
+        count: number
+    }
+    userInsightsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface addSavedInsightsModalLogicActions {
+    addInsightToDashboard: (
+        insight: QueryBasedInsightModel,
+        dashboardId: number
+    ) => {
+        dashboardId: number
+        insight: QueryBasedInsightModel<Node<Record<string, any>>>
+    }
+    dashboardUpdateFailed: (insightId: number) => {
+        insightId: number
+    }
+    loadInsights: () => {
+        value: true
+    }
+    loadInsightsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadInsightsSuccess: (
+        insights: {
+            count: number
+            results: QueryBasedInsightModel<Node<Record<string, any>>>[]
+        },
+        payload?: {
+            value: true
+        }
+    ) => {
+        insights: {
+            count: number
+            results: QueryBasedInsightModel<Node<Record<string, any>>>[]
+        }
+        payload?: {
+            value: true
+        }
+    }
+    loadUserInsights: () => any
+    loadUserInsightsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadUserInsightsSuccess: (
+        userInsights: {
+            count: any
+        },
+        payload?: any
+    ) => {
+        userInsights: {
+            count: any
+        }
+        payload?: any
+    }
+    removeInsightFromDashboard: (
+        insight: QueryBasedInsightModel,
+        dashboardId: number
+    ) => {
+        dashboardId: number
+        insight: QueryBasedInsightModel<Node<Record<string, any>>>
+    }
+    setDashboardUpdateLoading: (
+        insightId: number,
+        loading: boolean
+    ) => {
+        insightId: number
+        loading: boolean
+    }
+    setModalFilters: (
+        filters: Partial<SavedInsightFilters>,
+        merge?: boolean
+    ) => {
+        filters: Partial<SavedInsightFilters>
+        merge: boolean
+    }
+    setModalPage: (page: number) => {
+        page: number
+    }
+    updateInsight: (insight: QueryBasedInsightModel) => {
+        insight: QueryBasedInsightModel<Node<Record<string, any>>>
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface addSavedInsightsModalLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        filters: (rawModalFilters: Partial<SavedInsightFilters> | null) => SavedInsightFilters
+        hasFilteredUI: (featureFlags: FeatureFlagsSet) => boolean
+        hasSmartDefaults: (featureFlags: FeatureFlagsSet) => boolean
+        count: (insights: { count: number; results: QueryBasedInsightModel<Node<Record<string, any>>>[] }) => number
+        sorting: (filters: SavedInsightFilters) => Sorting | null
+        modalPage: (filters: SavedInsightFilters) => number
+    }
+}
+
+export type addSavedInsightsModalLogicType = MakeLogicType<
+    addSavedInsightsModalLogicValues,
+    addSavedInsightsModalLogicActions,
+    Record<string, any>,
+    addSavedInsightsModalLogicMeta
+>
+
 export const addSavedInsightsModalLogic = kea<addSavedInsightsModalLogicType>([
     path(['scenes', 'saved-insights', 'addSavedInsightsModalLogic']),
     connect(() => ({
@@ -165,32 +299,39 @@ export const addSavedInsightsModalLogic = kea<addSavedInsightsModalLogicType>([
     selectors({
         filters: [
             (s) => [s.rawModalFilters],
-            (rawModalFilters): SavedInsightFilters => cleanFilters(rawModalFilters || {}),
+            (rawModalFilters: Partial<SavedInsightFilters> | null): SavedInsightFilters =>
+                cleanFilters(rawModalFilters || {}),
         ],
         hasFilteredUI: [
             (s) => [s.featureFlags],
-            (featureFlags): boolean => {
+            (featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet): boolean => {
                 const variant = featureFlags[FEATURE_FLAGS.PRODUCT_ANALYTICS_DASHBOARD_MODAL_SMART_DEFAULTS]
                 return variant === 'filtered' || variant === 'smart-filtered'
             },
         ],
         hasSmartDefaults: [
             (s) => [s.featureFlags],
-            (featureFlags): boolean =>
+            (featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet): boolean =>
                 featureFlags[FEATURE_FLAGS.PRODUCT_ANALYTICS_DASHBOARD_MODAL_SMART_DEFAULTS] === 'smart-filtered',
         ],
         insightsPerPage: [() => [], (): number => INSIGHTS_PER_PAGE],
-        count: [(s) => [s.insights], (insights) => insights.count],
+        count: [
+            (s) => [s.insights],
+            (insights: {
+                count: number
+                results: QueryBasedInsightModel<import('../../queries/schema').Node<Record<string, any>>>[]
+            }) => insights.count,
+        ],
         sorting: [
             (s) => [s.filters],
-            (filters): Sorting | null =>
+            (filters: SavedInsightFilters): Sorting | null =>
                 filters.order
                     ? filters.order.startsWith('-')
                         ? { columnKey: filters.order.slice(1), order: -1 }
                         : { columnKey: filters.order, order: 1 }
                     : null,
         ],
-        modalPage: [(s) => [s.filters], (filters) => filters.page],
+        modalPage: [(s) => [s.filters], (filters: SavedInsightFilters) => filters.page],
     }),
     listeners(({ actions, values, selectors }) => ({
         setModalPage: async ({ page }) => {
diff --git a/frontend/src/scenes/saved-insights/insightDashboardModalLogic.ts b/frontend/src/scenes/saved-insights/insightDashboardModalLogic.ts
index 4cfb04b0c5d4..f58761861654 100644
--- a/frontend/src/scenes/saved-insights/insightDashboardModalLogic.ts
+++ b/frontend/src/scenes/saved-insights/insightDashboardModalLogic.ts
@@ -1,12 +1,103 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 
 import type { QueryBasedInsightModel } from '~/types'
 
+import type { Node } from '../../queries/schema/schema-general'
 import { addSavedInsightsModalLogic } from './addSavedInsightsModalLogic'
-import type { insightDashboardModalLogicType } from './insightDashboardModalLogicType'
 
 export type OptimisticDashboardState = Record<number, boolean>
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightDashboardModalLogicValues {
+    dashboardUpdatesInProgress: Record<number, boolean> // addSavedInsightsModalLogic
+    isInsightInDashboard: (
+        insight: QueryBasedInsightModel,
+        dashboardTiles?: {
+            insight?: {
+                id: number
+            } | null
+        }[]
+    ) => boolean
+    optimisticDashboardState: OptimisticDashboardState
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightDashboardModalLogicActions {
+    addInsightToDashboard: (
+        insight: QueryBasedInsightModel<Node<Record<string, any>>>,
+        dashboardId: number
+    ) => {
+        dashboardId: number
+        insight: QueryBasedInsightModel<Node<Record<string, any>>>
+    } // addSavedInsightsModalLogic
+    dashboardUpdateFailed: (insightId: number) => {
+        insightId: number
+    } // addSavedInsightsModalLogic
+    removeInsightFromDashboard: (
+        insight: QueryBasedInsightModel<Node<Record<string, any>>>,
+        dashboardId: number
+    ) => {
+        dashboardId: number
+        insight: QueryBasedInsightModel<Node<Record<string, any>>>
+    } // addSavedInsightsModalLogic
+    clearOptimisticDashboardState: (insightId: number) => {
+        insightId: number
+    }
+    setOptimisticDashboardState: (
+        insightId: number,
+        inDashboard: boolean
+    ) => {
+        inDashboard: boolean
+        insightId: number
+    }
+    syncOptimisticStateWithDashboard: (
+        tiles: {
+            insight?: {
+                id: number
+            } | null
+        }[]
+    ) => {
+        tiles: {
+            insight?:
+                | {
+                      id: number
+                  }
+                | null
+                | undefined
+        }[]
+    }
+    toggleInsightOnDashboard: (
+        insight: QueryBasedInsightModel,
+        dashboardId: number,
+        currentlyInDashboard: boolean
+    ) => {
+        currentlyInDashboard: boolean
+        dashboardId: number
+        insight: QueryBasedInsightModel<Node<Record<string, any>>>
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightDashboardModalLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        isInsightInDashboard: (optimisticDashboardState: OptimisticDashboardState) => (
+            insight: QueryBasedInsightModel,
+            dashboardTiles?: {
+                insight?: {
+                    id: number
+                } | null
+            }[]
+        ) => boolean
+    }
+}
+
+export type insightDashboardModalLogicType = MakeLogicType<
+    insightDashboardModalLogicValues,
+    insightDashboardModalLogicActions,
+    Record<string, any>,
+    insightDashboardModalLogicMeta
+>
+
 export const insightDashboardModalLogic = kea<insightDashboardModalLogicType>([
     path(['scenes', 'saved-insights', 'insightDashboardModalLogic']),
     connect({
diff --git a/frontend/src/scenes/saved-insights/savedInsightsLogic.ts b/frontend/src/scenes/saved-insights/savedInsightsLogic.ts
index 3e02373abedd..aec7c4b59f44 100644
--- a/frontend/src/scenes/saved-insights/savedInsightsLogic.ts
+++ b/frontend/src/scenes/saved-insights/savedInsightsLogic.ts
@@ -1,9 +1,10 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router, urlToAction } from 'kea-router'
 
 import api, { CountedPaginatedResponse } from 'lib/api'
 import { dayjs } from 'lib/dayjs'
+import type { Dayjs } from 'lib/dayjs'
 import { Sorting } from 'lib/lemon-ui/LemonTable'
 import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
 import { PaginationManual } from 'lib/lemon-ui/PaginationControl'
@@ -30,8 +31,8 @@ import {
     InsightBulkRestoreResponseApi,
 } from 'products/product_analytics/frontend/generated/api.schemas'
 
+import type { Node } from '../../queries/schema/schema-general'
 import { teamLogic } from '../teamLogic'
-import type { savedInsightsLogicType } from './savedInsightsLogicType'
 
 export const INSIGHTS_PER_PAGE = 30
 
@@ -88,6 +89,194 @@ export function cleanFilters(values: Partial<SavedInsightFilters>): SavedInsight
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface savedInsightsLogicValues {
+    activeSceneId: string | null; // sceneLogic
+    currentTeamId: number | null; // teamLogic
+    alertModalId: AlertType["id"] | null;
+    breadcrumbs: Breadcrumb[];
+    bulkDeleteResponse: InsightBulkDeleteResponseApi | null;
+    bulkDeleteResponseLoading: boolean;
+    bulkRestoreResponse: InsightBulkRestoreResponseApi | null;
+    bulkRestoreResponseLoading: boolean;
+    count: number;
+    dashboardUpdatesInProgress: Record<number, boolean>;
+    filters: SavedInsightFilters;
+    insights: InsightsResult;
+    insightsLoading: boolean;
+    pagination: PaginationManual;
+    paramsFromFilters: {
+        created_by?: string | undefined;
+        created_date_from?: string | Dayjs | undefined;
+        created_date_to?: string | Dayjs | null | undefined;
+        dashboards?: number[] | undefined;
+        date_from?: string | Dayjs | undefined;
+        date_to?: string | Dayjs | null | undefined;
+        favorited?: true | undefined;
+        hide_feature_flag_insights?: true | undefined;
+        insight?: string | undefined;
+        last_viewed_date_from?: string | Dayjs | undefined;
+        last_viewed_date_to?: string | Dayjs | null | undefined;
+        limit: number;
+        offset: number;
+        order: string;
+        saved: true;
+        search?: string | undefined;
+        tags?: string | undefined;
+        user?: true | undefined;
+    };
+    rawFilters: Partial<SavedInsightFilters> | null;
+    sidePanelContext: SidePanelSceneContext;
+    sorting: Sorting | null;
+    usingFilters: boolean;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface savedInsightsLogicActions {
+    addInsight: (insight: QueryBasedInsightModel) => {
+        insight: QueryBasedInsightModel<Node<Record<string, any>>>;
+    };
+    bulkDeleteInsights: ({ ids }: {
+        ids: number[];
+    }) => {
+        ids: number[];
+    };
+    bulkDeleteInsightsFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    bulkDeleteInsightsSuccess: (bulkDeleteResponse: InsightBulkDeleteResponseApi, payload?: {
+        ids: number[];
+    }) => {
+        bulkDeleteResponse: InsightBulkDeleteResponseApi;
+        payload?: {
+            ids: number[];
+        };
+    };
+    bulkRestoreInsights: ({ ids }: {
+        ids: number[];
+    }) => {
+        ids: number[];
+    };
+    bulkRestoreInsightsFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    bulkRestoreInsightsSuccess: (bulkRestoreResponse: InsightBulkRestoreResponseApi, payload?: {
+        ids: number[];
+    }) => {
+        bulkRestoreResponse: InsightBulkRestoreResponseApi;
+        payload?: {
+            ids: number[];
+        };
+    };
+    closeAlertModal: () => {
+        value: true;
+    };
+    duplicateInsight: (insight: QueryBasedInsightModel, redirectToInsight?: any) => {
+        insight: QueryBasedInsightModel<Node<Record<string, any>>>;
+        redirectToInsight: any;
+    };
+    loadInsights: (debounce?: boolean) => {
+        debounce: boolean;
+    };
+    loadInsightsFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadInsightsSuccess: (insights: InsightsResult, payload?: {
+        debounce: boolean;
+    }) => {
+        insights: InsightsResult;
+        payload?: {
+            debounce: boolean;
+        };
+    };
+    openAlertModal: (alertId: AlertType["id"]) => {
+        alertId: string;
+    };
+    renameInsight: (insight: QueryBasedInsightModel) => {
+        insight: QueryBasedInsightModel<Node<Record<string, any>>>;
+    };
+    setDashboardUpdateLoading: (insightId: number, loading: boolean) => {
+        insightId: number;
+        loading: boolean;
+    };
+    setSavedInsightsFilters: (filters: Partial<SavedInsightFilters>, merge?: boolean, debounce?: boolean) => {
+        debounce: boolean;
+        filters: Partial<SavedInsightFilters>;
+        merge: boolean;
+    };
+    updateFavoritedInsight: (insight: QueryBasedInsightModel, favorited: boolean) => {
+        favorited: boolean;
+        insight: QueryBasedInsightModel<Node<Record<string, any>>>;
+    };
+    updateFavoritedInsightFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    updateFavoritedInsightSuccess: (insights: {
+        count: number;
+        filters?: SavedInsightFilters | null | undefined;
+        next?: string | null | undefined;
+        offset: number;
+        previous?: string | null | undefined;
+        results: QueryBasedInsightModel<Node<Record<string, any>>>[];
+    }, payload?: {
+        favorited: boolean;
+        insight: QueryBasedInsightModel<Node<Record<string, any>>>;
+    }) => {
+        insights: {
+            count: number;
+            filters?: SavedInsightFilters | null | undefined;
+            next?: string | null | undefined;
+            offset: number;
+            previous?: string | null | undefined;
+            results: QueryBasedInsightModel<Node<Record<string, any>>>[];
+        };
+        payload?: {
+            favorited: boolean;
+            insight: QueryBasedInsightModel<Node<Record<string, any>>>;
+        };
+    };
+    updateInsight: (insight: QueryBasedInsightModel) => {
+        insight: QueryBasedInsightModel<Node<Record<string, any>>>;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface savedInsightsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        filters: (rawFilters: Partial<SavedInsightFilters> | null) => SavedInsightFilters;
+        count: (insights: InsightsResult) => number;
+        usingFilters: (filters: SavedInsightFilters) => boolean;
+        sorting: (filters: SavedInsightFilters) => Sorting | null;
+        paramsFromFilters: (filters: SavedInsightFilters) => {
+            created_by?: string | undefined;
+            created_date_from?: string | Dayjs | undefined;
+            created_date_to?: string | Dayjs | null | undefined;
+            dashboards?: number[] | undefined;
+            date_from?: string | Dayjs | undefined;
+            date_to?: string | Dayjs | null | undefined;
+            favorited?: true | undefined;
+            hide_feature_flag_insights?: true | undefined;
+            insight?: string | undefined;
+            last_viewed_date_from?: string | Dayjs | undefined;
+            last_viewed_date_to?: string | Dayjs | null | undefined;
+            limit: number;
+            offset: number;
+            order: string;
+            saved: true;
+            search?: string | undefined;
+            tags?: string | undefined;
+            user?: true | undefined;
+        };
+        pagination: (filters: SavedInsightFilters, count: number) => PaginationManual;
+    };
+}
+
+export type savedInsightsLogicType = MakeLogicType<savedInsightsLogicValues, savedInsightsLogicActions, Record<string, any>, savedInsightsLogicMeta>;
+
 export const savedInsightsLogic = kea<savedInsightsLogicType>([
     path(['scenes', 'saved-insights', 'savedInsightsLogic']),
     connect(() => ({
@@ -242,15 +431,19 @@ export const savedInsightsLogic = kea<savedInsightsLogicType>([
         ],
     }),
     selectors({
-        filters: [(s) => [s.rawFilters], (rawFilters): SavedInsightFilters => cleanFilters(rawFilters || {})],
-        count: [(s) => [s.insights], (insights) => insights.count],
+        filters: [
+            (s) => [s.rawFilters],
+            (rawFilters: Partial<SavedInsightFilters> | null): SavedInsightFilters => cleanFilters(rawFilters || {}),
+        ],
+        count: [(s) => [s.insights], (insights: InsightsResult) => insights.count],
         usingFilters: [
             (s) => [s.filters],
-            (filters) => !objectsEqual(cleanFilters({ ...filters, tab: SavedInsightsTabs.All }), cleanFilters({})),
+            (filters: SavedInsightFilters) =>
+                !objectsEqual(cleanFilters({ ...filters, tab: SavedInsightsTabs.All }), cleanFilters({})),
         ],
         sorting: [
             (s) => [s.filters],
-            (filters): Sorting | null => {
+            (filters: SavedInsightFilters): Sorting | null => {
                 if (!filters.order) {
                     // Sync with `cleanFilters` function
                     return {
@@ -271,7 +464,7 @@ export const savedInsightsLogic = kea<savedInsightsLogicType>([
         ],
         paramsFromFilters: [
             (s) => [s.filters],
-            (filters) => ({
+            (filters: SavedInsightFilters) => ({
                 order: filters.order,
                 limit: INSIGHTS_PER_PAGE,
                 offset: Math.max(0, (filters.page - 1) * INSIGHTS_PER_PAGE),
@@ -310,7 +503,7 @@ export const savedInsightsLogic = kea<savedInsightsLogicType>([
         ],
         pagination: [
             (s) => [s.filters, s.count],
-            (filters, count): PaginationManual => {
+            (filters: SavedInsightFilters, count: number): PaginationManual => {
                 return {
                     controlled: true,
                     pageSize: INSIGHTS_PER_PAGE,
diff --git a/frontend/src/scenes/sceneLogic.tsx b/frontend/src/scenes/sceneLogic.tsx
index 91493d2aed52..7053799367fb 100644
--- a/frontend/src/scenes/sceneLogic.tsx
+++ b/frontend/src/scenes/sceneLogic.tsx
@@ -1,5 +1,5 @@
 import { deepEqual as equal } from 'fast-equals'
-import { BuiltLogic, actions, afterMount, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, BuiltLogic, actions, afterMount, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
 import { router, urlToAction } from 'kea-router'
 import posthog from 'posthog-js'
 import { useEffect, useState } from 'react'
@@ -45,10 +45,12 @@ import { parseCouponCampaign } from './coupons/utils'
 import { isOnboardingRedirectSuppressed } from './onboarding/legacy/onboardingDelegationState'
 import { organizationLogic } from './organizationLogic'
 import { preflightLogic } from './PreflightCheck/preflightLogic'
-import type { sceneLogicType } from './sceneLogicType'
 import { inviteLogic } from './settings/organization/inviteLogic'
 import { teamLogic } from './teamLogic'
 import { userLogic } from './userLogic'
+import type { LocationChangedPayload } from 'kea-router/lib/types'
+import type { BillingType } from '../types'
+import type { SceneProps } from './sceneTypes'
 
 interface MountedSceneLogic {
     logic: SceneExport['logic']
@@ -181,6 +183,113 @@ export function withForwardedSearchParams(
     return redirectUrlObj.pathname + redirectUrlObj.search + redirectUrlObj.hash
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sceneLogicValues {
+    billing: BillingType | null; // billingLogic
+    organizationBeingDeleted: string | null; // organizationLogic
+    activeExportedScene: SceneExport<SceneProps> | null;
+    activeLoadedScene: LoadedScene | null;
+    activeSceneComponentParams: Record<string, any>;
+    activeSceneId: string | null;
+    activeSceneLogic: BuiltLogic | null;
+    activeSceneLogicProps: Record<string, any>;
+    activeSceneProductKey: ProductKey | null;
+    exportedScenes: Record<string, SceneExport<SceneProps>>;
+    hashParams: Record<string, any>;
+    homepage: SceneTab | null;
+    lastReloadAt: number | null;
+    lastSetScenePayload: Record<string, any>;
+    loadingScene: string | null;
+    sceneConfig: SceneConfig | null;
+    sceneId: string | null;
+    sceneKey: string | null;
+    sceneParams: SceneParams;
+    searchParams: Record<string, any>;
+    titleAndIcon: {
+        iconType: FileSystemIconType | "blank" | "loading";
+        title: string;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sceneLogicActions {
+    hideInviteModal: () => {
+        value: true;
+    }; // inviteLogic
+    locationChanged: ({ method, pathname, search, searchParams, hash, hashParams, initial, url, routerState, }: LocationChangedPayload) => {
+        hash: string;
+        hashParams: Record<string, any>;
+        initial: boolean;
+        method: "POP" | "PUSH" | "REPLACE";
+        pathname: string;
+        routerState: Record<string, any>;
+        search: string;
+        searchParams: Record<string, any>;
+        url: string;
+    }; // router
+    loadScene: (sceneId: string, sceneKey: string | undefined, params: SceneParams, method: string) => {
+        method: string;
+        params: SceneParams;
+        sceneId: string;
+        sceneKey: string | undefined;
+    };
+    openScene: (sceneId: string, sceneKey: string | undefined, params: SceneParams, method: string) => {
+        method: string;
+        params: SceneParams;
+        sceneId: string;
+        sceneKey: string | undefined;
+    };
+    reloadBrowserDueToImportError: () => {
+        value: true;
+    };
+    setExportedScene: (exportedScene: SceneExport, sceneId: string, sceneKey: string | undefined, params: SceneParams) => {
+        exportedScene: SceneExport<SceneProps>;
+        params: SceneParams;
+        sceneId: string;
+        sceneKey: string | undefined;
+    };
+    setHomepage: (tab: SceneTab | null) => {
+        tab: SceneTab | null;
+    };
+    setScene: (sceneId: string, sceneKey: string | undefined, params: SceneParams, scrollToTop?: boolean, exportedScene?: SceneExport) => {
+        exportedScene: SceneExport<SceneProps> | undefined;
+        params: SceneParams;
+        sceneId: string;
+        sceneKey: string | undefined;
+        scrollToTop: boolean;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sceneLogicProps {
+    scenes?: Record<string, () => any>;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sceneLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        sceneConfig: (sceneId: string | null) => SceneConfig | null;
+        activeSceneId: (sceneId: string | null, isCurrentTeamUnavailable: boolean) => string | null;
+        activeExportedScene: (activeSceneId: string | null, exportedScenes: Record<string, SceneExport<SceneProps>>) => SceneExport<SceneProps> | null;
+        activeLoadedScene: (activeSceneId: string | null, activeExportedScene: SceneExport<SceneProps> | null, sceneParams: SceneParams) => LoadedScene | null;
+        activeSceneComponentParams: (sceneParams: SceneParams) => Record<string, any>;
+        activeSceneLogicProps: (activeExportedScene: SceneExport<SceneProps> | null, sceneParams: SceneParams) => Record<string, any>;
+        activeSceneLogic: (activeExportedScene: SceneExport<SceneProps> | null, activeSceneLogicProps: Record<string, any>) => BuiltLogic | null;
+        searchParams: (sceneParams: SceneParams) => Record<string, any>;
+        hashParams: (sceneParams: SceneParams) => Record<string, any>;
+        titleAndIcon: (arg: {
+            iconType: FileSystemIconType | "blank" | "loading";
+            title: string;
+        }) => {
+            iconType: FileSystemIconType | "blank" | "loading";
+            title: string;
+        };
+        activeSceneProductKey: (activeExportedScene: SceneExport<SceneProps> | null) => ProductKey | null;
+    };
+}
+
+export type sceneLogicType = MakeLogicType<sceneLogicValues, sceneLogicActions, sceneLogicProps, sceneLogicMeta>;
+
 export const sceneLogic = kea<sceneLogicType>([
     props(
         {} as {
@@ -320,7 +429,7 @@ export const sceneLogic = kea<sceneLogicType>([
         ],
         activeSceneId: [
             (s) => [s.sceneId, teamLogic.selectors.isCurrentTeamUnavailable],
-            (sceneId, isCurrentTeamUnavailable) => {
+            (sceneId: string | null, isCurrentTeamUnavailable: boolean) => {
                 const effectiveResourceAccessControl = getAppContext()?.effective_resource_access_control
 
                 // Get the access control resource type for the current scene
@@ -351,14 +460,14 @@ export const sceneLogic = kea<sceneLogicType>([
         ],
         activeExportedScene: [
             (s) => [s.activeSceneId, s.exportedScenes],
-            (activeSceneId, exportedScenes) => {
+            (activeSceneId: string | null, exportedScenes: Record<string, SceneExport<SceneProps>>) => {
                 return activeSceneId ? exportedScenes[activeSceneId] : null
             },
             { resultEqualityCheck: (a, b) => a === b },
         ],
         activeLoadedScene: [
             (s) => [s.activeSceneId, s.activeExportedScene, s.sceneParams],
-            (activeSceneId, activeExportedScene, sceneParams): LoadedScene | null => {
+            (activeSceneId: string | null, activeExportedScene: SceneExport<SceneProps> | null, sceneParams: SceneParams): LoadedScene | null => {
                 return {
                     ...(activeExportedScene ?? { component: DelayedLoadingSpinner }),
                     id: activeSceneId ?? Scene.Error404,
@@ -368,7 +477,7 @@ export const sceneLogic = kea<sceneLogicType>([
         ],
         activeSceneComponentParams: [
             (s) => [s.sceneParams],
-            (sceneParams): Record<string, any> => {
+            (sceneParams: SceneParams): Record<string, any> => {
                 return {
                     ...sceneParams.params,
                 }
@@ -377,7 +486,7 @@ export const sceneLogic = kea<sceneLogicType>([
         ],
         activeSceneLogicProps: [
             (s) => [s.activeExportedScene, s.sceneParams],
-            (activeExportedScene, sceneParams): Record<string, any> => {
+            (activeExportedScene: SceneExport<SceneProps> | null, sceneParams: SceneParams): Record<string, any> => {
                 return {
                     ...activeExportedScene?.paramsToProps?.(sceneParams),
                 }
@@ -386,7 +495,7 @@ export const sceneLogic = kea<sceneLogicType>([
         ],
         activeSceneLogic: [
             (s) => [s.activeExportedScene, s.activeSceneLogicProps],
-            (activeExportedScene, activeSceneLogicProps): BuiltLogic | null => {
+            (activeExportedScene: SceneExport<SceneProps> | null, activeSceneLogicProps: Record<string, any>): BuiltLogic | null => {
                 if (activeExportedScene?.logic) {
                     try {
                         return activeExportedScene.logic.build(activeSceneLogicProps)
@@ -408,8 +517,8 @@ export const sceneLogic = kea<sceneLogicType>([
                 return null
             },
         ],
-        searchParams: [(s) => [s.sceneParams], (sceneParams): Record<string, any> => sceneParams.searchParams || {}],
-        hashParams: [(s) => [s.sceneParams], (sceneParams): Record<string, any> => sceneParams.hashParams || {}],
+        searchParams: [(s) => [s.sceneParams], (sceneParams: SceneParams): Record<string, any> => sceneParams.searchParams || {}],
+        hashParams: [(s) => [s.sceneParams], (sceneParams: SceneParams): Record<string, any> => sceneParams.hashParams || {}],
 
         titleAndIcon: [
             (s) => [
@@ -445,7 +554,10 @@ export const sceneLogic = kea<sceneLogicType>([
                     return { title: '...', iconType: 'loading' }
                 },
             ],
-            (titleAndIcon) => titleAndIcon as { title: string; iconType: FileSystemIconType | 'loading' | 'blank' },
+            (titleAndIcon: {
+    iconType: FileSystemIconType | "blank" | "loading";
+    title: string;
+}) => titleAndIcon as { title: string; iconType: FileSystemIconType | 'loading' | 'blank' },
             { resultEqualityCheck: equal },
         ],
         activeSceneProductKey: [
diff --git a/frontend/src/scenes/session-recordings/apm/networkViewLogic.ts b/frontend/src/scenes/session-recordings/apm/networkViewLogic.ts
index 6e259d8e5198..19f33dd9bc0b 100644
--- a/frontend/src/scenes/session-recordings/apm/networkViewLogic.ts
+++ b/frontend/src/scenes/session-recordings/apm/networkViewLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, path, props, reducers, selectors } from 'kea'
 
 import { Dayjs, dayjs } from 'lib/dayjs'
 import { humanFriendlyMilliseconds } from 'lib/utils/durations'
@@ -11,10 +11,95 @@ import {
 
 import { PerformanceEvent } from '~/types'
 
-import type { networkViewLogicType } from './networkViewLogicType'
+import type { SessionPlayerData, SessionRecordingType } from '../../../types'
+import type { AssetSizeInfo } from './performanceEventDataLogic'
 
 export interface NetworkViewLogicProps extends SessionRecordingDataCoordinatorLogicProps {}
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface networkViewLogicValues {
+    allPerformanceEvents: PerformanceEvent[]; // performanceEventDataLogic
+    sizeBreakdown: Record<string, AssetSizeInfo>; // performanceEventDataLogic
+    sessionPlayerData: SessionPlayerData; // sessionRecordingDataCoordinatorLogic
+    sessionPlayerMetaData: SessionRecordingType | null; // sessionRecordingDataCoordinatorLogic
+    sessionPlayerMetaDataLoading: boolean; // sessionRecordingDataCoordinatorLogic
+    snapshotsLoading: boolean; // sessionRecordingDataCoordinatorLogic
+    start: Dayjs | null; // sessionRecordingDataCoordinatorLogic
+    currentPage: (PerformanceEvent & {
+        timeInRecording: number;
+    })[];
+    finalItem: (PerformanceEvent & {
+        timeInRecording: number;
+    }) | null;
+    formattedDurationFor: (item: PerformanceEvent) => string | undefined;
+    hasPageViews: boolean;
+    isLoading: boolean;
+    navigationItem: (PerformanceEvent & {
+        timeInRecording: number;
+    }) | null;
+    page: number;
+    pageCount: number;
+    pageViews: (PerformanceEvent & {
+        timeInRecording: number;
+    })[][];
+    positionPercentagesFor: (item: PerformanceEvent) => {
+        startPercentage: string;
+        widthPercentage: string;
+    } | null | undefined;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface networkViewLogicActions {
+    loadSnapshots: () => {
+        value: true;
+    }; // sessionRecordingDataCoordinatorLogic
+    maybeLoadRecordingMeta: () => {
+        value: true;
+    }; // sessionRecordingDataCoordinatorLogic
+    nextPage: () => boolean;
+    prevPage: () => boolean;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface networkViewLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        isLoading: (snapshotsLoading: boolean, sessionPlayerMetaDataLoading: boolean) => boolean;
+        pageViews: (allPerformanceEvents: PerformanceEvent[], start: Dayjs | null) => (PerformanceEvent & {
+            timeInRecording: number;
+        })[][];
+        pageCount: (pageViews: (PerformanceEvent & {
+            timeInRecording: number;
+        })[][]) => number;
+        currentPage: (pageViews: (PerformanceEvent & {
+            timeInRecording: number;
+        })[][], page: number) => (PerformanceEvent & {
+            timeInRecording: number;
+        })[];
+        navigationItem: (currentPage: (PerformanceEvent & {
+            timeInRecording: number;
+        })[]) => (PerformanceEvent & {
+            timeInRecording: number;
+        }) | null;
+        finalItem: (currentPage: (PerformanceEvent & {
+            timeInRecording: number;
+        })[]) => (PerformanceEvent & {
+            timeInRecording: number;
+        }) | null;
+        positionPercentagesFor: (navigationItem: (PerformanceEvent & {
+            timeInRecording: number;
+        }) | null, finalItem: (PerformanceEvent & {
+            timeInRecording: number;
+        }) | null) => (item: PerformanceEvent) => {
+            startPercentage: string;
+            widthPercentage: string;
+        } | null | undefined;
+        hasPageViews: (pageCount: number) => boolean;
+    };
+}
+
+export type networkViewLogicType = MakeLogicType<networkViewLogicValues, networkViewLogicActions, NetworkViewLogicProps, networkViewLogicMeta>;
+
 export const networkViewLogic = kea<networkViewLogicType>([
     path(['scenes', 'session-recordings', 'apm', 'networkViewLogic']),
     key((props) => `network-view-${props.sessionRecordingId}`),
@@ -48,7 +133,8 @@ export const networkViewLogic = kea<networkViewLogicType>([
     selectors({
         isLoading: [
             (s) => [s.snapshotsLoading, s.sessionPlayerMetaDataLoading],
-            (snapshotsLoading, sessionPlayerMetaDataLoading) => snapshotsLoading || sessionPlayerMetaDataLoading,
+            (snapshotsLoading: boolean, sessionPlayerMetaDataLoading: boolean) =>
+                snapshotsLoading || sessionPlayerMetaDataLoading,
         ],
         pageViews: [
             (s) => [s.allPerformanceEvents, s.start],
@@ -81,16 +167,32 @@ export const networkViewLogic = kea<networkViewLogicType>([
                 return pages
             },
         ],
-        pageCount: [(s) => [s.pageViews], (pageViews) => pageViews.length],
+        pageCount: [
+            (s) => [s.pageViews],
+            (
+                pageViews: (PerformanceEvent & {
+                    timeInRecording: number
+                })[][]
+            ) => pageViews.length,
+        ],
         currentPage: [
             (s) => [s.pageViews, s.page],
-            (pageViews, page) => {
+            (
+                pageViews: (PerformanceEvent & {
+                    timeInRecording: number
+                })[][],
+                page: number
+            ) => {
                 return pageViews[page] || []
             },
         ],
         navigationItem: [
             (s) => [s.currentPage],
-            (currentPage) => {
+            (
+                currentPage: (PerformanceEvent & {
+                    timeInRecording: number
+                })[]
+            ) => {
                 if (currentPage.length) {
                     return currentPage[0]
                 }
@@ -99,7 +201,11 @@ export const networkViewLogic = kea<networkViewLogicType>([
         ],
         finalItem: [
             (s) => [s.currentPage],
-            (currentPage) => {
+            (
+                currentPage: (PerformanceEvent & {
+                    timeInRecording: number
+                })[]
+            ) => {
                 if (currentPage.length) {
                     return currentPage[currentPage.length - 1]
                 }
@@ -126,7 +232,18 @@ export const networkViewLogic = kea<networkViewLogicType>([
         ],
         positionPercentagesFor: [
             (s) => [s.navigationItem, s.finalItem],
-            (navigationItem, finalItem) => {
+            (
+                navigationItem:
+                    | (PerformanceEvent & {
+                          timeInRecording: number
+                      })
+                    | null,
+                finalItem:
+                    | (PerformanceEvent & {
+                          timeInRecording: number
+                      })
+                    | null
+            ) => {
                 return (item: PerformanceEvent) => {
                     if (!navigationItem || !finalItem) {
                         return
@@ -159,6 +276,6 @@ export const networkViewLogic = kea<networkViewLogicType>([
                 }
             },
         ],
-        hasPageViews: [(s) => [s.pageCount], (pageCount) => pageCount > 0],
+        hasPageViews: [(s) => [s.pageCount], (pageCount: number) => pageCount > 0],
     }),
 ])
diff --git a/frontend/src/scenes/session-recordings/apm/performanceEventDataLogic.ts b/frontend/src/scenes/session-recordings/apm/performanceEventDataLogic.ts
index 486e9731d485..cc4b065dbc39 100644
--- a/frontend/src/scenes/session-recordings/apm/performanceEventDataLogic.ts
+++ b/frontend/src/scenes/session-recordings/apm/performanceEventDataLogic.ts
@@ -1,4 +1,4 @@
-import { connect, kea, key, path, props, selectors } from 'kea'
+import { MakeLogicType, connect, kea, key, path, props, selectors } from 'kea'
 
 import {
     getPerformanceEvents,
@@ -13,7 +13,7 @@ import {
 
 import { PerformanceEvent, RecordingEventType } from '~/types'
 
-import type { performanceEventDataLogicType } from './performanceEventDataLogicType'
+import type { SessionPlayerData } from '../../../types'
 
 export type InspectorListItemPerformance = InspectorListItemBase & {
     type: 'network'
@@ -99,6 +99,25 @@ function matchWebVitalsEvents(
     return performanceEvents
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface performanceEventDataLogicValues {
+    sessionPlayerData: SessionPlayerData; // sessionRecordingDataCoordinatorLogic
+    webVitalsEvents: RecordingEventType[]; // sessionRecordingDataCoordinatorLogic
+    allPerformanceEvents: PerformanceEvent[];
+    sizeBreakdown: Record<string, AssetSizeInfo>;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface performanceEventDataLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        allPerformanceEvents: (sessionPlayerData: SessionPlayerData, webVitalsEvents: RecordingEventType[]) => PerformanceEvent[];
+        sizeBreakdown: (allPerformanceEvents: PerformanceEvent[]) => Record<string, AssetSizeInfo>;
+    };
+}
+
+export type performanceEventDataLogicType = MakeLogicType<performanceEventDataLogicValues, {}, PerformanceEventDataLogicProps, performanceEventDataLogicMeta>;
+
 export const performanceEventDataLogic = kea<performanceEventDataLogicType>([
     path(['scenes', 'session-recordings', 'apm', 'performanceEventDataLogic']),
     props({} as PerformanceEventDataLogicProps),
@@ -110,7 +129,10 @@ export const performanceEventDataLogic = kea<performanceEventDataLogicType>([
     selectors(() => ({
         allPerformanceEvents: [
             (s) => [s.sessionPlayerData, s.webVitalsEvents],
-            (sessionPlayerData, webVitalsEvents): PerformanceEvent[] => {
+            (
+                sessionPlayerData: import('~/types').SessionPlayerData,
+                webVitalsEvents: RecordingEventType[]
+            ): PerformanceEvent[] => {
                 // TRICKY: we listen to webVitalsEventsLoading to trigger a recompute once all the data is present
 
                 // performanceEvents used to come from the API,
@@ -127,7 +149,7 @@ export const performanceEventDataLogic = kea<performanceEventDataLogicType>([
         ],
         sizeBreakdown: [
             (s) => [s.allPerformanceEvents],
-            (allPerformanceEvents) => {
+            (allPerformanceEvents: PerformanceEvent[]) => {
                 const breakdown: Record<string, AssetSizeInfo> = {}
                 allPerformanceEvents.forEach((event) => {
                     const label = initiatorToAssetTypeMapping[event.initiator_type || 'unknown'] || 'unknown'
diff --git a/frontend/src/scenes/session-recordings/collections/sessionRecordingCollectionsLogic.ts b/frontend/src/scenes/session-recordings/collections/sessionRecordingCollectionsLogic.ts
index 5d2232d00bf9..bcabad0ea26c 100644
--- a/frontend/src/scenes/session-recordings/collections/sessionRecordingCollectionsLogic.ts
+++ b/frontend/src/scenes/session-recordings/collections/sessionRecordingCollectionsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 
@@ -21,7 +21,6 @@ import {
 } from '~/types'
 
 import { createPlaylist, deletePlaylist } from '../playlist/playlistUtils'
-import type { sessionRecordingCollectionsLogicType } from './sessionRecordingCollectionsLogicType'
 
 export const PLAYLISTS_PER_PAGE = 30
 
@@ -33,6 +32,158 @@ export const DEFAULT_PLAYLIST_FILTERS = {
     collectionType: null,
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingCollectionsLogicValues {
+    filters: Record<string, any> | SavedSessionRecordingPlaylistsFilters
+    loadPlaylistsFailed: boolean
+    pagination: PaginationManual
+    playlists: SavedSessionRecordingPlaylistsResult
+    playlistsLoading: boolean
+    sorting: Sorting | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingCollectionsLogicActions {
+    reportRecordingPlaylistCreated: (source: 'duplicate' | 'filters' | 'new' | 'pin') => {
+        source: 'duplicate' | 'filters' | 'new' | 'pin'
+    } // sessionRecordingEventUsageLogic
+    deletePlaylist: (playlist: SessionRecordingPlaylistType) => {
+        playlist: SessionRecordingPlaylistType
+    }
+    deletePlaylistFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deletePlaylistSuccess: (
+        playlists: {
+            count: number
+            filters?: SavedSessionRecordingPlaylistsFilters | null | undefined
+            next?: string | null | undefined
+            previous?: string | null | undefined
+            results: SessionRecordingPlaylistType[]
+        },
+        payload?: {
+            playlist: SessionRecordingPlaylistType
+        }
+    ) => {
+        playlists: {
+            count: number
+            filters?: SavedSessionRecordingPlaylistsFilters | null | undefined
+            next?: string | null | undefined
+            previous?: string | null | undefined
+            results: SessionRecordingPlaylistType[]
+        }
+        payload?: {
+            playlist: SessionRecordingPlaylistType
+        }
+    }
+    duplicatePlaylist: (playlist: SessionRecordingPlaylistType) => {
+        playlist: SessionRecordingPlaylistType
+    }
+    duplicatePlaylistFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    duplicatePlaylistSuccess: (
+        playlists: SavedSessionRecordingPlaylistsResult,
+        payload?: {
+            playlist: SessionRecordingPlaylistType
+        }
+    ) => {
+        playlists: SavedSessionRecordingPlaylistsResult
+        payload?: {
+            playlist: SessionRecordingPlaylistType
+        }
+    }
+    loadPlaylists: () => {
+        value: true
+    }
+    loadPlaylistsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPlaylistsSuccess: (
+        playlists: SavedSessionRecordingPlaylistsResult,
+        payload?: {
+            value: true
+        }
+    ) => {
+        playlists: SavedSessionRecordingPlaylistsResult
+        payload?: {
+            value: true
+        }
+    }
+    setSavedPlaylistsFilters: (filters: Partial<SavedSessionRecordingPlaylistsFilters>) => {
+        filters: Partial<SavedSessionRecordingPlaylistsFilters>
+    }
+    updatePlaylist: (
+        shortId: SessionRecordingPlaylistType['short_id'],
+        properties: Partial<SessionRecordingPlaylistType>
+    ) => {
+        properties: Partial<SessionRecordingPlaylistType>
+        shortId: string
+    }
+    updatePlaylistFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updatePlaylistSuccess: (
+        playlists: {
+            count: number
+            filters?: SavedSessionRecordingPlaylistsFilters | null | undefined
+            next?: string | null | undefined
+            previous?: string | null | undefined
+            results: SessionRecordingPlaylistType[]
+        },
+        payload?: {
+            properties: Partial<SessionRecordingPlaylistType>
+            shortId: string
+        }
+    ) => {
+        playlists: {
+            count: number
+            filters?: SavedSessionRecordingPlaylistsFilters | null | undefined
+            next?: string | null | undefined
+            previous?: string | null | undefined
+            results: SessionRecordingPlaylistType[]
+        }
+        payload?: {
+            properties: Partial<SessionRecordingPlaylistType>
+            shortId: string
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingCollectionsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        sorting: (filters: Record<string, any> | SavedSessionRecordingPlaylistsFilters) => Sorting | null
+        pagination: (
+            filters: Record<string, any> | SavedSessionRecordingPlaylistsFilters,
+            playlists: SavedSessionRecordingPlaylistsResult
+        ) => PaginationManual
+    }
+}
+
+export type sessionRecordingCollectionsLogicType = MakeLogicType<
+    sessionRecordingCollectionsLogicValues,
+    sessionRecordingCollectionsLogicActions,
+    Record<string, any>,
+    sessionRecordingCollectionsLogicMeta
+>
+
 export const sessionRecordingCollectionsLogic = kea<sessionRecordingCollectionsLogicType>([
     path(() => ['scenes', 'session-recordings', 'collections', 'sessionRecordingCollectionsLogic']),
     connect(() => ({
@@ -161,7 +312,7 @@ export const sessionRecordingCollectionsLogic = kea<sessionRecordingCollectionsL
     selectors(({ actions }) => ({
         sorting: [
             (s) => [s.filters],
-            (filters): Sorting | null => {
+            (filters: Record<string, any> | SavedSessionRecordingPlaylistsFilters): Sorting | null => {
                 if (!filters.order) {
                     return {
                         columnKey: 'last_modified_at',
@@ -181,7 +332,10 @@ export const sessionRecordingCollectionsLogic = kea<sessionRecordingCollectionsL
         ],
         pagination: [
             (s) => [s.filters, s.playlists],
-            (filters, playlists): PaginationManual => {
+            (
+                filters: Record<string, any> | SavedSessionRecordingPlaylistsFilters,
+                playlists: SavedSessionRecordingPlaylistsResult
+            ): PaginationManual => {
                 return {
                     controlled: true,
                     pageSize: PLAYLISTS_PER_PAGE,
diff --git a/frontend/src/scenes/session-recordings/components/AiRegexHelper/aiRegexHelperLogic.ts b/frontend/src/scenes/session-recordings/components/AiRegexHelper/aiRegexHelperLogic.ts
index beb10a4a44c0..384613f57589 100644
--- a/frontend/src/scenes/session-recordings/components/AiRegexHelper/aiRegexHelperLogic.ts
+++ b/frontend/src/scenes/session-recordings/components/AiRegexHelper/aiRegexHelperLogic.ts
@@ -1,14 +1,51 @@
-import { actions, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers } from 'kea'
 import posthog from 'posthog-js'
 
 import api, { ApiError } from 'lib/api'
 import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
 import { copyToClipboard } from 'lib/utils/copyToClipboard'
 
-import type { aiRegexHelperLogicType } from './aiRegexHelperLogicType'
-
 const GENERIC_ERROR = 'Failed to generate regex. Try again?'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiRegexHelperLogicValues {
+    error: string
+    generatedRegex: string
+    input: string
+    isLoading: boolean
+    isOpen: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiRegexHelperLogicActions {
+    handleCopyToClipboard: () => {
+        value: true
+    }
+    handleGenerateRegex: () => {
+        value: true
+    }
+    onClose: () => {
+        value: true
+    }
+    setError: (error: string) => {
+        error: string
+    }
+    setGeneratedRegex: (generatedRegex: string) => {
+        generatedRegex: string
+    }
+    setInput: (input: string) => {
+        input: string
+    }
+    setIsLoading: (isLoading: boolean) => {
+        isLoading: boolean
+    }
+    setIsOpen: (isOpen: boolean) => {
+        isOpen: boolean
+    }
+}
+
+export type aiRegexHelperLogicType = MakeLogicType<aiRegexHelperLogicValues, aiRegexHelperLogicActions>
+
 export const aiRegexHelperLogic = kea<aiRegexHelperLogicType>([
     path(['lib', 'components', 'AiRegexHelper', 'aiRegexHelperLogic']),
     actions({
diff --git a/frontend/src/scenes/session-recordings/components/InternalSurvey/internalMultipleChoiceSurveyLogic.ts b/frontend/src/scenes/session-recordings/components/InternalSurvey/internalMultipleChoiceSurveyLogic.ts
index 9c756539ebb7..03127559e9dc 100644
--- a/frontend/src/scenes/session-recordings/components/InternalSurvey/internalMultipleChoiceSurveyLogic.ts
+++ b/frontend/src/scenes/session-recordings/components/InternalSurvey/internalMultipleChoiceSurveyLogic.ts
@@ -1,14 +1,61 @@
-import { actions, afterMount, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, key, listeners, path, props, reducers } from 'kea'
 import posthog from 'posthog-js'
 
 import { Survey } from '~/types'
 
-import type { internalMultipleChoiceSurveyLogicType } from './internalMultipleChoiceSurveyLogicType'
-
 export interface InternalSurveyLogicProps {
     surveyId: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface internalMultipleChoiceSurveyLogicValues {
+    openChoice: string | null
+    showThankYouMessage: boolean
+    survey: Survey | null
+    surveyResponse: string[]
+    thankYouMessage: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface internalMultipleChoiceSurveyLogicActions {
+    getSurveys: () => {}
+    handleChoiceChange: (
+        choice: string,
+        isAdded: boolean
+    ) => {
+        choice: string
+        isAdded: boolean
+    }
+    handleSurveyResponse: () => {}
+    handleSurveys: (surveys: Survey[]) => {
+        surveys: Survey[]
+    }
+    setOpenChoice: (openChoice: string) => {
+        openChoice: string
+    }
+    setShowThankYouMessage: (showThankYouMessage: boolean) => {
+        showThankYouMessage: boolean
+    }
+    setSurvey: (survey: Survey) => {
+        survey: Survey
+    }
+    setThankYouMessage: (thankYouMessage: string) => {
+        thankYouMessage: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface internalMultipleChoiceSurveyLogicMeta {
+    key: string
+}
+
+export type internalMultipleChoiceSurveyLogicType = MakeLogicType<
+    internalMultipleChoiceSurveyLogicValues,
+    internalMultipleChoiceSurveyLogicActions,
+    InternalSurveyLogicProps,
+    internalMultipleChoiceSurveyLogicMeta
+>
+
 export const internalMultipleChoiceSurveyLogic = kea<internalMultipleChoiceSurveyLogicType>([
     path(['lib', 'components', 'InternalSurvey', 'internalMultipleChoiceSurveyLogicType']),
     props({} as InternalSurveyLogicProps),
diff --git a/frontend/src/scenes/session-recordings/components/replayCaptureDiagnosticsPanelLogic.ts b/frontend/src/scenes/session-recordings/components/replayCaptureDiagnosticsPanelLogic.ts
index 015d83488707..085111f6b0af 100644
--- a/frontend/src/scenes/session-recordings/components/replayCaptureDiagnosticsPanelLogic.ts
+++ b/frontend/src/scenes/session-recordings/components/replayCaptureDiagnosticsPanelLogic.ts
@@ -1,14 +1,49 @@
-import { defaults, kea, key, path, props } from 'kea'
+import { MakeLogicType, defaults, kea, key, path, props } from 'kea'
 import { lazyLoaders } from 'kea-loaders'
 
 import api from 'lib/api'
 
-import type { replayCaptureDiagnosticsPanelLogicType } from './replayCaptureDiagnosticsPanelLogicType'
-
 export interface ReplayCaptureDiagnosticsPanelLogicProps {
     sessionId: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface replayCaptureDiagnosticsPanelLogicValues {
+    sessionEventProperties: Record<string, any> | null
+    sessionEventPropertiesLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface replayCaptureDiagnosticsPanelLogicActions {
+    loadSessionEventProperties: (_: any) => any
+    loadSessionEventPropertiesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSessionEventPropertiesSuccess: (
+        sessionEventProperties: Record<string, any> | null,
+        payload?: any
+    ) => {
+        sessionEventProperties: Record<string, any> | null
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface replayCaptureDiagnosticsPanelLogicMeta {
+    key: string
+}
+
+export type replayCaptureDiagnosticsPanelLogicType = MakeLogicType<
+    replayCaptureDiagnosticsPanelLogicValues,
+    replayCaptureDiagnosticsPanelLogicActions,
+    ReplayCaptureDiagnosticsPanelLogicProps,
+    replayCaptureDiagnosticsPanelLogicMeta
+>
+
 export const replayCaptureDiagnosticsPanelLogic = kea<replayCaptureDiagnosticsPanelLogicType>([
     path(['scenes', 'session-recordings', 'components', 'replayCaptureDiagnosticsPanelLogic']),
     props({} as ReplayCaptureDiagnosticsPanelLogicProps),
diff --git a/frontend/src/scenes/session-recordings/deletedRecordingsLogic.ts b/frontend/src/scenes/session-recordings/deletedRecordingsLogic.ts
index ad86d27714f1..83ea6bb3acef 100644
--- a/frontend/src/scenes/session-recordings/deletedRecordingsLogic.ts
+++ b/frontend/src/scenes/session-recordings/deletedRecordingsLogic.ts
@@ -1,6 +1,18 @@
-import { actions, kea, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers } from 'kea'
 
-import type { deletedRecordingsLogicType } from './deletedRecordingsLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface deletedRecordingsLogicValues {
+    deletedRecordingIds: Set<string>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface deletedRecordingsLogicActions {
+    addDeletedRecordings: (ids: string[]) => {
+        ids: string[]
+    }
+}
+
+export type deletedRecordingsLogicType = MakeLogicType<deletedRecordingsLogicValues, deletedRecordingsLogicActions>
 
 export const deletedRecordingsLogic = kea<deletedRecordingsLogicType>([
     path(['scenes', 'session-recordings', 'deletedRecordingsLogic']),
diff --git a/frontend/src/scenes/session-recordings/detail/sessionRecordingDetailLogic.ts b/frontend/src/scenes/session-recordings/detail/sessionRecordingDetailLogic.ts
index 3b721e8afd23..6a6439d9b143 100644
--- a/frontend/src/scenes/session-recordings/detail/sessionRecordingDetailLogic.ts
+++ b/frontend/src/scenes/session-recordings/detail/sessionRecordingDetailLogic.ts
@@ -1,23 +1,40 @@
-import { kea, path, props, selectors } from 'kea'
+import { MakeLogicType, kea, path, props, selectors } from 'kea'
 
 import { Scene } from 'scenes/sceneTypes'
 import { urls } from 'scenes/urls'
 
 import { Breadcrumb, SessionRecordingType } from '~/types'
 
-import type { sessionRecordingDetailLogicType } from './sessionRecordingDetailLogicType'
-
 export interface SessionRecordingDetailLogicProps {
     id?: SessionRecordingType['id']
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingDetailLogicValues {
+    breadcrumbs: Breadcrumb[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingDetailLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        breadcrumbs: (arg: SessionRecordingType['id']) => Breadcrumb[]
+    }
+}
+
+export type sessionRecordingDetailLogicType = MakeLogicType<
+    sessionRecordingDetailLogicValues,
+    {},
+    SessionRecordingDetailLogicProps,
+    sessionRecordingDetailLogicMeta
+>
+
 export const sessionRecordingDetailLogic = kea<sessionRecordingDetailLogicType>([
     path(['scenes', 'session-recordings', 'detail', 'sessionRecordingDetailLogic']),
     props({} as SessionRecordingDetailLogicProps),
     selectors({
         breadcrumbs: [
             () => [(_, props) => props.id as SessionRecordingType['id']],
-            (sessionRecordingId): Breadcrumb[] => [
+            (sessionRecordingId: SessionRecordingType['id']): Breadcrumb[] => [
                 {
                     key: Scene.Replay,
                     name: `Replay`,
diff --git a/frontend/src/scenes/session-recordings/file-playback/sessionRecordingFilePlaybackSceneLogic.ts b/frontend/src/scenes/session-recordings/file-playback/sessionRecordingFilePlaybackSceneLogic.ts
index fbcbcaedc2e6..c6a7058a3c96 100644
--- a/frontend/src/scenes/session-recordings/file-playback/sessionRecordingFilePlaybackSceneLogic.ts
+++ b/frontend/src/scenes/session-recordings/file-playback/sessionRecordingFilePlaybackSceneLogic.ts
@@ -1,4 +1,4 @@
-import { BuiltLogic, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, BuiltLogic, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { beforeUnload } from 'kea-router'
 
@@ -12,11 +12,13 @@ import { urls } from 'scenes/urls'
 
 import { Breadcrumb } from '~/types'
 
+import type { RecordingSnapshot } from '../../../../../common/replay-shared/src/types'
+import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
+import type { PersonType } from '../../../types'
 import { sessionRecordingDataCoordinatorLogic } from '../player/sessionRecordingDataCoordinatorLogic'
-import type { sessionRecordingDataCoordinatorLogicType } from '../player/sessionRecordingDataCoordinatorLogicType'
+import type { sessionRecordingDataCoordinatorLogicType } from '../player/sessionRecordingDataCoordinatorLogic'
 import { SessionRecordingPlayerProps } from '../player/SessionRecordingPlayer'
 import { sessionRecordingEventUsageLogic } from '../sessionRecordingEventUsageLogic'
-import type { sessionRecordingFilePlaybackSceneLogicType } from './sessionRecordingFilePlaybackSceneLogicType'
 import { ExportedSessionRecordingFileV1, ExportedSessionRecordingFileV2 } from './types'
 
 export const parseExportedSessionRecording = (fileData: string): ExportedSessionRecordingFileV2 => {
@@ -84,6 +86,76 @@ const waitForDataLogic = async (
     throw new Error('Timeout reached: dataLogic is still null after 2 seconds')
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingFilePlaybackSceneLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    breadcrumbs: Breadcrumb[]
+    fileId: string
+    playerProps: SessionRecordingPlayerProps
+    sessionRecording: ExportedSessionRecordingFileV2['data'] | null
+    sessionRecordingLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingFilePlaybackSceneLogicActions {
+    reportRecordingLoadedFromFile: (data: { error?: string; success: boolean }) => {
+        error?: string | undefined
+        success: boolean
+    } // sessionRecordingEventUsageLogic
+    loadFromFile: (file: File) => File
+    loadFromFileFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadFromFileSuccess: (
+        sessionRecording: {
+            id: string
+            person: PersonType | undefined
+            snapshots: RecordingSnapshot[]
+        } | null,
+        payload?: File
+    ) => {
+        sessionRecording: {
+            id: string
+            person: PersonType | undefined
+            snapshots: RecordingSnapshot[]
+        } | null
+        payload?: File
+    }
+    resetSessionRecording: () => any
+    resetSessionRecordingFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    resetSessionRecordingSuccess: (
+        sessionRecording: null,
+        payload?: any
+    ) => {
+        sessionRecording: null
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingFilePlaybackSceneLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        playerProps: (fileId: string) => SessionRecordingPlayerProps
+    }
+}
+
+export type sessionRecordingFilePlaybackSceneLogicType = MakeLogicType<
+    sessionRecordingFilePlaybackSceneLogicValues,
+    sessionRecordingFilePlaybackSceneLogicActions,
+    Record<string, any>,
+    sessionRecordingFilePlaybackSceneLogicMeta
+>
+
 export const sessionRecordingFilePlaybackSceneLogic = kea<sessionRecordingFilePlaybackSceneLogicType>([
     path(['scenes', 'session-recordings', 'detail', 'sessionRecordingFilePlaybackSceneLogic']),
     connect(() => ({
diff --git a/frontend/src/scenes/session-recordings/filters/sessionRecordingSavedFiltersLogic.ts b/frontend/src/scenes/session-recordings/filters/sessionRecordingSavedFiltersLogic.ts
index 0c7cc52e2a92..ce7782976cfe 100644
--- a/frontend/src/scenes/session-recordings/filters/sessionRecordingSavedFiltersLogic.ts
+++ b/frontend/src/scenes/session-recordings/filters/sessionRecordingSavedFiltersLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 
@@ -17,7 +17,6 @@ import {
 } from '~/types'
 
 import { deletePlaylist, stripSessionIds } from '../playlist/playlistUtils'
-import type { sessionRecordingSavedFiltersLogicType } from './sessionRecordingSavedFiltersLogicType'
 
 export const PLAYLISTS_PER_PAGE = 30
 
@@ -27,6 +26,139 @@ export const DEFAULT_PLAYLIST_FILTERS = {
     dateFrom: 'all',
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingSavedFiltersLogicValues {
+    appliedSavedFilter: SessionRecordingPlaylistType | null
+    filters: Record<string, any> | SavedSessionRecordingPlaylistsFilters
+    loadSavedFiltersFailed: boolean
+    paginationSavedFilters: PaginationManual
+    pendingFilterApplication: SessionRecordingPlaylistType | null
+    playlists: SavedSessionRecordingPlaylistsResult
+    playlistsLoading: boolean
+    savedFilters: SavedSessionRecordingPlaylistsResult
+    savedFiltersLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingSavedFiltersLogicActions {
+    reportRecordingPlaylistCreated: (source: 'duplicate' | 'filters' | 'new' | 'pin') => {
+        source: 'duplicate' | 'filters' | 'new' | 'pin'
+    } // sessionRecordingEventUsageLogic
+    checkForSavedFilterRedirect: () => {
+        value: true
+    }
+    clearPendingFilterApplication: () => {
+        value: true
+    }
+    deletePlaylist: (playlist: SessionRecordingPlaylistType) => {
+        playlist: SessionRecordingPlaylistType
+    }
+    deletePlaylistFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deletePlaylistSuccess: (
+        playlists: SavedSessionRecordingPlaylistsResult,
+        payload?: {
+            playlist: SessionRecordingPlaylistType
+        }
+    ) => {
+        playlists: SavedSessionRecordingPlaylistsResult
+        payload?: {
+            playlist: SessionRecordingPlaylistType
+        }
+    }
+    loadSavedFilters: () => {
+        value: true
+    }
+    loadSavedFiltersFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSavedFiltersSuccess: (
+        savedFilters: SavedSessionRecordingPlaylistsResult,
+        payload?: {
+            value: true
+        }
+    ) => {
+        savedFilters: SavedSessionRecordingPlaylistsResult
+        payload?: {
+            value: true
+        }
+    }
+    requestApplySavedFilter: (filter: SessionRecordingPlaylistType) => {
+        filter: SessionRecordingPlaylistType
+    }
+    setAppliedSavedFilter: (appliedSavedFilter: SessionRecordingPlaylistType | null) => {
+        appliedSavedFilter: SessionRecordingPlaylistType | null
+    }
+    setSavedPlaylistsFilters: (filters: Partial<SavedSessionRecordingPlaylistsFilters>) => {
+        filters: Partial<SavedSessionRecordingPlaylistsFilters>
+    }
+    updatePlaylist: (
+        shortId: SessionRecordingPlaylistType['short_id'],
+        properties: Partial<SessionRecordingPlaylistType>
+    ) => {
+        properties: Partial<SessionRecordingPlaylistType>
+        shortId: string
+    }
+    updatePlaylistFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updatePlaylistSuccess: (
+        playlists: {
+            count: number
+            filters?: SavedSessionRecordingPlaylistsFilters | null | undefined
+            next?: string | null | undefined
+            previous?: string | null | undefined
+            results: SessionRecordingPlaylistType[]
+        },
+        payload?: {
+            properties: Partial<SessionRecordingPlaylistType>
+            shortId: string
+        }
+    ) => {
+        playlists: {
+            count: number
+            filters?: SavedSessionRecordingPlaylistsFilters | null | undefined
+            next?: string | null | undefined
+            previous?: string | null | undefined
+            results: SessionRecordingPlaylistType[]
+        }
+        payload?: {
+            properties: Partial<SessionRecordingPlaylistType>
+            shortId: string
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingSavedFiltersLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        paginationSavedFilters: (
+            filters: Record<string, any> | SavedSessionRecordingPlaylistsFilters,
+            savedFilters: SavedSessionRecordingPlaylistsResult
+        ) => PaginationManual
+    }
+}
+
+export type sessionRecordingSavedFiltersLogicType = MakeLogicType<
+    sessionRecordingSavedFiltersLogicValues,
+    sessionRecordingSavedFiltersLogicActions,
+    Record<string, any>,
+    sessionRecordingSavedFiltersLogicMeta
+>
+
 export const sessionRecordingSavedFiltersLogic = kea<sessionRecordingSavedFiltersLogicType>([
     path(() => ['scenes', 'session-recordings', 'filters', 'sessionRecordingSavedFiltersLogic']),
     connect(() => ({
@@ -147,7 +279,10 @@ export const sessionRecordingSavedFiltersLogic = kea<sessionRecordingSavedFilter
     selectors(({ actions }) => ({
         paginationSavedFilters: [
             (s) => [s.filters, s.savedFilters],
-            (filters, savedFilters): PaginationManual => {
+            (
+                filters: Record<string, any> | SavedSessionRecordingPlaylistsFilters,
+                savedFilters: SavedSessionRecordingPlaylistsResult
+            ): PaginationManual => {
                 return {
                     controlled: true,
                     pageSize: PLAYLISTS_PER_PAGE,
diff --git a/frontend/src/scenes/session-recordings/kiosk/sessionRecordingsKioskLogic.ts b/frontend/src/scenes/session-recordings/kiosk/sessionRecordingsKioskLogic.ts
index 1b746ceaaf61..8c39d82dd04a 100644
--- a/frontend/src/scenes/session-recordings/kiosk/sessionRecordingsKioskLogic.ts
+++ b/frontend/src/scenes/session-recordings/kiosk/sessionRecordingsKioskLogic.ts
@@ -1,4 +1,4 @@
-import { actions, beforeUnmount, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, beforeUnmount, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, urlToAction } from 'kea-router'
 
@@ -8,8 +8,6 @@ import { urls } from 'scenes/urls'
 import { NodeKind, RecordingsQuery } from '~/queries/schema/schema-general'
 import { PropertyFilterType, PropertyOperator, SessionRecordingType } from '~/types'
 
-import type { sessionRecordingsKioskLogicType } from './sessionRecordingsKioskLogicType'
-
 const KIOSK_PLAYED_IDS_KEY = 'kiosk_played_ids'
 const SOFT_REFRESH_AFTER_RECORDINGS = 10
 const HARD_REFRESH_AFTER_RECORDINGS = 50
@@ -63,6 +61,87 @@ const DEFAULT_FILTERS: KioskFilters = {
     featureFlagValue: null,
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingsKioskLogicValues {
+    currentRecording: SessionRecordingType | null
+    currentRecordingId: string | null
+    filters: KioskFilters
+    hasRecordings: boolean
+    isConfigured: boolean
+    nextRecording: SessionRecordingType | null
+    playedCountSinceRefresh: number
+    playedRecordingIds: string[]
+    recordings: SessionRecordingType[]
+    recordingsLoading: boolean
+    started: boolean
+    totalPlayedCount: number
+    unplayedRecordings: SessionRecordingType[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingsKioskLogicActions {
+    advanceToNextRecording: () => {
+        value: true
+    }
+    loadRecordings: () => any
+    loadRecordingsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRecordingsSuccess: (
+        recordings: SessionRecordingType[],
+        payload?: any
+    ) => {
+        recordings: SessionRecordingType[]
+        payload?: any
+    }
+    markRecordingPlayed: (id: string) => {
+        id: string
+    }
+    resetPlayback: () => {
+        value: true
+    }
+    resetPlayedRecordings: () => {
+        value: true
+    }
+    setCurrentRecordingId: (id: string | null) => {
+        id: string | null
+    }
+    setFilters: (filters: Partial<KioskFilters>) => {
+        filters: Partial<KioskFilters>
+    }
+    startPlayback: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingsKioskLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        isConfigured: (started: boolean) => boolean
+        unplayedRecordings: (recordings: SessionRecordingType[], playedRecordingIds: string[]) => SessionRecordingType[]
+        currentRecording: (
+            recordings: SessionRecordingType[],
+            currentRecordingId: string | null
+        ) => SessionRecordingType | null
+        nextRecording: (
+            unplayedRecordings: SessionRecordingType[],
+            currentRecordingId: string | null
+        ) => SessionRecordingType | null
+        hasRecordings: (recordings: SessionRecordingType[]) => boolean
+    }
+}
+
+export type sessionRecordingsKioskLogicType = MakeLogicType<
+    sessionRecordingsKioskLogicValues,
+    sessionRecordingsKioskLogicActions,
+    Record<string, any>,
+    sessionRecordingsKioskLogicMeta
+>
+
 export const sessionRecordingsKioskLogic = kea<sessionRecordingsKioskLogicType>([
     path(['scenes', 'session-recordings', 'kiosk', 'sessionRecordingsKioskLogic']),
     actions({
@@ -175,20 +254,23 @@ export const sessionRecordingsKioskLogic = kea<sessionRecordingsKioskLogicType>(
         ],
     })),
     selectors({
-        isConfigured: [(s) => [s.started], (started): boolean => started],
+        isConfigured: [(s) => [s.started], (started: boolean): boolean => started],
         unplayedRecordings: [
             (s) => [s.recordings, s.playedRecordingIds],
-            (recordings, playedRecordingIds): SessionRecordingType[] =>
+            (recordings: SessionRecordingType[], playedRecordingIds: string[]): SessionRecordingType[] =>
                 recordings.filter((r) => !playedRecordingIds.includes(r.id)),
         ],
         currentRecording: [
             (s) => [s.recordings, s.currentRecordingId],
-            (recordings, currentRecordingId): SessionRecordingType | null =>
+            (recordings: SessionRecordingType[], currentRecordingId: string | null): SessionRecordingType | null =>
                 recordings.find((r) => r.id === currentRecordingId) ?? null,
         ],
         nextRecording: [
             (s) => [s.unplayedRecordings, s.currentRecordingId],
-            (unplayedRecordings, currentRecordingId): SessionRecordingType | null => {
+            (
+                unplayedRecordings: SessionRecordingType[],
+                currentRecordingId: string | null
+            ): SessionRecordingType | null => {
                 if (!currentRecordingId) {
                     return unplayedRecordings[0] ?? null
                 }
@@ -196,7 +278,7 @@ export const sessionRecordingsKioskLogic = kea<sessionRecordingsKioskLogicType>(
                 return unplayedRecordings[currentIndex + 1] ?? unplayedRecordings[0] ?? null
             },
         ],
-        hasRecordings: [(s) => [s.recordings], (recordings): boolean => recordings.length > 0],
+        hasRecordings: [(s) => [s.recordings], (recordings: SessionRecordingType[]): boolean => recordings.length > 0],
     }),
     listeners(({ actions, values }) => ({
         markRecordingPlayed: () => {
diff --git a/frontend/src/scenes/session-recordings/player/commenting/playerCommentModel.ts b/frontend/src/scenes/session-recordings/player/commenting/playerCommentModel.ts
index 6fc7939f9883..2cfc27855e59 100644
--- a/frontend/src/scenes/session-recordings/player/commenting/playerCommentModel.ts
+++ b/frontend/src/scenes/session-recordings/player/commenting/playerCommentModel.ts
@@ -1,8 +1,18 @@
-import { actions, kea, path } from 'kea'
+import { MakeLogicType, actions, kea, path } from 'kea'
 
 import { RecordingCommentForm } from 'scenes/session-recordings/player/commenting/playerFrameCommentOverlayLogic'
 
-import type { playerCommentModelType } from './playerCommentModelType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface playerCommentModelActions {
+    commentEdited: (recordingId: string) => {
+        recordingId: string
+    }
+    startCommenting: (comment: RecordingCommentForm | null) => {
+        comment: RecordingCommentForm | null
+    }
+}
+
+export type playerCommentModelType = MakeLogicType<{}, playerCommentModelActions>
 
 /**
  * used as a message bus for decoupled components to signal that a recording should be commented on
diff --git a/frontend/src/scenes/session-recordings/player/commenting/playerFrameCommentOverlayLogic.ts b/frontend/src/scenes/session-recordings/player/commenting/playerFrameCommentOverlayLogic.ts
index 7f7519fac6d4..26737c08073d 100644
--- a/frontend/src/scenes/session-recordings/player/commenting/playerFrameCommentOverlayLogic.ts
+++ b/frontend/src/scenes/session-recordings/player/commenting/playerFrameCommentOverlayLogic.ts
@@ -1,5 +1,6 @@
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { subscriptions } from 'kea-subscriptions'
 
 import api from 'lib/api'
@@ -13,8 +14,8 @@ import { isSingleEmoji } from 'scenes/session-recordings/utils'
 
 import { CommentType } from '~/types'
 
+import type { SessionPlayerData } from '../../../../types'
 import { SessionRecordingPlayerLogicProps, sessionRecordingPlayerLogic } from '../sessionRecordingPlayerLogic'
-import type { playerCommentOverlayLogicType } from './playerFrameCommentOverlayLogicType'
 
 export interface RecordingCommentForm {
     // formatted time in recording, e.g. 00:00:00, 00:00:01, 00:00:02, etc.
@@ -34,6 +35,102 @@ export interface PlayerCommentOverlayLogicProps extends SessionRecordingPlayerLo
     recordingId: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface playerCommentOverlayLogicValues {
+    currentPlayerTime: number; // sessionRecordingPlayerLogic
+    currentTimestamp: number | undefined; // sessionRecordingPlayerLogic
+    sessionPlayerData: SessionPlayerData; // sessionRecordingPlayerLogic
+    asTask: boolean;
+    formattedTimestamp: string;
+    isEmpty: boolean;
+    isLoading: boolean;
+    isRecordingCommentSubmitting: boolean;
+    isRecordingCommentValid: boolean;
+    recordingComment: RecordingCommentForm;
+    recordingCommentAllErrors: Record<string, any>;
+    recordingCommentChanged: boolean;
+    recordingCommentErrors: DeepPartialMap<RecordingCommentForm, ValidationErrorType>;
+    recordingCommentHasErrors: boolean;
+    recordingCommentManualErrors: Record<string, any>;
+    recordingCommentTouched: boolean;
+    recordingCommentTouches: Record<string, boolean>;
+    recordingCommentValidationErrors: DeepPartialMap<RecordingCommentForm, ValidationErrorType>;
+    richContentEditor: RichContentEditorType | null;
+    showRecordingCommentErrors: boolean;
+    timestampUnits: 2 | 3;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface playerCommentOverlayLogicActions {
+    ensureAllMembersLoaded: () => {
+        value: true;
+    }; // membersLogic
+    setIsCommenting: (isCommenting: boolean) => {
+        isCommenting: boolean;
+    }; // sessionRecordingPlayerLogic
+    addEmojiComment: (emoji: string) => {
+        emoji: string;
+    };
+    editComment: (comment: RecordingCommentForm) => {
+        comment: RecordingCommentForm;
+    };
+    onRichContentEditorUpdate: (isEmpty: boolean) => {
+        isEmpty: boolean;
+    };
+    resetRecordingComment: (values?: RecordingCommentForm) => {
+        values?: RecordingCommentForm;
+    };
+    setAsTask: (asTask: boolean) => {
+        asTask: boolean;
+    };
+    setLoading: (isLoading: boolean) => {
+        isLoading: boolean;
+    };
+    setRecordingCommentManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>;
+    };
+    setRecordingCommentValue: (key: FieldName, value: any) => {
+        name: FieldName;
+        value: any;
+    };
+    setRecordingCommentValues: (values: DeepPartial<RecordingCommentForm>) => {
+        values: DeepPartial<RecordingCommentForm>;
+    };
+    setRichContent: (richContent: JSONContent | null) => {
+        richContent: JSONContent | null;
+    };
+    setRichContentEditor: (editor: RichContentEditorType) => {
+        editor: RichContentEditorType;
+    };
+    submitRecordingComment: () => {
+        value: boolean;
+    };
+    submitRecordingCommentFailure: (error: Error, errors: Record<string, any>) => {
+        error: Error;
+        errors: Record<string, any>;
+    };
+    submitRecordingCommentRequest: (recordingComment: RecordingCommentForm) => {
+        recordingComment: RecordingCommentForm;
+    };
+    submitRecordingCommentSuccess: (recordingComment: RecordingCommentForm) => {
+        recordingComment: RecordingCommentForm;
+    };
+    touchRecordingCommentField: (key: string) => {
+        key: string;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface playerCommentOverlayLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        timestampUnits: (sessionPlayerData: SessionPlayerData) => 2 | 3;
+        formattedTimestamp: (currentPlayerTime: number, timestampUnits: 2 | 3) => string;
+    };
+}
+
+export type playerCommentOverlayLogicType = MakeLogicType<playerCommentOverlayLogicValues, playerCommentOverlayLogicActions, PlayerCommentOverlayLogicProps, playerCommentOverlayLogicMeta>;
+
 export const playerCommentOverlayLogic = kea<playerCommentOverlayLogicType>([
     path(['scenes', 'session-recordings', 'player', 'PlayerFrameAnnotationOverlay']),
     key((props) => props.recordingId ?? 'unknown'),
@@ -83,14 +180,14 @@ export const playerCommentOverlayLogic = kea<playerCommentOverlayLogicType>([
     selectors({
         timestampUnits: [
             (s) => [s.sessionPlayerData],
-            (sessionPlayerData) => {
+            (sessionPlayerData: import('~/types').SessionPlayerData) => {
                 const endTimeSeconds = Math.floor(sessionPlayerData.durationMs / 1000)
                 return endTimeSeconds > 3600 ? 3 : 2
             },
         ],
         formattedTimestamp: [
             (s) => [s.currentPlayerTime, s.timestampUnits],
-            (currentPlayerTime, timestampUnits) => {
+            (currentPlayerTime: number, timestampUnits: 2 | 3) => {
                 return colonDelimitedDuration(currentPlayerTime / 1000, timestampUnits)
             },
         ],
diff --git a/frontend/src/scenes/session-recordings/player/controller/seekbarLogic.ts b/frontend/src/scenes/session-recordings/player/controller/seekbarLogic.ts
index 3a2286ab999a..ef431a4c6fa2 100644
--- a/frontend/src/scenes/session-recordings/player/controller/seekbarLogic.ts
+++ b/frontend/src/scenes/session-recordings/player/controller/seekbarLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { MutableRefObject } from 'react'
 
 import { clamp } from 'lib/utils/numbers'
@@ -7,8 +7,87 @@ import {
     sessionRecordingPlayerLogic,
 } from 'scenes/session-recordings/player/sessionRecordingPlayerLogic'
 
+import type { SessionPlayerData } from '../../../../types'
 import { InteractEvent, ReactInteractEvent, THUMB_OFFSET, getXPos } from '../utils/playerUtils'
-import type { seekbarLogicType } from './seekbarLogicType'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface seekbarLogicValues {
+    currentPlayerTime: number; // sessionRecordingPlayerLogic
+    sessionPlayerData: SessionPlayerData; // sessionRecordingPlayerLogic
+    cursorDiff: number;
+    endTimeMs: number;
+    isScrubbing: boolean;
+    isSeeking: boolean;
+    scrubbingTime: number;
+    scrubbingTimeSeconds: number;
+    slider: HTMLDivElement | null;
+    thumb: HTMLDivElement | null;
+    thumbLeftPos: number;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface seekbarLogicActions {
+    endScrub: () => {
+        value: true;
+    }; // sessionRecordingPlayerLogic
+    seekToTime: (timeInMilliseconds: number, forcePlay?: boolean | undefined) => {
+        forcePlay: boolean;
+        timeInMilliseconds: number;
+    }; // sessionRecordingPlayerLogic
+    setCurrentTimestamp: (timestamp: number) => {
+        timestamp: number;
+    }; // sessionRecordingPlayerLogic
+    startScrub: () => {
+        value: true;
+    }; // sessionRecordingPlayerLogic
+    debouncedSetTime: (time: number) => {
+        time: number;
+    };
+    endSeeking: () => {
+        value: true;
+    };
+    handleClick: (event: ReactInteractEvent) => {
+        event: ReactInteractEvent;
+    };
+    handleDown: (event: ReactInteractEvent) => {
+        event: ReactInteractEvent;
+    };
+    handleMove: (event: InteractEvent) => {
+        event: InteractEvent;
+    };
+    handleSeek: (newX: number, shouldSeek?: boolean) => {
+        newX: number;
+        shouldSeek: boolean;
+    };
+    handleUp: (event: InteractEvent) => {
+        event: InteractEvent;
+    };
+    setCursorDiff: (cursorDiff: number) => {
+        cursorDiff: number;
+    };
+    setSlider: (ref: MutableRefObject<HTMLDivElement | null>) => {
+        ref: MutableRefObject<HTMLDivElement | null>;
+    };
+    setThumb: (ref: MutableRefObject<HTMLDivElement | null>) => {
+        ref: MutableRefObject<HTMLDivElement | null>;
+    };
+    setThumbLeftPos: (thumbLeftPos: number, shouldSeek: boolean) => {
+        shouldSeek: boolean;
+        thumbLeftPos: number;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface seekbarLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        endTimeMs: (sessionPlayerData: SessionPlayerData) => number;
+        scrubbingTime: (thumbLeftPos: number, slider: HTMLDivElement | null, sessionPlayerData: SessionPlayerData) => number;
+        scrubbingTimeSeconds: (scrubbingTime: number) => number;
+    };
+}
+
+export type seekbarLogicType = MakeLogicType<seekbarLogicValues, seekbarLogicActions, SessionRecordingPlayerLogicProps, seekbarLogicMeta>;
 
 export const seekbarLogic = kea<seekbarLogicType>([
     path((key) => ['scenes', 'session-recordings', 'player', 'seekbarLogic', key]),
@@ -79,14 +158,18 @@ export const seekbarLogic = kea<seekbarLogicType>([
     selectors({
         endTimeMs: [
             (selectors) => [selectors.sessionPlayerData],
-            (sessionPlayerData) => {
+            (sessionPlayerData: import('../../../../types').SessionPlayerData) => {
                 return sessionPlayerData?.durationMs ?? 0
             },
         ],
 
         scrubbingTime: [
             (selectors) => [selectors.thumbLeftPos, selectors.slider, selectors.sessionPlayerData],
-            (thumbLeftPos, slider, sessionPlayerData) => {
+            (
+                thumbLeftPos: number,
+                slider: HTMLDivElement | null,
+                sessionPlayerData: import('../../../../types').SessionPlayerData
+            ) => {
                 if (thumbLeftPos && slider && sessionPlayerData?.durationMs) {
                     return ((thumbLeftPos + THUMB_OFFSET) / slider.offsetWidth) * sessionPlayerData.durationMs
                 }
@@ -95,7 +178,7 @@ export const seekbarLogic = kea<seekbarLogicType>([
         ],
         scrubbingTimeSeconds: [
             (selectors) => [selectors.scrubbingTime],
-            (scrubbingTime) => Math.floor(scrubbingTime / 1000),
+            (scrubbingTime: number) => Math.floor(scrubbingTime / 1000),
         ],
     }),
     listeners(({ values, actions, cache }) => ({
diff --git a/frontend/src/scenes/session-recordings/player/inspector/miniFiltersLogic.ts b/frontend/src/scenes/session-recordings/player/inspector/miniFiltersLogic.ts
index 3dbb0ed9b277..2a3247966ad0 100644
--- a/frontend/src/scenes/session-recordings/player/inspector/miniFiltersLogic.ts
+++ b/frontend/src/scenes/session-recordings/player/inspector/miniFiltersLogic.ts
@@ -1,11 +1,11 @@
 import { deepEqual as equal } from 'fast-equals'
-import { actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
 
 import { sessionRecordingEventUsageLogic } from 'scenes/session-recordings/sessionRecordingEventUsageLogic'
 import { teamLogic } from 'scenes/teamLogic'
 
-import type { miniFiltersLogicType } from './miniFiltersLogicType'
 import { FilterableInspectorListItemTypes } from './playerInspectorLogic'
+import type { TeamPublicType, TeamType } from '../../../../types'
 
 export type SharedListMiniFilter = {
     type: FilterableInspectorListItemTypes
@@ -152,6 +152,73 @@ const defaultMinifilters = [
     'logs-error',
 ]
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface miniFiltersLogicValues {
+    currentTeam: TeamPublicType | TeamType | null; // teamLogic
+    groupRepeatedItems: boolean;
+    hasEventsFiltersSelected: boolean;
+    miniFilters: SharedListMiniFilter[];
+    miniFiltersByKey: {
+        [key: string]: SharedListMiniFilter;
+    };
+    miniFiltersForType: ((tab: FilterableInspectorListItemTypes) => SharedListMiniFilter[]);
+    miniFiltersForTypeByKey: ((tab: FilterableInspectorListItemTypes) => {
+        [key: string]: SharedListMiniFilter;
+    });
+    searchQuery: string;
+    selectedMiniFilters: string[];
+    showLineTooltips: boolean;
+    showOnlyMatching: boolean;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface miniFiltersLogicActions {
+    reportRecordingInspectorMiniFilterViewed: (minifilterKey: string, enabled: boolean) => {
+        enabled: boolean;
+        minifilterKey: string;
+    }; // sessionRecordingEventUsageLogic
+    resetMiniFilters: () => {
+        value: true;
+    };
+    setGroupRepeatedItems: (groupRepeatedItems: boolean) => {
+        groupRepeatedItems: boolean;
+    };
+    setMiniFilter: (key: MiniFilterKey, enabled: boolean) => {
+        enabled: boolean;
+        key: string;
+    };
+    setMiniFilters: (keys: MiniFilterKey[], enabled: boolean) => {
+        enabled: boolean;
+        keys: string[];
+    };
+    setSearchQuery: (search: string) => {
+        search: string;
+    };
+    setShowLineTooltips: (showLineTooltips: boolean) => {
+        showLineTooltips: boolean;
+    };
+    setShowOnlyMatching: (showOnlyMatching: boolean) => {
+        showOnlyMatching: boolean;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface miniFiltersLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        miniFiltersForType: (selectedMiniFilters: string[]) => ((tab: FilterableInspectorListItemTypes) => SharedListMiniFilter[]);
+        hasEventsFiltersSelected: (miniFiltersForType: (tab: FilterableInspectorListItemTypes) => SharedListMiniFilter[]) => boolean;
+        miniFilters: (selectedMiniFilters: string[]) => SharedListMiniFilter[];
+        miniFiltersByKey: (miniFilters: SharedListMiniFilter[]) => {
+            [key: string]: SharedListMiniFilter;
+        };
+        miniFiltersForTypeByKey: (miniFiltersForType: (tab: FilterableInspectorListItemTypes) => SharedListMiniFilter[]) => ((tab: FilterableInspectorListItemTypes) => {
+            [key: string]: SharedListMiniFilter;
+        });
+    };
+}
+
+export type miniFiltersLogicType = MakeLogicType<miniFiltersLogicValues, miniFiltersLogicActions, Record<string, any>, miniFiltersLogicMeta>;
+
 export const miniFiltersLogic = kea<miniFiltersLogicType>([
     path(['scenes', 'session-recordings', 'player', 'miniFiltersLogic']),
     actions({
@@ -228,7 +295,7 @@ export const miniFiltersLogic = kea<miniFiltersLogicType>([
     selectors({
         miniFiltersForType: [
             (s) => [s.selectedMiniFilters],
-            (selectedMiniFilters): ((tab: FilterableInspectorListItemTypes) => SharedListMiniFilter[]) => {
+            (selectedMiniFilters: string[]): ((tab: FilterableInspectorListItemTypes) => SharedListMiniFilter[]) => {
                 return (tab: FilterableInspectorListItemTypes) => {
                     return MiniFilters.filter((filter) => filter.type === tab).map((x) => ({
                         ...x,
@@ -240,12 +307,12 @@ export const miniFiltersLogic = kea<miniFiltersLogicType>([
 
         hasEventsFiltersSelected: [
             (s) => [s.miniFiltersForType],
-            (miniFiltersForType) => miniFiltersForType('events').some((x) => x.enabled),
+            (miniFiltersForType: (tab: FilterableInspectorListItemTypes) => SharedListMiniFilter[]) => miniFiltersForType('events').some((x) => x.enabled),
         ],
 
         miniFilters: [
             (s) => [s.selectedMiniFilters],
-            (selectedMiniFilters): SharedListMiniFilter[] => {
+            (selectedMiniFilters: string[]): SharedListMiniFilter[] => {
                 return MiniFilters.map((x) => ({
                     ...x,
                     enabled: selectedMiniFilters.includes(x.key),
@@ -256,7 +323,7 @@ export const miniFiltersLogic = kea<miniFiltersLogicType>([
 
         miniFiltersByKey: [
             (s) => [s.miniFilters],
-            (miniFilters): { [key: string]: SharedListMiniFilter } => {
+            (miniFilters: SharedListMiniFilter[]): { [key: string]: SharedListMiniFilter } => {
                 return miniFilters.reduce<Record<string, SharedListMiniFilter>>((acc, filter) => {
                     acc[filter.key] = filter
                     return acc
@@ -268,7 +335,7 @@ export const miniFiltersLogic = kea<miniFiltersLogicType>([
         miniFiltersForTypeByKey: [
             (s) => [s.miniFiltersForType],
             (
-                miniFiltersForType
+                miniFiltersForType: (tab: FilterableInspectorListItemTypes) => SharedListMiniFilter[]
             ): ((tab: FilterableInspectorListItemTypes) => { [key: string]: SharedListMiniFilter }) => {
                 return (tab) => {
                     return miniFiltersForType(tab).reduce<Record<string, SharedListMiniFilter>>((acc, filter) => {
diff --git a/frontend/src/scenes/session-recordings/player/inspector/playerInspectorLogic.ts b/frontend/src/scenes/session-recordings/player/inspector/playerInspectorLogic.ts
index 93adb2d26797..1916bcc3b15b 100644
--- a/frontend/src/scenes/session-recordings/player/inspector/playerInspectorLogic.ts
+++ b/frontend/src/scenes/session-recordings/player/inspector/playerInspectorLogic.ts
@@ -1,6 +1,19 @@
 import { deepEqual as equal } from 'fast-equals'
 import FuseClass from 'fuse.js'
-import { actions, connect, events, kea, key, listeners, path, props, propsChanged, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    connect,
+    events,
+    kea,
+    key,
+    listeners,
+    path,
+    props,
+    propsChanged,
+    reducers,
+    selectors,
+} from 'kea'
 import { loaders } from 'kea-loaders'
 import {
     EventType as RRWebEventType,
@@ -47,6 +60,9 @@ import {
     RecordingEventType,
 } from '~/types'
 
+import type { ExperimentSessionContextItemApi } from '../../../../../../products/experiments/frontend/generated/api.schemas'
+import type { FeatureFlagsSet } from '../../../../lib/logic/featureFlagLogic'
+import type { RecordingSegment, SessionPlayerData, SessionRecordingType } from '../../../../types'
 import { sessionRecordingExperimentContextLogic } from '../player-meta/sessionRecordingExperimentContextLogic'
 import { sessionRecordingDataCoordinatorLogic } from '../sessionRecordingDataCoordinatorLogic'
 import {
@@ -54,7 +70,7 @@ import {
     SessionRecordingPlayerLogicProps,
     sessionRecordingPlayerLogic,
 } from '../sessionRecordingPlayerLogic'
-import type { playerInspectorLogicType } from './playerInspectorLogicType'
+import type { SharedListMiniFilter } from './miniFiltersLogic'
 import { playerInspectorLogsLogic } from './playerInspectorLogsLogic'
 
 const CONSOLE_LOG_PLUGIN_NAME = 'rrweb/console@1'
@@ -356,6 +372,245 @@ function commentTimestamp(
     return { timestamp: commentTime, timeInRecording: commentTime.valueOf() - (start?.valueOf() ?? 0) }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface playerInspectorLogicValues {
+    featureFlags: FeatureFlagsSet; // featureFlagLogic
+    groupRepeatedItems: boolean; // miniFiltersLogic
+    miniFilters: SharedListMiniFilter[]; // miniFiltersLogic
+    miniFiltersByKey: {
+        [key: string]: SharedListMiniFilter;
+    }; // miniFiltersLogic
+    miniFiltersForTypeByKey: ((tab: FilterableInspectorListItemTypes) => {
+        [key: string]: SharedListMiniFilter;
+    }); // miniFiltersLogic
+    searchQuery: string; // miniFiltersLogic
+    showOnlyMatching: boolean; // miniFiltersLogic
+    allPerformanceEvents: PerformanceEvent[]; // performanceEventDataLogic
+    logs: LogMessage[]; // playerInspectorLogsLogic
+    logsHasMore: boolean; // playerInspectorLogsLogic
+    logsInitialLoadRequested: boolean; // playerInspectorLogsLogic
+    logsLoadError: boolean; // playerInspectorLogsLogic
+    logsLoading: boolean; // playerInspectorLogsLogic
+    logsNextCursor: string | undefined; // playerInspectorLogsLogic
+    readyToLoadLogs: boolean; // playerInspectorLogsLogic
+    durationMs: number; // sessionRecordingDataCoordinatorLogic
+    end: Dayjs | null; // sessionRecordingDataCoordinatorLogic
+    segments: RecordingSegment[]; // sessionRecordingDataCoordinatorLogic
+    sessionComments: CommentType[]; // sessionRecordingDataCoordinatorLogic
+    sessionCommentsLoading: boolean; // sessionRecordingDataCoordinatorLogic
+    sessionEventsData: RecordingEventType[] | null; // sessionRecordingDataCoordinatorLogic
+    sessionEventsDataLoading: boolean; // sessionRecordingDataCoordinatorLogic
+    sessionNotebookComments: any; // sessionRecordingDataCoordinatorLogic
+    sessionPlayerData: SessionPlayerData; // sessionRecordingDataCoordinatorLogic
+    sessionPlayerMetaData: SessionRecordingType | null; // sessionRecordingDataCoordinatorLogic
+    sessionPlayerMetaDataLoading: boolean; // sessionRecordingDataCoordinatorLogic
+    snapshotsLoading: boolean; // sessionRecordingDataCoordinatorLogic
+    start: Dayjs | null; // sessionRecordingDataCoordinatorLogic
+    trackedWindow: number | null; // sessionRecordingDataCoordinatorLogic
+    uuidToIndex: Record<string, number>; // sessionRecordingDataCoordinatorLogic
+    windowIdForTimestamp: (timestamp: number) => number | undefined; // sessionRecordingDataCoordinatorLogic
+    windowIds: number[]; // sessionRecordingDataCoordinatorLogic
+    experimentItems: ExperimentSessionContextItemApi[]; // sessionRecordingExperimentContextLogic
+    currentPlayerTime: number; // sessionRecordingPlayerLogic
+    doctorDiagnostics: DoctorDiagnostics | null; // sessionRecordingPlayerLogic
+    skipToFirstMatchingEvent: boolean; // sessionRecordingPlayerLogic
+    allContextItems: InspectorListItem[];
+    allItems: {
+        items: InspectorListItem[];
+        itemsByMiniFilterKey: Record<MiniFilterKey, InspectorListItem[]>;
+        itemsByType: Record<FilterableInspectorListItemTypes | "context", InspectorListItem[]>;
+    };
+    allItemsByItemType: Record<FilterableInspectorListItemTypes | "context", InspectorListItem[]>;
+    allItemsByMiniFilterKey: Record<MiniFilterKey, InspectorListItem[]>;
+    allItemsList: InspectorListItem[];
+    allowMatchingEventsFilter: boolean;
+    collapseInspectorItems: boolean;
+    commentItems: InspectorListItemComment[];
+    displayGroups: DisplayGroup[];
+    expandedItems: number[];
+    experimentVariantItems: InspectorListItemExperimentVariant[];
+    filteredItems: InspectorListItem[];
+    fuse: Fuse;
+    hasEventsToDisplay: boolean;
+    inspectorDataState: Record<FilterableInspectorListItemTypes, "empty" | "loading" | "ready">;
+    isLoading: boolean;
+    isReady: boolean;
+    items: InspectorListItem[];
+    matchingEvents: MatchedRecordingEvent[] | null;
+    matchingEventsLoading: boolean;
+    notebookCommentItems: InspectorListItemNotebookComment[];
+    playbackIndicatorIndex: number;
+    playbackIndicatorIndexStop: number;
+    processedSnapshotData: {
+        appStateItems: InspectorListItemAppState[];
+        browserVisibilityChanges: InspectorListBrowserVisibility[];
+        consoleItems: InspectorListItemConsole[];
+        contextItems: InspectorListItem[];
+        doctorEvents: InspectorListItemDoctor[];
+        offlineStatusChanges: InspectorListOfflineStatusChange[];
+        rawConsoleLogs: RecordingConsoleLogV2[];
+    };
+    runtimeDoctorEvents: InspectorListItemDoctor[];
+    seekbarItems: (InspectorListItemComment | InspectorListItemEvent | InspectorListItemExperimentVariant)[];
+    syncScrollPaused: boolean;
+    windowNumberForID: (windowId: number | undefined) => number | "?" | undefined;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface playerInspectorLogicActions {
+    setMiniFilter: (key: string, enabled: boolean) => {
+        enabled: boolean;
+        key: string;
+    }; // miniFiltersLogic
+    setSearchQuery: (search: string) => {
+        search: string;
+    }; // miniFiltersLogic
+    loadLogs: () => any; // playerInspectorLogsLogic
+    loadMoreLogs: () => any; // playerInspectorLogsLogic
+    markLogsInitialLoadRequested: () => {
+        value: true;
+    }; // playerInspectorLogsLogic
+    loadEventsSuccess: (sessionEventsData: RecordingEventType[] | null, payload?: {
+        value: true;
+    } | undefined) => {
+        payload?: {
+            value: true;
+        };
+        sessionEventsData: RecordingEventType[] | null;
+    }; // sessionRecordingDataCoordinatorLogic
+    loadFullEventData: (event: RecordingEventType | RecordingEventType[]) => {
+        event: RecordingEventType | RecordingEventType[];
+    }; // sessionRecordingDataCoordinatorLogic
+    registerWindowId: (uuid: string) => {
+        uuid: string;
+    }; // sessionRecordingDataCoordinatorLogic
+    setTrackedWindow: (windowId: number | null) => {
+        windowId: number | null;
+    }; // sessionRecordingDataCoordinatorLogic
+    reportRecordingInspectorItemExpanded: (tab: "app-state" | "browser-visibility" | "comment" | "console" | "doctor" | "events" | "experiment-variant" | "inactivity" | "inspector-summary" | "logs" | "network" | "offline-status" | "performance" | "session-change", index: number) => {
+        index: number;
+        tab: "app-state" | "browser-visibility" | "comment" | "console" | "doctor" | "events" | "experiment-variant" | "inactivity" | "inspector-summary" | "logs" | "network" | "offline-status" | "performance" | "session-change";
+    }; // sessionRecordingEventUsageLogic
+    seekToTime: (timeInMilliseconds: number, forcePlay?: boolean | undefined) => {
+        forcePlay: boolean;
+        timeInMilliseconds: number;
+    }; // sessionRecordingPlayerLogic
+    setSkippingToMatchingEvent: (isSkippingToMatchingEvent: boolean) => {
+        isSkippingToMatchingEvent: boolean;
+    }; // sessionRecordingPlayerLogic
+    loadMatchingEvents: () => any;
+    loadMatchingEventsFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadMatchingEventsSuccess: (matchingEvents: MatchedRecordingEvent[] | null, payload?: any) => {
+        matchingEvents: MatchedRecordingEvent[] | null;
+        payload?: any;
+    };
+    setItemExpanded: (index: number, expanded: boolean) => {
+        expanded: boolean;
+        index: number;
+    };
+    setSyncScrollPaused: (paused: boolean) => {
+        paused: boolean;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface playerInspectorLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        allowMatchingEventsFilter: (miniFilters: SharedListMiniFilter[]) => boolean;
+        windowNumberForID: (windowIds: number[]) => (windowId: number | undefined) => number | "?" | undefined;
+        collapseInspectorItems: (featureFlags: FeatureFlagsSet) => boolean;
+        processedSnapshotData: (start: Dayjs | null, sessionPlayerData: SessionPlayerData, windowNumberForID: (windowId: number | undefined) => number | "?" | undefined, collapseInspectorItems: boolean) => {
+            appStateItems: InspectorListItemAppState[];
+            browserVisibilityChanges: InspectorListBrowserVisibility[];
+            consoleItems: InspectorListItemConsole[];
+            contextItems: InspectorListItem[];
+            doctorEvents: InspectorListItemDoctor[];
+            offlineStatusChanges: InspectorListOfflineStatusChange[];
+            rawConsoleLogs: RecordingConsoleLogV2[];
+        };
+        notebookCommentItems: (sessionNotebookComments: any, windowIdForTimestamp: (timestamp: number) => number | undefined, windowNumberForID: (windowId: number | undefined) => number | "?" | undefined, start: Dayjs | null) => InspectorListItemNotebookComment[];
+        commentItems: (sessionComments: CommentType[], windowIdForTimestamp: (timestamp: number) => number | undefined, windowNumberForID: (windowId: number | undefined) => number | "?" | undefined, start: Dayjs | null) => InspectorListItemComment[];
+        experimentVariantItems: (experimentItems: ExperimentSessionContextItemApi[], windowIdForTimestamp: (timestamp: number) => number | undefined, windowNumberForID: (windowId: number | undefined) => number | "?" | undefined, start: Dayjs | null) => InspectorListItemExperimentVariant[];
+        runtimeDoctorEvents: (start: Dayjs | null, doctorDiagnostics: DoctorDiagnostics | null) => InspectorListItemDoctor[];
+        allContextItems: (start: Dayjs | null, processedSnapshotData: {
+            appStateItems: InspectorListItemAppState[];
+            browserVisibilityChanges: InspectorListBrowserVisibility[];
+            consoleItems: InspectorListItemConsole[];
+            contextItems: InspectorListItem[];
+            doctorEvents: InspectorListItemDoctor[];
+            offlineStatusChanges: InspectorListOfflineStatusChange[];
+            rawConsoleLogs: RecordingConsoleLogV2[];
+        }, windowNumberForID: (windowId: number | undefined) => number | "?" | undefined, sessionPlayerMetaData: SessionRecordingType | null, segments: import("@common/replay-shared/src").RecordingSegment[], runtimeDoctorEvents: InspectorListItemDoctor[], experimentVariantItems: InspectorListItemExperimentVariant[]) => InspectorListItem[];
+        allItems: (start: Dayjs | null, allPerformanceEvents: PerformanceEvent[], processedSnapshotData: {
+            appStateItems: InspectorListItemAppState[];
+            browserVisibilityChanges: InspectorListBrowserVisibility[];
+            consoleItems: InspectorListItemConsole[];
+            contextItems: InspectorListItem[];
+            doctorEvents: InspectorListItemDoctor[];
+            offlineStatusChanges: InspectorListOfflineStatusChange[];
+            rawConsoleLogs: RecordingConsoleLogV2[];
+        }, sessionEventsData: RecordingEventType[] | null, matchingEvents: MatchedRecordingEvent[] | null, windowNumberForID: (windowId: number | undefined) => number | "?" | undefined, allContextItems: InspectorListItem[], commentItems: InspectorListItemComment[], notebookCommentItems: InspectorListItemNotebookComment[], sessionPlayerData: SessionPlayerData, miniFiltersByKey: {
+            [key: string]: SharedListMiniFilter;
+        }, uuidToIndex: Record<string, number>, logs: LogMessage[]) => {
+            items: InspectorListItem[];
+            itemsByMiniFilterKey: Record<MiniFilterKey, InspectorListItem[]>;
+            itemsByType: Record<FilterableInspectorListItemTypes | "context", InspectorListItem[]>;
+        };
+        filteredItems: (allItems: {
+            items: InspectorListItem[];
+            itemsByMiniFilterKey: Record<MiniFilterKey, InspectorListItem[]>;
+            itemsByType: Record<FilterableInspectorListItemTypes | "context", InspectorListItem[]>;
+        }, miniFiltersByKey: {
+            [key: string]: SharedListMiniFilter;
+        }, showOnlyMatching: boolean, allowMatchingEventsFilter: boolean, trackedWindow: number | null, hasEventsToDisplay: boolean) => InspectorListItem[];
+        seekbarItems: (allItems: {
+            items: InspectorListItem[];
+            itemsByMiniFilterKey: Record<MiniFilterKey, InspectorListItem[]>;
+            itemsByType: Record<FilterableInspectorListItemTypes | "context", InspectorListItem[]>;
+        }, miniFiltersByKey: {
+            [key: string]: SharedListMiniFilter;
+        }, showOnlyMatching: boolean, allowMatchingEventsFilter: boolean, trackedWindow: number | null, hasEventsToDisplay: boolean) => (InspectorListItemComment | InspectorListItemEvent | InspectorListItemExperimentVariant)[];
+        inspectorDataState: (sessionEventsDataLoading: boolean, sessionPlayerMetaDataLoading: boolean, snapshotsLoading: boolean, sessionEventsData: RecordingEventType[] | null, processedSnapshotData: {
+            appStateItems: InspectorListItemAppState[];
+            browserVisibilityChanges: InspectorListBrowserVisibility[];
+            consoleItems: InspectorListItemConsole[];
+            contextItems: InspectorListItem[];
+            doctorEvents: InspectorListItemDoctor[];
+            offlineStatusChanges: InspectorListOfflineStatusChange[];
+            rawConsoleLogs: RecordingConsoleLogV2[];
+        }, allPerformanceEvents: PerformanceEvent[], sessionComments: CommentType[], sessionCommentsLoading: boolean, logsLoading: boolean, logs: LogMessage[]) => Record<FilterableInspectorListItemTypes, "empty" | "loading" | "ready">;
+        isLoading: (inspectorDataState: Record<"comment" | "console" | "doctor" | "events" | "logs" | "network", "empty" | "loading" | "ready">) => boolean;
+        isReady: (inspectorDataState: Record<"comment" | "console" | "doctor" | "events" | "logs" | "network", "empty" | "loading" | "ready">) => boolean;
+        playbackIndicatorIndex: (currentPlayerTime: number, items: InspectorListItem[], displayGroups: DisplayGroup[]) => number;
+        playbackIndicatorIndexStop: (playbackIndicatorIndex: number, displayGroups: DisplayGroup[]) => number;
+        fuse: (filteredItems: InspectorListItem[]) => Fuse;
+        items: (filteredItems: InspectorListItem[], fuse: Fuse, searchQuery: string) => InspectorListItem[];
+        displayGroups: (items: InspectorListItem[], groupRepeatedItems: boolean, collapseInspectorItems: boolean) => DisplayGroup[];
+        allItemsList: (allItems: {
+            items: InspectorListItem[];
+            itemsByMiniFilterKey: Record<MiniFilterKey, InspectorListItem[]>;
+            itemsByType: Record<FilterableInspectorListItemTypes | "context", InspectorListItem[]>;
+        }) => InspectorListItem[];
+        allItemsByMiniFilterKey: (allItems: {
+            items: InspectorListItem[];
+            itemsByMiniFilterKey: Record<MiniFilterKey, InspectorListItem[]>;
+            itemsByType: Record<FilterableInspectorListItemTypes | "context", InspectorListItem[]>;
+        }) => Record<MiniFilterKey, InspectorListItem[]>;
+        allItemsByItemType: (allItems: {
+            items: InspectorListItem[];
+            itemsByMiniFilterKey: Record<MiniFilterKey, InspectorListItem[]>;
+            itemsByType: Record<FilterableInspectorListItemTypes | "context", InspectorListItem[]>;
+        }) => Record<FilterableInspectorListItemTypes | "context", InspectorListItem[]>;
+        hasEventsToDisplay: (allItemsByItemType: Record<"comment" | "console" | "context" | "doctor" | "events" | "logs" | "network", InspectorListItem[]>) => boolean;
+    };
+}
+
+export type playerInspectorLogicType = MakeLogicType<playerInspectorLogicValues, playerInspectorLogicActions, PlayerInspectorLogicProps, playerInspectorLogicMeta>;
+
 export const playerInspectorLogic = kea<playerInspectorLogicType>([
     path((key) => ['scenes', 'session-recordings', 'player', 'playerInspectorLogic', key]),
     props({} as PlayerInspectorLogicProps),
@@ -507,7 +762,9 @@ export const playerInspectorLogic = kea<playerInspectorLogicType>([
     selectors(({ props }) => ({
         allowMatchingEventsFilter: [
             (s) => [s.miniFilters],
-            (miniFilters): boolean => {
+            (
+                miniFilters: import('scenes/session-recordings/player/inspector/miniFiltersLogic').SharedListMiniFilter[]
+            ): boolean => {
                 return (
                     miniFilters.some((mf) => mf.type === 'events' && mf.enabled) &&
                     props.matchingEventsMatchType?.matchType !== 'none'
@@ -517,7 +774,7 @@ export const playerInspectorLogic = kea<playerInspectorLogicType>([
 
         windowNumberForID: [
             (s) => [s.windowIds],
-            (windowIds) => {
+            (windowIds: number[]) => {
                 // windowId is already 1-indexed from the registry
                 return (windowId: number | undefined): number | '?' | undefined => {
                     if (windowIds.length <= 1) {
@@ -533,16 +790,17 @@ export const playerInspectorLogic = kea<playerInspectorLogicType>([
 
         collapseInspectorItems: [
             (s) => [s.featureFlags],
-            (featureFlags): boolean => !!featureFlags[FEATURE_FLAGS.REPLAY_COLLAPSE_INSPECTOR_ITEMS],
+            (featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet): boolean =>
+                !!featureFlags[FEATURE_FLAGS.REPLAY_COLLAPSE_INSPECTOR_ITEMS],
         ],
 
         processedSnapshotData: [
             (s) => [s.start, s.sessionPlayerData, s.windowNumberForID, s.collapseInspectorItems],
             (
-                start,
-                sessionPlayerData,
-                windowNumberForID,
-                collapseInspectorItems
+                start: Dayjs | null,
+                sessionPlayerData: import('~/types').SessionPlayerData,
+                windowNumberForID: (windowId: number | undefined) => number | '?' | undefined,
+                collapseInspectorItems: boolean
             ): {
                 offlineStatusChanges: InspectorListOfflineStatusChange[]
                 browserVisibilityChanges: InspectorListBrowserVisibility[]
@@ -782,9 +1040,9 @@ export const playerInspectorLogic = kea<playerInspectorLogicType>([
             (s) => [s.sessionNotebookComments, s.windowIdForTimestamp, s.windowNumberForID, s.start],
             (
                 sessionNotebookComments,
-                windowIdForTimestamp,
-                windowNumberForID,
-                start
+                windowIdForTimestamp: (timestamp: number) => number | undefined,
+                windowNumberForID: (windowId: number | undefined) => number | '?' | undefined,
+                start: Dayjs | null
             ): InspectorListItemNotebookComment[] => {
                 const items: InspectorListItemNotebookComment[] = []
                 for (const comment of sessionNotebookComments || []) {
@@ -813,7 +1071,12 @@ export const playerInspectorLogic = kea<playerInspectorLogicType>([
 
         commentItems: [
             (s) => [s.sessionComments, s.windowIdForTimestamp, s.windowNumberForID, s.start],
-            (sessionComments, windowIdForTimestamp, windowNumberForID, start): InspectorListItemComment[] => {
+            (
+                sessionComments: CommentType[],
+                windowIdForTimestamp: (timestamp: number) => number | undefined,
+                windowNumberForID: (windowId: number | undefined) => number | '?' | undefined,
+                start: Dayjs | null
+            ): InspectorListItemComment[] => {
                 const items: InspectorListItemComment[] = []
                 for (const comment of sessionComments || []) {
                     if (!comment.item_context?.time_in_recording) {
@@ -847,7 +1110,12 @@ export const playerInspectorLogic = kea<playerInspectorLogicType>([
 
         experimentVariantItems: [
             (s) => [s.experimentItems, s.windowIdForTimestamp, s.windowNumberForID, s.start],
-            (experimentItems, windowIdForTimestamp, windowNumberForID, start): InspectorListItemExperimentVariant[] => {
+            (
+                experimentItems: import('products/experiments/frontend/generated/api.schemas').ExperimentSessionContextItemApi[],
+                windowIdForTimestamp: (timestamp: number) => number | undefined,
+                windowNumberForID: (windowId: number | undefined) => number | '?' | undefined,
+                start: Dayjs | null
+            ): InspectorListItemExperimentVariant[] => {
                 const items: InspectorListItemExperimentVariant[] = []
                 for (const item of experimentItems || []) {
                     // Without a $feature_flag_called event there is no in-session moment to mark —
@@ -934,13 +1202,21 @@ export const playerInspectorLogic = kea<playerInspectorLogicType>([
                 s.experimentVariantItems,
             ],
             (
-                start,
-                processedSnapshotData,
-                windowNumberForID,
-                sessionPlayerMetaData,
-                segments,
-                runtimeDoctorEvents,
-                experimentVariantItems
+                start: Dayjs | null,
+                processedSnapshotData: {
+                    appStateItems: InspectorListItemAppState[]
+                    browserVisibilityChanges: InspectorListBrowserVisibility[]
+                    consoleItems: InspectorListItemConsole[]
+                    contextItems: InspectorListItem[]
+                    doctorEvents: InspectorListItemDoctor[]
+                    offlineStatusChanges: InspectorListOfflineStatusChange[]
+                    rawConsoleLogs: RecordingConsoleLogV2[]
+                },
+                windowNumberForID: (windowId: number | undefined) => number | '?' | undefined,
+                sessionPlayerMetaData: null | import('~/types').SessionRecordingType,
+                segments: import('~/types').RecordingSegment[],
+                runtimeDoctorEvents: InspectorListItemDoctor[],
+                experimentVariantItems: InspectorListItemExperimentVariant[]
             ) => {
                 const items: InspectorListItem[] = []
 
@@ -1022,19 +1298,29 @@ export const playerInspectorLogic = kea<playerInspectorLogicType>([
                 s.logs,
             ],
             (
-                start,
-                performanceEvents,
-                processedSnapshotData,
-                eventsData,
-                matchingEvents,
-                windowNumberForID,
-                allContextItems,
-                commentItems,
-                notebookCommentItems,
-                sessionPlayerData,
-                miniFiltersByKey,
-                uuidToIndex,
-                logs
+                start: Dayjs | null,
+                performanceEvents: PerformanceEvent[],
+                processedSnapshotData: {
+                    appStateItems: InspectorListItemAppState[]
+                    browserVisibilityChanges: InspectorListBrowserVisibility[]
+                    consoleItems: InspectorListItemConsole[]
+                    contextItems: InspectorListItem[]
+                    doctorEvents: InspectorListItemDoctor[]
+                    offlineStatusChanges: InspectorListOfflineStatusChange[]
+                    rawConsoleLogs: RecordingConsoleLogV2[]
+                },
+                eventsData: RecordingEventType[] | null,
+                matchingEvents: MatchedRecordingEvent[] | null,
+                windowNumberForID: (windowId: number | undefined) => number | '?' | undefined,
+                allContextItems: InspectorListItem[],
+                commentItems: InspectorListItemComment[],
+                notebookCommentItems: InspectorListItemNotebookComment[],
+                sessionPlayerData: import('~/types').SessionPlayerData,
+                miniFiltersByKey: {
+                    [key: string]: import('scenes/session-recordings/player/inspector/miniFiltersLogic').SharedListMiniFilter
+                },
+                uuidToIndex: Record<string, number>,
+                logs: LogMessage[]
             ): {
                 items: InspectorListItem[]
                 itemsByMiniFilterKey: Record<MiniFilterKey, InspectorListItem[]>
@@ -1256,12 +1542,18 @@ export const playerInspectorLogic = kea<playerInspectorLogicType>([
                 s.hasEventsToDisplay,
             ],
             (
-                allItemsData,
-                miniFiltersByKey,
-                showOnlyMatching,
-                allowMatchingEventsFilter,
-                trackedWindow,
-                hasEventsToDisplay
+                allItemsData: {
+                    items: InspectorListItem[]
+                    itemsByMiniFilterKey: Record<MiniFilterKey, InspectorListItem[]>
+                    itemsByType: Record<FilterableInspectorListItemTypes | 'context', InspectorListItem[]>
+                },
+                miniFiltersByKey: {
+                    [key: string]: import('scenes/session-recordings/player/inspector/miniFiltersLogic').SharedListMiniFilter
+                },
+                showOnlyMatching: boolean,
+                allowMatchingEventsFilter: boolean,
+                trackedWindow: number | null,
+                hasEventsToDisplay: boolean
             ): InspectorListItem[] => {
                 const filteredItems = filterInspectorListItems({
                     allItems: allItemsData.items,
@@ -1287,12 +1579,18 @@ export const playerInspectorLogic = kea<playerInspectorLogicType>([
                 s.hasEventsToDisplay,
             ],
             (
-                allItemsData,
-                miniFiltersByKey,
-                showOnlyMatching,
-                allowMatchingEventsFilter,
-                trackedWindow,
-                hasEventsToDisplay
+                allItemsData: {
+                    items: InspectorListItem[]
+                    itemsByMiniFilterKey: Record<MiniFilterKey, InspectorListItem[]>
+                    itemsByType: Record<FilterableInspectorListItemTypes | 'context', InspectorListItem[]>
+                },
+                miniFiltersByKey: {
+                    [key: string]: import('scenes/session-recordings/player/inspector/miniFiltersLogic').SharedListMiniFilter
+                },
+                showOnlyMatching: boolean,
+                allowMatchingEventsFilter: boolean,
+                trackedWindow: number | null,
+                hasEventsToDisplay: boolean
             ): (InspectorListItemEvent | InspectorListItemComment | InspectorListItemExperimentVariant)[] => {
                 // Pre-filter to only events, comments and experiment variant markers, avoiding the full filterInspectorListItems call
                 const eventAndCommentItems: (
@@ -1445,17 +1743,19 @@ export const playerInspectorLogic = kea<playerInspectorLogicType>([
 
         isLoading: [
             (s) => [s.inspectorDataState],
-            (inspectorDataState): boolean => Object.values(inspectorDataState).some((state) => state === 'loading'),
+            (inspectorDataState: Record<FilterableInspectorListItemTypes, 'empty' | 'loading' | 'ready'>): boolean =>
+                Object.values(inspectorDataState).some((state) => state === 'loading'),
         ],
 
         isReady: [
             (s) => [s.inspectorDataState],
-            (inspectorDataState): boolean => Object.values(inspectorDataState).every((state) => state === 'ready'),
+            (inspectorDataState: Record<FilterableInspectorListItemTypes, 'empty' | 'loading' | 'ready'>): boolean =>
+                Object.values(inspectorDataState).every((state) => state === 'ready'),
         ],
 
         playbackIndicatorIndex: [
             (s) => [s.currentPlayerTime, s.items, s.displayGroups],
-            (playerTime, items, displayGroups): number => {
+            (playerTime: number, items: InspectorListItem[], displayGroups: DisplayGroup[]): number => {
                 if (!playerTime) {
                     return 0
                 }
@@ -1468,13 +1768,13 @@ export const playerInspectorLogic = kea<playerInspectorLogicType>([
 
         playbackIndicatorIndexStop: [
             (s) => [s.playbackIndicatorIndex, s.displayGroups],
-            (playbackIndicatorIndex, displayGroups): number =>
+            (playbackIndicatorIndex: number, displayGroups: DisplayGroup[]): number =>
                 (displayGroups.length + playbackIndicatorIndex) % displayGroups.length,
         ],
 
         fuse: [
             (s) => [s.filteredItems],
-            (filteredItems): Fuse =>
+            (filteredItems: InspectorListItem[]): Fuse =>
                 createFuse<InspectorListItem>(filteredItems, {
                     keys: ['search'],
                     findAllMatches: true,
@@ -1486,7 +1786,7 @@ export const playerInspectorLogic = kea<playerInspectorLogicType>([
 
         items: [
             (s) => [s.filteredItems, s.fuse, s.searchQuery],
-            (filteredItems, fuse, searchQuery): InspectorListItem[] => {
+            (filteredItems: InspectorListItem[], fuse: Fuse, searchQuery: string): InspectorListItem[] => {
                 if (searchQuery === '') {
                     return filteredItems
                 }
@@ -1497,7 +1797,11 @@ export const playerInspectorLogic = kea<playerInspectorLogicType>([
 
         displayGroups: [
             (s) => [s.items, s.groupRepeatedItems, s.collapseInspectorItems],
-            (items, groupRepeatedItems, collapseInspectorItems): DisplayGroup[] => {
+            (
+                items: InspectorListItem[],
+                groupRepeatedItems: boolean,
+                collapseInspectorItems: boolean
+            ): DisplayGroup[] => {
                 if (!collapseInspectorItems) {
                     return items.map((_, i) => ({ indices: [i] }))
                 }
@@ -1506,14 +1810,25 @@ export const playerInspectorLogic = kea<playerInspectorLogicType>([
             { resultEqualityCheck: equal },
         ],
 
-        allItemsList: [(s) => [s.allItems], (allItemsData): InspectorListItem[] => allItemsData.items],
+        allItemsList: [
+            (s) => [s.allItems],
+            (allItemsData: {
+                items: InspectorListItem[]
+                itemsByMiniFilterKey: Record<MiniFilterKey, InspectorListItem[]>
+                itemsByType: Record<FilterableInspectorListItemTypes | 'context', InspectorListItem[]>
+            }): InspectorListItem[] => allItemsData.items,
+        ],
 
         /**
          * All items by mini-filter key, not filtered items, so that we can count the unfiltered sets
          */
         allItemsByMiniFilterKey: [
             (s) => [s.allItems],
-            (allItemsData): Record<MiniFilterKey, InspectorListItem[]> => allItemsData.itemsByMiniFilterKey,
+            (allItemsData: {
+                items: InspectorListItem[]
+                itemsByMiniFilterKey: Record<MiniFilterKey, InspectorListItem[]>
+                itemsByType: Record<FilterableInspectorListItemTypes | 'context', InspectorListItem[]>
+            }): Record<MiniFilterKey, InspectorListItem[]> => allItemsData.itemsByMiniFilterKey,
         ],
 
         /**
@@ -1521,13 +1836,17 @@ export const playerInspectorLogic = kea<playerInspectorLogicType>([
          */
         allItemsByItemType: [
             (s) => [s.allItems],
-            (allItemsData): Record<FilterableInspectorListItemTypes | 'context', InspectorListItem[]> =>
-                allItemsData.itemsByType,
+            (allItemsData: {
+                items: InspectorListItem[]
+                itemsByMiniFilterKey: Record<MiniFilterKey, InspectorListItem[]>
+                itemsByType: Record<FilterableInspectorListItemTypes | 'context', InspectorListItem[]>
+            }): Record<FilterableInspectorListItemTypes | 'context', InspectorListItem[]> => allItemsData.itemsByType,
         ],
 
         hasEventsToDisplay: [
             (s) => [s.allItemsByItemType],
-            (allItemsByItemType): boolean => allItemsByItemType['events']?.length > 0,
+            (allItemsByItemType: Record<FilterableInspectorListItemTypes | 'context', InspectorListItem[]>): boolean =>
+                allItemsByItemType['events']?.length > 0,
         ],
     })),
     listeners(({ values, actions }) => ({
diff --git a/frontend/src/scenes/session-recordings/player/inspector/playerInspectorLogsLogic.ts b/frontend/src/scenes/session-recordings/player/inspector/playerInspectorLogsLogic.ts
index a2526e6e36bd..aa5514187bbe 100644
--- a/frontend/src/scenes/session-recordings/player/inspector/playerInspectorLogsLogic.ts
+++ b/frontend/src/scenes/session-recordings/player/inspector/playerInspectorLogsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -9,9 +9,9 @@ import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
 import { LogMessage, LogsQuery } from '~/queries/schema/schema-general'
 import { FilterLogicalOperator, PropertyFilterType, PropertyOperator } from '~/types'
 
+import type { FeatureFlagsSet } from '../../../../lib/logic/featureFlagLogic'
 import { sessionRecordingDataCoordinatorLogic } from '../sessionRecordingDataCoordinatorLogic'
 import { SessionRecordingPlayerLogicProps } from '../sessionRecordingPlayerLogic'
-import type { playerInspectorLogsLogicType } from './playerInspectorLogsLogicType'
 
 export const MAX_LOG_ENTRIES = 5000
 
@@ -50,6 +50,61 @@ export function buildSessionLogsQuery(
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface playerInspectorLogsLogicValues {
+    featureFlags: FeatureFlagsSet; // featureFlagLogic
+    end: Dayjs | null; // sessionRecordingDataCoordinatorLogic
+    start: Dayjs | null; // sessionRecordingDataCoordinatorLogic
+    logs: LogMessage[];
+    logsHasMore: boolean;
+    logsInitialLoadRequested: boolean;
+    logsLoadError: boolean;
+    logsLoading: boolean;
+    logsNextCursor: string | undefined;
+    readyToLoadLogs: boolean;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface playerInspectorLogsLogicActions {
+    loadLogs: () => any;
+    loadLogsFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadLogsSuccess: (logs: LogMessage[], payload?: any) => {
+        logs: LogMessage[];
+        payload?: any;
+    };
+    loadMoreLogs: () => any;
+    loadMoreLogsFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadMoreLogsSuccess: (logs: LogMessage[], payload?: any) => {
+        logs: LogMessage[];
+        payload?: any;
+    };
+    markLogsInitialLoadRequested: () => {
+        value: true;
+    };
+    setLogsHasMore: (hasMore: boolean) => {
+        hasMore: boolean;
+    };
+    setLogsNextCursor: (cursor: string | undefined) => {
+        cursor: string | undefined;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface playerInspectorLogsLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        readyToLoadLogs: (featureFlags: FeatureFlagsSet, start: Dayjs | null, end: Dayjs | null, arg: any) => boolean;
+    };
+}
+
+export type playerInspectorLogsLogicType = MakeLogicType<playerInspectorLogsLogicValues, playerInspectorLogsLogicActions, SessionRecordingPlayerLogicProps, playerInspectorLogsLogicMeta>;
+
 export const playerInspectorLogsLogic = kea<playerInspectorLogsLogicType>([
     path((key) => ['scenes', 'session-recordings', 'player', 'inspector', 'playerInspectorLogsLogic', key]),
     props({} as SessionRecordingPlayerLogicProps),
@@ -149,7 +204,12 @@ export const playerInspectorLogsLogic = kea<playerInspectorLogsLogicType>([
     selectors(() => ({
         readyToLoadLogs: [
             (s) => [s.featureFlags, s.start, s.end, (_, props) => props.sessionRecordingId],
-            (featureFlags, start, end, sessionRecordingId): boolean =>
+            (
+                featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet,
+                start: Dayjs | null,
+                end: Dayjs | null,
+                sessionRecordingId
+            ): boolean =>
                 !!featureFlags[FEATURE_FLAGS.SESSION_REPLAY_BACKEND_LOGS] && !!start && !!end && !!sessionRecordingId,
         ],
     })),
diff --git a/frontend/src/scenes/session-recordings/player/modal/sessionPlayerModalLogic.ts b/frontend/src/scenes/session-recordings/player/modal/sessionPlayerModalLogic.ts
index e33ca776b397..d493ec962a7d 100644
--- a/frontend/src/scenes/session-recordings/player/modal/sessionPlayerModalLogic.ts
+++ b/frontend/src/scenes/session-recordings/player/modal/sessionPlayerModalLogic.ts
@@ -1,10 +1,8 @@
-import { actions, kea, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers } from 'kea'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 
 import { SessionRecordingId, SessionRecordingType } from '~/types'
 
-import type { sessionPlayerModalLogicType } from './sessionPlayerModalLogicType'
-
 interface HashParams {
     sessionRecordingId?: SessionRecordingId
 }
@@ -13,6 +11,28 @@ interface QueryParams {
     timestamp?: number
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionPlayerModalLogicValues {
+    activeSessionRecording: Pick<SessionRecordingType, 'id' | 'matching_events'> | null
+    initialTimestamp: number | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionPlayerModalLogicActions {
+    closeSessionPlayer: () => {
+        value: true
+    }
+    openSessionPlayer: (
+        sessionRecording: Pick<SessionRecordingType, 'id' | 'matching_events'>,
+        initialTimestamp?: number | null
+    ) => {
+        initialTimestamp: number | null
+        sessionRecording: Pick<SessionRecordingType, 'id' | 'matching_events'>
+    }
+}
+
+export type sessionPlayerModalLogicType = MakeLogicType<sessionPlayerModalLogicValues, sessionPlayerModalLogicActions>
+
 export const sessionPlayerModalLogic = kea<sessionPlayerModalLogicType>([
     path(['scenes', 'session-recordings', 'sessionPlayerModalLogic']),
     actions({
diff --git a/frontend/src/scenes/session-recordings/player/player-meta/playerMetaLogic.tsx b/frontend/src/scenes/session-recordings/player/player-meta/playerMetaLogic.tsx
index 8a4842c22c97..8e9da03fc455 100644
--- a/frontend/src/scenes/session-recordings/player/player-meta/playerMetaLogic.tsx
+++ b/frontend/src/scenes/session-recordings/player/player-meta/playerMetaLogic.tsx
@@ -1,6 +1,6 @@
 import { aiSummaryMock } from './ai-summary.mock'
 
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import posthog from 'posthog-js'
 import React from 'react'
 
@@ -25,11 +25,18 @@ import {
 import { getCoreFilterDefinition, getFirstFilterTypeFor } from '~/taxonomy/helpers'
 import { PersonType, PropertyFilterType, SessionRecordingType } from '~/types'
 
+import type {
+    RecordingEventType,
+    RecordingSegment,
+    SessionPlayerData,
+    SessionRecordingPropertiesType,
+} from '../../../../types'
 import { sessionRecordingsListPropertiesLogic } from '../../playlist/sessionRecordingsListPropertiesLogic'
 import { SeekbarSegmentRange } from '../controller/SeekbarSegments'
+import type { MiniFilterKey } from '../inspector/miniFiltersLogic'
 import { playerInspectorLogic } from '../inspector/playerInspectorLogic'
 import type { InspectorListItemEvent } from '../inspector/playerInspectorLogic'
-import type { playerMetaLogicType } from './playerMetaLogicType'
+import type { InspectorListItem } from '../inspector/playerInspectorLogic'
 import { sessionRecordingPinnedPropertiesLogic } from './sessionRecordingPinnedPropertiesLogic'
 import { HARDCODED_DISPLAY_LABELS } from './sessionRecordingPinnedPropertiesLogic'
 import { sessionSummaryProgressLogic } from './sessionSummaryProgressLogic'
@@ -141,6 +148,152 @@ export function getPropertyDisplayInfo(
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface playerMetaLogicValues {
+    allItemsByMiniFilterKey: Record<MiniFilterKey, InspectorListItem[]>; // playerInspectorLogic
+    sessionEventsData: RecordingEventType[] | null; // sessionRecordingDataCoordinatorLogic
+    sessionPlayerData: SessionPlayerData; // sessionRecordingDataCoordinatorLogic
+    sessionPlayerMetaData: SessionRecordingType | null; // sessionRecordingDataCoordinatorLogic
+    trackedWindow: number | null; // sessionRecordingDataCoordinatorLogic
+    urls: {
+        timestamp: number;
+        url: string;
+    }[]; // sessionRecordingDataCoordinatorLogic
+    windowIds: number[]; // sessionRecordingDataCoordinatorLogic
+    pinnedProperties: string[]; // sessionRecordingPinnedPropertiesLogic
+    currentPlayerTime: number; // sessionRecordingPlayerLogic
+    currentSegment: RecordingSegment | null; // sessionRecordingPlayerLogic
+    currentTimestamp: number | undefined; // sessionRecordingPlayerLogic
+    currentURL: string | undefined; // sessionRecordingPlayerLogic
+    resolution: {
+        height: number;
+        width: number;
+    } | null; // sessionRecordingPlayerLogic
+    scale: number; // sessionRecordingPlayerLogic
+    recordingPropertiesById: Record<string, SessionRecordingPropertiesType[]>; // sessionRecordingsListPropertiesLogic
+    recordingPropertiesLoading: boolean; // sessionRecordingsListPropertiesLogic
+    errorBySessionId: Record<string, string | null>; // sessionSummaryProgressLogic
+    feedbackBySessionId: Record<string, boolean>; // sessionSummaryProgressLogic
+    loadingBySessionId: Record<string, boolean>; // sessionSummaryProgressLogic
+    progressBySessionId: Record<string, SummarizationProgress | null>; // sessionSummaryProgressLogic
+    retryStateBySessionId: Record<string, {
+        hasRetried: boolean;
+        maxStep: number;
+    }>; // sessionSummaryProgressLogic
+    summaryBySessionId: Record<string, SessionSummaryContent | null>; // sessionSummaryProgressLogic
+    summaryIdBySessionId: Record<string, string | null>; // sessionSummaryProgressLogic
+    allOverviewItems: OverviewItem[];
+    currentWindowIndex: number;
+    displayOverviewItems: OverviewItem[];
+    endTime: Dayjs | null;
+    isPropertyPopoverOpen: boolean;
+    lastPageviewEvent: RecordingEventType | null | undefined;
+    loading: boolean;
+    resolutionDisplay: string;
+    scaleDisplay: string;
+    sessionPerson: PersonType | null;
+    sessionSummary: SessionSummaryContent | null;
+    sessionSummaryError: string | null;
+    sessionSummaryHasRetried: boolean;
+    sessionSummaryId: string | null;
+    sessionSummaryLoading: boolean;
+    sessionSummarySegmentRanges: SeekbarSegmentRange[] | null;
+    showFeedbackSurvey: boolean;
+    snapshotAt: any;
+    startTime: Dayjs | null;
+    summarizationProgress: SummarizationProgress | null;
+    summaryDisabledReason: string | undefined;
+    summaryHasHadFeedback: boolean;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface playerMetaLogicActions {
+    loadRecordingMetaSuccess: (sessionPlayerMetaData: SessionRecordingType | null, payload?: {
+        value: true;
+    } | undefined) => {
+        payload?: {
+            value: true;
+        };
+        sessionPlayerMetaData: SessionRecordingType | null;
+    }; // sessionRecordingDataCoordinatorLogic
+    setTrackedWindow: (windowId: number | null) => {
+        windowId: number | null;
+    }; // sessionRecordingDataCoordinatorLogic
+    setPinnedProperties: (properties: string[]) => {
+        properties: string[];
+    }; // sessionRecordingPinnedPropertiesLogic
+    togglePropertyPin: (propertyKey: string) => {
+        propertyKey: string;
+    }; // sessionRecordingPinnedPropertiesLogic
+    loadPropertiesForSessionsSuccess: (recordingProperties: SessionRecordingPropertiesType[], payload?: {
+        sessions: SessionRecordingType[];
+    } | undefined) => {
+        payload?: {
+            sessions: SessionRecordingType[];
+        };
+        recordingProperties: SessionRecordingPropertiesType[];
+    }; // sessionRecordingsListPropertiesLogic
+    maybeLoadPropertiesForSessions: (sessions: SessionRecordingType[]) => {
+        sessions: SessionRecordingType[];
+    }; // sessionRecordingsListPropertiesLogic
+    markFeedbackGiven: (sessionId: string) => {
+        sessionId: string;
+    }; // sessionSummaryProgressLogic
+    setSummary: (sessionId: string, summary: SessionSummaryContent | null, summaryId?: string | null | undefined) => {
+        sessionId: string;
+        summary: SessionSummaryContent | null;
+        summaryId: string | null;
+    }; // sessionSummaryProgressLogic
+    startSummarization: (sessionId: string) => {
+        sessionId: string;
+    }; // sessionSummaryProgressLogic
+    sessionSummaryFeedback: (feedback: "bad" | "good") => {
+        feedback: "bad" | "good";
+    };
+    setIsPropertyPopoverOpen: (isOpen: boolean) => {
+        isOpen: boolean;
+    };
+    setShowFeedbackSurvey: (show: boolean) => {
+        show: boolean;
+    };
+    summarizeSession: () => {};
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface playerMetaLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        sessionSummary: (summaryBySessionId: Record<string, SessionSummaryContent | null>) => SessionSummaryContent | null;
+        sessionSummaryId: (summaryIdBySessionId: Record<string, string | null>) => string | null;
+        sessionSummaryLoading: (loadingBySessionId: Record<string, boolean>) => boolean;
+        summarizationProgress: (progressBySessionId: Record<string, SummarizationProgress | null>) => SummarizationProgress | null;
+        sessionSummaryError: (errorBySessionId: Record<string, string | null>) => string | null;
+        sessionSummaryHasRetried: (retryStateBySessionId: Record<string, {
+            hasRetried: boolean;
+            maxStep: number;
+        }>) => boolean;
+        summaryHasHadFeedback: (feedbackBySessionId: Record<string, boolean>) => boolean;
+        summaryDisabledReason: (allItemsByMiniFilterKey: Record<string, InspectorListItem[]>, sessionPlayerData: SessionPlayerData) => string | undefined;
+        loading: (sessionPlayerMetaData: SessionRecordingType | null, recordingPropertiesById: Record<string, SessionRecordingPropertiesType[]>) => boolean;
+        sessionPerson: (sessionPlayerData: SessionPlayerData) => PersonType | null;
+        resolutionDisplay: (resolution: {
+            height: number;
+            width: number;
+        } | null) => string;
+        scaleDisplay: (scale: number) => string;
+        startTime: (sessionPlayerData: SessionPlayerData) => Dayjs | null;
+        endTime: (sessionPlayerData: SessionPlayerData) => Dayjs | null;
+        snapshotAt: (startTime: Dayjs | null) => any;
+        currentWindowIndex: (currentSegment: null | import("@common/replay-shared/src").RecordingSegment) => number;
+        lastPageviewEvent: (sessionEventsData: RecordingEventType[] | null, currentPlayerTime: number) => RecordingEventType | null | undefined;
+        allOverviewItems: (sessionPlayerMetaData: SessionRecordingType | null, startTime: Dayjs | null, recordingPropertiesById: Record<string, SessionRecordingPropertiesType[]>, pinnedProperties: string[]) => OverviewItem[];
+        displayOverviewItems: (allOverviewItems: OverviewItem[], pinnedProperties: string[]) => OverviewItem[];
+        sessionSummarySegmentRanges: (sessionSummary: SessionSummaryContent | null) => SeekbarSegmentRange[] | null;
+    };
+}
+
+export type playerMetaLogicType = MakeLogicType<playerMetaLogicValues, playerMetaLogicActions, SessionRecordingPlayerLogicProps, playerMetaLogicMeta>;
+
 export const playerMetaLogic = kea<playerMetaLogicType>([
     path((key) => ['scenes', 'session-recordings', 'player', 'playerMetaLogic', key]),
     props({} as SessionRecordingPlayerLogicProps),
@@ -202,36 +355,53 @@ export const playerMetaLogic = kea<playerMetaLogicType>([
     selectors(({ props }) => ({
         sessionSummary: [
             (s) => [s.summaryBySessionId],
-            (summaryBySessionId): SessionSummaryContent | null => summaryBySessionId[props.sessionRecordingId] ?? null,
+            (summaryBySessionId: Record<string, SessionSummaryContent | null>): SessionSummaryContent | null =>
+                summaryBySessionId[props.sessionRecordingId] ?? null,
         ],
         sessionSummaryId: [
             (s) => [s.summaryIdBySessionId],
-            (summaryIdBySessionId): string | null => summaryIdBySessionId[props.sessionRecordingId] ?? null,
+            (summaryIdBySessionId: Record<string, string | null>): string | null =>
+                summaryIdBySessionId[props.sessionRecordingId] ?? null,
         ],
         sessionSummaryLoading: [
             (s) => [s.loadingBySessionId],
-            (loadingBySessionId): boolean => !!loadingBySessionId[props.sessionRecordingId],
+            (loadingBySessionId: Record<string, boolean>): boolean => !!loadingBySessionId[props.sessionRecordingId],
         ],
         summarizationProgress: [
             (s) => [s.progressBySessionId],
-            (progressBySessionId): SummarizationProgress | null =>
+            (progressBySessionId: Record<string, SummarizationProgress | null>): SummarizationProgress | null =>
                 progressBySessionId[props.sessionRecordingId] ?? null,
         ],
         sessionSummaryError: [
             (s) => [s.errorBySessionId],
-            (errorBySessionId): string | null => errorBySessionId[props.sessionRecordingId] ?? null,
+            (errorBySessionId: Record<string, string | null>): string | null =>
+                errorBySessionId[props.sessionRecordingId] ?? null,
         ],
         sessionSummaryHasRetried: [
             (s) => [s.retryStateBySessionId],
-            (retryStateBySessionId): boolean => !!retryStateBySessionId[props.sessionRecordingId]?.hasRetried,
+            (
+                retryStateBySessionId: Record<
+                    string,
+                    {
+                        hasRetried: boolean
+                        maxStep: number
+                    }
+                >
+            ): boolean => !!retryStateBySessionId[props.sessionRecordingId]?.hasRetried,
         ],
         summaryHasHadFeedback: [
             (s) => [s.feedbackBySessionId],
-            (feedbackBySessionId): boolean => !!feedbackBySessionId[props.sessionRecordingId],
+            (feedbackBySessionId: Record<string, boolean>): boolean => !!feedbackBySessionId[props.sessionRecordingId],
         ],
         summaryDisabledReason: [
             (s) => [s.allItemsByMiniFilterKey, s.sessionPlayerData],
-            (allItemsByMiniFilterKey, sessionPlayerData): string | undefined => {
+            (
+                allItemsByMiniFilterKey: Record<
+                    import('../inspector/miniFiltersLogic').MiniFilterKey,
+                    import('../inspector/playerInspectorLogic').InspectorListItem[]
+                >,
+                sessionPlayerData: import('~/types').SessionPlayerData
+            ): string | undefined => {
                 const eventItems = SUMMARY_EVENT_MINI_FILTER_KEYS.flatMap(
                     (key) => allItemsByMiniFilterKey[key] ?? []
                 ).filter((item): item is InspectorListItemEvent => item.type === 'events')
@@ -245,7 +415,10 @@ export const playerMetaLogic = kea<playerMetaLogicType>([
         ],
         loading: [
             (s) => [s.sessionPlayerMetaData, s.recordingPropertiesById],
-            (sessionPlayerMetaData, recordingPropertiesById) => {
+            (
+                sessionPlayerMetaData: SessionRecordingType | null,
+                recordingPropertiesById: Record<string, import('~/types').SessionRecordingPropertiesType[]>
+            ) => {
                 const hasSessionPlayerMetadata = !!sessionPlayerMetaData && !isEmptyObject(sessionPlayerMetaData)
                 const hasRecordingProperties = !!recordingPropertiesById && !isEmptyObject(recordingPropertiesById)
                 return !hasSessionPlayerMetadata || !hasRecordingProperties
@@ -253,37 +426,42 @@ export const playerMetaLogic = kea<playerMetaLogicType>([
         ],
         sessionPerson: [
             (s) => [s.sessionPlayerData],
-            (playerData): PersonType | null => {
+            (playerData: import('~/types').SessionPlayerData): PersonType | null => {
                 return playerData?.person ?? null
             },
         ],
         resolutionDisplay: [
             (s) => [s.resolution],
-            (resolution) => {
+            (
+                resolution: {
+                    height: number
+                    width: number
+                } | null
+            ) => {
                 return `${resolution?.width || '--'} x ${resolution?.height || '--'}`
             },
         ],
         scaleDisplay: [
             (s) => [s.scale],
-            (scale) => {
+            (scale: number) => {
                 return `${percentage(scale, 1, true)}`
             },
         ],
         startTime: [
             (s) => [s.sessionPlayerData],
-            (sessionPlayerData) => {
+            (sessionPlayerData: import('~/types').SessionPlayerData) => {
                 return sessionPlayerData.start ?? null
             },
         ],
         endTime: [
             (s) => [s.sessionPlayerData],
-            (sessionPlayerData) => {
+            (sessionPlayerData: import('~/types').SessionPlayerData) => {
                 return sessionPlayerData.end ?? null
             },
         ],
         snapshotAt: [
             (s) => [s.startTime],
-            (startTime) => {
+            (startTime: Dayjs | null) => {
                 return startTime
                     ? ((startTime as any).toISOString?.() ??
                           (typeof startTime === 'string' ? startTime : String(startTime)))
@@ -292,14 +470,14 @@ export const playerMetaLogic = kea<playerMetaLogicType>([
         ],
         currentWindowIndex: [
             (s) => [s.currentSegment],
-            (currentSegment) => {
+            (currentSegment: null | import('~/types').RecordingSegment) => {
                 // windowId is already 1-indexed from the registry
                 return currentSegment?.windowId ?? 1
             },
         ],
         lastPageviewEvent: [
             (s) => [s.sessionEventsData, s.currentPlayerTime],
-            (sessionEventsData, currentPlayerTime) => {
+            (sessionEventsData: import('~/types').RecordingEventType[] | null, currentPlayerTime: number) => {
                 const playerTimeClosestSecond = ceilMsToClosestSecond(currentPlayerTime ?? 0)
 
                 if (!sessionEventsData?.length) {
@@ -446,7 +624,7 @@ export const playerMetaLogic = kea<playerMetaLogicType>([
         ],
         displayOverviewItems: [
             (s) => [s.allOverviewItems, s.pinnedProperties],
-            (allOverviewItems, pinnedProperties) => {
+            (allOverviewItems: OverviewItem[], pinnedProperties: string[]) => {
                 // Filter to show only pinned properties and sort by pinned order
                 const pinnedItems = allOverviewItems.filter((item) => {
                     const key = item.type === 'property' ? item.property : item.label
diff --git a/frontend/src/scenes/session-recordings/player/player-meta/sessionRecordingExperimentContextLogic.ts b/frontend/src/scenes/session-recordings/player/player-meta/sessionRecordingExperimentContextLogic.ts
index 6f45fac73673..c6b423d6ef69 100644
--- a/frontend/src/scenes/session-recordings/player/player-meta/sessionRecordingExperimentContextLogic.ts
+++ b/frontend/src/scenes/session-recordings/player/player-meta/sessionRecordingExperimentContextLogic.ts
@@ -1,4 +1,4 @@
-import { afterMount, connect, kea, key, path, props, selectors } from 'kea'
+import { MakeLogicType, afterMount, connect, kea, key, path, props, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { subscriptions } from 'kea-subscriptions'
 
@@ -12,12 +12,63 @@ import type {
     ExperimentSessionContextResponseApi,
 } from 'products/experiments/frontend/generated/api.schemas'
 
-import type { sessionRecordingExperimentContextLogicType } from './sessionRecordingExperimentContextLogicType'
+import type { FeatureFlagsSet } from '../../../../lib/logic/featureFlagLogic'
 
 export interface SessionRecordingExperimentContextLogicProps {
     sessionRecordingId: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingExperimentContextLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    currentProjectId: number | string // teamLogic
+    experimentContext: ExperimentSessionContextResponseApi | null
+    experimentContextEnabled: boolean
+    experimentContextLoading: boolean
+    experimentItems: ExperimentSessionContextItemApi[]
+    hasExperimentContext: boolean
+    hasMultipleVariantWarning: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingExperimentContextLogicActions {
+    loadExperimentContext: () => any
+    loadExperimentContextFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadExperimentContextSuccess: (
+        experimentContext: ExperimentSessionContextResponseApi | null,
+        payload?: any
+    ) => {
+        experimentContext: ExperimentSessionContextResponseApi | null
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingExperimentContextLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        experimentContextEnabled: (featureFlags: FeatureFlagsSet, arg: any) => boolean
+        experimentItems: (
+            experimentContext: ExperimentSessionContextResponseApi | null
+        ) => ExperimentSessionContextItemApi[]
+        hasExperimentContext: (experimentItems: ExperimentSessionContextItemApi[]) => boolean
+        hasMultipleVariantWarning: (experimentItems: ExperimentSessionContextItemApi[]) => boolean
+    }
+}
+
+export type sessionRecordingExperimentContextLogicType = MakeLogicType<
+    sessionRecordingExperimentContextLogicValues,
+    sessionRecordingExperimentContextLogicActions,
+    SessionRecordingExperimentContextLogicProps,
+    sessionRecordingExperimentContextLogicMeta
+>
+
 export const sessionRecordingExperimentContextLogic = kea<sessionRecordingExperimentContextLogicType>([
     path((key) => [
         'scenes',
@@ -55,17 +106,22 @@ export const sessionRecordingExperimentContextLogic = kea<sessionRecordingExperi
     selectors({
         experimentContextEnabled: [
             (s) => [s.featureFlags, (_, props) => props.sessionRecordingId],
-            (featureFlags, sessionRecordingId): boolean =>
+            (featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet, sessionRecordingId): boolean =>
                 !!featureFlags[FEATURE_FLAGS.REPLAY_EXPERIMENT_CONTEXT] && !!sessionRecordingId,
         ],
         experimentItems: [
             (s) => [s.experimentContext],
-            (experimentContext): ExperimentSessionContextItemApi[] => experimentContext?.results ?? [],
+            (experimentContext: ExperimentSessionContextResponseApi | null): ExperimentSessionContextItemApi[] =>
+                experimentContext?.results ?? [],
+        ],
+        hasExperimentContext: [
+            (s) => [s.experimentItems],
+            (experimentItems: ExperimentSessionContextItemApi[]): boolean => experimentItems.length > 0,
         ],
-        hasExperimentContext: [(s) => [s.experimentItems], (experimentItems): boolean => experimentItems.length > 0],
         hasMultipleVariantWarning: [
             (s) => [s.experimentItems],
-            (experimentItems): boolean => experimentItems.some((item) => item.multiple_variants),
+            (experimentItems: ExperimentSessionContextItemApi[]): boolean =>
+                experimentItems.some((item) => item.multiple_variants),
         ],
     }),
     // Feature flags can arrive after the player mounts (posthog-js loads them asynchronously),
diff --git a/frontend/src/scenes/session-recordings/player/player-meta/sessionRecordingPinnedPropertiesLogic.ts b/frontend/src/scenes/session-recordings/player/player-meta/sessionRecordingPinnedPropertiesLogic.ts
index 27bc37b3aa14..724af795f7c5 100644
--- a/frontend/src/scenes/session-recordings/player/player-meta/sessionRecordingPinnedPropertiesLogic.ts
+++ b/frontend/src/scenes/session-recordings/player/player-meta/sessionRecordingPinnedPropertiesLogic.ts
@@ -1,9 +1,27 @@
-import { actions, kea, listeners, path, reducers } from 'kea'
-
-import type { sessionRecordingPinnedPropertiesLogicType } from './sessionRecordingPinnedPropertiesLogicType'
+import { MakeLogicType, actions, kea, listeners, path, reducers } from 'kea'
 
 export const HARDCODED_DISPLAY_LABELS = ['Start', 'Duration', 'TTL', 'Clicks', 'Errors', 'Key presses'] as const
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingPinnedPropertiesLogicValues {
+    pinnedProperties: string[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingPinnedPropertiesLogicActions {
+    setPinnedProperties: (properties: string[]) => {
+        properties: string[]
+    }
+    togglePropertyPin: (propertyKey: string) => {
+        propertyKey: string
+    }
+}
+
+export type sessionRecordingPinnedPropertiesLogicType = MakeLogicType<
+    sessionRecordingPinnedPropertiesLogicValues,
+    sessionRecordingPinnedPropertiesLogicActions
+>
+
 export const sessionRecordingPinnedPropertiesLogic = kea<sessionRecordingPinnedPropertiesLogicType>([
     path(['scenes', 'session-recordings', 'player', 'playerMetaLogic', 'sessionRecordingPinnedPropertiesLogic']),
     actions({
diff --git a/frontend/src/scenes/session-recordings/player/player-meta/sessionSummaryProgressLogic.ts b/frontend/src/scenes/session-recordings/player/player-meta/sessionSummaryProgressLogic.ts
index a369cdf31f59..c919c548c46a 100644
--- a/frontend/src/scenes/session-recordings/player/player-meta/sessionSummaryProgressLogic.ts
+++ b/frontend/src/scenes/session-recordings/player/player-meta/sessionSummaryProgressLogic.ts
@@ -1,5 +1,5 @@
 import { createParser } from 'eventsource-parser'
-import { actions, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers } from 'kea'
 import posthog from 'posthog-js'
 
 import api, { ApiError } from 'lib/api'
@@ -7,7 +7,6 @@ import { lemonToast } from 'lib/lemon-ui/LemonToast'
 
 import { SessionRecordingType } from '~/types'
 
-import type { sessionSummaryProgressLogicType } from './sessionSummaryProgressLogicType'
 import { SessionSummaryContent, SummarizationProgress } from './types'
 
 // Give up waiting after 10 minutes. The workflow may still complete later; if
@@ -31,6 +30,80 @@ const abortControllersBySessionId = new Map<string, AbortController>()
 // cancel falls back to the default attach-to-existing behavior.
 const cancelledSessionIds = new Set<string>()
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionSummaryProgressLogicValues {
+    autoExpandSummary: boolean
+    errorBySessionId: Record<string, string | null>
+    feedbackBySessionId: Record<string, boolean>
+    loadingBySessionId: Record<string, boolean>
+    openBySessionId: Record<string, boolean>
+    progressBySessionId: Record<string, SummarizationProgress | null>
+    retryStateBySessionId: Record<
+        string,
+        {
+            hasRetried: boolean
+            maxStep: number
+        }
+    >
+    summaryBySessionId: Record<string, SessionSummaryContent | null>
+    summaryIdBySessionId: Record<string, string | null>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionSummaryProgressLogicActions {
+    cancelSummarization: (sessionId: SessionRecordingType['id']) => {
+        sessionId: string
+    }
+    markFeedbackGiven: (sessionId: string) => {
+        sessionId: string
+    }
+    setError: (
+        sessionId: string,
+        error: string | null
+    ) => {
+        error: string | null
+        sessionId: string
+    }
+    setLoading: (
+        sessionId: string,
+        loading: boolean
+    ) => {
+        loading: boolean
+        sessionId: string
+    }
+    setProgress: (
+        sessionId: string,
+        progress: SummarizationProgress | null
+    ) => {
+        progress: SummarizationProgress | null
+        sessionId: string
+    }
+    setSummary: (
+        sessionId: string,
+        summary: SessionSummaryContent | null,
+        summaryId?: string | null
+    ) => {
+        sessionId: string
+        summary: SessionSummaryContent | null
+        summaryId: string | null
+    }
+    setSummaryOpen: (
+        sessionId: string,
+        open: boolean
+    ) => {
+        open: boolean
+        sessionId: string
+    }
+    startSummarization: (sessionId: SessionRecordingType['id']) => {
+        sessionId: string
+    }
+}
+
+export type sessionSummaryProgressLogicType = MakeLogicType<
+    sessionSummaryProgressLogicValues,
+    sessionSummaryProgressLogicActions
+>
+
 /**
  * Singleton store for in-flight session summarization state, keyed by session id.
  *
diff --git a/frontend/src/scenes/session-recordings/player/playerSettingsLogic.ts b/frontend/src/scenes/session-recordings/player/playerSettingsLogic.ts
index 726826d83adc..0782746c7ee1 100644
--- a/frontend/src/scenes/session-recordings/player/playerSettingsLogic.ts
+++ b/frontend/src/scenes/session-recordings/player/playerSettingsLogic.ts
@@ -1,12 +1,10 @@
-import { actions, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers, selectors } from 'kea'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 import { subscriptions } from 'kea-subscriptions'
 import posthog from 'posthog-js'
 
 import { AutoplayDirection, SessionRecordingSidebarStacking } from '~/types'
 
-import type { playerSettingsLogicType } from './playerSettingsLogicType'
-
 export enum TimestampFormat {
     Relative = 'relative',
     UTC = 'utc',
@@ -15,6 +13,90 @@ export enum TimestampFormat {
 
 export type HideViewedRecordingsOptions = 'current-user' | 'any-user' | false
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface playerSettingsLogicValues {
+    autoplayDirection: AutoplayDirection
+    hideRecordingsMenuLabelFor: (
+        option: HideViewedRecordingsOptions
+    ) => 'Hide all viewed recordings' | 'Hide my viewed recordings' | 'Viewed and unviewed recordings'
+    hideViewedRecordings: HideViewedRecordingsOptions
+    isPlaylistCollapsed: boolean
+    isVerticallyStacked: boolean
+    playerControlsOverlay: boolean
+    playlistOpen: boolean
+    playlistTimestampFormat: TimestampFormat
+    preferredSidebarStacking: SessionRecordingSidebarStacking
+    showFilters: boolean
+    showMetadataFooter: boolean
+    sidebarOpen: boolean
+    skipInactivitySetting: boolean
+    speed: number
+    timestampFormat: TimestampFormat
+    urlOverrideSidebarOpen: boolean | null
+    userPreferenceSidebarOpen: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface playerSettingsLogicActions {
+    setAutoplayDirection: (autoplayDirection: AutoplayDirection) => {
+        autoplayDirection: AutoplayDirection
+    }
+    setHideViewedRecordings: (hideViewedRecordings: HideViewedRecordingsOptions) => {
+        hideViewedRecordings: HideViewedRecordingsOptions
+    }
+    setPlayerControlsOverlay: (playerControlsOverlay: boolean) => {
+        playerControlsOverlay: boolean
+    }
+    setPlaylistCollapsed: (collapsed: boolean) => {
+        collapsed: boolean
+    }
+    setPlaylistOpen: (open: boolean) => {
+        open: boolean
+    }
+    setPlaylistTimestampFormat: (format: TimestampFormat) => {
+        format: TimestampFormat
+    }
+    setPreferredSidebarStacking: (stacking: SessionRecordingSidebarStacking) => {
+        stacking: SessionRecordingSidebarStacking
+    }
+    setShowFilters: (showFilters: boolean) => {
+        showFilters: boolean
+    }
+    setShowMetadataFooter: (showMetadataFooter: boolean) => {
+        showMetadataFooter: boolean
+    }
+    setSidebarOpen: (open: boolean) => {
+        open: boolean
+    }
+    setSkipInactivitySetting: (skipInactivitySetting: boolean) => {
+        skipInactivitySetting: boolean
+    }
+    setSpeed: (speed: number) => {
+        speed: number
+    }
+    setTimestampFormat: (format: TimestampFormat) => {
+        format: TimestampFormat
+    }
+    setURLOverrideSidebarOpen: (open: boolean) => {
+        open: boolean
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface playerSettingsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        sidebarOpen: (userPreferenceSidebarOpen: boolean, urlOverrideSidebarOpen: boolean | null) => boolean
+        isVerticallyStacked: (preferredSidebarStacking: SessionRecordingSidebarStacking) => boolean
+    }
+}
+
+export type playerSettingsLogicType = MakeLogicType<
+    playerSettingsLogicValues,
+    playerSettingsLogicActions,
+    Record<string, any>,
+    playerSettingsLogicMeta
+>
+
 // This logic contains player settings that should persist across players
 // If key is not specified, it is global so it does not reset when recordings change in the main recordings page
 export const playerSettingsLogic = kea<playerSettingsLogicType>([
@@ -122,7 +204,7 @@ export const playerSettingsLogic = kea<playerSettingsLogicType>([
     selectors({
         sidebarOpen: [
             (s) => [s.userPreferenceSidebarOpen, s.urlOverrideSidebarOpen],
-            (userPreferenceSidebarOpen, urlOverrideSidebarOpen): boolean => {
+            (userPreferenceSidebarOpen: boolean, urlOverrideSidebarOpen: boolean | null): boolean => {
                 if (urlOverrideSidebarOpen !== null) {
                     return urlOverrideSidebarOpen
                 }
@@ -131,7 +213,8 @@ export const playerSettingsLogic = kea<playerSettingsLogicType>([
         ],
         isVerticallyStacked: [
             (s) => [s.preferredSidebarStacking],
-            (preferredSidebarStacking) => preferredSidebarStacking === SessionRecordingSidebarStacking.Vertical,
+            (preferredSidebarStacking: SessionRecordingSidebarStacking) =>
+                preferredSidebarStacking === SessionRecordingSidebarStacking.Vertical,
         ],
         hideRecordingsMenuLabelFor: [
             () => [],
diff --git a/frontend/src/scenes/session-recordings/player/playlist-popover/playlistPopoverLogic.ts b/frontend/src/scenes/session-recordings/player/playlist-popover/playlistPopoverLogic.ts
index 1568beace829..8379ba3689f5 100644
--- a/frontend/src/scenes/session-recordings/player/playlist-popover/playlistPopoverLogic.ts
+++ b/frontend/src/scenes/session-recordings/player/playlist-popover/playlistPopoverLogic.ts
@@ -1,5 +1,6 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { lazyLoaders, loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -14,7 +15,222 @@ import { sessionRecordingEventUsageLogic } from 'scenes/session-recordings/sessi
 
 import { SessionRecordingPlaylistType } from '~/types'
 
-import type { playlistPopoverLogicType } from './playlistPopoverLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface playlistPopoverLogicValues {
+    allPlaylists: {
+        playlist: SessionRecordingPlaylistType
+        selected: boolean
+    }[]
+    currentPlaylists: SessionRecordingPlaylistType[]
+    currentPlaylistsLoading: boolean
+    isNewPlaylistSubmitting: boolean
+    isNewPlaylistValid: boolean
+    modifyingPlaylist: SessionRecordingPlaylistType | null
+    newFormShowing: boolean
+    newPlaylist: {
+        name: string
+    }
+    newPlaylistAllErrors: Record<string, any>
+    newPlaylistChanged: boolean
+    newPlaylistErrors: DeepPartialMap<
+        {
+            name: string
+        },
+        ValidationErrorType
+    >
+    newPlaylistHasErrors: boolean
+    newPlaylistManualErrors: Record<string, any>
+    newPlaylistTouched: boolean
+    newPlaylistTouches: Record<string, boolean>
+    newPlaylistValidationErrors: DeepPartialMap<
+        {
+            name: string
+        },
+        ValidationErrorType
+    >
+    pinnedCount: number
+    playlists: SessionRecordingPlaylistType[]
+    playlistsLoading: boolean
+    searchQuery: string
+    showNewPlaylistErrors: boolean
+    showPlaylistPopover: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface playlistPopoverLogicActions {
+    reportRecordingPinnedToList: (pinned: boolean) => {
+        pinned: boolean
+    } // sessionRecordingEventUsageLogic
+    reportRecordingPlaylistCreated: (source: 'duplicate' | 'filters' | 'new' | 'pin') => {
+        source: 'duplicate' | 'filters' | 'new' | 'pin'
+    } // sessionRecordingEventUsageLogic
+    setPause: () => {
+        value: true
+    } // sessionRecordingPlayerLogic
+    addToPlaylist: (playlist: SessionRecordingPlaylistType) => {
+        playlist: SessionRecordingPlaylistType
+    }
+    addToPlaylistFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    addToPlaylistSuccess: (
+        currentPlaylists: SessionRecordingPlaylistType[],
+        payload?: {
+            playlist: SessionRecordingPlaylistType
+        }
+    ) => {
+        currentPlaylists: SessionRecordingPlaylistType[]
+        payload?: {
+            playlist: SessionRecordingPlaylistType
+        }
+    }
+    loadPlaylists: () => {
+        value: true
+    }
+    loadPlaylistsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPlaylistsForRecording: () => {
+        value: true
+    }
+    loadPlaylistsForRecordingFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPlaylistsForRecordingSuccess: (
+        currentPlaylists: SessionRecordingPlaylistType[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        currentPlaylists: SessionRecordingPlaylistType[]
+        payload?: {
+            value: true
+        }
+    }
+    loadPlaylistsSuccess: (
+        playlists: SessionRecordingPlaylistType[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        playlists: SessionRecordingPlaylistType[]
+        payload?: {
+            value: true
+        }
+    }
+    removeFromPlaylist: (playlist: SessionRecordingPlaylistType) => {
+        playlist: SessionRecordingPlaylistType
+    }
+    removeFromPlaylistFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    removeFromPlaylistSuccess: (
+        currentPlaylists: SessionRecordingPlaylistType[],
+        payload?: {
+            playlist: SessionRecordingPlaylistType
+        }
+    ) => {
+        currentPlaylists: SessionRecordingPlaylistType[]
+        payload?: {
+            playlist: SessionRecordingPlaylistType
+        }
+    }
+    resetNewPlaylist: (values?: { name: string }) => {
+        values?: {
+            name: string
+        }
+    }
+    setNewFormShowing: (show: boolean) => {
+        show: boolean
+    }
+    setNewPlaylistManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setNewPlaylistValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setNewPlaylistValues: (
+        values: DeepPartial<{
+            name: string
+        }>
+    ) => {
+        values: DeepPartial<{
+            name: string
+        }>
+    }
+    setSearchQuery: (query: string) => {
+        query: string
+    }
+    setShowPlaylistPopover: (show: boolean) => {
+        show: boolean
+    }
+    submitNewPlaylist: () => {
+        value: boolean
+    }
+    submitNewPlaylistFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitNewPlaylistRequest: (newPlaylist: { name: string }) => {
+        newPlaylist: {
+            name: string
+        }
+    }
+    submitNewPlaylistSuccess: (newPlaylist: { name: string }) => {
+        newPlaylist: {
+            name: string
+        }
+    }
+    touchNewPlaylistField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface playlistPopoverLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        allPlaylists: (
+            playlists: SessionRecordingPlaylistType[],
+            currentPlaylists: SessionRecordingPlaylistType[],
+            searchQuery: string
+        ) => {
+            playlist: SessionRecordingPlaylistType
+            selected: boolean
+        }[]
+        pinnedCount: (currentPlaylists: SessionRecordingPlaylistType[]) => number
+    }
+}
+
+export type playlistPopoverLogicType = MakeLogicType<
+    playlistPopoverLogicValues,
+    playlistPopoverLogicActions,
+    SessionRecordingPlayerLogicProps,
+    playlistPopoverLogicMeta
+>
 
 export const playlistPopoverLogic = kea<playlistPopoverLogicType>([
     path((key) => ['scenes', 'session-recordings', 'player', 'playlist-popover', 'playlistPopoverLogic', key]),
@@ -148,7 +364,11 @@ export const playlistPopoverLogic = kea<playlistPopoverLogicType>([
     selectors(() => ({
         allPlaylists: [
             (s) => [s.playlists, s.currentPlaylists, s.searchQuery],
-            (playlists, currentPlaylists, searchQuery) => {
+            (
+                playlists: SessionRecordingPlaylistType[],
+                currentPlaylists: SessionRecordingPlaylistType[],
+                searchQuery: string
+            ) => {
                 const nonSyntheticPlaylists = playlists.filter((x) => !x.is_synthetic)
                 const nonSyntheticCurrentPlaylists = currentPlaylists.filter((x) => !x.is_synthetic)
 
@@ -179,7 +399,8 @@ export const playlistPopoverLogic = kea<playlistPopoverLogicType>([
         ],
         pinnedCount: [
             (s) => [s.currentPlaylists],
-            (currentPlaylists) => currentPlaylists.filter((x) => !x.is_synthetic).length,
+            (currentPlaylists: SessionRecordingPlaylistType[]) =>
+                currentPlaylists.filter((x) => !x.is_synthetic).length,
         ],
     })),
 
diff --git a/frontend/src/scenes/session-recordings/player/sessionEventsDataLogic.ts b/frontend/src/scenes/session-recordings/player/sessionEventsDataLogic.ts
index 49ea838cfa5f..f18640699cb7 100644
--- a/frontend/src/scenes/session-recordings/player/sessionEventsDataLogic.ts
+++ b/frontend/src/scenes/session-recordings/player/sessionEventsDataLogic.ts
@@ -1,5 +1,5 @@
 import { deepEqual as equal } from 'fast-equals'
-import { actions, beforeUnmount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, beforeUnmount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { subscriptions } from 'kea-subscriptions'
 import posthog from 'posthog-js'
@@ -16,12 +16,97 @@ import { primaryEventPropertiesModel } from '~/models/primaryEventPropertiesMode
 import { HogQLQueryString, hogql } from '~/queries/utils'
 import { RecordingEventType } from '~/types'
 
-import type { sessionEventsDataLogicType } from './sessionEventsDataLogicType'
 import { SessionRecordingMetaLogicProps, sessionRecordingMetaLogic } from './sessionRecordingMetaLogic'
+import type { SessionRecordingType } from '../../../types'
 
 const TWENTY_FOUR_HOURS_IN_MS = 24 * 60 * 60 * 1000 // +- before and after start and end of a recording to query for session linked events.
 const FIVE_MINUTES_IN_MS = 5 * 60 * 1000 // +- before and after start and end of a recording to query for events related by person.
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionEventsDataLogicValues {
+    sessionPlayerMetaData: SessionRecordingType | null; // metaLogic
+    primaryProperties: Record<string, string>; // primaryEventPropertiesModel
+    AIEvents: RecordingEventType[];
+    eventViewportsItems: TimeTree<{
+        payload: ViewportResolution;
+        timestamp: Dayjs;
+    }>;
+    eventsWithPrimaryProperty: RecordingEventType[];
+    exceptionEvents: RecordingEventType[];
+    preloadableEvents: RecordingEventType[];
+    sessionEventsData: RecordingEventType[] | null;
+    sessionEventsDataLoading: boolean;
+    viewportForTimestamp: (timestamp: number) => ViewportResolution | undefined;
+    webVitalsEvents: RecordingEventType[];
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionEventsDataLogicActions {
+    loadRecordingMetaSuccess: (sessionPlayerMetaData: SessionRecordingType | null, payload?: {
+        value: true;
+    } | undefined) => {
+        payload?: {
+            value: true;
+        };
+        sessionPlayerMetaData: SessionRecordingType | null;
+    }; // metaLogic
+    ensureLoadedForEvents: (eventNames: string[]) => {
+        eventNames: string[];
+    }; // primaryEventPropertiesModel
+    loadEvents: () => {
+        value: true;
+    };
+    loadEventsFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadEventsSuccess: (sessionEventsData: RecordingEventType[] | null, payload?: {
+        value: true;
+    }) => {
+        sessionEventsData: RecordingEventType[] | null;
+        payload?: {
+            value: true;
+        };
+    };
+    loadFullEventData: (event: RecordingEventType | RecordingEventType[]) => {
+        event: RecordingEventType | RecordingEventType[];
+    };
+    loadFullEventDataFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadFullEventDataSuccess: (sessionEventsData: RecordingEventType[] | null, payload?: {
+        event: RecordingEventType | RecordingEventType[];
+    }) => {
+        sessionEventsData: RecordingEventType[] | null;
+        payload?: {
+            event: RecordingEventType | RecordingEventType[];
+        };
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionEventsDataLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        webVitalsEvents: (sessionEventsData: RecordingEventType[] | null) => RecordingEventType[];
+        AIEvents: (sessionEventsData: RecordingEventType[] | null) => RecordingEventType[];
+        exceptionEvents: (sessionEventsData: RecordingEventType[] | null) => RecordingEventType[];
+        eventsWithPrimaryProperty: (sessionEventsData: RecordingEventType[] | null, primaryProperties: Record<string, string>) => RecordingEventType[];
+        preloadableEvents: (webVitalsEvents: RecordingEventType[], AIEvents: RecordingEventType[], exceptionEvents: RecordingEventType[], eventsWithPrimaryProperty: RecordingEventType[]) => RecordingEventType[];
+        eventViewportsItems: (sessionEventsData: RecordingEventType[] | null) => TimeTree<{
+            payload: ViewportResolution;
+            timestamp: Dayjs;
+        }>;
+        viewportForTimestamp: (eventViewportsItems: TimeTree<{
+            payload: ViewportResolution;
+            timestamp: Dayjs;
+        }>) => (timestamp: number) => ViewportResolution | undefined;
+    };
+}
+
+export type sessionEventsDataLogicType = MakeLogicType<sessionEventsDataLogicValues, sessionEventsDataLogicActions, SessionRecordingMetaLogicProps, sessionEventsDataLogicMeta>;
+
 export const sessionEventsDataLogic = kea<sessionEventsDataLogicType>([
     path((key) => ['scenes', 'session-recordings', 'sessionEventsDataLogic', key]),
     props({} as SessionRecordingMetaLogicProps),
@@ -234,28 +319,28 @@ AND properties.$lib != 'web'`
     selectors(() => ({
         webVitalsEvents: [
             (s) => [s.sessionEventsData],
-            (sessionEventsData): RecordingEventType[] =>
+            (sessionEventsData: RecordingEventType[] | null): RecordingEventType[] =>
                 (sessionEventsData || []).filter((e) => e.event === '$web_vitals'),
         ],
         AIEvents: [
             (s) => [s.sessionEventsData],
-            (sessionEventsData): RecordingEventType[] =>
+            (sessionEventsData: RecordingEventType[] | null): RecordingEventType[] =>
                 // see if event start with $ai_
                 (sessionEventsData || []).filter((e) => e.event.startsWith('$ai_')),
         ],
         exceptionEvents: [
             (s) => [s.sessionEventsData],
-            (sessionEventsData): RecordingEventType[] =>
+            (sessionEventsData: RecordingEventType[] | null): RecordingEventType[] =>
                 (sessionEventsData || []).filter((e) => e.event === '$exception'),
         ],
         eventsWithPrimaryProperty: [
             (s) => [s.sessionEventsData, s.primaryProperties],
-            (sessionEventsData, primaryProperties): RecordingEventType[] =>
+            (sessionEventsData: RecordingEventType[] | null, primaryProperties: Record<string, string>): RecordingEventType[] =>
                 getEventsWithPrimaryProperty(sessionEventsData || [], primaryProperties),
         ],
         preloadableEvents: [
             (s) => [s.webVitalsEvents, s.AIEvents, s.exceptionEvents, s.eventsWithPrimaryProperty],
-            (webVitalsEvents, AIEvents, exceptionEvents, eventsWithPrimaryProperty): RecordingEventType[] => {
+            (webVitalsEvents: RecordingEventType[], AIEvents: RecordingEventType[], exceptionEvents: RecordingEventType[], eventsWithPrimaryProperty: RecordingEventType[]): RecordingEventType[] => {
                 const seen = new Set<string>()
                 const merged: RecordingEventType[] = []
                 for (const e of [...webVitalsEvents, ...AIEvents, ...exceptionEvents, ...eventsWithPrimaryProperty]) {
@@ -271,7 +356,7 @@ AND properties.$lib != 'web'`
         eventViewportsItems: [
             (s) => [s.sessionEventsData],
             (
-                sessionEventsData
+                sessionEventsData: RecordingEventType[] | null
             ): TimeTree<{
                 timestamp: Dayjs
                 payload: ViewportResolution
@@ -298,7 +383,10 @@ AND properties.$lib != 'web'`
         ],
         viewportForTimestamp: [
             (s) => [s.eventViewportsItems],
-            (eventViewportsItems) => {
+            (eventViewportsItems: TimeTree<{
+    payload: ViewportResolution;
+    timestamp: Dayjs;
+}>) => {
                 return (timestamp: number) => {
                     const closestItem =
                         eventViewportsItems.next(dayjs(timestamp)) || eventViewportsItems.previous(dayjs(timestamp))
diff --git a/frontend/src/scenes/session-recordings/player/sessionRecordingCommentsLogic.ts b/frontend/src/scenes/session-recordings/player/sessionRecordingCommentsLogic.ts
index a5071cb87859..1f5403313cfd 100644
--- a/frontend/src/scenes/session-recordings/player/sessionRecordingCommentsLogic.ts
+++ b/frontend/src/scenes/session-recordings/player/sessionRecordingCommentsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props } from 'kea'
 import { loaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
@@ -9,13 +9,107 @@ import { RecordingComment } from 'scenes/session-recordings/player/inspector/pla
 
 import { CommentType, SessionRecordingId } from '~/types'
 
-import type { sessionRecordingCommentsLogicType } from './sessionRecordingCommentsLogicType'
+import type { SessionRecordingType } from '../../../types'
 import { SessionRecordingMetaLogicProps, sessionRecordingMetaLogic } from './sessionRecordingMetaLogic'
 
 export interface SessionRecordingCommentsLogicProps {
     sessionRecordingId: SessionRecordingId
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingCommentsLogicValues {
+    sessionComments: CommentType[]
+    sessionCommentsLoading: boolean
+    sessionNotebookComments: any
+    sessionNotebookCommentsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingCommentsLogicActions {
+    loadRecordingMetaSuccess: (
+        sessionPlayerMetaData: SessionRecordingType | null,
+        payload?:
+            | {
+                  value: true
+              }
+            | undefined
+    ) => {
+        payload?: {
+            value: true
+        }
+        sessionPlayerMetaData: SessionRecordingType | null
+    } // metaLogic
+    deleteComment: (id: any) => any
+    deleteCommentFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteCommentSuccess: (
+        sessionComments: CommentType[],
+        payload?: any
+    ) => {
+        sessionComments: CommentType[]
+        payload?: any
+    }
+    loadRecordingComments: () => {
+        value: true
+    }
+    loadRecordingCommentsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRecordingCommentsSuccess: (
+        sessionComments: CommentType[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        sessionComments: CommentType[]
+        payload?: {
+            value: true
+        }
+    }
+    loadRecordingNotebookComments: () => {
+        value: true
+    }
+    loadRecordingNotebookCommentsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRecordingNotebookCommentsSuccess: (
+        sessionNotebookComments: RecordingComment[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        sessionNotebookComments: RecordingComment[]
+        payload?: {
+            value: true
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingCommentsLogicMeta {
+    key: string
+}
+
+export type sessionRecordingCommentsLogicType = MakeLogicType<
+    sessionRecordingCommentsLogicValues,
+    sessionRecordingCommentsLogicActions,
+    SessionRecordingCommentsLogicProps,
+    sessionRecordingCommentsLogicMeta
+>
+
 export const sessionRecordingCommentsLogic = kea<sessionRecordingCommentsLogicType>([
     path((key) => ['scenes', 'session-recordings', 'sessionRecordingCommentsLogic', key]),
     props({} as SessionRecordingCommentsLogicProps),
diff --git a/frontend/src/scenes/session-recordings/player/sessionRecordingDataCoordinatorLogic.ts b/frontend/src/scenes/session-recordings/player/sessionRecordingDataCoordinatorLogic.ts
index 7cd5f53c8b77..26d44397797d 100644
--- a/frontend/src/scenes/session-recordings/player/sessionRecordingDataCoordinatorLogic.ts
+++ b/frontend/src/scenes/session-recordings/player/sessionRecordingDataCoordinatorLogic.ts
@@ -1,5 +1,5 @@
 import { deepEqual as equal } from 'fast-equals'
-import { actions, beforeUnmount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, beforeUnmount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { subscriptions } from 'kea-subscriptions'
 import posthog from 'posthog-js'
 import { EventType, customEvent, eventWithTime } from 'posthog-js/rrweb-types'
@@ -30,11 +30,13 @@ import { ExportedSessionRecordingFileV2 } from '../file-playback/types'
 import { sessionRecordingEventUsageLogic } from '../sessionRecordingEventUsageLogic'
 import { sessionEventsDataLogic } from './sessionEventsDataLogic'
 import { sessionRecordingCommentsLogic } from './sessionRecordingCommentsLogic'
-import type { sessionRecordingDataCoordinatorLogicType } from './sessionRecordingDataCoordinatorLogicType'
 import { sessionRecordingMetaLogic } from './sessionRecordingMetaLogic'
 import { posthogTelemetry } from './snapshot-processing/process-all-snapshots'
 import { snapshotDataLogic } from './snapshotDataLogic'
 import { createSegments, mapSnapshotsToWindowId } from './utils/segmenter'
+import type { AnnotationType, CommentType, SessionRecordingSnapshotSource } from '../../../types'
+import type { RecordingEventType } from '../../../types'
+import type { ViewportResolution } from '../../../../../common/replay-shared/src/index'
 
 export interface SessionRecordingDataCoordinatorLogicProps {
     sessionRecordingId: SessionRecordingId
@@ -56,6 +58,231 @@ export function isWithinIngestionGracePeriod(start: Dayjs | null): boolean {
     return start != null && now().diff(start, 'minute') <= INGESTION_GRACE_PERIOD_MINUTES
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingDataCoordinatorLogicValues {
+    sessionComments: CommentType[]; // commentsLogic
+    sessionCommentsLoading: boolean; // commentsLogic
+    sessionNotebookComments: any; // commentsLogic
+    sessionNotebookCommentsLoading: boolean; // commentsLogic
+    AIEvents: RecordingEventType[]; // eventsLogic
+    sessionEventsData: RecordingEventType[] | null; // eventsLogic
+    sessionEventsDataLoading: boolean; // eventsLogic
+    viewportForTimestamp: (timestamp: number) => ViewportResolution | undefined; // eventsLogic
+    webVitalsEvents: RecordingEventType[]; // eventsLogic
+    annotations: AnnotationType[]; // metaLogic
+    annotationsLoading: boolean; // metaLogic
+    currentTeam: TeamPublicType | TeamType | null; // metaLogic
+    getWindowId: (uuid: string | undefined) => number | undefined; // metaLogic
+    isLoadingSnapshots: boolean; // metaLogic
+    isNotFound: boolean; // metaLogic
+    isRecordingDeleted: boolean; // metaLogic
+    loadMetaError: boolean; // metaLogic
+    recordingDeletedAt: number | null; // metaLogic
+    recordingDeletedBy: string | null; // metaLogic
+    sessionPlayerMetaData: SessionRecordingType | null; // metaLogic
+    sessionPlayerMetaDataLoading: boolean; // metaLogic
+    snapshotSources: SessionRecordingSnapshotSource[] | null; // metaLogic
+    snapshotsLoaded: boolean; // metaLogic
+    snapshotsLoading: boolean; // metaLogic
+    trackedWindow: number | null; // metaLogic
+    uuidToIndex: Record<string, number>; // metaLogic
+    snapshotStore: SnapshotStore; // snapLogic
+    sourceLoadingStates: SourceLoadingState[]; // snapLogic
+    storeVersion: number; // snapLogic
+    bufferedToTime: number | null;
+    createExportJSON: (() => ExportedSessionRecordingFileV2);
+    customRRWebEvents: customEvent[];
+    durationMs: number;
+    effectiveSourceLoadingStates: SourceLoadingState[];
+    end: Dayjs | null;
+    fullyLoaded: boolean;
+    isOldAndInvalid: boolean;
+    isRecentAndInvalid: boolean;
+    processedSnapshots: RecordingSnapshot[];
+    reportedLoaded: boolean;
+    segments: RecordingSegment[];
+    sessionPlayerData: SessionPlayerData;
+    snapshots: RecordingSnapshot[];
+    snapshotsByWindowId: Record<number, eventWithTime[]>;
+    snapshotsInvalid: boolean;
+    start: Dayjs | null;
+    urls: {
+        timestamp: number;
+        url: string;
+    }[];
+    windowIdForTimestamp: (timestamp: number) => number | undefined;
+    windowIds: number[];
+    windowsHaveFullSnapshot: Record<string, boolean>;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingDataCoordinatorLogicActions {
+    loadRecordingComments: () => {
+        value: true;
+    }; // commentsLogic
+    loadRecordingCommentsSuccess: (sessionComments: CommentType[], payload?: {
+        value: true;
+    } | undefined) => {
+        payload?: {
+            value: true;
+        };
+        sessionComments: CommentType[];
+    }; // commentsLogic
+    loadRecordingNotebookComments: () => {
+        value: true;
+    }; // commentsLogic
+    loadRecordingNotebookCommentsSuccess: (sessionNotebookComments: import("./inspector/playerInspectorLogic").RecordingComment[], payload?: {
+        value: true;
+    } | undefined) => {
+        payload?: {
+            value: true;
+        };
+        sessionNotebookComments: import("./inspector/playerInspectorLogic").RecordingComment[];
+    }; // commentsLogic
+    loadEvents: () => {
+        value: true;
+    }; // eventsLogic
+    loadEventsSuccess: (sessionEventsData: RecordingEventType[] | null, payload?: {
+        value: true;
+    } | undefined) => {
+        payload?: {
+            value: true;
+        };
+        sessionEventsData: RecordingEventType[] | null;
+    }; // eventsLogic
+    loadFullEventData: (event: RecordingEventType | RecordingEventType[]) => {
+        event: RecordingEventType | RecordingEventType[];
+    }; // eventsLogic
+    loadFullEventDataSuccess: (sessionEventsData: RecordingEventType[] | null, payload?: {
+        event: RecordingEventType | RecordingEventType[];
+    } | undefined) => {
+        payload?: {
+            event: RecordingEventType | RecordingEventType[];
+        };
+        sessionEventsData: RecordingEventType[] | null;
+    }; // eventsLogic
+    loadRecordingFromFile: (recording: {
+        id: SessionRecordingType["id"];
+        person: SessionRecordingType["person"];
+        snapshots: RecordingSnapshot[];
+    }) => {
+        recording: {
+            id: string;
+            person: import("~/types").PersonType | undefined;
+            snapshots: RecordingSnapshot[];
+        };
+    }; // metaLogic
+    loadRecordingMeta: () => {
+        value: true;
+    }; // metaLogic
+    loadRecordingMetaFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    }; // metaLogic
+    loadRecordingMetaSuccess: (sessionPlayerMetaData: SessionRecordingType | null, payload?: {
+        value: true;
+    } | undefined) => {
+        payload?: {
+            value: true;
+        };
+        sessionPlayerMetaData: SessionRecordingType | null;
+    }; // metaLogic
+    loadSnapshotSources: (breakpointLength?: number | undefined) => {
+        breakpointLength: number | undefined;
+    }; // metaLogic
+    loadSnapshots: () => {
+        value: true;
+    }; // metaLogic
+    loadSnapshotsForSourceSuccess: (snapshotsForSource: {
+        source: Pick<SessionRecordingSnapshotSource, "blob_key" | "source">;
+        sources?: undefined;
+    } | {
+        source?: undefined;
+        sources: Pick<SessionRecordingSnapshotSource, "blob_key" | "source">[];
+    }, payload?: {
+        sources: Pick<SessionRecordingSnapshotSource, "blob_key" | "source">[];
+    } | undefined) => {
+        payload?: {
+            sources: Pick<SessionRecordingSnapshotSource, "blob_key" | "source">[];
+        };
+        snapshotsForSource: {
+            source: Pick<SessionRecordingSnapshotSource, "blob_key" | "source">;
+            sources?: undefined;
+        } | {
+            source?: undefined;
+            sources: Pick<SessionRecordingSnapshotSource, "blob_key" | "source">[];
+        };
+    }; // metaLogic
+    maybeLoadRecordingMeta: () => {
+        value: true;
+    }; // metaLogic
+    registerWindowId: (uuid: string) => {
+        uuid: string;
+    }; // metaLogic
+    setSnapshots: (snapshots: import("@posthog/replay-shared").RecordingSnapshot[]) => {
+        snapshots: RecordingSnapshot[];
+    }; // metaLogic
+    setTrackedWindow: (windowId: number | null) => {
+        windowId: number | null;
+    }; // metaLogic
+    reportRecordingLoaded: (playerData: SessionPlayerData, metadata: SessionRecordingType | null) => {
+        metadata: SessionRecordingType | null;
+        playerData: SessionPlayerData;
+    }; // sessionRecordingEventUsageLogic
+    storeUpdated: () => {
+        value: true;
+    }; // snapLogic
+    loadRecordingData: () => {
+        value: true;
+    };
+    processSnapshotsAsync: () => {
+        value: true;
+    };
+    reportUsageIfFullyLoaded: () => {
+        value: true;
+    };
+    setProcessedSnapshots: (snapshots: RecordingSnapshot[]) => {
+        snapshots: RecordingSnapshot[];
+    };
+    setRecordingReportedLoaded: () => {
+        value: true;
+    };
+    snapshotProcessingFailed: () => {
+        value: true;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingDataCoordinatorLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        snapshots: (processedSnapshots: import("@posthog/replay-shared").RecordingSnapshot[]) => RecordingSnapshot[];
+        start: (snapshots: import("@posthog/replay-shared").RecordingSnapshot[], sessionPlayerMetaData: SessionRecordingType | null) => Dayjs | null;
+        end: (snapshots: import("@posthog/replay-shared").RecordingSnapshot[], sessionPlayerMetaData: SessionRecordingType | null) => Dayjs | null;
+        durationMs: (start: Dayjs | null, end: Dayjs | null, sessionPlayerMetaData: SessionRecordingType | null, fullyLoaded: boolean) => number;
+        segments: (snapshots: import("@posthog/replay-shared").RecordingSnapshot[], start: Dayjs | null, end: Dayjs | null, trackedWindow: number | null, snapshotsByWindowId: Record<number, eventWithTime[]>, snapshotStore: SnapshotStore, storeVersion: number) => RecordingSegment[];
+        snapshotsByWindowId: (snapshots: import("@posthog/replay-shared").RecordingSnapshot[]) => Record<number, eventWithTime[]>;
+        bufferedToTime: (segments: import("@posthog/replay-shared").RecordingSegment[]) => number | null;
+        windowIdForTimestamp: (segments: import("@posthog/replay-shared").RecordingSegment[]) => (timestamp: number) => number | undefined;
+        urls: (snapshots: import("@posthog/replay-shared").RecordingSnapshot[]) => {
+            timestamp: number;
+            url: string;
+        }[];
+        windowsHaveFullSnapshot: (snapshotsByWindowId: Record<number, eventWithTime[]>) => Record<string, boolean>;
+        snapshotsInvalid: (windowsHaveFullSnapshot: Record<string, boolean>, fullyLoaded: boolean, start: Dayjs | null, sessionRecordingId: string, currentTeam: TeamPublicType | TeamType | null) => boolean;
+        isRecentAndInvalid: (start: Dayjs | null, snapshotsInvalid: boolean) => boolean;
+        isOldAndInvalid: (snapshotsInvalid: boolean, isRecentAndInvalid: boolean) => boolean;
+        windowIds: (snapshotsByWindowId: Record<number, eventWithTime[]>) => number[];
+        createExportJSON: (sessionPlayerMetaData: SessionRecordingType | null, snapshots: import("@posthog/replay-shared").RecordingSnapshot[]) => (() => ExportedSessionRecordingFileV2);
+        customRRWebEvents: (snapshots: import("@posthog/replay-shared").RecordingSnapshot[]) => customEvent[];
+        effectiveSourceLoadingStates: (sourceLoadingStates: SourceLoadingState[], segments: import("@posthog/replay-shared").RecordingSegment[]) => SourceLoadingState[];
+        fullyLoaded: (snapshots: import("@posthog/replay-shared").RecordingSnapshot[], segments: import("@posthog/replay-shared").RecordingSegment[], sessionPlayerMetaDataLoading: boolean, snapshotsLoading: boolean, sessionEventsDataLoading: boolean, sessionCommentsLoading: boolean, sessionNotebookCommentsLoading: boolean) => boolean;
+        sessionPlayerData: (sessionPlayerMetaData: SessionRecordingType | null, snapshotsByWindowId: Record<number, eventWithTime[]>, segments: import("@posthog/replay-shared").RecordingSegment[], bufferedToTime: number | null, start: Dayjs | null, end: Dayjs | null, durationMs: number, fullyLoaded: boolean, sessionRecordingId: string) => SessionPlayerData;
+    };
+}
+
+export type sessionRecordingDataCoordinatorLogicType = MakeLogicType<sessionRecordingDataCoordinatorLogicValues, sessionRecordingDataCoordinatorLogicActions, SessionRecordingDataCoordinatorLogicProps, sessionRecordingDataCoordinatorLogicMeta>;
+
 export const sessionRecordingDataCoordinatorLogic = kea<sessionRecordingDataCoordinatorLogicType>([
     path((key) => ['scenes', 'session-recordings', 'sessionRecordingDataCoordinatorLogic', key]),
     props({} as SessionRecordingDataCoordinatorLogicProps),
@@ -325,7 +552,7 @@ export const sessionRecordingDataCoordinatorLogic = kea<sessionRecordingDataCoor
 
         start: [
             (s) => [s.snapshots, s.sessionPlayerMetaData],
-            (snapshots, meta): Dayjs | null => {
+            (snapshots: import("@posthog/replay-shared").RecordingSnapshot[], meta: SessionRecordingType | null): Dayjs | null => {
                 const firstSnapshot = snapshots[0] || null
                 const eventStart = meta?.start_time ? dayjs(meta.start_time) : null
                 const snapshotStart = firstSnapshot ? dayjs(firstSnapshot.timestamp) : null
@@ -339,7 +566,7 @@ export const sessionRecordingDataCoordinatorLogic = kea<sessionRecordingDataCoor
 
         end: [
             (s) => [s.snapshots, s.sessionPlayerMetaData],
-            (snapshots, meta): Dayjs | null => {
+            (snapshots: import("@posthog/replay-shared").RecordingSnapshot[], meta: SessionRecordingType | null): Dayjs | null => {
                 const lastSnapshot = snapshots[snapshots.length - 1] || null
                 const eventEnd = meta?.end_time ? dayjs(meta.end_time) : null
                 const snapshotEnd = lastSnapshot ? dayjs(lastSnapshot.timestamp) : null
@@ -353,7 +580,7 @@ export const sessionRecordingDataCoordinatorLogic = kea<sessionRecordingDataCoor
 
         durationMs: [
             (s) => [s.start, s.end, s.sessionPlayerMetaData, s.fullyLoaded],
-            (start, end, meta: SessionRecordingType | null, fullyLoaded: boolean): number => {
+            (start: Dayjs | null, end: Dayjs | null, meta: SessionRecordingType | null, fullyLoaded: boolean): number => {
                 if (!start || !end) {
                     return 0
                 }
@@ -398,7 +625,7 @@ export const sessionRecordingDataCoordinatorLogic = kea<sessionRecordingDataCoor
 
         bufferedToTime: [
             (s) => [s.segments],
-            (segments): number | null => {
+            (segments: import("@posthog/replay-shared").RecordingSegment[]): number | null => {
                 if (!segments.length) {
                     return null
                 }
@@ -416,7 +643,7 @@ export const sessionRecordingDataCoordinatorLogic = kea<sessionRecordingDataCoor
 
         windowIdForTimestamp: [
             (s) => [s.segments],
-            (segments) => {
+            (segments: import("@posthog/replay-shared").RecordingSegment[]) => {
                 // memoized per segments recompute — segments reshape as data loads, so a logic-lifetime cache would pin stale window attributions
                 const memo: Record<number, number | undefined> = {}
                 return (timestamp: number): number | undefined => {
@@ -435,7 +662,7 @@ export const sessionRecordingDataCoordinatorLogic = kea<sessionRecordingDataCoor
 
         urls: [
             (s) => [s.snapshots],
-            (snapshots): { url: string; timestamp: number }[] => {
+            (snapshots: import("@posthog/replay-shared").RecordingSnapshot[]): { url: string; timestamp: number }[] => {
                 return (
                     snapshots
                         .filter((snapshot) => getHrefFromSnapshot(snapshot))
@@ -508,7 +735,7 @@ export const sessionRecordingDataCoordinatorLogic = kea<sessionRecordingDataCoor
 
         isRecentAndInvalid: [
             (s) => [s.start, s.snapshotsInvalid],
-            (start, snapshotsInvalid) => {
+            (start: Dayjs | null, snapshotsInvalid: boolean) => {
                 return snapshotsInvalid && isWithinIngestionGracePeriod(start)
             },
         ],
@@ -517,7 +744,7 @@ export const sessionRecordingDataCoordinatorLogic = kea<sessionRecordingDataCoor
         // e.g. the browser closed or went offline before the recording finished uploading
         isOldAndInvalid: [
             (s) => [s.snapshotsInvalid, s.isRecentAndInvalid],
-            (snapshotsInvalid, isRecentAndInvalid) => snapshotsInvalid && !isRecentAndInvalid,
+            (snapshotsInvalid: boolean, isRecentAndInvalid: boolean) => snapshotsInvalid && !isRecentAndInvalid,
         ],
 
         windowIds: [
@@ -529,7 +756,7 @@ export const sessionRecordingDataCoordinatorLogic = kea<sessionRecordingDataCoor
 
         createExportJSON: [
             (s) => [s.sessionPlayerMetaData, s.snapshots],
-            (sessionPlayerMetaData, snapshots): (() => ExportedSessionRecordingFileV2) => {
+            (sessionPlayerMetaData: SessionRecordingType | null, snapshots: import("@posthog/replay-shared").RecordingSnapshot[]): (() => ExportedSessionRecordingFileV2) => {
                 return (): ExportedSessionRecordingFileV2 => {
                     return {
                         version: '2023-04-28',
@@ -545,7 +772,7 @@ export const sessionRecordingDataCoordinatorLogic = kea<sessionRecordingDataCoor
 
         customRRWebEvents: [
             (s) => [s.snapshots],
-            (snapshots): customEvent[] => {
+            (snapshots: import("@posthog/replay-shared").RecordingSnapshot[]): customEvent[] => {
                 return snapshots.filter((snapshot) => snapshot.type === EventType.Custom).map((x) => x as customEvent)
             },
         ],
@@ -578,13 +805,13 @@ export const sessionRecordingDataCoordinatorLogic = kea<sessionRecordingDataCoor
                 s.sessionNotebookCommentsLoading,
             ],
             (
-                snapshots,
-                segments,
-                sessionPlayerMetaDataLoading,
-                snapshotsLoading,
-                sessionEventsDataLoading,
-                sessionCommentsLoading,
-                sessionNotebookCommentsLoading
+                snapshots: import("@posthog/replay-shared").RecordingSnapshot[],
+                segments: import("@posthog/replay-shared").RecordingSegment[],
+                sessionPlayerMetaDataLoading: boolean,
+                snapshotsLoading: boolean,
+                sessionEventsDataLoading: boolean,
+                sessionCommentsLoading: boolean,
+                sessionNotebookCommentsLoading: boolean
             ): boolean => {
                 // Check if there's a buffer segment (unloaded data)
                 const hasBufferSegment = segments.some((segment) => segment.kind === 'buffer')
diff --git a/frontend/src/scenes/session-recordings/player/sessionRecordingMetaLogic.ts b/frontend/src/scenes/session-recordings/player/sessionRecordingMetaLogic.ts
index 19cd07284a13..b4b2e6e1efe6 100644
--- a/frontend/src/scenes/session-recordings/player/sessionRecordingMetaLogic.ts
+++ b/frontend/src/scenes/session-recordings/player/sessionRecordingMetaLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, defaults, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, connect, defaults, kea, key, listeners, path, props, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api, { ApiError } from 'lib/api'
@@ -10,8 +10,15 @@ import { teamLogic } from 'scenes/teamLogic'
 import { annotationsModel } from '~/models/annotationsModel'
 import { SessionRecordingId, SessionRecordingType } from '~/types'
 
+import type {
+    AnnotationType,
+    PersonType,
+    RecordingSnapshot,
+    SessionRecordingSnapshotSource,
+    TeamPublicType,
+    TeamType,
+} from '../../../types'
 import { ExportedSessionRecordingFileV2 } from '../file-playback/types'
-import type { sessionRecordingMetaLogicType } from './sessionRecordingMetaLogicType'
 
 export interface SessionRecordingMetaLogicProps {
     sessionRecordingId: SessionRecordingId
@@ -20,6 +27,118 @@ export interface SessionRecordingMetaLogicProps {
     accessToken?: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingMetaLogicValues {
+    annotations: AnnotationType[] // annotationsModel
+    annotationsLoading: boolean // annotationsModel
+    getWindowId: (uuid: string | undefined) => number | undefined // registryLogic
+    uuidToIndex: Record<string, number> // registryLogic
+    isLoadingSnapshots: boolean // snapshotLogic
+    isRecordingDeleted: boolean // snapshotLogic
+    recordingDeletedAt: number | null // snapshotLogic
+    recordingDeletedBy: string | null // snapshotLogic
+    snapshotSources: SessionRecordingSnapshotSource[] | null // snapshotLogic
+    snapshotsLoaded: boolean // snapshotLogic
+    snapshotsLoading: boolean // snapshotLogic
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    isNotFound: boolean
+    loadMetaError: boolean
+    sessionPlayerMetaData: SessionRecordingType | null
+    sessionPlayerMetaDataLoading: boolean
+    trackedWindow: number | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingMetaLogicActions {
+    registerWindowId: (uuid: string) => {
+        uuid: string
+    } // registryLogic
+    loadSnapshotSources: (breakpointLength?: number | undefined) => {
+        breakpointLength: number | undefined
+    } // snapshotLogic
+    loadSnapshots: () => {
+        value: true
+    } // snapshotLogic
+    loadSnapshotsForSourceSuccess: (
+        snapshotsForSource:
+            | {
+                  source: Pick<SessionRecordingSnapshotSource, 'blob_key' | 'source'>
+                  sources?: undefined
+              }
+            | {
+                  source?: undefined
+                  sources: Pick<SessionRecordingSnapshotSource, 'blob_key' | 'source'>[]
+              },
+        payload?:
+            | {
+                  sources: Pick<SessionRecordingSnapshotSource, 'blob_key' | 'source'>[]
+              }
+            | undefined
+    ) => {
+        payload?: {
+            sources: Pick<SessionRecordingSnapshotSource, 'blob_key' | 'source'>[]
+        }
+        snapshotsForSource:
+            | {
+                  source: Pick<SessionRecordingSnapshotSource, 'blob_key' | 'source'>
+                  sources?: undefined
+              }
+            | {
+                  source?: undefined
+                  sources: Pick<SessionRecordingSnapshotSource, 'blob_key' | 'source'>[]
+              }
+    } // snapshotLogic
+    setSnapshots: (snapshots: import('@common/replay-shared/src').RecordingSnapshot[]) => {
+        snapshots: RecordingSnapshot[]
+    } // snapshotLogic
+    loadRecordingFromFile: (recording: ExportedSessionRecordingFileV2['data']) => {
+        recording: {
+            id: string
+            person: PersonType | undefined
+            snapshots: RecordingSnapshot[]
+        }
+    }
+    loadRecordingMeta: () => {
+        value: true
+    }
+    loadRecordingMetaFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRecordingMetaSuccess: (
+        sessionPlayerMetaData: SessionRecordingType | null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        sessionPlayerMetaData: SessionRecordingType | null
+        payload?: {
+            value: true
+        }
+    }
+    maybeLoadRecordingMeta: () => {
+        value: true
+    }
+    setTrackedWindow: (windowId: number | null) => {
+        windowId: number | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingMetaLogicMeta {
+    key: string
+}
+
+export type sessionRecordingMetaLogicType = MakeLogicType<
+    sessionRecordingMetaLogicValues,
+    sessionRecordingMetaLogicActions,
+    SessionRecordingMetaLogicProps,
+    sessionRecordingMetaLogicMeta
+>
+
 export const sessionRecordingMetaLogic = kea<sessionRecordingMetaLogicType>([
     path((key) => ['scenes', 'session-recordings', 'sessionRecordingMetaLogic', key]),
     props({} as SessionRecordingMetaLogicProps),
diff --git a/frontend/src/scenes/session-recordings/player/sessionRecordingPlayerLogic.ts b/frontend/src/scenes/session-recordings/player/sessionRecordingPlayerLogic.ts
index c40e1f4fed17..7fd6e7ee0f30 100644
--- a/frontend/src/scenes/session-recordings/player/sessionRecordingPlayerLogic.ts
+++ b/frontend/src/scenes/session-recordings/player/sessionRecordingPlayerLogic.ts
@@ -1,4 +1,5 @@
 import {
+    MakeLogicType,
     BuiltLogic,
     actions,
     afterMount,
@@ -18,6 +19,7 @@ import { delay } from 'kea-test-utils'
 import posthog from 'posthog-js'
 import { ReplayPlugin, Replayer, playerConfig } from 'posthog-js/rrweb'
 import { EventType, IncrementalSource, eventWithTime } from 'posthog-js/rrweb-types'
+import type { customEvent } from 'posthog-js/rrweb-types'
 import { RefObject } from 'react'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -54,13 +56,14 @@ import { userLogic } from 'scenes/userLogic'
 
 import { AvailableFeature, ExporterFormat, RecordingSegment, SessionPlayerData, SessionPlayerState } from '~/types'
 
+import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
+import type { PreflightStatus, SessionRecordingSnapshotSource, SessionRecordingType, UserType } from '../../../types'
 import { deletedRecordingsLogic } from '../deletedRecordingsLogic'
 import { ExportedSessionRecordingFileV2 } from '../file-playback/types'
 import { sessionRecordingEventUsageLogic } from '../sessionRecordingEventUsageLogic'
 import { playerCommentOverlayLogic } from './commenting/playerFrameCommentOverlayLogic'
-import { playerCommentOverlayLogicType } from './commenting/playerFrameCommentOverlayLogicType'
+import type { playerCommentOverlayLogicType } from './commenting/playerFrameCommentOverlayLogic'
 import { playerSettingsLogic } from './playerSettingsLogic'
-import type { sessionRecordingPlayerLogicType } from './sessionRecordingPlayerLogicType'
 import { snapshotDataLogic } from './snapshotDataLogic'
 import {
     addAssetError,
@@ -510,6 +513,465 @@ function scheduleDiagnosticsFlush(
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingPlayerLogicValues {
+    hasReachedExportFullVideoLimit: boolean; // exportsLogic
+    featureFlags: FeatureFlagsSet; // featureFlagLogic
+    playerControlsOverlay: boolean; // playerSettingsLogic
+    showMetadataFooter: boolean; // playerSettingsLogic
+    skipInactivitySetting: boolean; // playerSettingsLogic
+    speed: number; // playerSettingsLogic
+    preflight: PreflightStatus | null; // preflightLogic
+    createExportJSON: (() => ExportedSessionRecordingFileV2); // sessionRecordingDataCoordinatorLogic
+    customRRWebEvents: customEvent[]; // sessionRecordingDataCoordinatorLogic
+    fullyLoaded: boolean; // sessionRecordingDataCoordinatorLogic
+    sessionPlayerData: SessionPlayerData; // sessionRecordingDataCoordinatorLogic
+    sessionPlayerMetaData: SessionRecordingType | null; // sessionRecordingDataCoordinatorLogic
+    sessionPlayerMetaDataLoading: boolean; // sessionRecordingDataCoordinatorLogic
+    trackedWindow: number | null; // sessionRecordingDataCoordinatorLogic
+    urls: {
+        timestamp: number;
+        url: string;
+    }[]; // sessionRecordingDataCoordinatorLogic
+    allSourcesLoaded: boolean; // snapshotDataLogic
+    snapshotSources: SessionRecordingSnapshotSource[] | null; // snapshotDataLogic
+    snapshotStore: SnapshotStore; // snapshotDataLogic
+    snapshotsLoaded: boolean; // snapshotDataLogic
+    snapshotsLoading: boolean; // snapshotDataLogic
+    storeVersion: number; // snapshotDataLogic
+    hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean; // userLogic
+    user: UserType | null; // userLogic
+    activityPerSecond: {
+        durationSeconds: number;
+        maxY: number;
+        smoothedPoints: Record<number, {
+            y: number;
+        }>;
+    };
+    clickCount: number;
+    currentPlayerState: SessionPlayerState.READY | SessionPlayerState.BUFFER | SessionPlayerState.PLAY | SessionPlayerState.PAUSE | SessionPlayerState.SKIP | SessionPlayerState.SKIP_TO_MATCHING_EVENT | SessionPlayerState.ERROR;
+    currentPlayerTime: number;
+    currentPlayerTimeSeconds: number;
+    currentSegment: RecordingSegment | null;
+    currentTimestamp: number | undefined;
+    currentURL: string | undefined;
+    dataBufferedUntilTimestamp: number | null;
+    debugSettings: {
+        incrementalSources: IncrementalSource[];
+        types: EventType[];
+    };
+    debugSnapshots: eventWithTime[];
+    doctorDiagnostics: DoctorDiagnostics | null;
+    endReached: boolean;
+    errorCount: number;
+    explorerMode: SessionRecordingPlayerExplorerProps | null;
+    forceShowPlayerChrome: boolean;
+    fromRRWebPlayerTime: (time?: number | undefined) => number | undefined;
+    hasLateFullSnapshot: boolean;
+    hasSnapshots: boolean;
+    hoverModeIsEnabled: boolean;
+    isBuffering: boolean;
+    isCommenting: boolean;
+    isFullScreen: boolean;
+    isHovering: boolean;
+    isKioskMode: boolean;
+    isMuted: boolean;
+    isScrubbing: boolean;
+    isSkippingInactivity: boolean;
+    isSkippingToMatchingEvent: boolean;
+    isWaitingForIngestion: boolean;
+    jumpTimeMs: number;
+    leadingUnplayableMs: number;
+    logicProps: SessionRecordingPlayerLogicProps;
+    maskingWindow: boolean;
+    pauseForced: boolean;
+    playNextAnimationInterrupted: boolean;
+    playNextRecording: ((automatic: boolean) => void) | undefined;
+    player: Player | null;
+    playerError: string | null;
+    playerSpeed: number;
+    playingState: SessionPlayerState.PLAY | SessionPlayerState.PAUSE;
+    playingTimeTracking: PlayerTimeTracking;
+    quickEmojiIsOpen: boolean;
+    reportedReplayerErrors: Set<string>;
+    resolution: {
+        height: number;
+        width: number;
+    } | null;
+    rootFrame: HTMLDivElement | null;
+    roughAnimationFPS: number;
+    scale: number;
+    seekIndicator: {
+        direction: "backward" | "forward";
+        seconds: number;
+    } | null;
+    seekRenderability: (timestamp: number) => SeekRenderability;
+    segmentForTimestamp: (timestamp?: number | undefined) => RecordingSegment | null;
+    sessionRecordingId: string;
+    showPlayerChrome: boolean;
+    showingClipParams: boolean;
+    skipToFirstMatchingEvent: boolean;
+    timestampChangeTracking: {
+        timestamp: number | null;
+        timestampMatchesPrevious: number;
+    };
+    toRRWebPlayerTime: (timestamp: number) => number | undefined;
+    wasMarkedViewed: boolean;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingPlayerLogicActions {
+    addDeletedRecordings: (ids: string[]) => {
+        ids: string[];
+    }; // deletedRecordingsLogic
+    startReplayExport: (sessionRecordingId: string, format?: ExporterFormat | undefined, timestamp?: number | undefined, duration?: number | undefined, mode?: SessionRecordingPlayerMode | undefined, options?: {
+        css_selector?: string;
+        filename?: string;
+        height?: number;
+        skip_inactivity?: boolean;
+        width?: number;
+    } | undefined) => {
+        duration: number | undefined;
+        format: ExporterFormat | undefined;
+        mode: SessionRecordingPlayerMode | undefined;
+        options: {
+            css_selector?: string | undefined;
+            filename?: string | undefined;
+            height?: number | undefined;
+            skip_inactivity?: boolean | undefined;
+            width?: number | undefined;
+        } | undefined;
+        sessionRecordingId: string;
+        timestamp: number | undefined;
+    }; // exportsLogic
+    setPlayerControlsOverlay: (playerControlsOverlay: boolean) => {
+        playerControlsOverlay: boolean;
+    }; // playerSettingsLogic
+    setSkipInactivitySetting: (skipInactivitySetting: boolean) => {
+        skipInactivitySetting: boolean;
+    }; // playerSettingsLogic
+    setSpeed: (speed: number) => {
+        speed: number;
+    }; // playerSettingsLogic
+    loadRecordingData: () => {
+        value: true;
+    }; // sessionRecordingDataCoordinatorLogic
+    loadRecordingMetaSuccess: (sessionPlayerMetaData: SessionRecordingType | null, payload?: {
+        value: true;
+    } | undefined) => {
+        payload?: {
+            value: true;
+        };
+        sessionPlayerMetaData: SessionRecordingType | null;
+    }; // sessionRecordingDataCoordinatorLogic
+    snapshotProcessingFailed: () => {
+        value: true;
+    }; // sessionRecordingDataCoordinatorLogic
+    reportNextRecordingTriggered: (automatic: boolean) => {
+        automatic: boolean;
+    }; // sessionRecordingEventUsageLogic
+    reportRecordingExportedToFile: () => {
+        value: true;
+    }; // sessionRecordingEventUsageLogic
+    loadAllSources: () => {
+        value: true;
+    }; // snapshotDataLogic
+    loadNextSnapshotSource: () => {
+        value: true;
+    }; // snapshotDataLogic
+    loadSnapshotSourcesFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    }; // snapshotDataLogic
+    loadSnapshots: () => {
+        value: true;
+    }; // snapshotDataLogic
+    loadSnapshotsForSourceFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    }; // snapshotDataLogic
+    setPlayerActive: (active: boolean) => {
+        active: boolean;
+    }; // snapshotDataLogic
+    setTargetTimestamp: (timestamp: number | null, windowId?: number | undefined) => {
+        timestamp: number | null;
+        windowId: number | undefined;
+    }; // snapshotDataLogic
+    snapshotSourceLoadExhausted: () => {
+        value: true;
+    }; // snapshotDataLogic
+    updatePlaybackPosition: (timestamp: number, windowId?: number | undefined) => {
+        timestamp: number;
+        windowId: number | undefined;
+    }; // snapshotDataLogic
+    allowPlayerChromeToHide: () => {
+        value: true;
+    };
+    caughtAssetErrorFromIframe: (errorDetails: ResourceErrorDetails) => {
+        errorDetails: ResourceErrorDetails;
+    };
+    clearPlayerError: () => {
+        value: true;
+    };
+    closeExplorer: () => {
+        value: true;
+    };
+    createExternalReference: (integrationId: number, config: Record<string, any>) => {
+        config: Record<string, any>;
+        integrationId: number;
+    };
+    deleteRecording: () => {
+        value: true;
+    };
+    endBuffer: () => {
+        value: true;
+    };
+    endScrub: () => {
+        value: true;
+    };
+    exportRecording: (format: ExporterFormat, timestamp?: number, mode?: SessionRecordingPlayerMode, duration?: number, filename?: string) => {
+        duration: number;
+        filename: string | undefined;
+        format: ExporterFormat;
+        mode: SessionRecordingPlayerMode;
+        timestamp: number;
+    };
+    exportRecordingToFile: () => {
+        value: true;
+    };
+    exportRecordingToVideoFile: () => {
+        value: true;
+    };
+    fingerprintReported: (fingerprint: string) => {
+        fingerprint: string;
+    };
+    flushDoctorDiagnostics: (diagnostics: DoctorDiagnostics) => {
+        diagnostics: DoctorDiagnostics;
+    };
+    forcePause: () => {
+        value: true;
+    };
+    getClip: (format: ExporterFormat, duration?: number, filename?: string) => {
+        duration: number;
+        filename: string | undefined;
+        format: ExporterFormat;
+    };
+    hideSeekIndicator: () => {
+        value: true;
+    };
+    incrementClickCount: () => {
+        value: true;
+    };
+    incrementErrorCount: () => {
+        value: true;
+    };
+    initializePlayerFromStart: () => {
+        value: true;
+    };
+    markViewed: (delay?: number) => {
+        delay: number | undefined;
+    };
+    openExplorer: () => {
+        value: true;
+    };
+    openHeatmap: () => {
+        value: true;
+    };
+    pauseIframePlayback: () => {
+        value: true;
+    };
+    playerErrorSeen: (error: any) => {
+        error: any;
+    };
+    restartIframePlayback: () => {
+        value: true;
+    };
+    schedulePlayerTimeTracking: () => {
+        value: true;
+    };
+    seekBackward: (amount?: number) => {
+        amount: number | undefined;
+    };
+    seekForward: (amount?: number) => {
+        amount: number | undefined;
+    };
+    seekToStart: () => {
+        value: true;
+    };
+    seekToTime: (timeInMilliseconds: number, forcePlay?: boolean) => {
+        forcePlay: boolean;
+        timeInMilliseconds: number;
+    };
+    seekToTimestamp: (timestamp: number, forcePlay?: boolean) => {
+        forcePlay: boolean;
+        timestamp: number;
+    };
+    setCurrentSegment: (segment: RecordingSegment) => {
+        segment: RecordingSegment;
+    };
+    setCurrentTimestamp: (timestamp: number) => {
+        timestamp: number;
+    };
+    setDebugSnapshotIncrementalSources: (incrementalSources: IncrementalSource[]) => {
+        incrementalSources: IncrementalSource[];
+    };
+    setDebugSnapshotTypes: (types: EventType[]) => {
+        types: EventType[];
+    };
+    setEndReached: (reached?: boolean) => {
+        reached: boolean;
+    };
+    setExplorerProps: (props: SessionRecordingPlayerExplorerProps | null) => {
+        props: SessionRecordingPlayerExplorerProps | null;
+    };
+    setIsCommenting: (isCommenting: boolean) => {
+        isCommenting: boolean;
+    };
+    setIsFullScreen: (isFullScreen: boolean) => {
+        isFullScreen: boolean;
+    };
+    setIsHovering: (isHovering: boolean) => {
+        isHovering: boolean;
+    };
+    setMaskWindow: (shouldMaskWindow: boolean) => {
+        shouldMaskWindow: boolean;
+    };
+    setMuted: (muted: boolean) => {
+        muted: boolean;
+    };
+    setPause: () => {
+        value: true;
+    };
+    setPlay: () => {
+        value: true;
+    };
+    setPlayNextAnimationInterrupted: (interrupted: boolean) => {
+        interrupted: boolean;
+    };
+    setPlayer: (player: Player | null) => {
+        player: Player | null;
+    };
+    setPlayerError: (reason: string) => {
+        reason: string;
+    };
+    setPlayerTimeTrackingState: (tracking: PlayerTimeTracking) => {
+        tracking: PlayerTimeTracking;
+    };
+    setQuickEmojiIsOpen: (quickEmojiIsOpen: boolean) => {
+        quickEmojiIsOpen: boolean;
+    };
+    setRootFrame: (frame: HTMLDivElement | null) => {
+        frame: HTMLDivElement | null;
+    };
+    setScale: (scale: number) => {
+        scale: number;
+    };
+    setShowingClipParams: (showingClipParams: boolean) => {
+        showingClipParams: boolean;
+    };
+    setSkipToFirstMatchingEvent: (skipToFirstMatchingEvent: boolean) => {
+        skipToFirstMatchingEvent: boolean;
+    };
+    setSkippingInactivity: (isSkippingInactivity: boolean) => {
+        isSkippingInactivity: boolean;
+    };
+    setSkippingToMatchingEvent: (isSkippingToMatchingEvent: boolean) => {
+        isSkippingToMatchingEvent: boolean;
+    };
+    setWasMarkedViewed: (wasMarkedViewed: boolean) => {
+        wasMarkedViewed: boolean;
+    };
+    showSeekIndicator: (direction: "backward" | "forward", seconds: number) => {
+        direction: "backward" | "forward";
+        seconds: number;
+    };
+    skipPlayerForward: (rrWebPlayerTime: number, skip: number) => {
+        rrWebPlayerTime: number;
+        skip: number;
+    };
+    startBuffer: () => {
+        value: true;
+    };
+    startScrub: () => {
+        value: true;
+    };
+    stopAnimation: () => {
+        value: true;
+    };
+    syncPlayerSpeed: () => {
+        value: true;
+    };
+    syncPlayerState: (forcePlay?: boolean, reposition?: boolean) => {
+        forcePlay: boolean;
+        reposition: boolean;
+    };
+    syncSnapshotsWithPlayer: () => {
+        value: true;
+    };
+    takeScreenshot: () => {
+        value: true;
+    };
+    togglePlayPause: () => {
+        value: true;
+    };
+    tryInitReplayer: () => boolean;
+    updateAnimation: () => {
+        value: true;
+    };
+    updatePlayerTimeTracking: () => {
+        value: true;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingPlayerLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        sessionRecordingId: (sessionRecordingId: string) => string;
+        logicProps: (arg: any) => SessionRecordingPlayerLogicProps;
+        playNextRecording: (arg: any) => ((automatic: boolean) => void) | undefined;
+        hasSnapshots: (sessionPlayerData: SessionPlayerData) => boolean;
+        activityPerSecond: (sessionPlayerData: SessionPlayerData, hasSnapshots: boolean) => {
+            durationSeconds: number;
+            maxY: number;
+            smoothedPoints: Record<number, {
+                y: number;
+            }>;
+        };
+        roughAnimationFPS: (playerSpeed: number) => number;
+        currentPlayerState: (playingState: SessionPlayerState.PLAY | SessionPlayerState.PAUSE, isBuffering: boolean, playerError: string | null, isScrubbing: boolean, isSkippingInactivity: boolean, isSkippingToMatchingEvent: boolean, snapshotsLoaded: boolean, snapshotsLoading: boolean) => SessionPlayerState.READY | SessionPlayerState.BUFFER | SessionPlayerState.PLAY | SessionPlayerState.PAUSE | SessionPlayerState.SKIP | SessionPlayerState.SKIP_TO_MATCHING_EVENT | SessionPlayerState.ERROR;
+        dataBufferedUntilTimestamp: (sessionPlayerData: SessionPlayerData) => number | null;
+        currentPlayerTime: (currentTimestamp: number | undefined, sessionPlayerData: SessionPlayerData) => number;
+        currentPlayerTimeSeconds: (currentPlayerTime: number) => number;
+        toRRWebPlayerTime: (sessionPlayerData: SessionPlayerData, currentSegment: null | import("@posthog/replay-shared").RecordingSegment) => (timestamp: number) => number | undefined;
+        fromRRWebPlayerTime: (sessionPlayerData: SessionPlayerData, currentSegment: null | import("@posthog/replay-shared").RecordingSegment) => (time?: number | undefined) => number | undefined;
+        jumpTimeMs: (speed: number) => number;
+        playerSpeed: (speed: number, isSkippingInactivity: boolean, currentSegment: null | import("@posthog/replay-shared").RecordingSegment, currentTimestamp: number | undefined, arg: any) => number;
+        segmentForTimestamp: (sessionPlayerData: SessionPlayerData) => (timestamp?: number | undefined) => RecordingSegment | null;
+        seekRenderability: (segmentForTimestamp: (timestamp?: number | undefined) => RecordingSegment | null, snapshotStore: SnapshotStore, allSourcesLoaded: boolean, sessionPlayerData: SessionPlayerData, storeVersion: number) => (timestamp: number) => SeekRenderability;
+        leadingUnplayableMs: (sessionPlayerData: SessionPlayerData, seekRenderability: (timestamp: number) => SeekRenderability) => number;
+        hasLateFullSnapshot: (leadingUnplayableMs: number) => boolean;
+        isWaitingForIngestion: (seekRenderability: (timestamp: number) => SeekRenderability, currentTimestamp: number | undefined) => boolean;
+        debugSnapshots: (sessionPlayerData: SessionPlayerData, debugSettings: {
+            incrementalSources: IncrementalSource[];
+            types: EventType[];
+        }) => eventWithTime[];
+        currentURL: (urls: {
+            timestamp: number;
+            url: string;
+        }[], sessionPlayerMetaData: SessionRecordingType | null, currentTimestamp: number | undefined) => string | undefined;
+        resolution: (sessionPlayerData: SessionPlayerData, currentTimestamp: number | undefined, currentSegment: null | import("@posthog/replay-shared").RecordingSegment) => {
+            height: number;
+            width: number;
+        } | null;
+        isKioskMode: (logicProps: SessionRecordingPlayerLogicProps) => boolean;
+        hoverModeIsEnabled: (logicProps: SessionRecordingPlayerLogicProps, isCommenting: boolean, showingClipParams: boolean, playerControlsOverlay: boolean) => boolean;
+        showPlayerChrome: (isKioskMode: boolean, hoverModeIsEnabled: boolean, isHovering: boolean, forceShowPlayerChrome: boolean) => boolean;
+    };
+}
+
+export type sessionRecordingPlayerLogicType = MakeLogicType<sessionRecordingPlayerLogicValues, sessionRecordingPlayerLogicActions, SessionRecordingPlayerLogicProps, sessionRecordingPlayerLogicMeta>;
+
 export const sessionRecordingPlayerLogic = kea<sessionRecordingPlayerLogicType>([
     path((key) => ['scenes', 'session-recordings', 'player', 'sessionRecordingPlayerLogic', key]),
     props({} as SessionRecordingPlayerLogicProps),
@@ -890,7 +1352,7 @@ export const sessionRecordingPlayerLogic = kea<sessionRecordingPlayerLogicType>(
     })),
     selectors({
         // Prop references for use by other logics
-        sessionRecordingId: [(_, p) => [p.sessionRecordingId], (sessionRecordingId) => sessionRecordingId],
+        sessionRecordingId: [(_, p) => [p.sessionRecordingId], (sessionRecordingId: string) => sessionRecordingId],
         logicProps: [() => [(_, props) => props], (props): SessionRecordingPlayerLogicProps => props],
         playNextRecording: [
             () => [(_, props) => props.playNextRecording],
@@ -977,7 +1439,7 @@ export const sessionRecordingPlayerLogic = kea<sessionRecordingPlayerLogicType>(
             },
         ],
 
-        roughAnimationFPS: [(s) => [s.playerSpeed], (playerSpeed) => playerSpeed * (1000 / 60)],
+        roughAnimationFPS: [(s) => [s.playerSpeed], (playerSpeed: number) => playerSpeed * (1000 / 60)],
         currentPlayerState: [
             (s) => [
                 s.playingState,
@@ -990,14 +1452,14 @@ export const sessionRecordingPlayerLogic = kea<sessionRecordingPlayerLogicType>(
                 s.snapshotsLoading,
             ],
             (
-                playingState,
-                isBuffering,
-                playerError,
-                isScrubbing,
-                isSkippingInactivity,
-                isSkippingToMatchingEvent,
-                snapshotsLoaded,
-                snapshotsLoading
+                playingState: SessionPlayerState.PLAY | SessionPlayerState.PAUSE,
+                isBuffering: boolean,
+                playerError: string | null,
+                isScrubbing: boolean,
+                isSkippingInactivity: boolean,
+                isSkippingToMatchingEvent: boolean,
+                snapshotsLoaded: boolean,
+                snapshotsLoading: boolean
             ) => {
                 switch (true) {
                     case isScrubbing:
@@ -1035,7 +1497,7 @@ export const sessionRecordingPlayerLogic = kea<sessionRecordingPlayerLogicType>(
         // Useful for the relative time in the context of the whole recording
         currentPlayerTime: [
             (s) => [s.currentTimestamp, s.sessionPlayerData],
-            (currentTimestamp, sessionPlayerData) => {
+            (currentTimestamp: number | undefined, sessionPlayerData: SessionPlayerData) => {
                 if (!currentTimestamp || !sessionPlayerData?.start) {
                     return 0
                 }
@@ -1046,13 +1508,13 @@ export const sessionRecordingPlayerLogic = kea<sessionRecordingPlayerLogicType>(
 
         currentPlayerTimeSeconds: [
             (s) => [s.currentPlayerTime],
-            (currentPlayerTime) => Math.floor(currentPlayerTime / 1000),
+            (currentPlayerTime: number) => Math.floor(currentPlayerTime / 1000),
         ],
 
         // The relative time for the player, i.e. the offset between the current timestamp, and the window start for the current segment
         toRRWebPlayerTime: [
             (s) => [s.sessionPlayerData, s.currentSegment],
-            (sessionPlayerData, currentSegment) => {
+            (sessionPlayerData: SessionPlayerData, currentSegment: RecordingSegment | null) => {
                 return (timestamp: number): number | undefined => {
                     if (!currentSegment || !currentSegment.windowId) {
                         return
@@ -1071,7 +1533,7 @@ export const sessionRecordingPlayerLogic = kea<sessionRecordingPlayerLogicType>(
         // The relative time for the player, i.e. the offset between the current timestamp, and the window start for the current segment
         fromRRWebPlayerTime: [
             (s) => [s.sessionPlayerData, s.currentSegment],
-            (sessionPlayerData, currentSegment) => {
+            (sessionPlayerData: SessionPlayerData, currentSegment: RecordingSegment | null) => {
                 return (time?: number): number | undefined => {
                     if (time === undefined || !currentSegment?.windowId) {
                         return
@@ -1085,11 +1547,17 @@ export const sessionRecordingPlayerLogic = kea<sessionRecordingPlayerLogicType>(
             },
         ],
 
-        jumpTimeMs: [(selectors) => [selectors.speed], (speed) => 10 * 1000 * speed],
+        jumpTimeMs: [(selectors) => [selectors.speed], (speed: number) => 10 * 1000 * speed],
 
         playerSpeed: [
             (s) => [s.speed, s.isSkippingInactivity, s.currentSegment, s.currentTimestamp, (_, props) => props.mode],
-            (speed, isSkippingInactivity, currentSegment, currentTimestamp, mode) => {
+            (
+                speed: number,
+                isSkippingInactivity: boolean,
+                currentSegment: RecordingSegment | null,
+                currentTimestamp: number | undefined,
+                mode
+            ) => {
                 if (mode === SessionRecordingPlayerMode.Preview) {
                     // default max speed in rrweb https://github.com/rrweb-io/rrweb/blob/58c9104eddc8b7994a067a97daae5684e42f892f/packages/rrweb/src/replay/index.ts#L178
                     return 360
@@ -1257,7 +1725,13 @@ export const sessionRecordingPlayerLogic = kea<sessionRecordingPlayerLogicType>(
 
         debugSnapshots: [
             (s) => [s.sessionPlayerData, s.debugSettings],
-            (sessionPlayerData: SessionPlayerData, debugSettings): eventWithTime[] => {
+            (
+                sessionPlayerData: SessionPlayerData,
+                debugSettings: {
+                    incrementalSources: import('node_modules/posthog-js/dist/rrweb').IncrementalSource[]
+                    types: import('node_modules/posthog-js/dist/rrweb').EventType[]
+                }
+            ): eventWithTime[] => {
                 const allSnapshots = Object.values(sessionPlayerData.snapshotsByWindowId).flat()
                 const visualSnapshots = allSnapshots.filter(
                     (s) =>
@@ -1271,7 +1745,14 @@ export const sessionRecordingPlayerLogic = kea<sessionRecordingPlayerLogicType>(
 
         currentURL: [
             (s) => [s.urls, s.sessionPlayerMetaData, s.currentTimestamp],
-            (urls, sessionPlayerMetaData, currentTimestamp): string | undefined => {
+            (
+                urls: {
+                    timestamp: number
+                    url: string
+                }[],
+                sessionPlayerMetaData: null | import('~/types').SessionRecordingType,
+                currentTimestamp: number | undefined
+            ): string | undefined => {
                 if (!urls.length || !currentTimestamp) {
                     return sessionPlayerMetaData?.start_url ?? undefined
                 }
@@ -1287,7 +1768,11 @@ export const sessionRecordingPlayerLogic = kea<sessionRecordingPlayerLogicType>(
         ],
         resolution: [
             (s) => [s.sessionPlayerData, s.currentTimestamp, s.currentSegment],
-            (sessionPlayerData, currentTimestamp, currentSegment): { width: number; height: number } | null => {
+            (
+                sessionPlayerData: SessionPlayerData,
+                currentTimestamp: number | undefined,
+                currentSegment: RecordingSegment | null
+            ): { width: number; height: number } | null => {
                 // Find snapshot to pull resolution from
                 if (!currentTimestamp) {
                     return null
@@ -1330,11 +1815,17 @@ export const sessionRecordingPlayerLogic = kea<sessionRecordingPlayerLogicType>(
         ],
         isKioskMode: [
             (s) => [s.logicProps],
-            (logicProps): boolean => logicProps.mode === SessionRecordingPlayerMode.Kiosk,
+            (logicProps: SessionRecordingPlayerLogicProps): boolean =>
+                logicProps.mode === SessionRecordingPlayerMode.Kiosk,
         ],
         hoverModeIsEnabled: [
             (s) => [s.logicProps, s.isCommenting, s.showingClipParams, s.playerControlsOverlay],
-            (logicProps, isCommenting, showingClipParams, playerControlsOverlay): boolean => {
+            (
+                logicProps: SessionRecordingPlayerLogicProps,
+                isCommenting: boolean,
+                showingClipParams: boolean,
+                playerControlsOverlay: boolean
+            ): boolean => {
                 return (
                     !!logicProps.mode &&
                     ModesWithInteractions.includes(logicProps.mode) &&
@@ -1346,7 +1837,12 @@ export const sessionRecordingPlayerLogic = kea<sessionRecordingPlayerLogicType>(
         ],
         showPlayerChrome: [
             (s) => [s.isKioskMode, s.hoverModeIsEnabled, s.isHovering, s.forceShowPlayerChrome],
-            (isKioskMode, hoverModeIsEnabled, isHovering, forceShowPlayerChrome): boolean => {
+            (
+                isKioskMode: boolean,
+                hoverModeIsEnabled: boolean,
+                isHovering: boolean,
+                forceShowPlayerChrome: boolean
+            ): boolean => {
                 // Kiosk mode never shows player controls
                 if (isKioskMode) {
                     return false
diff --git a/frontend/src/scenes/session-recordings/player/sessionSummariesConfigLogic.ts b/frontend/src/scenes/session-recordings/player/sessionSummariesConfigLogic.ts
index 09445597d8c7..9bd0f54d934d 100644
--- a/frontend/src/scenes/session-recordings/player/sessionSummariesConfigLogic.ts
+++ b/frontend/src/scenes/session-recordings/player/sessionSummariesConfigLogic.ts
@@ -1,5 +1,6 @@
-import { actions, afterMount, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, listeners, path, reducers } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -7,8 +8,6 @@ import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
 
 import type { SessionSummariesConfig } from 'products/session_summaries/frontend/types'
 
-import type { sessionSummariesConfigLogicType } from './sessionSummariesConfigLogicType'
-
 export const CUSTOM_TAGS_MAX_COUNT = 15
 export const CUSTOM_TAG_NAME_MAX_LENGTH = 60
 export const CUSTOM_TAG_DESCRIPTION_MAX_LENGTH = 200
@@ -42,6 +41,103 @@ const customTagsToDict = (tags: CustomTagFormEntry[]): Record<string, string> =>
     return dict
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionSummariesConfigLogicValues {
+    config: SessionSummariesConfig | null
+    configForm: SessionSummariesConfigForm
+    configFormAllErrors: Record<string, any>
+    configFormChanged: boolean
+    configFormErrors: DeepPartialMap<SessionSummariesConfigForm, ValidationErrorType>
+    configFormHasErrors: boolean
+    configFormManualErrors: Record<string, any>
+    configFormTouched: boolean
+    configFormTouches: Record<string, boolean>
+    configFormValidationErrors: DeepPartialMap<SessionSummariesConfigForm, ValidationErrorType>
+    configLoading: boolean
+    isConfigFormSubmitting: boolean
+    isConfigFormValid: boolean
+    isLoading: boolean
+    isUpdating: boolean
+    showConfigFormErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionSummariesConfigLogicActions {
+    loadConfig: () => any
+    loadConfigFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadConfigSuccess: (
+        config: SessionSummariesConfig,
+        payload?: any
+    ) => {
+        config: SessionSummariesConfig
+        payload?: any
+    }
+    resetConfigForm: (values?: SessionSummariesConfigForm) => {
+        values?: SessionSummariesConfigForm
+    }
+    revertConfigForm: () => {
+        value: true
+    }
+    setConfigFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setConfigFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setConfigFormValues: (values: DeepPartial<SessionSummariesConfigForm>) => {
+        values: DeepPartial<SessionSummariesConfigForm>
+    }
+    submitConfigForm: () => {
+        value: boolean
+    }
+    submitConfigFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitConfigFormRequest: (configForm: SessionSummariesConfigForm) => {
+        configForm: SessionSummariesConfigForm
+    }
+    submitConfigFormSuccess: (configForm: SessionSummariesConfigForm) => {
+        configForm: SessionSummariesConfigForm
+    }
+    touchConfigFormField: (key: string) => {
+        key: string
+    }
+    updateConfig: (data: SessionSummariesConfigForm) => SessionSummariesConfigForm
+    updateConfigFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateConfigSuccess: (
+        config: SessionSummariesConfig,
+        payload?: SessionSummariesConfigForm
+    ) => {
+        config: SessionSummariesConfig
+        payload?: SessionSummariesConfigForm
+    }
+}
+
+export type sessionSummariesConfigLogicType = MakeLogicType<
+    sessionSummariesConfigLogicValues,
+    sessionSummariesConfigLogicActions
+>
+
 export const sessionSummariesConfigLogic = kea<sessionSummariesConfigLogicType>([
     path(['scenes', 'session-recordings', 'player', 'sessionSummariesConfigLogic']),
 
diff --git a/frontend/src/scenes/session-recordings/player/share/playerShareLogic.ts b/frontend/src/scenes/session-recordings/player/share/playerShareLogic.ts
index 5523d50ada6b..5ec32171ded6 100644
--- a/frontend/src/scenes/session-recordings/player/share/playerShareLogic.ts
+++ b/frontend/src/scenes/session-recordings/player/share/playerShareLogic.ts
@@ -1,12 +1,11 @@
-import { kea, key, path, props, selectors } from 'kea'
+import { MakeLogicType, kea, key, path, props, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { combineUrl } from 'kea-router'
 
 import { colonDelimitedDuration, reverseColonDelimitedDuration } from 'lib/utils/durations'
 import { urls } from 'scenes/urls'
 
-import type { playerShareLogicType } from './playerShareLogicType'
-
 export interface FormWithTime {
     includeTime: boolean
     time: string | null
@@ -31,6 +30,79 @@ export type PlayerShareLogicProps = {
     shareType?: 'private' | 'public'
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface playerShareLogicValues {
+    isPrivateLinkFormSubmitting: boolean
+    isPrivateLinkFormValid: boolean
+    privateLinkForm: FormWithTime
+    privateLinkFormAllErrors: Record<string, any>
+    privateLinkFormChanged: boolean
+    privateLinkFormErrors: DeepPartialMap<FormWithTime, ValidationErrorType>
+    privateLinkFormHasErrors: boolean
+    privateLinkFormManualErrors: Record<string, any>
+    privateLinkFormTouched: boolean
+    privateLinkFormTouches: Record<string, boolean>
+    privateLinkFormValidationErrors: DeepPartialMap<FormWithTime, ValidationErrorType>
+    privateLinkUrl: string
+    privateLinkUrlQueryParams: Record<string, string | undefined>
+    showPrivateLinkFormErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface playerShareLogicActions {
+    resetPrivateLinkForm: (values?: FormWithTime) => {
+        values?: FormWithTime
+    }
+    setPrivateLinkFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setPrivateLinkFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setPrivateLinkFormValues: (values: DeepPartial<FormWithTime>) => {
+        values: DeepPartial<FormWithTime>
+    }
+    submitPrivateLinkForm: () => {
+        value: boolean
+    }
+    submitPrivateLinkFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitPrivateLinkFormRequest: (privateLinkForm: FormWithTime) => {
+        privateLinkForm: FormWithTime
+    }
+    submitPrivateLinkFormSuccess: (privateLinkForm: FormWithTime) => {
+        privateLinkForm: FormWithTime
+    }
+    touchPrivateLinkFormField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface playerShareLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        privateLinkUrlQueryParams: (privateLinkForm: FormWithTime) => Record<string, string | undefined>
+        privateLinkUrl: (privateLinkForm: FormWithTime) => string
+    }
+}
+
+export type playerShareLogicType = MakeLogicType<
+    playerShareLogicValues,
+    playerShareLogicActions,
+    PlayerShareLogicProps,
+    playerShareLogicMeta
+>
+
 export const playerShareLogic = kea<playerShareLogicType>([
     path(() => ['scenes', 'session-recordings', 'player', 'playerShareLogic']),
     props({} as PlayerShareLogicProps),
@@ -58,13 +130,13 @@ export const playerShareLogic = kea<playerShareLogicType>([
     selectors(({ props }) => ({
         privateLinkUrlQueryParams: [
             (s) => [s.privateLinkForm],
-            (privateLinkForm) => {
+            (privateLinkForm: FormWithTime) => {
                 return makePrivateLinkQueryParams(privateLinkForm)
             },
         ],
         privateLinkUrl: [
             (s) => [s.privateLinkForm],
-            (privateLinkForm) => {
+            (privateLinkForm: FormWithTime) => {
                 return makePrivateLink(props.id, privateLinkForm)
             },
         ],
diff --git a/frontend/src/scenes/session-recordings/player/sidebar/playerSidebarLogic.ts b/frontend/src/scenes/session-recordings/player/sidebar/playerSidebarLogic.ts
index cbd5fd3b5897..4a8125a409d8 100644
--- a/frontend/src/scenes/session-recordings/player/sidebar/playerSidebarLogic.ts
+++ b/frontend/src/scenes/session-recordings/player/sidebar/playerSidebarLogic.ts
@@ -1,9 +1,21 @@
-import { actions, kea, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers } from 'kea'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 
 import { SessionRecordingSidebarTab } from '~/types'
 
-import type { playerSidebarLogicType } from './playerSidebarLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface playerSidebarLogicValues {
+    activeTab: SessionRecordingSidebarTab
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface playerSidebarLogicActions {
+    setTab: (tab: SessionRecordingSidebarTab) => {
+        tab: SessionRecordingSidebarTab
+    }
+}
+
+export type playerSidebarLogicType = MakeLogicType<playerSidebarLogicValues, playerSidebarLogicActions>
 
 export const playerSidebarLogic = kea<playerSidebarLogicType>([
     path(() => ['scenes', 'session-recordings', 'player', 'playerSidebarLogic']),
diff --git a/frontend/src/scenes/session-recordings/player/snapshotDataLogic.tsx b/frontend/src/scenes/session-recordings/player/snapshotDataLogic.tsx
index a0257a951fe5..1ef512ef2720 100644
--- a/frontend/src/scenes/session-recordings/player/snapshotDataLogic.tsx
+++ b/frontend/src/scenes/session-recordings/player/snapshotDataLogic.tsx
@@ -1,6 +1,19 @@
 import '~/queries/utils'
 
-import { actions, afterMount, beforeUnmount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    afterMount,
+    beforeUnmount,
+    connect,
+    kea,
+    key,
+    listeners,
+    path,
+    props,
+    reducers,
+    selectors,
+} from 'kea'
 import { loaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
@@ -21,7 +34,6 @@ import {
 } from '~/types'
 
 import { SeekTarget, planNextBatch } from './snapshot-store/planNextBatch'
-import type { snapshotDataLogicType } from './snapshotDataLogicType'
 
 const DEFAULT_V2_POLLING_INTERVAL_MS: number = 10000
 const MAX_V2_POLLING_INTERVAL_MS = 60000
@@ -34,6 +46,189 @@ export interface SnapshotLogicProps {
     accessToken?: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface snapshotDataLogicValues {
+    getWindowId: (uuid: string | undefined) => number | undefined // windowIdRegistryLogic
+    uuidToIndex: Record<string, number> // windowIdRegistryLogic
+    allSourcesLoaded: boolean
+    isLoadingSnapshots: boolean
+    isPolling: boolean
+    isRecordingDeleted: boolean
+    loadAllMode: boolean
+    loadingSources: Pick<SessionRecordingSnapshotSource, 'blob_key' | 'end_timestamp' | 'source' | 'start_timestamp'>[]
+    pollingInterval: number
+    recordingDeletedAt: number | null
+    recordingDeletedBy: string | null
+    seekTarget: SeekTarget | null
+    snapshotLoadError: Error | null
+    snapshotSources: SessionRecordingSnapshotSource[] | null
+    snapshotSourcesLoading: boolean
+    snapshotStore: SnapshotStore
+    snapshotsForSource: SessionRecordingSnapshotSourceResponse | null
+    snapshotsForSourceLoading: boolean
+    snapshotsLoaded: boolean
+    snapshotsLoading: boolean
+    sourceLoadingStates: SourceLoadingState[]
+    storeUpdateCount: number
+    storeVersion: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface snapshotDataLogicActions {
+    registerWindowId: (uuid: string) => {
+        uuid: string
+    } // windowIdRegistryLogic
+    loadAllSources: () => {
+        value: true
+    }
+    loadNextSnapshotSource: () => {
+        value: true
+    }
+    loadSnapshotSources: (breakpointLength?: number) => {
+        breakpointLength: number | undefined
+    }
+    loadSnapshotSourcesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSnapshotSourcesSuccess: (
+        snapshotSources: SessionRecordingSnapshotSource[],
+        payload?: {
+            breakpointLength: number | undefined
+        }
+    ) => {
+        snapshotSources: SessionRecordingSnapshotSource[]
+        payload?: {
+            breakpointLength: number | undefined
+        }
+    }
+    loadSnapshots: () => {
+        value: true
+    }
+    loadSnapshotsForSource: (sources: Pick<SessionRecordingSnapshotSource, 'blob_key' | 'source'>[]) => {
+        sources: Pick<SessionRecordingSnapshotSource, 'blob_key' | 'source'>[]
+    }
+    loadSnapshotsForSourceFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSnapshotsForSourceSuccess: (
+        snapshotsForSource:
+            | {
+                  source: Pick<SessionRecordingSnapshotSource, 'blob_key' | 'source'>
+                  sources?: undefined
+              }
+            | {
+                  source?: undefined
+                  sources: Pick<SessionRecordingSnapshotSource, 'blob_key' | 'source'>[]
+              },
+        payload?: {
+            sources: Pick<SessionRecordingSnapshotSource, 'blob_key' | 'source'>[]
+        }
+    ) => {
+        snapshotsForSource:
+            | {
+                  source: Pick<SessionRecordingSnapshotSource, 'blob_key' | 'source'>
+                  sources?: undefined
+              }
+            | {
+                  source?: undefined
+                  sources: Pick<SessionRecordingSnapshotSource, 'blob_key' | 'source'>[]
+              }
+        payload?: {
+            sources: Pick<SessionRecordingSnapshotSource, 'blob_key' | 'source'>[]
+        }
+    }
+    maybeStartPolling: () => {
+        value: true
+    }
+    resetPollingInterval: () => {
+        value: true
+    }
+    setPlayerActive: (active: boolean) => {
+        active: boolean
+    }
+    setPollingInterval: (intervalMs: number) => {
+        intervalMs: number
+    }
+    setSnapshots: (snapshots: RecordingSnapshot[]) => {
+        snapshots: RecordingSnapshot[]
+    }
+    setTargetTimestamp: (
+        timestamp: number | null,
+        windowId?: number
+    ) => {
+        timestamp: number | null
+        windowId: number | undefined
+    }
+    snapshotSourceLoadExhausted: () => {
+        value: true
+    }
+    startPolling: () => {
+        value: true
+    }
+    stopPolling: () => {
+        value: true
+    }
+    storeUpdated: () => {
+        value: true
+    }
+    updatePlaybackPosition: (
+        timestamp: number,
+        windowId?: number
+    ) => {
+        timestamp: number
+        windowId: number | undefined
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface snapshotDataLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        snapshotsLoading: (
+            snapshotSourcesLoading: boolean,
+            snapshotsForSourceLoading: boolean,
+            storeVersion: number
+        ) => boolean
+        snapshotsLoaded: (
+            snapshotSources: import('@posthog/replay-shared').SessionRecordingSnapshotSource[] | null
+        ) => boolean
+        isLoadingSnapshots: (
+            loadingSources: Pick<
+                import('@posthog/replay-shared').SessionRecordingSnapshotSource,
+                'blob_key' | 'end_timestamp' | 'source' | 'start_timestamp'
+            >[]
+        ) => boolean
+        allSourcesLoaded: (
+            snapshotSources: import('@posthog/replay-shared').SessionRecordingSnapshotSource[] | null,
+            storeVersion: number
+        ) => boolean
+        storeVersion: (
+            storeUpdateCount: number,
+            snapshotSources: import('@posthog/replay-shared').SessionRecordingSnapshotSource[] | null
+        ) => number
+        snapshotStore: (storeVersion: number) => SnapshotStore
+        sourceLoadingStates: (storeVersion: number) => SourceLoadingState[]
+        isRecordingDeleted: (snapshotLoadError: Error | null) => boolean
+        recordingDeletedAt: (snapshotLoadError: Error | null) => number | null
+        recordingDeletedBy: (snapshotLoadError: Error | null) => string | null
+    }
+}
+
+export type snapshotDataLogicType = MakeLogicType<
+    snapshotDataLogicValues,
+    snapshotDataLogicActions,
+    SnapshotLogicProps,
+    snapshotDataLogicMeta
+>
+
 // Reactivity note (#53893): `cache.store` (SnapshotStore) lives outside Kea, so any listener that mutates it (markFetched, setSources) MUST dispatch `storeUpdated()` afterwards, and any selector reading it MUST depend on `storeVersion`.
 export const snapshotDataLogic = kea<snapshotDataLogicType>([
     path((key) => ['scenes', 'session-recordings', 'snapshotLogic', key]),
@@ -457,18 +652,26 @@ export const snapshotDataLogic = kea<snapshotDataLogicType>([
             },
         ],
 
-        snapshotsLoaded: [(s) => [s.snapshotSources], (snapshotSources): boolean => !!snapshotSources],
+        snapshotsLoaded: [
+            (s) => [s.snapshotSources],
+            (snapshotSources: SessionRecordingSnapshotSource[] | null): boolean => !!snapshotSources,
+        ],
 
         isLoadingSnapshots: [
             (s) => [s.loadingSources],
-            (loadingSources): boolean => {
+            (
+                loadingSources: Pick<
+                    SessionRecordingSnapshotSource,
+                    'blob_key' | 'end_timestamp' | 'source' | 'start_timestamp'
+                >[]
+            ): boolean => {
                 return loadingSources.length > 0
             },
         ],
 
         allSourcesLoaded: [
             (s) => [s.snapshotSources, s.storeVersion],
-            (snapshotSources, _storeVersion: number): boolean => {
+            (snapshotSources: SessionRecordingSnapshotSource[] | null, _storeVersion: number): boolean => {
                 if (!snapshotSources || snapshotSources.length === 0) {
                     return false
                 }
@@ -501,14 +704,14 @@ export const snapshotDataLogic = kea<snapshotDataLogicType>([
 
         isRecordingDeleted: [
             (s) => [s.snapshotLoadError],
-            (snapshotLoadError): boolean => {
+            (snapshotLoadError: Error | null): boolean => {
                 return snapshotLoadError instanceof RecordingDeletedError
             },
         ],
 
         recordingDeletedAt: [
             (s) => [s.snapshotLoadError],
-            (snapshotLoadError): number | null => {
+            (snapshotLoadError: Error | null): number | null => {
                 if (snapshotLoadError instanceof RecordingDeletedError) {
                     return snapshotLoadError.deletedAt
                 }
@@ -518,7 +721,7 @@ export const snapshotDataLogic = kea<snapshotDataLogicType>([
 
         recordingDeletedBy: [
             (s) => [s.snapshotLoadError],
-            (snapshotLoadError): string | null => {
+            (snapshotLoadError: Error | null): string | null => {
                 if (snapshotLoadError instanceof RecordingDeletedError) {
                     return snapshotLoadError.deletedBy
                 }
diff --git a/frontend/src/scenes/session-recordings/player/windowIdRegistryLogic.ts b/frontend/src/scenes/session-recordings/player/windowIdRegistryLogic.ts
index b8a52d1e6b3d..399471203729 100644
--- a/frontend/src/scenes/session-recordings/player/windowIdRegistryLogic.ts
+++ b/frontend/src/scenes/session-recordings/player/windowIdRegistryLogic.ts
@@ -1,13 +1,41 @@
-import { actions, kea, key, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, key, path, props, reducers, selectors } from 'kea'
 
 import { SessionRecordingId } from '~/types'
 
-import type { windowIdRegistryLogicType } from './windowIdRegistryLogicType'
-
 export interface WindowIdRegistryLogicProps {
     sessionRecordingId: SessionRecordingId
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface windowIdRegistryLogicValues {
+    getWindowId: (uuid: string | undefined) => number | undefined
+    uuidToIndex: Record<string, number>
+    windowIds: number[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface windowIdRegistryLogicActions {
+    registerWindowId: (uuid: string) => {
+        uuid: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface windowIdRegistryLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        getWindowId: (uuidToIndex: Record<string, number>) => (uuid: string | undefined) => number | undefined
+        windowIds: (uuidToIndex: Record<string, number>) => number[]
+    }
+}
+
+export type windowIdRegistryLogicType = MakeLogicType<
+    windowIdRegistryLogicValues,
+    windowIdRegistryLogicActions,
+    WindowIdRegistryLogicProps,
+    windowIdRegistryLogicMeta
+>
+
 export const windowIdRegistryLogic = kea<windowIdRegistryLogicType>([
     path((key) => ['scenes', 'session-recordings', 'windowIdRegistryLogic', key]),
     props({} as WindowIdRegistryLogicProps),
@@ -31,7 +59,7 @@ export const windowIdRegistryLogic = kea<windowIdRegistryLogicType>([
     selectors({
         getWindowId: [
             (s) => [s.uuidToIndex],
-            (uuidToIndex) =>
+            (uuidToIndex: Record<string, number>) =>
                 (uuid: string | undefined): number | undefined => {
                     if (!uuid) {
                         return undefined
@@ -41,7 +69,7 @@ export const windowIdRegistryLogic = kea<windowIdRegistryLogicType>([
         ],
         windowIds: [
             (s) => [s.uuidToIndex],
-            (uuidToIndex): number[] => Object.values(uuidToIndex).sort((a, b) => a - b),
+            (uuidToIndex: Record<string, number>): number[] => Object.values(uuidToIndex).sort((a, b) => a - b),
         ],
     }),
 ])
diff --git a/frontend/src/scenes/session-recordings/playlist/playlistFiltersLogic.ts b/frontend/src/scenes/session-recordings/playlist/playlistFiltersLogic.ts
index 00c09b24e9de..3f1078498733 100644
--- a/frontend/src/scenes/session-recordings/playlist/playlistFiltersLogic.ts
+++ b/frontend/src/scenes/session-recordings/playlist/playlistFiltersLogic.ts
@@ -1,11 +1,35 @@
-import { actions, kea, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers } from 'kea'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 
 import { urls } from 'scenes/urls'
 
 import { ReplayTabs } from '~/types'
 
-import type { playlistFiltersLogicType } from './playlistFiltersLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface playlistFiltersLogicValues {
+    activeCategory: string
+    activeFilterTab: string
+    isExpanded: boolean
+    isFiltersExpanded: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface playlistFiltersLogicActions {
+    setActiveCategory: (categoryId: string) => {
+        categoryId: string
+    }
+    setActiveFilterTab: (activeFilterTab: string) => {
+        activeFilterTab: string
+    }
+    setIsExpanded: (isExpanded: boolean) => {
+        isExpanded: boolean
+    }
+    setIsFiltersExpanded: (isFiltersExpanded: boolean) => {
+        isFiltersExpanded: boolean
+    }
+}
+
+export type playlistFiltersLogicType = MakeLogicType<playlistFiltersLogicValues, playlistFiltersLogicActions>
 
 export const playlistFiltersLogic = kea<playlistFiltersLogicType>([
     path(['scenes', 'session-recordings', 'playlist', 'playlistFiltersLogic']),
diff --git a/frontend/src/scenes/session-recordings/playlist/playlistUtils.ts b/frontend/src/scenes/session-recordings/playlist/playlistUtils.ts
index 1ea463352424..2dd5e7e761bf 100644
--- a/frontend/src/scenes/session-recordings/playlist/playlistUtils.ts
+++ b/frontend/src/scenes/session-recordings/playlist/playlistUtils.ts
@@ -15,7 +15,7 @@ import { teamLogic } from 'scenes/teamLogic'
 import { urls } from 'scenes/urls'
 
 import { deleteFromTree, refreshTreeItem } from '~/layout/panel-layout/ProjectTree/projectTreeLogic'
-import { cohortsModelType } from '~/models/cohortsModelType'
+import type { cohortsModelType } from '~/models/cohortsModel'
 import { getCoreFilterDefinition } from '~/taxonomy/helpers'
 import {
     PropertyOperator,
diff --git a/frontend/src/scenes/session-recordings/playlist/sessionRecordingsListPropertiesLogic.ts b/frontend/src/scenes/session-recordings/playlist/sessionRecordingsListPropertiesLogic.ts
index dfc209c6dab5..c4d5a2ab703b 100644
--- a/frontend/src/scenes/session-recordings/playlist/sessionRecordingsListPropertiesLogic.ts
+++ b/frontend/src/scenes/session-recordings/playlist/sessionRecordingsListPropertiesLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api, { ApiError } from 'lib/api'
@@ -11,7 +11,6 @@ import { CORE_FILTER_DEFINITIONS_BY_GROUP } from '~/taxonomy/taxonomy'
 import { SessionRecordingPropertiesType, SessionRecordingType } from '~/types'
 
 import { sessionRecordingPinnedPropertiesLogic } from '../player/player-meta/sessionRecordingPinnedPropertiesLogic'
-import type { sessionRecordingsListPropertiesLogicType } from './sessionRecordingsListPropertiesLogicType'
 
 const QUERY_TAGS: QueryLogTags = { scene: 'Replay', productKey: 'session_replay' }
 
@@ -66,6 +65,64 @@ function buildPropertiesQuery(
                         GROUP BY session_id`
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingsListPropertiesLogicValues {
+    pinnedProperties: string[] // sessionRecordingPinnedPropertiesLogic
+    extraSessionProperties: string[]
+    recordingProperties: SessionRecordingPropertiesType[]
+    recordingPropertiesById: Record<string, SessionRecordingPropertiesType['properties']>
+    recordingPropertiesLoading: boolean
+    unqueryableExtraProperties: string[] | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingsListPropertiesLogicActions {
+    reportRecordingsListPropertiesFetched: (loadTime: number) => {
+        loadTime: number
+    } // sessionRecordingEventUsageLogic
+    loadPropertiesForSessions: (sessions: SessionRecordingType[]) => {
+        sessions: SessionRecordingType[]
+    }
+    loadPropertiesForSessionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPropertiesForSessionsSuccess: (
+        recordingProperties: SessionRecordingPropertiesType[],
+        payload?: {
+            sessions: SessionRecordingType[]
+        }
+    ) => {
+        recordingProperties: SessionRecordingPropertiesType[]
+        payload?: {
+            sessions: SessionRecordingType[]
+        }
+    }
+    markExtraPropertiesUnqueryable: (properties: string[]) => {
+        properties: string[]
+    }
+    maybeLoadPropertiesForSessions: (sessions: SessionRecordingType[]) => {
+        sessions: SessionRecordingType[]
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingsListPropertiesLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        extraSessionProperties: (pinnedProperties: string[], unqueryableExtraProperties: string[] | null) => string[]
+    }
+}
+
+export type sessionRecordingsListPropertiesLogicType = MakeLogicType<
+    sessionRecordingsListPropertiesLogicValues,
+    sessionRecordingsListPropertiesLogicActions,
+    Record<string, any>,
+    sessionRecordingsListPropertiesLogicMeta
+>
+
 // This logic is used to fetch properties for a list of recordings
 // It is used in a global way as the cached values can be re-used
 export const sessionRecordingsListPropertiesLogic = kea<sessionRecordingsListPropertiesLogicType>([
@@ -173,7 +230,7 @@ export const sessionRecordingsListPropertiesLogic = kea<sessionRecordingsListPro
     selectors({
         extraSessionProperties: [
             (s) => [s.pinnedProperties, s.unqueryableExtraProperties],
-            (pinnedProperties, unqueryableExtraProperties): string[] => {
+            (pinnedProperties: string[], unqueryableExtraProperties: string[] | null): string[] => {
                 const extras = pinnedSessionProperties(pinnedProperties)
                 // while the pin set that failed to query is unchanged, don't retry it
                 if (
diff --git a/frontend/src/scenes/session-recordings/playlist/sessionRecordingsPlaylistLogic.ts b/frontend/src/scenes/session-recordings/playlist/sessionRecordingsPlaylistLogic.ts
index 92877aebdbe8..5f38baf71406 100644
--- a/frontend/src/scenes/session-recordings/playlist/sessionRecordingsPlaylistLogic.ts
+++ b/frontend/src/scenes/session-recordings/playlist/sessionRecordingsPlaylistLogic.ts
@@ -1,5 +1,5 @@
 import { deepEqual as equal } from 'fast-equals'
-import { actions, afterMount, connect, kea, key, listeners, path, props, propsChanged, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, propsChanged, reducers, selectors } from 'kea'
 import { lazyLoaders, loaders } from 'kea-loaders'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 import posthog from 'posthog-js'
@@ -59,8 +59,11 @@ import { playlistFiltersLogic } from './playlistFiltersLogic'
 // `recordingsQueryConversions` module so they can be imported without pulling in this logic file.
 export { DEFAULT_RECORDING_FILTERS_ORDER_BY, convertUniversalFiltersToRecordingsQuery }
 import { sessionRecordingsListPropertiesLogic } from './sessionRecordingsListPropertiesLogic'
-import type { sessionRecordingsPlaylistLogicType } from './sessionRecordingsPlaylistLogicType'
 import { sessionRecordingsPlaylistSceneLogic } from './sessionRecordingsPlaylistSceneLogic'
+import type { AutoplayDirection } from '../../../types'
+import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
+import type { HideViewedRecordingsOptions } from '../player/playerSettingsLogic'
+import type { RecordingOrderDirection } from '../../../queries/schema/schema-general'
 
 export type PersonUUID = string
 
@@ -414,6 +417,250 @@ export interface SessionRecordingPlaylistLogicProps {
 
 const isRelativeDate = (x: RecordingUniversalFilters['date_from']): boolean => !!x && x.startsWith('-')
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingsPlaylistLogicValues {
+    deletedRecordingIds: Set<string>; // deletedRecordingsLogic
+    featureFlags: FeatureFlagsSet; // featureFlagLogic
+    autoplayDirection: AutoplayDirection; // playerSettingsLogic
+    hideViewedRecordings: HideViewedRecordingsOptions; // playerSettingsLogic
+    activeSessionRecording: SessionRecordingType | undefined;
+    activeSessionRecordingId: SessionRecordingId | undefined;
+    addToCollectionSearch: string;
+    allowEventPropertyExpansion: boolean;
+    allowHogQLFilters: boolean;
+    collectionsForBulkAdd: SavedSessionRecordingPlaylistsResult;
+    collectionsForBulkAddLoading: boolean;
+    deleteConfirmationText: string;
+    eventsHaveSessionId: Record<string, boolean>;
+    eventsHaveSessionIdLoading: boolean;
+    filters: RecordingUniversalFilters;
+    hasNext: boolean;
+    hiddenRecordings: SessionRecordingType[];
+    hiddenRecordingsCount: number;
+    isAddToCollectionModalOpen: boolean;
+    isCreatingNewCollectionInModal: boolean;
+    isDeleteSelectedRecordingsDialogOpen: boolean;
+    logicProps: SessionRecordingPlaylistLogicProps;
+    matchingEventsMatchType: MatchingEventsMatchType;
+    newCollectionName: string;
+    nextSessionRecording: Partial<SessionRecordingType> | undefined;
+    otherRecordings: SessionRecordingType[];
+    pinnedFilters: UniversalFiltersGroup | undefined;
+    pinnedRecordings: SessionRecordingType[];
+    pinnedRecordingsLoading: boolean;
+    recordings: SessionRecordingType[];
+    recordingsCount: number;
+    selectedRecordingId: SessionRecordingType["id"] | null;
+    selectedRecordingOutsideFilters: boolean;
+    selectedRecordingsIds: string[];
+    sessionRecordings: SessionRecordingType[];
+    sessionRecordingsAPIErrored: boolean;
+    sessionRecordingsResponse: RecordingsQueryResponse & {
+        order: RecordingsQuery["order"];
+        order_direction: RecordingsQuery["order_direction"];
+    };
+    sessionRecordingsResponseLoading: boolean;
+    showFilters: boolean;
+    showSettings: boolean;
+    totalFiltersCount: number;
+    unusableEventsInFilter: string[];
+    visiblePinnedRecordings: SessionRecordingType[];
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingsPlaylistLogicActions {
+    addDeletedRecordings: (ids: string[]) => {
+        ids: string[];
+    }; // deletedRecordingsLogic
+    setHideViewedRecordings: (hideViewedRecordings: HideViewedRecordingsOptions) => {
+        hideViewedRecordings: HideViewedRecordingsOptions;
+    }; // playerSettingsLogic
+    setIsFiltersExpanded: (isFiltersExpanded: boolean) => {
+        isFiltersExpanded: boolean;
+    }; // playlistFiltersLogic
+    reportRecordingsListFetched: (loadTime: number, filters: RecordingUniversalFilters, defaultDurationFilter: RecordingDurationFilter) => {
+        defaultDurationFilter: RecordingDurationFilter;
+        filters: RecordingUniversalFilters;
+        loadTime: number;
+    }; // sessionRecordingEventUsageLogic
+    reportRecordingsListFilterAdded: (filterType: import("scenes/session-recordings/sessionRecordingEventUsageLogic").SessionRecordingFilterType) => {
+        filterType: import("scenes/session-recordings/sessionRecordingEventUsageLogic").SessionRecordingFilterType;
+    }; // sessionRecordingEventUsageLogic
+    maybeLoadPropertiesForSessions: (sessions: SessionRecordingType[]) => {
+        sessions: SessionRecordingType[];
+    }; // sessionRecordingsListPropertiesLogic
+    applyPropertyFilter: (propertyKey: string, propertyValue: string | undefined) => {
+        propertyKey: string;
+        propertyValue: string | undefined;
+    };
+    handleBulkAddToPlaylist: (short_id: string) => {
+        short_id: string;
+    };
+    handleBulkDeleteFromPlaylist: (short_id: string) => {
+        short_id: string;
+    };
+    handleBulkMarkAsNotViewed: (shortId?: string) => {
+        shortId: string | undefined;
+    };
+    handleBulkMarkAsViewed: (shortId?: string) => {
+        shortId: string | undefined;
+    };
+    handleCreateNewCollectionBulkAdd: (onSuccess: () => void) => {
+        onSuccess: () => void;
+    };
+    handleDeleteSelectedRecordings: (shortId?: string) => {
+        shortId: string | undefined;
+    };
+    handleSelectUnselectAll: (checked: boolean, type: "collection" | "filters") => {
+        checked: boolean;
+        type: "collection" | "filters";
+    };
+    loadAllRecordings: () => {
+        value: true;
+    };
+    loadCollectionsForBulkAdd: (_: any) => any;
+    loadCollectionsForBulkAddFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadCollectionsForBulkAddSuccess: (collectionsForBulkAdd: SavedSessionRecordingPlaylistsResult, payload?: any) => {
+        collectionsForBulkAdd: SavedSessionRecordingPlaylistsResult;
+        payload?: any;
+    };
+    loadEventsHaveSessionId: () => any;
+    loadEventsHaveSessionIdFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadEventsHaveSessionIdSuccess: (eventsHaveSessionId: Record<string, boolean>, payload?: any) => {
+        eventsHaveSessionId: Record<string, boolean>;
+        payload?: any;
+    };
+    loadNext: () => {
+        value: true;
+    };
+    loadPinnedRecordings: () => {
+        value: true;
+    };
+    loadPinnedRecordingsFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadPinnedRecordingsSuccess: (pinnedRecordings: SessionRecordingType[], payload?: {
+        value: true;
+    }) => {
+        pinnedRecordings: SessionRecordingType[];
+        payload?: {
+            value: true;
+        };
+    };
+    loadPrev: () => {
+        value: true;
+    };
+    loadSessionRecordings: (direction?: "newer" | "older", userModifiedFilters?: Record<string, any>) => {
+        direction: "newer" | "older" | undefined;
+        userModifiedFilters: Record<string, any> | undefined;
+    };
+    loadSessionRecordingsFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadSessionRecordingsSuccess: (sessionRecordingsResponse: {
+        has_next: boolean;
+        next_cursor: string | undefined;
+        order: "active_seconds" | "activity_score" | "click_count" | "console_error_count" | "duration" | "inactive_seconds" | "keypress_count" | "mouse_activity_count" | "recording_duration" | "recording_ttl" | "start_time" | "surfacing_score" | undefined;
+        order_direction: RecordingOrderDirection | undefined;
+        results: SessionRecordingType[];
+    }, payload?: {
+        direction: "newer" | "older" | undefined;
+        userModifiedFilters: Record<string, any> | undefined;
+    }) => {
+        sessionRecordingsResponse: {
+            has_next: boolean;
+            next_cursor: string | undefined;
+            order: "active_seconds" | "activity_score" | "click_count" | "console_error_count" | "duration" | "inactive_seconds" | "keypress_count" | "mouse_activity_count" | "recording_duration" | "recording_ttl" | "start_time" | "surfacing_score" | undefined;
+            order_direction: RecordingOrderDirection | undefined;
+            results: SessionRecordingType[];
+        };
+        payload?: {
+            direction: "newer" | "older" | undefined;
+            userModifiedFilters: Record<string, any> | undefined;
+        };
+    };
+    maybeLoadSessionRecordings: (direction?: "newer" | "older") => {
+        direction: "newer" | "older" | undefined;
+    };
+    resetFilters: () => {
+        value: true;
+    };
+    setAddToCollectionSearch: (addToCollectionSearch: string) => {
+        addToCollectionSearch: string;
+    };
+    setDeleteConfirmationText: (deleteConfirmationText: string) => {
+        deleteConfirmationText: string;
+    };
+    setFilters: (filters: Partial<RecordingUniversalFilters>) => {
+        filters: Partial<RecordingUniversalFilters>;
+    };
+    setIsAddToCollectionModalOpen: (isAddToCollectionModalOpen: boolean) => {
+        isAddToCollectionModalOpen: boolean;
+    };
+    setIsCreatingNewCollectionInModal: (isCreatingNewCollectionInModal: boolean) => {
+        isCreatingNewCollectionInModal: boolean;
+    };
+    setIsDeleteSelectedRecordingsDialogOpen: (isDeleteSelectedRecordingsDialogOpen: boolean) => {
+        isDeleteSelectedRecordingsDialogOpen: boolean;
+    };
+    setNewCollectionName: (newCollectionName: string) => {
+        newCollectionName: string;
+    };
+    setSelectedRecordingId: (id: SessionRecordingType["id"] | null) => {
+        id: string | null;
+    };
+    setSelectedRecordingsIds: (recordingsIds: string[]) => {
+        recordingsIds: string[];
+    };
+    setShowFilters: (showFilters: boolean) => {
+        showFilters: boolean;
+    };
+    setShowSettings: (showSettings: boolean) => {
+        showSettings: boolean;
+    };
+    togglePropertyFilter: (propertyKey: string, propertyValue: string | undefined) => {
+        propertyKey: string;
+        propertyValue: string | undefined;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingsPlaylistLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        logicProps: (arg: any) => SessionRecordingPlaylistLogicProps;
+        allowEventPropertyExpansion: (featureFlags: FeatureFlagsSet) => boolean;
+        matchingEventsMatchType: (filters: RecordingUniversalFilters) => MatchingEventsMatchType;
+        activeSessionRecordingId: (selectedRecordingId: string | null, recordings: SessionRecordingType[], arg: any) => SessionRecordingId | undefined;
+        activeSessionRecording: (activeSessionRecordingId: string | undefined, recordings: SessionRecordingType[]) => SessionRecordingType | undefined;
+        selectedRecordingOutsideFilters: (selectedRecordingId: string | null, recordings: SessionRecordingType[]) => boolean;
+        nextSessionRecording: (activeSessionRecording: SessionRecordingType | undefined, recordings: SessionRecordingType[], autoplayDirection: AutoplayDirection) => Partial<SessionRecordingType> | undefined;
+        hasNext: (sessionRecordingsResponse: RecordingsQueryResponse & {
+            order: RecordingsQuery["order"];
+            order_direction: RecordingsQuery["order_direction"];
+        }) => boolean;
+        pinnedFilters: (arg: any) => UniversalFiltersGroup | undefined;
+        totalFiltersCount: (filters: RecordingUniversalFilters, arg: any, arg2: any) => number;
+        hiddenRecordings: (sessionRecordings: SessionRecordingType[], hideViewedRecordings: HideViewedRecordingsOptions, selectedRecordingId: string | null, deletedRecordingIds: Set<string>) => SessionRecordingType[];
+        otherRecordings: (sessionRecordings: SessionRecordingType[], hideViewedRecordings: HideViewedRecordingsOptions, pinnedRecordings: SessionRecordingType[], deletedRecordingIds: Set<string>, selectedRecordingId: string | null, filters: RecordingUniversalFilters) => SessionRecordingType[];
+        visiblePinnedRecordings: (pinnedRecordings: SessionRecordingType[], deletedRecordingIds: Set<string>) => SessionRecordingType[];
+        recordings: (visiblePinnedRecordings: SessionRecordingType[], otherRecordings: SessionRecordingType[], arg: any) => SessionRecordingType[];
+        recordingsCount: (recordings: SessionRecordingType[]) => number;
+        hiddenRecordingsCount: (hiddenRecordings: SessionRecordingType[]) => number;
+        allowHogQLFilters: (featureFlags: FeatureFlagsSet) => boolean;
+    };
+}
+
+export type sessionRecordingsPlaylistLogicType = MakeLogicType<sessionRecordingsPlaylistLogicValues, sessionRecordingsPlaylistLogicActions, SessionRecordingPlaylistLogicProps, sessionRecordingsPlaylistLogicMeta>;
+
 export const sessionRecordingsPlaylistLogic = kea<sessionRecordingsPlaylistLogicType>([
     path((key) => ['scenes', 'session-recordings', 'playlist', 'sessionRecordingsPlaylistLogic', key]),
     props({} as SessionRecordingPlaylistLogicProps),
@@ -1226,14 +1473,14 @@ export const sessionRecordingsPlaylistLogic = kea<sessionRecordingsPlaylistLogic
 
         allowEventPropertyExpansion: [
             (s) => [s.featureFlags],
-            (featureFlags): boolean => {
+            (featureFlags: FeatureFlagsSet): boolean => {
                 return !!featureFlags[FEATURE_FLAGS.RECORDINGS_PLAYER_EVENT_PROPERTY_EXPANSION]
             },
         ],
 
         matchingEventsMatchType: [
             (s) => [s.filters],
-            (filters): MatchingEventsMatchType => {
+            (filters: RecordingUniversalFilters): MatchingEventsMatchType => {
                 if (!filters) {
                     return { matchType: 'none' }
                 }
@@ -1280,21 +1527,21 @@ export const sessionRecordingsPlaylistLogic = kea<sessionRecordingsPlaylistLogic
 
         activeSessionRecordingId: [
             (s) => [s.selectedRecordingId, s.recordings, (_, props) => props.autoPlay],
-            (selectedRecordingId, recordings, autoPlay): SessionRecordingId | undefined => {
+            (selectedRecordingId: string | null, recordings: SessionRecordingType[], autoPlay): SessionRecordingId | undefined => {
                 return selectedRecordingId ? selectedRecordingId : autoPlay ? recordings[0]?.id : undefined
             },
         ],
 
         activeSessionRecording: [
             (s) => [s.activeSessionRecordingId, s.recordings],
-            (activeSessionRecordingId, recordings): SessionRecordingType | undefined => {
+            (activeSessionRecordingId: string | undefined, recordings: SessionRecordingType[]): SessionRecordingType | undefined => {
                 return recordings.find((rec) => rec.id === activeSessionRecordingId)
             },
         ],
 
         selectedRecordingOutsideFilters: [
             (s) => [s.selectedRecordingId, s.recordings],
-            (selectedRecordingId, recordings): boolean => {
+            (selectedRecordingId: string | null, recordings: SessionRecordingType[]): boolean => {
                 if (!selectedRecordingId) {
                     return false
                 }
@@ -1304,7 +1551,7 @@ export const sessionRecordingsPlaylistLogic = kea<sessionRecordingsPlaylistLogic
 
         nextSessionRecording: [
             (s) => [s.activeSessionRecording, s.recordings, s.autoplayDirection],
-            (activeSessionRecording, recordings, autoplayDirection): Partial<SessionRecordingType> | undefined => {
+            (activeSessionRecording: SessionRecordingType | undefined, recordings: SessionRecordingType[], autoplayDirection: AutoplayDirection): Partial<SessionRecordingType> | undefined => {
                 if (!activeSessionRecording || !autoplayDirection) {
                     return
                 }
@@ -1317,7 +1564,10 @@ export const sessionRecordingsPlaylistLogic = kea<sessionRecordingsPlaylistLogic
 
         hasNext: [
             (s) => [s.sessionRecordingsResponse],
-            (sessionRecordingsResponse) => sessionRecordingsResponse.has_next,
+            (sessionRecordingsResponse: RecordingsQueryResponse & {
+    order: RecordingsQuery["order"];
+    order_direction: RecordingsQuery["order_direction"];
+}) => sessionRecordingsResponse.has_next,
         ],
 
         pinnedFilters: [
@@ -1327,7 +1577,7 @@ export const sessionRecordingsPlaylistLogic = kea<sessionRecordingsPlaylistLogic
 
         totalFiltersCount: [
             (s) => [s.filters, (_, props) => props.personUUID, (_, props) => props.pinnedFilters],
-            (filters, personUUID, pinnedFilters) => {
+            (filters: RecordingUniversalFilters, personUUID, pinnedFilters) => {
                 const defaultFilters = getDefaultFilters(personUUID, pinnedFilters)
                 const groupFilters = filtersFromUniversalFilterGroups(filters)
                 const pinnedValues: UniversalFilterValue[] = pinnedFilters?.values ?? []
@@ -1346,10 +1596,10 @@ export const sessionRecordingsPlaylistLogic = kea<sessionRecordingsPlaylistLogic
         hiddenRecordings: [
             (s) => [s.sessionRecordings, s.hideViewedRecordings, s.selectedRecordingId, s.deletedRecordingIds],
             (
-                sessionRecordings,
-                hideViewedRecordings,
-                selectedRecordingId,
-                deletedRecordingIds
+                sessionRecordings: SessionRecordingType[],
+                hideViewedRecordings: HideViewedRecordingsOptions,
+                selectedRecordingId: string | null,
+                deletedRecordingIds: Set<string>
             ): SessionRecordingType[] => {
                 return sessionRecordings.filter((rec) => {
                     if (deletedRecordingIds.has(rec.id)) {
@@ -1383,12 +1633,12 @@ export const sessionRecordingsPlaylistLogic = kea<sessionRecordingsPlaylistLogic
                 s.filters,
             ],
             (
-                sessionRecordings,
-                hideViewedRecordings,
-                pinnedRecordings,
-                deletedRecordingIds,
-                selectedRecordingId,
-                filters
+                sessionRecordings: SessionRecordingType[],
+                hideViewedRecordings: HideViewedRecordingsOptions,
+                pinnedRecordings: SessionRecordingType[],
+                deletedRecordingIds: Set<string>,
+                selectedRecordingId: string | null,
+                filters: RecordingUniversalFilters
             ): SessionRecordingType[] => {
                 const filteredRecordings = sessionRecordings.filter((rec) => {
                     if (deletedRecordingIds.has(rec.id)) {
@@ -1425,7 +1675,7 @@ export const sessionRecordingsPlaylistLogic = kea<sessionRecordingsPlaylistLogic
         // pinnedRecordings is a lazyLoader so we can't add filtering there directly
         visiblePinnedRecordings: [
             (s) => [s.pinnedRecordings, s.deletedRecordingIds],
-            (pinnedRecordings, deletedRecordingIds): SessionRecordingType[] => {
+            (pinnedRecordings: SessionRecordingType[], deletedRecordingIds: Set<string>): SessionRecordingType[] => {
                 if (deletedRecordingIds.size === 0) {
                     return pinnedRecordings
                 }
@@ -1435,28 +1685,28 @@ export const sessionRecordingsPlaylistLogic = kea<sessionRecordingsPlaylistLogic
 
         recordings: [
             (s) => [s.visiblePinnedRecordings, s.otherRecordings, (_, props) => props.onlyPinned],
-            (visiblePinnedRecordings, otherRecordings, onlyPinned): SessionRecordingType[] => {
+            (visiblePinnedRecordings: SessionRecordingType[], otherRecordings: SessionRecordingType[], onlyPinned): SessionRecordingType[] => {
                 return onlyPinned ? [...visiblePinnedRecordings] : [...visiblePinnedRecordings, ...otherRecordings]
             },
         ],
 
         recordingsCount: [
             (s) => [s.recordings],
-            (recordings): number => {
+            (recordings: SessionRecordingType[]): number => {
                 return recordings.length
             },
         ],
 
         hiddenRecordingsCount: [
             (s) => [s.hiddenRecordings],
-            (hiddenRecordings): number => {
+            (hiddenRecordings: SessionRecordingType[]): number => {
                 return hiddenRecordings?.length ?? 0
             },
         ],
 
         allowHogQLFilters: [
             (s) => [s.featureFlags],
-            (featureFlags): boolean => !!featureFlags[FEATURE_FLAGS.REPLAY_HOGQL_FILTERS],
+            (featureFlags: FeatureFlagsSet): boolean => !!featureFlags[FEATURE_FLAGS.REPLAY_HOGQL_FILTERS],
         ],
     }),
 
diff --git a/frontend/src/scenes/session-recordings/playlist/sessionRecordingsPlaylistSceneLogic.ts b/frontend/src/scenes/session-recordings/playlist/sessionRecordingsPlaylistSceneLogic.ts
index 6ef9f404a7c9..5c6dcc972d71 100644
--- a/frontend/src/scenes/session-recordings/playlist/sessionRecordingsPlaylistSceneLogic.ts
+++ b/frontend/src/scenes/session-recordings/playlist/sessionRecordingsPlaylistSceneLogic.ts
@@ -1,5 +1,5 @@
 import { deepEqual as equal } from 'fast-equals'
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { beforeUnload, router, urlToAction } from 'kea-router'
 
@@ -34,12 +34,133 @@ import {
 import { addRecordingToPlaylist, removeRecordingFromPlaylist } from '../player/utils/playerUtils'
 import { filtersFromUniversalFilterGroups, isUniversalFilters } from '../utils'
 import { PINNED_RECORDINGS_LIMIT, convertLegacyFiltersToUniversalFilters } from './sessionRecordingsPlaylistLogic'
-import type { sessionRecordingsPlaylistSceneLogicType } from './sessionRecordingsPlaylistSceneLogicType'
+import type { CohortType } from '../../../types'
+import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
 
 export interface SessionRecordingsPlaylistLogicProps {
     shortId: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingsPlaylistSceneLogicValues {
+    cohortsById: Partial<Record<number | string, CohortType>>; // cohortsModel
+    featureFlags: FeatureFlagsSet; // featureFlagLogic
+    activeSceneId: string | null; // sceneLogic
+    breadcrumbs: Breadcrumb[];
+    derivedName: string;
+    filters: LegacyRecordingFilters | RecordingUniversalFilters | null;
+    hasChanges: boolean;
+    pinnedRecordings: SessionRecordingType[] | null;
+    pinnedRecordingsLoading: boolean;
+    playlist: SessionRecordingPlaylistType | null;
+    playlistLoading: boolean;
+    projectTreeRef: ProjectTreeRef;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingsPlaylistSceneLogicActions {
+    reportRecordingPlaylistCreated: (source: "duplicate" | "filters" | "new" | "pin") => {
+        source: "duplicate" | "filters" | "new" | "pin";
+    }; // sessionRecordingEventUsageLogic
+    deletePlaylist: () => any;
+    deletePlaylistFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    deletePlaylistSuccess: (playlist: SessionRecordingPlaylistType | null, payload?: any) => {
+        playlist: SessionRecordingPlaylistType | null;
+        payload?: any;
+    };
+    duplicatePlaylist: () => any;
+    duplicatePlaylistFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    duplicatePlaylistSuccess: (playlist: SessionRecordingPlaylistType | null, payload?: any) => {
+        playlist: SessionRecordingPlaylistType | null;
+        payload?: any;
+    };
+    getPlaylist: () => any;
+    getPlaylistFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    getPlaylistSuccess: (playlist: SessionRecordingPlaylistType | null, payload?: any) => {
+        playlist: SessionRecordingPlaylistType | null;
+        payload?: any;
+    };
+    loadPinnedRecordings: () => {
+        value: true;
+    };
+    loadPinnedRecordingsFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadPinnedRecordingsSuccess: (pinnedRecordings: SessionRecordingType[] | null, payload?: {
+        value: true;
+    }) => {
+        pinnedRecordings: SessionRecordingType[] | null;
+        payload?: {
+            value: true;
+        };
+    };
+    markPlaylistViewed: () => {
+        value: true;
+    };
+    onPinnedChange: (recording: SessionRecordingType, pinned: boolean) => {
+        pinned: boolean;
+        recording: SessionRecordingType;
+    };
+    onPinnedChangeFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    onPinnedChangeSuccess: (pinnedRecordings: SessionRecordingType[], payload?: {
+        pinned: boolean;
+        recording: SessionRecordingType;
+    }) => {
+        pinnedRecordings: SessionRecordingType[];
+        payload?: {
+            pinned: boolean;
+            recording: SessionRecordingType;
+        };
+    };
+    setFilters: (filters: LegacyRecordingFilters | RecordingUniversalFilters | null) => {
+        filters: LegacyRecordingFilters | RecordingUniversalFilters | null;
+    };
+    updatePlaylist: (properties?: Partial<SessionRecordingPlaylistType>, silent?: any) => {
+        properties: Partial<SessionRecordingPlaylistType> | undefined;
+        silent: any;
+    };
+    updatePlaylistFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    updatePlaylistSuccess: (playlist: SessionRecordingPlaylistType | null, payload?: {
+        properties: Partial<SessionRecordingPlaylistType> | undefined;
+        silent: any;
+    }) => {
+        playlist: SessionRecordingPlaylistType | null;
+        payload?: {
+            properties: Partial<SessionRecordingPlaylistType> | undefined;
+            silent: any;
+        };
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingsPlaylistSceneLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        breadcrumbs: (playlist: SessionRecordingPlaylistType | null, featureFlags: FeatureFlagsSet) => Breadcrumb[];
+        projectTreeRef: (arg: string) => ProjectTreeRef;
+        hasChanges: (playlist: SessionRecordingPlaylistType | null, filters: LegacyRecordingFilters | RecordingUniversalFilters | null) => boolean;
+        derivedName: (filters: LegacyRecordingFilters | RecordingUniversalFilters | null, cohortsById: Partial<Record<number | string, CohortType>>) => string;
+    };
+}
+
+export type sessionRecordingsPlaylistSceneLogicType = MakeLogicType<sessionRecordingsPlaylistSceneLogicValues, sessionRecordingsPlaylistSceneLogicActions, SessionRecordingsPlaylistLogicProps, sessionRecordingsPlaylistSceneLogicMeta>;
+
 export const sessionRecordingsPlaylistSceneLogic = kea<sessionRecordingsPlaylistSceneLogicType>([
     path((key) => ['scenes', 'session-recordings', 'playlist', 'sessionRecordingsPlaylistSceneLogic', key]),
     props({} as SessionRecordingsPlaylistLogicProps),
@@ -178,7 +299,7 @@ export const sessionRecordingsPlaylistSceneLogic = kea<sessionRecordingsPlaylist
     selectors(() => ({
         breadcrumbs: [
             (s) => [s.playlist, s.featureFlags],
-            (playlist): Breadcrumb[] => [
+            (playlist: SessionRecordingPlaylistType | null): Breadcrumb[] => [
                 {
                     key: ReplayTabs.Playlists,
                     name: 'Collections',
@@ -194,17 +315,17 @@ export const sessionRecordingsPlaylistSceneLogic = kea<sessionRecordingsPlaylist
         ],
         projectTreeRef: [
             () => [(_, props: SessionRecordingsPlaylistLogicProps) => props.shortId],
-            (shortId): ProjectTreeRef => ({ type: 'session_recording_playlist', ref: String(shortId) }),
+            (shortId: string): ProjectTreeRef => ({ type: 'session_recording_playlist', ref: String(shortId) }),
         ],
         hasChanges: [
             (s) => [s.playlist, s.filters],
-            (playlist, filters): boolean => {
+            (playlist: SessionRecordingPlaylistType | null, filters: LegacyRecordingFilters | RecordingUniversalFilters | null): boolean => {
                 return !equal(playlist?.filters, filters)
             },
         ],
         derivedName: [
             (s) => [s.filters, s.cohortsById],
-            (filters, cohortsById) => {
+            (filters: LegacyRecordingFilters | RecordingUniversalFilters | null, cohortsById: Partial<Record<number | string, CohortType>>) => {
                 if (!filters) {
                     return 'Unnamed'
                 }
diff --git a/frontend/src/scenes/session-recordings/sessionRecordingEventUsageLogic.ts b/frontend/src/scenes/session-recordings/sessionRecordingEventUsageLogic.ts
index b43daa5da193..22c840ffe4c6 100644
--- a/frontend/src/scenes/session-recordings/sessionRecordingEventUsageLogic.ts
+++ b/frontend/src/scenes/session-recordings/sessionRecordingEventUsageLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path } from 'kea'
 import posthog from 'posthog-js'
 
 import { isLogEntryPropertyFilter, isValidPropertyFilter } from 'lib/components/PropertyFilters/utils'
@@ -18,7 +18,7 @@ import {
     SessionRecordingType,
 } from '~/types'
 
-import type { sessionRecordingEventUsageLogicType } from './sessionRecordingEventUsageLogicType'
+import type { Realm, UserType } from '../../types'
 
 export enum SessionRecordingFilterType {
     Duration = 'duration',
@@ -37,6 +37,122 @@ interface RecordingViewedProps {
     snapshot_source: 'web' | 'mobile' | 'unknown'
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingEventUsageLogicValues {
+    realm: Realm | null // preflightLogic
+    user: UserType | null // userLogic
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingEventUsageLogicActions {
+    reportAISessionSummaryCopiedForLLM: (
+        recording_id: string,
+        properties: {
+            has_session_outcome: boolean
+            key_action_count: number
+            segment_count: number
+        }
+    ) => {
+        has_session_outcome: boolean
+        key_action_count: number
+        recording_id: string
+        segment_count: number
+    }
+    reportAISessionSummaryViewed: (
+        recording_id: string,
+        source: 'dock',
+        summary_id: string | null
+    ) => {
+        recording_id: string
+        source: 'dock'
+        summary_id: string | null
+    }
+    reportNextRecordingTriggered: (automatic: boolean) => {
+        automatic: boolean
+    }
+    reportRecordingExportedToFile: () => {
+        value: true
+    }
+    reportRecordingInspectorItemExpanded: (
+        tab: InspectorListItemType,
+        index: number
+    ) => {
+        index: number
+        tab:
+            | 'app-state'
+            | 'browser-visibility'
+            | 'comment'
+            | 'console'
+            | 'doctor'
+            | 'events'
+            | 'experiment-variant'
+            | 'inactivity'
+            | 'inspector-summary'
+            | 'logs'
+            | 'network'
+            | 'offline-status'
+            | 'performance'
+            | 'session-change'
+    }
+    reportRecordingInspectorMiniFilterViewed: (
+        minifilterKey: MiniFilterKey,
+        enabled: boolean
+    ) => {
+        enabled: boolean
+        minifilterKey: string
+    }
+    reportRecordingListVisibilityToggled: (
+        type: string,
+        visible: boolean
+    ) => {
+        type: string
+        visible: boolean
+    }
+    reportRecordingLoaded: (
+        playerData: SessionPlayerData,
+        metadata: SessionRecordingType | null
+    ) => {
+        metadata: SessionRecordingType | null
+        playerData: SessionPlayerData
+    }
+    reportRecordingLoadedFromFile: (data: { error?: string; success: boolean }) => {
+        error?: string | undefined
+        success: boolean
+    }
+    reportRecordingOpenedFromRecentRecordingList: () => {
+        value: true
+    }
+    reportRecordingPinnedToList: (pinned: boolean) => {
+        pinned: boolean
+    }
+    reportRecordingPlayerSeekbarEventHovered: () => {
+        value: true
+    }
+    reportRecordingPlaylistCreated: (source: 'duplicate' | 'filters' | 'new' | 'pin') => {
+        source: 'duplicate' | 'filters' | 'new' | 'pin'
+    }
+    reportRecordingsListFetched: (
+        loadTime: number,
+        filters: RecordingUniversalFilters,
+        defaultDurationFilter: RecordingDurationFilter
+    ) => {
+        defaultDurationFilter: RecordingDurationFilter
+        filters: RecordingUniversalFilters
+        loadTime: number
+    }
+    reportRecordingsListFilterAdded: (filterType: SessionRecordingFilterType) => {
+        filterType: SessionRecordingFilterType
+    }
+    reportRecordingsListPropertiesFetched: (loadTime: number) => {
+        loadTime: number
+    }
+}
+
+export type sessionRecordingEventUsageLogicType = MakeLogicType<
+    sessionRecordingEventUsageLogicValues,
+    sessionRecordingEventUsageLogicActions
+>
+
 export const sessionRecordingEventUsageLogic = kea<sessionRecordingEventUsageLogicType>([
     path(['scenes', 'session-recordings', 'sessionRecordingEventUsageLogic']),
     connect(() => ({
diff --git a/frontend/src/scenes/session-recordings/sessionReplaySceneLogic.ts b/frontend/src/scenes/session-recordings/sessionReplaySceneLogic.ts
index 498dc6dcedce..2c00d2e83a8c 100644
--- a/frontend/src/scenes/session-recordings/sessionReplaySceneLogic.ts
+++ b/frontend/src/scenes/session-recordings/sessionReplaySceneLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers, selectors } from 'kea'
 import { router, urlToAction } from 'kea-router'
 
 import { trackedActionToUrl } from 'lib/logic/scenes/trackedActionToUrl'
@@ -10,8 +10,6 @@ import { urls } from 'scenes/urls'
 import { SIDE_PANEL_CONTEXT_KEY, SidePanelSceneContext } from '~/layout/navigation-3000/sidepanel/types'
 import { ActivityScope, Breadcrumb, ReplayTabs } from '~/types'
 
-import type { sessionReplaySceneLogicType } from './sessionReplaySceneLogicType'
-
 export const humanFriendlyTabName = (tab: ReplayTabs): string => {
     switch (tab) {
         case ReplayTabs.Home:
@@ -27,6 +25,39 @@ export const humanFriendlyTabName = (tab: ReplayTabs): string => {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionReplaySceneLogicValues {
+    breadcrumbs: Breadcrumb[]
+    shouldShowNewBadge: boolean
+    sidePanelContext: SidePanelSceneContext
+    tab: ReplayTabs
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionReplaySceneLogicActions {
+    hideNewBadge: () => {
+        value: true
+    }
+    setTab: (tab?: ReplayTabs) => {
+        tab: ReplayTabs
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionReplaySceneLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        breadcrumbs: (tab: ReplayTabs) => Breadcrumb[]
+        sidePanelContext: (searchParams: Record<string, any>) => SidePanelSceneContext
+    }
+}
+
+export type sessionReplaySceneLogicType = MakeLogicType<
+    sessionReplaySceneLogicValues,
+    sessionReplaySceneLogicActions,
+    Record<string, any>,
+    sessionReplaySceneLogicMeta
+>
+
 export const sessionReplaySceneLogic = kea<sessionReplaySceneLogicType>([
     path(() => ['scenes', 'session-recordings', 'sessionReplaySceneLogic']),
     actions({
diff --git a/frontend/src/scenes/session-recordings/settings/SessionRecordingsSettingsScene.tsx b/frontend/src/scenes/session-recordings/settings/SessionRecordingsSettingsScene.tsx
index 689d51c46e17..92bd879ede00 100644
--- a/frontend/src/scenes/session-recordings/settings/SessionRecordingsSettingsScene.tsx
+++ b/frontend/src/scenes/session-recordings/settings/SessionRecordingsSettingsScene.tsx
@@ -1,4 +1,4 @@
-import { BindLogic, kea, path, selectors } from 'kea'
+import { MakeLogicType, BindLogic, kea, path, selectors } from 'kea'
 import { router } from 'kea-router'
 
 import { sceneConfigurations } from 'scenes/scenes'
@@ -13,10 +13,16 @@ import { Breadcrumb } from '~/types'
 
 import { SessionRecordingsPageTabs } from '../SessionRecordings'
 import { sessionReplaySceneLogic } from '../sessionReplaySceneLogic'
-import type { sessionRecordingsSettingsSceneLogicType } from './SessionRecordingsSettingsSceneType'
 
 export const SETTINGS_LOGIC_KEY = 'replaySettings'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionRecordingsSettingsSceneLogicValues {
+    breadcrumbs: Breadcrumb[]
+}
+
+export type sessionRecordingsSettingsSceneLogicType = MakeLogicType<sessionRecordingsSettingsSceneLogicValues, {}>
+
 export const sessionRecordingsSettingsSceneLogic = kea<sessionRecordingsSettingsSceneLogicType>([
     path(['scenes', 'session-recordings', 'settings', 'sessionRecordingsSettingsSceneLogic']),
     selectors({
diff --git a/frontend/src/scenes/session-recordings/templates/sessionRecordingTemplatesLogic.tsx b/frontend/src/scenes/session-recordings/templates/sessionRecordingTemplatesLogic.tsx
index 4738e19d0d2b..fc21139dcc1c 100644
--- a/frontend/src/scenes/session-recordings/templates/sessionRecordingTemplatesLogic.tsx
+++ b/frontend/src/scenes/session-recordings/templates/sessionRecordingTemplatesLogic.tsx
@@ -1,5 +1,5 @@
 import clsx from 'clsx'
-import { actions, connect, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { router } from 'kea-router'
 import posthog from 'posthog-js'
 
@@ -18,7 +18,7 @@ import {
     UniversalFiltersGroupValue,
 } from '~/types'
 
-import type { sessionReplayTemplatesLogicType } from './sessionRecordingTemplatesLogicType'
+import type { TeamPublicType, TeamType } from '../../../types'
 
 const getPageviewFilterValue = (pageview: string): UniversalFiltersGroupValue => {
     return {
@@ -64,6 +64,57 @@ export interface ReplayTemplateLogicPropsType {
     category: ReplayTemplateCategory
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionReplayTemplatesLogicValues {
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    areAnyVariablesTouched: boolean
+    canApplyFilters: boolean
+    editableVariables: ReplayTemplateVariableType[]
+    filterGroup: Partial<RecordingUniversalFilters>
+    variables: ReplayTemplateVariableType[]
+    variablesVisible: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionReplayTemplatesLogicActions {
+    hideVariables: () => {
+        value: true
+    }
+    navigate: () => {
+        value: true
+    }
+    resetVariable: (variable: ReplayTemplateVariableType) => {
+        variable: ReplayTemplateVariableType
+    }
+    setVariable: (variable: ReplayTemplateVariableType) => {
+        variable: ReplayTemplateVariableType
+    }
+    setVariables: (variables?: ReplayTemplateVariableType[]) => {
+        variables: ReplayTemplateVariableType[] | undefined
+    }
+    showVariables: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionReplayTemplatesLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        filterGroup: (variables: ReplayTemplateVariableType[]) => Partial<RecordingUniversalFilters>
+        canApplyFilters: (variables: ReplayTemplateVariableType[], areAnyVariablesTouched: boolean) => boolean
+        areAnyVariablesTouched: (variables: ReplayTemplateVariableType[]) => boolean
+        editableVariables: (variables: ReplayTemplateVariableType[]) => ReplayTemplateVariableType[]
+    }
+}
+
+export type sessionReplayTemplatesLogicType = MakeLogicType<
+    sessionReplayTemplatesLogicValues,
+    sessionReplayTemplatesLogicActions,
+    ReplayTemplateLogicPropsType,
+    sessionReplayTemplatesLogicMeta
+>
+
 export const sessionReplayTemplatesLogic = kea<sessionReplayTemplatesLogicType>([
     path(() => ['scenes', 'session-recordings', 'templates', 'sessionReplayTemplatesLogic']),
     props({} as ReplayTemplateLogicPropsType),
@@ -110,7 +161,7 @@ export const sessionReplayTemplatesLogic = kea<sessionReplayTemplatesLogicType>(
     selectors({
         filterGroup: [
             (s) => [s.variables],
-            (variables) => {
+            (variables: ReplayTemplateVariableType[]) => {
                 const filters = variables
                     .map((variable) => {
                         if (variable.type === 'pageview' && variable.value) {
@@ -146,13 +197,18 @@ export const sessionReplayTemplatesLogic = kea<sessionReplayTemplatesLogicType>(
         ],
         canApplyFilters: [
             (s) => [s.variables, s.areAnyVariablesTouched],
-            (variables, areAnyVariablesTouched) => areAnyVariablesTouched || variables.length === 0,
+            (variables: ReplayTemplateVariableType[], areAnyVariablesTouched: boolean) =>
+                areAnyVariablesTouched || variables.length === 0,
         ],
         areAnyVariablesTouched: [
             (s) => [s.variables],
-            (variables) => variables.some((v) => v.touched) || variables.some((v) => v.noTouch),
+            (variables: ReplayTemplateVariableType[]) =>
+                variables.some((v) => v.touched) || variables.some((v) => v.noTouch),
+        ],
+        editableVariables: [
+            (s) => [s.variables],
+            (variables: ReplayTemplateVariableType[]) => variables.filter((v) => !v.noTouch),
         ],
-        editableVariables: [(s) => [s.variables], (variables) => variables.filter((v) => !v.noTouch)],
     }),
     listeners(({ values, props }) => ({
         navigate: () => {
diff --git a/frontend/src/scenes/sessions/sessionProfileLogic.ts b/frontend/src/scenes/sessions/sessionProfileLogic.ts
index cb6091c03824..1c1634249e5e 100644
--- a/frontend/src/scenes/sessions/sessionProfileLogic.ts
+++ b/frontend/src/scenes/sessions/sessionProfileLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -7,8 +7,8 @@ import { NodeKind } from '~/queries/schema/schema-general'
 import { hogql } from '~/queries/utils'
 import { SessionEventType } from '~/types'
 
+import type { TeamPublicType, TeamType } from '../../types'
 import { teamLogic } from '../teamLogic'
-import type { sessionProfileLogicType } from './sessionProfileLogicType'
 
 /**
  * Extract the timestamp embedded in a UUIDv7.
@@ -55,6 +55,281 @@ export interface SessionData {
     last_external_click_url: string | null
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionProfileLogicValues {
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    categorizedEventCount: number
+    eventDetails: Record<string, Record<string, any>>
+    eventDetailsLoading: boolean
+    eventsListFolded: boolean
+    eventsOffset: number
+    hasMoreEvents: boolean
+    hasRecording: boolean
+    hasRecordingLoading: boolean
+    isInitialLoading: boolean
+    isLoadingMore: boolean
+    otherEventCount: number
+    sessionData: SessionData | null
+    sessionDataLoading: boolean
+    sessionDuration: number | null
+    sessionEvents: SessionEventType[] | null
+    sessionEventsLoading: boolean
+    sessionId: any
+    sessionProperties: Record<string, any> | null
+    sortOrder: 'asc' | 'desc'
+    supportTicketEvents: SessionEventType[]
+    supportTicketEventsLoading: boolean
+    totalEventCount: number | null
+    totalEventCountLoading: boolean
+    uniqueUrlCount: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionProfileLogicActions {
+    loadEventDetails: (
+        eventId: string,
+        eventName: string
+    ) => {
+        eventId: string
+        eventName: string
+    }
+    loadEventDetailsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadEventDetailsSuccess: (
+        eventDetails: {
+            [x: number]: any
+        },
+        payload?: {
+            eventId: string
+            eventName: string
+        }
+    ) => {
+        eventDetails: {
+            [x: number]: any
+        }
+        payload?: {
+            eventId: string
+            eventName: string
+        }
+    }
+    loadMoreSessionEvents: () => {
+        value: true
+    }
+    loadMoreSessionEventsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadMoreSessionEventsSuccess: (
+        sessionEvents: SessionEventType[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        sessionEvents: SessionEventType[]
+        payload?: {
+            value: true
+        }
+    }
+    loadRecordingAvailability: () => {
+        value: true
+    }
+    loadRecordingAvailabilityFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRecordingAvailabilitySuccess: (
+        hasRecording: boolean,
+        payload?: {
+            value: true
+        }
+    ) => {
+        hasRecording: boolean
+        payload?: {
+            value: true
+        }
+    }
+    loadSessionData: () => {
+        value: true
+    }
+    loadSessionDataFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSessionDataSuccess: (
+        sessionData: {
+            autocapture_count: any
+            channel_type: any
+            distinct_id: any
+            end_current_url: any
+            end_timestamp: any
+            entry_current_url: any
+            entry_hostname: any
+            entry_pathname: any
+            entry_referring_domain: any
+            entry_utm_campaign: any
+            entry_utm_medium: any
+            entry_utm_source: any
+            is_bounce: any
+            last_external_click_url: any
+            num_uniq_urls: any
+            pageview_count: any
+            person_properties: Record<string, any> | null
+            screen_count: any
+            session_duration: any
+            session_id: any
+            start_timestamp: any
+            urls: any
+        } | null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        sessionData: {
+            autocapture_count: any
+            channel_type: any
+            distinct_id: any
+            end_current_url: any
+            end_timestamp: any
+            entry_current_url: any
+            entry_hostname: any
+            entry_pathname: any
+            entry_referring_domain: any
+            entry_utm_campaign: any
+            entry_utm_medium: any
+            entry_utm_source: any
+            is_bounce: any
+            last_external_click_url: any
+            num_uniq_urls: any
+            pageview_count: any
+            person_properties: Record<string, any> | null
+            screen_count: any
+            session_duration: any
+            session_id: any
+            start_timestamp: any
+            urls: any
+        } | null
+        payload?: {
+            value: true
+        }
+    }
+    loadSessionEvents: () => {
+        value: true
+    }
+    loadSessionEventsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSessionEventsSuccess: (
+        sessionEvents: SessionEventType[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        sessionEvents: SessionEventType[]
+        payload?: {
+            value: true
+        }
+    }
+    loadSupportTicketEvents: () => {
+        value: true
+    }
+    loadSupportTicketEventsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSupportTicketEventsSuccess: (
+        supportTicketEvents: SessionEventType[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        supportTicketEvents: SessionEventType[]
+        payload?: {
+            value: true
+        }
+    }
+    loadTotalEventCount: () => {
+        value: true
+    }
+    loadTotalEventCountFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadTotalEventCountSuccess: (
+        totalEventCount: number | null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        totalEventCount: number | null
+        payload?: {
+            value: true
+        }
+    }
+    setEventsListFolded: (isFolded: boolean) => {
+        isFolded: boolean
+    }
+    setHasMoreEvents: (hasMore: boolean) => {
+        hasMore: boolean
+    }
+    setSortOrder: (sortOrder: 'asc' | 'desc') => {
+        sortOrder: 'asc' | 'desc'
+    }
+    updateEventsOffset: (offset: number) => {
+        offset: number
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionProfileLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        sessionId: (arg: any) => any
+        sessionDuration: (sessionData: SessionData | null) => number | null
+        uniqueUrlCount: (sessionData: SessionData | null) => number
+        categorizedEventCount: (sessionData: SessionData | null) => number
+        otherEventCount: (totalEventCount: number | null, sessionData: SessionData | null) => number
+        isInitialLoading: (
+            sessionDataLoading: boolean,
+            sessionEventsLoading: boolean,
+            sessionData: SessionData | null,
+            sessionEvents: SessionEventType[] | null
+        ) => boolean
+        isLoadingMore: (sessionEventsLoading: boolean, sessionEvents: SessionEventType[] | null) => boolean
+        sessionProperties: (sessionData: SessionData | null) => Record<string, any> | null
+    }
+}
+
+export type sessionProfileLogicType = MakeLogicType<
+    sessionProfileLogicValues,
+    sessionProfileLogicActions,
+    SessionProfileLogicProps,
+    sessionProfileLogicMeta
+>
+
 export const sessionProfileLogic = kea<sessionProfileLogicType>([
     path(['scenes', 'sessions', 'sessionProfileLogic']),
     props({} as SessionProfileLogicProps),
diff --git a/frontend/src/scenes/settings/environment/coreEventsLogic.ts b/frontend/src/scenes/settings/environment/coreEventsLogic.ts
index 87f18ec9ac94..91cf5f0cfbe4 100644
--- a/frontend/src/scenes/settings/environment/coreEventsLogic.ts
+++ b/frontend/src/scenes/settings/environment/coreEventsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -7,8 +7,6 @@ import { teamLogic } from 'scenes/teamLogic'
 
 import { CoreEvent } from '~/queries/schema/schema-general'
 
-import type { coreEventsLogicType } from './coreEventsLogicType'
-
 /** API response type for core events */
 interface CoreEventResponse {
     id: string
@@ -31,6 +29,60 @@ function toCoreEvent(response: CoreEventResponse): CoreEvent {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface coreEventsLogicValues {
+    currentTeamId: number | null // teamLogic
+    coreEvents: CoreEvent[]
+    coreEventsLoader: any
+    coreEventsLoaderLoading: boolean
+    coreEventsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface coreEventsLogicActions {
+    addCoreEvent: (event: Omit<CoreEvent, 'id'>) => {
+        event: Omit<CoreEvent, 'id'>
+    }
+    loadCoreEvents: () => any
+    loadCoreEventsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadCoreEventsSuccess: (
+        coreEventsLoader: any,
+        payload?: any
+    ) => {
+        coreEventsLoader: any
+        payload?: any
+    }
+    removeCoreEvent: (eventId: string) => {
+        eventId: string
+    }
+    setCoreEvents: (events: CoreEvent[]) => {
+        events: CoreEvent[]
+    }
+    updateCoreEvent: (event: CoreEvent) => {
+        event: CoreEvent
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface coreEventsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        coreEventsLoading: (coreEventsLoaderLoading: boolean) => boolean
+    }
+}
+
+export type coreEventsLogicType = MakeLogicType<
+    coreEventsLogicValues,
+    coreEventsLogicActions,
+    Record<string, any>,
+    coreEventsLogicMeta
+>
+
 export const coreEventsLogic = kea<coreEventsLogicType>([
     path(['scenes', 'settings', 'environment', 'coreEventsLogic']),
     connect(() => ({
diff --git a/frontend/src/scenes/settings/environment/dataColorThemeModalLogic.ts b/frontend/src/scenes/settings/environment/dataColorThemeModalLogic.ts
index 92b104ea5c39..2dd26e6e2a7c 100644
--- a/frontend/src/scenes/settings/environment/dataColorThemeModalLogic.ts
+++ b/frontend/src/scenes/settings/environment/dataColorThemeModalLogic.ts
@@ -1,5 +1,6 @@
-import { actions, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 
 import { lemonToast } from '@posthog/lemon-ui'
 
@@ -7,10 +8,84 @@ import api from 'lib/api'
 
 import { DataColorThemeModelPayload } from '~/types'
 
-import type { dataColorThemesModalLogicType } from './dataColorThemeModalLogicType'
-
 const PAYLOAD_DEFAULT: DataColorThemeModelPayload = { name: '', colors: [] }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataColorThemesModalLogicValues {
+    isOpen: boolean
+    isThemeSubmitting: boolean
+    isThemeValid: boolean
+    showThemeErrors: boolean
+    theme: DataColorThemeModelPayload
+    themeAllErrors: Record<string, any>
+    themeChanged: boolean
+    themeErrors: DeepPartialMap<DataColorThemeModelPayload, ValidationErrorType>
+    themeHasErrors: boolean
+    themeManualErrors: Record<string, any>
+    themeTouched: boolean
+    themeTouches: Record<string, boolean>
+    themeValidationErrors: DeepPartialMap<DataColorThemeModelPayload, ValidationErrorType>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataColorThemesModalLogicActions {
+    addColor: () => {
+        value: true
+    }
+    closeModal: () => {
+        value: true
+    }
+    duplicateColor: (index: number) => {
+        index: number
+    }
+    openModal: (theme: any) => {
+        theme: any
+    }
+    removeColor: (index: number) => {
+        index: number
+    }
+    resetTheme: (values?: DataColorThemeModelPayload) => {
+        values?: DataColorThemeModelPayload
+    }
+    setThemeManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setThemeValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setThemeValues: (values: DeepPartial<DataColorThemeModelPayload>) => {
+        values: DeepPartial<DataColorThemeModelPayload>
+    }
+    submitTheme: () => {
+        value: boolean
+    }
+    submitThemeFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitThemeRequest: (theme: DataColorThemeModelPayload) => {
+        theme: DataColorThemeModelPayload
+    }
+    submitThemeSuccess: (theme: DataColorThemeModelPayload) => {
+        theme: DataColorThemeModelPayload
+    }
+    touchThemeField: (key: string) => {
+        key: string
+    }
+}
+
+export type dataColorThemesModalLogicType = MakeLogicType<
+    dataColorThemesModalLogicValues,
+    dataColorThemesModalLogicActions
+>
+
 export const dataColorThemesModalLogic = kea<dataColorThemesModalLogicType>([
     path(['scenes', 'settings', 'environment', 'dataColorThemesModalLogic']),
     actions({
diff --git a/frontend/src/scenes/settings/environment/dataColorThemesLogic.ts b/frontend/src/scenes/settings/environment/dataColorThemesLogic.ts
index 1111d5f73a85..1311a8cd2046 100644
--- a/frontend/src/scenes/settings/environment/dataColorThemesLogic.ts
+++ b/frontend/src/scenes/settings/environment/dataColorThemesLogic.ts
@@ -1,9 +1,35 @@
-import { actions, connect, kea, listeners, path } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path } from 'kea'
 
 import { dataThemeLogic } from 'scenes/dataThemeLogic'
 
+import type { DataColorThemeModel, DataColorThemeModelPayload } from '../../../types'
 import { dataColorThemesModalLogic } from './dataColorThemeModalLogic'
-import type { dataColorThemesLogicType } from './dataColorThemesLogicType'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataColorThemesLogicValues {
+    defaultTheme: DataColorThemeModel | null // dataThemeLogic
+    posthogTheme: DataColorThemeModel | null | undefined // dataThemeLogic
+    themes: DataColorThemeModel[] | null // dataThemeLogic
+    themesLoading: boolean // dataThemeLogic
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dataColorThemesLogicActions {
+    openModal: (theme: any) => {
+        theme: any
+    } // dataColorThemesModalLogic
+    submitThemeSuccess: (theme: DataColorThemeModelPayload) => {
+        theme: DataColorThemeModelPayload
+    } // dataColorThemesModalLogic
+    setThemes: (themes: any) => {
+        themes: any
+    } // dataThemeLogic
+    selectTheme: (id: number | 'new' | null) => {
+        id: number | 'new' | null
+    }
+}
+
+export type dataColorThemesLogicType = MakeLogicType<dataColorThemesLogicValues, dataColorThemesLogicActions>
 
 export const dataColorThemesLogic = kea<dataColorThemesLogicType>([
     path(['scenes', 'settings', 'environment', 'dataColorThemesLogic']),
diff --git a/frontend/src/scenes/settings/environment/experimentsConfigLogic.ts b/frontend/src/scenes/settings/environment/experimentsConfigLogic.ts
index 4a6282c32650..8d9342f9892c 100644
--- a/frontend/src/scenes/settings/environment/experimentsConfigLogic.ts
+++ b/frontend/src/scenes/settings/environment/experimentsConfigLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -6,8 +6,6 @@ import api from 'lib/api'
 import { DEFAULT_MDE } from '~/scenes/experiments/constants'
 import { teamLogic } from '~/scenes/teamLogic'
 
-import type { experimentsConfigLogicType } from './experimentsConfigLogicType'
-
 export interface ExperimentsConfig {
     experiment_recalculation_time: string | null
     default_experiment_confidence_level: number | null
@@ -20,6 +18,50 @@ export interface ExperimentsConfig {
     default_sequential_tuning_parameter: number | null
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface experimentsConfigLogicValues {
+    currentTeamId: number | null // teamLogic
+    defaultMinimumDetectableEffect: number
+    experimentsConfig: ExperimentsConfig | null
+    experimentsConfigLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface experimentsConfigLogicActions {
+    loadExperimentsConfig: () => any
+    loadExperimentsConfigFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadExperimentsConfigSuccess: (
+        experimentsConfig: ExperimentsConfig,
+        payload?: any
+    ) => {
+        experimentsConfig: ExperimentsConfig
+        payload?: any
+    }
+    updateExperimentsConfig: (payload: Partial<ExperimentsConfig>) => {
+        payload: Partial<ExperimentsConfig>
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface experimentsConfigLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        defaultMinimumDetectableEffect: (experimentsConfig: ExperimentsConfig | null) => number
+    }
+}
+
+export type experimentsConfigLogicType = MakeLogicType<
+    experimentsConfigLogicValues,
+    experimentsConfigLogicActions,
+    Record<string, any>,
+    experimentsConfigLogicMeta
+>
+
 export const experimentsConfigLogic = kea<experimentsConfigLogicType>([
     path(['scenes', 'settings', 'environment', 'experimentsConfigLogic']),
     connect({ values: [teamLogic, ['currentTeamId']] }),
@@ -44,7 +86,7 @@ export const experimentsConfigLogic = kea<experimentsConfigLogicType>([
     selectors({
         defaultMinimumDetectableEffect: [
             (s) => [s.experimentsConfig],
-            (config): number => config?.default_minimum_detectable_effect ?? DEFAULT_MDE,
+            (config: ExperimentsConfig | null): number => config?.default_minimum_detectable_effect ?? DEFAULT_MDE,
         ],
     }),
     listeners(({ actions, values }) => ({
diff --git a/frontend/src/scenes/settings/environment/filterTestAccountDefaultsLogic.ts b/frontend/src/scenes/settings/environment/filterTestAccountDefaultsLogic.ts
index 89e4fe038dfc..a636b3e5422f 100644
--- a/frontend/src/scenes/settings/environment/filterTestAccountDefaultsLogic.ts
+++ b/frontend/src/scenes/settings/environment/filterTestAccountDefaultsLogic.ts
@@ -1,8 +1,45 @@
-import { actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
 
 import { teamLogic } from 'scenes/teamLogic'
 
-import type { filterTestAccountsDefaultsLogicType } from './filterTestAccountDefaultsLogicType'
+import type { TeamPublicType, TeamType } from '../../../types'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface filterTestAccountsDefaultsLogicValues {
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    filterTestAccountsDefault: boolean
+    localFilterTestAccountsDefault: boolean | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface filterTestAccountsDefaultsLogicActions {
+    setDefault: (value: boolean) => {
+        value: boolean
+    }
+    setLocalDefault: (value: boolean) => {
+        value: boolean
+    }
+    setTeamDefault: (value: boolean) => {
+        value: boolean
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface filterTestAccountsDefaultsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        filterTestAccountsDefault: (
+            localFilterTestAccountsDefault: boolean | null,
+            currentTeam: TeamPublicType | TeamType | null
+        ) => boolean
+    }
+}
+
+export type filterTestAccountsDefaultsLogicType = MakeLogicType<
+    filterTestAccountsDefaultsLogicValues,
+    filterTestAccountsDefaultsLogicActions,
+    Record<string, any>,
+    filterTestAccountsDefaultsLogicMeta
+>
 
 export const filterTestAccountsDefaultsLogic = kea<filterTestAccountsDefaultsLogicType>([
     path(['scenes', 'project', 'Settings', 'filterTestAccountsDefaultLogic']),
@@ -27,7 +64,10 @@ export const filterTestAccountsDefaultsLogic = kea<filterTestAccountsDefaultsLog
     selectors({
         filterTestAccountsDefault: [
             (s) => [s.localFilterTestAccountsDefault, s.currentTeam],
-            (localFilterTestAccountsDefault, currentTeam) => {
+            (
+                localFilterTestAccountsDefault: boolean | null,
+                currentTeam: null | import('../../../types').TeamPublicType | import('../../../types').TeamType
+            ) => {
                 if (localFilterTestAccountsDefault !== null) {
                     return localFilterTestAccountsDefault
                 } else if (currentTeam?.test_account_filters_default_checked) {
diff --git a/frontend/src/scenes/settings/environment/groupAnalyticsConfigLogic.ts b/frontend/src/scenes/settings/environment/groupAnalyticsConfigLogic.ts
index 19a2912f5625..39bbfd91a8b7 100644
--- a/frontend/src/scenes/settings/environment/groupAnalyticsConfigLogic.ts
+++ b/frontend/src/scenes/settings/environment/groupAnalyticsConfigLogic.ts
@@ -1,8 +1,61 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 
 import { groupsModel } from '~/models/groupsModel'
 
-import type { groupAnalyticsConfigLogicType } from './groupAnalyticsConfigLogicType'
+import type { GroupType, GroupTypeIndex } from '../../../types'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface groupAnalyticsConfigLogicValues {
+    groupTypes: Map<GroupTypeIndex, GroupType> // groupsModel
+    groupTypesLoading: boolean // groupsModel
+    hasChanges: boolean
+    pluralChanges: Record<number, string | undefined>
+    singularChanges: Record<number, string | undefined>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface groupAnalyticsConfigLogicActions {
+    deleteGroupType: (groupTypeIndex: number) => number // groupsModel
+    loadAllGroupTypes: () => any // groupsModel
+    updateGroupTypesMetadata: (payload: GroupType[]) => GroupType[] // groupsModel
+    reset: () => {
+        value: true
+    }
+    save: () => {
+        value: true
+    }
+    setPlural: (
+        groupTypeIndex: number,
+        value: string
+    ) => {
+        groupTypeIndex: number
+        value: string
+    }
+    setSingular: (
+        groupTypeIndex: number,
+        value: string
+    ) => {
+        groupTypeIndex: number
+        value: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface groupAnalyticsConfigLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        hasChanges: (
+            singularChanges: Record<number, string | undefined>,
+            pluralChanges: Record<number, string | undefined>
+        ) => boolean
+    }
+}
+
+export type groupAnalyticsConfigLogicType = MakeLogicType<
+    groupAnalyticsConfigLogicValues,
+    groupAnalyticsConfigLogicActions,
+    Record<string, any>,
+    groupAnalyticsConfigLogicMeta
+>
 
 export const groupAnalyticsConfigLogic = kea<groupAnalyticsConfigLogicType>([
     path(['scenes', 'project', 'Settings', 'groupAnalyticsConfigLogic']),
@@ -37,7 +90,7 @@ export const groupAnalyticsConfigLogic = kea<groupAnalyticsConfigLogicType>([
     selectors({
         hasChanges: [
             (s) => [s.singularChanges, s.pluralChanges],
-            (singularChanges, pluralChanges) =>
+            (singularChanges: Record<number, string | undefined>, pluralChanges: Record<number, string | undefined>) =>
                 Object.keys(singularChanges).length > 0 || Object.keys(pluralChanges).length > 0,
         ],
     }),
diff --git a/frontend/src/scenes/settings/environment/jsSnippetVersionPinLogic.ts b/frontend/src/scenes/settings/environment/jsSnippetVersionPinLogic.ts
index f315d0185002..fded41d35a1c 100644
--- a/frontend/src/scenes/settings/environment/jsSnippetVersionPinLogic.ts
+++ b/frontend/src/scenes/settings/environment/jsSnippetVersionPinLogic.ts
@@ -1,17 +1,70 @@
-import { actions, afterMount, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, listeners, path, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
 import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
 import { teamLogic } from 'scenes/teamLogic'
 
-import type { jsSnippetVersionPinLogicType } from './jsSnippetVersionPinLogicType'
-
 export interface VersionPinResponse {
     requested_version: string | null
     resolved_version: string | null
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface jsSnippetVersionPinLogicValues {
+    localPin: string
+    versionPinResponse: VersionPinResponse | null
+    versionPinResponseLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface jsSnippetVersionPinLogicActions {
+    loadVersionPin: () => any
+    loadVersionPinFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadVersionPinSuccess: (
+        versionPinResponse: VersionPinResponse | null,
+        payload?: any
+    ) => {
+        versionPinResponse: VersionPinResponse | null
+        payload?: any
+    }
+    saveVersionPin: ({ pin }: { pin: string | null }) => {
+        pin: string | null
+    }
+    saveVersionPinFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    saveVersionPinSuccess: (
+        versionPinResponse: VersionPinResponse | null,
+        payload?: {
+            pin: string | null
+        }
+    ) => {
+        versionPinResponse: VersionPinResponse | null
+        payload?: {
+            pin: string | null
+        }
+    }
+    setLocalPin: (localPin: string) => {
+        localPin: string
+    }
+}
+
+export type jsSnippetVersionPinLogicType = MakeLogicType<
+    jsSnippetVersionPinLogicValues,
+    jsSnippetVersionPinLogicActions
+>
+
 export const jsSnippetVersionPinLogic = kea<jsSnippetVersionPinLogicType>([
     path(['scenes', 'settings', 'environment', 'jsSnippetVersionPinLogic']),
     actions({
diff --git a/frontend/src/scenes/settings/environment/maxSettingsLogic.tsx b/frontend/src/scenes/settings/environment/maxSettingsLogic.tsx
index 915fb984752c..c7ed7690d9b9 100644
--- a/frontend/src/scenes/settings/environment/maxSettingsLogic.tsx
+++ b/frontend/src/scenes/settings/environment/maxSettingsLogic.tsx
@@ -1,5 +1,6 @@
-import { actions, afterMount, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, listeners, path, reducers } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -8,12 +9,104 @@ import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
 
 import { CoreMemory } from '~/types'
 
-import type { maxSettingsLogicType } from './maxSettingsLogicType'
-
 export type CoreMemoryForm = {
     text: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface maxSettingsLogicValues {
+    coreMemory: CoreMemory | null
+    coreMemoryForm: CoreMemoryForm
+    coreMemoryFormAllErrors: Record<string, any>
+    coreMemoryFormChanged: boolean
+    coreMemoryFormErrors: DeepPartialMap<CoreMemoryForm, ValidationErrorType>
+    coreMemoryFormHasErrors: boolean
+    coreMemoryFormManualErrors: Record<string, any>
+    coreMemoryFormTouched: boolean
+    coreMemoryFormTouches: Record<string, boolean>
+    coreMemoryFormValidationErrors: DeepPartialMap<CoreMemoryForm, ValidationErrorType>
+    coreMemoryLoading: boolean
+    isCoreMemoryFormSubmitting: boolean
+    isCoreMemoryFormValid: boolean
+    isLoading: boolean
+    isUpdating: boolean
+    showCoreMemoryFormErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface maxSettingsLogicActions {
+    loadCoreMemory: () => any
+    loadCoreMemoryFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadCoreMemorySuccess: (
+        coreMemory: CoreMemory | null,
+        payload?: any
+    ) => {
+        coreMemory: CoreMemory | null
+        payload?: any
+    }
+    resetCoreMemoryForm: (values?: CoreMemoryForm) => {
+        values?: CoreMemoryForm
+    }
+    setCoreMemoryFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setCoreMemoryFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setCoreMemoryFormValues: (values: DeepPartial<CoreMemoryForm>) => {
+        values: DeepPartial<CoreMemoryForm>
+    }
+    setIsLoading: (isLoading: boolean) => {
+        isLoading: boolean
+    }
+    submitCoreMemoryForm: () => {
+        value: boolean
+    }
+    submitCoreMemoryFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitCoreMemoryFormRequest: (coreMemoryForm: CoreMemoryForm) => {
+        coreMemoryForm: CoreMemoryForm
+    }
+    submitCoreMemoryFormSuccess: (coreMemoryForm: CoreMemoryForm) => {
+        coreMemoryForm: CoreMemoryForm
+    }
+    touchCoreMemoryFormField: (key: string) => {
+        key: string
+    }
+    updateCoreMemory: (data: CoreMemoryForm) => CoreMemoryForm
+    updateCoreMemoryFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateCoreMemorySuccess: (
+        coreMemory: CoreMemory,
+        payload?: CoreMemoryForm
+    ) => {
+        coreMemory: CoreMemory
+        payload?: CoreMemoryForm
+    }
+}
+
+export type maxSettingsLogicType = MakeLogicType<maxSettingsLogicValues, maxSettingsLogicActions>
+
 export const maxSettingsLogic = kea<maxSettingsLogicType>([
     path(['scenes', 'project', 'Settings', 'maxSettingsLogic']),
 
diff --git a/frontend/src/scenes/settings/environment/proxyLogic.ts b/frontend/src/scenes/settings/environment/proxyLogic.ts
index 07d76f61290e..f55061092816 100644
--- a/frontend/src/scenes/settings/environment/proxyLogic.ts
+++ b/frontend/src/scenes/settings/environment/proxyLogic.ts
@@ -1,6 +1,7 @@
 import { isFreeEmail } from 'bloommx'
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 
 import { LemonDialog } from '@posthog/lemon-ui'
@@ -16,8 +17,6 @@ import { userLogic } from 'scenes/userLogic'
 
 import { UserType } from '~/types'
 
-import type { proxyLogicType } from './proxyLogicType'
-
 export type ProxyRecord = {
     id: string
     domain: string
@@ -108,6 +107,245 @@ function initialDomainFor(user: UserType | null): string {
     return `${subdomain}.${domain}`
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface proxyLogicValues {
+    currentOrganizationId: string // organizationLogic
+    user: UserType | null // userLogic
+    cloudflareOptInAcknowledged: boolean
+    cloudflareOptInChecked: boolean
+    createRecord: {
+        domain: string
+    }
+    createRecordAllErrors: Record<string, any>
+    createRecordChanged: boolean
+    createRecordErrors: DeepPartialMap<
+        {
+            domain: string
+        },
+        ValidationErrorType
+    >
+    createRecordHasErrors: boolean
+    createRecordManualErrors: Record<string, any>
+    createRecordTouched: boolean
+    createRecordTouches: Record<string, boolean>
+    createRecordValidationErrors: DeepPartialMap<
+        {
+            domain: string
+        },
+        ValidationErrorType
+    >
+    diagnoseLoadingIds: string[]
+    diagnosticReports: Record<string, DiagnosticReport>
+    expandedRecordIds: string[]
+    formState: FormState
+    isCreateRecordSubmitting: boolean
+    isCreateRecordValid: boolean
+    maxProxyRecords: number
+    proxyRecords: ProxyRecord[]
+    proxyRecordsLoaded: boolean
+    proxyRecordsLoading: boolean
+    recordActiveTabs: Record<string, string>
+    shouldRefreshRecords: boolean
+    shouldShowCloudflareOptIn: boolean
+    showCreateRecordErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface proxyLogicActions {
+    acknowledgeCloudflareOptIn: () => {
+        value: true
+    }
+    clearDiagnosticReport: (id: ProxyRecord['id']) => {
+        id: string
+    }
+    collapseForm: () => {
+        value: true
+    }
+    createRecord: ({ domain }: { domain: string }) => {
+        domain: string
+    }
+    createRecordFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    createRecordSuccess: (
+        proxyRecords: any[],
+        payload?: {
+            domain: string
+        }
+    ) => {
+        proxyRecords: any[]
+        payload?: {
+            domain: string
+        }
+    }
+    deleteRecord: (id: ProxyRecord['id']) => ProxyRecord[]
+    deleteRecordFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteRecordSuccess: (
+        proxyRecords: {
+            domain: string
+            id: string
+            message?: string | undefined
+            status: 'deleting' | 'erroring' | 'issuing' | 'timed_out' | 'valid' | 'waiting' | 'warning'
+            target_cname: string
+        }[],
+        payload?: ProxyRecord[]
+    ) => {
+        proxyRecords: {
+            domain: string
+            id: string
+            message?: string | undefined
+            status: 'deleting' | 'erroring' | 'issuing' | 'timed_out' | 'valid' | 'waiting' | 'warning'
+            target_cname: string
+        }[]
+        payload?: ProxyRecord[]
+    }
+    diagnose: (id: ProxyRecord['id']) => {
+        id: string
+    }
+    diagnoseFailure: (
+        id: ProxyRecord['id'],
+        error: string
+    ) => {
+        error: string
+        id: string
+    }
+    diagnoseSuccess: (
+        id: ProxyRecord['id'],
+        report: DiagnosticReport
+    ) => {
+        id: string
+        report: DiagnosticReport
+    }
+    loadRecords: () => any
+    loadRecordsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRecordsSuccess: (
+        proxyRecords: ProxyRecord[],
+        payload?: any
+    ) => {
+        proxyRecords: ProxyRecord[]
+        payload?: any
+    }
+    maybeRefreshRecords: () => {
+        value: true
+    }
+    resetCreateRecord: (values?: { domain: string }) => {
+        values?: {
+            domain: string
+        }
+    }
+    retryRecord: (id: ProxyRecord['id']) => ProxyRecord[]
+    retryRecordFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    retryRecordSuccess: (
+        proxyRecords: ProxyRecord[],
+        payload?: ProxyRecord[]
+    ) => {
+        proxyRecords: ProxyRecord[]
+        payload?: ProxyRecord[]
+    }
+    setCloudflareOptInChecked: (checked: boolean) => {
+        checked: boolean
+    }
+    setCreateRecordManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setCreateRecordValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setCreateRecordValues: (
+        values: DeepPartial<{
+            domain: string
+        }>
+    ) => {
+        values: DeepPartial<{
+            domain: string
+        }>
+    }
+    setMaxProxyRecords: (maxProxyRecords: number) => {
+        maxProxyRecords: number
+    }
+    setRecordActiveTab: (
+        id: ProxyRecord['id'],
+        tab: string
+    ) => {
+        id: string
+        tab: string
+    }
+    setRecordExpanded: (
+        id: ProxyRecord['id'],
+        expanded: boolean
+    ) => {
+        expanded: boolean
+        id: string
+    }
+    showForm: () => {
+        value: true
+    }
+    submitCreateRecord: () => {
+        value: boolean
+    }
+    submitCreateRecordFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitCreateRecordRequest: (createRecord: { domain: string }) => {
+        createRecord: {
+            domain: string
+        }
+    }
+    submitCreateRecordSuccess: (createRecord: { domain: string }) => {
+        createRecord: {
+            domain: string
+        }
+    }
+    touchCreateRecordField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface proxyLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        shouldRefreshRecords: (proxyRecords: ProxyRecord[]) => boolean
+        shouldShowCloudflareOptIn: (
+            cloudflareOptInAcknowledged: boolean,
+            proxyRecordsLoaded: boolean,
+            proxyRecords: ProxyRecord[],
+            user: UserType | null
+        ) => boolean
+    }
+}
+
+export type proxyLogicType = MakeLogicType<proxyLogicValues, proxyLogicActions, Record<string, any>, proxyLogicMeta>
+
 export const proxyLogic = kea<proxyLogicType>([
     path(['scenes', 'project', 'Settings', 'proxyLogic']),
     connect(() => ({
@@ -238,7 +476,7 @@ export const proxyLogic = kea<proxyLogicType>([
     selectors(() => ({
         shouldRefreshRecords: [
             (s) => [s.proxyRecords],
-            (proxyRecords) => {
+            (proxyRecords: ProxyRecord[]) => {
                 return proxyRecords.some((r) => ['waiting', 'issuing', 'deleting'].includes(r.status))
             },
         ],
diff --git a/frontend/src/scenes/settings/environment/replayTriggersLogic.ts b/frontend/src/scenes/settings/environment/replayTriggersLogic.ts
index 534b3ef0a36a..4126966ac11d 100644
--- a/frontend/src/scenes/settings/environment/replayTriggersLogic.ts
+++ b/frontend/src/scenes/settings/environment/replayTriggersLogic.ts
@@ -1,5 +1,7 @@
-import { actions, connect, kea, listeners, path, reducers, selectors, sharedListeners } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors, sharedListeners } from 'kea'
+import type { BreakPointFunction } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 import { subscriptions } from 'kea-subscriptions'
 
@@ -10,7 +12,7 @@ import { teamLogic } from 'scenes/teamLogic'
 
 import { TeamPublicType, TeamType } from '~/types'
 
-import type { replayTriggersLogicType } from './replayTriggersLogicType'
+import type { AugmentedTeamSdkVersionsInfo } from '../../onboarding/shared/sdkHealth/sdkHealthLogic'
 
 export type ReplayPlatform = 'web' | 'mobile'
 
@@ -89,6 +91,286 @@ function ensureAnchored(url: string): string {
     return `^${url}$`
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface replayTriggersLogicValues {
+    augmentedData: AugmentedTeamSdkVersionsInfo // sdkHealthLogic
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    checkUrlBlocklist: string
+    checkUrlBlocklistResults: {
+        [key: number]: boolean
+    }
+    checkUrlTrigger: string
+    checkUrlTriggerResults: {
+        [key: number]: boolean
+    }
+    editUrlBlocklistIndex: number | null
+    editUrlTriggerIndex: number | null
+    eventTriggerConfig: string[] | null
+    hasOutdatedWebSdk: boolean
+    isAddUrlBlocklistConfigFormVisible: boolean
+    isAddUrlTriggerConfigFormVisible: boolean
+    isProposedUrlBlocklistSubmitting: boolean
+    isProposedUrlBlocklistValid: boolean
+    isProposedUrlTriggerSubmitting: boolean
+    isProposedUrlTriggerValid: boolean
+    outdatedWebTraffic: {
+        outdatedCount: number
+        share: number
+        totalCount: number
+    }
+    proposedUrlBlocklist: UrlTriggerConfig
+    proposedUrlBlocklistAllErrors: Record<string, any>
+    proposedUrlBlocklistChanged: boolean
+    proposedUrlBlocklistErrors: DeepPartialMap<UrlTriggerConfig, ValidationErrorType>
+    proposedUrlBlocklistHasErrors: boolean
+    proposedUrlBlocklistManualErrors: Record<string, any>
+    proposedUrlBlocklistTouched: boolean
+    proposedUrlBlocklistTouches: Record<string, boolean>
+    proposedUrlBlocklistValidationErrors: DeepPartialMap<UrlTriggerConfig, ValidationErrorType>
+    proposedUrlTrigger: UrlTriggerConfig
+    proposedUrlTriggerAllErrors: Record<string, any>
+    proposedUrlTriggerChanged: boolean
+    proposedUrlTriggerErrors: DeepPartialMap<UrlTriggerConfig, ValidationErrorType>
+    proposedUrlTriggerHasErrors: boolean
+    proposedUrlTriggerManualErrors: Record<string, any>
+    proposedUrlTriggerTouched: boolean
+    proposedUrlTriggerTouches: Record<string, boolean>
+    proposedUrlTriggerValidationErrors: DeepPartialMap<UrlTriggerConfig, ValidationErrorType>
+    remoteUrlBlocklistConfig: UrlTriggerConfig[] | undefined
+    selectedPlatform: ReplayPlatform
+    shouldMinimizeLegacyConditions: boolean
+    showProposedUrlBlocklistErrors: boolean
+    showProposedUrlTriggerErrors: boolean
+    urlBlocklistConfig: UrlTriggerConfig[] | null
+    urlBlocklistInputValidationWarning: string | null
+    urlBlocklistToEdit: {
+        matching: string
+        url: string
+    }
+    urlTriggerConfig: UrlTriggerConfig[] | null
+    urlTriggerInputValidationWarning: string | null
+    urlTriggerToEdit: {
+        matching: string
+        url: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface replayTriggersLogicActions {
+    updateCurrentTeam: (payload: Partial<TeamType>) => Partial<TeamType> // teamLogic
+    addUrlBlocklist: (urlBlocklistConfig: UrlTriggerConfig) => {
+        urlBlocklistConfig: UrlTriggerConfig
+    }
+    addUrlTrigger: (urlTriggerConfig: UrlTriggerConfig) => {
+        urlTriggerConfig: UrlTriggerConfig
+    }
+    cancelProposingUrlBlocklist: () => {
+        value: true
+    }
+    cancelProposingUrlTrigger: () => {
+        value: true
+    }
+    newUrlBlocklist: () => {
+        value: true
+    }
+    newUrlTrigger: () => {
+        value: true
+    }
+    removeUrlBlocklist: (index: number) => {
+        index: number
+    }
+    removeUrlTrigger: (index: number) => {
+        index: number
+    }
+    resetProposedUrlBlocklist: (values?: UrlTriggerConfig) => {
+        values?: UrlTriggerConfig
+    }
+    resetProposedUrlTrigger: (values?: UrlTriggerConfig) => {
+        values?: UrlTriggerConfig
+    }
+    selectPlatform: (platform: ReplayPlatform) => {
+        platform: ReplayPlatform
+    }
+    setCheckUrlBlocklist: (url: string) => {
+        url: string
+    }
+    setCheckUrlTrigger: (url: string) => {
+        url: string
+    }
+    setEditUrlBlocklistIndex: (originalIndex: number | null) => {
+        originalIndex: number | null
+    }
+    setEditUrlTriggerIndex: (originalIndex: number | null) => {
+        originalIndex: number | null
+    }
+    setEventTriggerConfig: (eventTriggerConfig: string[]) => {
+        eventTriggerConfig: string[]
+    }
+    setProposedUrlBlocklistManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setProposedUrlBlocklistValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setProposedUrlBlocklistValues: (values: DeepPartial<UrlTriggerConfig>) => {
+        values: DeepPartial<UrlTriggerConfig>
+    }
+    setProposedUrlTriggerManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setProposedUrlTriggerValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setProposedUrlTriggerValues: (values: DeepPartial<UrlTriggerConfig>) => {
+        values: DeepPartial<UrlTriggerConfig>
+    }
+    setUrlBlocklistConfig: (urlBlocklistConfig: UrlTriggerConfig[]) => {
+        urlBlocklistConfig: UrlTriggerConfig[]
+    }
+    setUrlTriggerConfig: (urlTriggerConfig: UrlTriggerConfig[]) => {
+        urlTriggerConfig: UrlTriggerConfig[]
+    }
+    submitProposedUrlBlocklist: () => {
+        value: boolean
+    }
+    submitProposedUrlBlocklistFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitProposedUrlBlocklistRequest: (proposedUrlBlocklist: UrlTriggerConfig) => {
+        proposedUrlBlocklist: UrlTriggerConfig
+    }
+    submitProposedUrlBlocklistSuccess: (proposedUrlBlocklist: UrlTriggerConfig) => {
+        proposedUrlBlocklist: UrlTriggerConfig
+    }
+    submitProposedUrlTrigger: () => {
+        value: boolean
+    }
+    submitProposedUrlTriggerFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitProposedUrlTriggerRequest: (proposedUrlTrigger: UrlTriggerConfig) => {
+        proposedUrlTrigger: UrlTriggerConfig
+    }
+    submitProposedUrlTriggerSuccess: (proposedUrlTrigger: UrlTriggerConfig) => {
+        proposedUrlTrigger: UrlTriggerConfig
+    }
+    touchProposedUrlBlocklistField: (key: string) => {
+        key: string
+    }
+    touchProposedUrlTriggerField: (key: string) => {
+        key: string
+    }
+    updateEventTriggerConfig: (eventTriggerConfig: string[]) => {
+        eventTriggerConfig: string[]
+    }
+    updateUrlBlocklist: (
+        index: number,
+        urlBlocklistConfig: UrlTriggerConfig
+    ) => {
+        index: number
+        urlBlocklistConfig: UrlTriggerConfig
+    }
+    updateUrlTrigger: (
+        index: number,
+        urlTriggerConfig: UrlTriggerConfig
+    ) => {
+        index: number
+        urlTriggerConfig: UrlTriggerConfig
+    }
+    validateUrlInput: (
+        url: string,
+        type: 'blocklist' | 'trigger'
+    ) => {
+        type: 'blocklist' | 'trigger'
+        url: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface replayTriggersLogicMeta {
+    sharedListeners: {
+        saveUrlTriggers: (
+            payload: any,
+            breakpoint: BreakPointFunction,
+            action: {
+                type: string
+                payload: any
+            },
+            previousState: any
+        ) => void | Promise<void>
+        saveUrlBlocklists: (
+            payload: any,
+            breakpoint: BreakPointFunction,
+            action: {
+                type: string
+                payload: any
+            },
+            previousState: any
+        ) => void | Promise<void>
+    }
+    __keaTypeGenInternalSelectorTypes: {
+        shouldMinimizeLegacyConditions: (augmentedData: AugmentedTeamSdkVersionsInfo) => boolean
+        hasOutdatedWebSdk: (augmentedData: AugmentedTeamSdkVersionsInfo) => boolean
+        outdatedWebTraffic: (augmentedData: AugmentedTeamSdkVersionsInfo) => {
+            outdatedCount: number
+            share: number
+            totalCount: number
+        }
+        isAddUrlTriggerConfigFormVisible: (editUrlTriggerIndex: number | null) => boolean
+        urlTriggerToEdit: (
+            urlTriggerConfig: UrlTriggerConfig[] | null,
+            editUrlTriggerIndex: number | null
+        ) => {
+            matching: string
+            url: string
+        }
+        remoteUrlBlocklistConfig: (currentTeam: TeamPublicType | TeamType | null) => UrlTriggerConfig[] | undefined
+        isAddUrlBlocklistConfigFormVisible: (editUrlBlocklistIndex: number | null) => boolean
+        urlBlocklistToEdit: (
+            urlBlocklistConfig: UrlTriggerConfig[] | null,
+            editUrlBlocklistIndex: number | null
+        ) => {
+            matching: string
+            url: string
+        }
+        checkUrlTriggerResults: (
+            checkUrlTrigger: string,
+            urlTriggerConfig: UrlTriggerConfig[] | null
+        ) => {
+            [key: number]: boolean
+        }
+        checkUrlBlocklistResults: (
+            checkUrlBlocklist: string,
+            urlBlocklistConfig: UrlTriggerConfig[] | null
+        ) => {
+            [key: number]: boolean
+        }
+    }
+}
+
+export type replayTriggersLogicType = MakeLogicType<
+    replayTriggersLogicValues,
+    replayTriggersLogicActions,
+    Record<string, any>,
+    replayTriggersLogicMeta
+>
+
 export const replayTriggersLogic = kea<replayTriggersLogicType>([
     path(['scenes', 'settings', 'project', 'replayTriggersLogic']),
     actions({
@@ -248,24 +530,30 @@ export const replayTriggersLogic = kea<replayTriggersLogicType>([
     selectors({
         shouldMinimizeLegacyConditions: [
             (s) => [s.augmentedData],
-            (augmentedData): boolean => legacyConditionsAreInactive(augmentedData?.web?.allReleases ?? []),
+            (
+                augmentedData: import('scenes/onboarding/shared/sdkHealth/sdkHealthLogic').AugmentedTeamSdkVersionsInfo
+            ): boolean => legacyConditionsAreInactive(augmentedData?.web?.allReleases ?? []),
         ],
         hasOutdatedWebSdk: [
             (s) => [s.augmentedData],
-            (augmentedData): boolean => hasOutdatedWebSdk(augmentedData?.web?.allReleases ?? []),
+            (
+                augmentedData: import('scenes/onboarding/shared/sdkHealth/sdkHealthLogic').AugmentedTeamSdkVersionsInfo
+            ): boolean => hasOutdatedWebSdk(augmentedData?.web?.allReleases ?? []),
         ],
         outdatedWebTraffic: [
             (s) => [s.augmentedData],
-            (augmentedData): { outdatedCount: number; totalCount: number; share: number } =>
+            (
+                augmentedData: import('scenes/onboarding/shared/sdkHealth/sdkHealthLogic').AugmentedTeamSdkVersionsInfo
+            ): { outdatedCount: number; totalCount: number; share: number } =>
                 outdatedWebTrafficShare(augmentedData?.web?.allReleases ?? []),
         ],
         isAddUrlTriggerConfigFormVisible: [
             (s) => [s.editUrlTriggerIndex],
-            (editUrlTriggerIndex) => editUrlTriggerIndex === -1,
+            (editUrlTriggerIndex: number | null) => editUrlTriggerIndex === -1,
         ],
         urlTriggerToEdit: [
             (s) => [s.urlTriggerConfig, s.editUrlTriggerIndex],
-            (urlTriggerConfig, editUrlTriggerIndex) => {
+            (urlTriggerConfig: UrlTriggerConfig[] | null, editUrlTriggerIndex: number | null) => {
                 if (
                     editUrlTriggerIndex === null ||
                     editUrlTriggerIndex === -1 ||
@@ -279,15 +567,15 @@ export const replayTriggersLogic = kea<replayTriggersLogicType>([
 
         remoteUrlBlocklistConfig: [
             (s) => [s.currentTeam],
-            (currentTeam) => currentTeam?.session_recording_url_blocklist_config,
+            (currentTeam: TeamPublicType | TeamType | null) => currentTeam?.session_recording_url_blocklist_config,
         ],
         isAddUrlBlocklistConfigFormVisible: [
             (s) => [s.editUrlBlocklistIndex],
-            (editUrlBlocklistIndex) => editUrlBlocklistIndex === -1,
+            (editUrlBlocklistIndex: number | null) => editUrlBlocklistIndex === -1,
         ],
         urlBlocklistToEdit: [
             (s) => [s.urlBlocklistConfig, s.editUrlBlocklistIndex],
-            (urlBlocklistConfig, editUrlBlocklistIndex) => {
+            (urlBlocklistConfig: UrlTriggerConfig[] | null, editUrlBlocklistIndex: number | null) => {
                 if (
                     editUrlBlocklistIndex === null ||
                     editUrlBlocklistIndex === -1 ||
@@ -301,7 +589,7 @@ export const replayTriggersLogic = kea<replayTriggersLogicType>([
 
         checkUrlTriggerResults: [
             (s) => [s.checkUrlTrigger, s.urlTriggerConfig],
-            (checkUrl, urlTriggerConfig): { [key: number]: boolean } => {
+            (checkUrl: string, urlTriggerConfig: UrlTriggerConfig[] | null): { [key: number]: boolean } => {
                 if (!checkUrl.trim() || !urlTriggerConfig) {
                     return {}
                 }
@@ -321,7 +609,7 @@ export const replayTriggersLogic = kea<replayTriggersLogicType>([
 
         checkUrlBlocklistResults: [
             (s) => [s.checkUrlBlocklist, s.urlBlocklistConfig],
-            (checkUrl, urlBlocklistConfig): { [key: number]: boolean } => {
+            (checkUrl: string, urlBlocklistConfig: UrlTriggerConfig[] | null): { [key: number]: boolean } => {
                 if (!checkUrl.trim() || !urlBlocklistConfig) {
                     return {}
                 }
diff --git a/frontend/src/scenes/settings/environment/usageMetricsConfigLogic.ts b/frontend/src/scenes/settings/environment/usageMetricsConfigLogic.ts
index 7e1b41e9f9b1..a27cb7e32149 100644
--- a/frontend/src/scenes/settings/environment/usageMetricsConfigLogic.ts
+++ b/frontend/src/scenes/settings/environment/usageMetricsConfigLogic.ts
@@ -1,5 +1,6 @@
-import { actions, connect, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { lazyLoaders } from 'kea-loaders'
 
 import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
@@ -17,7 +18,7 @@ import {
 } from 'products/customer_analytics/frontend/generated/api'
 import type { GroupUsageMetricApi } from 'products/customer_analytics/frontend/generated/api.schemas'
 
-import type { usageMetricsConfigLogicType } from './usageMetricsConfigLogicType'
+import type { ProductIntentProperties } from '../../../lib/utils/product-intents'
 
 export type UsageMetricSource = 'events' | 'data_warehouse'
 
@@ -119,6 +120,165 @@ export interface UsageMetricsConfigLogicProps {
     logicKey?: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface usageMetricsConfigLogicValues {
+    currentProjectId: number | null // projectLogic
+    isModalOpen: boolean
+    isUsageMetricSubmitting: boolean
+    isUsageMetricValid: boolean
+    showUsageMetricErrors: boolean
+    usageMetric: UsageMetricFormData
+    usageMetricAllErrors: Record<string, any>
+    usageMetricChanged: boolean
+    usageMetricErrors: DeepPartialMap<UsageMetricFormData, ValidationErrorType>
+    usageMetricHasErrors: boolean
+    usageMetricManualErrors: Record<string, any>
+    usageMetricTouched: boolean
+    usageMetricTouches: Record<string, boolean>
+    usageMetricValidationErrors: DeepPartialMap<UsageMetricFormData, ValidationErrorType>
+    usageMetrics: GroupUsageMetricApi[]
+    usageMetricsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface usageMetricsConfigLogicActions {
+    reportUsageMetricCreated: () => boolean // eventUsageLogic
+    reportUsageMetricDeleted: () => boolean // eventUsageLogic
+    reportUsageMetricUpdated: () => boolean // eventUsageLogic
+    addProductIntent: (properties: ProductIntentProperties) => ProductIntentProperties // teamLogic
+    addUsageMetric: (metric: UsageMetricFormData) => {
+        metric: UsageMetricFormData
+    }
+    addUsageMetricFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    addUsageMetricSuccess: (
+        usageMetrics: GroupUsageMetricApi[],
+        payload?: {
+            metric: UsageMetricFormData
+        }
+    ) => {
+        usageMetrics: GroupUsageMetricApi[]
+        payload?: {
+            metric: UsageMetricFormData
+        }
+    }
+    closeModal: () => {
+        value: true
+    }
+    loadUsageMetrics: () => any
+    loadUsageMetricsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadUsageMetricsSuccess: (
+        usageMetrics: GroupUsageMetricApi[],
+        payload?: any
+    ) => {
+        usageMetrics: GroupUsageMetricApi[]
+        payload?: any
+    }
+    openModal: () => {
+        value: true
+    }
+    removeUsageMetric: (id: string) => {
+        id: string
+    }
+    removeUsageMetricFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    removeUsageMetricSuccess: (
+        usageMetrics: GroupUsageMetricApi[],
+        payload?: {
+            id: string
+        }
+    ) => {
+        usageMetrics: GroupUsageMetricApi[]
+        payload?: {
+            id: string
+        }
+    }
+    resetUsageMetric: (values?: UsageMetricFormData) => {
+        values?: UsageMetricFormData
+    }
+    setUsageMetricManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setUsageMetricValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setUsageMetricValues: (values: DeepPartial<UsageMetricFormData>) => {
+        values: DeepPartial<UsageMetricFormData>
+    }
+    submitUsageMetric: () => {
+        value: boolean
+    }
+    submitUsageMetricFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitUsageMetricRequest: (usageMetric: UsageMetricFormData) => {
+        usageMetric: UsageMetricFormData
+    }
+    submitUsageMetricSuccess: (usageMetric: UsageMetricFormData) => {
+        usageMetric: UsageMetricFormData
+    }
+    touchUsageMetricField: (key: string) => {
+        key: string
+    }
+    updateUsageMetric: (metric: UsageMetricFormData) => {
+        metric: UsageMetricFormData
+    }
+    updateUsageMetricFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateUsageMetricSuccess: (
+        usageMetrics: GroupUsageMetricApi[],
+        payload?: {
+            metric: UsageMetricFormData
+        }
+    ) => {
+        usageMetrics: GroupUsageMetricApi[]
+        payload?: {
+            metric: UsageMetricFormData
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface usageMetricsConfigLogicMeta {
+    key: string
+}
+
+export type usageMetricsConfigLogicType = MakeLogicType<
+    usageMetricsConfigLogicValues,
+    usageMetricsConfigLogicActions,
+    UsageMetricsConfigLogicProps,
+    usageMetricsConfigLogicMeta
+>
+
 export const usageMetricsConfigLogic = kea<usageMetricsConfigLogicType>([
     path(['scenes', 'settings', 'environment', 'usageMetricsConfigLogic']),
     props({} as UsageMetricsConfigLogicProps),
diff --git a/frontend/src/scenes/settings/organization/Approvals/approvalPoliciesLogic.tsx b/frontend/src/scenes/settings/organization/Approvals/approvalPoliciesLogic.tsx
index a0a0d1596dc7..0d16ce4fb173 100644
--- a/frontend/src/scenes/settings/organization/Approvals/approvalPoliciesLogic.tsx
+++ b/frontend/src/scenes/settings/organization/Approvals/approvalPoliciesLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -8,7 +8,52 @@ import { userLogic } from 'scenes/userLogic'
 
 import { ApprovalPolicy, AvailableFeature } from '~/types'
 
-import type { approvalPoliciesLogicType } from './approvalPoliciesLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface approvalPoliciesLogicValues {
+    hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean // userLogic
+    policies: ApprovalPolicy[]
+    policiesLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface approvalPoliciesLogicActions {
+    createPolicy: (policy: Partial<ApprovalPolicy>) => {
+        policy: Partial<ApprovalPolicy>
+    }
+    deletePolicy: (id: string) => {
+        id: string
+    }
+    loadPolicies: () => {
+        value: true
+    }
+    loadPoliciesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPoliciesSuccess: (
+        policies: ApprovalPolicy[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        policies: ApprovalPolicy[]
+        payload?: {
+            value: true
+        }
+    }
+    updatePolicy: (
+        id: string,
+        policy: Partial<ApprovalPolicy>
+    ) => {
+        id: string
+        policy: Partial<ApprovalPolicy>
+    }
+}
+
+export type approvalPoliciesLogicType = MakeLogicType<approvalPoliciesLogicValues, approvalPoliciesLogicActions>
 
 export const approvalPoliciesLogic = kea<approvalPoliciesLogicType>([
     path(['scenes', 'settings', 'organization', 'Approvals', 'approvalPoliciesLogic']),
diff --git a/frontend/src/scenes/settings/organization/Permissions/Roles/rolesLogic.tsx b/frontend/src/scenes/settings/organization/Permissions/Roles/rolesLogic.tsx
index 5d012c77eb40..42316386c33c 100644
--- a/frontend/src/scenes/settings/organization/Permissions/Roles/rolesLogic.tsx
+++ b/frontend/src/scenes/settings/organization/Permissions/Roles/rolesLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -7,7 +7,144 @@ import { membersLogic } from 'scenes/organization/membersLogic'
 
 import { RoleMemberType, RoleType, UserBasicType } from '~/types'
 
-import type { rolesLogicType } from './rolesLogicType'
+import type { OrganizationMemberType } from '../../../../../types'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface rolesLogicValues {
+    members: OrganizationMemberType[] | null // membersLogic
+    addableMembers: UserBasicType[]
+    createRoleModalShown: boolean
+    roleInFocus: RoleType | null
+    roleMembersInFocus: RoleMemberType[]
+    roleMembersInFocusLoading: boolean
+    roleMembersToAdd: string[]
+    roles: RoleType[]
+    rolesLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface rolesLogicActions {
+    addRoleMembers: ({ role, membersToAdd }: any) => any
+    addRoleMembersFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    addRoleMembersSuccess: (
+        roleMembersInFocus: any[],
+        payload?: any
+    ) => {
+        roleMembersInFocus: any[]
+        payload?: any
+    }
+    createRole: (roleName: string) => string
+    createRoleFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    createRoleSuccess: (
+        roles: RoleType[],
+        payload?: string
+    ) => {
+        roles: RoleType[]
+        payload?: string
+    }
+    deleteRole: (role: RoleType) => RoleType
+    deleteRoleFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteRoleMember: ({ roleMemberUuid }: any) => any
+    deleteRoleMemberFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteRoleMemberSuccess: (
+        roleMembersInFocus: RoleMemberType[],
+        payload?: any
+    ) => {
+        roleMembersInFocus: RoleMemberType[]
+        payload?: any
+    }
+    deleteRoleSuccess: (
+        roles: RoleType[],
+        payload?: RoleType
+    ) => {
+        roles: RoleType[]
+        payload?: RoleType
+    }
+    loadRoleMembers: ({ roleId }: any) => any
+    loadRoleMembersFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRoleMembersSuccess: (
+        roleMembersInFocus: RoleMemberType[],
+        payload?: any
+    ) => {
+        roleMembersInFocus: RoleMemberType[]
+        payload?: any
+    }
+    loadRoles: () => any
+    loadRolesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRolesSuccess: (
+        roles: RoleType[],
+        payload?: any
+    ) => {
+        roles: RoleType[]
+        payload?: any
+    }
+    openCreateRoleModal: () => {
+        value: true
+    }
+    setCreateRoleModalShown: (shown: boolean) => {
+        shown: boolean
+    }
+    setRoleInFocus: (role: RoleType | null) => {
+        role: RoleType | null
+    }
+    setRoleMembersInFocus: (roleMembers: RoleMemberType[]) => {
+        roleMembers: RoleMemberType[]
+    }
+    setRoleMembersToAdd: (uuids: string[]) => {
+        uuids: string[]
+    }
+    updateRole: (role: RoleType) => {
+        role: RoleType
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface rolesLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        addableMembers: (
+            members: OrganizationMemberType[] | null,
+            roleMembersInFocus: RoleMemberType[]
+        ) => UserBasicType[]
+    }
+}
+
+export type rolesLogicType = MakeLogicType<rolesLogicValues, rolesLogicActions, Record<string, any>, rolesLogicMeta>
 
 export const rolesLogic = kea<rolesLogicType>([
     path(['scenes', 'organization', 'rolesLogic']),
@@ -113,7 +250,10 @@ export const rolesLogic = kea<rolesLogicType>([
     selectors({
         addableMembers: [
             (s) => [s.members, s.roleMembersInFocus],
-            (members, roleMembersInFocus): UserBasicType[] => {
+            (
+                members: import('~/types').OrganizationMemberType[] | null,
+                roleMembersInFocus: RoleMemberType[]
+            ): UserBasicType[] => {
                 const addableMembers: UserBasicType[] = []
                 for (const member of members || []) {
                     if (
diff --git a/frontend/src/scenes/settings/organization/VerifiedDomains/verifiedDomainsLogic.ts b/frontend/src/scenes/settings/organization/VerifiedDomains/verifiedDomainsLogic.ts
index f2ceaa10c1a9..61f40aaffd7f 100644
--- a/frontend/src/scenes/settings/organization/VerifiedDomains/verifiedDomainsLogic.ts
+++ b/frontend/src/scenes/settings/organization/VerifiedDomains/verifiedDomainsLogic.ts
@@ -1,5 +1,6 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -19,8 +20,6 @@ import {
 import { IdentityProviderConfigApi } from '~/generated/core/api.schemas'
 import { AvailableFeature, OrganizationDomainType, PaginatedSCIMRequestLogs } from '~/types'
 
-import type { verifiedDomainsLogicType } from './verifiedDomainsLogicType'
-
 /**
  * Resolve the `IdentityProviderConfig` id that backs a domain, creating and linking an empty
  * config first if the domain doesn't have one yet. The config is the sole read/write interface
@@ -96,6 +95,535 @@ export const isSecureURL = (url: string): boolean => {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface verifiedDomainsLogicValues {
+    currentOrganizationId: string // organizationLogic
+    addModalShown: boolean
+    configureIdJagModalId: string | null
+    configureSAMLModalId: string | null
+    configureSCIMModalId: string | null
+    domainBeingVerified: OrganizationDomainType | null
+    idJagConfig: Partial<
+        Pick<IdentityProviderConfigApi, 'id_jag_allowed_clients' | 'id_jag_issuer_url' | 'id_jag_jwks_url'> & {
+            id: string
+        }
+    >
+    idJagConfigAllErrors: Record<string, any>
+    idJagConfigChanged: boolean
+    idJagConfigErrors: DeepPartialMap<
+        Partial<
+            Pick<IdentityProviderConfigApi, 'id_jag_allowed_clients' | 'id_jag_issuer_url' | 'id_jag_jwks_url'> & {
+                id: string
+            }
+        >,
+        ValidationErrorType
+    >
+    idJagConfigHasErrors: boolean
+    idJagConfigManualErrors: Record<string, any>
+    idJagConfigTouched: boolean
+    idJagConfigTouches: Record<string, boolean>
+    idJagConfigValidationErrors: DeepPartialMap<
+        Partial<
+            Pick<IdentityProviderConfigApi, 'id_jag_allowed_clients' | 'id_jag_issuer_url' | 'id_jag_jwks_url'> & {
+                id: string
+            }
+        >,
+        ValidationErrorType
+    >
+    isIdJagConfigSubmitting: boolean
+    isIdJagConfigValid: boolean
+    isSAMLAvailable: boolean
+    isSCIMAvailable: boolean
+    isSSOEnforcementAvailable: boolean
+    isSamlConfigSubmitting: boolean
+    isSamlConfigValid: boolean
+    isXAAAuthenticationAvailable: boolean
+    samlConfig: Partial<
+        Pick<IdentityProviderConfigApi, 'saml_acs_url' | 'saml_entity_id' | 'saml_x509_cert'> & {
+            id: string
+        }
+    >
+    samlConfigAllErrors: Record<string, any>
+    samlConfigChanged: boolean
+    samlConfigErrors: DeepPartialMap<
+        Partial<
+            Pick<IdentityProviderConfigApi, 'saml_acs_url' | 'saml_entity_id' | 'saml_x509_cert'> & {
+                id: string
+            }
+        >,
+        ValidationErrorType
+    >
+    samlConfigHasErrors: boolean
+    samlConfigManualErrors: Record<string, any>
+    samlConfigTouched: boolean
+    samlConfigTouches: Record<string, boolean>
+    samlConfigValidationErrors: DeepPartialMap<
+        Partial<
+            Pick<IdentityProviderConfigApi, 'saml_acs_url' | 'saml_entity_id' | 'saml_x509_cert'> & {
+                id: string
+            }
+        >,
+        ValidationErrorType
+    >
+    scimConfig: SCIMConfigType
+    scimConfigLoading: boolean
+    scimLogs: PaginatedSCIMRequestLogs | null
+    scimLogsLoading: boolean
+    scimLogsModalId: string | null
+    scimLogsPage: number
+    scimLogsSearch: string
+    scimLogsStatusFilter: '4xx' | '5xx' | 'all' | 'success'
+    showIdJagConfigErrors: boolean
+    showSamlConfigErrors: boolean
+    updatingDomain: boolean
+    updatingDomainLoading: boolean
+    verifiedDomains: OrganizationDomainType[]
+    verifiedDomainsLoading: boolean
+    verifyModal: string | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface verifiedDomainsLogicActions {
+    addVerifiedDomain: (domain: string) => string
+    addVerifiedDomainFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    addVerifiedDomainSuccess: (
+        verifiedDomains: OrganizationDomainType[],
+        payload?: string
+    ) => {
+        verifiedDomains: OrganizationDomainType[]
+        payload?: string
+    }
+    deleteVerifiedDomain: (id: string) => string
+    deleteVerifiedDomainFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteVerifiedDomainSuccess: (
+        verifiedDomains: OrganizationDomainType[],
+        payload?: string
+    ) => {
+        verifiedDomains: OrganizationDomainType[]
+        payload?: string
+    }
+    disableScim: (domainId: string) => string
+    disableScimFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    disableScimSuccess: (
+        scimConfig: Partial<
+            Pick<IdentityProviderConfigApi, 'scim_bearer_token' | 'scim_enabled'> & {
+                id: string
+                scim_base_url: string | null
+            }
+        >,
+        payload?: string
+    ) => {
+        scimConfig: Partial<
+            Pick<IdentityProviderConfigApi, 'scim_bearer_token' | 'scim_enabled'> & {
+                id: string
+                scim_base_url: string | null
+            }
+        >
+        payload?: string
+    }
+    enableScim: (domainId: string) => string
+    enableScimFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    enableScimSuccess: (
+        scimConfig: Partial<
+            Pick<IdentityProviderConfigApi, 'scim_bearer_token' | 'scim_enabled'> & {
+                id: string
+                scim_base_url: string | null
+            }
+        >,
+        payload?: string
+    ) => {
+        scimConfig: Partial<
+            Pick<IdentityProviderConfigApi, 'scim_bearer_token' | 'scim_enabled'> & {
+                id: string
+                scim_base_url: string | null
+            }
+        >
+        payload?: string
+    }
+    hideAddDomainModal: () => {
+        value: true
+    }
+    loadScimConfig: (domainId: string) => string
+    loadScimConfigFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadScimConfigSuccess: (
+        scimConfig: {
+            id: string
+            scim_base_url: string | undefined
+            scim_enabled: boolean
+        },
+        payload?: string
+    ) => {
+        scimConfig: {
+            id: string
+            scim_base_url: string | undefined
+            scim_enabled: boolean
+        }
+        payload?: string
+    }
+    loadScimLogs: ({ domainId, page }: { domainId: string; page?: number }) => {
+        domainId: string
+        page?: number
+    }
+    loadScimLogsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadScimLogsSuccess: (
+        scimLogs: PaginatedSCIMRequestLogs | null,
+        payload?: {
+            domainId: string
+            page?: number
+        }
+    ) => {
+        scimLogs: PaginatedSCIMRequestLogs | null
+        payload?: {
+            domainId: string
+            page?: number
+        }
+    }
+    loadVerifiedDomains: () => any
+    loadVerifiedDomainsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadVerifiedDomainsSuccess: (
+        verifiedDomains: OrganizationDomainType[],
+        payload?: any
+    ) => {
+        verifiedDomains: OrganizationDomainType[]
+        payload?: any
+    }
+    regenerateScimToken: (domainId: string) => string
+    regenerateScimTokenFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    regenerateScimTokenSuccess: (
+        scimConfig: Partial<
+            Pick<IdentityProviderConfigApi, 'scim_bearer_token' | 'scim_enabled'> & {
+                id: string
+                scim_base_url: string | null
+            }
+        >,
+        payload?: string
+    ) => {
+        scimConfig: Partial<
+            Pick<IdentityProviderConfigApi, 'scim_bearer_token' | 'scim_enabled'> & {
+                id: string
+                scim_base_url: string | null
+            }
+        >
+        payload?: string
+    }
+    reloadScimLogs: () => {
+        value: true
+    }
+    replaceDomain: (domain: OrganizationDomainType) => {
+        domain: OrganizationDomainType
+    }
+    resetIdJagConfig: (
+        values?: Partial<
+            Pick<IdentityProviderConfigApi, 'id_jag_allowed_clients' | 'id_jag_issuer_url' | 'id_jag_jwks_url'> & {
+                id: string
+            }
+        >
+    ) => {
+        values?: Partial<
+            Pick<IdentityProviderConfigApi, 'id_jag_allowed_clients' | 'id_jag_issuer_url' | 'id_jag_jwks_url'> & {
+                id: string
+            }
+        >
+    }
+    resetSamlConfig: (
+        values?: Partial<
+            Pick<IdentityProviderConfigApi, 'saml_acs_url' | 'saml_entity_id' | 'saml_x509_cert'> & {
+                id: string
+            }
+        >
+    ) => {
+        values?: Partial<
+            Pick<IdentityProviderConfigApi, 'saml_acs_url' | 'saml_entity_id' | 'saml_x509_cert'> & {
+                id: string
+            }
+        >
+    }
+    setConfigureIdJagModalId: (id: string | null) => {
+        id: string | null
+    }
+    setConfigureSAMLModalId: (id: string | null) => {
+        id: string | null
+    }
+    setConfigureSCIMModalId: (id: string | null) => {
+        id: string | null
+    }
+    setIdJagConfigManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setIdJagConfigValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setIdJagConfigValues: (
+        values: DeepPartial<
+            Partial<
+                Pick<IdentityProviderConfigApi, 'id_jag_allowed_clients' | 'id_jag_issuer_url' | 'id_jag_jwks_url'> & {
+                    id: string
+                }
+            >
+        >
+    ) => {
+        values: DeepPartial<
+            Partial<
+                Pick<IdentityProviderConfigApi, 'id_jag_allowed_clients' | 'id_jag_issuer_url' | 'id_jag_jwks_url'> & {
+                    id: string
+                }
+            >
+        >
+    }
+    setSamlConfigManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setSamlConfigValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setSamlConfigValues: (
+        values: DeepPartial<
+            Partial<
+                Pick<IdentityProviderConfigApi, 'saml_acs_url' | 'saml_entity_id' | 'saml_x509_cert'> & {
+                    id: string
+                }
+            >
+        >
+    ) => {
+        values: DeepPartial<
+            Partial<
+                Pick<IdentityProviderConfigApi, 'saml_acs_url' | 'saml_entity_id' | 'saml_x509_cert'> & {
+                    id: string
+                }
+            >
+        >
+    }
+    setScimLogsModalId: (id: string | null) => {
+        id: string | null
+    }
+    setScimLogsModalIdFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    setScimLogsModalIdSuccess: (
+        scimLogs: null,
+        payload?: {
+            id: string | null
+        }
+    ) => {
+        scimLogs: null
+        payload?: {
+            id: string | null
+        }
+    }
+    setScimLogsPage: (page: number) => {
+        page: number
+    }
+    setScimLogsSearch: (search: string) => {
+        search: string
+    }
+    setScimLogsStatusFilter: (filter: '4xx' | '5xx' | 'all' | 'success') => {
+        filter: '4xx' | '5xx' | 'all' | 'success'
+    }
+    setVerifyModal: (id: string | null) => {
+        id: string | null
+    }
+    showAddDomainModal: () => {
+        value: true
+    }
+    submitIdJagConfig: () => {
+        value: boolean
+    }
+    submitIdJagConfigFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitIdJagConfigRequest: (
+        idJagConfig: Partial<
+            Pick<IdentityProviderConfigApi, 'id_jag_allowed_clients' | 'id_jag_issuer_url' | 'id_jag_jwks_url'> & {
+                id: string
+            }
+        >
+    ) => {
+        idJagConfig: Partial<
+            Pick<IdentityProviderConfigApi, 'id_jag_allowed_clients' | 'id_jag_issuer_url' | 'id_jag_jwks_url'> & {
+                id: string
+            }
+        >
+    }
+    submitIdJagConfigSuccess: (
+        idJagConfig: Partial<
+            Pick<IdentityProviderConfigApi, 'id_jag_allowed_clients' | 'id_jag_issuer_url' | 'id_jag_jwks_url'> & {
+                id: string
+            }
+        >
+    ) => {
+        idJagConfig: Partial<
+            Pick<IdentityProviderConfigApi, 'id_jag_allowed_clients' | 'id_jag_issuer_url' | 'id_jag_jwks_url'> & {
+                id: string
+            }
+        >
+    }
+    submitSamlConfig: () => {
+        value: boolean
+    }
+    submitSamlConfigFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitSamlConfigRequest: (
+        samlConfig: Partial<
+            Pick<IdentityProviderConfigApi, 'saml_acs_url' | 'saml_entity_id' | 'saml_x509_cert'> & {
+                id: string
+            }
+        >
+    ) => {
+        samlConfig: Partial<
+            Pick<IdentityProviderConfigApi, 'saml_acs_url' | 'saml_entity_id' | 'saml_x509_cert'> & {
+                id: string
+            }
+        >
+    }
+    submitSamlConfigSuccess: (
+        samlConfig: Partial<
+            Pick<IdentityProviderConfigApi, 'saml_acs_url' | 'saml_entity_id' | 'saml_x509_cert'> & {
+                id: string
+            }
+        >
+    ) => {
+        samlConfig: Partial<
+            Pick<IdentityProviderConfigApi, 'saml_acs_url' | 'saml_entity_id' | 'saml_x509_cert'> & {
+                id: string
+            }
+        >
+    }
+    touchIdJagConfigField: (key: string) => {
+        key: string
+    }
+    touchSamlConfigField: (key: string) => {
+        key: string
+    }
+    updateDomain: (payload: OrganizationDomainUpdatePayload) => OrganizationDomainUpdatePayload
+    updateDomainFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateDomainSuccess: (
+        updatingDomain: boolean,
+        payload?: OrganizationDomainUpdatePayload
+    ) => {
+        updatingDomain: boolean
+        payload?: OrganizationDomainUpdatePayload
+    }
+    verifyDomain: () => any
+    verifyDomainFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    verifyDomainSuccess: (
+        updatingDomain: boolean,
+        payload?: any
+    ) => {
+        updatingDomain: boolean
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface verifiedDomainsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        domainBeingVerified: (
+            verifiedDomains: OrganizationDomainType[],
+            verifyModal: string | null
+        ) => OrganizationDomainType | null
+        isSSOEnforcementAvailable: (
+            hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean
+        ) => boolean
+        isSAMLAvailable: (
+            hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean
+        ) => boolean
+        isSCIMAvailable: (
+            hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean
+        ) => boolean
+        isXAAAuthenticationAvailable: (
+            hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean
+        ) => boolean
+    }
+}
+
+export type verifiedDomainsLogicType = MakeLogicType<
+    verifiedDomainsLogicValues,
+    verifiedDomainsLogicActions,
+    Record<string, any>,
+    verifiedDomainsLogicMeta
+>
+
 export const verifiedDomainsLogic = kea<verifiedDomainsLogicType>([
     path(['scenes', 'organization', 'verifiedDomainsLogic']),
     connect(() => ({ values: [organizationLogic, ['currentOrganizationId']], logic: [userLogic] })),
@@ -407,24 +935,28 @@ export const verifiedDomainsLogic = kea<verifiedDomainsLogicType>([
     selectors({
         domainBeingVerified: [
             (s) => [s.verifiedDomains, s.verifyModal],
-            (verifiedDomains, verifyingId): OrganizationDomainType | null =>
+            (verifiedDomains: OrganizationDomainType[], verifyingId: string | null): OrganizationDomainType | null =>
                 (verifyingId && verifiedDomains.find(({ id }) => id === verifyingId)) || null,
         ],
         isSSOEnforcementAvailable: [
             () => [userLogic.selectors.hasAvailableFeature],
-            (hasAvailableFeature): boolean => hasAvailableFeature(AvailableFeature.SSO_ENFORCEMENT),
+            (hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean): boolean =>
+                hasAvailableFeature(AvailableFeature.SSO_ENFORCEMENT),
         ],
         isSAMLAvailable: [
             () => [userLogic.selectors.hasAvailableFeature],
-            (hasAvailableFeature): boolean => hasAvailableFeature(AvailableFeature.SAML),
+            (hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean): boolean =>
+                hasAvailableFeature(AvailableFeature.SAML),
         ],
         isSCIMAvailable: [
             () => [userLogic.selectors.hasAvailableFeature],
-            (hasAvailableFeature): boolean => hasAvailableFeature(AvailableFeature.SCIM),
+            (hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean): boolean =>
+                hasAvailableFeature(AvailableFeature.SCIM),
         ],
         isXAAAuthenticationAvailable: [
             () => [userLogic.selectors.hasAvailableFeature],
-            (hasAvailableFeature): boolean => hasAvailableFeature(AvailableFeature.XAA_AUTHENTICATION),
+            (hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean): boolean =>
+                hasAvailableFeature(AvailableFeature.XAA_AUTHENTICATION),
         ],
     }),
     afterMount(({ actions }) => actions.loadVerifiedDomains()),
diff --git a/frontend/src/scenes/settings/organization/cimdVerificationTokensLogic.ts b/frontend/src/scenes/settings/organization/cimdVerificationTokensLogic.ts
index a322be68c14d..ce3aa9d0d173 100644
--- a/frontend/src/scenes/settings/organization/cimdVerificationTokensLogic.ts
+++ b/frontend/src/scenes/settings/organization/cimdVerificationTokensLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, listeners, path, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
@@ -11,11 +11,60 @@ import {
 } from '~/generated/core/api'
 import { CIMDVerificationTokenApi, CIMDVerificationTokenWithValueApi } from '~/generated/core/api.schemas'
 
-import type { cimdVerificationTokensLogicType } from './cimdVerificationTokensLogicType'
-
 export type CIMDVerificationToken = CIMDVerificationTokenApi
 export type CIMDVerificationTokenWithValue = CIMDVerificationTokenWithValueApi
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface cimdVerificationTokensLogicValues {
+    isCreateDialogOpen: boolean
+    justCreatedToken: CIMDVerificationTokenWithValue | null
+    newTokenLabel: string
+    tokens: CIMDVerificationToken[]
+    tokensLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface cimdVerificationTokensLogicActions {
+    createToken: () => {
+        value: true
+    }
+    deleteToken: (token: CIMDVerificationToken) => {
+        token: CIMDVerificationTokenApi
+    }
+    hideCreateDialog: () => {
+        value: true
+    }
+    loadTokens: () => any
+    loadTokensFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadTokensSuccess: (
+        tokens: CIMDVerificationTokenApi[],
+        payload?: any
+    ) => {
+        tokens: CIMDVerificationTokenApi[]
+        payload?: any
+    }
+    setJustCreatedToken: (token: CIMDVerificationTokenWithValue | null) => {
+        token: CIMDVerificationTokenWithValueApi | null
+    }
+    setNewTokenLabel: (label: string) => {
+        label: string
+    }
+    showCreateDialog: () => {
+        value: true
+    }
+}
+
+export type cimdVerificationTokensLogicType = MakeLogicType<
+    cimdVerificationTokensLogicValues,
+    cimdVerificationTokensLogicActions
+>
+
 export const cimdVerificationTokensLogic = kea<cimdVerificationTokensLogicType>([
     path(['scenes', 'settings', 'organization', 'cimdVerificationTokensLogic']),
 
diff --git a/frontend/src/scenes/settings/organization/inviteLogic.ts b/frontend/src/scenes/settings/organization/inviteLogic.ts
index 69be469a2ced..28a5d345cc22 100644
--- a/frontend/src/scenes/settings/organization/inviteLogic.ts
+++ b/frontend/src/scenes/settings/organization/inviteLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { lazyLoaders, loaders } from 'kea-loaders'
 
 import api, { PaginatedResponse } from 'lib/api'
@@ -12,7 +12,7 @@ import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
 
 import { AccessControlLevel, OrganizationInviteType } from '~/types'
 
-import type { inviteLogicType } from './inviteLogicType'
+import type { PreflightStatus } from '../../../types'
 
 /** State of a single invite row (with input data) in bulk invite creation. */
 export interface InviteRowState {
@@ -32,6 +32,158 @@ const EMPTY_INVITE: InviteRowState = {
     private_project_access: [],
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface inviteLogicValues {
+    preflight: PreflightStatus | null // preflightLogic
+    availableProjects: any[]
+    canSubmit: boolean
+    inviteContainsOwnerLevel: boolean
+    invitedTeamMembersInternal: OrganizationInviteType[]
+    invitedTeamMembersInternalLoading: boolean
+    invites: OrganizationInviteType[]
+    invitesLoading: boolean
+    invitesToSend: InviteRowState[]
+    isInviteConfirmed: boolean
+    isInviteModalShown: boolean
+    isInviting: boolean
+    message: string
+    projectAccessControls: Record<
+        number,
+        {
+            access_level: string
+        }
+    >
+    projectAccessControlsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface inviteLogicActions {
+    addProjectAccess: (
+        inviteIndex: number,
+        projectId: number,
+        level: AccessControlLevel
+    ) => {
+        inviteIndex: number
+        level: AccessControlLevel
+        projectId: number
+    }
+    appendInviteRow: () => {
+        value: true
+    }
+    deleteInvite: (invite: OrganizationInviteType) => OrganizationInviteType
+    deleteInviteAtIndex: (index: number) => {
+        index: number
+    }
+    deleteInviteFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteInviteSuccess: (
+        invites: OrganizationInviteType[],
+        payload?: OrganizationInviteType
+    ) => {
+        invites: OrganizationInviteType[]
+        payload?: OrganizationInviteType
+    }
+    hideInviteModal: () => {
+        value: true
+    }
+    inviteTeamMembers: () => any
+    inviteTeamMembersFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    inviteTeamMembersSuccess: (
+        invitedTeamMembersInternal: OrganizationInviteType[],
+        payload?: any
+    ) => {
+        invitedTeamMembersInternal: OrganizationInviteType[]
+        payload?: any
+    }
+    loadInvites: () => any
+    loadInvitesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadInvitesSuccess: (
+        invites: OrganizationInviteType[],
+        payload?: any
+    ) => {
+        invites: OrganizationInviteType[]
+        payload?: any
+    }
+    loadProjectAccessControl: (projectId: number) => number
+    loadProjectAccessControlFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadProjectAccessControlSuccess: (
+        projectAccessControls: {
+            [x: number]: any
+        },
+        payload?: number
+    ) => {
+        projectAccessControls: {
+            [x: number]: any
+        }
+        payload?: number
+    }
+    removeProjectAccess: (
+        inviteIndex: number,
+        projectId: number
+    ) => {
+        inviteIndex: number
+        projectId: number
+    }
+    resetInviteRows: () => {
+        value: true
+    }
+    setIsInviteConfirmed: (inviteConfirmed: boolean) => {
+        inviteConfirmed: boolean
+    }
+    showInviteModal: () => {
+        value: true
+    }
+    updateInviteAtIndex: (
+        payload: any,
+        index: number
+    ) => {
+        index: number
+        payload: any
+    }
+    updateMessage: (message: string) => {
+        message: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface inviteLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        inviteContainsOwnerLevel: (invitesToSend: InviteRowState[]) => boolean
+        canSubmit: (
+            invitesToSend: InviteRowState[],
+            inviteContainsOwnerLevel: boolean,
+            isInviteConfirmed: boolean
+        ) => boolean
+        availableProjects: (currentOrganization: null | import('~/types').OrganizationType) => any[]
+        isInviting: (invitedTeamMembersInternalLoading: boolean) => boolean
+    }
+}
+
+export type inviteLogicType = MakeLogicType<inviteLogicValues, inviteLogicActions, Record<string, any>, inviteLogicMeta>
+
 export const inviteLogic = kea<inviteLogicType>([
     path(['scenes', 'organization', 'Settings', 'inviteLogic']),
     connect(() => ({
diff --git a/frontend/src/scenes/settings/organization/oauthAppsLogic.ts b/frontend/src/scenes/settings/organization/oauthAppsLogic.ts
index bb00acedc3ce..ce71ce2e3bae 100644
--- a/frontend/src/scenes/settings/organization/oauthAppsLogic.ts
+++ b/frontend/src/scenes/settings/organization/oauthAppsLogic.ts
@@ -1,11 +1,36 @@
-import { afterMount, kea, path } from 'kea'
+import { MakeLogicType, afterMount, kea, path } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
 
 import { OrganizationOAuthApplicationApi } from '~/generated/core/api.schemas'
 
-import type { oauthAppsLogicType } from './oauthAppsLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface oauthAppsLogicValues {
+    oauthApps: OrganizationOAuthApplicationApi[]
+    oauthAppsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface oauthAppsLogicActions {
+    loadOAuthApps: () => any
+    loadOAuthAppsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadOAuthAppsSuccess: (
+        oauthApps: OrganizationOAuthApplicationApi[],
+        payload?: any
+    ) => {
+        oauthApps: OrganizationOAuthApplicationApi[]
+        payload?: any
+    }
+}
+
+export type oauthAppsLogicType = MakeLogicType<oauthAppsLogicValues, oauthAppsLogicActions>
 
 export const oauthAppsLogic = kea<oauthAppsLogicType>([
     path(['scenes', 'settings', 'organization', 'oauthAppsLogic']),
diff --git a/frontend/src/scenes/settings/organization/organizationIntegrationsLogic.ts b/frontend/src/scenes/settings/organization/organizationIntegrationsLogic.ts
index 4f91e83a1a63..9cb185cdc53c 100644
--- a/frontend/src/scenes/settings/organization/organizationIntegrationsLogic.ts
+++ b/frontend/src/scenes/settings/organization/organizationIntegrationsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, listeners, path, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, listeners, path, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { LemonDialog, lemonToast } from '@posthog/lemon-ui'
@@ -8,7 +8,226 @@ import { ICONS } from 'lib/integrations/utils'
 
 import { IntegrationKind, IntegrationType } from '~/types'
 
-import type { organizationIntegrationsLogicType } from './organizationIntegrationsLogicType'
+import type { UserBasicType } from '../../../types'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface organizationIntegrationsLogicValues {
+    getOrganizationIntegrationsByKind: (
+        kinds: (
+            | 'apns'
+            | 'aws-s3'
+            | 'azure-blob'
+            | 'bing-ads'
+            | 'clickup'
+            | 'customerio-app'
+            | 'customerio-track'
+            | 'customerio-webhook'
+            | 'databricks'
+            | 'email'
+            | 'firebase'
+            | 'github'
+            | 'gitlab'
+            | 'google-ads'
+            | 'google-analytics'
+            | 'google-cloud-service-account'
+            | 'google-cloud-storage'
+            | 'google-pubsub'
+            | 'google-search-console'
+            | 'google-sheets'
+            | 'hubspot'
+            | 'intercom'
+            | 'jira'
+            | 'linear'
+            | 'linkedin-ads'
+            | 'meta-ads'
+            | 'pinterest-ads'
+            | 'postgresql'
+            | 'reddit-ads'
+            | 's3-compatible'
+            | 'salesforce'
+            | 'slack'
+            | 'snapchat'
+            | 'stripe'
+            | 'tiktok-ads'
+            | 'twilio'
+            | 'vercel'
+        )[]
+    ) => IntegrationType[]
+    organizationIntegrations: IntegrationType[] | null
+    organizationIntegrationsLoading: boolean
+    vercelIntegrations: IntegrationType[] | undefined
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface organizationIntegrationsLogicActions {
+    deleteOrganizationIntegration: (id: IntegrationType['id']) => {
+        id: number
+    }
+    loadOrganizationIntegrations: () => any
+    loadOrganizationIntegrationsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadOrganizationIntegrationsSuccess: (
+        organizationIntegrations: {
+            config: any
+            created_at: string
+            created_by?: UserBasicType | null | undefined
+            display_name: string
+            errors?: string | undefined
+            icon_url: any
+            id: number
+            kind:
+                | 'apns'
+                | 'aws-s3'
+                | 'azure-blob'
+                | 'bing-ads'
+                | 'clickup'
+                | 'customerio-app'
+                | 'customerio-track'
+                | 'customerio-webhook'
+                | 'databricks'
+                | 'email'
+                | 'firebase'
+                | 'github'
+                | 'gitlab'
+                | 'google-ads'
+                | 'google-analytics'
+                | 'google-cloud-service-account'
+                | 'google-cloud-storage'
+                | 'google-pubsub'
+                | 'google-search-console'
+                | 'google-sheets'
+                | 'hubspot'
+                | 'intercom'
+                | 'jira'
+                | 'linear'
+                | 'linkedin-ads'
+                | 'meta-ads'
+                | 'pinterest-ads'
+                | 'postgresql'
+                | 'reddit-ads'
+                | 's3-compatible'
+                | 'salesforce'
+                | 'slack'
+                | 'snapchat'
+                | 'stripe'
+                | 'tiktok-ads'
+                | 'twilio'
+                | 'vercel'
+        }[],
+        payload?: any
+    ) => {
+        organizationIntegrations: {
+            config: any
+            created_at: string
+            created_by?: UserBasicType | null | undefined
+            display_name: string
+            errors?: string | undefined
+            icon_url: any
+            id: number
+            kind:
+                | 'apns'
+                | 'aws-s3'
+                | 'azure-blob'
+                | 'bing-ads'
+                | 'clickup'
+                | 'customerio-app'
+                | 'customerio-track'
+                | 'customerio-webhook'
+                | 'databricks'
+                | 'email'
+                | 'firebase'
+                | 'github'
+                | 'gitlab'
+                | 'google-ads'
+                | 'google-analytics'
+                | 'google-cloud-service-account'
+                | 'google-cloud-storage'
+                | 'google-pubsub'
+                | 'google-search-console'
+                | 'google-sheets'
+                | 'hubspot'
+                | 'intercom'
+                | 'jira'
+                | 'linear'
+                | 'linkedin-ads'
+                | 'meta-ads'
+                | 'pinterest-ads'
+                | 'postgresql'
+                | 'reddit-ads'
+                | 's3-compatible'
+                | 'salesforce'
+                | 'slack'
+                | 'snapchat'
+                | 'stripe'
+                | 'tiktok-ads'
+                | 'twilio'
+                | 'vercel'
+        }[]
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface organizationIntegrationsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        vercelIntegrations: (organizationIntegrations: IntegrationType[] | null) => IntegrationType[] | undefined
+        getOrganizationIntegrationsByKind: (
+            organizationIntegrations: IntegrationType[] | null
+        ) => (
+            kinds: (
+                | 'apns'
+                | 'aws-s3'
+                | 'azure-blob'
+                | 'bing-ads'
+                | 'clickup'
+                | 'customerio-app'
+                | 'customerio-track'
+                | 'customerio-webhook'
+                | 'databricks'
+                | 'email'
+                | 'firebase'
+                | 'github'
+                | 'gitlab'
+                | 'google-ads'
+                | 'google-analytics'
+                | 'google-cloud-service-account'
+                | 'google-cloud-storage'
+                | 'google-pubsub'
+                | 'google-search-console'
+                | 'google-sheets'
+                | 'hubspot'
+                | 'intercom'
+                | 'jira'
+                | 'linear'
+                | 'linkedin-ads'
+                | 'meta-ads'
+                | 'pinterest-ads'
+                | 'postgresql'
+                | 'reddit-ads'
+                | 's3-compatible'
+                | 'salesforce'
+                | 'slack'
+                | 'snapchat'
+                | 'stripe'
+                | 'tiktok-ads'
+                | 'twilio'
+                | 'vercel'
+            )[]
+        ) => IntegrationType[]
+    }
+}
+
+export type organizationIntegrationsLogicType = MakeLogicType<
+    organizationIntegrationsLogicValues,
+    organizationIntegrationsLogicActions,
+    Record<string, any>,
+    organizationIntegrationsLogicMeta
+>
 
 export const organizationIntegrationsLogic = kea<organizationIntegrationsLogicType>([
     path(['scenes', 'settings', 'organization', 'organizationIntegrationsLogic']),
@@ -38,13 +257,13 @@ export const organizationIntegrationsLogic = kea<organizationIntegrationsLogicTy
     selectors({
         vercelIntegrations: [
             (s) => [s.organizationIntegrations],
-            (organizationIntegrations) => {
+            (organizationIntegrations: IntegrationType[] | null) => {
                 return organizationIntegrations?.filter((x) => x.kind === 'vercel')
             },
         ],
         getOrganizationIntegrationsByKind: [
             (s) => [s.organizationIntegrations],
-            (organizationIntegrations) => {
+            (organizationIntegrations: IntegrationType[] | null) => {
                 return (kinds: IntegrationKind[]) =>
                     organizationIntegrations?.filter((i) => kinds.includes(i.kind)) || []
             },
diff --git a/frontend/src/scenes/settings/organization/organizationPersonalAPIKeysLogic.ts b/frontend/src/scenes/settings/organization/organizationPersonalAPIKeysLogic.ts
index 5714f6cc43df..8ff7a37d9c68 100644
--- a/frontend/src/scenes/settings/organization/organizationPersonalAPIKeysLogic.ts
+++ b/frontend/src/scenes/settings/organization/organizationPersonalAPIKeysLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api, { ApiConfig } from 'lib/api'
@@ -7,7 +7,49 @@ import { fullName } from 'lib/utils/strings'
 import { getPersonalApiKeysListUrl } from 'products/platform_features/frontend/generated/api'
 import type { OrganizationPersonalAPIKeyApi } from 'products/platform_features/frontend/generated/api.schemas'
 
-import type { organizationPersonalAPIKeysLogicType } from './organizationPersonalAPIKeysLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface organizationPersonalAPIKeysLogicValues {
+    filteredKeys: OrganizationPersonalAPIKeyApi[]
+    keys: OrganizationPersonalAPIKeyApi[]
+    keysLoading: boolean
+    search: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface organizationPersonalAPIKeysLogicActions {
+    loadKeys: () => any
+    loadKeysFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadKeysSuccess: (
+        keys: OrganizationPersonalAPIKeyApi[],
+        payload?: any
+    ) => {
+        keys: OrganizationPersonalAPIKeyApi[]
+        payload?: any
+    }
+    setSearch: (search: string) => {
+        search: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface organizationPersonalAPIKeysLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        filteredKeys: (keys: OrganizationPersonalAPIKeyApi[], search: string) => OrganizationPersonalAPIKeyApi[]
+    }
+}
+
+export type organizationPersonalAPIKeysLogicType = MakeLogicType<
+    organizationPersonalAPIKeysLogicValues,
+    organizationPersonalAPIKeysLogicActions,
+    Record<string, any>,
+    organizationPersonalAPIKeysLogicMeta
+>
 
 export const organizationPersonalAPIKeysLogic = kea<organizationPersonalAPIKeysLogicType>([
     path(['scenes', 'settings', 'organization', 'organizationPersonalAPIKeysLogic']),
@@ -33,7 +75,7 @@ export const organizationPersonalAPIKeysLogic = kea<organizationPersonalAPIKeysL
         // Client-side filtering — the full list is already loaded, so this stays in the browser.
         filteredKeys: [
             (s) => [s.keys, s.search],
-            (keys, search): OrganizationPersonalAPIKeyApi[] => {
+            (keys: OrganizationPersonalAPIKeyApi[], search: string): OrganizationPersonalAPIKeyApi[] => {
                 const term = search.trim().toLowerCase()
                 if (!term) {
                     return keys
diff --git a/frontend/src/scenes/settings/project/projectSecretAPIKeysLogic.tsx b/frontend/src/scenes/settings/project/projectSecretAPIKeysLogic.tsx
index c74cef372f4d..b4e80e665f3e 100644
--- a/frontend/src/scenes/settings/project/projectSecretAPIKeysLogic.tsx
+++ b/frontend/src/scenes/settings/project/projectSecretAPIKeysLogic.tsx
@@ -1,5 +1,6 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 
 import { LemonDialog } from '@posthog/lemon-ui'
@@ -21,7 +22,7 @@ import { teamLogic } from 'scenes/teamLogic'
 import { ProjectSecretAPIKeyApi } from '~/generated/core/api.schemas'
 import { APIScopeAction, ProjectSecretAPIKeyRequest } from '~/types'
 
-import type { projectSecretAPIKeysLogicType } from './projectSecretAPIKeysLogicType'
+import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
 
 export type EditingProjectKeyFormValues = ProjectSecretAPIKeyRequest & {
     preset?: string
@@ -34,6 +35,182 @@ const PROJECT_SECRET_SCOPE_OBJECT_NAMES: Record<string, string> = {
     llm_gateway: 'AI gateway',
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface projectSecretAPIKeysLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    currentTeamId: number | null // teamLogic
+    availablePresets: ProjectSecretAPIKeyScopePreset[]
+    editingKey: EditingProjectKeyFormValues
+    editingKeyAllErrors: Record<string, any>
+    editingKeyChanged: boolean
+    editingKeyErrors: DeepPartialMap<EditingProjectKeyFormValues, ValidationErrorType>
+    editingKeyHasErrors: boolean
+    editingKeyId: ProjectSecretAPIKeyApi['id'] | null
+    editingKeyManualErrors: Record<string, any>
+    editingKeyTouched: boolean
+    editingKeyTouches: Record<string, boolean>
+    editingKeyValidationErrors: DeepPartialMap<EditingProjectKeyFormValues, ValidationErrorType>
+    filteredScopes: {
+        disabledActions: APIScopeAction[]
+        key: string
+        label: string
+    }[]
+    formScopeRadioValues: Record<string, string>
+    isEditingKeySubmitting: boolean
+    isEditingKeyValid: boolean
+    keys: ProjectSecretAPIKeyApi[]
+    keysLoading: boolean
+    searchTerm: string
+    showEditingKeyErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface projectSecretAPIKeysLogicActions {
+    createKeySuccess: (key: ProjectSecretAPIKeyApi) => {
+        key: ProjectSecretAPIKeyApi
+    }
+    deleteKey: (id: ProjectSecretAPIKeyApi['id']) => {
+        id: string
+    }
+    deleteKeyFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteKeySuccess: (
+        keys: ProjectSecretAPIKeyApi[],
+        payload?: {
+            id: string
+        }
+    ) => {
+        keys: ProjectSecretAPIKeyApi[]
+        payload?: {
+            id: string
+        }
+    }
+    loadKeys: () => {
+        value: true
+    }
+    loadKeysFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadKeysSuccess: (
+        keys: ProjectSecretAPIKeyApi[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        keys: ProjectSecretAPIKeyApi[]
+        payload?: {
+            value: true
+        }
+    }
+    resetEditingKey: (values?: EditingProjectKeyFormValues) => {
+        values?: EditingProjectKeyFormValues
+    }
+    resetScopes: () => {
+        value: true
+    }
+    rollKey: (id: ProjectSecretAPIKeyApi['id']) => {
+        id: string
+    }
+    rollKeyFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    rollKeySuccess: (
+        keys: ProjectSecretAPIKeyApi[],
+        payload?: {
+            id: string
+        }
+    ) => {
+        keys: ProjectSecretAPIKeyApi[]
+        payload?: {
+            id: string
+        }
+    }
+    setEditingKeyId: (id: ProjectSecretAPIKeyApi['id'] | null) => {
+        id: string | null
+    }
+    setEditingKeyManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setEditingKeyValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setEditingKeyValues: (values: DeepPartial<EditingProjectKeyFormValues>) => {
+        values: DeepPartial<EditingProjectKeyFormValues>
+    }
+    setScopeRadioValue: (
+        key: string,
+        action: string
+    ) => {
+        action: string
+        key: string
+    }
+    setSearchTerm: (searchTerm: string) => {
+        searchTerm: string
+    }
+    showRollKeySuccessDialog: (key: ProjectSecretAPIKeyApi) => {
+        key: ProjectSecretAPIKeyApi
+    }
+    submitEditingKey: () => {
+        value: boolean
+    }
+    submitEditingKeyFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitEditingKeyRequest: (editingKey: EditingProjectKeyFormValues) => {
+        editingKey: EditingProjectKeyFormValues
+    }
+    submitEditingKeySuccess: (editingKey: EditingProjectKeyFormValues) => {
+        editingKey: EditingProjectKeyFormValues
+    }
+    touchEditingKeyField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface projectSecretAPIKeysLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        formScopeRadioValues: (editingKey: EditingProjectKeyFormValues) => Record<string, string>
+        filteredScopes: (
+            searchTerm: string,
+            featureFlags: FeatureFlagsSet
+        ) => {
+            disabledActions: APIScopeAction[]
+            key: string
+            label: string
+        }[]
+        availablePresets: (featureFlags: FeatureFlagsSet) => ProjectSecretAPIKeyScopePreset[]
+    }
+}
+
+export type projectSecretAPIKeysLogicType = MakeLogicType<
+    projectSecretAPIKeysLogicValues,
+    projectSecretAPIKeysLogicActions,
+    Record<string, any>,
+    projectSecretAPIKeysLogicMeta
+>
+
 export const projectSecretAPIKeysLogic = kea<projectSecretAPIKeysLogicType>([
     path(['scenes', 'settings', 'project', 'projectSecretAPIKeysLogic']),
     connect(() => ({
@@ -174,7 +351,10 @@ export const projectSecretAPIKeysLogic = kea<projectSecretAPIKeysLogicType>([
         ],
         filteredScopes: [
             (s) => [s.searchTerm, s.featureFlags],
-            (searchTerm: string, featureFlags): { key: string; label: string; disabledActions: APIScopeAction[] }[] => {
+            (
+                searchTerm: string,
+                featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet
+            ): { key: string; label: string; disabledActions: APIScopeAction[] }[] => {
                 const allActions: APIScopeAction[] = ['read', 'write']
                 // llm_gateway:read is added only when the ai-gateway flag is on, mirroring the backend.
                 const allowedScopeActions: string[] = [...PROJECT_SECRET_API_KEY_ALLOWED_API_SCOPE_ACTION]
@@ -203,7 +383,7 @@ export const projectSecretAPIKeysLogic = kea<projectSecretAPIKeysLogicType>([
         ],
         availablePresets: [
             (s) => [s.featureFlags],
-            (featureFlags): ProjectSecretAPIKeyScopePreset[] =>
+            (featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet): ProjectSecretAPIKeyScopePreset[] =>
                 PROJECT_SECRET_API_KEY_SCOPE_PRESETS.filter(
                     ({ value }) => value !== 'llm_gateway' || featureFlags[FEATURE_FLAGS.AI_GATEWAY]
                 ),
diff --git a/frontend/src/scenes/settings/settingsLogic.ts b/frontend/src/scenes/settings/settingsLogic.ts
index 324eb4540186..944e32c977d5 100644
--- a/frontend/src/scenes/settings/settingsLogic.ts
+++ b/frontend/src/scenes/settings/settingsLogic.ts
@@ -1,5 +1,5 @@
 import FuseClass from 'fuse.js'
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 
@@ -14,8 +14,16 @@ import { organizationIntegrationsLogic } from 'scenes/settings/organization/orga
 import { teamLogic } from 'scenes/teamLogic'
 import { userLogic } from 'scenes/userLogic'
 
+import type { FeatureFlagsSet } from '../../lib/logic/featureFlagLogic'
+import type {
+    AvailableFeature,
+    IntegrationType,
+    OrganizationType,
+    PreflightStatus,
+    TeamPublicType,
+    TeamType,
+} from '../../types'
 import { matchesFlagDefinition } from './flagGating'
-import type { settingsLogicType } from './settingsLogicType'
 import { SETTINGS_MAP } from './SettingsMap'
 import { Setting, SettingId, SettingLevelId, SettingSection, SettingSectionId, SettingsLogicProps } from './types'
 
@@ -75,6 +83,184 @@ const getSectionStringValue = (section: SettingSection): string => {
     return section.id
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface settingsLogicValues {
+    canAccessBilling: boolean // billingLogic
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    organizationIntegrations: IntegrationType[] | null // organizationIntegrationsLogic
+    currentOrganization: OrganizationType | null // organizationLogic
+    isAdminOrOwner: boolean | null // organizationLogic
+    isCloudOrDev: boolean | undefined // preflightLogic
+    preflight: PreflightStatus | null // preflightLogic
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean // userLogic
+    collapsedGroups: Record<string, boolean>
+    collapsedLevels: Record<SettingLevelId, boolean>
+    defaultSectionId: SettingSectionId | null
+    doesMatchFlags: (flagDefinition: Pick<Setting, 'flag'>) => boolean
+    filteredLevels: SettingLevelId[]
+    filteredSections: SettingSection[]
+    globalSearchIndex: GlobalSearchFuse
+    isCompactNavigationOpen: boolean
+    isSearching: boolean
+    levels: SettingLevelId[]
+    searchResults: SearchResultGroup[]
+    searchTerm: string
+    sections: SettingSection[]
+    sectionsFuse: SectionsFuse
+    selectedLevel: SettingLevelId
+    selectedLevelRaw: 'environment' | 'organization' | 'project' | 'user'
+    selectedSection: SettingSection | null
+    selectedSectionId: SettingSectionId | null
+    selectedSectionIdRaw: SettingSectionId | null
+    selectedSetting: Setting | null
+    selectedSettingId: SettingId | null
+    settings: Setting[]
+    settingsFuse: SettingsFuse
+    settingsSnapshot: Record<string, any> | null
+    settingsSnapshotLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface settingsLogicActions {
+    closeCompactNavigation: () => {
+        value: true
+    }
+    expandGroup: (group: string) => {
+        group: string
+    }
+    loadSettingsAsOf: (
+        at: string,
+        scope?: string | string[]
+    ) => {
+        at: string
+        scope: string | string[] | undefined
+    }
+    loadSettingsAsOfFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSettingsAsOfSuccess: (
+        settingsSnapshot: Record<string, any>,
+        payload?: {
+            at: string
+            scope: string | string[] | undefined
+        }
+    ) => {
+        settingsSnapshot: Record<string, any>
+        payload?: {
+            at: string
+            scope: string | string[] | undefined
+        }
+    }
+    navigateToSetting: (
+        sectionId: SettingSectionId,
+        settingId: SettingId
+    ) => {
+        sectionId: SettingSectionId
+        settingId: SettingId
+    }
+    openCompactNavigation: () => {
+        value: true
+    }
+    selectLevel: (level: SettingLevelId) => {
+        level: 'environment' | 'organization' | 'project' | 'user'
+    }
+    selectSection: (
+        section: SettingSectionId,
+        level: SettingLevelId
+    ) => {
+        level: 'environment' | 'organization' | 'project' | 'user'
+        section: SettingSectionId
+    }
+    selectSetting: (setting: SettingId) => {
+        setting: SettingId
+    }
+    setSearchTerm: (searchTerm: string) => {
+        searchTerm: string
+    }
+    toggleGroupCollapse: (group: string) => {
+        group: string
+    }
+    toggleLevelCollapse: (level: SettingLevelId) => {
+        level: 'environment' | 'organization' | 'project' | 'user'
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface settingsLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        levels: (sections: SettingSection[]) => SettingLevelId[]
+        sections: (
+            doesMatchFlags: (flagDefinition: Pick<Setting, 'flag'>) => boolean,
+            isCloudOrDev: boolean | undefined,
+            currentTeam: TeamPublicType | TeamType | null,
+            currentOrganization: OrganizationType | null,
+            organizationIntegrations: IntegrationType[] | null,
+            preflight: PreflightStatus | null,
+            canAccessBilling: boolean,
+            isAdminOrOwner: boolean | null
+        ) => SettingSection[]
+        selectedLevel: (
+            selectedLevelRaw: 'environment' | 'organization' | 'project' | 'user',
+            selectedSectionIdRaw: SettingSectionId | null,
+            currentTeam: TeamPublicType | TeamType | null
+        ) => SettingLevelId
+        selectedSectionId: (selectedSectionIdRaw: SettingSectionId | null) => SettingSectionId | null
+        defaultSectionId: (
+            sections: SettingSection[],
+            selectedLevel: 'environment' | 'organization' | 'project' | 'user'
+        ) => SettingSectionId | null
+        selectedSection: (
+            sections: SettingSection[],
+            selectedSectionId: SettingSectionId | null,
+            defaultSectionId: SettingSectionId | null
+        ) => SettingSection | null
+        settings: (
+            selectedLevel: 'environment' | 'organization' | 'project' | 'user',
+            selectedSectionId: SettingSectionId | null,
+            defaultSectionId: SettingSectionId | null,
+            sections: SettingSection[],
+            doesMatchFlags: (flagDefinition: Pick<Setting, 'flag'>) => boolean,
+            preflight: PreflightStatus | null,
+            currentTeam: TeamPublicType | TeamType | null
+        ) => Setting[]
+        selectedSetting: (settings: Setting[], selectedSettingId: SettingId | null) => Setting | null
+        doesMatchFlags: (featureFlags: FeatureFlagsSet) => (flagDefinition: Pick<Setting, 'flag'>) => boolean
+        settingsFuse: (settings: Setting[]) => SettingsFuse
+        sectionsFuse: (sections: SettingSection[]) => SectionsFuse
+        isSearching: (searchTerm: string) => boolean
+        globalSearchIndex: (
+            sections: SettingSection[],
+            doesMatchFlags: (flagDefinition: Pick<Setting, 'flag'>) => boolean,
+            preflight: PreflightStatus | null,
+            currentTeam: TeamPublicType | TeamType | null
+        ) => GlobalSearchFuse
+        searchResults: (searchTerm: string, globalSearchIndex: GlobalSearchFuse) => SearchResultGroup[]
+        filteredLevels: (
+            levels: ('environment' | 'organization' | 'project' | 'user')[],
+            searchResults: SearchResultGroup[],
+            isSearching: boolean
+        ) => SettingLevelId[]
+        filteredSections: (
+            sections: SettingSection[],
+            searchResults: SearchResultGroup[],
+            isSearching: boolean
+        ) => SettingSection[]
+    }
+}
+
+export type settingsLogicType = MakeLogicType<
+    settingsLogicValues,
+    settingsLogicActions,
+    SettingsLogicProps,
+    settingsLogicMeta
+>
+
 export const settingsLogic = kea<settingsLogicType>([
     props({} as SettingsLogicProps),
     key((props) => props.logicKey ?? 'global'),
@@ -247,7 +433,7 @@ export const settingsLogic = kea<settingsLogicType>([
     selectors({
         levels: [
             (s) => [s.sections],
-            (sections): SettingLevelId[] => {
+            (sections: SettingSection[]): SettingLevelId[] => {
                 return sections.reduce<SettingLevelId[]>((acc, section) => {
                     if (!acc.includes(section.level)) {
                         acc.push(section.level)
@@ -268,14 +454,14 @@ export const settingsLogic = kea<settingsLogicType>([
                 s.isAdminOrOwner,
             ],
             (
-                doesMatchFlags,
-                isCloudOrDev,
-                currentTeam,
-                currentOrganization,
-                organizationIntegrations,
-                preflight,
-                canAccessBilling,
-                isAdminOrOwner
+                doesMatchFlags: (flagDefinition: Pick<Setting, 'flag'>) => boolean,
+                isCloudOrDev: boolean | undefined,
+                currentTeam: null | import('../../types').TeamPublicType | import('../../types').TeamType,
+                currentOrganization: null | import('../../types').OrganizationType,
+                organizationIntegrations: import('../../types').IntegrationType[] | null,
+                preflight: null | import('../../types').PreflightStatus,
+                canAccessBilling: boolean,
+                isAdminOrOwner: boolean | null
             ): SettingSection[] => {
                 const isSettingVisible = (setting: Setting): boolean => {
                     if (!doesMatchFlags(setting)) {
@@ -346,7 +532,11 @@ export const settingsLogic = kea<settingsLogicType>([
         ],
         selectedLevel: [
             (s) => [s.selectedLevelRaw, s.selectedSectionIdRaw, s.currentTeam],
-            (selectedLevelRaw, selectedSectionIdRaw, currentTeam): SettingLevelId => {
+            (
+                selectedLevelRaw: 'environment' | 'organization' | 'project' | 'user',
+                selectedSectionIdRaw: SettingSectionId | null,
+                currentTeam: null | import('../../types').TeamPublicType | import('../../types').TeamType
+            ): SettingLevelId => {
                 if (
                     !selectedSectionIdRaw ||
                     (!selectedSectionIdRaw.endsWith('-details') && !selectedSectionIdRaw.endsWith('-danger-zone'))
@@ -363,7 +553,7 @@ export const settingsLogic = kea<settingsLogicType>([
         ],
         selectedSectionId: [
             (s) => [s.selectedSectionIdRaw],
-            (selectedSectionIdRaw): SettingSectionId | null => {
+            (selectedSectionIdRaw: SettingSectionId | null): SettingSectionId | null => {
                 if (!selectedSectionIdRaw) {
                     return null
                 }
@@ -376,14 +566,18 @@ export const settingsLogic = kea<settingsLogicType>([
         ],
         defaultSectionId: [
             (s) => [s.sections, s.selectedLevel],
-            (sections, selectedLevel): SettingSectionId | null => {
+            (sections: SettingSection[], selectedLevel: SettingLevelId): SettingSectionId | null => {
                 const firstSection = sections.find((s) => s.level === selectedLevel)
                 return firstSection?.id ?? null
             },
         ],
         selectedSection: [
             (s) => [s.sections, s.selectedSectionId, s.defaultSectionId],
-            (sections, selectedSectionId, defaultSectionId): SettingSection | null => {
+            (
+                sections: SettingSection[],
+                selectedSectionId: SettingSectionId | null,
+                defaultSectionId: SettingSectionId | null
+            ): SettingSection | null => {
                 const effectiveId = selectedSectionId ?? defaultSectionId
                 return sections.find((x) => x.id === effectiveId) ?? null
             },
@@ -399,13 +593,13 @@ export const settingsLogic = kea<settingsLogicType>([
                 s.currentTeam,
             ],
             (
-                selectedLevel,
-                selectedSectionId,
-                defaultSectionId,
-                sections,
-                doesMatchFlags,
-                preflight,
-                currentTeam
+                selectedLevel: SettingLevelId,
+                selectedSectionId: SettingSectionId | null,
+                defaultSectionId: SettingSectionId | null,
+                sections: SettingSection[],
+                doesMatchFlags: (flagDefinition: Pick<Setting, 'flag'>) => boolean,
+                preflight: null | import('../../types').PreflightStatus,
+                currentTeam: null | import('../../types').TeamPublicType | import('../../types').TeamType
             ): Setting[] => {
                 const effectiveSectionId = selectedSectionId ?? defaultSectionId
 
@@ -438,13 +632,13 @@ export const settingsLogic = kea<settingsLogicType>([
         ],
         selectedSetting: [
             (s) => [s.settings, s.selectedSettingId],
-            (settings, selectedSettingId): Setting | null => {
+            (settings: Setting[], selectedSettingId: SettingId | null): Setting | null => {
                 return settings.find((s) => s.id === selectedSettingId) ?? null
             },
         ],
         doesMatchFlags: [
             (s) => [s.featureFlags],
-            (featureFlags) => {
+            (featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet) => {
                 return (flagDefinition: Pick<Setting, 'flag'>) =>
                     matchesFlagDefinition(flagDefinition.flag, featureFlags)
             },
@@ -485,7 +679,12 @@ export const settingsLogic = kea<settingsLogicType>([
 
         globalSearchIndex: [
             (s) => [s.sections, s.doesMatchFlags, s.preflight, s.currentTeam],
-            (sections, doesMatchFlags, preflight, currentTeam): GlobalSearchFuse => {
+            (
+                sections: SettingSection[],
+                doesMatchFlags: (flagDefinition: Pick<Setting, 'flag'>) => boolean,
+                preflight: null | import('../../types').PreflightStatus,
+                currentTeam: null | import('../../types').TeamPublicType | import('../../types').TeamType
+            ): GlobalSearchFuse => {
                 const entries: SearchIndexEntry[] = []
 
                 for (const section of sections.filter((s) => !s.hideFromNavigation)) {
@@ -554,7 +753,7 @@ export const settingsLogic = kea<settingsLogicType>([
 
         searchResults: [
             (s) => [s.searchTerm, s.globalSearchIndex],
-            (searchTerm, globalSearchIndex): SearchResultGroup[] => {
+            (searchTerm: string, globalSearchIndex: GlobalSearchFuse): SearchResultGroup[] => {
                 if (!searchTerm.trim()) {
                     return []
                 }
@@ -578,7 +777,7 @@ export const settingsLogic = kea<settingsLogicType>([
 
         filteredLevels: [
             (s) => [s.levels, s.searchResults, s.isSearching],
-            (levels, searchResults, isSearching): SettingLevelId[] => {
+            (levels: SettingLevelId[], searchResults: SearchResultGroup[], isSearching: boolean): SettingLevelId[] => {
                 if (!isSearching) {
                     return levels
                 }
@@ -590,7 +789,11 @@ export const settingsLogic = kea<settingsLogicType>([
 
         filteredSections: [
             (s) => [s.sections, s.searchResults, s.isSearching],
-            (sections, searchResults, isSearching): SettingSection[] => {
+            (
+                sections: SettingSection[],
+                searchResults: SearchResultGroup[],
+                isSearching: boolean
+            ): SettingSection[] => {
                 const visibleSections = sections.filter((section) => !section.hideFromNavigation)
 
                 if (!isSearching) {
diff --git a/frontend/src/scenes/settings/settingsSceneLogic.ts b/frontend/src/scenes/settings/settingsSceneLogic.ts
index 9a6386713d86..d837cdad62af 100644
--- a/frontend/src/scenes/settings/settingsSceneLogic.ts
+++ b/frontend/src/scenes/settings/settingsSceneLogic.ts
@@ -1,4 +1,4 @@
-import { connect, kea, listeners, path, selectors } from 'kea'
+import { MakeLogicType, connect, kea, listeners, path, selectors } from 'kea'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 
 import { copyToClipboard } from 'lib/utils/copyToClipboard'
@@ -11,8 +11,8 @@ import { SIDE_PANEL_CONTEXT_KEY, SidePanelSceneContext } from '~/layout/navigati
 import { ActivityScope, Breadcrumb } from '~/types'
 
 import { settingsLogic } from './settingsLogic'
-import type { settingsSceneLogicType } from './settingsSceneLogicType'
 import { SettingId, SettingLevelId, SettingLevelIds, SettingSectionId } from './types'
+import type { Setting, SettingSection } from './types'
 
 const AI_OBSERVABILITY_SETTINGS_SECTION: SettingSectionId = 'project-ai-observability'
 const AI_OBSERVABILITY_BYOK_SETTING: SettingId = 'ai-observability-byok'
@@ -62,6 +62,53 @@ const canonicalSettingsHashParams = (hashParams: Params): [Params, boolean] => {
     return [nextHashParams, changed]
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface settingsSceneLogicValues {
+    sections: SettingSection[] // settingsLogic
+    selectedLevel: SettingLevelId // settingsLogic
+    selectedSection: SettingSection | null // settingsLogic
+    selectedSectionId: SettingSectionId | null // settingsLogic
+    settings: Setting[] // settingsLogic
+    breadcrumbs: Breadcrumb[]
+    sidePanelContext: SidePanelSceneContext | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface settingsSceneLogicActions {
+    selectLevel: (level: 'environment' | 'organization' | 'project' | 'user') => {
+        level: 'environment' | 'organization' | 'project' | 'user'
+    } // settingsLogic
+    selectSection: (
+        section: SettingSectionId,
+        level: 'environment' | 'organization' | 'project' | 'user'
+    ) => {
+        level: 'environment' | 'organization' | 'project' | 'user'
+        section: SettingSectionId
+    } // settingsLogic
+    selectSetting: (setting: SettingId) => {
+        setting: SettingId
+    } // settingsLogic
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface settingsSceneLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        breadcrumbs: (
+            selectedLevel: 'environment' | 'organization' | 'project' | 'user',
+            selectedSectionId: SettingSectionId | null,
+            selectedSection: SettingSection | null
+        ) => Breadcrumb[]
+        sidePanelContext: (selectedSectionId: SettingSectionId | null) => SidePanelSceneContext | null
+    }
+}
+
+export type settingsSceneLogicType = MakeLogicType<
+    settingsSceneLogicValues,
+    settingsSceneLogicActions,
+    Record<string, any>,
+    settingsSceneLogicMeta
+>
+
 export const settingsSceneLogic = kea<settingsSceneLogicType>([
     path(['scenes', 'settings', 'settingsSceneLogic']),
     connect(() => ({
@@ -75,7 +122,11 @@ export const settingsSceneLogic = kea<settingsSceneLogicType>([
     selectors({
         breadcrumbs: [
             (s) => [s.selectedLevel, s.selectedSectionId, s.selectedSection],
-            (selectedLevel, selectedSectionId, selectedSection): Breadcrumb[] => {
+            (
+                selectedLevel: SettingLevelId,
+                selectedSectionId: SettingSectionId | null,
+                selectedSection: null | import('./types').SettingSection
+            ): Breadcrumb[] => {
                 const sectionName = selectedSection?.title ?? capitalizeFirstLetter(selectedLevel)
 
                 return [
diff --git a/frontend/src/scenes/settings/user/changePasswordLogic.ts b/frontend/src/scenes/settings/user/changePasswordLogic.ts
index 46534452c73d..b93efdc92e76 100644
--- a/frontend/src/scenes/settings/user/changePasswordLogic.ts
+++ b/frontend/src/scenes/settings/user/changePasswordLogic.ts
@@ -1,5 +1,6 @@
-import { connect, kea, path, selectors } from 'kea'
+import { MakeLogicType, connect, kea, path, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 
 import { lemonToast } from '@posthog/lemon-ui'
 
@@ -7,7 +8,7 @@ import api from 'lib/api'
 import { ValidatedPasswordResult, validatePassword } from 'lib/components/PasswordStrength'
 import { userLogic } from 'scenes/userLogic'
 
-import type { changePasswordLogicType } from './changePasswordLogicType'
+import type { UserType } from '../../../types'
 
 export interface ChangePasswordForm {
     current_password: string
@@ -15,6 +16,80 @@ export interface ChangePasswordForm {
     confirm_password: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface changePasswordLogicValues {
+    user: UserType | null // userLogic
+    changePassword: ChangePasswordForm
+    changePasswordAllErrors: Record<string, any>
+    changePasswordChanged: boolean
+    changePasswordErrors: DeepPartialMap<ChangePasswordForm, ValidationErrorType>
+    changePasswordHasErrors: boolean
+    changePasswordManualErrors: Record<string, any>
+    changePasswordTouched: boolean
+    changePasswordTouches: Record<string, boolean>
+    changePasswordValidationErrors: DeepPartialMap<ChangePasswordForm, ValidationErrorType>
+    isChangePasswordSubmitting: boolean
+    isChangePasswordValid: boolean
+    showChangePasswordErrors: boolean
+    validatedPassword: ValidatedPasswordResult
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface changePasswordLogicActions {
+    loadUser: (resetOnFailure?: boolean | undefined) => {
+        resetOnFailure: boolean | undefined
+    } // userLogic
+    resetChangePassword: (values?: ChangePasswordForm) => {
+        values?: ChangePasswordForm
+    }
+    setChangePasswordManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setChangePasswordValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setChangePasswordValues: (values: DeepPartial<ChangePasswordForm>) => {
+        values: DeepPartial<ChangePasswordForm>
+    }
+    submitChangePassword: () => {
+        value: boolean
+    }
+    submitChangePasswordFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitChangePasswordRequest: (changePassword: ChangePasswordForm) => {
+        changePassword: ChangePasswordForm
+    }
+    submitChangePasswordSuccess: (changePassword: ChangePasswordForm) => {
+        changePassword: ChangePasswordForm
+    }
+    touchChangePasswordField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface changePasswordLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        validatedPassword: (changePassword: ChangePasswordForm) => ValidatedPasswordResult
+    }
+}
+
+export type changePasswordLogicType = MakeLogicType<
+    changePasswordLogicValues,
+    changePasswordLogicActions,
+    Record<string, any>,
+    changePasswordLogicMeta
+>
+
 export const changePasswordLogic = kea<changePasswordLogicType>([
     path(['scenes', 'me', 'settings', 'changePasswordLogic']),
     connect(() => ({
diff --git a/frontend/src/scenes/settings/user/connectedAppsLogic.ts b/frontend/src/scenes/settings/user/connectedAppsLogic.ts
index d3a1f2393cf7..d40f7c94a4b8 100644
--- a/frontend/src/scenes/settings/user/connectedAppsLogic.ts
+++ b/frontend/src/scenes/settings/user/connectedAppsLogic.ts
@@ -1,11 +1,9 @@
-import { actions, events, kea, path } from 'kea'
+import { MakeLogicType, actions, events, kea, path } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
 import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
 
-import type { connectedAppsLogicType } from './connectedAppsLogicType'
-
 export interface ConnectedApp {
     id: string
     name: string
@@ -16,6 +14,54 @@ export interface ConnectedApp {
     is_first_party: boolean
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface connectedAppsLogicValues {
+    connectedApps: ConnectedApp[]
+    connectedAppsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface connectedAppsLogicActions {
+    loadConnectedApps: () => any
+    loadConnectedAppsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadConnectedAppsSuccess: (
+        connectedApps: ConnectedApp[],
+        payload?: any
+    ) => {
+        connectedApps: ConnectedApp[]
+        payload?: any
+    }
+    revokeApp: (id: string) => {
+        id: string
+    }
+    revokeAppFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    revokeAppSuccess: (
+        connectedApps: ConnectedApp[],
+        payload?: {
+            id: string
+        }
+    ) => {
+        connectedApps: ConnectedApp[]
+        payload?: {
+            id: string
+        }
+    }
+}
+
+export type connectedAppsLogicType = MakeLogicType<connectedAppsLogicValues, connectedAppsLogicActions>
+
 export const connectedAppsLogic = kea<connectedAppsLogicType>([
     path(['scenes', 'settings', 'user', 'connectedAppsLogic']),
 
diff --git a/frontend/src/scenes/settings/user/loginSessionsLogic.ts b/frontend/src/scenes/settings/user/loginSessionsLogic.ts
index edae7743de4e..9d00576d50c1 100644
--- a/frontend/src/scenes/settings/user/loginSessionsLogic.ts
+++ b/frontend/src/scenes/settings/user/loginSessionsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, events, kea, path } from 'kea'
+import { MakeLogicType, actions, events, kea, path } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
@@ -10,7 +10,74 @@ import {
 } from '~/generated/core/api'
 import type { UserAuthSessionApi } from '~/generated/core/api.schemas'
 
-import type { loginSessionsLogicType } from './loginSessionsLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface loginSessionsLogicValues {
+    loginSessions: UserAuthSessionApi[]
+    loginSessionsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface loginSessionsLogicActions {
+    loadLoginSessions: () => any
+    loadLoginSessionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadLoginSessionsSuccess: (
+        loginSessions: UserAuthSessionApi[],
+        payload?: any
+    ) => {
+        loginSessions: UserAuthSessionApi[]
+        payload?: any
+    }
+    revokeOtherSessions: () => {
+        value: true
+    }
+    revokeOtherSessionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    revokeOtherSessionsSuccess: (
+        loginSessions: UserAuthSessionApi[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        loginSessions: UserAuthSessionApi[]
+        payload?: {
+            value: true
+        }
+    }
+    revokeSession: (id: string) => {
+        id: string
+    }
+    revokeSessionFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    revokeSessionSuccess: (
+        loginSessions: UserAuthSessionApi[],
+        payload?: {
+            id: string
+        }
+    ) => {
+        loginSessions: UserAuthSessionApi[]
+        payload?: {
+            id: string
+        }
+    }
+}
+
+export type loginSessionsLogicType = MakeLogicType<loginSessionsLogicValues, loginSessionsLogicActions>
 
 export const loginSessionsLogic = kea<loginSessionsLogicType>([
     path(['scenes', 'settings', 'user', 'loginSessionsLogic']),
diff --git a/frontend/src/scenes/settings/user/passkeySettingsLogic.ts b/frontend/src/scenes/settings/user/passkeySettingsLogic.ts
index 9f80cb1ebc1a..1e362eb846be 100644
--- a/frontend/src/scenes/settings/user/passkeySettingsLogic.ts
+++ b/frontend/src/scenes/settings/user/passkeySettingsLogic.ts
@@ -1,5 +1,5 @@
 import { type PublicKeyCredentialDescriptorJSON, startAuthentication, startRegistration } from '@simplewebauthn/browser'
-import { actions, connect, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -9,7 +9,6 @@ import { twoFactorLogic } from 'scenes/authentication/two-factor-setup/twoFactor
 import { userLogic } from 'scenes/userLogic'
 
 import { getPasskeyErrorMessage } from './passkeys/utils'
-import type { passkeySettingsLogicType } from './passkeySettingsLogicType'
 
 export interface PasskeyCredential {
     id: number
@@ -48,6 +47,165 @@ export interface VerificationBeginResponse {
 
 export type RegistrationStep = 'idle' | 'registering' | 'verifying' | 'complete'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface passkeySettingsLogicValues {
+    deleteModalId: number | null
+    error: string | null
+    passkeys: PasskeyCredential[]
+    passkeysLoading: boolean
+    registerPasskey: null
+    registerPasskeyLoading: boolean
+    registrationLabel: string
+    registrationStep: RegistrationStep
+    renameModal: {
+        currentLabel: string
+        id: number
+    } | null
+    verifyingPasskeyId: number | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface passkeySettingsLogicActions {
+    loadStatus: () => {
+        value: true
+    } // twoFactorLogic
+    loadUser: (resetOnFailure?: boolean | undefined) => {
+        resetOnFailure: boolean | undefined
+    } // userLogic
+    beginRegistration: (label: string) => {
+        label: string
+    }
+    beginRegistrationFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    beginRegistrationSuccess: (
+        registerPasskey: null,
+        payload?: {
+            label: string
+        }
+    ) => {
+        registerPasskey: null
+        payload?: {
+            label: string
+        }
+    }
+    clearError: () => {
+        value: true
+    }
+    closeDeleteModal: () => {
+        value: true
+    }
+    closeRenameModal: () => {
+        value: true
+    }
+    deletePasskey: (id: number) => {
+        id: number
+    }
+    deletePasskeyFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deletePasskeySuccess: (
+        passkeys: PasskeyCredential[],
+        payload?: {
+            id: number
+        }
+    ) => {
+        passkeys: PasskeyCredential[]
+        payload?: {
+            id: number
+        }
+    }
+    loadPasskeys: () => any
+    loadPasskeysFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPasskeysSuccess: (
+        passkeys: PasskeyCredential[],
+        payload?: any
+    ) => {
+        passkeys: PasskeyCredential[]
+        payload?: any
+    }
+    openDeleteModal: (id: number) => {
+        id: number
+    }
+    openRenameModal: (
+        id: number,
+        currentLabel: string
+    ) => {
+        currentLabel: string
+        id: number
+    }
+    renamePasskey: (
+        id: number,
+        label: string
+    ) => {
+        id: number
+        label: string
+    }
+    renamePasskeyFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    renamePasskeySuccess: (
+        passkeys: PasskeyCredential[],
+        payload?: {
+            id: number
+            label: string
+        }
+    ) => {
+        passkeys: PasskeyCredential[]
+        payload?: {
+            id: number
+            label: string
+        }
+    }
+    setError: (error: string | null) => {
+        error: string | null
+    }
+    setRegistrationStep: (step: RegistrationStep) => {
+        step: RegistrationStep
+    }
+    verifyPasskey: (id: number) => {
+        id: number
+    }
+    verifyPasskeyFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    verifyPasskeySuccess: (
+        passkeys: PasskeyCredential[],
+        payload?: {
+            id: number
+        }
+    ) => {
+        passkeys: PasskeyCredential[]
+        payload?: {
+            id: number
+        }
+    }
+}
+
+export type passkeySettingsLogicType = MakeLogicType<passkeySettingsLogicValues, passkeySettingsLogicActions>
+
 export const passkeySettingsLogic = kea<passkeySettingsLogicType>([
     path(['scenes', 'settings', 'user', 'passkeySettingsLogic']),
     connect(() => ({
diff --git a/frontend/src/scenes/settings/user/personalAPIKeysLogic.tsx b/frontend/src/scenes/settings/user/personalAPIKeysLogic.tsx
index 1643c0b74cc0..cb8d3c039de4 100644
--- a/frontend/src/scenes/settings/user/personalAPIKeysLogic.tsx
+++ b/frontend/src/scenes/settings/user/personalAPIKeysLogic.tsx
@@ -1,5 +1,6 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 
@@ -24,7 +25,7 @@ import { userLogic } from 'scenes/userLogic'
 import { API_KEY_SCOPE_PRESETS } from '~/lib/scopes'
 import { AvailableFeature, OrganizationBasicType, PersonalAPIKeyType, TeamBasicType, UserType } from '~/types'
 
-import type { personalAPIKeysLogicType } from './personalAPIKeysLogicType'
+import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
 
 export type EditingKeyFormValues = Pick<
     PersonalAPIKeyType,
@@ -34,6 +35,238 @@ export type EditingKeyFormValues = Pick<
     access_type?: 'all' | 'organizations' | 'teams'
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface personalAPIKeysLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean // userLogic
+    user: UserType | null // userLogic
+    allAccessSelected: boolean
+    allOrganizations: OrganizationBasicType[]
+    allTeams: TeamBasicType[] | null
+    allTeamsLoading: boolean
+    allowedScopeKeys: Set<string>
+    allowedScopes: APIScope[]
+    canUsePersonalApiKeys: boolean
+    editingKey: EditingKeyFormValues
+    editingKeyAllErrors: Record<string, any>
+    editingKeyChanged: boolean
+    editingKeyErrors: DeepPartialMap<EditingKeyFormValues, ValidationErrorType>
+    editingKeyHasErrors: boolean
+    editingKeyId: PersonalAPIKeyType['id'] | null
+    editingKeyManualErrors: Record<string, any>
+    editingKeyTouched: boolean
+    editingKeyTouches: Record<string, boolean>
+    editingKeyValidationErrors: DeepPartialMap<EditingKeyFormValues, ValidationErrorType>
+    filteredScopes: APIScope[]
+    formScopeRadioValues: Record<string, string>
+    getRestrictedOrganizationsForKey: (keyId: string) => OrganizationBasicType[]
+    getRestrictedTeamsForKey: (keyId: string) => TeamBasicType[]
+    isDescriptionFieldVisible: boolean
+    isEditingKeyLegacy: boolean
+    isEditingKeySubmitting: boolean
+    isEditingKeyValid: boolean
+    isPersonalApiKeyIdDisabled: (keyId: string) => boolean
+    keys: PersonalAPIKeyType[]
+    keysLoading: boolean
+    searchTerm: string
+    showEditingKeyErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface personalAPIKeysLogicActions {
+    createKeySuccess: (key: PersonalAPIKeyType) => {
+        key: PersonalAPIKeyType
+    }
+    deleteKey: (id: PersonalAPIKeyType['id']) => {
+        id: string
+    }
+    deleteKeyFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteKeySuccess: (
+        keys: PersonalAPIKeyType[],
+        payload?: {
+            id: string
+        }
+    ) => {
+        keys: PersonalAPIKeyType[]
+        payload?: {
+            id: string
+        }
+    }
+    loadAllTeams: () => {
+        value: true
+    }
+    loadAllTeamsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAllTeamsSuccess: (
+        allTeams: TeamBasicType[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        allTeams: TeamBasicType[]
+        payload?: {
+            value: true
+        }
+    }
+    loadKeys: () => {
+        value: true
+    }
+    loadKeysFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadKeysSuccess: (
+        keys: PersonalAPIKeyType[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        keys: PersonalAPIKeyType[]
+        payload?: {
+            value: true
+        }
+    }
+    resetEditingKey: (values?: EditingKeyFormValues) => {
+        values?: EditingKeyFormValues
+    }
+    resetScopes: () => {
+        value: true
+    }
+    rollKey: (id: PersonalAPIKeyType['id']) => {
+        id: string
+    }
+    rollKeyFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    rollKeySuccess: (
+        keys: PersonalAPIKeyType[],
+        payload?: {
+            id: string
+        }
+    ) => {
+        keys: PersonalAPIKeyType[]
+        payload?: {
+            id: string
+        }
+    }
+    setEditingKeyId: (id: PersonalAPIKeyType['id'] | null) => {
+        id: string | null
+    }
+    setEditingKeyManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setEditingKeyValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setEditingKeyValues: (values: DeepPartial<EditingKeyFormValues>) => {
+        values: DeepPartial<EditingKeyFormValues>
+    }
+    setScopeRadioValue: (
+        key: string,
+        action: string
+    ) => {
+        action: string
+        key: string
+    }
+    setSearchTerm: (searchTerm: string) => {
+        searchTerm: string
+    }
+    showDescriptionField: () => {
+        value: true
+    }
+    showRollKeySuccessDialog: (
+        key: PersonalAPIKeyType,
+        prevMaskedValue?: string | null
+    ) => {
+        key: PersonalAPIKeyType
+        prevMaskedValue: string | null | undefined
+    }
+    submitEditingKey: () => {
+        value: boolean
+    }
+    submitEditingKeyFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitEditingKeyRequest: (editingKey: EditingKeyFormValues) => {
+        editingKey: EditingKeyFormValues
+    }
+    submitEditingKeySuccess: (editingKey: EditingKeyFormValues) => {
+        editingKey: EditingKeyFormValues
+    }
+    touchEditingKeyField: (key: string) => {
+        key: string
+    }
+    updateKey: (
+        data: Partial<Pick<PersonalAPIKeyType, 'label' | 'scopes'>>
+    ) => Partial<Pick<PersonalAPIKeyType, 'label' | 'scopes'>>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface personalAPIKeysLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        allowedScopes: (
+            featureFlags: FeatureFlagsSet,
+            hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean
+        ) => APIScope[]
+        allowedScopeKeys: (allowedScopes: APIScope[]) => Set<string>
+        filteredScopes: (searchTerm: string, allowedScopes: APIScope[]) => APIScope[]
+        formScopeRadioValues: (editingKey: EditingKeyFormValues) => Record<string, string>
+        allAccessSelected: (editingKey: EditingKeyFormValues) => boolean
+        isEditingKeyLegacy: (editingKeyId: string | null, keys: PersonalAPIKeyType[]) => boolean
+        allOrganizations: (user: UserType | null) => OrganizationBasicType[]
+        canUsePersonalApiKeys: (user: UserType | null) => boolean
+        isPersonalApiKeyIdDisabled: (
+            allOrganizations: OrganizationBasicType[],
+            allTeams: TeamBasicType[] | null,
+            keys: PersonalAPIKeyType[],
+            getRestrictedOrganizationsForKey: (keyId: string) => OrganizationBasicType[]
+        ) => (keyId: string) => boolean
+        getRestrictedOrganizationsForKey: (
+            allOrganizations: OrganizationBasicType[],
+            keys: PersonalAPIKeyType[],
+            getRestrictedTeamsForKey: (keyId: string) => TeamBasicType[]
+        ) => (keyId: string) => OrganizationBasicType[]
+        getRestrictedTeamsForKey: (
+            allOrganizations: OrganizationBasicType[],
+            allTeams: TeamBasicType[] | null,
+            keys: PersonalAPIKeyType[]
+        ) => (keyId: string) => TeamBasicType[]
+    }
+}
+
+export type personalAPIKeysLogicType = MakeLogicType<
+    personalAPIKeysLogicValues,
+    personalAPIKeysLogicActions,
+    Record<string, any>,
+    personalAPIKeysLogicMeta
+>
+
 export const personalAPIKeysLogic = kea<personalAPIKeysLogicType>([
     path(['lib', 'components', 'PersonalAPIKeys', 'personalAPIKeysLogic']),
     connect(() => ({
@@ -177,7 +410,10 @@ export const personalAPIKeysLogic = kea<personalAPIKeysLogicType>([
     selectors(() => ({
         allowedScopes: [
             (s) => [s.featureFlags, s.hasAvailableFeature],
-            (featureFlags, hasAvailableFeature): APIScope[] => {
+            (
+                featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet,
+                hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean
+            ): APIScope[] => {
                 let scopes = API_SCOPES
 
                 // Filter out llm_gateway scope if feature flag is disabled
@@ -205,11 +441,11 @@ export const personalAPIKeysLogic = kea<personalAPIKeysLogicType>([
         ],
         allowedScopeKeys: [
             (s) => [s.allowedScopes],
-            (allowedScopes): Set<string> => new Set(allowedScopes.map((scope) => scope.key)),
+            (allowedScopes: APIScope[]): Set<string> => new Set(allowedScopes.map((scope) => scope.key)),
         ],
         filteredScopes: [
             (s) => [s.searchTerm, s.allowedScopes],
-            (searchTerm, allowedScopes): APIScope[] => {
+            (searchTerm: string, allowedScopes: APIScope[]): APIScope[] => {
                 const scopes = allowedScopes
 
                 if (!searchTerm.trim()) {
@@ -231,20 +467,20 @@ export const personalAPIKeysLogic = kea<personalAPIKeysLogicType>([
         ],
         formScopeRadioValues: [
             (s) => [s.editingKey],
-            (editingKey): Record<string, string> => {
+            (editingKey: EditingKeyFormValues): Record<string, string> => {
                 return scopesArrayToObject(editingKey.scopes)
             },
         ],
         allAccessSelected: [
             (s) => [s.editingKey],
-            (editingKey): boolean => {
+            (editingKey: EditingKeyFormValues): boolean => {
                 return editingKey.scopes.includes('*')
             },
         ],
 
         isEditingKeyLegacy: [
             (s) => [s.editingKeyId, s.keys],
-            (editingKeyId, keys): boolean => {
+            (editingKeyId: PersonalAPIKeyType['id'] | null, keys: PersonalAPIKeyType[]): boolean => {
                 if (!editingKeyId || editingKeyId === 'new') {
                     return false
                 }
@@ -255,7 +491,7 @@ export const personalAPIKeysLogic = kea<personalAPIKeysLogicType>([
 
         allOrganizations: [
             (s) => [s.user],
-            (user): OrganizationBasicType[] => {
+            (user: UserType | null): OrganizationBasicType[] => {
                 return user?.organizations ?? []
             },
         ],
diff --git a/frontend/src/scenes/settings/user/personalIntegrationsLogic.ts b/frontend/src/scenes/settings/user/personalIntegrationsLogic.ts
index b41e8652a01a..55f3882ae504 100644
--- a/frontend/src/scenes/settings/user/personalIntegrationsLogic.ts
+++ b/frontend/src/scenes/settings/user/personalIntegrationsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -18,7 +18,8 @@ import {
     usersIntegrationsSlackStartCreate,
 } from '~/generated/core/api'
 
-import type { personalIntegrationsLogicType } from './personalIntegrationsLogicType'
+import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
+import type { TeamPublicType, TeamType, UserBasicType } from '../../../types'
 
 export interface PersonalGitHubIntegration {
     kind: 'github'
@@ -88,6 +89,218 @@ function writeConnectFromStorage(value: string | null): void {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface personalIntegrationsLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    githubConnecting: boolean
+    integrations: PersonalGitHubIntegration[]
+    integrationsLoading: boolean
+    linkableSlackWorkspaces: LinkableSlackWorkspace[]
+    linkableSlackWorkspacesLoading: boolean
+    slackConnect: boolean
+    slackConnectLoading: boolean
+    slackIntegrations: PersonalSlackIntegration[]
+    slackIntegrationsLoading: boolean
+    slackLinkEnabled: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface personalIntegrationsLogicActions {
+    loadProjectIntegrations: () => any // integrationsLogic
+    projectIntegrationsLoaded: (
+        integrations: {
+            config: any
+            created_at: string
+            created_by?: UserBasicType | null | undefined
+            display_name: string
+            errors?: string | undefined
+            icon_url: any
+            id: number
+            kind:
+                | 'apns'
+                | 'aws-s3'
+                | 'azure-blob'
+                | 'bing-ads'
+                | 'clickup'
+                | 'customerio-app'
+                | 'customerio-track'
+                | 'customerio-webhook'
+                | 'databricks'
+                | 'email'
+                | 'firebase'
+                | 'github'
+                | 'gitlab'
+                | 'google-ads'
+                | 'google-analytics'
+                | 'google-cloud-service-account'
+                | 'google-cloud-storage'
+                | 'google-pubsub'
+                | 'google-search-console'
+                | 'google-sheets'
+                | 'hubspot'
+                | 'intercom'
+                | 'jira'
+                | 'linear'
+                | 'linkedin-ads'
+                | 'meta-ads'
+                | 'pinterest-ads'
+                | 'postgresql'
+                | 'reddit-ads'
+                | 's3-compatible'
+                | 'salesforce'
+                | 'slack'
+                | 'snapchat'
+                | 'stripe'
+                | 'tiktok-ads'
+                | 'twilio'
+                | 'vercel'
+        }[],
+        payload?: any
+    ) => {
+        integrations: {
+            config: any
+            created_at: string
+            created_by?: UserBasicType | null | undefined
+            display_name: string
+            errors?: string | undefined
+            icon_url: any
+            id: number
+            kind:
+                | 'apns'
+                | 'aws-s3'
+                | 'azure-blob'
+                | 'bing-ads'
+                | 'clickup'
+                | 'customerio-app'
+                | 'customerio-track'
+                | 'customerio-webhook'
+                | 'databricks'
+                | 'email'
+                | 'firebase'
+                | 'github'
+                | 'gitlab'
+                | 'google-ads'
+                | 'google-analytics'
+                | 'google-cloud-service-account'
+                | 'google-cloud-storage'
+                | 'google-pubsub'
+                | 'google-search-console'
+                | 'google-sheets'
+                | 'hubspot'
+                | 'intercom'
+                | 'jira'
+                | 'linear'
+                | 'linkedin-ads'
+                | 'meta-ads'
+                | 'pinterest-ads'
+                | 'postgresql'
+                | 'reddit-ads'
+                | 's3-compatible'
+                | 'salesforce'
+                | 'slack'
+                | 'snapchat'
+                | 'stripe'
+                | 'tiktok-ads'
+                | 'twilio'
+                | 'vercel'
+        }[]
+        payload?: any
+    } // integrationsLogic
+    connectGitHub: () => {
+        value: true
+    }
+    connectGitHubFailure: () => {
+        value: true
+    }
+    connectSlack: (payload?: { workspace?: LinkableSlackWorkspace }) => {
+        workspace?: LinkableSlackWorkspace
+    }
+    connectSlackFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    connectSlackSuccess: (
+        slackConnect: boolean,
+        payload?: {
+            workspace?: LinkableSlackWorkspace
+        }
+    ) => {
+        slackConnect: boolean
+        payload?: {
+            workspace?: LinkableSlackWorkspace
+        }
+    }
+    disconnectGitHub: (installationId: string) => {
+        installationId: string
+    }
+    disconnectSlack: (slackUserId: string) => {
+        slackUserId: string
+    }
+    loadIntegrations: () => any
+    loadIntegrationsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadIntegrationsSuccess: (
+        integrations: PersonalGitHubIntegration[],
+        payload?: any
+    ) => {
+        integrations: PersonalGitHubIntegration[]
+        payload?: any
+    }
+    loadLinkableSlackWorkspaces: () => any
+    loadLinkableSlackWorkspacesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadLinkableSlackWorkspacesSuccess: (
+        linkableSlackWorkspaces: LinkableSlackWorkspace[],
+        payload?: any
+    ) => {
+        linkableSlackWorkspaces: LinkableSlackWorkspace[]
+        payload?: any
+    }
+    loadSlackIntegrations: () => any
+    loadSlackIntegrationsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSlackIntegrationsSuccess: (
+        slackIntegrations: PersonalSlackIntegration[],
+        payload?: any
+    ) => {
+        slackIntegrations: PersonalSlackIntegration[]
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface personalIntegrationsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        slackLinkEnabled: (featureFlags: FeatureFlagsSet) => boolean
+    }
+}
+
+export type personalIntegrationsLogicType = MakeLogicType<
+    personalIntegrationsLogicValues,
+    personalIntegrationsLogicActions,
+    Record<string, any>,
+    personalIntegrationsLogicMeta
+>
+
 export const personalIntegrationsLogic = kea<personalIntegrationsLogicType>([
     path(['scenes', 'settings', 'user', 'personalIntegrationsLogic']),
 
@@ -199,7 +412,8 @@ export const personalIntegrationsLogic = kea<personalIntegrationsLogicType>([
         // is hidden, not the unlink path.
         slackLinkEnabled: [
             (s) => [s.featureFlags],
-            (featureFlags): boolean => !!featureFlags[FEATURE_FLAGS.SLACK_APP_OAUTH],
+            (featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet): boolean =>
+                !!featureFlags[FEATURE_FLAGS.SLACK_APP_OAUTH],
         ],
     }),
 
diff --git a/frontend/src/scenes/settings/user/pipelineNotificationsLogic.ts b/frontend/src/scenes/settings/user/pipelineNotificationsLogic.ts
index a8fec5cbd52c..2add933aac9c 100644
--- a/frontend/src/scenes/settings/user/pipelineNotificationsLogic.ts
+++ b/frontend/src/scenes/settings/user/pipelineNotificationsLogic.ts
@@ -1,4 +1,4 @@
-import { afterMount, connect, kea, path, selectors } from 'kea'
+import { MakeLogicType, afterMount, connect, kea, path, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { subscriptions } from 'kea-subscriptions'
 
@@ -16,8 +16,6 @@ import type {
     PaginatedHogFunctionMinimalListApi,
 } from 'products/cdp/frontend/generated/api.schemas'
 
-import type { pipelineNotificationsLogicType } from './pipelineNotificationsLogicType'
-
 export type PipelineKind = 'destination' | 'transformation' | 'plugin' | 'batch_export'
 
 export type PipelineItem = {
@@ -49,6 +47,52 @@ function displayName(name: string | null | undefined): string {
     return name?.trim() || '(unnamed)'
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface pipelineNotificationsLogicValues {
+    currentOrganization: OrganizationType | null // organizationLogic
+    user: UserType | null // userLogic
+    allPipelineIds: string[]
+    isPipelineDisabled: (pipelineId: string) => boolean
+    pipelines: PipelineItem[]
+    pipelinesByTeam: Record<string, PipelineTeamGroup>
+    pipelinesLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface pipelineNotificationsLogicActions {
+    loadPipelines: () => any
+    loadPipelinesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPipelinesSuccess: (
+        pipelines: PipelineItem[],
+        payload?: any
+    ) => {
+        pipelines: PipelineItem[]
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface pipelineNotificationsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        allPipelineIds: (pipelines: PipelineItem[]) => string[]
+        pipelinesByTeam: (pipelines: PipelineItem[]) => Record<string, PipelineTeamGroup>
+        isPipelineDisabled: (user: UserType | null) => (pipelineId: string) => boolean
+    }
+}
+
+export type pipelineNotificationsLogicType = MakeLogicType<
+    pipelineNotificationsLogicValues,
+    pipelineNotificationsLogicActions,
+    Record<string, any>,
+    pipelineNotificationsLogicMeta
+>
+
 export const pipelineNotificationsLogic = kea<pipelineNotificationsLogicType>([
     path(['scenes', 'settings', 'user', 'pipelineNotificationsLogic']),
     connect(() => ({
diff --git a/frontend/src/scenes/settings/user/realtimeNotificationPreferencesLogic.ts b/frontend/src/scenes/settings/user/realtimeNotificationPreferencesLogic.ts
index 31979e8993ce..d22c4f018aca 100644
--- a/frontend/src/scenes/settings/user/realtimeNotificationPreferencesLogic.ts
+++ b/frontend/src/scenes/settings/user/realtimeNotificationPreferencesLogic.ts
@@ -1,14 +1,73 @@
-import { actions, connect, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, path, reducers, selectors } from 'kea'
 
 import { organizationLogic } from 'scenes/organizationLogic'
 import { userLogic } from 'scenes/userLogic'
 
 import { TeamBasicType } from '~/types'
 
-import type { realtimeNotificationPreferencesLogicType } from './realtimeNotificationPreferencesLogicType'
+import type { OrganizationType, UserType } from '../../../types'
 
 export type ProjectState = 'on' | 'off' | 'partial'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface realtimeNotificationPreferencesLogicValues {
+    currentOrganization: OrganizationType | null // organizationLogic
+    user: UserType | null // userLogic
+    activeTypes: string[]
+    allOff: boolean
+    allOn: boolean
+    defaultExpanded: boolean
+    disabledMap: Record<string, Record<string, boolean>>
+    expandedOverrides: Record<number, boolean>
+    isProjectExpanded: (teamId: number) => boolean
+    isTypeEnabledForTeam: (type: string, teamId: number) => boolean
+    projectState: (teamId: number) => ProjectState
+    teamIds: number[]
+    teams: TeamBasicType[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface realtimeNotificationPreferencesLogicActions {
+    setProjectExpanded: (
+        teamId: number,
+        expanded: boolean
+    ) => {
+        expanded: boolean
+        teamId: number
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface realtimeNotificationPreferencesLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        teams: (currentOrganization: OrganizationType | null) => TeamBasicType[]
+        teamIds: (teams: TeamBasicType[]) => number[]
+        activeTypes: (user: UserType | null) => string[]
+        disabledMap: (user: UserType | null) => Record<string, Record<string, boolean>>
+        defaultExpanded: (teams: TeamBasicType[]) => boolean
+        isProjectExpanded: (
+            expandedOverrides: Record<number, boolean>,
+            defaultExpanded: boolean
+        ) => (teamId: number) => boolean
+        isTypeEnabledForTeam: (
+            disabledMap: Record<string, Record<string, boolean>>
+        ) => (type: string, teamId: number) => boolean
+        projectState: (
+            activeTypes: string[],
+            disabledMap: Record<string, Record<string, boolean>>
+        ) => (teamId: number) => ProjectState
+        allOn: (teamIds: number[], projectState: (teamId: number) => ProjectState) => boolean
+        allOff: (teamIds: number[], projectState: (teamId: number) => ProjectState) => boolean
+    }
+}
+
+export type realtimeNotificationPreferencesLogicType = MakeLogicType<
+    realtimeNotificationPreferencesLogicValues,
+    realtimeNotificationPreferencesLogicActions,
+    Record<string, any>,
+    realtimeNotificationPreferencesLogicMeta
+>
+
 export const realtimeNotificationPreferencesLogic = kea<realtimeNotificationPreferencesLogicType>([
     path(['scenes', 'settings', 'user', 'realtimeNotificationPreferencesLogic']),
     connect({
@@ -28,16 +87,18 @@ export const realtimeNotificationPreferencesLogic = kea<realtimeNotificationPref
     selectors(() => ({
         teams: [
             (s) => [s.currentOrganization],
-            (currentOrganization): TeamBasicType[] => currentOrganization?.teams ?? [],
+            (currentOrganization: null | import('~/types').OrganizationType): TeamBasicType[] =>
+                currentOrganization?.teams ?? [],
         ],
         teamIds: [(s) => [s.teams], (teams: TeamBasicType[]): number[] => teams.map((t) => t.id)],
         activeTypes: [
             () => [userLogic.selectors.user],
-            (user): string[] => (user?.active_realtime_notification_types ?? []) as string[],
+            (user: null | import('~/types').UserType): string[] =>
+                (user?.active_realtime_notification_types ?? []) as string[],
         ],
         disabledMap: [
             () => [userLogic.selectors.user],
-            (user): Record<string, Record<string, boolean>> =>
+            (user: null | import('~/types').UserType): Record<string, Record<string, boolean>> =>
                 user?.notification_settings?.realtime_notifications_disabled ?? {},
         ],
         defaultExpanded: [(s) => [s.teams], (teams: TeamBasicType[]): boolean => teams.length <= 3],
@@ -49,13 +110,13 @@ export const realtimeNotificationPreferencesLogic = kea<realtimeNotificationPref
         ],
         isTypeEnabledForTeam: [
             (s) => [s.disabledMap],
-            (disabledMap) =>
+            (disabledMap: Record<string, Record<string, boolean>>) =>
                 (type: string, teamId: number): boolean =>
                     !disabledMap[type]?.[String(teamId)],
         ],
         projectState: [
             (s) => [s.activeTypes, s.disabledMap],
-            (activeTypes, disabledMap) =>
+            (activeTypes: string[], disabledMap: Record<string, Record<string, boolean>>) =>
                 (teamId: number): ProjectState => {
                     if (activeTypes.length === 0) {
                         return 'on'
diff --git a/frontend/src/scenes/settings/user/remindersLogic.ts b/frontend/src/scenes/settings/user/remindersLogic.ts
index 36eae63d4da3..6f729e88c80b 100644
--- a/frontend/src/scenes/settings/user/remindersLogic.ts
+++ b/frontend/src/scenes/settings/user/remindersLogic.ts
@@ -1,5 +1,6 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 
 import { dayjs } from 'lib/dayjs'
@@ -16,7 +17,7 @@ import {
 } from 'products/reminders/frontend/generated/api'
 import { RecurrenceIntervalEnumApi, ReminderApi } from 'products/reminders/frontend/generated/api.schemas'
 
-import type { remindersLogicType } from './remindersLogicType'
+import type { OrganizationType, PreflightStatus } from '../../../types'
 
 export type ReminderScheduleType = 'one-off' | 'repeats' | 'advanced'
 
@@ -54,6 +55,132 @@ function scheduleTypeForReminder(reminder: ReminderApi): ReminderScheduleType {
     return 'one-off'
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface remindersLogicValues {
+    currentOrganization: OrganizationType | null // organizationLogic
+    preflight: PreflightStatus | null // preflightLogic
+    editingReminder: ReminderApi | null
+    editingReminderId: string | null
+    isReminderFormSubmitting: boolean
+    isReminderFormValid: boolean
+    isScheduleEditable: boolean
+    projectOptions: {
+        label: string
+        value: number | null
+    }[]
+    reminderForm: ReminderFormValues
+    reminderFormAllErrors: Record<string, any>
+    reminderFormChanged: boolean
+    reminderFormErrors: DeepPartialMap<ReminderFormValues, ValidationErrorType>
+    reminderFormHasErrors: boolean
+    reminderFormManualErrors: Record<string, any>
+    reminderFormTouched: boolean
+    reminderFormTouches: Record<string, boolean>
+    reminderFormValidationErrors: DeepPartialMap<ReminderFormValues, ValidationErrorType>
+    reminders: ReminderApi[]
+    remindersLoading: boolean
+    showReminderFormErrors: boolean
+    timezoneOptions: {
+        key: string
+        label: string
+    }[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface remindersLogicActions {
+    deleteReminder: (id: string) => string
+    deleteReminderFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteReminderSuccess: (
+        reminders: ReminderApi[],
+        payload?: string
+    ) => {
+        reminders: ReminderApi[]
+        payload?: string
+    }
+    loadReminders: () => any
+    loadRemindersFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRemindersSuccess: (
+        reminders: ReminderApi[],
+        payload?: any
+    ) => {
+        reminders: ReminderApi[]
+        payload?: any
+    }
+    resetReminderForm: (values?: ReminderFormValues) => {
+        values?: ReminderFormValues
+    }
+    setEditingReminderId: (id: string | null) => {
+        id: string | null
+    }
+    setReminderFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setReminderFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setReminderFormValues: (values: DeepPartial<ReminderFormValues>) => {
+        values: DeepPartial<ReminderFormValues>
+    }
+    submitReminderForm: () => {
+        value: boolean
+    }
+    submitReminderFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitReminderFormRequest: (reminderForm: ReminderFormValues) => {
+        reminderForm: ReminderFormValues
+    }
+    submitReminderFormSuccess: (reminderForm: ReminderFormValues) => {
+        reminderForm: ReminderFormValues
+    }
+    touchReminderFormField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface remindersLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        editingReminder: (editingReminderId: string | null, reminders: ReminderApi[]) => ReminderApi | null
+        isScheduleEditable: (editingReminderId: string | null, editingReminder: ReminderApi | null) => boolean
+        projectOptions: (currentOrganization: OrganizationType | null) => {
+            label: string
+            value: number | null
+        }[]
+        timezoneOptions: (preflight: PreflightStatus | null) => {
+            key: string
+            label: string
+        }[]
+    }
+}
+
+export type remindersLogicType = MakeLogicType<
+    remindersLogicValues,
+    remindersLogicActions,
+    Record<string, any>,
+    remindersLogicMeta
+>
+
 export const remindersLogic = kea<remindersLogicType>([
     path(['scenes', 'settings', 'user', 'remindersLogic']),
     connect(() => ({
@@ -156,26 +283,28 @@ export const remindersLogic = kea<remindersLogicType>([
     selectors({
         editingReminder: [
             (s) => [s.editingReminderId, s.reminders],
-            (editingReminderId, reminders): ReminderApi | null =>
+            (editingReminderId: string | null, reminders: ReminderApi[]): ReminderApi | null =>
                 editingReminderId && editingReminderId !== NEW
                     ? (reminders.find((reminder) => reminder.id === editingReminderId) ?? null)
                     : null,
         ],
         isScheduleEditable: [
             (s) => [s.editingReminderId, s.editingReminder],
-            (editingReminderId, editingReminder): boolean =>
+            (editingReminderId: string | null, editingReminder: ReminderApi | null): boolean =>
                 editingReminderId === NEW || editingReminder?.status === 'active',
         ],
         projectOptions: [
             (s) => [s.currentOrganization],
-            (currentOrganization): { value: number | null; label: string }[] => [
+            (
+                currentOrganization: null | import('../../../types').OrganizationType
+            ): { value: number | null; label: string }[] => [
                 { value: null, label: 'Organization-wide (no project)' },
                 ...(currentOrganization?.teams ?? []).map((team) => ({ value: team.id, label: team.name })),
             ],
         ],
         timezoneOptions: [
             (s) => [s.preflight],
-            (preflight): { key: string; label: string }[] =>
+            (preflight: null | import('../../../types').PreflightStatus): { key: string; label: string }[] =>
                 Object.entries(preflight?.available_timezones ?? {}).map(([tz, offset]) => ({
                     key: tz,
                     label: timeZoneLabel(tz, offset),
diff --git a/frontend/src/scenes/settings/user/userDangerZoneLogic.ts b/frontend/src/scenes/settings/user/userDangerZoneLogic.ts
index 30f99232f94e..b753bf5a7d02 100644
--- a/frontend/src/scenes/settings/user/userDangerZoneLogic.ts
+++ b/frontend/src/scenes/settings/user/userDangerZoneLogic.ts
@@ -1,4 +1,4 @@
-import { kea } from 'kea'
+import { MakeLogicType, kea } from 'kea'
 import { router } from 'kea-router'
 
 import api from 'lib/api'
@@ -8,7 +8,51 @@ import { urls } from 'scenes/urls'
 
 import type { OrganizationBasicType } from '~/types'
 
-import type { userDangerZoneLogicType } from './userDangerZoneLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface userDangerZoneLogicValues {
+    _leaveOrganization: null
+    _leaveOrganizationLoading: boolean
+    deleteUserModalOpen: boolean
+    deletedOrganizationIds: string[]
+    isUserDeletionConfirmed: boolean
+    organizationToDelete: OrganizationBasicType | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface userDangerZoneLogicActions {
+    deleteOrganizationSuccess: (args_0: { redirectPath?: string }) => {
+        redirectPath: string | undefined
+    } // organizationLogic
+    addDeletedOrganizationId: (id: string) => {
+        id: string
+    }
+    leaveOrganization: (organizationId: string) => string
+    leaveOrganizationFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    leaveOrganizationSuccess: (
+        _leaveOrganization: null,
+        payload?: string
+    ) => {
+        _leaveOrganization: null
+        payload?: string
+    }
+    setDeleteUserModalOpen: (open: boolean) => {
+        open: boolean
+    }
+    setIsUserDeletionConfirmed: (confirmed: boolean) => {
+        confirmed: boolean
+    }
+    setOrganizationToDelete: (organization: OrganizationBasicType | null) => {
+        organization: OrganizationBasicType | null
+    }
+}
+
+export type userDangerZoneLogicType = MakeLogicType<userDangerZoneLogicValues, userDangerZoneLogicActions>
 
 export const userDangerZoneLogic = kea<userDangerZoneLogicType>({
     path: ['scenes', 'settings', 'user', 'userDangerZoneLogic'],
diff --git a/frontend/src/scenes/sites/siteLogic.ts b/frontend/src/scenes/sites/siteLogic.ts
index a7cd78ee3991..fdd1af927815 100644
--- a/frontend/src/scenes/sites/siteLogic.ts
+++ b/frontend/src/scenes/sites/siteLogic.ts
@@ -1,22 +1,34 @@
-import { kea, path, props, selectors } from 'kea'
+import { MakeLogicType, kea, path, props, selectors } from 'kea'
 
 import { Scene } from 'scenes/sceneTypes'
 
 import { Breadcrumb } from '~/types'
 
-import type { siteLogicType } from './siteLogicType'
-
 export interface SiteLogicProps {
     url: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface siteLogicValues {
+    breadcrumbs: Breadcrumb[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface siteLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        breadcrumbs: (url: string) => Breadcrumb[]
+    }
+}
+
+export type siteLogicType = MakeLogicType<siteLogicValues, {}, SiteLogicProps, siteLogicMeta>
+
 export const siteLogic = kea<siteLogicType>([
     path(['scenes', 'sites', 'siteLogic']),
     props({} as SiteLogicProps),
     selectors({
         breadcrumbs: [
             (_, p) => [p.url],
-            (url): Breadcrumb[] => [
+            (url: string): Breadcrumb[] => [
                 {
                     key: Scene.Site,
                     name: `Site`,
diff --git a/frontend/src/scenes/startups/startupProgramLogic.ts b/frontend/src/scenes/startups/startupProgramLogic.ts
index f929be870472..8288c08b737e 100644
--- a/frontend/src/scenes/startups/startupProgramLogic.ts
+++ b/frontend/src/scenes/startups/startupProgramLogic.ts
@@ -1,5 +1,6 @@
-import { actions, connect, kea, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, path, props, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import posthog from 'posthog-js'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -12,8 +13,8 @@ import { userLogic } from 'scenes/userLogic'
 
 import { BillingType } from '~/types'
 
+import type { OrganizationType, StartupProgramLabel, UserType } from '../../types'
 import { PUBLIC_EMAIL_DOMAINS } from './constants'
-import type { startupProgramLogicType } from './startupProgramLogicType'
 import { getYCBatchOptions } from './utils'
 
 export enum StartupProgramType {
@@ -70,6 +71,103 @@ function validateFunding(raised: string | undefined, isYC: boolean): string | un
     return undefined
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface startupProgramLogicValues {
+    billing: BillingType | null // billingLogic
+    currentOrganization: OrganizationType | null // organizationLogic
+    currentOrganizationId: string // organizationLogic
+    isAdminOrOwner: boolean | null // organizationLogic
+    user: UserType | null // userLogic
+    currentStartupProgramLabel: StartupProgramLabel | null
+    domainFromEmail: string
+    formSubmitted: boolean
+    isCurrentlyOnStartupPlan: boolean
+    isReferralProgram: boolean
+    isStartupProgramSubmitting: boolean
+    isStartupProgramValid: boolean
+    isYC: boolean
+    referrer: string | undefined
+    referrerDisplayName: string | undefined
+    showStartupProgramErrors: boolean
+    startupProgram: StartupProgramFormValues
+    startupProgramAllErrors: Record<string, any>
+    startupProgramChanged: boolean
+    startupProgramErrors: DeepPartialMap<StartupProgramFormValues, ValidationErrorType>
+    startupProgramHasErrors: boolean
+    startupProgramManualErrors: Record<string, any>
+    startupProgramTouched: boolean
+    startupProgramTouches: Record<string, boolean>
+    startupProgramValidationErrors: DeepPartialMap<StartupProgramFormValues, ValidationErrorType>
+    wasPreviouslyOnStartupPlan: boolean
+    ycBatchOptions: {
+        label: string
+        value: string
+    }[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface startupProgramLogicActions {
+    resetStartupProgram: (values?: StartupProgramFormValues) => {
+        values?: StartupProgramFormValues
+    }
+    setFormSubmitted: (submitted: boolean) => {
+        submitted: boolean
+    }
+    setStartupProgramManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setStartupProgramValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setStartupProgramValues: (values: DeepPartial<StartupProgramFormValues>) => {
+        values: DeepPartial<StartupProgramFormValues>
+    }
+    submitStartupProgram: () => {
+        value: boolean
+    }
+    submitStartupProgramFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitStartupProgramRequest: (startupProgram: StartupProgramFormValues) => {
+        startupProgram: StartupProgramFormValues
+    }
+    submitStartupProgramSuccess: (startupProgram: StartupProgramFormValues) => {
+        startupProgram: StartupProgramFormValues
+    }
+    touchStartupProgramField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface startupProgramLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        isYC: (arg: any) => boolean
+        isReferralProgram: (arg: any) => boolean
+        referrer: (arg: any) => string | undefined
+        referrerDisplayName: (arg: any) => string | undefined
+        isCurrentlyOnStartupPlan: (billing: BillingType | null) => boolean
+        currentStartupProgramLabel: (billing: BillingType | null) => StartupProgramLabel | null
+        wasPreviouslyOnStartupPlan: (billing: BillingType | null) => boolean
+        domainFromEmail: (user: UserType | null) => string
+    }
+}
+
+export type startupProgramLogicType = MakeLogicType<
+    startupProgramLogicValues,
+    startupProgramLogicActions,
+    StartupProgramLogicProps,
+    startupProgramLogicMeta
+>
+
 export const startupProgramLogic = kea<startupProgramLogicType>([
     path(['scenes', 'startups', 'startupProgramLogic']),
     props({} as StartupProgramLogicProps),
@@ -130,7 +228,7 @@ export const startupProgramLogic = kea<startupProgramLogicType>([
         ],
         domainFromEmail: [
             (s) => [s.user],
-            (user) => {
+            (user: null | import('~/types').UserType) => {
                 if (!user?.email) {
                     return ''
                 }
diff --git a/frontend/src/scenes/surveys/forms/surveyFormBuilderLogic.ts b/frontend/src/scenes/surveys/forms/surveyFormBuilderLogic.ts
index 88a3a7f35155..2f9292d96e8a 100644
--- a/frontend/src/scenes/surveys/forms/surveyFormBuilderLogic.ts
+++ b/frontend/src/scenes/surveys/forms/surveyFormBuilderLogic.ts
@@ -1,16 +1,64 @@
-import { connect, kea, key, path, props } from 'kea'
+import { MakeLogicType, connect, kea, key, path, props } from 'kea'
 import { router, urlToAction } from 'kea-router'
 
 import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
 import { urls } from 'scenes/urls'
 
+import type { Survey } from '../../../types'
 import { surveysLogic } from '../surveysLogic'
-import type { surveyFormBuilderLogicType } from './surveyFormBuilderLogicType'
 
 export interface SurveyFormBuilderLogicProps {
     id: string // 'new' for new surveys, or a UUID for editing
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface surveyFormBuilderLogicValues {
+    formBuilderEnabled: boolean // surveysLogic
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface surveyFormBuilderLogicActions {
+    reportSurveyCreated: (
+        survey: Survey,
+        isDuplicate?: boolean | undefined,
+        creationSource?:
+            | 'form_builder'
+            | 'full_editor'
+            | 'llm_analytics'
+            | 'quick_create'
+            | 'template'
+            | 'wizard'
+            | undefined
+    ) => {
+        creationSource:
+            | 'form_builder'
+            | 'full_editor'
+            | 'llm_analytics'
+            | 'quick_create'
+            | 'template'
+            | 'wizard'
+            | undefined
+        isDuplicate: boolean | undefined
+        survey: Survey
+    } // eventUsageLogic
+    reportSurveyEdited: (survey: Survey) => {
+        survey: Survey
+    } // eventUsageLogic
+    loadSurveys: () => any // surveysLogic
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface surveyFormBuilderLogicMeta {
+    key: string
+}
+
+export type surveyFormBuilderLogicType = MakeLogicType<
+    surveyFormBuilderLogicValues,
+    surveyFormBuilderLogicActions,
+    SurveyFormBuilderLogicProps,
+    surveyFormBuilderLogicMeta
+>
+
 export const surveyFormBuilderLogic = kea<surveyFormBuilderLogicType>([
     path(['scenes', 'surveys', 'form', 'surveyFormBuilderLogic']),
 
diff --git a/frontend/src/scenes/surveys/quick-create/quickSurveyFormLogic.ts b/frontend/src/scenes/surveys/quick-create/quickSurveyFormLogic.ts
index a399282972f8..bbb7d59e01d6 100644
--- a/frontend/src/scenes/surveys/quick-create/quickSurveyFormLogic.ts
+++ b/frontend/src/scenes/surveys/quick-create/quickSurveyFormLogic.ts
@@ -1,5 +1,6 @@
-import { actions, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { router } from 'kea-router'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -22,10 +23,10 @@ import {
     SurveyType,
 } from '~/types'
 
+import type { SurveyAppearance, SurveyDisplayConditions } from '../../../types'
 import { NewSurvey, SURVEY_CREATED_SOURCE, SURVEY_RATING_SCALE, defaultSurveyAppearance } from '../constants'
 import { surveysLogic } from '../surveysLogic'
 import { toSurveyEvent } from '../utils/opportunityDetection'
-import type { quickSurveyFormLogicType } from './quickSurveyFormLogicType'
 import { QuickSurveyType } from './types'
 
 export type QuickSurveyCreateMode = 'launch' | 'edit' | 'draft'
@@ -104,6 +105,104 @@ function buildSurveyQuestion(
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface quickSurveyFormLogicValues {
+    cancelEvents: string[]
+    createMode: QuickSurveyCreateMode
+    delaySeconds: number
+    isSurveyFormSubmitting: boolean
+    isSurveyFormValid: boolean
+    previewSurvey: NewSurvey
+    selectedEvents: string[]
+    showSurveyFormErrors: boolean
+    submitDisabledReason: string | undefined
+    surveyForm: QuickSurveyFormValues
+    surveyFormAllErrors: Record<string, any>
+    surveyFormChanged: boolean
+    surveyFormErrors: DeepPartialMap<QuickSurveyFormValues, ValidationErrorType>
+    surveyFormHasErrors: boolean
+    surveyFormManualErrors: Record<string, any>
+    surveyFormTouched: boolean
+    surveyFormTouches: Record<string, boolean>
+    surveyFormValidationErrors: DeepPartialMap<QuickSurveyFormValues, ValidationErrorType>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface quickSurveyFormLogicActions {
+    resetSurveyForm: (values?: QuickSurveyFormValues) => {
+        values?: QuickSurveyFormValues
+    }
+    setCreateMode: (mode: QuickSurveyCreateMode) => {
+        mode: QuickSurveyCreateMode
+    }
+    setSurveyFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setSurveyFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setSurveyFormValues: (values: DeepPartial<QuickSurveyFormValues>) => {
+        values: DeepPartial<QuickSurveyFormValues>
+    }
+    setTriggerEvent: (
+        step: EventsNode | null,
+        field: 'cancelEvents' | 'events'
+    ) => {
+        field: 'cancelEvents' | 'events'
+        step: EventsNode | null
+    }
+    submitSurveyForm: () => {
+        value: boolean
+    }
+    submitSurveyFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitSurveyFormRequest: (surveyForm: QuickSurveyFormValues) => {
+        surveyForm: QuickSurveyFormValues
+    }
+    submitSurveyFormSuccess: (surveyForm: QuickSurveyFormValues) => {
+        surveyForm: QuickSurveyFormValues
+    }
+    touchSurveyFormField: (key: string) => {
+        key: string
+    }
+    updateAppearance: (updates: Partial<Survey['appearance']>) => {
+        updates: Partial<SurveyAppearance | null>
+    }
+    updateConditions: (updates: Partial<Survey['conditions']>) => {
+        updates: Partial<SurveyDisplayConditions | null>
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface quickSurveyFormLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        selectedEvents: (surveyForm: QuickSurveyFormValues) => string[]
+        cancelEvents: (surveyForm: QuickSurveyFormValues) => string[]
+        delaySeconds: (surveyForm: QuickSurveyFormValues) => number
+        previewSurvey: (surveyForm: QuickSurveyFormValues) => NewSurvey
+        submitDisabledReason: (
+            surveyFormErrors: DeepPartialMap<QuickSurveyFormValues, ValidationErrorType>
+        ) => string | undefined
+    }
+}
+
+export type quickSurveyFormLogicType = MakeLogicType<
+    quickSurveyFormLogicValues,
+    quickSurveyFormLogicActions,
+    QuickSurveyFormLogicProps,
+    quickSurveyFormLogicMeta
+>
+
 export const quickSurveyFormLogic = kea<quickSurveyFormLogicType>([
     path(['scenes', 'surveys', 'quickSurveyFormLogic']),
     props({} as QuickSurveyFormLogicProps),
@@ -204,21 +303,21 @@ export const quickSurveyFormLogic = kea<quickSurveyFormLogicType>([
     selectors({
         selectedEvents: [
             (s) => [s.surveyForm],
-            (surveyForm): string[] =>
+            (surveyForm: QuickSurveyFormValues): string[] =>
                 (surveyForm.conditions?.events?.values || []).map((e: { name: string }) => e.name),
         ],
         cancelEvents: [
             (s) => [s.surveyForm],
-            (surveyForm): string[] =>
+            (surveyForm: QuickSurveyFormValues): string[] =>
                 (surveyForm.conditions?.cancelEvents?.values || []).map((e: { name: string }) => e.name),
         ],
         delaySeconds: [
             (s) => [s.surveyForm],
-            (surveyForm): number => surveyForm.appearance?.surveyPopupDelaySeconds ?? 15,
+            (surveyForm: QuickSurveyFormValues): number => surveyForm.appearance?.surveyPopupDelaySeconds ?? 15,
         ],
         previewSurvey: [
             (s) => [s.surveyForm],
-            (surveyForm): NewSurvey =>
+            (surveyForm: QuickSurveyFormValues): NewSurvey =>
                 ({
                     id: 'new',
                     name: surveyForm.name,
diff --git a/frontend/src/scenes/surveys/surveyLogic.tsx b/frontend/src/scenes/surveys/surveyLogic.tsx
index 12fca03e8661..b8f1e5441932 100644
--- a/frontend/src/scenes/surveys/surveyLogic.tsx
+++ b/frontend/src/scenes/surveys/surveyLogic.tsx
@@ -1,5 +1,19 @@
-import { actions, afterMount, connect, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    afterMount,
+    connect,
+    events,
+    kea,
+    key,
+    listeners,
+    path,
+    props,
+    reducers,
+    selectors,
+} from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 import posthog from 'posthog-js'
@@ -85,6 +99,20 @@ import {
 
 import { surveysGenerateTranslationsCreate } from 'products/surveys/frontend/generated/api'
 
+import type { ProductIntentProperties } from '../../lib/utils/product-intents'
+import type {
+    AccessControlLevel,
+    BasicSurveyQuestion,
+    FeatureFlagBasicType,
+    PropertyDefinition,
+    SurveyAppearance,
+    SurveyDisplayConditions,
+    SurveyQuestionDescriptionContentType,
+    SurveyType,
+    TeamPublicType,
+    TeamType,
+    UserType,
+} from '../../types'
 import {
     LOADING_SURVEY_RESULTS_TOAST_ID,
     NEW_SURVEY,
@@ -94,9 +122,10 @@ import {
     defaultSurveyAppearance,
     defaultSurveyFieldValues,
 } from './constants'
-import type { surveyLogicType } from './surveyLogicType'
 import { getSurveyStatus, surveysLogic } from './surveysLogic'
+import type { SurveyDataState } from './surveysLogic'
 import { SurveyFeatureWarning, getSurveyWarnings } from './surveyVersionRequirements'
+import type { TeamSdkVersions } from './surveyVersionRequirements'
 import {
     DATE_FORMAT,
     type OpenEndedColumnMap,
@@ -402,7 +431,7 @@ function processRatingQuestion(
     entries: AggregateEntries
 ): ChoiceQuestionProcessedResponses {
     const scaleSize = question.scale === SURVEY_RATING_SCALE.NPS_10_POINT ? 11 : question.scale
-    const counts = new Array(scaleSize).fill(0)
+    const counts = Array<number>(scaleSize).fill(0)
     let total = 0
 
     entries.forEach(([label, count]) => {
@@ -606,6 +635,840 @@ export function mergeResponsesByQuestion(
     return merged
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface surveyLogicValues {
+    enabledFlags: FeatureFlagsSet // enabledFlagLogic
+    dataProcessingAccepted: boolean // maxGlobalLogic
+    propertyDefinitionsByType: (type: string, groupTypeIndex?: number | null) => PropertyDefinition[] // propertyDefinitionsModel
+    data: SurveyDataState // surveysLogic
+    teamSdkVersions: TeamSdkVersions // surveysLogic
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    user: UserType | null // userLogic
+    activeTab: SurveyTab
+    aiGeneratedTranslationFields: string[]
+    answerFilterHogQLExpression: string
+    answerFilters: EventPropertyFilter[]
+    archivedResponseUuids: Set<string>
+    archivedResponseUuidsLoading: boolean
+    archivedResponsesFilter: string
+    archivedResponsesPropertyFilter: Array<{
+        key: string
+        type: PropertyFilterType.HogQL
+    }>
+    breadcrumbs: Breadcrumb[]
+    compareFilter: CompareFilter
+    consolidatedSurveyResults: any
+    consolidatedSurveyResultsLoading: boolean
+    dataCollectionType: DataCollectionType
+    dataTableQuery: DataTableNode | null
+    dateRange: SurveyDateRange | null
+    defaultAnswerFilters: EventPropertyFilter[]
+    defaultInterval: IntervalType
+    derivedDataCollectionType: DataCollectionType
+    descriptionContentType: (questionIndex: number) => SurveyQuestionDescriptionContentType | undefined
+    deviceTypesMatchTypeValidationError: string | null
+    editingLanguage: string | null
+    enrichedConsolidatedSurveyResults: ConsolidatedSurveyResults
+    expandedResponseUuids: Set<string>
+    filterSurveyStatsByDistinctId: boolean
+    flagPropertyErrors: any
+    formattedOpenEndedResponses: SurveyAnalysisQuestionGroup[]
+    generatingTranslationDrafts: boolean
+    getBranchingDropdownValue: (questionIndex: number, question: SurveyQuestion) => string
+    getResponseBasedBranchingDropdownValue: (
+        questionIndex: number,
+        question: MultipleSurveyQuestion | RatingSurveyQuestion,
+        response: any
+    ) => any
+    hasActiveAnswerFilters: boolean
+    hasActiveDateRange: boolean
+    hasActiveFilters: boolean
+    hasBranchingLogic: boolean
+    hasCycle: false
+    hasTargetingSet: boolean
+    hasTranslationValidationErrors: boolean
+    interval: IntervalType | null
+    isAdaptiveLimitFFEnabled: boolean
+    isAnyResultsLoading: boolean
+    isEditingSurvey: boolean
+    isSurveyHeadlineEnabled: boolean
+    isSurveyRunning: boolean
+    isSurveySubmitting: boolean
+    isSurveyValid: boolean
+    partialResponsesFilter: string
+    personNames: Record<string, string>
+    processedSurveyStats: SurveyStats | null
+    projectTreeRef: ProjectTreeRef
+    propertyFilters: AnyPropertyFilter[]
+    resultsRequeryInProgress: boolean
+    reusableSurveyNotifications: HogFunctionType[]
+    reusableSurveyNotificationsLoading: boolean
+    selectedPageIndex: number | null
+    selectedSection: SurveyEditSection | null
+    showArchivedResponses: boolean
+    showSurveyErrors: boolean
+    showSurveyRepeatSchedule: boolean
+    sidePanelContext: SidePanelSceneContext | null
+    survey: NewSurvey | Survey
+    surveyAllErrors: Record<string, any>
+    surveyAsInsightURL: string
+    surveyBaseStats: any
+    surveyBaseStatsInternal: SurveyBaseStatsResult
+    surveyBaseStatsLoading: boolean
+    surveyChanged: boolean
+    surveyDemoData: SurveyDemoData
+    surveyDismissedAndSentCount: any
+    surveyDismissedAndSentCountInternal: DismissedAndSentCountResult
+    surveyDismissedAndSentCountLoading: boolean
+    surveyErrors: DeepPartialMap<NewSurvey | Survey, ValidationErrorType>
+    surveyHasErrors: boolean
+    surveyHeadline: {
+        has_more: boolean
+        headline: string
+        responses_sampled: number
+    } | null
+    surveyHeadlineLoading: boolean
+    surveyLoading: boolean
+    surveyManualErrors: Record<string, any>
+    surveyMissing: boolean
+    surveyNotifications: HogFunctionType[]
+    surveyNotificationsLoading: boolean
+    surveyRates: SurveyRates | null
+    surveyRepeatedActivationAvailable: boolean
+    surveyShufflingQuestionsAvailable: boolean
+    surveyTouched: boolean
+    surveyTouches: Record<string, boolean>
+    surveyUsesAdaptiveLimit: boolean
+    surveyUsesLimit: boolean
+    surveyValidationErrors: DeepPartialMap<NewSurvey | Survey, ValidationErrorType>
+    surveyWarnings: SurveyFeatureWarning[]
+    targetingFlagFilters: FeatureFlagFilters | undefined
+    timestampFilter: string
+    translationErrorsByQuestion: (questionIndex: number) => TranslationValidationError[]
+    translationErrorsForField: (questionIndex: number, fieldPath: string) => TranslationValidationError | undefined
+    translationValidationErrors: TranslationValidationError[]
+    urlMatchTypeValidationError: string | null
+    urlSearchParams: {
+        answerFilters: string | undefined
+        date_from: string | undefined
+        date_to: string | undefined
+        propertyFilters: string | undefined
+    }
+    writingHTMLDescription: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface surveyLogicActions {
+    reportSurveyArchived: (survey: Survey) => {
+        survey: Survey
+    } // eventUsageLogic
+    reportSurveyConsolidatedResultsQuery: (
+        survey: Survey,
+        totalDurationMs: number,
+        queryDurations: {
+            aggregate: number
+            openEnded: number
+        }
+    ) => {
+        queryDurations: {
+            aggregate: number
+            openEnded: number
+        }
+        survey: Survey
+        totalDurationMs: number
+    } // eventUsageLogic
+    reportSurveyCreated: (
+        survey: Survey,
+        isDuplicate?: boolean | undefined,
+        creationSource?:
+            | 'form_builder'
+            | 'full_editor'
+            | 'llm_analytics'
+            | 'quick_create'
+            | 'template'
+            | 'wizard'
+            | undefined
+    ) => {
+        creationSource:
+            | 'form_builder'
+            | 'full_editor'
+            | 'llm_analytics'
+            | 'quick_create'
+            | 'template'
+            | 'wizard'
+            | undefined
+        isDuplicate: boolean | undefined
+        survey: Survey
+    } // eventUsageLogic
+    reportSurveyCycleDetected: (survey: NewSurvey | Survey) => {
+        survey: NewSurvey | Survey
+    } // eventUsageLogic
+    reportSurveyEdited: (survey: Survey) => {
+        survey: Survey
+    } // eventUsageLogic
+    reportSurveyViewed: (survey: Survey) => {
+        survey: Survey
+    } // eventUsageLogic
+    loadSurveys: () => any // surveysLogic
+    addProductIntent: (properties: ProductIntentProperties) => ProductIntentProperties // teamLogic
+    archiveResponse: (responseUuid: string) => {
+        responseUuid: string
+    }
+    archiveSurvey: () => {
+        value: true
+    }
+    clearAiGeneratedTranslationField: (path: string) => {
+        path: string
+    }
+    clearFilters: () => {
+        value: true
+    }
+    createSurvey: (surveyPayload: Partial<Survey>) => Partial<Survey>
+    createSurveyFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    createSurveySuccess: (
+        survey: Survey,
+        payload?: Partial<Survey>
+    ) => {
+        survey: Survey
+        payload?: Partial<Survey>
+    }
+    deleteBranchingLogic: () => {
+        value: true
+    }
+    deleteSurveyNotification: (notification: HogFunctionType) => {
+        notification: HogFunctionType
+    }
+    editingSurvey: (editing: boolean) => {
+        editing: boolean
+    }
+    generateTranslationDrafts: (
+        language: string,
+        overwrite?: boolean
+    ) => {
+        language: string
+        overwrite: boolean
+    }
+    launchSurvey: () => any
+    launchSurveyFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    launchSurveySuccess: (
+        survey: Survey,
+        payload?: any
+    ) => {
+        survey: Survey
+        payload?: any
+    }
+    loadArchivedResponseUuids: () => any
+    loadArchivedResponseUuidsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadArchivedResponseUuidsSuccess: (
+        archivedResponseUuids: Set<string>,
+        payload?: any
+    ) => {
+        archivedResponseUuids: Set<string>
+        payload?: any
+    }
+    loadConsolidatedSurveyResults: () => any
+    loadConsolidatedSurveyResultsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadConsolidatedSurveyResultsSuccess: (
+        consolidatedSurveyResults: ConsolidatedSurveyResults,
+        payload?: any
+    ) => {
+        consolidatedSurveyResults: ConsolidatedSurveyResults
+        payload?: any
+    }
+    loadReusableSurveyNotifications: () => any
+    loadReusableSurveyNotificationsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadReusableSurveyNotificationsSuccess: (
+        reusableSurveyNotifications: HogFunctionType[],
+        payload?: any
+    ) => {
+        reusableSurveyNotifications: HogFunctionType[]
+        payload?: any
+    }
+    loadSurvey: () => any
+    loadSurveyBaseStats: () => any
+    loadSurveyBaseStatsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSurveyBaseStatsSuccess: (
+        surveyBaseStats: SurveyBaseStatsResult,
+        payload?: any
+    ) => {
+        surveyBaseStats: SurveyBaseStatsResult
+        payload?: any
+    }
+    loadSurveyDismissedAndSentCount: () => any
+    loadSurveyDismissedAndSentCountFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSurveyDismissedAndSentCountSuccess: (
+        surveyDismissedAndSentCount: DismissedAndSentCountResult,
+        payload?: any
+    ) => {
+        surveyDismissedAndSentCount: DismissedAndSentCountResult
+        payload?: any
+    }
+    loadSurveyFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSurveyHeadline: (forceRefresh?: boolean) => boolean
+    loadSurveyHeadlineFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSurveyHeadlineSuccess: (
+        surveyHeadline: {
+            has_more: boolean
+            headline: string
+            responses_sampled: number
+        } | null,
+        payload?: boolean
+    ) => {
+        surveyHeadline: {
+            has_more: boolean
+            headline: string
+            responses_sampled: number
+        } | null
+        payload?: boolean
+    }
+    loadSurveyNotifications: () => any
+    loadSurveyNotificationsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSurveyNotificationsSuccess: (
+        surveyNotifications: HogFunctionType[],
+        payload?: any
+    ) => {
+        surveyNotifications: HogFunctionType[]
+        payload?: any
+    }
+    loadSurveySuccess: (
+        survey:
+            | Survey
+            | {
+                  appearance: SurveyAppearance | null
+                  archived: boolean
+                  base_language?: string | null | undefined
+                  conditions: SurveyDisplayConditions | null
+                  current_iteration?: number | null | undefined
+                  description: string
+                  enable_iframe_embedding?: boolean | null | undefined
+                  enable_partial_responses?: boolean | null | undefined
+                  end_date: string | null
+                  form_content?: Record<string, unknown> | null | undefined
+                  headline_response_count?: number | null | undefined
+                  headline_summary?: string | null | undefined
+                  id: 'new'
+                  iteration_count?: number | null | undefined
+                  iteration_frequency_days?: number | null | undefined
+                  iteration_start_dates?: string[] | undefined
+                  linked_flag: FeatureFlagBasicType | null
+                  linked_flag_id: number | null
+                  name: string
+                  questions: (
+                      | BasicSurveyQuestion
+                      | LinkSurveyQuestion
+                      | MultipleSurveyQuestion
+                      | RatingSurveyQuestion
+                  )[]
+                  response_sampling_interval?: number | null | undefined
+                  response_sampling_interval_type?: string | null | undefined
+                  response_sampling_limit?: number | null | undefined
+                  response_sampling_start_date?: string | null | undefined
+                  responses_limit: number | null
+                  schedule?: SurveySchedule | null | undefined
+                  start_date: string | null
+                  targeting_flag: FeatureFlagBasicType | null
+                  targeting_flag_filters?: FeatureFlagFilters | undefined
+                  translations?:
+                      | Record<
+                            string,
+                            {
+                                backButtonText?: string | undefined
+                                name?: string | undefined
+                                submitButtonText?: string | undefined
+                                thankYouMessageCloseButtonText?: string | undefined
+                                thankYouMessageDescription?: string | undefined
+                                thankYouMessageHeader?: string | undefined
+                            }
+                        >
+                      | null
+                      | undefined
+                  type: SurveyType
+                  user_access_level: AccessControlLevel
+              },
+        payload?: any
+    ) => {
+        survey:
+            | Survey
+            | {
+                  appearance: SurveyAppearance | null
+                  archived: boolean
+                  base_language?: string | null | undefined
+                  conditions: SurveyDisplayConditions | null
+                  current_iteration?: number | null | undefined
+                  description: string
+                  enable_iframe_embedding?: boolean | null | undefined
+                  enable_partial_responses?: boolean | null | undefined
+                  end_date: string | null
+                  form_content?: Record<string, unknown> | null | undefined
+                  headline_response_count?: number | null | undefined
+                  headline_summary?: string | null | undefined
+                  id: 'new'
+                  iteration_count?: number | null | undefined
+                  iteration_frequency_days?: number | null | undefined
+                  iteration_start_dates?: string[] | undefined
+                  linked_flag: FeatureFlagBasicType | null
+                  linked_flag_id: number | null
+                  name: string
+                  questions: (
+                      | BasicSurveyQuestion
+                      | LinkSurveyQuestion
+                      | MultipleSurveyQuestion
+                      | RatingSurveyQuestion
+                  )[]
+                  response_sampling_interval?: number | null | undefined
+                  response_sampling_interval_type?: string | null | undefined
+                  response_sampling_limit?: number | null | undefined
+                  response_sampling_start_date?: string | null | undefined
+                  responses_limit: number | null
+                  schedule?: SurveySchedule | null | undefined
+                  start_date: string | null
+                  targeting_flag: FeatureFlagBasicType | null
+                  targeting_flag_filters?: FeatureFlagFilters | undefined
+                  translations?:
+                      | Record<
+                            string,
+                            {
+                                backButtonText?: string | undefined
+                                name?: string | undefined
+                                submitButtonText?: string | undefined
+                                thankYouMessageCloseButtonText?: string | undefined
+                                thankYouMessageDescription?: string | undefined
+                                thankYouMessageHeader?: string | undefined
+                            }
+                        >
+                      | null
+                      | undefined
+                  type: SurveyType
+                  user_access_level: AccessControlLevel
+              }
+        payload?: any
+    }
+    markResultsRequeryCompleted: () => {
+        value: true
+    }
+    moveQuestion: (
+        oldIndex: number,
+        newIndex: number
+    ) => {
+        newIndex: number
+        oldIndex: number
+    }
+    removeQuestion: (questionIndex: number) => {
+        questionIndex: number
+    }
+    resetBranchingForQuestion: (questionIndex: any) => {
+        questionIndex: any
+    }
+    resetSurvey: (values?: NewSurvey | Survey) => {
+        values?: NewSurvey | Survey
+    }
+    resetSurveyAdaptiveSampling: () => {
+        value: true
+    }
+    resetSurveyResponseLimits: () => {
+        value: true
+    }
+    resetTargeting: () => {
+        value: true
+    }
+    resumeSurvey: () => any
+    resumeSurveyFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    resumeSurveySuccess: (
+        survey: Survey,
+        payload?: any
+    ) => {
+        survey: Survey
+        payload?: any
+    }
+    setActiveTab: (tab: SurveyTab) => {
+        tab: SurveyTab
+    }
+    setAiGeneratedTranslationFields: (paths: string[]) => {
+        paths: string[]
+    }
+    setAnswerFilters: (
+        filters: EventPropertyFilter[],
+        reloadResults?: boolean
+    ) => {
+        filters: EventPropertyFilter[]
+        reloadResults: boolean
+    }
+    setBaseStatsResults: (results: SurveyBaseStatsResult) => {
+        results: SurveyBaseStatsResult
+    }
+    setCompareFilter: (compareFilter: CompareFilter) => {
+        compareFilter: CompareFilter
+    }
+    setDataCollectionType: (dataCollectionType: DataCollectionType) => {
+        dataCollectionType: DataCollectionType
+    }
+    setDateRange: (
+        dateRange: SurveyDateRange,
+        reloadResults?: boolean
+    ) => {
+        dateRange: SurveyDateRange
+        reloadResults: boolean
+    }
+    setDefaultForQuestionType: (
+        idx: number,
+        surveyQuestion: SurveyQuestion,
+        type: SurveyQuestionType
+    ) => {
+        idx: number
+        surveyQuestion: SurveyQuestion
+        type: SurveyQuestionType
+    }
+    setDismissedAndSentCount: (count: DismissedAndSentCountResult) => {
+        count: DismissedAndSentCountResult
+    }
+    setEditingLanguage: (language: string | null) => {
+        language: string | null
+    }
+    setFilterSurveyStatsByDistinctId: (filterByDistinctId: boolean) => {
+        filterByDistinctId: boolean
+    }
+    setFlagPropertyErrors: (errors: any) => {
+        errors: any
+    }
+    setGeneratingTranslationDrafts: (generating: boolean) => {
+        generating: boolean
+    }
+    setInterval: (interval: IntervalType) => {
+        interval: IntervalType
+    }
+    setMultipleSurveyQuestion: (
+        questionIndex: number,
+        question: MultipleSurveyQuestion,
+        type: SurveyQuestionType.MultipleChoice | SurveyQuestionType.SingleChoice
+    ) => {
+        question: MultipleSurveyQuestion
+        questionIndex: number
+        type: SurveyQuestionType.MultipleChoice | SurveyQuestionType.SingleChoice
+    }
+    setPersonNames: (personNames: Record<string, string>) => {
+        personNames: Record<string, string>
+    }
+    setPropertyFilters: (
+        propertyFilters: AnyPropertyFilter[],
+        reloadResults?: boolean
+    ) => {
+        propertyFilters: AnyPropertyFilter[]
+        reloadResults: boolean
+    }
+    setQuestionBranchingType: (
+        questionIndex: any,
+        type: any,
+        specificQuestionIndex: any
+    ) => {
+        questionIndex: any
+        specificQuestionIndex: any
+        type: any
+    }
+    setResponseBasedBranchingForQuestion: (
+        questionIndex: any,
+        responseValue: any,
+        nextStep: any,
+        specificQuestionIndex: any
+    ) => {
+        nextStep: any
+        questionIndex: any
+        responseValue: any
+        specificQuestionIndex: any
+    }
+    setResponseExpanded: (
+        uuid: string,
+        expanded: boolean
+    ) => {
+        expanded: boolean
+        uuid: string
+    }
+    setSelectedPageIndex: (idx: number | null) => {
+        idx: number | null
+    }
+    setSelectedSection: (section: SurveyEditSection | null) => {
+        section: SurveyEditSection | null
+    }
+    setShowArchivedResponses: (show: boolean) => {
+        show: boolean
+    }
+    setSurveyManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setSurveyMissing: () => {
+        value: true
+    }
+    setSurveyValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setSurveyValues: (values: DeepPartial<NewSurvey | Survey>) => {
+        values: DeepPartial<NewSurvey | Survey>
+    }
+    setWritingHTMLDescription: (writingHTML: boolean) => {
+        writingHTML: boolean
+    }
+    startResultsRequery: () => {
+        value: true
+    }
+    stopSurvey: () => any
+    stopSurveyFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    stopSurveySuccess: (
+        survey: Survey,
+        payload?: any
+    ) => {
+        survey: Survey
+        payload?: any
+    }
+    submitSurvey: () => {
+        value: boolean
+    }
+    submitSurveyFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitSurveyRequest: (survey: NewSurvey | Survey) => {
+        survey: NewSurvey | Survey
+    }
+    submitSurveySuccess: (survey: NewSurvey | Survey) => {
+        survey: NewSurvey | Survey
+    }
+    toggleResponseExpansion: (uuid: string) => {
+        uuid: string
+    }
+    toggleSurveyNotificationEnabled: (
+        notificationId: string,
+        enabled: boolean
+    ) => {
+        enabled: boolean
+        notificationId: string
+    }
+    touchSurveyField: (key: string) => {
+        key: string
+    }
+    unarchiveResponse: (responseUuid: string) => {
+        responseUuid: string
+    }
+    updateSurvey: (
+        surveyPayload: Partial<Survey> & {
+            intentContext?: ProductIntentContext
+        }
+    ) => Partial<Survey> & {
+        intentContext?: ProductIntentContext
+    }
+    updateSurveyFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateSurveySuccess: (
+        survey: Survey,
+        payload?: Partial<Survey> & {
+            intentContext?: ProductIntentContext
+        }
+    ) => {
+        survey: Survey
+        payload?: Partial<Survey> & {
+            intentContext?: ProductIntentContext
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface surveyLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        enrichedConsolidatedSurveyResults: (
+            consolidatedSurveyResults: any,
+            personNames: Record<string, string>
+        ) => ConsolidatedSurveyResults
+        timestampFilter: (survey: NewSurvey | Survey, dateRange: SurveyDateRange | null) => string
+        partialResponsesFilter: (survey: NewSurvey | Survey, dateRange: SurveyDateRange | null) => string
+        archivedResponsesFilter: (showArchivedResponses: boolean, archivedResponseUuids: Set<string>) => string
+        archivedResponsesPropertyFilter: (
+            showArchivedResponses: boolean,
+            archivedResponseUuids: Set<string>
+        ) => Array<{
+            key: string
+            type: PropertyFilterType.HogQL
+        }>
+        isAdaptiveLimitFFEnabled: (enabledFlags: FeatureFlagsSet) => boolean
+        isSurveyHeadlineEnabled: (enabledFlags: FeatureFlagsSet) => boolean
+        isAnyResultsLoading: (
+            archivedResponseUuidsLoading: boolean,
+            surveyBaseStatsLoading: boolean,
+            surveyDismissedAndSentCountLoading: boolean,
+            consolidatedSurveyResultsLoading: boolean
+        ) => boolean
+        defaultAnswerFilters: (survey: NewSurvey | Survey) => EventPropertyFilter[]
+        hasActiveAnswerFilters: (answerFilters: EventPropertyFilter[]) => boolean
+        hasActiveDateRange: (dateRange: SurveyDateRange | null, survey: NewSurvey | Survey) => boolean
+        hasActiveFilters: (
+            hasActiveAnswerFilters: boolean,
+            propertyFilters: AnyPropertyFilter[],
+            hasActiveDateRange: boolean
+        ) => boolean
+        isSurveyRunning: (survey: NewSurvey | Survey) => boolean
+        surveyUsesLimit: (survey: NewSurvey | Survey) => boolean
+        surveyUsesAdaptiveLimit: (survey: NewSurvey | Survey) => boolean
+        derivedDataCollectionType: (
+            surveyUsesAdaptiveLimit: boolean,
+            surveyUsesLimit: boolean,
+            isAdaptiveLimitFFEnabled: boolean
+        ) => DataCollectionType
+        surveyShufflingQuestionsAvailable: (survey: NewSurvey | Survey) => boolean
+        showSurveyRepeatSchedule: (survey: NewSurvey | Survey) => boolean
+        descriptionContentType: (
+            survey: NewSurvey | Survey
+        ) => (questionIndex: number) => SurveyQuestionDescriptionContentType | undefined
+        surveyRepeatedActivationAvailable: (survey: NewSurvey | Survey) => boolean
+        hasTargetingSet: (survey: NewSurvey | Survey) => boolean
+        breadcrumbs: (survey: NewSurvey | Survey) => Breadcrumb[]
+        sidePanelContext: (survey: NewSurvey | Survey) => SidePanelSceneContext | null
+        projectTreeRef: (arg: string) => ProjectTreeRef
+        answerFilterHogQLExpression: (survey: NewSurvey | Survey, answerFilters: EventPropertyFilter[]) => string
+        dataTableQuery: (
+            survey: NewSurvey | Survey,
+            propertyFilters: AnyPropertyFilter[],
+            answerFilterHogQLExpression: string,
+            partialResponsesFilter: string,
+            archivedResponsesFilter: string,
+            dateRange: SurveyDateRange | null,
+            archivedResponseUuids: Set<string>,
+            showArchivedResponses: boolean
+        ) => DataTableNode | null
+        targetingFlagFilters: (survey: NewSurvey | Survey) => FeatureFlagFilters | undefined
+        urlMatchTypeValidationError: (survey: NewSurvey | Survey) => string | null
+        urlSearchParams: (
+            propertyFilters: AnyPropertyFilter[],
+            answerFilters: EventPropertyFilter[],
+            dateRange: SurveyDateRange | null,
+            survey: NewSurvey | Survey
+        ) => {
+            answerFilters: string | undefined
+            date_from: string | undefined
+            date_to: string | undefined
+            propertyFilters: string | undefined
+        }
+        deviceTypesMatchTypeValidationError: (survey: NewSurvey | Survey) => string | null
+        getBranchingDropdownValue: (
+            survey: NewSurvey | Survey
+        ) => (questionIndex: number, question: SurveyQuestion) => string
+        getResponseBasedBranchingDropdownValue: (
+            survey: NewSurvey | Survey
+        ) => (questionIndex: number, question: MultipleSurveyQuestion | RatingSurveyQuestion, response: any) => any
+        hasCycle: (survey: NewSurvey | Survey) => false
+        hasBranchingLogic: (survey: NewSurvey | Survey) => boolean
+        translationValidationErrors: (survey: NewSurvey | Survey) => TranslationValidationError[]
+        hasTranslationValidationErrors: (translationValidationErrors: TranslationValidationError[]) => boolean
+        translationErrorsByQuestion: (
+            translationValidationErrors: TranslationValidationError[],
+            editingLanguage: string | null
+        ) => (questionIndex: number) => TranslationValidationError[]
+        translationErrorsForField: (
+            translationValidationErrors: TranslationValidationError[],
+            editingLanguage: string | null
+        ) => (questionIndex: number, fieldPath: string) => TranslationValidationError | undefined
+        surveyAsInsightURL: (survey: NewSurvey | Survey) => string
+        defaultInterval: (survey: NewSurvey | Survey) => IntervalType
+        processedSurveyStats: (
+            surveyBaseStatsInternal: SurveyBaseStatsResult,
+            surveyDismissedAndSentCountInternal: DismissedAndSentCountResult
+        ) => SurveyStats | null
+        surveyRates: (processedSurveyStats: SurveyStats | null) => SurveyRates | null
+        surveyDemoData: (survey: NewSurvey | Survey) => SurveyDemoData
+        formattedOpenEndedResponses: (
+            enrichedConsolidatedSurveyResults: ConsolidatedSurveyResults,
+            survey: NewSurvey | Survey
+        ) => SurveyAnalysisQuestionGroup[]
+        surveyWarnings: (
+            survey: NewSurvey | Survey,
+            teamSdkVersions: Partial<Record<import('./surveyVersionRequirements').SurveySdkType, string | null>>
+        ) => SurveyFeatureWarning[]
+    }
+}
+
+export type surveyLogicType = MakeLogicType<surveyLogicValues, surveyLogicActions, SurveyLogicProps, surveyLogicMeta>
+
 export const surveyLogic = kea<surveyLogicType>([
     props({} as SurveyLogicProps),
     key(({ id }) => id),
@@ -2198,7 +3061,7 @@ export const surveyLogic = kea<surveyLogicType>([
         ],
         projectTreeRef: [
             () => [(_, props: SurveyLogicProps) => props.id],
-            (id): ProjectTreeRef => {
+            (id: string): ProjectTreeRef => {
                 return { type: 'survey', ref: id === 'new' ? null : String(id) }
             },
         ],
@@ -2291,7 +3154,7 @@ export const surveyLogic = kea<surveyLogicType>([
         ],
         targetingFlagFilters: [
             (s) => [s.survey],
-            (survey): FeatureFlagFilters | undefined => {
+            (survey: NewSurvey | Survey): FeatureFlagFilters | undefined => {
                 if (survey.targeting_flag_filters) {
                     return {
                         ...survey.targeting_flag_filters,
@@ -2306,7 +3169,7 @@ export const surveyLogic = kea<surveyLogicType>([
         ],
         urlMatchTypeValidationError: [
             (s) => [s.survey],
-            (survey): string | null => {
+            (survey: NewSurvey | Survey): string | null => {
                 if (
                     survey.conditions?.url &&
                     [SurveyMatchType.Regex, SurveyMatchType.NotRegex].includes(
@@ -2374,7 +3237,7 @@ export const surveyLogic = kea<surveyLogicType>([
         ],
         getBranchingDropdownValue: [
             (s) => [s.survey],
-            (survey) => (questionIndex: number, question: SurveyQuestion) => {
+            (survey: NewSurvey | Survey) => (questionIndex: number, question: SurveyQuestion) => {
                 if (question.branching?.type) {
                     const { type } = question.branching
 
@@ -2392,33 +3255,34 @@ export const surveyLogic = kea<surveyLogicType>([
         ],
         getResponseBasedBranchingDropdownValue: [
             (s) => [s.survey],
-            (survey) => (questionIndex: number, question: RatingSurveyQuestion | MultipleSurveyQuestion, response) => {
-                if (!question.branching || !('responseValues' in question.branching)) {
-                    return SurveyQuestionBranchingType.NextQuestion
-                }
+            (survey: NewSurvey | Survey) =>
+                (questionIndex: number, question: RatingSurveyQuestion | MultipleSurveyQuestion, response) => {
+                    if (!question.branching || !('responseValues' in question.branching)) {
+                        return SurveyQuestionBranchingType.NextQuestion
+                    }
 
-                // If a value is mapped onto an integer, we're redirecting to a specific question
-                if (Number.isInteger(question.branching.responseValues[response])) {
-                    const nextQuestionIndex = question.branching.responseValues[response]
-                    return `${SurveyQuestionBranchingType.SpecificQuestion}:${nextQuestionIndex}`
-                }
+                    // If a value is mapped onto an integer, we're redirecting to a specific question
+                    if (Number.isInteger(question.branching.responseValues[response])) {
+                        const nextQuestionIndex = question.branching.responseValues[response]
+                        return `${SurveyQuestionBranchingType.SpecificQuestion}:${nextQuestionIndex}`
+                    }
 
-                // If any other value is present (practically only Confirmation message), return that value
-                if (question.branching?.responseValues?.[response]) {
-                    return question.branching.responseValues[response]
-                }
+                    // If any other value is present (practically only Confirmation message), return that value
+                    if (question.branching?.responseValues?.[response]) {
+                        return question.branching.responseValues[response]
+                    }
 
-                // No branching specified, default to Next question / Confirmation message
-                if (questionIndex < survey.questions.length - 1) {
-                    return SurveyQuestionBranchingType.NextQuestion
-                }
+                    // No branching specified, default to Next question / Confirmation message
+                    if (questionIndex < survey.questions.length - 1) {
+                        return SurveyQuestionBranchingType.NextQuestion
+                    }
 
-                return SurveyQuestionBranchingType.End
-            },
+                    return SurveyQuestionBranchingType.End
+                },
         ],
         hasCycle: [
             (s) => [s.survey],
-            (survey) => {
+            (survey: NewSurvey | Survey) => {
                 const graph = new Map()
                 survey.questions.forEach((question, fromIndex: number) => {
                     if (!graph.has(fromIndex)) {
@@ -2473,12 +3337,12 @@ export const surveyLogic = kea<surveyLogicType>([
         ],
         hasBranchingLogic: [
             (s) => [s.survey],
-            (survey) =>
+            (survey: NewSurvey | Survey) =>
                 survey.questions.some((question) => question.branching && Object.keys(question.branching).length > 0),
         ],
         translationValidationErrors: [
             (s) => [s.survey],
-            (survey): TranslationValidationError[] => {
+            (survey: NewSurvey | Survey): TranslationValidationError[] => {
                 const errors: TranslationValidationError[] = []
                 const surveyLevelFieldChecks: TranslationFieldCheck<SurveyTranslationField>[] = [
                     { key: 'name', defaultValue: survey.name },
@@ -2752,7 +3616,7 @@ export const surveyLogic = kea<surveyLogicType>([
         ],
         hasTranslationValidationErrors: [
             (s) => [s.translationValidationErrors],
-            (errors): boolean => errors.length > 0,
+            (errors: TranslationValidationError[]): boolean => errors.length > 0,
         ],
         translationErrorsByQuestion: [
             (s) => [s.translationValidationErrors, s.editingLanguage],
@@ -2783,7 +3647,7 @@ export const surveyLogic = kea<surveyLogicType>([
         ],
         surveyAsInsightURL: [
             (s) => [s.survey],
-            (survey) => {
+            (survey: NewSurvey | Survey) => {
                 const query: InsightVizNode = {
                     kind: NodeKind.InsightVizNode,
                     source: {
@@ -2999,7 +3863,10 @@ export const surveyLogic = kea<surveyLogicType>([
         ],
         surveyWarnings: [
             (s) => [s.survey, s.teamSdkVersions],
-            (survey, teamSdkVersions): SurveyFeatureWarning[] => {
+            (
+                survey: NewSurvey | Survey,
+                teamSdkVersions: import('./surveyVersionRequirements').TeamSdkVersions
+            ): SurveyFeatureWarning[] => {
                 return getSurveyWarnings(survey as Survey, teamSdkVersions)
             },
         ],
diff --git a/frontend/src/scenes/surveys/surveyNotificationModalLogic.ts b/frontend/src/scenes/surveys/surveyNotificationModalLogic.ts
index 33ddcecad2e5..940e54a3b97d 100644
--- a/frontend/src/scenes/surveys/surveyNotificationModalLogic.ts
+++ b/frontend/src/scenes/surveys/surveyNotificationModalLogic.ts
@@ -1,5 +1,6 @@
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 
@@ -47,7 +48,20 @@ import {
     SurveyQuestionType,
 } from '~/types'
 
-import type { surveyNotificationModalLogicType } from './surveyNotificationModalLogicType'
+import type {
+    AccessControlLevel,
+    BasicSurveyQuestion,
+    FeatureFlagBasicType,
+    FeatureFlagFilters,
+    LinkSurveyQuestion,
+    MultipleSurveyQuestion,
+    RatingSurveyQuestion,
+    SurveyAppearance,
+    SurveyDisplayConditions,
+    SurveySchedule,
+    SurveyType,
+} from '../../types'
+import type { NewSurvey } from './constants'
 
 export const WEBHOOK_METHOD_OPTIONS = [
     { value: 'POST', label: 'POST' },
@@ -846,6 +860,286 @@ function getNotificationFormErrors(
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface surveyNotificationModalLogicValues {
+    integrations: IntegrationType[] | null // integrationsLogic
+    survey: NewSurvey | Survey // surveyLogic
+    surveyLoading: boolean // surveyLogic
+    surveyNotifications: HogFunctionType[] // surveyLogic
+    surveyNotificationsLoading: boolean // surveyLogic
+    copiedNotification: HogFunctionType | null
+    editingNotification: HogFunctionType | null
+    hasSlackIntegration: boolean
+    isNotificationFormSubmitting: boolean
+    isNotificationFormValid: boolean
+    isOpen: boolean
+    lastResponseEventQuery: EventsQuery | null
+    notificationForm: SurveyNotificationForm
+    notificationFormAllErrors: Record<string, any>
+    notificationFormChanged: boolean
+    notificationFormErrors: DeepPartialMap<SurveyNotificationForm, ValidationErrorType>
+    notificationFormHasErrors: boolean
+    notificationFormManualErrors: Record<string, any>
+    notificationFormTouched: boolean
+    notificationFormTouches: Record<string, boolean>
+    notificationFormValidationErrors: DeepPartialMap<SurveyNotificationForm, ValidationErrorType>
+    notificationSubmissionError: string | null
+    pendingDeepLink: string | null
+    selectedSlackIntegration: IntegrationType | null
+    showNotificationFormErrors: boolean
+    submitDisabledReason: string | undefined
+    templateGlobals: CyclotronJobInvocationGlobals
+    testResult: CyclotronJobTestInvocationResult | null
+    testResultError: string | null
+    testResultLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface surveyNotificationModalLogicActions {
+    loadSurveyNotifications: () => any // surveyLogic
+    loadSurveyNotificationsSuccess: (
+        surveyNotifications: HogFunctionType[],
+        payload?: any
+    ) => {
+        payload?: any
+        surveyNotifications: HogFunctionType[]
+    } // surveyLogic
+    loadSurveySuccess: (
+        survey:
+            | Survey
+            | {
+                  appearance: SurveyAppearance | null
+                  archived: boolean
+                  base_language?: string | null | undefined
+                  conditions: SurveyDisplayConditions | null
+                  current_iteration?: number | null | undefined
+                  description: string
+                  enable_iframe_embedding?: boolean | null | undefined
+                  enable_partial_responses?: boolean | null | undefined
+                  end_date: string | null
+                  form_content?: Record<string, unknown> | null | undefined
+                  headline_response_count?: number | null | undefined
+                  headline_summary?: string | null | undefined
+                  id: 'new'
+                  iteration_count?: number | null | undefined
+                  iteration_frequency_days?: number | null | undefined
+                  iteration_start_dates?: string[] | undefined
+                  linked_flag: FeatureFlagBasicType | null
+                  linked_flag_id: number | null
+                  name: string
+                  questions: (
+                      | BasicSurveyQuestion
+                      | LinkSurveyQuestion
+                      | MultipleSurveyQuestion
+                      | RatingSurveyQuestion
+                  )[]
+                  response_sampling_interval?: number | null | undefined
+                  response_sampling_interval_type?: string | null | undefined
+                  response_sampling_limit?: number | null | undefined
+                  response_sampling_start_date?: string | null | undefined
+                  responses_limit: number | null
+                  schedule?: SurveySchedule | null | undefined
+                  start_date: string | null
+                  targeting_flag: FeatureFlagBasicType | null
+                  targeting_flag_filters?: FeatureFlagFilters | undefined
+                  translations?:
+                      | Record<
+                            string,
+                            {
+                                backButtonText?: string | undefined
+                                name?: string | undefined
+                                submitButtonText?: string | undefined
+                                thankYouMessageCloseButtonText?: string | undefined
+                                thankYouMessageDescription?: string | undefined
+                                thankYouMessageHeader?: string | undefined
+                            }
+                        >
+                      | null
+                      | undefined
+                  type: SurveyType
+                  user_access_level: AccessControlLevel
+              },
+        payload?: any
+    ) => {
+        payload?: any
+        survey:
+            | Survey
+            | {
+                  appearance: SurveyAppearance | null
+                  archived: boolean
+                  base_language?: string | null | undefined
+                  conditions: SurveyDisplayConditions | null
+                  current_iteration?: number | null | undefined
+                  description: string
+                  enable_iframe_embedding?: boolean | null | undefined
+                  enable_partial_responses?: boolean | null | undefined
+                  end_date: string | null
+                  form_content?: Record<string, unknown> | null | undefined
+                  headline_response_count?: number | null | undefined
+                  headline_summary?: string | null | undefined
+                  id: 'new'
+                  iteration_count?: number | null | undefined
+                  iteration_frequency_days?: number | null | undefined
+                  iteration_start_dates?: string[] | undefined
+                  linked_flag: FeatureFlagBasicType | null
+                  linked_flag_id: number | null
+                  name: string
+                  questions: (
+                      | BasicSurveyQuestion
+                      | LinkSurveyQuestion
+                      | MultipleSurveyQuestion
+                      | RatingSurveyQuestion
+                  )[]
+                  response_sampling_interval?: number | null | undefined
+                  response_sampling_interval_type?: string | null | undefined
+                  response_sampling_limit?: number | null | undefined
+                  response_sampling_start_date?: string | null | undefined
+                  responses_limit: number | null
+                  schedule?: SurveySchedule | null | undefined
+                  start_date: string | null
+                  targeting_flag: FeatureFlagBasicType | null
+                  targeting_flag_filters?: FeatureFlagFilters | undefined
+                  translations?:
+                      | Record<
+                            string,
+                            {
+                                backButtonText?: string | undefined
+                                name?: string | undefined
+                                submitButtonText?: string | undefined
+                                thankYouMessageCloseButtonText?: string | undefined
+                                thankYouMessageDescription?: string | undefined
+                                thankYouMessageHeader?: string | undefined
+                            }
+                        >
+                      | null
+                      | undefined
+                  type: SurveyType
+                  user_access_level: AccessControlLevel
+              }
+    } // surveyLogic
+    clearTestResult: () => {
+        value: true
+    }
+    clearTestResultFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    clearTestResultSuccess: (
+        testResult: null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        testResult: null
+        payload?: {
+            value: true
+        }
+    }
+    closeDialog: () => {
+        value: true
+    }
+    consumePendingDeepLink: () => {
+        value: true
+    }
+    openDialog: (payload?: OpenSurveyNotificationDialogPayload) => {
+        intent: SurveyNotificationModalIntent
+        notification: HogFunctionType | null
+    }
+    resetNotificationForm: (values?: SurveyNotificationForm) => {
+        values?: SurveyNotificationForm
+    }
+    sendTestNotification: (payload: { source: SurveyNotificationTestSource }) => {
+        source: SurveyNotificationTestSource
+    }
+    sendTestNotificationFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    sendTestNotificationSuccess: (
+        testResult: CyclotronJobTestInvocationResult,
+        payload?: {
+            source: SurveyNotificationTestSource
+        }
+    ) => {
+        testResult: CyclotronJobTestInvocationResult
+        payload?: {
+            source: SurveyNotificationTestSource
+        }
+    }
+    setNotificationFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setNotificationFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setNotificationFormValues: (values: DeepPartial<SurveyNotificationForm>) => {
+        values: DeepPartial<SurveyNotificationForm>
+    }
+    setNotificationSubmissionError: (error: string | null) => {
+        error: string | null
+    }
+    setPendingDeepLink: (target: string | null) => {
+        target: string | null
+    }
+    submitNotificationForm: () => {
+        value: boolean
+    }
+    submitNotificationFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitNotificationFormRequest: (notificationForm: SurveyNotificationForm) => {
+        notificationForm: SurveyNotificationForm
+    }
+    submitNotificationFormSuccess: (notificationForm: SurveyNotificationForm) => {
+        notificationForm: SurveyNotificationForm
+    }
+    touchNotificationFormField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface surveyNotificationModalLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        hasSlackIntegration: (integrations: IntegrationType[] | null) => boolean
+        selectedSlackIntegration: (
+            integrations: IntegrationType[] | null,
+            notificationForm: SurveyNotificationForm
+        ) => IntegrationType | null
+        templateGlobals: (survey: NewSurvey | Survey) => CyclotronJobInvocationGlobals
+        lastResponseEventQuery: (survey: NewSurvey | Survey) => EventsQuery | null
+        submitDisabledReason: (
+            survey: NewSurvey | Survey,
+            notificationFormErrors: DeepPartialMap<SurveyNotificationForm, ValidationErrorType>,
+            isNotificationFormSubmitting: boolean,
+            editingNotification: HogFunctionType | null,
+            copiedNotification: HogFunctionType | null
+        ) => string | undefined
+    }
+}
+
+export type surveyNotificationModalLogicType = MakeLogicType<
+    surveyNotificationModalLogicValues,
+    surveyNotificationModalLogicActions,
+    SurveyNotificationModalLogicProps,
+    surveyNotificationModalLogicMeta
+>
+
 export const surveyNotificationModalLogic = kea<surveyNotificationModalLogicType>([
     path(['scenes', 'surveys', 'surveyNotificationModalLogic']),
     props({} as SurveyNotificationModalLogicProps),
diff --git a/frontend/src/scenes/surveys/surveyNotificationsListLogic.ts b/frontend/src/scenes/surveys/surveyNotificationsListLogic.ts
index d7e29037d2e0..6136cdbfdd26 100644
--- a/frontend/src/scenes/surveys/surveyNotificationsListLogic.ts
+++ b/frontend/src/scenes/surveys/surveyNotificationsListLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
@@ -10,8 +10,6 @@ import { projectLogic } from 'scenes/projectLogic'
 
 import { CyclotronJobFiltersType, HogFunctionType, Survey, SurveyEventName, SurveyEventProperties } from '~/types'
 
-import type { surveyNotificationsListLogicType } from './surveyNotificationsListLogicType'
-
 const SURVEY_NOTIFICATION_LIST_LIMIT = 200
 const SURVEY_INDEX_LIMIT = 1000
 
@@ -42,6 +40,99 @@ export function getSurveyIdsFromNotificationFilters(filters?: CyclotronJobFilter
 
 export type KnownSurvey = Pick<Survey, 'id' | 'name' | 'archived' | 'created_at'>
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface surveyNotificationsListLogicValues {
+    currentProjectId: number | null // projectLogic
+    allNotifications: HogFunctionType[]
+    allNotificationsLoading: boolean
+    filteredSelectableSurveys: KnownSurvey[]
+    knownSurveyIds: Set<string>
+    knownSurveys: KnownSurvey[]
+    knownSurveysFailed: boolean
+    knownSurveysLoading: boolean
+    notifications: HogFunctionType[]
+    notificationsFailed: boolean
+    notificationsLoading: boolean
+    selectableSurveys: KnownSurvey[]
+    surveyCreatedAtById: Map<string, string>
+    surveyPickerSearch: string
+    surveyPickerVisible: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface surveyNotificationsListLogicActions {
+    deleteNotification: (notification: HogFunctionType) => {
+        notification: HogFunctionType
+    }
+    loadKnownSurveys: () => any
+    loadKnownSurveysFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadKnownSurveysSuccess: (
+        knownSurveys: KnownSurvey[],
+        payload?: any
+    ) => {
+        knownSurveys: KnownSurvey[]
+        payload?: any
+    }
+    loadNotifications: () => any
+    loadNotificationsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadNotificationsSuccess: (
+        allNotifications: HogFunctionType[],
+        payload?: any
+    ) => {
+        allNotifications: HogFunctionType[]
+        payload?: any
+    }
+    setSurveyPickerSearch: (search: string) => {
+        search: string
+    }
+    setSurveyPickerVisible: (visible: boolean) => {
+        visible: boolean
+    }
+    toggleNotificationEnabled: (
+        notificationId: string,
+        enabled: boolean
+    ) => {
+        enabled: boolean
+        notificationId: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface surveyNotificationsListLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        surveyCreatedAtById: (knownSurveys: KnownSurvey[]) => Map<string, string>
+        knownSurveyIds: (knownSurveys: KnownSurvey[]) => Set<string>
+        selectableSurveys: (knownSurveys: KnownSurvey[]) => KnownSurvey[]
+        filteredSelectableSurveys: (selectableSurveys: KnownSurvey[], surveyPickerSearch: string) => KnownSurvey[]
+        notifications: (
+            allNotifications: HogFunctionType[],
+            knownSurveyIds: Set<string>,
+            surveyCreatedAtById: Map<string, string>,
+            knownSurveysFailed: boolean
+        ) => HogFunctionType[]
+        notificationsLoading: (allNotificationsLoading: boolean, knownSurveysLoading: boolean) => boolean
+    }
+}
+
+export type surveyNotificationsListLogicType = MakeLogicType<
+    surveyNotificationsListLogicValues,
+    surveyNotificationsListLogicActions,
+    Record<string, any>,
+    surveyNotificationsListLogicMeta
+>
+
 export const surveyNotificationsListLogic = kea<surveyNotificationsListLogicType>([
     path(['scenes', 'surveys', 'surveyNotificationsListLogic']),
     connect(() => ({
diff --git a/frontend/src/scenes/surveys/surveyQuestionLabelsLogic.ts b/frontend/src/scenes/surveys/surveyQuestionLabelsLogic.ts
index 3f0a7ae4f309..cd1de6684e55 100644
--- a/frontend/src/scenes/surveys/surveyQuestionLabelsLogic.ts
+++ b/frontend/src/scenes/surveys/surveyQuestionLabelsLogic.ts
@@ -1,10 +1,8 @@
-import { afterMount, kea, path } from 'kea'
+import { MakeLogicType, afterMount, kea, path } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
 
-import type { surveyQuestionLabelsLogicType } from './surveyQuestionLabelsLogicType'
-
 export interface SurveyQuestionLabel {
     surveyId: string
     surveyName: string
@@ -12,6 +10,36 @@ export interface SurveyQuestionLabel {
     questionIndex: number
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface surveyQuestionLabelsLogicValues {
+    surveyQuestionLabels: Record<string, SurveyQuestionLabel>
+    surveyQuestionLabelsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface surveyQuestionLabelsLogicActions {
+    loadSurveyQuestionLabels: () => any
+    loadSurveyQuestionLabelsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSurveyQuestionLabelsSuccess: (
+        surveyQuestionLabels: Record<string, SurveyQuestionLabel>,
+        payload?: any
+    ) => {
+        surveyQuestionLabels: Record<string, SurveyQuestionLabel>
+        payload?: any
+    }
+}
+
+export type surveyQuestionLabelsLogicType = MakeLogicType<
+    surveyQuestionLabelsLogicValues,
+    surveyQuestionLabelsLogicActions
+>
+
 export const surveyQuestionLabelsLogic = kea<surveyQuestionLabelsLogicType>([
     path(['scenes', 'surveys', 'surveyQuestionLabelsLogic']),
     loaders(({ values }) => ({
diff --git a/frontend/src/scenes/surveys/surveysLogic.tsx b/frontend/src/scenes/surveys/surveysLogic.tsx
index 5c28e1fe44f5..e3fc64127d44 100644
--- a/frontend/src/scenes/surveys/surveysLogic.tsx
+++ b/frontend/src/scenes/surveys/surveysLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 
@@ -22,9 +22,12 @@ import { deleteFromTree } from '~/layout/panel-layout/ProjectTree/projectTreeLog
 import { ProductIntentContext, ProductKey } from '~/queries/schema/schema-general'
 import { ActivityScope, AvailableFeature, Breadcrumb, ProgressStatus, Survey, SurveyType } from '~/types'
 
+import type { FeatureFlagsSet } from '../../lib/logic/featureFlagLogic'
+import type { ProductIntentProperties } from '../../lib/utils/product-intents'
+import type { TeamPublicType, TeamType } from '../../types'
 import { SURVEY_CREATED_SOURCE } from './constants'
-import type { surveysLogicType } from './surveysLogicType'
 import { surveysSdkLogic } from './surveysSdkLogic'
+import type { TeamSdkVersions } from './surveyVersionRequirements'
 import { captureMaxAISurveyCreationException } from './utils'
 
 export enum SurveysTabs {
@@ -111,6 +114,307 @@ function updateSurvey(surveys: Survey[], id: string, updatedSurvey: Survey): Sur
     return surveys.map((s) => (s.id === id ? updatedSurvey : s))
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface surveysLogicValues {
+    enabledFlags: FeatureFlagsSet // enabledFlagLogic
+    teamSdkVersions: TeamSdkVersions // surveysSdkLogic
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    currentTeamLoading: boolean // teamLogic
+    hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean // userLogic
+    breadcrumbs: Breadcrumb[]
+    data: SurveyDataState
+    dataLoading: boolean
+    duplicatedSurvey: Survey | null
+    duplicatedSurveyLoading: boolean
+    filters: Partial<SurveysFilters>
+    formBuilderEnabled: boolean
+    globalSurveyAppearanceConfigAvailable: boolean
+    hasNextPage: boolean
+    hasNextSearchPage: boolean
+    isAppearanceModalOpen: boolean
+    preferredEditor: 'full' | 'guided'
+    searchTerm: any
+    searchedSurveys: Survey[]
+    showSurveysDisabledBanner: boolean
+    sidePanelContext: SidePanelSceneContext
+    surveyToDuplicate: Survey | null
+    surveysResponsesCount: {
+        [key: string]: number
+    }
+    surveysResponsesCountLoading: boolean
+    surveysStylingAvailable: boolean
+    tab: SurveysTabs
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface surveysLogicActions {
+    addProductIntent: (properties: ProductIntentProperties) => ProductIntentProperties // teamLogic
+    loadCurrentTeam: () => any // teamLogic
+    deleteSurvey: (id: any) => any
+    deleteSurveyFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteSurveySuccess: (
+        data: {
+            searchSurveys: Survey[]
+            searchSurveysCount: number
+            surveys: Survey[]
+            surveysCount: number
+        },
+        payload?: any
+    ) => {
+        data: {
+            searchSurveys: Survey[]
+            searchSurveysCount: number
+            surveys: Survey[]
+            surveysCount: number
+        }
+        payload?: any
+    }
+    duplicateSurvey: (survey: Survey) => Survey
+    duplicateSurveyFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    duplicateSurveySuccess: (
+        duplicatedSurvey: Survey,
+        payload?: Survey
+    ) => {
+        duplicatedSurvey: Survey
+        payload?: Survey
+    }
+    duplicateToProjects: ({ survey, targetTeamIds }: { survey: Survey; targetTeamIds: number[] }) => {
+        survey: Survey
+        targetTeamIds: number[]
+    }
+    duplicateToProjectsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    duplicateToProjectsSuccess: (
+        duplicatedSurvey: Survey,
+        payload?: {
+            survey: Survey
+            targetTeamIds: number[]
+        }
+    ) => {
+        duplicatedSurvey: Survey
+        payload?: {
+            survey: Survey
+            targetTeamIds: number[]
+        }
+    }
+    handleMaxSurveyCreated: (
+        toolOutput: {
+            error?: string
+            error_message?: string
+            survey_id?: string
+            survey_name?: string
+            survey_type?: string
+        },
+        source: SURVEY_CREATED_SOURCE
+    ) => {
+        source: SURVEY_CREATED_SOURCE
+        toolOutput: {
+            error?: string | undefined
+            error_message?: string | undefined
+            survey_id?: string | undefined
+            survey_name?: string | undefined
+            survey_type?: string | undefined
+        }
+    }
+    loadNextPage: () => {
+        value: true
+    }
+    loadNextPageFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadNextPageSuccess: (
+        data: SurveyDataState,
+        payload?: {
+            value: true
+        }
+    ) => {
+        data: SurveyDataState
+        payload?: {
+            value: true
+        }
+    }
+    loadNextSearchPage: () => {
+        value: true
+    }
+    loadNextSearchPageFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadNextSearchPageSuccess: (
+        data: SurveyDataState,
+        payload?: {
+            value: true
+        }
+    ) => {
+        data: SurveyDataState
+        payload?: {
+            value: true
+        }
+    }
+    loadResponsesCount: (surveyIds: string) => string
+    loadResponsesCountFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadResponsesCountSuccess: (
+        surveysResponsesCount: {
+            [key: string]: number
+        },
+        payload?: string
+    ) => {
+        surveysResponsesCount: {
+            [key: string]: number
+        }
+        payload?: string
+    }
+    loadSearchResults: () => any
+    loadSearchResultsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSearchResultsSuccess: (
+        data: SurveyDataState,
+        payload?: any
+    ) => {
+        data: SurveyDataState
+        payload?: any
+    }
+    loadSurveys: () => any
+    loadSurveysFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSurveysSuccess: (
+        data: SurveyDataState,
+        payload?: any
+    ) => {
+        data: SurveyDataState
+        payload?: any
+    }
+    setIsAppearanceModalOpen: (isOpen: boolean) => {
+        isOpen: boolean
+    }
+    setPreferredEditor: (editor: 'full' | 'guided') => {
+        editor: 'full' | 'guided'
+    }
+    setSearchTerm: (searchTerm: string) => {
+        searchTerm: string
+    }
+    setSurveyToDuplicate: (survey: Survey | null) => {
+        survey: Survey | null
+    }
+    setSurveysFilters: (
+        filters: Partial<SurveysFilters>,
+        replace?: boolean
+    ) => {
+        filters: Partial<SurveysFilters>
+        replace: boolean | undefined
+    }
+    setTab: (tab: SurveysTabs) => {
+        tab: SurveysTabs
+    }
+    updateSurvey: ({
+        id,
+        updatePayload,
+        intentContext,
+    }: {
+        id: string
+        intentContext?: ProductIntentContext
+        updatePayload: any
+    }) => {
+        id: string
+        updatePayload: any
+        intentContext?: ProductIntentContext
+    }
+    updateSurveyFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateSurveySuccess: (
+        data: {
+            searchSurveys: Survey[]
+            searchSurveysCount: number
+            surveys: Survey[]
+            surveysCount: number
+        },
+        payload?: {
+            id: string
+            updatePayload: any
+            intentContext?: ProductIntentContext
+        }
+    ) => {
+        data: {
+            searchSurveys: Survey[]
+            searchSurveysCount: number
+            surveys: Survey[]
+            surveysCount: number
+        }
+        payload?: {
+            id: string
+            updatePayload: any
+            intentContext?: ProductIntentContext
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface surveysLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        searchedSurveys: (data: SurveyDataState, searchTerm: any, filters: Partial<SurveysFilters>) => Survey[]
+        surveysStylingAvailable: (
+            hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean
+        ) => boolean
+        formBuilderEnabled: (enabledFlags: FeatureFlagsSet) => boolean
+        globalSurveyAppearanceConfigAvailable: (
+            hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean
+        ) => boolean
+        showSurveysDisabledBanner: (currentTeam: TeamPublicType | TeamType | null) => boolean
+    }
+}
+
+export type surveysLogicType = MakeLogicType<
+    surveysLogicValues,
+    surveysLogicActions,
+    Record<string, any>,
+    surveysLogicMeta
+>
+
 export const surveysLogic = kea<surveysLogicType>([
     path(['scenes', 'surveys', 'surveysLogic']),
     connect(() => ({
@@ -412,7 +716,7 @@ export const surveysLogic = kea<surveysLogicType>([
     selectors({
         searchedSurveys: [
             (selectors) => [selectors.data, selectors.searchTerm, selectors.filters],
-            (data, searchTerm, filters) => {
+            (data: SurveyDataState, searchTerm, filters: Partial<SurveysFilters>) => {
                 let searchedSurveys = searchTerm?.trim() ? data.searchSurveys : data.surveys
 
                 const { status, type, created_by, archived } = filters
@@ -448,19 +752,22 @@ export const surveysLogic = kea<surveysLogicType>([
         ],
         surveysStylingAvailable: [
             (s) => [s.hasAvailableFeature],
-            (hasAvailableFeature) => hasAvailableFeature(AvailableFeature.SURVEYS_STYLING),
+            (hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean) =>
+                hasAvailableFeature(AvailableFeature.SURVEYS_STYLING),
         ],
         formBuilderEnabled: [
             (s) => [s.enabledFlags],
-            (enabledFlags) => !!enabledFlags[FEATURE_FLAGS.SURVEYS_FORM_BUILDER],
+            (enabledFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet) =>
+                !!enabledFlags[FEATURE_FLAGS.SURVEYS_FORM_BUILDER],
         ],
         globalSurveyAppearanceConfigAvailable: [
             (s) => [s.hasAvailableFeature],
-            (hasAvailableFeature) => hasAvailableFeature(AvailableFeature.SURVEYS_STYLING),
+            (hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean) =>
+                hasAvailableFeature(AvailableFeature.SURVEYS_STYLING),
         ],
         showSurveysDisabledBanner: [
             (s) => [s.currentTeam],
-            (currentTeam) => {
+            (currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType) => {
                 return !currentTeam?.surveys_opt_in
             },
         ],
diff --git a/frontend/src/scenes/surveys/surveysSdkLogic.ts b/frontend/src/scenes/surveys/surveysSdkLogic.ts
index b68b8438f590..994d18afd972 100644
--- a/frontend/src/scenes/surveys/surveysSdkLogic.ts
+++ b/frontend/src/scenes/surveys/surveysSdkLogic.ts
@@ -1,10 +1,25 @@
-import { connect, kea, path, selectors } from 'kea'
+import { MakeLogicType, connect, kea, path, selectors } from 'kea'
 
 import { sdkHealthLogic } from '~/scenes/onboarding/shared/sdkHealth/sdkHealthLogic'
 
-import type { surveysSdkLogicType } from './surveysSdkLogicType'
+import type { AugmentedTeamSdkVersionsInfo } from '../onboarding/shared/sdkHealth/sdkHealthLogic'
 import { TeamSdkVersions } from './surveyVersionRequirements'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface surveysSdkLogicValues {
+    sdkHealthData: AugmentedTeamSdkVersionsInfo // sdkHealthLogic
+    teamSdkVersions: TeamSdkVersions
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface surveysSdkLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        teamSdkVersions: (sdkHealthData: AugmentedTeamSdkVersionsInfo) => TeamSdkVersions
+    }
+}
+
+export type surveysSdkLogicType = MakeLogicType<surveysSdkLogicValues, {}, Record<string, any>, surveysSdkLogicMeta>
+
 export const surveysSdkLogic = kea<surveysSdkLogicType>([
     path(['scenes', 'surveys', 'surveysSdkLogic']),
     connect(() => ({
@@ -13,7 +28,9 @@ export const surveysSdkLogic = kea<surveysSdkLogicType>([
     selectors({
         teamSdkVersions: [
             (s) => [s.sdkHealthData],
-            (sdkHealthData): TeamSdkVersions => {
+            (
+                sdkHealthData: import('~/scenes/onboarding/shared/sdkHealth/sdkHealthLogic').AugmentedTeamSdkVersionsInfo
+            ): TeamSdkVersions => {
                 const versions: TeamSdkVersions = {}
 
                 for (const [sdkType, sdkInfo] of Object.entries(sdkHealthData ?? {})) {
diff --git a/frontend/src/scenes/surveys/wizard/surveyWizardLogic.ts b/frontend/src/scenes/surveys/wizard/surveyWizardLogic.ts
index 9ad5d9cbe654..b90f53f77dc3 100644
--- a/frontend/src/scenes/surveys/wizard/surveyWizardLogic.ts
+++ b/frontend/src/scenes/surveys/wizard/surveyWizardLogic.ts
@@ -1,4 +1,18 @@
-import { actions, afterMount, beforeUnmount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    afterMount,
+    beforeUnmount,
+    connect,
+    kea,
+    key,
+    listeners,
+    path,
+    props,
+    reducers,
+    selectors,
+} from 'kea'
+import type { FieldName } from 'kea-forms'
 import { router, urlToAction } from 'kea-router'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -13,6 +27,8 @@ import { urls } from 'scenes/urls'
 import { ProductIntentContext, ProductKey } from '~/queries/schema/schema-general'
 import { Breadcrumb, LinkSurveyQuestion, Survey, SurveyQuestionType, SurveySchedule, SurveyType } from '~/types'
 
+import type { ProductIntentProperties } from '../../../lib/utils/product-intents'
+import type { TeamPublicType, TeamType } from '../../../types'
 import {
     SURVEY_CREATED_SOURCE,
     SurveyTemplate,
@@ -22,9 +38,9 @@ import {
     defaultSurveyTemplates,
     surveyThemes,
 } from '../constants'
+import type { NewSurvey } from '../constants'
 import { surveyLogic } from '../surveyLogic'
 import { surveysLogic } from '../surveysLogic'
-import type { surveyWizardLogicType } from './surveyWizardLogicType'
 
 export type WizardStep = 'template' | 'questions' | 'where' | 'when' | 'appearance' | 'success'
 
@@ -53,6 +69,154 @@ export interface SurveyWizardLogicProps {
     id: string // 'new' for new surveys, or a UUID for editing
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface surveyWizardLogicValues {
+    survey: NewSurvey | Survey // surveyLogic
+    surveyChanged: boolean // surveyLogic
+    surveyLoading: boolean // surveyLogic
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    breadcrumbs: Breadcrumb[]
+    coreTemplates: SurveyTemplate[]
+    createdSurvey: Survey | null
+    currentStep: WizardStep
+    currentStepHasErrors: boolean
+    otherTemplates: SurveyTemplate[]
+    recommendedFrequency: {
+        label: string
+        reason: string
+        value: string
+    }
+    selectedTemplate: SurveyTemplate | null
+    stepNumber: number
+    stepValidationErrors: Record<WizardStep, string[]>
+    surveyLaunching: boolean
+    surveySaving: boolean
+    templateMode: SurveyTemplateMode
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface surveyWizardLogicActions {
+    reportSurveyCreated: (
+        survey: Survey,
+        isDuplicate?: boolean | undefined,
+        creationSource?:
+            | 'form_builder'
+            | 'full_editor'
+            | 'llm_analytics'
+            | 'quick_create'
+            | 'template'
+            | 'wizard'
+            | undefined
+    ) => {
+        creationSource:
+            | 'form_builder'
+            | 'full_editor'
+            | 'llm_analytics'
+            | 'quick_create'
+            | 'template'
+            | 'wizard'
+            | undefined
+        isDuplicate: boolean | undefined
+        survey: Survey
+    } // eventUsageLogic
+    reportSurveyEdited: (survey: Survey) => {
+        survey: Survey
+    } // eventUsageLogic
+    reportSurveyTemplateClicked: (
+        template: SurveyTemplateType,
+        source?: string | undefined
+    ) => {
+        source: string | undefined
+        template: SurveyTemplateType
+    } // eventUsageLogic
+    loadSurvey: () => any // surveyLogic
+    resetSurvey: (values?: NewSurvey | Survey | undefined) => {
+        values?: NewSurvey | Survey
+    } // surveyLogic
+    setSurveyValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    } // surveyLogic
+    loadSurveys: () => any // surveysLogic
+    addProductIntent: (properties: ProductIntentProperties) => ProductIntentProperties // teamLogic
+    launchSurvey: () => {
+        value: true
+    }
+    launchSurveyFailure: (error: string) => {
+        error: string
+    }
+    launchSurveySuccess: (survey: Survey) => {
+        survey: Survey
+    }
+    nextStep: () => {
+        value: true
+    }
+    prevStep: () => {
+        value: true
+    }
+    resetWizard: () => {
+        value: true
+    }
+    restoreDefaultQuestions: () => {
+        value: true
+    }
+    saveDraft: () => {
+        value: true
+    }
+    saveDraftFailure: (error: string) => {
+        error: string
+    }
+    saveDraftSuccess: (survey: Survey) => {
+        survey: Survey
+    }
+    selectTemplate: (template: SurveyTemplate) => {
+        template: SurveyTemplate
+    }
+    setStep: (step: WizardStep) => {
+        step: WizardStep
+    }
+    setTemplateMode: (mode: SurveyTemplateMode) => {
+        mode: SurveyTemplateMode
+    }
+    updateSurvey: () => {
+        value: true
+    }
+    updateSurveyFailure: (error: string) => {
+        error: string
+    }
+    updateSurveySuccess: (survey: Survey) => {
+        survey: Survey
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface surveyWizardLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        coreTemplates: (templateMode: SurveyTemplateMode) => SurveyTemplate[]
+        otherTemplates: (templateMode: SurveyTemplateMode) => SurveyTemplate[]
+        stepNumber: (currentStep: WizardStep) => number
+        breadcrumbs: (survey: NewSurvey | Survey) => Breadcrumb[]
+        stepValidationErrors: (survey: NewSurvey | Survey) => Record<WizardStep, string[]>
+        currentStepHasErrors: (stepValidationErrors: Record<WizardStep, string[]>, currentStep: WizardStep) => boolean
+        recommendedFrequency: (selectedTemplate: SurveyTemplate | null) => {
+            label: string
+            reason: string
+            value: string
+        }
+    }
+}
+
+export type surveyWizardLogicType = MakeLogicType<
+    surveyWizardLogicValues,
+    surveyWizardLogicActions,
+    SurveyWizardLogicProps,
+    surveyWizardLogicMeta
+>
+
 export const surveyWizardLogic = kea<surveyWizardLogicType>([
     path(['scenes', 'surveys', 'wizard', 'surveyWizardLogic']),
 
diff --git a/frontend/src/scenes/teamLogic.tsx b/frontend/src/scenes/teamLogic.tsx
index e9120e9949e9..a369a3ebfbdb 100644
--- a/frontend/src/scenes/teamLogic.tsx
+++ b/frontend/src/scenes/teamLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
@@ -24,9 +24,9 @@ import { customProductsLogic } from '~/layout/panel-layout/ProjectTree/customPro
 import { CurrencyCode, CustomerAnalyticsConfig, ProductKey } from '~/queries/schema/schema-general'
 import { CorrelationConfigType, ProjectType, TeamPublicType, TeamType } from '~/types'
 
+import type { FeatureFlagsSet } from '../lib/logic/featureFlagLogic'
 import { organizationLogic } from './organizationLogic'
 import { projectLogic } from './projectLogic'
-import type { teamLogicType } from './teamLogicType'
 import { userLogic } from './userLogic'
 
 const parseUpdatedAttributeName = (attr: keyof TeamType | null): string => {
@@ -56,6 +56,237 @@ export interface FrequentMistakeAdvice {
     fix: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface teamLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    currentProject: ProjectType | null // projectLogic
+    baseCurrency: CurrencyCode
+    currentProjectId: number | string
+    currentTeam: TeamPublicType | TeamType | null
+    currentTeamId: number | null
+    currentTeamIdStrict: number | string
+    currentTeamLoading: boolean
+    customerAnalyticsConfig: CustomerAnalyticsConfig
+    demoOnlyProject: boolean
+    funnelCorrelationConfig: CorrelationConfigType
+    hasOnboardedAnyProduct: boolean
+    isCurrentTeamUnavailable: boolean
+    isTeamTokenResetAvailable: boolean
+    teamBeingDeleted: TeamType | null
+    testAccountFilterFrequentMistakes: FrequentMistakeAdvice[]
+    timezone: string
+    weekStartDay: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface teamLogicActions {
+    loadCustomProducts: () => any // customProductsLogic
+    loadCurrentOrganization: () => any // organizationLogic
+    loadCurrentProjectSuccess: (
+        currentProject: ProjectType | null,
+        payload?: any
+    ) => {
+        currentProject: ProjectType | null
+        payload?: any
+    } // projectLogic
+    loadUser: (resetOnFailure?: boolean | undefined) => {
+        resetOnFailure: boolean | undefined
+    } // userLogic
+    switchTeam: (
+        teamId: number | string,
+        destination?: string | undefined
+    ) => {
+        destination: string | undefined
+        teamId: number | string
+    } // userLogic
+    addProductIntent: (properties: ProductIntentProperties) => ProductIntentProperties
+    addProductIntentFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    addProductIntentForCrossSell: (properties: ProductCrossSellProperties) => ProductCrossSellProperties
+    addProductIntentForCrossSellFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    addProductIntentForCrossSellSuccess: (
+        currentTeam: TeamType | null,
+        payload?: ProductCrossSellProperties
+    ) => {
+        currentTeam: TeamType | null
+        payload?: ProductCrossSellProperties
+    }
+    addProductIntentSuccess: (
+        currentTeam: TeamType | null,
+        payload?: ProductIntentProperties
+    ) => {
+        currentTeam: TeamType | null
+        payload?: ProductIntentProperties
+    }
+    createTeam: ({ name, is_demo }: { is_demo: boolean; name: string }) => {
+        name: string
+        is_demo: boolean
+    }
+    createTeamFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    createTeamSuccess: (
+        currentTeam: TeamPublicType | TeamType | null,
+        payload?: {
+            name: string
+            is_demo: boolean
+        }
+    ) => {
+        currentTeam: TeamPublicType | TeamType | null
+        payload?: {
+            name: string
+            is_demo: boolean
+        }
+    }
+    deleteSecretTokenBackup: () => any
+    deleteSecretTokenBackupFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteSecretTokenBackupSuccess: (
+        currentTeam: TeamPublicType | TeamType | null,
+        payload?: any
+    ) => {
+        currentTeam: TeamPublicType | TeamType | null
+        payload?: any
+    }
+    deleteTeam: (team: TeamType) => {
+        team: TeamType
+    }
+    deleteTeamFailure: () => {
+        value: true
+    }
+    deleteTeamSuccess: () => {
+        value: true
+    }
+    loadCurrentTeam: () => any
+    loadCurrentTeamFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadCurrentTeamSuccess: (
+        currentTeam: TeamPublicType | null,
+        payload?: any
+    ) => {
+        currentTeam: TeamPublicType | null
+        payload?: any
+    }
+    recordProductIntentOnboardingComplete: ({ product_type }: { product_type: ProductKey }) => {
+        product_type: ProductKey
+    }
+    recordProductIntentOnboardingCompleteFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    recordProductIntentOnboardingCompleteSuccess: (
+        currentTeam: TeamPublicType | TeamType | null,
+        payload?: {
+            product_type: ProductKey
+        }
+    ) => {
+        currentTeam: TeamPublicType | TeamType | null
+        payload?: {
+            product_type: ProductKey
+        }
+    }
+    resetToken: () => any
+    resetTokenFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    resetTokenSuccess: (
+        currentTeam: TeamPublicType | TeamType | null,
+        payload?: any
+    ) => {
+        currentTeam: TeamPublicType | TeamType | null
+        payload?: any
+    }
+    rotateSecretToken: () => any
+    rotateSecretTokenFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    rotateSecretTokenSuccess: (
+        currentTeam: TeamPublicType | TeamType | null,
+        payload?: any
+    ) => {
+        currentTeam: TeamPublicType | TeamType | null
+        payload?: any
+    }
+    updateCurrentTeam: (payload: Partial<TeamType>) => Partial<TeamType>
+    updateCurrentTeamFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateCurrentTeamSuccess: (
+        currentTeam: TeamPublicType | TeamType,
+        payload?: Partial<TeamType>
+    ) => {
+        currentTeam: TeamPublicType | TeamType
+        payload?: Partial<TeamType>
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface teamLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        hasOnboardedAnyProduct: (currentTeam: TeamPublicType | TeamType | null) => boolean
+        currentTeamId: (currentTeam: TeamPublicType | TeamType | null) => number | null
+        currentTeamIdStrict: (currentTeam: TeamPublicType | TeamType | null) => number | string
+        currentProjectId: (currentTeam: TeamPublicType | TeamType | null) => number | string
+        isCurrentTeamUnavailable: (
+            currentTeam: TeamPublicType | TeamType | null,
+            currentTeamLoading: boolean
+        ) => boolean
+        demoOnlyProject: (
+            currentTeam: TeamPublicType | TeamType | null,
+            currentOrganization: null | import('~/types').OrganizationType
+        ) => boolean
+        funnelCorrelationConfig: (currentTeam: TeamPublicType | TeamType | null) => CorrelationConfigType
+        timezone: (currentTeam: TeamPublicType | TeamType | null) => string
+        weekStartDay: (currentTeam: TeamPublicType | TeamType | null) => number
+        isTeamTokenResetAvailable: (currentTeam: TeamPublicType | TeamType | null) => boolean
+        testAccountFilterFrequentMistakes: (currentTeam: TeamPublicType | TeamType | null) => FrequentMistakeAdvice[]
+        baseCurrency: (currentTeam: TeamPublicType | TeamType | null) => CurrencyCode
+        customerAnalyticsConfig: (currentTeam: TeamPublicType | TeamType | null) => CustomerAnalyticsConfig
+    }
+}
+
+export type teamLogicType = MakeLogicType<teamLogicValues, teamLogicActions, Record<string, any>, teamLogicMeta>
+
 export const teamLogic = kea<teamLogicType>([
     path(['scenes', 'teamLogic']),
     connect(() => ({
@@ -244,7 +475,7 @@ export const teamLogic = kea<teamLogicType>([
     selectors(() => ({
         hasOnboardedAnyProduct: [
             (selectors) => [selectors.currentTeam],
-            (currentTeam): boolean => {
+            (currentTeam: TeamPublicType | TeamType | null): boolean => {
                 if (
                     currentTeam &&
                     !currentTeam.completed_snippet_onboarding &&
@@ -257,7 +488,7 @@ export const teamLogic = kea<teamLogicType>([
         ],
         currentTeamId: [
             (selectors) => [selectors.currentTeam],
-            (currentTeam): number | null => (currentTeam ? currentTeam.id : null),
+            (currentTeam: TeamPublicType | TeamType | null): number | null => (currentTeam ? currentTeam.id : null),
         ],
         // currentTeamIdStrict is currentTeamId with throwing an error to be consistent with the
         // newly introduced currentProjectId and currentOrganizationId. To not cause a breaking change
@@ -265,7 +496,7 @@ export const teamLogic = kea<teamLogicType>([
         // currentTeamId and so that currentTeamIdStrict can be removed.
         currentTeamIdStrict: [
             (selectors) => [selectors.currentTeam],
-            (currentTeam): number | string => {
+            (currentTeam: TeamPublicType | TeamType | null): number | string => {
                 if (!currentTeam || !currentTeam.id) {
                     // TODO: Fix callers that access currentTeamIdStrict before the team is loaded,
                     // then restore the throw. Temporarily falling back to "@current" to avoid crashes.
@@ -280,7 +511,7 @@ export const teamLogic = kea<teamLogicType>([
         ],
         currentProjectId: [
             (selectors) => [selectors.currentTeam],
-            (currentTeam): number | string => {
+            (currentTeam: TeamPublicType | TeamType | null): number | string => {
                 if (!currentTeam || !currentTeam.project_id) {
                     // TODO: Fix callers that access currentProjectId before the team is loaded,
                     // then restore the throw. Temporarily falling back to "@current" to avoid crashes.
@@ -296,37 +527,43 @@ export const teamLogic = kea<teamLogicType>([
         isCurrentTeamUnavailable: [
             (selectors) => [selectors.currentTeam, selectors.currentTeamLoading],
             // If project has been loaded and is still null, it means the user just doesn't have access.
-            (currentTeam, currentTeamLoading): boolean =>
+            (currentTeam: TeamPublicType | TeamType | null, currentTeamLoading: boolean): boolean =>
                 (!currentTeam?.effective_membership_level || currentTeam.user_access_level === 'none') &&
                 !currentTeamLoading,
         ],
         demoOnlyProject: [
             (selectors) => [selectors.currentTeam, organizationLogic.selectors.currentOrganization],
-            (currentTeam, currentOrganization): boolean =>
+            (
+                currentTeam: TeamPublicType | TeamType | null,
+                currentOrganization: null | import('~/types').OrganizationType
+            ): boolean =>
                 (currentTeam?.is_demo && currentOrganization?.teams && currentOrganization.teams.length == 1) || false,
         ],
         funnelCorrelationConfig: [
             (selectors) => [selectors.currentTeam],
-            (currentTeam): CorrelationConfigType => {
+            (currentTeam: TeamPublicType | TeamType | null): CorrelationConfigType => {
                 return currentTeam?.correlation_config || {}
             },
         ],
-        timezone: [(selectors) => [selectors.currentTeam], (currentTeam): string => currentTeam?.timezone || 'UTC'],
+        timezone: [
+            (selectors) => [selectors.currentTeam],
+            (currentTeam: TeamPublicType | TeamType | null): string => currentTeam?.timezone || 'UTC',
+        ],
         /** 0 means Sunday, 1 means Monday. */
         weekStartDay: [
             (selectors) => [selectors.currentTeam],
-            (currentTeam): number => currentTeam?.week_start_day || 0,
+            (currentTeam: TeamPublicType | TeamType | null): number => currentTeam?.week_start_day || 0,
         ],
         isTeamTokenResetAvailable: [
             (selectors) => [selectors.currentTeam],
-            (currentTeam): boolean =>
+            (currentTeam: TeamPublicType | TeamType | null): boolean =>
                 (!!currentTeam?.effective_membership_level &&
                     currentTeam.effective_membership_level >= OrganizationMembershipLevel.Admin) ||
                 currentTeam?.user_access_level === 'admin',
         ],
         testAccountFilterFrequentMistakes: [
             (selectors) => [selectors.currentTeam],
-            (currentTeam): FrequentMistakeAdvice[] => {
+            (currentTeam: TeamPublicType | TeamType | null): FrequentMistakeAdvice[] => {
                 if (!currentTeam) {
                     return []
                 }
diff --git a/frontend/src/scenes/trends/mathsLogic.tsx b/frontend/src/scenes/trends/mathsLogic.tsx
index 40301fb12b48..6c0c952393f9 100644
--- a/frontend/src/scenes/trends/mathsLogic.tsx
+++ b/frontend/src/scenes/trends/mathsLogic.tsx
@@ -1,4 +1,4 @@
-import { connect, kea, path, selectors } from 'kea'
+import { MakeLogicType, connect, kea, path, selectors } from 'kea'
 
 import { groupsAccessLogic } from 'lib/introductions/groupsAccessLogic'
 import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
@@ -14,7 +14,9 @@ import {
     PropertyMathType,
 } from '~/types'
 
-import type { mathsLogicType } from './mathsLogicType'
+import type { FeatureFlagsSet } from '../../lib/logic/featureFlagLogic'
+import type { Noun } from '../../models/groupsModel'
+import type { GroupType, GroupTypeIndex } from '../../types'
 
 export enum MathCategory {
     EventCount,
@@ -426,6 +428,39 @@ export function apiValueToMathType(math: string | undefined, groupTypeIndex: num
     return assembledMath as MathType
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface mathsLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    canStartUsingGroups: boolean // groupsAccessLogic
+    needsUpgradeForGroups: boolean // groupsAccessLogic
+    aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun // groupsModel
+    groupTypes: Map<GroupTypeIndex, GroupType> // groupsModel
+    calendarHeatmapMathDefinitions: Partial<Record<string, MathDefinition>>
+    funnelMathDefinitions: Partial<Record<string, MathDefinition>>
+    groupsMathDefinitions: Partial<Record<string, MathDefinition>>
+    mathDefinitions: Partial<Record<string, MathDefinition>>
+    staticActorsOnlyMathDefinitions: Partial<Record<string, MathDefinition>>
+    staticMathDefinitions: Partial<Record<string, MathDefinition>>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface mathsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        mathDefinitions: (
+            groupsMathDefinitions: Partial<Record<string, MathDefinition>>
+        ) => Partial<Record<string, MathDefinition>>
+        staticActorsOnlyMathDefinitions: (
+            staticMathDefinitions: Partial<Record<string, MathDefinition>>
+        ) => Partial<Record<string, MathDefinition>>
+        groupsMathDefinitions: (
+            groupTypes: Map<GroupTypeIndex, GroupType>,
+            aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun
+        ) => Partial<Record<string, MathDefinition>>
+    }
+}
+
+export type mathsLogicType = MakeLogicType<mathsLogicValues, {}, Record<string, any>, mathsLogicMeta>
+
 export const mathsLogic = kea<mathsLogicType>([
     path(['scenes', 'trends', 'mathsLogic']),
     connect(() => ({
@@ -441,7 +476,9 @@ export const mathsLogic = kea<mathsLogicType>([
     selectors({
         mathDefinitions: [
             (s) => [s.groupsMathDefinitions],
-            (groupsMathDefinitions): Partial<Record<string, MathDefinition>> => {
+            (
+                groupsMathDefinitions: Partial<Record<string, MathDefinition>>
+            ): Partial<Record<string, MathDefinition>> => {
                 const allMathDefinitions: Partial<Record<string, MathDefinition>> = {
                     ...BASE_MATH_DEFINITIONS,
                     ...groupsMathDefinitions,
@@ -470,7 +507,9 @@ export const mathsLogic = kea<mathsLogicType>([
         staticMathDefinitions: [() => [], (): Partial<Record<string, MathDefinition>> => BASE_MATH_DEFINITIONS],
         staticActorsOnlyMathDefinitions: [
             (s) => [s.staticMathDefinitions],
-            (staticMathDefinitions): Partial<Record<string, MathDefinition>> => {
+            (
+                staticMathDefinitions: Partial<Record<string, MathDefinition>>
+            ): Partial<Record<string, MathDefinition>> => {
                 return Object.fromEntries(
                     Object.entries(staticMathDefinitions).filter(
                         ([, mathDefinition]) => mathDefinition?.category === MathCategory.ActorCount
@@ -481,7 +520,13 @@ export const mathsLogic = kea<mathsLogicType>([
         // Definitions based on group types present in the project
         groupsMathDefinitions: [
             (s) => [s.groupTypes, s.aggregationLabel],
-            (groupTypes, aggregationLabel): Partial<Record<string, MathDefinition>> =>
+            (
+                groupTypes: Map<import('~/types').GroupTypeIndex, import('~/types').GroupType>,
+                aggregationLabel: (
+                    groupTypeIndex: number | null | undefined,
+                    deferToUserWording?: boolean
+                ) => import('~/models/groupsModel').Noun
+            ): Partial<Record<string, MathDefinition>> =>
                 Object.fromEntries(
                     Array.from(groupTypes.values())
                         .map((groupType) => [
diff --git a/frontend/src/scenes/trends/persons-modal/personsModalLogic.ts b/frontend/src/scenes/trends/persons-modal/personsModalLogic.ts
index 9d3c35c08677..c12309f837d9 100644
--- a/frontend/src/scenes/trends/persons-modal/personsModalLogic.ts
+++ b/frontend/src/scenes/trends/persons-modal/personsModalLogic.ts
@@ -1,4 +1,16 @@
-import { actions, afterMount, connect, kea, listeners, path, props, propsChanged, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    afterMount,
+    connect,
+    kea,
+    listeners,
+    path,
+    props,
+    propsChanged,
+    reducers,
+    selectors,
+} from 'kea'
 import { loaders } from 'kea-loaders'
 import { combineUrl, router, urlToAction } from 'kea-router'
 
@@ -48,7 +60,9 @@ import {
     UniversalFilterValue,
 } from '~/types'
 
-import type { personsModalLogicType } from './personsModalLogicType'
+import type { Noun } from '../../../models/groupsModel'
+import type { InsightQueryNode } from '../../../queries/schema/schema-general'
+import type { GroupType, GroupTypeIndex } from '../../../types'
 
 const RESULTS_PER_PAGE = 100
 
@@ -143,6 +157,158 @@ export interface ListActorsResponse {
     offset?: number // Offset for HogQL queries
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface personsModalLogicValues {
+    aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun // groupsModel
+    groupTypes: Map<GroupTypeIndex, GroupType> // groupsModel
+    currentTeamId: number | null // teamLogic
+    actorLabel: Noun
+    actors: ActorType[]
+    actorsQuery: ActorsQuery | null
+    actorsResponse: ListActorsResponse | null
+    actorsResponseLoading: boolean
+    errorObject: Record<string, any> | null
+    exploreUrl: string | null
+    insightActorsQueryOptions: InsightActorsQueryOptionsResponse | null
+    insightActorsQueryOptionsLoading: boolean
+    insightEventsQueryUrl: string | null
+    isCohortModalOpen: boolean
+    isModalOpen: boolean
+    missingActorsCount: number
+    propertiesTimelineFilterFromUrl: PropertiesTimelineFilterType
+    query: FunnelsActorsQuery | InsightActorsQuery | null
+    recordingFilters: Partial<RecordingUniversalFilters>
+    searchTerm: string
+    selectFields: string[]
+    sessionIdsFromLoadedActors: string[]
+    validationError: string | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface personsModalLogicActions {
+    reportPersonsModalSearched: (params: { actorType?: string; teamId?: number | null }) => {
+        params: {
+            actorType?: string | undefined
+            teamId?: number | null | undefined
+        }
+    } // eventUsageLogic
+    reportPersonsModalViewed: (params: any) => {
+        params: any
+    } // eventUsageLogic
+    closeModal: () => boolean
+    loadActors: ({ url, clear, offset }: { clear?: boolean; offset?: number; url?: string | null }) => {
+        clear: boolean | undefined
+        offset: number | undefined
+        url: string | null | undefined
+    }
+    loadActorsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadActorsQueryOptions: (query: FunnelsActorsQuery | InsightActorsQuery) => {
+        query: FunnelsActorsQuery | InsightActorsQuery<InsightQueryNode>
+    }
+    loadActorsQueryOptionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadActorsQueryOptionsSuccess: (
+        insightActorsQueryOptions:
+            | InsightActorsQueryOptionsResponse
+            | {
+                  [k: string]: any
+              }
+            | null,
+        payload?: {
+            query: FunnelsActorsQuery | InsightActorsQuery<InsightQueryNode>
+        }
+    ) => {
+        insightActorsQueryOptions:
+            | InsightActorsQueryOptionsResponse
+            | {
+                  [k: string]: any
+              }
+            | null
+        payload?: {
+            query: FunnelsActorsQuery | InsightActorsQuery<InsightQueryNode>
+        }
+    }
+    loadActorsSuccess: (
+        actorsResponse: ListActorsResponse | null,
+        payload?: {
+            clear: boolean | undefined
+            offset: number | undefined
+            url: string | null | undefined
+        }
+    ) => {
+        actorsResponse: ListActorsResponse | null
+        payload?: {
+            clear: boolean | undefined
+            offset: number | undefined
+            url: string | null | undefined
+        }
+    }
+    loadNextActors: () => {
+        value: true
+    }
+    resetActors: () => boolean
+    saveAsCohort: (cohortName: string) => {
+        cohortName: string
+    }
+    setIsCohortModalOpen: (isOpen: boolean) => {
+        isOpen: boolean
+    }
+    setSearchTerm: (search: string) => {
+        search: string
+    }
+    updateActorsQuery: (query: Partial<InsightActorsQuery> | Partial<FunnelsActorsQuery>) => {
+        query: Partial<InsightActorsQuery<InsightQueryNode>> | Partial<FunnelsActorsQuery>
+    }
+    updateQuery: (query: FunnelsActorsQuery | InsightActorsQuery) => {
+        query: FunnelsActorsQuery | InsightActorsQuery<InsightQueryNode>
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface personsModalLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        actorLabel: (
+            actors: ActorType[],
+            aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun
+        ) => Noun
+        validationError: (errorObject: Record<string, any> | null) => string | null
+        propertiesTimelineFilterFromUrl: (arg: any) => PropertiesTimelineFilterType
+        selectFields: (arg: any) => string[]
+        actorsQuery: (
+            arg: any,
+            query: FunnelsActorsQuery | InsightActorsQuery<InsightQueryNode> | null,
+            searchTerm: string,
+            selectFields: string[]
+        ) => ActorsQuery | null
+        exploreUrl: (actorsQuery: ActorsQuery | null) => string | null
+        insightEventsQueryUrl: (actorsQuery: ActorsQuery | null) => string | null
+        sessionIdsFromLoadedActors: (actors: ActorType[]) => string[]
+        recordingFilters: (
+            actorsQuery: ActorsQuery | null,
+            propertiesTimelineFilterFromUrl: PropertiesTimelineFilterType,
+            sessionIdsFromLoadedActors: string[]
+        ) => Partial<RecordingUniversalFilters>
+    }
+}
+
+export type personsModalLogicType = MakeLogicType<
+    personsModalLogicValues,
+    personsModalLogicActions,
+    PersonModalLogicProps,
+    personsModalLogicMeta
+>
+
 export const personsModalLogic = kea<personsModalLogicType>([
     path(['scenes', 'trends', 'personsModalLogic']),
     props({} as PersonModalLogicProps),
@@ -404,7 +570,13 @@ export const personsModalLogic = kea<personsModalLogicType>([
     selectors({
         actorLabel: [
             (s) => [s.actors, s.aggregationLabel],
-            (actors, aggregationLabel) => {
+            (
+                actors: ActorType[],
+                aggregationLabel: (
+                    groupTypeIndex: number | null | undefined,
+                    deferToUserWording?: boolean
+                ) => import('~/models/groupsModel').Noun
+            ) => {
                 const firstResult = actors[0]
 
                 if (!firstResult) {
@@ -418,7 +590,7 @@ export const personsModalLogic = kea<personsModalLogicType>([
         ],
         validationError: [
             (s) => [s.errorObject],
-            (errorObject): string | null => {
+            (errorObject: Record<string, any> | null): string | null => {
                 return extractValidationError(errorObject)
             },
         ],
@@ -457,7 +629,12 @@ export const personsModalLogic = kea<personsModalLogicType>([
         ],
         actorsQuery: [
             (s) => [(_, p) => p.orderBy, s.query, s.searchTerm, s.selectFields],
-            (orderBy, query, searchTerm, selectFields): ActorsQuery | null => {
+            (
+                orderBy,
+                query: FunnelsActorsQuery | InsightActorsQuery | null,
+                searchTerm: string,
+                selectFields: string[]
+            ): ActorsQuery | null => {
                 if (!query) {
                     return null
                 }
@@ -482,7 +659,7 @@ export const personsModalLogic = kea<personsModalLogicType>([
         ],
         exploreUrl: [
             (s) => [s.actorsQuery],
-            (actorsQuery): string | null => {
+            (actorsQuery: ActorsQuery | null): string | null => {
                 if (!actorsQuery) {
                     return null
                 }
diff --git a/frontend/src/scenes/trends/trendsDataLogic.ts b/frontend/src/scenes/trends/trendsDataLogic.ts
index 421e50941594..5d1109bb310a 100644
--- a/frontend/src/scenes/trends/trendsDataLogic.ts
+++ b/frontend/src/scenes/trends/trendsDataLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 
 import { DataColorTheme, DataColorToken } from 'lib/colors'
 import { dayjs } from 'lib/dayjs'
@@ -44,7 +44,43 @@ import {
     TrendResult,
 } from '~/types'
 
-import type { trendsDataLogicType } from './trendsDataLogicType'
+import type { Intervals } from '../../lib/components/IntervalFilter/intervals'
+import type {
+    AnyDataWarehouseNode,
+    AnyEntityNode,
+    CompareFilter,
+    DataWarehouseNode,
+    ErrorTrackingQueryResponse,
+    EventsQueryResponse,
+    FunnelsQuery,
+    GoalLine,
+    GroupNode,
+    HogQLAutocompleteResponse,
+    HogQLMetadataResponse,
+    HogQLQueryResponse,
+    HogQueryResponse,
+    InsightFilter,
+    LifecycleFilter,
+    LogAttributesQueryResponse,
+    LogValuesQueryResponse,
+    LogsQueryResponse,
+    MetricsQueryResponse,
+    PathsQuery,
+    ResultCustomizationByPosition,
+    ResultCustomizationByValue,
+    RetentionQuery,
+    SessionsQueryResponse,
+    StickinessFilter,
+    StickinessQuery,
+    TraceSpansAggregationQueryResponse,
+    TraceSpansAttributeBreakdownQueryResponse,
+    TraceSpansQueryResponse,
+    TraceSpansTreeQueryResponse,
+    TrendsFormulaNode,
+    VizSpecificOptions,
+    WebOverviewQuery,
+    WebStatsTableQuery,
+} from '../../queries/schema/schema-general'
 import { IndexedTrendResult } from './types'
 
 export const RESULT_CUSTOMIZATION_DEFAULT = ResultCustomizationBy.Value
@@ -69,6 +105,322 @@ export const INTERVAL_TO_DEFAULT_MOVING_AVERAGE_PERIOD: Record<IntervalType, num
 
 const DEFAULT_CONFIDENCE_LEVEL = 95
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface trendsDataLogicValues {
+    showPersonsModal: boolean // insightLogic
+    breakdownFilter: BreakdownFilter | null | undefined // insightVizDataLogic
+    compareFilter: CompareFilter | null | undefined // insightVizDataLogic
+    display: ChartDisplayType | null | undefined // insightVizDataLogic
+    enabledIntervals: Intervals // insightVizDataLogic
+    formula: string | null | undefined // insightVizDataLogic
+    formulaNodes: TrendsFormulaNode[] // insightVizDataLogic
+    getTheme: (themeId: number | string | null | undefined) => DataColorTheme | null // insightVizDataLogic
+    goalLines: GoalLine[] | null | undefined // insightVizDataLogic
+    hasDataWarehouseSeries: boolean // insightVizDataLogic
+    hasLegend: boolean // insightVizDataLogic
+    insightData: Record<string, any> // insightVizDataLogic
+    insightDataLoading: boolean // insightVizDataLogic
+    insightFilter: InsightFilter | null | undefined // insightVizDataLogic
+    interval: IntervalType | null | undefined // insightVizDataLogic
+    isBreakdownSeries: boolean // insightVizDataLogic
+    isLifecycle: boolean // insightVizDataLogic
+    isNonTimeSeriesDisplay: boolean // insightVizDataLogic
+    isSingleSeriesDefinition: boolean // insightVizDataLogic
+    isSingleSeriesOutput: boolean // insightVizDataLogic
+    isStickiness: boolean // insightVizDataLogic
+    isTrends: boolean // insightVizDataLogic
+    legendPosition: string | null | undefined // insightVizDataLogic
+    lifecycleFilter: LifecycleFilter | null | undefined // insightVizDataLogic
+    querySource:
+        | FunnelsQuery
+        | LifecycleQuery
+        | PathsQuery
+        | RetentionQuery
+        | StickinessQuery
+        | TrendsQuery
+        | WebOverviewQuery
+        | WebStatsTableQuery
+        | null // insightVizDataLogic
+    resultCustomizationByRaw: ResultCustomizationBy | null | undefined // insightVizDataLogic
+    series: (AnyEntityNode<AnyDataWarehouseNode> | GroupNode<DataWarehouseNode>)[] | null | undefined // insightVizDataLogic
+    showAnnotations: boolean | null | undefined // insightVizDataLogic
+    showLabelOnSeries: boolean | null | undefined // insightVizDataLogic
+    showLegend: boolean | null | undefined // insightVizDataLogic
+    showMultipleYAxes: boolean | null | undefined // insightVizDataLogic
+    showPercentStackView: boolean | null | undefined // insightVizDataLogic
+    showPercentagesOnSeries: boolean | null | undefined // insightVizDataLogic
+    showValuesOnSeries: boolean | null | undefined // insightVizDataLogic
+    stickinessFilter: StickinessFilter | null | undefined // insightVizDataLogic
+    supportsPercentStackView: boolean // insightVizDataLogic
+    theme: DataColorTheme | null // insightVizDataLogic
+    trendsFilter: TrendsFilter | null | undefined // insightVizDataLogic
+    vizSpecificOptions: VizSpecificOptions | null | undefined // insightVizDataLogic
+    yAxisScaleType: string | null | undefined // insightVizDataLogic
+    alertSeries: EventsNode[]
+    areAllSeriesVisible: boolean
+    breakdownValuesLoading: boolean
+    confidenceLevel: number
+    currentPeriodResult: IndexedTrendResult | undefined
+    getIsOnlyVisibleSeriesInLegend: (dataset: IndexedTrendResult) => boolean
+    getTrendsColor: (dataset: IndexedTrendResult) => string
+    getTrendsColorToken: (dataset: IndexedTrendResult) => [DataColorTheme | null, DataColorToken | null]
+    getTrendsHidden: (dataset: IndexedTrendResult) => boolean
+    hasBreakdownMore: boolean
+    hasPersonsModal: boolean
+    hoveredDatasetIndex: number | null
+    incompletenessOffsetFromEnd: number
+    indexedResults: IndexedTrendResult[]
+    isBreakdownValid: boolean
+    labelGroupType: number | 'none' | 'people'
+    legendSeriesIsolationMenuEligible: boolean
+    mightContainFractionalNumbers: boolean
+    movingAverageIntervals: number
+    pieChartVizOptions:
+        | {
+              disableHoverOffset?: boolean | undefined
+              hideAggregation?: boolean | undefined
+          }
+        | undefined
+    resultCustomizationBy: ResultCustomizationBy
+    resultCustomizations:
+        | Record<string, ResultCustomizationByValue>
+        | Record<number, ResultCustomizationByPosition>
+        | undefined
+    results: TrendResult[]
+    showConfidenceIntervals: boolean
+    showLegendIsolateSeriesItem: boolean
+    showMovingAverage: boolean
+    showTrendLines: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface trendsDataLogicActions {
+    setInsightData: (
+        response:
+            | ErrorTrackingQueryResponse
+            | EventsQueryResponse
+            | HogQLAutocompleteResponse
+            | HogQLMetadataResponse
+            | HogQLQueryResponse<any[]>
+            | HogQueryResponse
+            | LogAttributesQueryResponse
+            | LogsQueryResponse
+            | LogValuesQueryResponse
+            | MetricsQueryResponse
+            | Record<string, any>
+            | SessionsQueryResponse
+            | TraceSpansAggregationQueryResponse
+            | TraceSpansAttributeBreakdownQueryResponse
+            | TraceSpansQueryResponse
+            | TraceSpansTreeQueryResponse
+    ) =>
+        | ErrorTrackingQueryResponse
+        | EventsQueryResponse
+        | HogQLAutocompleteResponse
+        | HogQLMetadataResponse
+        | HogQLQueryResponse<any[]>
+        | HogQueryResponse
+        | LogAttributesQueryResponse
+        | LogsQueryResponse
+        | LogValuesQueryResponse
+        | MetricsQueryResponse
+        | Record<string, any>
+        | SessionsQueryResponse
+        | TraceSpansAggregationQueryResponse
+        | TraceSpansAttributeBreakdownQueryResponse
+        | TraceSpansQueryResponse
+        | TraceSpansTreeQueryResponse // insightVizDataLogic
+    updateBreakdownFilter: (breakdownFilter: BreakdownFilter) => {
+        breakdownFilter: BreakdownFilter
+    } // insightVizDataLogic
+    updateInsightFilter: (insightFilter: InsightFilter) => {
+        insightFilter: InsightFilter
+    } // insightVizDataLogic
+    loadMoreBreakdownValues: () => {
+        value: true
+    }
+    setBreakdownValuesLoading: (loading: boolean) => {
+        loading: boolean
+    }
+    setHoveredDatasetIndex: (index: number | null) => {
+        index: number | null
+    }
+    toggleAllResultsHidden: (
+        datasets: IndexedTrendResult[],
+        hidden: boolean
+    ) => {
+        datasets: IndexedTrendResult[]
+        hidden: boolean
+    }
+    toggleOtherSeriesHidden: (dataset: IndexedTrendResult) => {
+        dataset: IndexedTrendResult
+    }
+    toggleResultHidden: (dataset: IndexedTrendResult) => {
+        dataset: IndexedTrendResult
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface trendsDataLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        alertSeries: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => EventsNode[]
+        results: (insightData: Record<string, any>) => TrendResult[]
+        hasBreakdownMore: (insightData: Record<string, any>, isTrends: boolean) => boolean
+        hasPersonsModal: (
+            formula: string | null | undefined,
+            hasDataWarehouseSeries: boolean,
+            isLifecycle: boolean,
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null,
+            showPersonsModal: boolean
+        ) => boolean
+        isBreakdownValid: (breakdownFilter: BreakdownFilter | null | undefined) => boolean
+        indexedResults: (
+            results: TrendResult[],
+            display: ChartDisplayType | null | undefined,
+            lifecycleFilter: LifecycleFilter | null | undefined
+        ) => IndexedTrendResult[]
+        currentPeriodResult: (indexedResults: IndexedTrendResult[]) => IndexedTrendResult | undefined
+        labelGroupType: (
+            series: (AnyEntityNode<AnyDataWarehouseNode> | GroupNode<DataWarehouseNode>)[] | null | undefined,
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null,
+            isLifecycle: boolean
+        ) => number | 'none' | 'people'
+        incompletenessOffsetFromEnd: (results: TrendResult[], interval: IntervalType | null | undefined) => number
+        showConfidenceIntervals: (
+            trendsFilter: TrendsFilter | null | undefined,
+            isTrends: boolean,
+            hasDataWarehouseSeries: boolean,
+            yAxisScaleType: string | null | undefined
+        ) => boolean
+        showTrendLines: (
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null,
+            isTrends: boolean,
+            hasDataWarehouseSeries: boolean,
+            yAxisScaleType: string | null | undefined,
+            trendsFilter: TrendsFilter | null | undefined
+        ) => boolean
+        showMovingAverage: (
+            trendsFilter: TrendsFilter | null | undefined,
+            isTrends: boolean,
+            hasDataWarehouseSeries: boolean,
+            yAxisScaleType: string | null | undefined
+        ) => boolean
+        movingAverageIntervals: (
+            trendsFilter: TrendsFilter | null | undefined,
+            interval: IntervalType | null | undefined
+        ) => number
+        confidenceLevel: (trendsFilter: TrendsFilter | null | undefined) => number
+        pieChartVizOptions: (arg: VizSpecificOptions | null | undefined) =>
+            | {
+                  disableHoverOffset?: boolean | undefined
+                  hideAggregation?: boolean | undefined
+              }
+            | undefined
+        mightContainFractionalNumbers: (
+            formula: string | null | undefined,
+            series: (AnyEntityNode<AnyDataWarehouseNode> | GroupNode<DataWarehouseNode>)[] | null | undefined
+        ) => boolean
+        resultCustomizations: (
+            isTrends: boolean,
+            isStickiness: boolean,
+            trendsFilter: TrendsFilter | null | undefined,
+            stickinessFilter: StickinessFilter | null | undefined
+        ) => Record<string, ResultCustomizationByValue> | Record<number, ResultCustomizationByPosition> | undefined
+        resultCustomizationBy: (
+            resultCustomizationByRaw: ResultCustomizationBy | null | undefined
+        ) => ResultCustomizationBy
+        getTrendsColorToken: (
+            resultCustomizationBy: ResultCustomizationBy,
+            resultCustomizations:
+                | Record<string, ResultCustomizationByValue>
+                | Record<number, ResultCustomizationByPosition>
+                | undefined,
+            getTheme: (themeId: number | string | null | undefined) => DataColorTheme | null,
+            breakdownFilter: BreakdownFilter | null | undefined,
+            querySource:
+                | FunnelsQuery
+                | LifecycleQuery
+                | PathsQuery
+                | RetentionQuery
+                | StickinessQuery
+                | TrendsQuery
+                | WebOverviewQuery
+                | WebStatsTableQuery
+                | null
+        ) => (dataset: IndexedTrendResult) => [DataColorTheme | null, DataColorToken | null]
+        getTrendsColor: (
+            getTrendsColorToken: (dataset: IndexedTrendResult) => [DataColorTheme | null, DataColorToken | null]
+        ) => (dataset: IndexedTrendResult) => string
+        getTrendsHidden: (
+            resultCustomizationBy: ResultCustomizationBy,
+            resultCustomizations:
+                | Record<string, ResultCustomizationByValue>
+                | Record<number, ResultCustomizationByPosition>
+                | undefined
+        ) => (dataset: IndexedTrendResult) => boolean
+        areAllSeriesVisible: (
+            indexedResults: IndexedTrendResult[],
+            getTrendsHidden: (dataset: IndexedTrendResult) => boolean
+        ) => boolean
+        showLegendIsolateSeriesItem: (
+            indexedResults: IndexedTrendResult[],
+            getTrendsHidden: (dataset: IndexedTrendResult) => boolean
+        ) => boolean
+        legendSeriesIsolationMenuEligible: (indexedResults: IndexedTrendResult[]) => boolean
+        getIsOnlyVisibleSeriesInLegend: (
+            indexedResults: IndexedTrendResult[],
+            resultCustomizationBy: ResultCustomizationBy,
+            getTrendsHidden: (dataset: IndexedTrendResult) => boolean
+        ) => (dataset: IndexedTrendResult) => boolean
+    }
+}
+
+export type trendsDataLogicType = MakeLogicType<
+    trendsDataLogicValues,
+    trendsDataLogicActions,
+    InsightLogicProps,
+    trendsDataLogicMeta
+>
+
 export const trendsDataLogic = kea<trendsDataLogicType>([
     props({} as InsightLogicProps),
     key(keyForInsightLogicProps('all_trends')),
@@ -173,7 +525,7 @@ export const trendsDataLogic = kea<trendsDataLogicType>([
 
         hasBreakdownMore: [
             (s) => [s.insightData, s.isTrends],
-            (insightData, isTrends) => {
+            (insightData: Record<string, any>, isTrends: boolean) => {
                 if (!isTrends) {
                     return false
                 }
@@ -182,7 +534,22 @@ export const trendsDataLogic = kea<trendsDataLogicType>([
         ],
         hasPersonsModal: [
             (s) => [s.formula, s.hasDataWarehouseSeries, s.isLifecycle, s.querySource, s.showPersonsModal],
-            (formula, hasDataWarehouseSeries, isLifecycle, querySource, showPersonsModal) => {
+            (
+                formula: string | null | undefined,
+                hasDataWarehouseSeries: boolean,
+                isLifecycle: boolean,
+                querySource:
+                    | LifecycleQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').FunnelsQuery
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').RetentionQuery
+                    | import('~/queries/schema/schema-general').StickinessQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery,
+                showPersonsModal: boolean
+            ) => {
                 if (!showPersonsModal || isSharedView()) {
                     return false
                 }
@@ -206,7 +573,11 @@ export const trendsDataLogic = kea<trendsDataLogicType>([
 
         indexedResults: [
             (s) => [s.results, s.display, s.lifecycleFilter],
-            (results, display, lifecycleFilter): IndexedTrendResult[] => {
+            (
+                results: TrendResult[],
+                display: ChartDisplayType | null | undefined,
+                lifecycleFilter: null | import('~/queries/schema/schema-general').LifecycleFilter | undefined
+            ): IndexedTrendResult[] => {
                 const defaultLifecyclesOrder = ['new', 'resurrecting', 'returning', 'dormant']
                 let indexedResults = results.map((result, index) => ({ ...result, seriesIndex: index }))
 
@@ -284,7 +655,30 @@ export const trendsDataLogic = kea<trendsDataLogicType>([
 
         labelGroupType: [
             (s) => [s.series, s.querySource, s.isLifecycle],
-            (series, querySource, isLifecycle): 'people' | 'none' | number => {
+            (
+                series:
+                    | (
+                          | import('~/queries/schema/schema-general').AnyEntityNode<
+                                import('~/queries/schema/schema-general').AnyDataWarehouseNode
+                            >
+                          | import('~/queries/schema/schema-general').GroupNode<
+                                import('~/queries/schema/schema-general').DataWarehouseNode
+                            >
+                      )[]
+                    | null
+                    | undefined,
+                querySource:
+                    | LifecycleQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').FunnelsQuery
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').RetentionQuery
+                    | import('~/queries/schema/schema-general').StickinessQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery,
+                isLifecycle: boolean
+            ): 'people' | 'none' | number => {
                 // Find the commonly shared aggregation group index if there is one.
                 let firstAggregationGroupTypeIndex: 'people' | 'none' | number | undefined | null
                 if (isLifecycle) {
@@ -302,7 +696,7 @@ export const trendsDataLogic = kea<trendsDataLogicType>([
 
         incompletenessOffsetFromEnd: [
             (s) => [s.results, s.interval],
-            (results, interval) => {
+            (results: TrendResult[], interval: IntervalType | null | undefined) => {
                 // Returns negative number of points to paint over starting from end of array
                 if (results[0]?.days === undefined) {
                     return 0
@@ -402,12 +796,26 @@ export const trendsDataLogic = kea<trendsDataLogicType>([
 
         pieChartVizOptions: [
             () => [() => values.vizSpecificOptions],
-            (vizSpecificOptions) => vizSpecificOptions?.[ChartDisplayType.ActionsPie],
+            (vizSpecificOptions: null | import('~/queries/schema/schema-general').VizSpecificOptions | undefined) =>
+                vizSpecificOptions?.[ChartDisplayType.ActionsPie],
         ],
 
         mightContainFractionalNumbers: [
             (s) => [s.formula, s.series],
-            (formula, series): boolean => {
+            (
+                formula: string | null | undefined,
+                series:
+                    | (
+                          | import('~/queries/schema/schema-general').AnyEntityNode<
+                                import('~/queries/schema/schema-general').AnyDataWarehouseNode
+                            >
+                          | import('~/queries/schema/schema-general').GroupNode<
+                                import('~/queries/schema/schema-general').DataWarehouseNode
+                            >
+                      )[]
+                    | null
+                    | undefined
+            ): boolean => {
                 // Whether data points might contain fractional numbers, which involve extra display considerations,
                 // such as rounding
                 if (formula) {
@@ -422,7 +830,12 @@ export const trendsDataLogic = kea<trendsDataLogicType>([
 
         resultCustomizations: [
             (s) => [s.isTrends, s.isStickiness, s.trendsFilter, s.stickinessFilter],
-            (isTrends, isStickiness, trendsFilter, stickinessFilter) => {
+            (
+                isTrends: boolean,
+                isStickiness: boolean,
+                trendsFilter: TrendsFilter | null | undefined,
+                stickinessFilter: null | import('~/queries/schema/schema-general').StickinessFilter | undefined
+            ) => {
                 if (isTrends) {
                     return trendsFilter?.resultCustomizations
                 }
@@ -434,12 +847,31 @@ export const trendsDataLogic = kea<trendsDataLogicType>([
         ],
         resultCustomizationBy: [
             (s) => [s.resultCustomizationByRaw],
-            (resultCustomizationByRaw) => resultCustomizationByRaw || RESULT_CUSTOMIZATION_DEFAULT,
+            (resultCustomizationByRaw: ResultCustomizationBy | null | undefined) =>
+                resultCustomizationByRaw || RESULT_CUSTOMIZATION_DEFAULT,
         ],
 
         getTrendsColorToken: [
             (s) => [s.resultCustomizationBy, s.resultCustomizations, s.getTheme, s.breakdownFilter, s.querySource],
-            (resultCustomizationBy, resultCustomizations, getTheme, breakdownFilter, querySource) => {
+            (
+                resultCustomizationBy: ResultCustomizationBy,
+                resultCustomizations:
+                    | Record<string, import('~/queries/schema/schema-general').ResultCustomizationByValue>
+                    | Record<number, import('~/queries/schema/schema-general').ResultCustomizationByPosition>
+                    | undefined,
+                getTheme: (themeId: number | string | null | undefined) => DataColorTheme | null,
+                breakdownFilter: BreakdownFilter | null | undefined,
+                querySource:
+                    | LifecycleQuery
+                    | TrendsQuery
+                    | null
+                    | import('~/queries/schema/schema-general').FunnelsQuery
+                    | import('~/queries/schema/schema-general').PathsQuery
+                    | import('~/queries/schema/schema-general').RetentionQuery
+                    | import('~/queries/schema/schema-general').StickinessQuery
+                    | import('~/queries/schema/schema-general').WebOverviewQuery
+                    | import('~/queries/schema/schema-general').WebStatsTableQuery
+            ) => {
                 return (dataset: IndexedTrendResult): [DataColorTheme | null, DataColorToken | null] => {
                     // stringified breakdown value
                     const key = getTrendDatasetKey(dataset)
@@ -481,7 +913,7 @@ export const trendsDataLogic = kea<trendsDataLogicType>([
         ],
         getTrendsColor: [
             (s) => [s.getTrendsColorToken],
-            (getTrendsColorToken) => {
+            (getTrendsColorToken: (dataset: IndexedTrendResult) => [DataColorTheme | null, DataColorToken | null]) => {
                 return (dataset: IndexedTrendResult) => {
                     const [colorTheme, colorToken] = getTrendsColorToken(dataset)
                     return colorTheme && colorToken ? getColorFromToken(colorTheme, colorToken) : '#000000'
@@ -490,7 +922,13 @@ export const trendsDataLogic = kea<trendsDataLogicType>([
         ],
         getTrendsHidden: [
             (s) => [s.resultCustomizationBy, s.resultCustomizations],
-            (resultCustomizationBy, resultCustomizations) => {
+            (
+                resultCustomizationBy: ResultCustomizationBy,
+                resultCustomizations:
+                    | Record<string, import('~/queries/schema/schema-general').ResultCustomizationByValue>
+                    | Record<number, import('~/queries/schema/schema-general').ResultCustomizationByPosition>
+                    | undefined
+            ) => {
                 return (dataset: IndexedTrendResult): boolean => {
                     const resultCustomization = getTrendResultCustomization(
                         resultCustomizationBy,
@@ -504,13 +942,18 @@ export const trendsDataLogic = kea<trendsDataLogicType>([
 
         areAllSeriesVisible: [
             (s) => [s.indexedResults, s.getTrendsHidden],
-            (indexedResults, getTrendsHidden): boolean => indexedResults.every((d) => !getTrendsHidden(d)),
+            (
+                indexedResults: IndexedTrendResult[],
+                getTrendsHidden: (dataset: IndexedTrendResult) => boolean
+            ): boolean => indexedResults.every((d) => !getTrendsHidden(d)),
         ],
 
         showLegendIsolateSeriesItem: [
             (s) => [s.indexedResults, s.getTrendsHidden],
-            (indexedResults, getTrendsHidden): boolean =>
-                indexedResults.length > 0 && !indexedResults.every((d) => getTrendsHidden(d)),
+            (
+                indexedResults: IndexedTrendResult[],
+                getTrendsHidden: (dataset: IndexedTrendResult) => boolean
+            ): boolean => indexedResults.length > 0 && !indexedResults.every((d) => getTrendsHidden(d)),
         ],
 
         legendSeriesIsolationMenuEligible: [
@@ -520,7 +963,11 @@ export const trendsDataLogic = kea<trendsDataLogicType>([
 
         getIsOnlyVisibleSeriesInLegend: [
             (s) => [s.indexedResults, s.resultCustomizationBy, s.getTrendsHidden],
-            (indexedResults, resultCustomizationBy, getTrendsHidden) => {
+            (
+                indexedResults: IndexedTrendResult[],
+                resultCustomizationBy: ResultCustomizationBy,
+                getTrendsHidden: (dataset: IndexedTrendResult) => boolean
+            ) => {
                 if (indexedResults.length < 2) {
                     return (): boolean => false
                 }
diff --git a/frontend/src/scenes/userLogic.ts b/frontend/src/scenes/userLogic.ts
index 904988e9c9cd..b65da5f3368c 100644
--- a/frontend/src/scenes/userLogic.ts
+++ b/frontend/src/scenes/userLogic.ts
@@ -1,5 +1,6 @@
-import { actions, afterMount, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, listeners, path, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 import posthog from 'posthog-js'
@@ -15,8 +16,8 @@ import { sidePanelStateLogic } from '~/layout/navigation-3000/sidepanel/sidePane
 import { ProductKey } from '~/queries/schema/schema-general'
 import { AvailableFeature, NotificationSettings, OrganizationBasicType, UserRole, UserTheme, UserType } from '~/types'
 
+import type { BillingFeatureType } from '../types'
 import { urls } from './urls'
-import type { userLogicType } from './userLogicType'
 
 export interface UserDetailsFormType {
     first_name: string
@@ -64,6 +65,353 @@ function updateDigestProjectSettings(
     })
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface userLogicValues {
+    availableFeature: (feature: AvailableFeature) => BillingFeatureType | null | undefined
+    credentialReviewDismissedInSession: boolean
+    hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean
+    isImpersonationUpgradeInProgress: boolean
+    isUserDetailsSubmitting: boolean
+    isUserDetailsValid: boolean
+    isUserNonTechnical: boolean
+    optimisticThemeMode: UserTheme | null
+    otherOrganizations: OrganizationBasicType[]
+    showUserDetailsErrors: boolean
+    themeMode: UserTheme
+    user: UserType | null
+    userDetails: UserDetailsFormType
+    userDetailsAllErrors: Record<string, any>
+    userDetailsChanged: boolean
+    userDetailsErrors: DeepPartialMap<Record<string, any>, ValidationErrorType>
+    userDetailsHasErrors: boolean
+    userDetailsManualErrors: Record<string, any>
+    userDetailsTouched: boolean
+    userDetailsTouches: Record<string, boolean>
+    userDetailsValidationErrors: DeepPartialMap<Record<string, any>, ValidationErrorType>
+    userLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface userLogicActions {
+    cancelEmailChangeRequest: () => {
+        value: true
+    }
+    cancelEmailChangeRequestFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    cancelEmailChangeRequestSuccess: (
+        user: UserType,
+        payload?: {
+            value: true
+        }
+    ) => {
+        user: UserType
+        payload?: {
+            value: true
+        }
+    }
+    credentialReviewDismissed: () => {
+        value: true
+    }
+    deleteUser: () => {
+        value: true
+    }
+    deleteUserFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteUserSuccess: (
+        user: UserType | null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        user: UserType | null
+        payload?: {
+            value: true
+        }
+    }
+    loadUser: (resetOnFailure?: boolean) => {
+        resetOnFailure: boolean | undefined
+    }
+    loadUserFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadUserSuccess: (
+        user: UserType | null,
+        payload?: {
+            resetOnFailure: boolean | undefined
+        }
+    ) => {
+        user: UserType | null
+        payload?: {
+            resetOnFailure: boolean | undefined
+        }
+    }
+    logout: (preserveLocation?: any) => {
+        preserveLocation: any
+    }
+    resetUserDetails: (values?: Record<string, any>) => {
+        values?: Record<string, any>
+    }
+    setUserDetailsManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setUserDetailsValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setUserDetailsValues: (values: DeepPartial<Record<string, any>>) => {
+        values: DeepPartial<Record<string, any>>
+    }
+    setUserScenePersonalisation: (
+        scene: DashboardCompatibleScenes,
+        dashboard: number
+    ) => {
+        dashboard: number
+        scene: DashboardCompatibleScenes
+    }
+    setUserScenePersonalisationFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    setUserScenePersonalisationSuccess: (
+        user: UserType,
+        payload?: {
+            dashboard: number
+            scene: DashboardCompatibleScenes
+        }
+    ) => {
+        user: UserType
+        payload?: {
+            dashboard: number
+            scene: DashboardCompatibleScenes
+        }
+    }
+    submitUserDetails: () => {
+        value: boolean
+    }
+    submitUserDetailsFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitUserDetailsRequest: (userDetails: Record<string, any>) => {
+        userDetails: Record<string, any>
+    }
+    submitUserDetailsSuccess: (userDetails: Record<string, any>) => {
+        userDetails: Record<string, any>
+    }
+    switchTeam: (
+        teamId: number | string,
+        destination?: string
+    ) => {
+        destination: string | undefined
+        teamId: number | string
+    }
+    touchUserDetailsField: (key: string) => {
+        key: string
+    }
+    updateAllRealtimeNotifications: (
+        teamIds: number[],
+        types: string[],
+        enabled: boolean
+    ) => {
+        enabled: boolean
+        teamIds: number[]
+        types: string[]
+    }
+    updateCurrentOrganization: (
+        organizationId: string,
+        destination?: string
+    ) => {
+        destination: string | undefined
+        organizationId: string
+    }
+    updateDataPipelineErrorThreshold: (threshold: number) => {
+        threshold: number
+    }
+    updateETWeeklyDigestForAllTeams: (
+        teamIds: number[],
+        enabled: boolean
+    ) => {
+        enabled: boolean
+        teamIds: number[]
+    }
+    updateETWeeklyDigestForTeam: (
+        teamId: number,
+        enabled: boolean
+    ) => {
+        enabled: boolean
+        teamId: number
+    }
+    updateHasSeenProductIntroFor: (
+        productKey: ProductKey,
+        value?: boolean
+    ) => {
+        productKey: ProductKey
+        value: boolean
+    }
+    updateMemberJoinEmailForAllOrganizations: (
+        organizationIds: string[],
+        enabled: boolean
+    ) => {
+        enabled: boolean
+        organizationIds: string[]
+    }
+    updateMemberJoinEmailForOrganization: (
+        organizationId: string,
+        enabled: boolean
+    ) => {
+        enabled: boolean
+        organizationId: string
+    }
+    updatePipelineNotification: (
+        pipelineId: string,
+        enabled: boolean
+    ) => {
+        enabled: boolean
+        pipelineId: string
+    }
+    updatePipelineNotificationForAll: (
+        pipelineIds: string[],
+        enabled: boolean
+    ) => {
+        enabled: boolean
+        pipelineIds: string[]
+    }
+    updateRealtimeNotificationForProject: (
+        teamId: number,
+        types: string[],
+        enabled: boolean
+    ) => {
+        enabled: boolean
+        teamId: number
+        types: string[]
+    }
+    updateRealtimeNotificationForTeam: (
+        type: string,
+        teamId: number,
+        enabled: boolean
+    ) => {
+        enabled: boolean
+        teamId: number
+        type: string
+    }
+    updateUser: (
+        user: Partial<UserType>,
+        successCallback?: () => void
+    ) => {
+        successCallback: (() => void) | undefined
+        user: Partial<UserType>
+    }
+    updateUserFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateUserSuccess: (
+        user: UserType,
+        payload?: {
+            successCallback: (() => void) | undefined
+            user: Partial<UserType>
+        }
+    ) => {
+        user: UserType
+        payload?: {
+            successCallback: (() => void) | undefined
+            user: Partial<UserType>
+        }
+    }
+    updateWAWeeklyDigestForAllTeams: (
+        teamIds: number[],
+        enabled: boolean
+    ) => {
+        enabled: boolean
+        teamIds: number[]
+    }
+    updateWAWeeklyDigestForTeam: (
+        teamId: number,
+        enabled: boolean
+    ) => {
+        enabled: boolean
+        teamId: number
+    }
+    updateWeeklyDigestForAllTeams: (
+        teamIds: number[],
+        enabled: boolean
+    ) => {
+        enabled: boolean
+        teamIds: number[]
+    }
+    updateWeeklyDigestForTeam: (
+        teamId: number,
+        enabled: boolean
+    ) => {
+        enabled: boolean
+        teamId: number
+    }
+    upgradeImpersonation: (reason: string) => {
+        reason: string
+    }
+    upgradeImpersonationFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    upgradeImpersonationSuccess: (
+        user: UserType | null,
+        payload?: {
+            reason: string
+        }
+    ) => {
+        user: UserType | null
+        payload?: {
+            reason: string
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface userLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        hasAvailableFeature: (
+            user: UserType | null
+        ) => (feature: AvailableFeature, currentUsage?: number | undefined) => boolean
+        availableFeature: (
+            user: UserType | null
+        ) => (feature: AvailableFeature) => BillingFeatureType | null | undefined
+        otherOrganizations: (user: UserType | null) => OrganizationBasicType[]
+        themeMode: (user: UserType | null, optimisticThemeMode: UserTheme | null) => UserTheme
+        isUserNonTechnical: (user: UserType | null) => boolean
+    }
+}
+
+export type userLogicType = MakeLogicType<userLogicValues, userLogicActions, Record<string, any>, userLogicMeta>
+
 export const userLogic = kea<userLogicType>([
     path(['scenes', 'userLogic']),
     actions(() => ({
@@ -614,7 +962,7 @@ export const userLogic = kea<userLogicType>([
     selectors({
         hasAvailableFeature: [
             (s) => [s.user],
-            (user) => {
+            (user: UserType | null) => {
                 return (feature: AvailableFeature, currentUsage?: number) => {
                     const availableProductFeatures = user?.organization?.available_product_features
                     if (availableProductFeatures && availableProductFeatures.length > 0) {
@@ -633,7 +981,7 @@ export const userLogic = kea<userLogicType>([
         ],
         availableFeature: [
             (s) => [s.user],
-            (user) => {
+            (user: UserType | null) => {
                 return (feature: AvailableFeature) => {
                     const availableProductFeatures = user?.organization?.available_product_features
                     if (availableProductFeatures && availableProductFeatures.length > 0) {
@@ -645,7 +993,7 @@ export const userLogic = kea<userLogicType>([
         ],
         otherOrganizations: [
             (s) => [s.user],
-            (user): OrganizationBasicType[] =>
+            (user: UserType | null): OrganizationBasicType[] =>
                 user
                     ? user.organizations
                           ?.filter((organization) => organization.id !== user.organization?.id)
@@ -657,14 +1005,14 @@ export const userLogic = kea<userLogicType>([
 
         themeMode: [
             (s) => [s.user, s.optimisticThemeMode],
-            (user, optimisticThemeMode): UserTheme => {
+            (user: UserType | null, optimisticThemeMode: UserTheme | null): UserTheme => {
                 return optimisticThemeMode ?? user?.theme_mode ?? 'light'
             },
         ],
 
         isUserNonTechnical: [
             (s) => [s.user],
-            (user): boolean => {
+            (user: UserType | null): boolean => {
                 const nonTechnicalRoles = [
                     UserRole.Founder,
                     UserRole.Leadership,
diff --git a/frontend/src/scenes/web-analytics/LiveMetricsDashboard/livePersonDrillDownDrawerLogic.ts b/frontend/src/scenes/web-analytics/LiveMetricsDashboard/livePersonDrillDownDrawerLogic.ts
index b0cf71a11ef2..775797982e6f 100644
--- a/frontend/src/scenes/web-analytics/LiveMetricsDashboard/livePersonDrillDownDrawerLogic.ts
+++ b/frontend/src/scenes/web-analytics/LiveMetricsDashboard/livePersonDrillDownDrawerLogic.ts
@@ -1,6 +1,4 @@
-import { actions, kea, path, reducers } from 'kea'
-
-import type { livePersonDrillDownDrawerLogicType } from './livePersonDrillDownDrawerLogicType'
+import { MakeLogicType, actions, kea, path, reducers } from 'kea'
 
 export type LivePersonDrillDownBreakdownType = 'country' | 'city' | 'device' | 'browser'
 
@@ -10,6 +8,24 @@ export interface LivePersonDrillDownSelection {
     breakdownLabel: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface livePersonDrillDownDrawerLogicValues {
+    currentSelection: LivePersonDrillDownSelection | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface livePersonDrillDownDrawerLogicActions {
+    closeDrillDown: () => {
+        value: true
+    }
+    openDrillDown: (selection: LivePersonDrillDownSelection) => LivePersonDrillDownSelection
+}
+
+export type livePersonDrillDownDrawerLogicType = MakeLogicType<
+    livePersonDrillDownDrawerLogicValues,
+    livePersonDrillDownDrawerLogicActions
+>
+
 export const livePersonDrillDownDrawerLogic = kea<livePersonDrillDownDrawerLogicType>([
     path(['scenes', 'webAnalytics', 'livePersonDrillDownDrawerLogic']),
     actions({
diff --git a/frontend/src/scenes/web-analytics/LiveMetricsDashboard/livePersonDrillDownLogic.ts b/frontend/src/scenes/web-analytics/LiveMetricsDashboard/livePersonDrillDownLogic.ts
index 449726427ebb..7e6f67ab0eb0 100644
--- a/frontend/src/scenes/web-analytics/LiveMetricsDashboard/livePersonDrillDownLogic.ts
+++ b/frontend/src/scenes/web-analytics/LiveMetricsDashboard/livePersonDrillDownLogic.ts
@@ -1,5 +1,5 @@
 import { deepEqual as equal } from 'fast-equals'
-import { actions, connect, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { parsePersonFromHogQLRow } from 'scenes/persons/person-utils'
@@ -13,8 +13,9 @@ import { PersonType } from '~/types'
 
 import { LiveMetricsSlidingWindow } from './LiveMetricsSlidingWindow'
 import { LivePersonDrillDownBreakdownType, livePersonDrillDownDrawerLogic } from './livePersonDrillDownDrawerLogic'
-import type { livePersonDrillDownLogicType } from './livePersonDrillDownLogicType'
 import { liveWebAnalyticsMetricsLogic } from './liveWebAnalyticsMetricsLogic'
+import type { LivePersonDrillDownSelection } from './livePersonDrillDownDrawerLogic'
+import type { TeamPublicType, TeamType } from '../../../types'
 
 export const COOKIELESS_DISTINCT_ID_PREFIX = 'cookieless_'
 export const PERSON_HYDRATION_LIMIT = 200
@@ -58,6 +59,100 @@ export const aggregateRecordingCountsByPerson = (
     return byKey
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface livePersonDrillDownLogicValues {
+    currentSelection: LivePersonDrillDownSelection | null; // livePersonDrillDownDrawerLogic
+    eventsVersion: number; // liveWebAnalyticsMetricsLogic
+    geoVersion: number; // liveWebAnalyticsMetricsLogic
+    slidingWindow: LiveMetricsSlidingWindow; // liveWebAnalyticsMetricsLogic
+    currentTeam: TeamPublicType | TeamType | null; // teamLogic
+    anonymousCount: number;
+    currentDistinctIds: string[];
+    displayedDistinctIds: string[];
+    identifiedCount: number;
+    identifiedDistinctIds: string[];
+    isTruncated: boolean;
+    newVisitorCount: number;
+    partitionedDistinctIds: {
+        anonymous: string[];
+        identified: string[];
+    };
+    persons: PersonType[];
+    personsLoading: boolean;
+    recordingCountByPersonKey: Record<string, number>;
+    recordingCountsByDistinctId: Record<string, number>;
+    recordingCountsByDistinctIdLoading: boolean;
+    totalCount: number;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface livePersonDrillDownLogicActions {
+    loadPersons: ({ distinctIds }: {
+        distinctIds: string[];
+    }) => {
+        distinctIds: string[];
+    };
+    loadPersonsFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadPersonsSuccess: (persons: PersonType[], payload?: {
+        distinctIds: string[];
+    }) => {
+        persons: PersonType[];
+        payload?: {
+            distinctIds: string[];
+        };
+    };
+    loadRecordingCounts: ({ distinctIds }: {
+        distinctIds: string[];
+    }) => {
+        distinctIds: string[];
+    };
+    loadRecordingCountsFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadRecordingCountsSuccess: (recordingCountsByDistinctId: Record<string, number>, payload?: {
+        distinctIds: string[];
+    }) => {
+        recordingCountsByDistinctId: Record<string, number>;
+        payload?: {
+            distinctIds: string[];
+        };
+    };
+    refresh: () => {
+        value: true;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface livePersonDrillDownLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        currentDistinctIds: (slidingWindow: LiveMetricsSlidingWindow, eventsVersion: number, geoVersion: number, arg: any) => string[];
+        partitionedDistinctIds: (currentDistinctIds: string[]) => {
+            anonymous: string[];
+            identified: string[];
+        };
+        identifiedDistinctIds: (partitionedDistinctIds: {
+            anonymous: string[];
+            identified: string[];
+        }) => string[];
+        anonymousCount: (partitionedDistinctIds: {
+            anonymous: string[];
+            identified: string[];
+        }) => number;
+        totalCount: (currentDistinctIds: string[]) => number;
+        identifiedCount: (identifiedDistinctIds: string[]) => number;
+        newVisitorCount: (identifiedDistinctIds: string[], displayedDistinctIds: string[]) => number;
+        isTruncated: (identifiedCount: number) => boolean;
+        recordingCountByPersonKey: (persons: PersonType[], recordingCountsByDistinctId: Record<string, number>) => Record<string, number>;
+    };
+}
+
+export type livePersonDrillDownLogicType = MakeLogicType<livePersonDrillDownLogicValues, livePersonDrillDownLogicActions, LivePersonDrillDownLogicProps, livePersonDrillDownLogicMeta>;
+
 export const livePersonDrillDownLogic = kea<livePersonDrillDownLogicType>([
     props({} as LivePersonDrillDownLogicProps),
     key((p) => `${p.breakdownType}:${p.breakdownValue}`),
diff --git a/frontend/src/scenes/web-analytics/LiveMetricsDashboard/liveWebAnalyticsLayoutLogic.ts b/frontend/src/scenes/web-analytics/LiveMetricsDashboard/liveWebAnalyticsLayoutLogic.ts
index 157fdded5e04..d426b9a44db3 100644
--- a/frontend/src/scenes/web-analytics/LiveMetricsDashboard/liveWebAnalyticsLayoutLogic.ts
+++ b/frontend/src/scenes/web-analytics/LiveMetricsDashboard/liveWebAnalyticsLayoutLogic.ts
@@ -1,11 +1,50 @@
-import { actions, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers, selectors } from 'kea'
 
 import { DEFAULT_CONTENT_ORDER, DEFAULT_STAT_ORDER, LiveContentCardId, LiveStatCardId, mergeOrder } from './liveCards'
-import type { liveWebAnalyticsLayoutLogicType } from './liveWebAnalyticsLayoutLogicType'
 
 const teamId = window.POSTHOG_APP_CONTEXT?.current_team?.id
 const persistConfig = { persist: true, prefix: `${teamId}__` }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface liveWebAnalyticsLayoutLogicValues {
+    cardOrder: LiveContentCardId[]
+    isEditing: boolean
+    persistedCardOrder: LiveContentCardId[]
+    persistedStatOrder: LiveStatCardId[]
+    statOrder: LiveStatCardId[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface liveWebAnalyticsLayoutLogicActions {
+    resetLayout: () => {
+        value: true
+    }
+    setCardOrder: (order: LiveContentCardId[]) => {
+        order: LiveContentCardId[]
+    }
+    setEditing: (editing: boolean) => {
+        editing: boolean
+    }
+    setStatOrder: (order: LiveStatCardId[]) => {
+        order: LiveStatCardId[]
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface liveWebAnalyticsLayoutLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        statOrder: (persistedStatOrder: LiveStatCardId[]) => LiveStatCardId[]
+        cardOrder: (persistedCardOrder: LiveContentCardId[]) => LiveContentCardId[]
+    }
+}
+
+export type liveWebAnalyticsLayoutLogicType = MakeLogicType<
+    liveWebAnalyticsLayoutLogicValues,
+    liveWebAnalyticsLayoutLogicActions,
+    Record<string, any>,
+    liveWebAnalyticsLayoutLogicMeta
+>
+
 export const liveWebAnalyticsLayoutLogic = kea<liveWebAnalyticsLayoutLogicType>([
     path(['scenes', 'webAnalytics', 'liveWebAnalyticsLayoutLogic']),
     actions({
diff --git a/frontend/src/scenes/web-analytics/LiveMetricsDashboard/liveWebAnalyticsMetricsLogic.tsx b/frontend/src/scenes/web-analytics/LiveMetricsDashboard/liveWebAnalyticsMetricsLogic.tsx
index 0c8d0c87dc1c..8cec83a96168 100644
--- a/frontend/src/scenes/web-analytics/LiveMetricsDashboard/liveWebAnalyticsMetricsLogic.tsx
+++ b/frontend/src/scenes/web-analytics/LiveMetricsDashboard/liveWebAnalyticsMetricsLogic.tsx
@@ -1,5 +1,5 @@
 import { deepEqual as equal } from 'fast-equals'
-import { actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
 import { subscriptions } from 'kea-subscriptions'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -30,7 +30,6 @@ import { BaseMathType, LiveEvent, PropertyFilterType, PropertyOperator } from '~
 
 import { createStreamConnection } from './createStreamConnection'
 import { LiveMetricsSlidingWindow } from './LiveMetricsSlidingWindow'
-import type { liveWebAnalyticsMetricsLogicType } from './liveWebAnalyticsMetricsLogicType'
 import {
     BOT_ELIGIBLE_EVENTS,
     BOT_KEY_SEPARATOR,
@@ -53,6 +52,8 @@ import {
     pruneRecentUsersByLastSeen,
     upsertRecentUsersByLastSeenFromEvents,
 } from './recentUsersByLastSeen'
+import type { TeamPublicType, TeamType } from '../../../types'
+import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
 
 const ERROR_TOAST_ID = 'live-pageviews-error'
 const RECONNECT_TOAST_ID = 'live-pageviews-reconnect'
@@ -85,6 +86,124 @@ const collapseTopWithOther = <T extends { count: number; percentage: number }>(
     return [...top, makeOther(othersCount, othersPercentage)]
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface liveWebAnalyticsMetricsLogicValues {
+    featureFlags: FeatureFlagsSet; // featureFlagLogic
+    currentTeam: TeamPublicType | TeamType | null; // teamLogic
+    rawLiveFilters: WebAnalyticsPropertyFilter[]; // webAnalyticsFilterLogic
+    rawSelectedHost: string | null; // webAnalyticsFilterLogic
+    productTab: ProductTab; // webAnalyticsLogic
+    botBreakdown: BotBreakdownItem[];
+    browserBreakdown: BrowserBreakdownItem[];
+    chartData: ChartDataPoint[];
+    cityBreakdown: CityBreakdownItem[];
+    countryBreakdown: CountryBreakdownItem[];
+    deviceBreakdown: DeviceBreakdownItem[];
+    eventsVersion: number;
+    geoVersion: number;
+    hasActiveFilters: boolean;
+    isLoading: boolean;
+    liveFilters: WebAnalyticsPropertyFilter[];
+    liveUserCount: number;
+    recentEvents: LiveEvent[];
+    recentUsersByLastSeen: Map<string, number>;
+    selectedHost: string | null;
+    slidingWindow: LiveMetricsSlidingWindow;
+    topCityBreakdown: CityBreakdownItem[];
+    topCountryBreakdown: CountryBreakdownItem[];
+    topPaths: PathItem[];
+    topReferrers: ReferrerItem[];
+    totalBotEligibleEvents: number;
+    totalBotEvents: number;
+    totalBrowsers: number;
+    totalPageviews: number;
+    totalUniqueVisitors: number;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface liveWebAnalyticsMetricsLogicActions {
+    addEvents: (events: LiveEvent[], newerThan: Date) => {
+        events: LiveEvent[];
+        newerThan: Date;
+    };
+    addGeoEvents: (events: LiveGeoEvent[]) => {
+        events: LiveGeoEvent[];
+    };
+    clearFilteredLiveUsers: () => {
+        value: true;
+    };
+    clearRecentEvents: () => {
+        value: true;
+    };
+    loadInitialData: () => {
+        value: true;
+    };
+    pauseStream: () => {
+        value: true;
+    };
+    resumeStream: () => {
+        value: true;
+    };
+    setInitialData: (buckets: {
+        bucket: SlidingWindowBucket;
+        timestamp: number;
+    }[], recentUsersByLastSeen: [
+        string,
+        number
+    ][]) => {
+        buckets: {
+            bucket: SlidingWindowBucket;
+            timestamp: number;
+        }[];
+        recentUsersByLastSeen: [
+            string,
+            number
+        ][];
+    };
+    setIsLoading: (loading: boolean) => {
+        loading: boolean;
+    };
+    tickCurrentMinute: () => {
+        value: true;
+    };
+    tickLiveUserCount: () => {
+        value: true;
+    };
+    updateConnection: () => {
+        value: true;
+    };
+    updateGeoConnection: () => {
+        value: true;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface liveWebAnalyticsMetricsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        chartData: (slidingWindow: LiveMetricsSlidingWindow, eventsVersion: number) => ChartDataPoint[];
+        deviceBreakdown: (slidingWindow: LiveMetricsSlidingWindow, eventsVersion: number) => DeviceBreakdownItem[];
+        browserBreakdown: (slidingWindow: LiveMetricsSlidingWindow, eventsVersion: number) => BrowserBreakdownItem[];
+        countryBreakdown: (slidingWindow: LiveMetricsSlidingWindow, geoVersion: number) => CountryBreakdownItem[];
+        topCountryBreakdown: (countryBreakdown: CountryBreakdownItem[]) => CountryBreakdownItem[];
+        cityBreakdown: (slidingWindow: LiveMetricsSlidingWindow, eventsVersion: number) => CityBreakdownItem[];
+        topCityBreakdown: (cityBreakdown: CityBreakdownItem[]) => CityBreakdownItem[];
+        topPaths: (slidingWindow: LiveMetricsSlidingWindow, eventsVersion: number) => PathItem[];
+        topReferrers: (slidingWindow: LiveMetricsSlidingWindow, eventsVersion: number) => ReferrerItem[];
+        totalPageviews: (slidingWindow: LiveMetricsSlidingWindow, eventsVersion: number) => number;
+        totalUniqueVisitors: (slidingWindow: LiveMetricsSlidingWindow, eventsVersion: number) => number;
+        totalBrowsers: (slidingWindow: LiveMetricsSlidingWindow, eventsVersion: number) => number;
+        botBreakdown: (slidingWindow: LiveMetricsSlidingWindow, eventsVersion: number) => BotBreakdownItem[];
+        totalBotEvents: (slidingWindow: LiveMetricsSlidingWindow, eventsVersion: number) => number;
+        totalBotEligibleEvents: (slidingWindow: LiveMetricsSlidingWindow, eventsVersion: number) => number;
+        liveUserCount: (recentUsersByLastSeen: Map<string, number>) => number;
+        selectedHost: (rawSelectedHost: string | null, productTab: ProductTab) => string | null;
+        liveFilters: (rawLiveFilters: WebAnalyticsPropertyFilter[]) => WebAnalyticsPropertyFilter[];
+        hasActiveFilters: (liveFilters: WebAnalyticsPropertyFilter[]) => boolean;
+    };
+}
+
+export type liveWebAnalyticsMetricsLogicType = MakeLogicType<liveWebAnalyticsMetricsLogicValues, liveWebAnalyticsMetricsLogicActions, Record<string, any>, liveWebAnalyticsMetricsLogicMeta>;
+
 export const liveWebAnalyticsMetricsLogic = kea<liveWebAnalyticsMetricsLogicType>([
     path(['scenes', 'web-analytics', 'livePageviewsLogic']),
     connect(() => ({
diff --git a/frontend/src/scenes/web-analytics/LiveMetricsDashboard/liveWorldMapLogic.tsx b/frontend/src/scenes/web-analytics/LiveMetricsDashboard/liveWorldMapLogic.tsx
index 51fc7f71c5e2..37781edc48ae 100644
--- a/frontend/src/scenes/web-analytics/LiveMetricsDashboard/liveWorldMapLogic.tsx
+++ b/frontend/src/scenes/web-analytics/LiveMetricsDashboard/liveWorldMapLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, events, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, events, kea, listeners, path, reducers, selectors } from 'kea'
 
 import { getSeriesColor } from 'lib/colors'
 import { COUNTRY_CODE_TO_LONG_NAME, countryCodeToFlag } from 'lib/utils/country'
@@ -6,7 +6,6 @@ import { COUNTRY_CODE_TO_LONG_NAME, countryCodeToFlag } from 'lib/utils/country'
 import type { DisposablesManager } from '~/kea-disposables'
 
 import { CountryBreakdownItem } from './LiveWebAnalyticsMetricsTypes'
-import type { liveWorldMapLogicType } from './liveWorldMapLogicType'
 
 const HEAT_DECAY_MS = 3000
 const HEAT_UPDATE_INTERVAL_MS = 250
@@ -24,6 +23,83 @@ export interface TooltipData {
     y: number
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface liveWorldMapLogicValues {
+    countryCodeToCount: Record<string, number>
+    countryData: CountryBreakdownItem[]
+    countryHeat: Record<string, number>
+    hasData: boolean
+    hoveredCountryCode: string | null
+    mapColor: string
+    maxCount: number
+    tooltipCoordinates: {
+        x: number
+        y: number
+    } | null
+    tooltipData: TooltipData | null
+    tooltipPosition: {
+        left: number
+        top: number
+    } | null
+    totalEvents: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface liveWorldMapLogicActions {
+    hideTooltip: () => {
+        value: true
+    }
+    setCountryHeat: (heat: Record<string, number>) => {
+        heat: Record<string, number>
+    }
+    showTooltip: (countryCode: string) => {
+        countryCode: string
+    }
+    updateCountryData: (
+        data: CountryBreakdownItem[],
+        totalEvents: number
+    ) => {
+        data: CountryBreakdownItem[]
+        totalEvents: number
+    }
+    updateTooltipCoordinates: (
+        x: number,
+        y: number
+    ) => {
+        x: number
+        y: number
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface liveWorldMapLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        countryCodeToCount: (countryData: CountryBreakdownItem[]) => Record<string, number>
+        maxCount: (countryData: CountryBreakdownItem[]) => number
+        hasData: (countryData: CountryBreakdownItem[]) => boolean
+        tooltipData: (
+            hoveredCountryCode: string | null,
+            tooltipCoordinates: {
+                x: number
+                y: number
+            } | null,
+            countryCodeToCount: Record<string, number>,
+            totalEvents: number
+        ) => TooltipData | null
+        tooltipPosition: (tooltipData: TooltipData | null) => {
+            left: number
+            top: number
+        } | null
+    }
+}
+
+export type liveWorldMapLogicType = MakeLogicType<
+    liveWorldMapLogicValues,
+    liveWorldMapLogicActions,
+    Record<string, any>,
+    liveWorldMapLogicMeta
+>
+
 export const liveWorldMapLogic = kea<liveWorldMapLogicType>([
     path(['scenes', 'web-analytics', 'LiveMetricsDashboard', 'liveWorldMapLogic']),
     actions({
diff --git a/frontend/src/scenes/web-analytics/SessionAttributionExplorer/sessionAttributionExplorerLogic.ts b/frontend/src/scenes/web-analytics/SessionAttributionExplorer/sessionAttributionExplorerLogic.ts
index a42cac3d9450..a970934bd304 100644
--- a/frontend/src/scenes/web-analytics/SessionAttributionExplorer/sessionAttributionExplorerLogic.ts
+++ b/frontend/src/scenes/web-analytics/SessionAttributionExplorer/sessionAttributionExplorerLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, path, reducers, selectors } from 'kea'
 import { actionToUrl, urlToAction } from 'kea-router'
 
 import { TaxonomicFilterGroupType } from 'lib/components/TaxonomicFilter/types'
@@ -17,7 +17,7 @@ import {
 } from '~/queries/schema/schema-general'
 import { Breadcrumb, SessionPropertyFilter } from '~/types'
 
-import type { sessionAttributionExplorerLogicType } from './sessionAttributionExplorerLogicType'
+import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
 
 export const initialProperties = [] as SessionPropertyFilter[]
 export const initialGroupBy = [
@@ -27,6 +27,56 @@ export const initialGroupBy = [
     SessionAttributionGroupBy.ReferringDomain,
 ]
 export const defaultDateRange: DateRange = { date_from: '-7d', date_to: 'now' }
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionAttributionExplorerLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    breadcrumbs: Breadcrumb[]
+    dateRange: DateRange | null
+    groupBy: SessionAttributionGroupBy[]
+    properties: SessionPropertyFilter[]
+    query: DataTableNode
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionAttributionExplorerLogicActions {
+    disableGroupBy: (groupBy: SessionAttributionGroupBy) => {
+        groupBy: SessionAttributionGroupBy
+    }
+    enableGroupBy: (groupBy: SessionAttributionGroupBy) => {
+        groupBy: SessionAttributionGroupBy
+    }
+    setDateRange: (dateRange: DateRange | null) => {
+        dateRange: DateRange | null
+    }
+    setProperties: (properties: SessionPropertyFilter[]) => {
+        properties: SessionPropertyFilter[]
+    }
+    setStateFromUrl: (state: { dateRange: DateRange | null; properties: SessionPropertyFilter[] }) => {
+        state: {
+            dateRange: DateRange | null
+            properties: SessionPropertyFilter[]
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionAttributionExplorerLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        query: (
+            properties: SessionPropertyFilter[],
+            dateRange: DateRange | null,
+            groupBy: SessionAttributionGroupBy[]
+        ) => DataTableNode
+    }
+}
+
+export type sessionAttributionExplorerLogicType = MakeLogicType<
+    sessionAttributionExplorerLogicValues,
+    sessionAttributionExplorerLogicActions,
+    Record<string, any>,
+    sessionAttributionExplorerLogicMeta
+>
+
 export const sessionAttributionExplorerLogic = kea<sessionAttributionExplorerLogicType>([
     path(['scenes', 'webAnalytics', 'sessionDebuggerLogic']),
     connect(() => ({
@@ -75,7 +125,11 @@ export const sessionAttributionExplorerLogic = kea<sessionAttributionExplorerLog
     selectors({
         query: [
             (s) => [s.properties, s.dateRange, s.groupBy],
-            (properties: SessionPropertyFilter[], dateRange, groupBy): DataTableNode => {
+            (
+                properties: SessionPropertyFilter[],
+                dateRange: DateRange | null,
+                groupBy: SessionAttributionGroupBy[]
+            ): DataTableNode => {
                 const filters = {
                     properties,
                     dateRange: dateRange ?? defaultDateRange,
diff --git a/frontend/src/scenes/web-analytics/achievements/webAnalyticsAchievementsLogic.ts b/frontend/src/scenes/web-analytics/achievements/webAnalyticsAchievementsLogic.ts
index 7e9db95a9acf..c26a9713c3ec 100644
--- a/frontend/src/scenes/web-analytics/achievements/webAnalyticsAchievementsLogic.ts
+++ b/frontend/src/scenes/web-analytics/achievements/webAnalyticsAchievementsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
@@ -20,9 +20,10 @@ import {
     type PendingCelebrationApi,
 } from 'products/web_analytics/frontend/generated/api.schemas'
 
+import type { WebAnalyticsUserPreferencesApi } from '../../../../../products/web_analytics/frontend/generated/api.schemas'
+import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
 import { deriveTrackProgress } from './achievementProgress'
 import { isWebAnalyticsAchievementsEnabled } from './gating'
-import type { webAnalyticsAchievementsLogicType } from './webAnalyticsAchievementsLogicType'
 import { webAnalyticsAchievementsPreferencesLogic } from './webAnalyticsAchievementsPreferencesLogic'
 
 const celebrationKey = (trackKey: string, stage: number): string => `${trackKey}:${stage}`
@@ -42,6 +43,110 @@ function sortByCloseness(
         .map(({ track }) => track)
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface webAnalyticsAchievementsLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    currentProjectId: number | string // teamLogic
+    achievementsOptOut: boolean // webAnalyticsAchievementsPreferencesLogic
+    preferences: WebAnalyticsUserPreferencesApi | null // webAnalyticsAchievementsPreferencesLogic
+    achievements: AchievementsListResponseApi | null
+    achievementsLoading: boolean
+    celebratedKeys: string[]
+    definitions: AchievementDefinitionApi[]
+    expandedTracks: string[]
+    modalOpen: boolean
+    pendingCelebrations: PendingCelebrationApi[]
+    pendingTrackKeys: Set<string>
+    progressByTrack: Record<string, AchievementProgressApi>
+    sortedTeamTracks: AchievementDefinitionApi[]
+    sortedUserTracks: AchievementDefinitionApi[]
+    teamProgress: AchievementProgressApi[]
+    totalStages: number
+    uncelebratedPending: PendingCelebrationApi[]
+    unlockedStages: number
+    userProgress: AchievementProgressApi[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface webAnalyticsAchievementsLogicActions {
+    acknowledgeCelebration: (
+        trackKey: string,
+        stage: number
+    ) => {
+        stage: number
+        trackKey: string
+    }
+    closeModal: () => {
+        value: true
+    }
+    loadAchievements: () => any
+    loadAchievementsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAchievementsSuccess: (
+        achievements: AchievementsListResponseApi,
+        payload?: any
+    ) => {
+        achievements: AchievementsListResponseApi
+        payload?: any
+    }
+    markCelebrated: (key: string) => {
+        key: string
+    }
+    openModal: () => {
+        value: true
+    }
+    recordInteraction: (kind: InteractionKindEnumApi) => {
+        kind: InteractionKindEnumApi
+    }
+    toggleTrackExpanded: (trackKey: string) => {
+        trackKey: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface webAnalyticsAchievementsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        definitions: (achievements: AchievementsListResponseApi | null) => AchievementDefinitionApi[]
+        userProgress: (achievements: AchievementsListResponseApi | null) => AchievementProgressApi[]
+        teamProgress: (achievements: AchievementsListResponseApi | null) => AchievementProgressApi[]
+        pendingCelebrations: (achievements: AchievementsListResponseApi | null) => PendingCelebrationApi[]
+        uncelebratedPending: (
+            pendingCelebrations: PendingCelebrationApi[],
+            celebratedKeys: string[]
+        ) => PendingCelebrationApi[]
+        progressByTrack: (
+            userProgress: AchievementProgressApi[],
+            teamProgress: AchievementProgressApi[]
+        ) => Record<string, AchievementProgressApi>
+        sortedUserTracks: (
+            definitions: AchievementDefinitionApi[],
+            progressByTrack: Record<string, AchievementProgressApi>
+        ) => AchievementDefinitionApi[]
+        sortedTeamTracks: (
+            definitions: AchievementDefinitionApi[],
+            progressByTrack: Record<string, AchievementProgressApi>
+        ) => AchievementDefinitionApi[]
+        pendingTrackKeys: (uncelebratedPending: PendingCelebrationApi[]) => Set<string>
+        unlockedStages: (
+            definitions: AchievementDefinitionApi[],
+            progressByTrack: Record<string, AchievementProgressApi>
+        ) => number
+        totalStages: (definitions: AchievementDefinitionApi[]) => number
+    }
+}
+
+export type webAnalyticsAchievementsLogicType = MakeLogicType<
+    webAnalyticsAchievementsLogicValues,
+    webAnalyticsAchievementsLogicActions,
+    Record<string, any>,
+    webAnalyticsAchievementsLogicMeta
+>
+
 export const webAnalyticsAchievementsLogic = kea<webAnalyticsAchievementsLogicType>([
     path(['scenes', 'web-analytics', 'achievements', 'webAnalyticsAchievementsLogic']),
     connect(() => ({
@@ -98,28 +203,35 @@ export const webAnalyticsAchievementsLogic = kea<webAnalyticsAchievementsLogicTy
     selectors({
         definitions: [
             (s) => [s.achievements],
-            (achievements): AchievementDefinitionApi[] => achievements?.definitions ?? [],
+            (achievements: AchievementsListResponseApi | null): AchievementDefinitionApi[] =>
+                achievements?.definitions ?? [],
         ],
         userProgress: [
             (s) => [s.achievements],
-            (achievements): AchievementProgressApi[] => achievements?.user_progress ?? [],
+            (achievements: AchievementsListResponseApi | null): AchievementProgressApi[] =>
+                achievements?.user_progress ?? [],
         ],
         teamProgress: [
             (s) => [s.achievements],
-            (achievements): AchievementProgressApi[] => achievements?.team_progress ?? [],
+            (achievements: AchievementsListResponseApi | null): AchievementProgressApi[] =>
+                achievements?.team_progress ?? [],
         ],
         pendingCelebrations: [
             (s) => [s.achievements],
-            (achievements): PendingCelebrationApi[] => achievements?.pending_celebrations ?? [],
+            (achievements: AchievementsListResponseApi | null): PendingCelebrationApi[] =>
+                achievements?.pending_celebrations ?? [],
         ],
         uncelebratedPending: [
             (s) => [s.pendingCelebrations, s.celebratedKeys],
-            (pending, celebrated): PendingCelebrationApi[] =>
+            (pending: PendingCelebrationApi[], celebrated: string[]): PendingCelebrationApi[] =>
                 pending.filter((entry) => !celebrated.includes(celebrationKey(entry.track_key, entry.stage))),
         ],
         progressByTrack: [
             (s) => [s.userProgress, s.teamProgress],
-            (userProgress, teamProgress): Record<string, AchievementProgressApi> => {
+            (
+                userProgress: AchievementProgressApi[],
+                teamProgress: AchievementProgressApi[]
+            ): Record<string, AchievementProgressApi> => {
                 const byTrack: Record<string, AchievementProgressApi> = {}
                 for (const row of [...userProgress, ...teamProgress]) {
                     byTrack[row.track_key] = row
@@ -129,7 +241,10 @@ export const webAnalyticsAchievementsLogic = kea<webAnalyticsAchievementsLogicTy
         ],
         sortedUserTracks: [
             (s) => [s.definitions, s.progressByTrack],
-            (definitions, progressByTrack): AchievementDefinitionApi[] =>
+            (
+                definitions: AchievementDefinitionApi[],
+                progressByTrack: Record<string, AchievementProgressApi>
+            ): AchievementDefinitionApi[] =>
                 sortByCloseness(
                     definitions.filter((track) => track.scope === 'user'),
                     progressByTrack
@@ -137,7 +252,10 @@ export const webAnalyticsAchievementsLogic = kea<webAnalyticsAchievementsLogicTy
         ],
         sortedTeamTracks: [
             (s) => [s.definitions, s.progressByTrack],
-            (definitions, progressByTrack): AchievementDefinitionApi[] =>
+            (
+                definitions: AchievementDefinitionApi[],
+                progressByTrack: Record<string, AchievementProgressApi>
+            ): AchievementDefinitionApi[] =>
                 sortByCloseness(
                     definitions.filter((track) => track.scope === 'team'),
                     progressByTrack
@@ -145,16 +263,19 @@ export const webAnalyticsAchievementsLogic = kea<webAnalyticsAchievementsLogicTy
         ],
         pendingTrackKeys: [
             (s) => [s.uncelebratedPending],
-            (pending): Set<string> => new Set(pending.map((entry) => entry.track_key)),
+            (pending: PendingCelebrationApi[]): Set<string> => new Set(pending.map((entry) => entry.track_key)),
         ],
         unlockedStages: [
             (s) => [s.definitions, s.progressByTrack],
-            (definitions, progressByTrack): number =>
-                definitions.reduce((sum, track) => sum + (progressByTrack[track.key]?.current_stage ?? 0), 0),
+            (
+                definitions: AchievementDefinitionApi[],
+                progressByTrack: Record<string, AchievementProgressApi>
+            ): number => definitions.reduce((sum, track) => sum + (progressByTrack[track.key]?.current_stage ?? 0), 0),
         ],
         totalStages: [
             (s) => [s.definitions],
-            (definitions): number => definitions.reduce((sum, track) => sum + track.stages.length, 0),
+            (definitions: AchievementDefinitionApi[]): number =>
+                definitions.reduce((sum, track) => sum + track.stages.length, 0),
         ],
     }),
     listeners(({ values, actions }) => ({
diff --git a/frontend/src/scenes/web-analytics/achievements/webAnalyticsAchievementsPreferencesLogic.ts b/frontend/src/scenes/web-analytics/achievements/webAnalyticsAchievementsPreferencesLogic.ts
index cf5b7759440a..be2d6769608b 100644
--- a/frontend/src/scenes/web-analytics/achievements/webAnalyticsAchievementsPreferencesLogic.ts
+++ b/frontend/src/scenes/web-analytics/achievements/webAnalyticsAchievementsPreferencesLogic.ts
@@ -1,4 +1,4 @@
-import { afterMount, connect, kea, listeners, path, selectors } from 'kea'
+import { MakeLogicType, afterMount, connect, kea, listeners, path, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
@@ -12,7 +12,70 @@ import {
 } from 'products/web_analytics/frontend/generated/api'
 import type { WebAnalyticsUserPreferencesApi } from 'products/web_analytics/frontend/generated/api.schemas'
 
-import type { webAnalyticsAchievementsPreferencesLogicType } from './webAnalyticsAchievementsPreferencesLogicType'
+import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface webAnalyticsAchievementsPreferencesLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    currentProjectId: number | string // teamLogic
+    achievementsOptOut: boolean
+    preferences: WebAnalyticsUserPreferencesApi | null
+    preferencesLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface webAnalyticsAchievementsPreferencesLogicActions {
+    loadPreferences: () => any
+    loadPreferencesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPreferencesSuccess: (
+        preferences: WebAnalyticsUserPreferencesApi,
+        payload?: any
+    ) => {
+        preferences: WebAnalyticsUserPreferencesApi
+        payload?: any
+    }
+    setAchievementsOptOut: ({ optedOut }: { optedOut: boolean }) => {
+        optedOut: boolean
+    }
+    setAchievementsOptOutFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    setAchievementsOptOutSuccess: (
+        preferences: WebAnalyticsUserPreferencesApi,
+        payload?: {
+            optedOut: boolean
+        }
+    ) => {
+        preferences: WebAnalyticsUserPreferencesApi
+        payload?: {
+            optedOut: boolean
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface webAnalyticsAchievementsPreferencesLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        achievementsOptOut: (preferences: WebAnalyticsUserPreferencesApi | null) => boolean
+    }
+}
+
+export type webAnalyticsAchievementsPreferencesLogicType = MakeLogicType<
+    webAnalyticsAchievementsPreferencesLogicValues,
+    webAnalyticsAchievementsPreferencesLogicActions,
+    Record<string, any>,
+    webAnalyticsAchievementsPreferencesLogicMeta
+>
 
 export const webAnalyticsAchievementsPreferencesLogic = kea<webAnalyticsAchievementsPreferencesLogicType>([
     path(['scenes', 'web-analytics', 'achievements', 'webAnalyticsAchievementsPreferencesLogic']),
@@ -37,7 +100,7 @@ export const webAnalyticsAchievementsPreferencesLogic = kea<webAnalyticsAchievem
     selectors({
         achievementsOptOut: [
             (s) => [s.preferences],
-            (preferences): boolean => preferences?.achievements_opt_out ?? false,
+            (preferences: WebAnalyticsUserPreferencesApi | null): boolean => preferences?.achievements_opt_out ?? false,
         ],
     }),
     listeners({
diff --git a/frontend/src/scenes/web-analytics/botAnalyticsLogic.ts b/frontend/src/scenes/web-analytics/botAnalyticsLogic.ts
index c8e880f06a2e..6823f7b9f76a 100644
--- a/frontend/src/scenes/web-analytics/botAnalyticsLogic.ts
+++ b/frontend/src/scenes/web-analytics/botAnalyticsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { router } from 'kea-router'
 
 import { isNotNil } from 'lib/utils/guards'
@@ -22,7 +22,6 @@ import {
     PropertyOperator,
 } from '~/types'
 
-import type { botAnalyticsLogicType } from './botAnalyticsLogicType'
 import {
     BOT_ANALYTICS_EVENTS,
     INITIAL_DATE_FROM,
@@ -38,11 +37,66 @@ import {
 } from './common'
 import { getDashboardItemId } from './insightsUtils'
 import { webAnalyticsLogic } from './webAnalyticsLogic'
+import type { DateFilterState } from './webAnalyticsLogic'
 
 const teamId = window.POSTHOG_APP_CONTEXT?.current_team?.id
 // Distinct prefix from webAnalyticsFilterLogic so bot-tab filters don't collide with the regular tab.
 const persistConfig = { persist: true, prefix: `${teamId}__bot_` }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface botAnalyticsLogicValues {
+    dateFilter: DateFilterState // webAnalyticsLogic
+    filterTestAccounts: boolean // webAnalyticsLogic
+    _botTrendsTab: string | null
+    botFilters: WebAnalyticsPropertyFilters
+    botTrendsTab: string
+    rawBotAnalyticsFilters: WebAnalyticsPropertyFilters
+    tiles: WebAnalyticsTile[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface botAnalyticsLogicActions {
+    clearBotAnalyticsFilters: () => {
+        value: true
+    }
+    setBotAnalyticsFilters: (filters: WebAnalyticsPropertyFilters) => {
+        filters: WebAnalyticsPropertyFilters
+    }
+    setBotTrendsTab: (tab: string) => {
+        tab: string
+    }
+    toggleBotAnalyticsFilter: (
+        type: PropertyFilterType.Event | PropertyFilterType.Person | PropertyFilterType.Session,
+        key: string,
+        value: number | string | null
+    ) => {
+        key: string
+        type: PropertyFilterType.Event | PropertyFilterType.Person | PropertyFilterType.Session
+        value: number | string | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface botAnalyticsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        botTrendsTab: (_botTrendsTab: string | null) => string
+        botFilters: (rawBotAnalyticsFilters: WebAnalyticsPropertyFilters) => WebAnalyticsPropertyFilters
+        tiles: (
+            dateFilter: DateFilterState,
+            filterTestAccounts: boolean,
+            botTrendsTab: string,
+            botFilters: WebAnalyticsPropertyFilters
+        ) => WebAnalyticsTile[]
+    }
+}
+
+export type botAnalyticsLogicType = MakeLogicType<
+    botAnalyticsLogicValues,
+    botAnalyticsLogicActions,
+    Record<string, any>,
+    botAnalyticsLogicMeta
+>
+
 export const botAnalyticsLogic = kea<botAnalyticsLogicType>([
     path(['scenes', 'webAnalytics', 'botAnalyticsLogic']),
     connect(() => ({
@@ -164,7 +218,12 @@ export const botAnalyticsLogic = kea<botAnalyticsLogicType>([
         ],
         tiles: [
             (s) => [s.dateFilter, s.filterTestAccounts, s.botTrendsTab, s.botFilters],
-            (dateFilter, filterTestAccounts, botTrendsTab, botFilters): WebAnalyticsTile[] => {
+            (
+                dateFilter: import('./webAnalyticsLogic').DateFilterState,
+                filterTestAccounts: boolean,
+                botTrendsTab: string,
+                botFilters: WebAnalyticsPropertyFilters
+            ): WebAnalyticsTile[] => {
                 const dateRange = { date_from: dateFilter.dateFrom, date_to: dateFilter.dateTo }
                 const interval = dateFilter.interval
 
diff --git a/frontend/src/scenes/web-analytics/health/webAnalyticsHealthLogic.ts b/frontend/src/scenes/web-analytics/health/webAnalyticsHealthLogic.ts
index cb5f32fb71a3..7d545cca51b7 100644
--- a/frontend/src/scenes/web-analytics/health/webAnalyticsHealthLogic.ts
+++ b/frontend/src/scenes/web-analytics/health/webAnalyticsHealthLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api, { ApiError } from 'lib/api'
@@ -22,7 +22,6 @@ import {
     HealthCheckStatus,
     OverallHealthStatus,
 } from './healthCheckTypes'
-import type { webAnalyticsHealthLogicType } from './webAnalyticsHealthLogicType'
 
 /**
  * Static presentational config for the web analytics checks. The pass/fail decision and the
@@ -122,6 +121,148 @@ const WEB_HEALTH_CHECKS: WebHealthCheckConfig[] = [
     },
 ]
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface webAnalyticsHealthLogicValues {
+    currentTeamIdStrict: number | string // teamLogic
+    activeIssuesByKind: Record<string, HealthIssue>
+    allChecks: HealthCheck[]
+    checksByCategory: Record<HealthCheckCategory, HealthCheck[]>
+    hasIssues: boolean
+    hasUrgentIssues: boolean
+    healthIssues: HealthIssuesResponse | null
+    healthIssuesLoading: boolean
+    nextRefreshAvailableAt: number | null
+    overallHealthStatus: OverallHealthStatus
+    urgentFailedChecks: HealthCheck[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface webAnalyticsHealthLogicActions {
+    reportWebAnalyticsHealthActionClicked: (props: {
+        category: string
+        check_id: string
+        is_urgent: boolean
+        status: string
+    }) => {
+        props: {
+            category: string
+            check_id: string
+            is_urgent: boolean
+            status: string
+        }
+    } // eventUsageLogic
+    reportWebAnalyticsHealthRefreshed: (props: { overall_status: string; passed_count: number }) => {
+        props: {
+            overall_status: string
+            passed_count: number
+        }
+    } // eventUsageLogic
+    reportWebAnalyticsHealthSectionToggled: (props: { category: string; is_expanded: boolean }) => {
+        props: {
+            category: string
+            is_expanded: boolean
+        }
+    } // eventUsageLogic
+    reportWebAnalyticsHealthStatus: (props: {
+        has_authorized_urls: boolean
+        has_pageleaves: boolean
+        has_pageviews: boolean
+        has_reverse_proxy: boolean
+        has_scroll_depth: boolean
+        has_web_vitals: boolean
+        overall_status: string
+    }) => {
+        props: {
+            has_authorized_urls: boolean
+            has_pageleaves: boolean
+            has_pageviews: boolean
+            has_reverse_proxy: boolean
+            has_scroll_depth: boolean
+            has_web_vitals: boolean
+            overall_status: string
+        }
+    } // eventUsageLogic
+    reportWebAnalyticsHealthTabViewed: (props: {
+        error_count: number
+        overall_status: string
+        passed_count: number
+        warning_count: number
+    }) => {
+        props: {
+            error_count: number
+            overall_status: string
+            passed_count: number
+            warning_count: number
+        }
+    } // eventUsageLogic
+    loadHealthIssues: () => any
+    loadHealthIssuesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadHealthIssuesSuccess: (
+        healthIssues: HealthIssuesResponse,
+        payload?: any
+    ) => {
+        healthIssues: HealthIssuesResponse
+        payload?: any
+    }
+    refreshHealthChecks: (isManual?: boolean) => {
+        isManual: boolean
+    }
+    setNextRefreshAvailableAt: (timestamp: number | null) => {
+        timestamp: number | null
+    }
+    trackActionClicked: (
+        checkId: HealthCheckId,
+        category: HealthCheckCategory,
+        status: HealthCheckStatus,
+        isUrgent: boolean
+    ) => {
+        category: HealthCheckCategory
+        checkId: HealthCheckId
+        isUrgent: boolean
+        status: HealthCheckStatus
+    }
+    trackSectionToggled: (
+        category: HealthCheckCategory,
+        isExpanded: boolean
+    ) => {
+        category: HealthCheckCategory
+        isExpanded: boolean
+    }
+    trackTabViewed: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface webAnalyticsHealthLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        activeIssuesByKind: (healthIssues: HealthIssuesResponse | null) => Record<string, HealthIssue>
+        allChecks: (
+            activeIssuesByKind: Record<string, HealthIssue>,
+            healthIssuesLoading: boolean,
+            healthIssues: HealthIssuesResponse | null
+        ) => HealthCheck[]
+        checksByCategory: (allChecks: HealthCheck[]) => Record<HealthCheckCategory, HealthCheck[]>
+        overallHealthStatus: (allChecks: HealthCheck[]) => OverallHealthStatus
+        hasIssues: (overallHealthStatus: OverallHealthStatus) => boolean
+        urgentFailedChecks: (allChecks: HealthCheck[]) => HealthCheck[]
+        hasUrgentIssues: (urgentFailedChecks: HealthCheck[]) => boolean
+    }
+}
+
+export type webAnalyticsHealthLogicType = MakeLogicType<
+    webAnalyticsHealthLogicValues,
+    webAnalyticsHealthLogicActions,
+    Record<string, any>,
+    webAnalyticsHealthLogicMeta
+>
+
 export const webAnalyticsHealthLogic = kea<webAnalyticsHealthLogicType>([
     path(['scenes', 'web-analytics', 'health', 'webAnalyticsHealthLogic']),
 
diff --git a/frontend/src/scenes/web-analytics/pageReportsLogic.ts b/frontend/src/scenes/web-analytics/pageReportsLogic.ts
index c83513bda82c..ab43fec626be 100644
--- a/frontend/src/scenes/web-analytics/pageReportsLogic.ts
+++ b/frontend/src/scenes/web-analytics/pageReportsLogic.ts
@@ -1,4 +1,4 @@
-import { kea } from 'kea'
+import { MakeLogicType, kea } from 'kea'
 import { router } from 'kea-router'
 
 import api from 'lib/api'
@@ -32,6 +32,8 @@ import {
     TeamType,
 } from '~/types'
 
+import type { FeatureFlagsSet } from '../../lib/logic/featureFlagLogic'
+import type { QueryLogTags } from '../../queries/schema/schema-general'
 import {
     DeviceTab,
     GeographyTab,
@@ -49,8 +51,8 @@ import {
     parseWebAnalyticsURL,
 } from './common'
 import { PROPERTY_PATHNAME } from './constants'
-import type { pageReportsLogicType } from './pageReportsLogicType'
 import { webAnalyticsLogic } from './webAnalyticsLogic'
+import type { DateFilterState } from './webAnalyticsLogic'
 
 /**
  * Creates property filters for URL matching that handles query parameters consistently
@@ -258,6 +260,337 @@ const createTimeOnPageTrendsQuery = (
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface pageReportsLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    compareFilter: CompareFilter // webAnalyticsLogic
+    controls: {
+        filterTestAccounts: boolean
+        includeHostPath: boolean
+        isPathCleaningEnabled: boolean
+        shouldStripQueryParams: boolean
+        useWebAnalyticsPrecompute: boolean | undefined
+    } // webAnalyticsLogic
+    dateFilter: DateFilterState // webAnalyticsLogic
+    isPathCleaningEnabled: boolean // webAnalyticsLogic
+    selectedHost: string | null // webAnalyticsLogic
+    shouldFilterTestAccounts: boolean // webAnalyticsLogic
+    webAnalyticsFilters: WebAnalyticsPropertyFilters // webAnalyticsLogic
+    webAnalyticsTiles: WebAnalyticsTile[] // webAnalyticsLogic
+    combinedMetricsQuery: (dateFilter: DateFilterState) => InsightVizNode<TrendsQuery>
+    createInsightProps: (tileId: TileId, tabId?: string | undefined) => InsightLogicProps<QuerySchema>
+    hasPageUrl: boolean
+    isInitialLoad: boolean
+    isLoading: boolean
+    pageUrl: string | null
+    pageUrlOptions: PageURLOption[]
+    pageUrlSearchTerm: string
+    pagesUrls: PageURLSearchResult[]
+    pagesUrlsLoading: boolean
+    pathCleaningFilters: PathCleaningFilter[]
+    queries:
+        | {
+              avgTimeOnPageTrendQuery: InsightVizNode<TrendsQuery> | undefined
+              browserQuery: QuerySchema | undefined
+              channelsQuery: QuerySchema | undefined
+              citiesQuery: QuerySchema | undefined
+              countriesQuery: QuerySchema | undefined
+              deviceTypeQuery: QuerySchema | undefined
+              entryPathsQuery: QuerySchema | undefined
+              exitPathsQuery: QuerySchema | undefined
+              languagesQuery: QuerySchema | undefined
+              osQuery: QuerySchema | undefined
+              outboundClicksQuery: QuerySchema | undefined
+              prevPathsQuery: {
+                  embedded: boolean
+                  full: boolean
+                  kind: NodeKind
+                  showActions: boolean
+                  source: {
+                      breakdownBy: WebStatsBreakdown
+                      compareFilter: CompareFilter
+                      dateRange: {
+                          date_from: string | null
+                          date_to: string | null
+                      }
+                      doPathCleaning: boolean
+                      filterTestAccounts: boolean
+                      kind: NodeKind
+                      limit: number
+                      properties: WebAnalyticsPropertyFilters
+                      tags: QueryLogTags
+                  }
+              }
+              referrersQuery: QuerySchema | undefined
+              regionsQuery: QuerySchema | undefined
+              timezonesQuery: QuerySchema | undefined
+              topEventsQuery: QuerySchema | undefined
+              utmCampaignQuery: QuerySchema | undefined
+              utmContentQuery: QuerySchema | undefined
+              utmMediumQuery: QuerySchema | undefined
+              utmSourceQuery: QuerySchema | undefined
+              utmTermQuery: QuerySchema | undefined
+          }
+        | {
+              avgTimeOnPageTrendQuery: undefined
+              browserQuery: undefined
+              channelsQuery: undefined
+              citiesQuery: undefined
+              countriesQuery: undefined
+              deviceTypeQuery: undefined
+              entryPathsQuery: undefined
+              exitPathsQuery: undefined
+              languagesQuery: undefined
+              osQuery: undefined
+              outboundClicksQuery: undefined
+              prevPathsQuery?: undefined
+              referrersQuery: undefined
+              regionsQuery: undefined
+              timezonesQuery: undefined
+              topEventsQuery: undefined
+              utmCampaignQuery: undefined
+              utmContentQuery: undefined
+              utmMediumQuery: undefined
+              utmSourceQuery: undefined
+              utmTermQuery: undefined
+          }
+    stripQueryParams: boolean
+    tileVisualizations: Record<TileId, TileVisualizationOption>
+    tiles: SectionTile[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface pageReportsLogicActions {
+    setDates: (
+        dateFrom: string | null,
+        dateTo: string | null
+    ) => {
+        dateFrom: string | null
+        dateTo: string | null
+    } // webAnalyticsLogic
+    setDomainFilter: (domain: string | null) => {
+        domain: string | null
+    } // webAnalyticsLogic
+    setIsPathCleaningEnabled: (isPathCleaningEnabled: boolean) => {
+        isPathCleaningEnabled: boolean
+    } // webAnalyticsLogic
+    loadPages: (searchTerm?: string) => {
+        searchTerm: string
+    }
+    loadPagesUrls: ({ searchTerm }: { searchTerm: string }) => {
+        searchTerm: string
+    }
+    loadPagesUrlsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPagesUrlsSuccess: (
+        pagesUrls: PageURLSearchResult[],
+        payload?: {
+            searchTerm: string
+        }
+    ) => {
+        pagesUrls: PageURLSearchResult[]
+        payload?: {
+            searchTerm: string
+        }
+    }
+    setPageUrl: (url: string | string[] | null) => {
+        url: string | string[] | null
+    }
+    setPageUrlSearchTerm: (searchTerm: string) => {
+        searchTerm: string
+    }
+    setTileVisualization: (
+        tileId: TileId,
+        visualization: TileVisualizationOption
+    ) => {
+        tileId: TileId
+        visualization: TileVisualizationOption
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface pageReportsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        hasPageUrl: (pageUrl: string | null) => boolean
+        isLoading: (pagesUrlsLoading: boolean, isInitialLoad: boolean) => boolean
+        pathCleaningFilters: (currentTeam: TeamPublicType | TeamType | null) => PathCleaningFilter[]
+        pageUrlOptions: (
+            pagesUrls: PageURLSearchResult[],
+            pageUrl: string | null,
+            pathCleaningFilters: PathCleaningFilter[],
+            isPathCleaningEnabled: boolean
+        ) => PageURLOption[]
+        queries: (
+            webAnalyticsTiles: WebAnalyticsTile[],
+            pageUrl: string | null,
+            stripQueryParams: boolean,
+            dateFilter: DateFilterState,
+            shouldFilterTestAccounts: boolean,
+            compareFilter: CompareFilter,
+            isPathCleaningEnabled: boolean,
+            selectedHost: string | null
+        ) =>
+            | {
+                  avgTimeOnPageTrendQuery: InsightVizNode<TrendsQuery> | undefined
+                  browserQuery: QuerySchema | undefined
+                  channelsQuery: QuerySchema | undefined
+                  citiesQuery: QuerySchema | undefined
+                  countriesQuery: QuerySchema | undefined
+                  deviceTypeQuery: QuerySchema | undefined
+                  entryPathsQuery: QuerySchema | undefined
+                  exitPathsQuery: QuerySchema | undefined
+                  languagesQuery: QuerySchema | undefined
+                  osQuery: QuerySchema | undefined
+                  outboundClicksQuery: QuerySchema | undefined
+                  prevPathsQuery: {
+                      embedded: boolean
+                      full: boolean
+                      kind: NodeKind
+                      showActions: boolean
+                      source: {
+                          breakdownBy: WebStatsBreakdown
+                          compareFilter: CompareFilter
+                          dateRange: {
+                              date_from: string | null
+                              date_to: string | null
+                          }
+                          doPathCleaning: boolean
+                          filterTestAccounts: boolean
+                          kind: NodeKind
+                          limit: number
+                          properties: WebAnalyticsPropertyFilters
+                          tags: QueryLogTags
+                      }
+                  }
+                  referrersQuery: QuerySchema | undefined
+                  regionsQuery: QuerySchema | undefined
+                  timezonesQuery: QuerySchema | undefined
+                  topEventsQuery: QuerySchema | undefined
+                  utmCampaignQuery: QuerySchema | undefined
+                  utmContentQuery: QuerySchema | undefined
+                  utmMediumQuery: QuerySchema | undefined
+                  utmSourceQuery: QuerySchema | undefined
+                  utmTermQuery: QuerySchema | undefined
+              }
+            | {
+                  avgTimeOnPageTrendQuery: undefined
+                  browserQuery: undefined
+                  channelsQuery: undefined
+                  citiesQuery: undefined
+                  countriesQuery: undefined
+                  deviceTypeQuery: undefined
+                  entryPathsQuery: undefined
+                  exitPathsQuery: undefined
+                  languagesQuery: undefined
+                  osQuery: undefined
+                  outboundClicksQuery: undefined
+                  prevPathsQuery?: undefined
+                  referrersQuery: undefined
+                  regionsQuery: undefined
+                  timezonesQuery: undefined
+                  topEventsQuery: undefined
+                  utmCampaignQuery: undefined
+                  utmContentQuery: undefined
+                  utmMediumQuery: undefined
+                  utmSourceQuery: undefined
+                  utmTermQuery: undefined
+              }
+        combinedMetricsQuery: (
+            pageUrl: string | null,
+            stripQueryParams: boolean,
+            shouldFilterTestAccounts: boolean,
+            selectedHost: string | null,
+            isPathCleaningEnabled: boolean
+        ) => (dateFilter: DateFilterState) => InsightVizNode<TrendsQuery>
+        tiles: (
+            queries:
+                | {
+                      avgTimeOnPageTrendQuery: InsightVizNode<TrendsQuery> | undefined
+                      browserQuery: QuerySchema | undefined
+                      channelsQuery: QuerySchema | undefined
+                      citiesQuery: QuerySchema | undefined
+                      countriesQuery: QuerySchema | undefined
+                      deviceTypeQuery: QuerySchema | undefined
+                      entryPathsQuery: QuerySchema | undefined
+                      exitPathsQuery: QuerySchema | undefined
+                      languagesQuery: QuerySchema | undefined
+                      osQuery: QuerySchema | undefined
+                      outboundClicksQuery: QuerySchema | undefined
+                      prevPathsQuery: {
+                          embedded: boolean
+                          full: boolean
+                          kind: NodeKind
+                          showActions: boolean
+                          source: {
+                              breakdownBy: WebStatsBreakdown
+                              compareFilter: CompareFilter
+                              dateRange: {
+                                  date_from: string | null
+                                  date_to: string | null
+                              }
+                              doPathCleaning: boolean
+                              filterTestAccounts: boolean
+                              kind: NodeKind
+                              limit: number
+                              properties: WebAnalyticsPropertyFilters
+                              tags: QueryLogTags
+                          }
+                      }
+                      referrersQuery: QuerySchema | undefined
+                      regionsQuery: QuerySchema | undefined
+                      timezonesQuery: QuerySchema | undefined
+                      topEventsQuery: QuerySchema | undefined
+                      utmCampaignQuery: QuerySchema | undefined
+                      utmContentQuery: QuerySchema | undefined
+                      utmMediumQuery: QuerySchema | undefined
+                      utmSourceQuery: QuerySchema | undefined
+                      utmTermQuery: QuerySchema | undefined
+                  }
+                | {
+                      avgTimeOnPageTrendQuery: undefined
+                      browserQuery: undefined
+                      channelsQuery: undefined
+                      citiesQuery: undefined
+                      countriesQuery: undefined
+                      deviceTypeQuery: undefined
+                      entryPathsQuery: undefined
+                      exitPathsQuery: undefined
+                      languagesQuery: undefined
+                      osQuery: undefined
+                      outboundClicksQuery: undefined
+                      prevPathsQuery?: undefined
+                      referrersQuery: undefined
+                      regionsQuery: undefined
+                      timezonesQuery: undefined
+                      topEventsQuery: undefined
+                      utmCampaignQuery: undefined
+                      utmContentQuery: undefined
+                      utmMediumQuery: undefined
+                      utmSourceQuery: undefined
+                      utmTermQuery: undefined
+                  },
+            pageUrl: string | null,
+            createInsightProps: (tileId: TileId, tabId?: string | undefined) => InsightLogicProps<QuerySchema>,
+            combinedMetricsQuery: (dateFilter: DateFilterState) => InsightVizNode<TrendsQuery>,
+            dateFilter: DateFilterState,
+            featureFlags: FeatureFlagsSet
+        ) => SectionTile[]
+    }
+}
+
+export type pageReportsLogicType = MakeLogicType<
+    pageReportsLogicValues,
+    pageReportsLogicActions,
+    Record<string, any>,
+    pageReportsLogicMeta
+>
+
 export const pageReportsLogic = kea<pageReportsLogicType>({
     path: ['scenes', 'web-analytics', 'pageReportsLogic'],
 
diff --git a/frontend/src/scenes/web-analytics/recap/webAnalyticsRecapLogic.ts b/frontend/src/scenes/web-analytics/recap/webAnalyticsRecapLogic.ts
index 06ee85ae6d04..46d4f2284402 100644
--- a/frontend/src/scenes/web-analytics/recap/webAnalyticsRecapLogic.ts
+++ b/frontend/src/scenes/web-analytics/recap/webAnalyticsRecapLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 import posthog from 'posthog-js'
@@ -11,7 +11,6 @@ import { webAnalyticsRecap } from 'products/web_analytics/frontend/generated/api
 import type { WebAnalyticsRecapResponseApi } from 'products/web_analytics/frontend/generated/api.schemas'
 
 import { formatRecapDateRange } from './recapDates'
-import type { webAnalyticsRecapLogicType } from './webAnalyticsRecapLogicType'
 
 export type RecapShareMethod = 'copy_link' | 'copy_slack' | 'copy_email'
 export type RecapCta = 'view_dashboard' | 'ask_posthog_ai' | 'go_to_web_analytics'
@@ -62,6 +61,61 @@ function buildEmailCopy(recap: WebAnalyticsRecapResponseApi): string {
     ].join('\n')
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface webAnalyticsRecapLogicValues {
+    currentProjectId: number | null // projectLogic
+    recap: WebAnalyticsRecapResponseApi | null
+    recapLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface webAnalyticsRecapLogicActions {
+    copyRecapForEmail: () => {
+        value: true
+    }
+    copyRecapForSlack: () => {
+        value: true
+    }
+    copyRecapLink: () => {
+        value: true
+    }
+    goToWebAnalytics: (cta: Extract<RecapCta, 'go_to_web_analytics' | 'view_dashboard'>) => {
+        cta: 'go_to_web_analytics' | 'view_dashboard'
+    }
+    loadRecap: () => any
+    loadRecapFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRecapSuccess: (
+        recap: WebAnalyticsRecapResponseApi | null,
+        payload?: any
+    ) => {
+        recap: WebAnalyticsRecapResponseApi | null
+        payload?: any
+    }
+    recordButtonClicked: (button: RecapButton) => {
+        button: RecapButton
+    }
+    recordCtaClicked: (cta: RecapCta) => {
+        cta: RecapCta
+    }
+    recordOpened: () => {
+        value: true
+    }
+    recordReachedEnd: () => {
+        value: true
+    }
+    recordShared: (method: RecapShareMethod) => {
+        method: RecapShareMethod
+    }
+}
+
+export type webAnalyticsRecapLogicType = MakeLogicType<webAnalyticsRecapLogicValues, webAnalyticsRecapLogicActions>
+
 export const webAnalyticsRecapLogic = kea<webAnalyticsRecapLogicType>([
     path(['scenes', 'web-analytics', 'recap', 'webAnalyticsRecapLogic']),
     connect(() => ({
diff --git a/frontend/src/scenes/web-analytics/shareNudgeLogic.ts b/frontend/src/scenes/web-analytics/shareNudgeLogic.ts
index 524a3635b40b..7da77e6c76cb 100644
--- a/frontend/src/scenes/web-analytics/shareNudgeLogic.ts
+++ b/frontend/src/scenes/web-analytics/shareNudgeLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { subscriptions } from 'kea-subscriptions'
 import posthog from 'posthog-js'
 
@@ -6,13 +6,61 @@ import { FEATURE_FLAGS } from 'lib/constants'
 import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
 import { organizationLogic } from 'scenes/organizationLogic'
 
-import type { shareNudgeLogicType } from './shareNudgeLogicType'
+import type { FeatureFlagsSet } from '../../lib/logic/featureFlagLogic'
+import type { OrganizationType } from '../../types'
 
 const FLAG = FEATURE_FLAGS.WEB_ANALYTICS_SHARE_NUDGE_V2
 const DASHBOARD_SELECTOR = '[data-attr="web-analytics-dashboard"]'
 const HOVER_DWELL_MS = 2500
 const EXPORT_PROMPT_PROBABILITY = 0.25
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface shareNudgeLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    currentOrganization: OrganizationType | null // organizationLogic
+    emphasizeShareButton: boolean
+    exportPromptEnabled: boolean
+    hasColleagues: boolean
+    intentPromptEnabled: boolean
+    promptSource: string | null
+    promptVisible: boolean
+    sessionDismissed: boolean
+    showBanner: boolean
+    variant: string | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface shareNudgeLogicActions {
+    dismissForSession: () => {
+        value: true
+    }
+    exportTriggered: () => {
+        value: true
+    }
+    showPrompt: (source: string) => {
+        source: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface shareNudgeLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        hasColleagues: (currentOrganization: OrganizationType | null) => boolean
+        variant: (featureFlags: FeatureFlagsSet, hasColleagues: boolean) => string | null
+        showBanner: (variant: string | null, sessionDismissed: boolean) => boolean
+        emphasizeShareButton: (variant: string | null) => boolean
+        intentPromptEnabled: (variant: string | null) => boolean
+        exportPromptEnabled: (variant: string | null) => boolean
+    }
+}
+
+export type shareNudgeLogicType = MakeLogicType<
+    shareNudgeLogicValues,
+    shareNudgeLogicActions,
+    Record<string, any>,
+    shareNudgeLogicMeta
+>
+
 export const shareNudgeLogic = kea<shareNudgeLogicType>([
     path(['scenes', 'web-analytics', 'shareNudgeLogic']),
     connect(() => ({
@@ -47,22 +95,26 @@ export const shareNudgeLogic = kea<shareNudgeLogicType>([
     selectors({
         hasColleagues: [
             (s) => [s.currentOrganization],
-            (currentOrganization): boolean => (currentOrganization?.member_count ?? 1) >= 2,
+            (currentOrganization: null | import('../../types').OrganizationType): boolean =>
+                (currentOrganization?.member_count ?? 1) >= 2,
         ],
         variant: [
             (s) => [s.featureFlags, s.hasColleagues],
-            (featureFlags, hasColleagues): string | null => {
+            (
+                featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet,
+                hasColleagues: boolean
+            ): string | null => {
                 const flag = featureFlags[FLAG]
                 return hasColleagues && typeof flag === 'string' ? flag : null
             },
         ],
         showBanner: [
             (s) => [s.variant, s.sessionDismissed],
-            (variant, sessionDismissed): boolean => variant === 'banner' && !sessionDismissed,
+            (variant: string | null, sessionDismissed: boolean): boolean => variant === 'banner' && !sessionDismissed,
         ],
-        emphasizeShareButton: [(s) => [s.variant], (variant): boolean => variant === 'button'],
-        intentPromptEnabled: [(s) => [s.variant], (variant): boolean => variant === 'prompt'],
-        exportPromptEnabled: [(s) => [s.variant], (variant): boolean => variant === 'export'],
+        emphasizeShareButton: [(s) => [s.variant], (variant: string | null): boolean => variant === 'button'],
+        intentPromptEnabled: [(s) => [s.variant], (variant: string | null): boolean => variant === 'prompt'],
+        exportPromptEnabled: [(s) => [s.variant], (variant: string | null): boolean => variant === 'export'],
     }),
     listeners(({ values, actions }) => ({
         showPrompt: ({ source }) => {
diff --git a/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/logic/marketingAnalyticsLogic.ts b/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/logic/marketingAnalyticsLogic.ts
index 411b59ab7da8..cadb70dc5744 100644
--- a/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/logic/marketingAnalyticsLogic.ts
+++ b/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/logic/marketingAnalyticsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { actionToUrl } from 'kea-router'
 
 import { FEATURE_FLAGS } from 'lib/constants'
@@ -35,8 +35,10 @@ import { ChartDisplayType } from '~/types'
 import { mapUrlToProvider } from 'products/data_warehouse/frontend/shared/components/SourceIcon'
 import { sourceManagementLogic } from 'products/data_warehouse/frontend/shared/logics/sourceManagementLogic'
 
+import type { PaginatedResponse } from '../../../../../../lib/api'
+import type { FeatureFlagsSet } from '../../../../../../lib/logic/featureFlagLogic'
+import type { ProductIntentProperties } from '../../../../../../lib/utils/product-intents'
 import { defaultConversionGoalFilter } from '../components/settings/constants'
-import type { marketingAnalyticsLogicType } from './marketingAnalyticsLogicType'
 import { marketingAnalyticsSettingsLogic } from './marketingAnalyticsSettingsLogic'
 import { externalAdsCostTile } from './marketingCostTile'
 import {
@@ -209,6 +211,350 @@ const INITIAL_DATE_FROM = '-7d' as string | null
 const INITIAL_DATE_TO = null as string | null
 const INITIAL_INTERVAL = getDefaultInterval(INITIAL_DATE_FROM, INITIAL_DATE_TO)
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface marketingAnalyticsLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    conversion_goals: ConversionGoalFilter[] // marketingAnalyticsSettingsLogic
+    sources_map: Record<string, SourceMap> // marketingAnalyticsSettingsLogic
+    dataWarehouseSources: PaginatedResponse<ExternalDataSource> | null // sourceManagementLogic
+    dataWarehouseSourcesLoading: boolean // sourceManagementLogic
+    dataWarehouseTables: DatabaseSchemaDataWarehouseTable[] // sourceManagementLogic
+    baseCurrency: CurrencyCode // teamLogic
+    _drillDownLevel: MarketingAnalyticsDrillDownLevel
+    activeTab: MarketingAnalyticsTab
+    allAvailableSources: {
+        id: string
+        name: string
+        prefix?: string | undefined
+        source_type: string
+        type: string
+    }[]
+    allAvailableSourcesWithStatus: {
+        id: string
+        name: string
+        prefix?: string | undefined
+        source_type: string
+        status: SourceStatus
+        statusMessage: string
+        type: string
+    }[]
+    allExternalTablesWithStatus: {
+        columns: {
+            name: string
+            type: string
+        }[]
+        dw_source_type: string
+        external_type: DataWarehouseSettingsTab
+        id: string
+        name: string
+        schema_name: string
+        schema_status?: string | undefined
+        source_map: SourceMap | null
+        source_map_id: string
+        source_prefix: string
+        source_type: string
+        sourceUrl: string
+        status: SourceStatus
+        statusMessage: string
+        url_pattern: string
+    }[]
+    chartDisplayType: ChartDisplayType
+    columnConfigModalVisible: boolean
+    compareFilter: CompareFilter
+    conversionGoalInput: ConversionGoalFilter
+    conversionGoalModalVisible: boolean
+    createMarketingDataWarehouseNodes: DataWarehouseNode[]
+    dateFilter: {
+        dateFrom: string | null
+        dateTo: string | null
+        interval: IntervalType
+    }
+    draftConversionGoal: ConversionGoalFilter | null
+    drillDownLevel: MarketingAnalyticsDrillDownLevel
+    externalTables: ExternalTable[]
+    hasNoConfiguredSources: boolean
+    hasSources: boolean
+    initialized: boolean
+    integrationFilter: IntegrationFilter
+    loading: boolean
+    nativeSources: ExternalDataSource[]
+    nativeSourcesHierarchyStatus: NativeSourceHierarchyStatus[]
+    overviewQuery: MarketingAnalyticsAggregatedQuery
+    tileColumnSelection: validColumnsForTiles
+    uniqueConversionGoalName: string
+    validExternalTables: ExternalTable[]
+    validNativeSources: NativeSource[]
+    validSourcesMap: {
+        [x: string]: SourceMap
+    } | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface marketingAnalyticsLogicActions {
+    reloadAll: () => {} // dataNodeCollectionLogic
+    addOrUpdateConversionGoal: (conversionGoal: ConversionGoalFilter) => {
+        conversionGoal: ConversionGoalFilter
+    } // marketingAnalyticsSettingsLogic
+    loadDatabase: (
+        args_0?:
+            | {
+                  force?: boolean
+              }
+            | undefined
+    ) => {
+        force?: boolean
+    } // sourceManagementLogic
+    loadSources: () => {
+        value: true
+    } // sourceManagementLogic
+    loadSourcesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    } // sourceManagementLogic
+    loadSourcesSuccess: (
+        dataWarehouseSources:
+            | PaginatedResponse<ExternalDataSource>
+            | {
+                  count: number
+                  next: null
+                  previous: null
+                  results: never[]
+              },
+        payload?:
+            | {
+                  value: true
+              }
+            | undefined
+    ) => {
+        dataWarehouseSources:
+            | PaginatedResponse<ExternalDataSource>
+            | {
+                  count: number
+                  next: null
+                  previous: null
+                  results: never[]
+              }
+        payload?: {
+            value: true
+        }
+    } // sourceManagementLogic
+    addProductIntent: (properties: ProductIntentProperties) => ProductIntentProperties // teamLogic
+    applyConversionGoal: () => {
+        value: true
+    }
+    clearConversionGoal: () => {
+        value: true
+    }
+    hideColumnConfigModal: () => {
+        value: true
+    }
+    hideConversionGoalModal: () => {
+        value: true
+    }
+    loadConversionGoal: (goal: ConversionGoalFilter) => {
+        goal: ConversionGoalFilter
+    }
+    saveConversionGoal: () => {
+        value: true
+    }
+    setActiveTab: (tab: MarketingAnalyticsTab) => {
+        tab: MarketingAnalyticsTab
+    }
+    setChartDisplayType: (chartDisplayType: ChartDisplayType) => {
+        chartDisplayType: ChartDisplayType
+    }
+    setCompareFilter: (compareFilter: CompareFilter) => {
+        compareFilter: CompareFilter
+    }
+    setConversionGoalInput: (goal: ConversionGoalFilter) => {
+        goal: ConversionGoalFilter
+    }
+    setDateInterval: (interval: IntervalType) => {
+        interval: IntervalType
+    }
+    setDates: (
+        dateFrom: string | null,
+        dateTo: string | null
+    ) => {
+        dateFrom: string | null
+        dateTo: string | null
+    }
+    setDatesAndInterval: (
+        dateFrom: string | null,
+        dateTo: string | null,
+        interval: IntervalType
+    ) => {
+        dateFrom: string | null
+        dateTo: string | null
+        interval: IntervalType
+    }
+    setDraftConversionGoal: (goal: ConversionGoalFilter | null) => {
+        goal: ConversionGoalFilter | null
+    }
+    setDrillDownLevel: (level: MarketingAnalyticsDrillDownLevel) => {
+        level: MarketingAnalyticsDrillDownLevel
+    }
+    setInitialized: () => {
+        value: true
+    }
+    setIntegrationFilter: (integrationFilter: IntegrationFilter) => {
+        integrationFilter: IntegrationFilter
+    }
+    setTileColumnSelection: (column: validColumnsForTiles) => {
+        column: validColumnsForTiles
+    }
+    showColumnConfigModal: () => {
+        value: true
+    }
+    showConversionGoalModal: () => {
+        value: true
+    }
+    syncFromUrl: (params: {
+        chartDisplayType?: ChartDisplayType
+        compare?: boolean
+        compare_to?: string
+        dateFrom?: string | null
+        dateTo?: string | null
+        drillDownLevel?: MarketingAnalyticsDrillDownLevel
+        integrationSourceIds?: string[]
+        interval?: IntervalType
+        tileColumnSelection?: string
+    }) => {
+        params: {
+            chartDisplayType?: ChartDisplayType | undefined
+            compare?: boolean | undefined
+            compare_to?: string | undefined
+            dateFrom?: string | null | undefined
+            dateTo?: string | null | undefined
+            drillDownLevel?: MarketingAnalyticsDrillDownLevel | undefined
+            integrationSourceIds?: string[] | undefined
+            interval?: IntervalType | undefined
+            tileColumnSelection?: string | undefined
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface marketingAnalyticsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        drillDownLevel: (
+            _drillDownLevel: MarketingAnalyticsDrillDownLevel,
+            featureFlags: FeatureFlagsSet
+        ) => MarketingAnalyticsDrillDownLevel
+        validSourcesMap: (sources_map: Record<string, SourceMap>) => {
+            [x: string]: SourceMap
+        } | null
+        externalTables: (
+            dataWarehouseTables: DatabaseSchemaDataWarehouseTable[],
+            sources_map: Record<string, SourceMap>,
+            dataWarehouseSources: PaginatedResponse<ExternalDataSource> | null
+        ) => ExternalTable[]
+        validExternalTables: (
+            externalTables: ExternalTable[],
+            validSourcesMap: {
+                [x: string]: SourceMap
+            } | null
+        ) => ExternalTable[]
+        nativeSources: (dataWarehouseSources: PaginatedResponse<ExternalDataSource> | null) => ExternalDataSource[]
+        validNativeSources: (
+            nativeSources: ExternalDataSource[],
+            dataWarehouseTables: DatabaseSchemaDataWarehouseTable[]
+        ) => NativeSource[]
+        uniqueConversionGoalName: (
+            conversionGoalInput: ConversionGoalFilter,
+            conversion_goals: ConversionGoalFilter[]
+        ) => string
+        nativeSourcesHierarchyStatus: (validNativeSources: NativeSource[]) => NativeSourceHierarchyStatus[]
+        loading: (dataWarehouseSourcesLoading: boolean) => boolean
+        allAvailableSources: (
+            validExternalTables: ExternalTable[],
+            validNativeSources: NativeSource[]
+        ) => {
+            id: string
+            name: string
+            prefix?: string | undefined
+            source_type: string
+            type: string
+        }[]
+        allAvailableSourcesWithStatus: (
+            allAvailableSources: {
+                id: string
+                name: string
+                prefix?: string | undefined
+                source_type: string
+                type: string
+            }[],
+            nativeSources: ExternalDataSource[],
+            validExternalTables: ExternalTable[]
+        ) => {
+            id: string
+            name: string
+            prefix?: string | undefined
+            source_type: string
+            status: SourceStatus
+            statusMessage: string
+            type: string
+        }[]
+        hasNoConfiguredSources: (
+            validExternalTables: ExternalTable[],
+            validNativeSources: NativeSource[],
+            loading: boolean,
+            dataWarehouseTables: DatabaseSchemaDataWarehouseTable[]
+        ) => boolean
+        hasSources: (validExternalTables: ExternalTable[], validNativeSources: NativeSource[]) => boolean
+        allExternalTablesWithStatus: (
+            externalTables: ExternalTable[],
+            nativeSources: ExternalDataSource[]
+        ) => {
+            columns: {
+                name: string
+                type: string
+            }[]
+            dw_source_type: string
+            external_type: DataWarehouseSettingsTab
+            id: string
+            name: string
+            schema_name: string
+            schema_status?: string | undefined
+            source_map: SourceMap | null
+            source_map_id: string
+            source_prefix: string
+            source_type: string
+            sourceUrl: string
+            status: SourceStatus
+            statusMessage: string
+            url_pattern: string
+        }[]
+        createMarketingDataWarehouseNodes: (
+            validExternalTables: ExternalTable[],
+            baseCurrency: CurrencyCode,
+            validNativeSources: NativeSource[],
+            tileColumnSelection: validColumnsForTiles,
+            integrationFilter: IntegrationFilter
+        ) => DataWarehouseNode[]
+        overviewQuery: (
+            dateFilter: {
+                dateFrom: string | null
+                dateTo: string | null
+                interval: IntervalType
+            },
+            compareFilter: CompareFilter,
+            draftConversionGoal: ConversionGoalFilter | null,
+            integrationFilter: IntegrationFilter
+        ) => MarketingAnalyticsAggregatedQuery
+    }
+}
+
+export type marketingAnalyticsLogicType = MakeLogicType<
+    marketingAnalyticsLogicValues,
+    marketingAnalyticsLogicActions,
+    Record<string, any>,
+    marketingAnalyticsLogicMeta
+>
+
 export const marketingAnalyticsLogic = kea<marketingAnalyticsLogicType>([
     path(['scenes', 'webAnalytics', 'marketingAnalyticsLogic']),
     connect(() => ({
@@ -450,7 +796,7 @@ export const marketingAnalyticsLogic = kea<marketingAnalyticsLogicType>([
         ],
         validSourcesMap: [
             (s) => [s.sources_map],
-            (sources_map) => {
+            (sources_map: Record<string, SourceMap>) => {
                 if (!sources_map || Object.keys(sources_map).length === 0) {
                     return null
                 }
@@ -480,7 +826,11 @@ export const marketingAnalyticsLogic = kea<marketingAnalyticsLogicType>([
         ],
         externalTables: [
             (s) => [s.dataWarehouseTables, s.sources_map, s.dataWarehouseSources],
-            (dataWarehouseTables, sources_map, dataWarehouseSources) => {
+            (
+                dataWarehouseTables: DatabaseSchemaDataWarehouseTable[],
+                sources_map: Record<string, SourceMap>,
+                dataWarehouseSources: null | import('../../../../../../lib/api').PaginatedResponse<ExternalDataSource>
+            ) => {
                 const externalTables: ExternalTable[] = []
                 if (dataWarehouseTables?.length) {
                     dataWarehouseTables.forEach((table) => {
@@ -526,7 +876,7 @@ export const marketingAnalyticsLogic = kea<marketingAnalyticsLogicType>([
         ],
         validExternalTables: [
             (s) => [s.externalTables, s.validSourcesMap],
-            (externalTables, validSourcesMap: Record<string, SourceMap> | null): ExternalTable[] => {
+            (externalTables: ExternalTable[], validSourcesMap: Record<string, SourceMap> | null): ExternalTable[] => {
                 if (!validSourcesMap || Object.keys(validSourcesMap).length === 0) {
                     return []
                 }
@@ -536,14 +886,19 @@ export const marketingAnalyticsLogic = kea<marketingAnalyticsLogicType>([
         ],
         nativeSources: [
             (s) => [s.dataWarehouseSources],
-            (dataWarehouseSources): ExternalDataSource[] =>
+            (
+                dataWarehouseSources: null | import('../../../../../../lib/api').PaginatedResponse<ExternalDataSource>
+            ): ExternalDataSource[] =>
                 dataWarehouseSources?.results.filter((source) =>
                     VALID_NATIVE_MARKETING_SOURCES.includes(source.source_type as NativeMarketingSource)
                 ) ?? [],
         ],
         validNativeSources: [
             (s) => [s.nativeSources, s.dataWarehouseTables],
-            (nativeSources, dataWarehouseTables): NativeSource[] => {
+            (
+                nativeSources: ExternalDataSource[],
+                dataWarehouseTables: DatabaseSchemaDataWarehouseTable[]
+            ): NativeSource[] => {
                 return nativeSources.reduce((validNativeSources: NativeSource[], source) => {
                     const requiredFields =
                         NEEDED_FIELDS_FOR_NATIVE_MARKETING_ANALYTICS[source.source_type as NativeMarketingSource] || []
@@ -653,7 +1008,17 @@ export const marketingAnalyticsLogic = kea<marketingAnalyticsLogicType>([
         ],
         allAvailableSourcesWithStatus: [
             (s) => [s.allAvailableSources, s.nativeSources, s.validExternalTables],
-            (allAvailableSources, nativeSources: ExternalDataSource[], validExternalTables) => {
+            (
+                allAvailableSources: {
+                    id: string
+                    name: string
+                    prefix?: string | undefined
+                    source_type: string
+                    type: string
+                }[],
+                nativeSources: ExternalDataSource[],
+                validExternalTables: ExternalTable[]
+            ) => {
                 const sourcesWithStatus = allAvailableSources.map((source) => {
                     const status = getSourceStatus(source, nativeSources, validExternalTables)
                     return {
@@ -695,7 +1060,12 @@ export const marketingAnalyticsLogic = kea<marketingAnalyticsLogicType>([
         ],
         hasNoConfiguredSources: [
             (s) => [s.validExternalTables, s.validNativeSources, s.loading, s.dataWarehouseTables],
-            (validExternalTables, validNativeSources, loading, dataWarehouseTables): boolean => {
+            (
+                validExternalTables: ExternalTable[],
+                validNativeSources: NativeSource[],
+                loading: boolean,
+                dataWarehouseTables: DatabaseSchemaDataWarehouseTable[]
+            ): boolean => {
                 // Don't show error banner while data is loading or if tables haven't been fetched yet
                 if (loading || dataWarehouseTables === null) {
                     return false
@@ -710,7 +1080,7 @@ export const marketingAnalyticsLogic = kea<marketingAnalyticsLogicType>([
         ],
         allExternalTablesWithStatus: [
             (s) => [s.externalTables, s.nativeSources],
-            (externalTables, nativeSources) => {
+            (externalTables: ExternalTable[], nativeSources: ExternalDataSource[]) => {
                 // Filter out tables that belong to native sources (to avoid duplicates)
                 // Only include BigQuery, self-managed, and other non-native sources
                 // For example a native source could have multiple external tables.
@@ -809,7 +1179,16 @@ export const marketingAnalyticsLogic = kea<marketingAnalyticsLogicType>([
         ],
         overviewQuery: [
             (s) => [s.dateFilter, s.compareFilter, s.draftConversionGoal, s.integrationFilter],
-            (dateFilter, compareFilter, draftConversionGoal, integrationFilter): MarketingAnalyticsAggregatedQuery => ({
+            (
+                dateFilter: {
+                    dateFrom: string | null
+                    dateTo: string | null
+                    interval: IntervalType
+                },
+                compareFilter: CompareFilter,
+                draftConversionGoal: ConversionGoalFilter | null,
+                integrationFilter: IntegrationFilter
+            ): MarketingAnalyticsAggregatedQuery => ({
                 kind: NodeKind.MarketingAnalyticsAggregatedQuery,
                 dateRange: {
                     date_from: dateFilter.dateFrom,
diff --git a/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/logic/marketingAnalyticsSettingsLogic.ts b/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/logic/marketingAnalyticsSettingsLogic.ts
index 84c4bfca45c3..dce4cb08f356 100644
--- a/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/logic/marketingAnalyticsSettingsLogic.ts
+++ b/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/logic/marketingAnalyticsSettingsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -25,8 +25,10 @@ import { ExternalDataSource } from '~/types'
 
 import { sourceManagementLogic } from 'products/data_warehouse/frontend/shared/logics/sourceManagementLogic'
 
+import type { PaginatedResponse } from '../../../../../../lib/api'
+import type { ProductIntentProperties } from '../../../../../../lib/utils/product-intents'
+import type { TeamPublicType, TeamType } from '../../../../../../types'
 import { IntegrationSettingsTab } from '../components/settings/IntegrationSettingsModal'
-import type { marketingAnalyticsSettingsLogicType } from './marketingAnalyticsSettingsLogicType'
 import { DEFAULT_ATTRIBUTION_WINDOW_DAYS, generateUniqueName } from './utils'
 
 export interface IntegrationSettingsModalState {
@@ -58,6 +60,159 @@ const createEmptyConfig = (): MarketingAnalyticsConfig => ({
 const isNativeMarketingSource = (value: string): value is NativeMarketingSource =>
     VALID_NATIVE_MARKETING_SOURCES.includes(value as NativeMarketingSource)
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface marketingAnalyticsSettingsLogicValues {
+    dataWarehouseSources: PaginatedResponse<ExternalDataSource> | null // sourceManagementLogic
+    dataWarehouseTables: DatabaseSchemaDataWarehouseTable[] // sourceManagementLogic
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    currentTeamId: number | null // teamLogic
+    attribution_mode: AttributionMode
+    attribution_window_days: number
+    conversion_goals: ConversionGoalFilter[]
+    integrationCampaignTables: Record<string, string>
+    integrationCampaigns: Record<
+        string,
+        Array<{
+            id: string
+            name: string
+        }>
+    >
+    integrationCampaignsLoading: Record<string, boolean>
+    integrationSettingsModal: IntegrationSettingsModalState
+    marketingAnalyticsConfig: MarketingAnalyticsConfig | null
+    marketingAnalyticsConfigLoading: boolean
+    savedMarketingAnalyticsConfig: MarketingAnalyticsConfig
+    sources_map: Record<string, SourceMap>
+    testMappingResults: Record<string, TestMappingResult>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface marketingAnalyticsSettingsLogicActions {
+    addProductIntent: (properties: ProductIntentProperties) => ProductIntentProperties // teamLogic
+    updateCurrentTeam: (payload: Partial<TeamType>) => Partial<TeamType> // teamLogic
+    addOrUpdateConversionGoal: (conversionGoal: ConversionGoalFilter) => {
+        conversionGoal: ConversionGoalFilter
+    }
+    closeIntegrationSettingsModal: () => {
+        value: true
+    }
+    loadIntegrationCampaigns: (integration: string) => {
+        integration: string
+    }
+    loadMarketingAnalyticsConfig: () => any
+    loadMarketingAnalyticsConfigFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadMarketingAnalyticsConfigSuccess: (
+        marketingAnalyticsConfig: MarketingAnalyticsConfig | null,
+        payload?: any
+    ) => {
+        marketingAnalyticsConfig: MarketingAnalyticsConfig | null
+        payload?: any
+    }
+    openIntegrationSettingsModal: (
+        integration: NativeMarketingSource,
+        initialTab: IntegrationSettingsTab,
+        initialUtmValue: string,
+        initialCampaignName?: string
+    ) => {
+        initialCampaignName: string
+        initialTab: IntegrationSettingsTab
+        initialUtmValue: string
+        integration:
+            | 'BingAds'
+            | 'GoogleAds'
+            | 'LinkedinAds'
+            | 'MetaAds'
+            | 'PinterestAds'
+            | 'RedditAds'
+            | 'SnapchatAds'
+            | 'TikTokAds'
+    }
+    removeConversionGoal: (goalId: string) => {
+        goalId: string
+    }
+    setIntegrationCampaigns: (
+        integration: string,
+        campaigns: Array<{
+            id: string
+            name: string
+        }>
+    ) => {
+        campaigns: {
+            id: string
+            name: string
+        }[]
+        integration: string
+    }
+    setTestMappingResult: (
+        tableId: string,
+        result: TestMappingResult
+    ) => {
+        result: TestMappingResult
+        tableId: string
+    }
+    testMapping: (
+        tableId: string,
+        sourceMap: SourceMap
+    ) => {
+        sourceMap: SourceMap
+        tableId: string
+    }
+    updateAttributionMode: (mode: AttributionMode) => {
+        mode: AttributionMode
+    }
+    updateAttributionWindowDays: (days: number) => {
+        days: number
+    }
+    updateCampaignFieldPreferences: (campaignFieldPreferences: Record<string, CampaignFieldPreference>) => {
+        campaignFieldPreferences: Record<string, CampaignFieldPreference>
+    }
+    updateCampaignNameMappings: (campaignNameMappings: Record<string, Record<string, string[]>>) => {
+        campaignNameMappings: Record<string, Record<string, string[]>>
+    }
+    updateConversionGoals: (conversionGoals: ConversionGoalFilter[]) => {
+        conversionGoals: ConversionGoalFilter[]
+    }
+    updateCustomSourceMappings: (customSourceMappings: Record<string, string[]>) => {
+        customSourceMappings: Record<string, string[]>
+    }
+    updateSourceMapping: (
+        tableId: string,
+        fieldName: MarketingAnalyticsColumnsSchemaNames,
+        columnName: string | null
+    ) => {
+        columnName: string | null
+        fieldName: MarketingAnalyticsColumnsSchemaNames
+        tableId: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface marketingAnalyticsSettingsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        sources_map: (marketingAnalyticsConfig: MarketingAnalyticsConfig | null) => Record<string, SourceMap>
+        conversion_goals: (marketingAnalyticsConfig: MarketingAnalyticsConfig | null) => ConversionGoalFilter[]
+        attribution_window_days: (marketingAnalyticsConfig: MarketingAnalyticsConfig | null) => number
+        attribution_mode: (marketingAnalyticsConfig: MarketingAnalyticsConfig | null) => AttributionMode
+        integrationCampaignTables: (
+            dataWarehouseTables: DatabaseSchemaDataWarehouseTable[],
+            dataWarehouseSources: PaginatedResponse<ExternalDataSource> | null
+        ) => Record<string, string>
+    }
+}
+
+export type marketingAnalyticsSettingsLogicType = MakeLogicType<
+    marketingAnalyticsSettingsLogicValues,
+    marketingAnalyticsSettingsLogicActions,
+    Record<string, any>,
+    marketingAnalyticsSettingsLogicMeta
+>
+
 export const marketingAnalyticsSettingsLogic = kea<marketingAnalyticsSettingsLogicType>([
     path(['scenes', 'web-analytics', 'marketingAnalyticsSettingsLogic']),
     connect(() => ({
diff --git a/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/logic/marketingAnalyticsTableLogic.ts b/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/logic/marketingAnalyticsTableLogic.ts
index c57977f65012..275c92e00378 100644
--- a/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/logic/marketingAnalyticsTableLogic.ts
+++ b/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/logic/marketingAnalyticsTableLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { actionToUrl, urlToAction } from 'kea-router'
 
 import { isNotNil } from 'lib/utils/guards'
@@ -19,7 +19,6 @@ import {
 import { DataWarehouseSettingsTab, ExternalDataSource } from '~/types'
 
 import { marketingAnalyticsLogic } from './marketingAnalyticsLogic'
-import type { marketingAnalyticsTableLogicType } from './marketingAnalyticsTableLogicType'
 import { createMarketingAnalyticsOrderBy, isDraftConversionGoalColumn } from './utils'
 
 export type ExternalTable = {
@@ -42,6 +41,44 @@ export type NativeSource = {
     tables: DatabaseSchemaDataWarehouseTable[]
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface marketingAnalyticsTableLogicValues {
+    conversion_goals: ConversionGoalFilter[] // marketingAnalyticsLogic
+    draftConversionGoal: ConversionGoalFilter | null // marketingAnalyticsLogic
+    drillDownLevel: MarketingAnalyticsDrillDownLevel // marketingAnalyticsLogic
+    defaultColumns: string[]
+    query: DataTableNode | null
+    sortedColumns: string[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface marketingAnalyticsTableLogicActions {
+    setDraftConversionGoal: (goal: ConversionGoalFilter | null) => {
+        goal: ConversionGoalFilter | null
+    } // marketingAnalyticsLogic
+    setQuery: (query: DataTableNode) => {
+        query: DataTableNode
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface marketingAnalyticsTableLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        defaultColumns: (
+            conversion_goals: ConversionGoalFilter[],
+            drillDownLevel: MarketingAnalyticsDrillDownLevel
+        ) => string[]
+        sortedColumns: (defaultColumns: string[], query: DataTableNode | null) => string[]
+    }
+}
+
+export type marketingAnalyticsTableLogicType = MakeLogicType<
+    marketingAnalyticsTableLogicValues,
+    marketingAnalyticsTableLogicActions,
+    Record<string, any>,
+    marketingAnalyticsTableLogicMeta
+>
+
 export const marketingAnalyticsTableLogic = kea<marketingAnalyticsTableLogicType>([
     path(['scenes', 'marketingAnalytics', 'marketingAnalyticsTableLogic']),
     connect(() => ({
diff --git a/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/logic/marketingAnalyticsTilesLogic.ts b/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/logic/marketingAnalyticsTilesLogic.ts
index b0f8dd14c7b4..0906e6532c86 100644
--- a/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/logic/marketingAnalyticsTilesLogic.ts
+++ b/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/logic/marketingAnalyticsTilesLogic.ts
@@ -1,4 +1,4 @@
-import { connect, kea, path, selectors } from 'kea'
+import { MakeLogicType, connect, kea, path, selectors } from 'kea'
 
 import { FEATURE_FLAGS } from 'lib/constants'
 import { FeatureFlagsSet, featureFlagLogic } from 'lib/logic/featureFlagLogic'
@@ -36,7 +36,6 @@ import {
 
 import { marketingAnalyticsLogic } from './marketingAnalyticsLogic'
 import { marketingAnalyticsTableLogic } from './marketingAnalyticsTableLogic'
-import type { marketingAnalyticsTilesLogicType } from './marketingAnalyticsTilesLogicType'
 import {
     getOrderBy,
     getSortedColumnsByArray,
@@ -69,6 +68,92 @@ const createInsightProps = (tile: TileId, tab?: string): InsightLogicProps => ({
     dataNodeCollectionId: MARKETING_ANALYTICS_DATA_COLLECTION_NODE_ID,
 })
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface marketingAnalyticsTilesLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    baseCurrency: CurrencyCode // marketingAnalyticsLogic
+    chartDisplayType: ChartDisplayType // marketingAnalyticsLogic
+    compareFilter: CompareFilter // marketingAnalyticsLogic
+    createMarketingDataWarehouseNodes: DataWarehouseNode[] // marketingAnalyticsLogic
+    dateFilter: {
+        dateFrom: string | null
+        dateTo: string | null
+        interval: IntervalType
+    } // marketingAnalyticsLogic
+    draftConversionGoal: ConversionGoalFilter | null // marketingAnalyticsLogic
+    drillDownLevel: MarketingAnalyticsDrillDownLevel // marketingAnalyticsLogic
+    integrationFilter: IntegrationFilter // marketingAnalyticsLogic
+    loading: boolean // marketingAnalyticsLogic
+    tileColumnSelection: validColumnsForTiles // marketingAnalyticsLogic
+    defaultColumns: string[] // marketingAnalyticsTableLogic
+    query: DataTableNode | null // marketingAnalyticsTableLogic
+    campaignBreakdownTile: QueryTile | null
+    campaignCostsBreakdown: DataTableNode | null
+    marketingChartTile: QueryTile
+    overviewTile: QueryTile
+    tiles: QueryTile[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface marketingAnalyticsTilesLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        overviewTile: (
+            compareFilter: CompareFilter,
+            dateFilter: {
+                dateFrom: string | null
+                dateTo: string | null
+                interval: IntervalType
+            },
+            draftConversionGoal: ConversionGoalFilter | null,
+            integrationFilter: IntegrationFilter
+        ) => QueryTile
+        marketingChartTile: (
+            compareFilter: CompareFilter,
+            dateFilter: {
+                dateFrom: string | null
+                dateTo: string | null
+                interval: IntervalType
+            },
+            createMarketingDataWarehouseNodes: DataWarehouseNode[],
+            chartDisplayType: ChartDisplayType,
+            tileColumnSelection: validColumnsForTiles,
+            baseCurrency: CurrencyCode,
+            integrationFilter: IntegrationFilter,
+            featureFlags: FeatureFlagsSet
+        ) => QueryTile
+        campaignBreakdownTile: (
+            campaignCostsBreakdown: DataTableNode | null,
+            drillDownLevel: MarketingAnalyticsDrillDownLevel
+        ) => QueryTile | null
+        tiles: (
+            overviewTile: QueryTile,
+            marketingChartTile: QueryTile,
+            campaignBreakdownTile: QueryTile | null
+        ) => QueryTile[]
+        campaignCostsBreakdown: (
+            loading: boolean,
+            query: DataTableNode | null,
+            dateFilter: {
+                dateFrom: string | null
+                dateTo: string | null
+                interval: IntervalType
+            },
+            draftConversionGoal: ConversionGoalFilter | null,
+            defaultColumns: string[],
+            compareFilter: CompareFilter,
+            integrationFilter: IntegrationFilter,
+            drillDownLevel: MarketingAnalyticsDrillDownLevel
+        ) => DataTableNode | null
+    }
+}
+
+export type marketingAnalyticsTilesLogicType = MakeLogicType<
+    marketingAnalyticsTilesLogicValues,
+    {},
+    Record<string, any>,
+    marketingAnalyticsTilesLogicMeta
+>
+
 export const marketingAnalyticsTilesLogic = kea<marketingAnalyticsTilesLogicType>([
     path(['scenes', 'webAnalytics', 'marketingAnalyticsTilesLogic']),
     connect(() => ({
diff --git a/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/logic/utmAuditLogic.ts b/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/logic/utmAuditLogic.ts
index 56f6d5932608..6089c195024b 100644
--- a/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/logic/utmAuditLogic.ts
+++ b/frontend/src/scenes/web-analytics/tabs/marketing-analytics/frontend/logic/utmAuditLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -11,10 +11,10 @@ import {
     VALID_NATIVE_MARKETING_SOURCES,
 } from '~/queries/schema/schema-general'
 
+import type { CurrencyCode } from '../../../../../../queries/schema/schema-general'
 import { similarityScore } from '../components/settings/stringSimilarity'
 import { marketingAnalyticsSettingsLogic } from './marketingAnalyticsSettingsLogic'
 import { MARKETING_ANALYTICS_DATA_COLLECTION_NODE_ID } from './marketingAnalyticsTilesLogic'
-import type { utmAuditLogicType } from './utmAuditLogicType'
 
 export interface UtmIssue {
     field: string
@@ -85,6 +85,107 @@ const SOURCE_TO_INTEGRATION_NAME: Record<string, string> = Object.fromEntries(
     KNOWN_SOURCES_LIST.map((s) => [s.source, s.integration])
 )
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface utmAuditLogicValues {
+    marketingAnalyticsConfig: MarketingAnalyticsConfig | null // marketingAnalyticsSettingsLogic
+    baseCurrency: CurrencyCode // teamLogic
+    currentTeamId: number | null // teamLogic
+    activeTab: HealthTab
+    aggregatedUtmSources: AggregatedUtmSource[]
+    allMappedSources: Set<string>
+    auditData: UtmAuditResponse | null
+    auditDataFailure: string | null
+    auditDataLoading: boolean
+    availableSources: string[]
+    campaignSearch: string
+    campaignsWithoutUtmCount: number
+    filteredCampaigns: CampaignAuditResult[]
+    selectedCampaign: string | null
+    selectedCampaignData: CampaignAuditResult | null
+    selectedUtmCampaign: string | null
+    sortedUtmCampaigns: UtmEvent[]
+    sourceFilter: string | null
+    totalUtmSourcesCount: number
+    unmappedSourcesCount: number
+    utmSearch: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface utmAuditLogicActions {
+    reloadAll: () => {} // dataNodeCollectionLogic
+    loadAuditData: () => any
+    loadAuditDataFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAuditDataSuccess: (
+        auditData: UtmAuditResponse,
+        payload?: any
+    ) => {
+        auditData: UtmAuditResponse
+        payload?: any
+    }
+    setActiveTab: (tab: HealthTab) => {
+        tab: HealthTab
+    }
+    setCampaignSearch: (search: string) => {
+        search: string
+    }
+    setSelectedCampaign: (campaignName: string | null) => {
+        campaignName: string | null
+    }
+    setSelectedUtmCampaign: (utmCampaign: string | null) => {
+        utmCampaign: string | null
+    }
+    setSourceFilter: (source: string | null) => {
+        source: string | null
+    }
+    setUtmSearch: (search: string) => {
+        search: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface utmAuditLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        availableSources: (auditData: UtmAuditResponse | null) => string[]
+        filteredCampaigns: (
+            auditData: UtmAuditResponse | null,
+            sourceFilter: string | null,
+            campaignSearch: string
+        ) => CampaignAuditResult[]
+        campaignsWithoutUtmCount: (auditData: UtmAuditResponse | null) => number
+        totalUtmSourcesCount: (auditData: UtmAuditResponse | null) => number
+        unmappedSourcesCount: (auditData: UtmAuditResponse | null, allMappedSources: Set<string>) => number
+        selectedCampaignData: (
+            auditData: UtmAuditResponse | null,
+            selectedCampaign: string | null
+        ) => CampaignAuditResult | null
+        sortedUtmCampaigns: (
+            auditData: UtmAuditResponse | null,
+            selectedCampaign: string | null,
+            utmSearch: string
+        ) => UtmEvent[]
+        allMappedSources: (marketingAnalyticsConfig: MarketingAnalyticsConfig | null) => Set<string>
+        aggregatedUtmSources: (
+            auditData: UtmAuditResponse | null,
+            utmSearch: string,
+            allMappedSources: Set<string>,
+            marketingAnalyticsConfig: MarketingAnalyticsConfig | null
+        ) => AggregatedUtmSource[]
+    }
+}
+
+export type utmAuditLogicType = MakeLogicType<
+    utmAuditLogicValues,
+    utmAuditLogicActions,
+    Record<string, any>,
+    utmAuditLogicMeta
+>
+
 export const utmAuditLogic = kea<utmAuditLogicType>([
     path(['scenes', 'webAnalytics', 'utmAuditLogic']),
     connect(() => ({
diff --git a/frontend/src/scenes/web-analytics/webAnalyticsFilterLogic.ts b/frontend/src/scenes/web-analytics/webAnalyticsFilterLogic.ts
index 4b0d50a96338..a13a84e3a807 100644
--- a/frontend/src/scenes/web-analytics/webAnalyticsFilterLogic.ts
+++ b/frontend/src/scenes/web-analytics/webAnalyticsFilterLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 
 import { AuthorizedUrlListType, authorizedUrlListLogic } from 'lib/components/AuthorizedUrlList/authorizedUrlListLogic'
 import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
@@ -8,7 +8,6 @@ import { CompareFilter, WebAnalyticsPropertyFilter, WebAnalyticsPropertyFilters
 import { PropertyFilterBaseValue, PropertyFilterType, PropertyOperator, WebAnalyticsFiltersConfig } from '~/types'
 
 import { DeviceType, INITIAL_WEB_ANALYTICS_FILTER } from './common'
-import type { webAnalyticsFilterLogicType } from './webAnalyticsFilterLogicType'
 
 const teamId = window.POSTHOG_APP_CONTEXT?.current_team?.id
 const persistConfig = { persist: true, prefix: `${teamId}__` }
@@ -24,6 +23,101 @@ const eventFilter = (key: string, value: string | string[]): WebAnalyticsPropert
 export const isLiveStreamFilter = (filter: WebAnalyticsPropertyFilter): boolean =>
     filter.type === PropertyFilterType.Event && filter.operator === PropertyOperator.Exact
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface webAnalyticsFilterLogicValues {
+    rawAuthorizedUrls: string[] // authorizedUrlListLogic
+    authorizedDomains: string[]
+    compareFilter: CompareFilter
+    countryFilter: string | null
+    deviceTypeFilter: DeviceType | null
+    domainFilter: string | null
+    effectiveDomain: string | null
+    hasHostFilter: boolean
+    liveFilters: WebAnalyticsPropertyFilter[]
+    rawWebAnalyticsFilters: WebAnalyticsPropertyFilters
+    referrerFilter: string | null
+    selectedHost: string | null
+    validatedDomainFilter: string | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface webAnalyticsFilterLogicActions {
+    clearFilters: () => {
+        value: true
+    }
+    loadPreset: (filters: WebAnalyticsFiltersConfig) => {
+        filters: WebAnalyticsFiltersConfig
+    }
+    setCompareFilter: (compareFilter: CompareFilter) => {
+        compareFilter: CompareFilter
+    }
+    setCountryFilter: (countryCode: string | null) => {
+        countryCode: string | null
+    }
+    setDeviceTypeFilter: (deviceType: DeviceType | null) => {
+        deviceType: DeviceType | null
+    }
+    setDomainFilter: (domain: string | null) => {
+        domain: string | null
+    }
+    setReferrerFilter: (referrer: string | null) => {
+        referrer: string | null
+    }
+    setWebAnalyticsFilters: (webAnalyticsFilters: WebAnalyticsPropertyFilters) => {
+        webAnalyticsFilters: WebAnalyticsPropertyFilters
+    }
+    togglePropertyFilter: (
+        type: PropertyFilterType.Event | PropertyFilterType.Person | PropertyFilterType.Session,
+        key: string,
+        value: number | string | null,
+        tabChange?: {
+            activeHoursTab?: string
+            deviceTab?: string
+            geographyTab?: string
+            graphsTab?: string
+            pathTab?: string
+            sourceTab?: string
+        }
+    ) => {
+        key: string
+        tabChange:
+            | {
+                  activeHoursTab?: string | undefined
+                  deviceTab?: string | undefined
+                  geographyTab?: string | undefined
+                  graphsTab?: string | undefined
+                  pathTab?: string | undefined
+                  sourceTab?: string | undefined
+              }
+            | undefined
+        type: PropertyFilterType.Event | PropertyFilterType.Person | PropertyFilterType.Session
+        value: number | string | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface webAnalyticsFilterLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        hasHostFilter: (rawWebAnalyticsFilters: WebAnalyticsPropertyFilters) => boolean
+        authorizedDomains: (rawAuthorizedUrls: string[]) => string[]
+        validatedDomainFilter: (domainFilter: string | null, authorizedDomains: string[]) => string | null
+        selectedHost: (validatedDomainFilter: string | null) => string | null
+        effectiveDomain: (domainFilter: string | null, authorizedDomains: string[]) => string | null
+        liveFilters: (
+            rawWebAnalyticsFilters: WebAnalyticsPropertyFilters,
+            selectedHost: string | null,
+            deviceTypeFilter: DeviceType | null
+        ) => WebAnalyticsPropertyFilter[]
+    }
+}
+
+export type webAnalyticsFilterLogicType = MakeLogicType<
+    webAnalyticsFilterLogicValues,
+    webAnalyticsFilterLogicActions,
+    Record<string, any>,
+    webAnalyticsFilterLogicMeta
+>
+
 export const webAnalyticsFilterLogic = kea<webAnalyticsFilterLogicType>([
     path(['scenes', 'webAnalytics', 'webAnalyticsFilterLogic']),
     connect(() => ({
@@ -204,7 +298,10 @@ export const webAnalyticsFilterLogic = kea<webAnalyticsFilterLogicType>([
         ],
     }),
     selectors({
-        hasHostFilter: [(s) => [s.rawWebAnalyticsFilters], (filters) => filters.some((f) => f.key === '$host')],
+        hasHostFilter: [
+            (s) => [s.rawWebAnalyticsFilters],
+            (filters: WebAnalyticsPropertyFilters) => filters.some((f) => f.key === '$host'),
+        ],
         authorizedDomains: [
             (s) => [s.rawAuthorizedUrls],
             (rawAuthorizedUrls: string[]): string[] => {
diff --git a/frontend/src/scenes/web-analytics/webAnalyticsFilterPresetsLogic.ts b/frontend/src/scenes/web-analytics/webAnalyticsFilterPresetsLogic.ts
index f7f2d10d9185..ac78d45cb0f4 100644
--- a/frontend/src/scenes/web-analytics/webAnalyticsFilterPresetsLogic.ts
+++ b/frontend/src/scenes/web-analytics/webAnalyticsFilterPresetsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 
@@ -9,10 +9,203 @@ import { toParams } from 'lib/utils/url'
 
 import { WebAnalyticsFilterPresetType } from '~/types'
 
+import type { WebAnalyticsFiltersConfig } from '../../types'
 import { webAnalyticsFilterLogic } from './webAnalyticsFilterLogic'
-import type { webAnalyticsFilterPresetsLogicType } from './webAnalyticsFilterPresetsLogicType'
 import { webAnalyticsLogic } from './webAnalyticsLogic'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface webAnalyticsFilterPresetsLogicValues {
+    currentFiltersConfig: WebAnalyticsFiltersConfig // webAnalyticsLogic
+    activePreset: WebAnalyticsFilterPresetType | null
+    appliedPreset: WebAnalyticsFilterPresetType | null
+    canSavePreset: boolean
+    editingPreset: WebAnalyticsFilterPresetType | null
+    hasPresets: boolean
+    hasUnsavedChanges: boolean
+    isEditMode: boolean
+    pinnedPresets: WebAnalyticsFilterPresetType[]
+    presetFormDescription: string
+    presetFormName: string
+    presetToDelete: WebAnalyticsFilterPresetType | null
+    presets: PaginatedResponse<WebAnalyticsFilterPresetType>
+    presetsLoading: boolean
+    recentPresets: WebAnalyticsFilterPresetType[]
+    saveModalOpen: boolean
+    savedPreset: WebAnalyticsFilterPresetType | null
+    savedPresetLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface webAnalyticsFilterPresetsLogicActions {
+    clearPropertyFilters: () => {
+        value: true
+    } // webAnalyticsFilterLogic
+    loadPreset: (filters: WebAnalyticsFiltersConfig) => {
+        filters: WebAnalyticsFiltersConfig
+    } // webAnalyticsFilterLogic
+    clearDateFilters: () => {
+        value: true
+    } // webAnalyticsLogic
+    applyPreset: (preset: WebAnalyticsFilterPresetType) => {
+        preset: WebAnalyticsFilterPresetType
+    }
+    checkForPresetRedirect: () => {
+        value: true
+    }
+    clearPreset: () => {
+        value: true
+    }
+    closeDeleteModal: () => {
+        value: true
+    }
+    closeSaveModal: () => {
+        value: true
+    }
+    deletePreset: (preset: WebAnalyticsFilterPresetType) => {
+        preset: WebAnalyticsFilterPresetType
+    }
+    deletePresetFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deletePresetSuccess: (
+        savedPreset: null,
+        payload?: {
+            preset: WebAnalyticsFilterPresetType
+        }
+    ) => {
+        savedPreset: null
+        payload?: {
+            preset: WebAnalyticsFilterPresetType
+        }
+    }
+    loadPresets: () => {
+        value: true
+    }
+    loadPresetsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPresetsSuccess: (
+        presets: PaginatedResponse<WebAnalyticsFilterPresetType>,
+        payload?: {
+            value: true
+        }
+    ) => {
+        presets: PaginatedResponse<WebAnalyticsFilterPresetType>
+        payload?: {
+            value: true
+        }
+    }
+    openDeleteModal: (preset: WebAnalyticsFilterPresetType) => {
+        preset: WebAnalyticsFilterPresetType
+    }
+    openEditModal: (preset: WebAnalyticsFilterPresetType) => {
+        preset: WebAnalyticsFilterPresetType
+    }
+    openSaveModal: () => {
+        value: true
+    }
+    resetPresetForm: () => {
+        value: true
+    }
+    saveCurrentFiltersAsPreset: (
+        name: string,
+        description?: string
+    ) => {
+        description: string | undefined
+        name: string
+    }
+    saveCurrentFiltersAsPresetFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    saveCurrentFiltersAsPresetSuccess: (
+        savedPreset: WebAnalyticsFilterPresetType,
+        payload?: {
+            description: string | undefined
+            name: string
+        }
+    ) => {
+        savedPreset: WebAnalyticsFilterPresetType
+        payload?: {
+            description: string | undefined
+            name: string
+        }
+    }
+    setAppliedPreset: (preset: WebAnalyticsFilterPresetType | null) => {
+        preset: WebAnalyticsFilterPresetType | null
+    }
+    setPresetFormDescription: (description: string) => {
+        description: string
+    }
+    setPresetFormName: (name: string) => {
+        name: string
+    }
+    updateAppliedPresetFilters: () => {
+        value: true
+    }
+    updatePreset: (
+        shortId: string,
+        updates: Partial<WebAnalyticsFilterPresetType>
+    ) => {
+        shortId: string
+        updates: Partial<WebAnalyticsFilterPresetType>
+    }
+    updatePresetFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updatePresetSuccess: (
+        savedPreset: WebAnalyticsFilterPresetType,
+        payload?: {
+            shortId: string
+            updates: Partial<WebAnalyticsFilterPresetType>
+        }
+    ) => {
+        savedPreset: WebAnalyticsFilterPresetType
+        payload?: {
+            shortId: string
+            updates: Partial<WebAnalyticsFilterPresetType>
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface webAnalyticsFilterPresetsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        pinnedPresets: (presets: PaginatedResponse<WebAnalyticsFilterPresetType>) => WebAnalyticsFilterPresetType[]
+        recentPresets: (presets: PaginatedResponse<WebAnalyticsFilterPresetType>) => WebAnalyticsFilterPresetType[]
+        hasPresets: (presets: PaginatedResponse<WebAnalyticsFilterPresetType>) => boolean
+        canSavePreset: (presetFormName: string) => boolean
+        activePreset: (appliedPreset: WebAnalyticsFilterPresetType | null) => WebAnalyticsFilterPresetType | null
+        hasUnsavedChanges: (
+            appliedPreset: WebAnalyticsFilterPresetType | null,
+            currentFiltersConfig: WebAnalyticsFiltersConfig
+        ) => boolean
+        isEditMode: (editingPreset: WebAnalyticsFilterPresetType | null) => boolean
+    }
+}
+
+export type webAnalyticsFilterPresetsLogicType = MakeLogicType<
+    webAnalyticsFilterPresetsLogicValues,
+    webAnalyticsFilterPresetsLogicActions,
+    Record<string, any>,
+    webAnalyticsFilterPresetsLogicMeta
+>
+
 export const webAnalyticsFilterPresetsLogic = kea<webAnalyticsFilterPresetsLogicType>([
     path(['scenes', 'webAnalytics', 'webAnalyticsFilterPresetsLogic']),
     connect(() => ({
@@ -197,31 +390,31 @@ export const webAnalyticsFilterPresetsLogic = kea<webAnalyticsFilterPresetsLogic
     selectors({
         pinnedPresets: [
             (s) => [s.presets],
-            (presets): WebAnalyticsFilterPresetType[] => {
+            (presets: PaginatedResponse<WebAnalyticsFilterPresetType>): WebAnalyticsFilterPresetType[] => {
                 return presets.results.filter((p) => p.pinned)
             },
         ],
         recentPresets: [
             (s) => [s.presets],
-            (presets): WebAnalyticsFilterPresetType[] => {
+            (presets: PaginatedResponse<WebAnalyticsFilterPresetType>): WebAnalyticsFilterPresetType[] => {
                 return presets.results.filter((p) => !p.pinned).slice(0, 5)
             },
         ],
         hasPresets: [
             (s) => [s.presets],
-            (presets): boolean => {
+            (presets: PaginatedResponse<WebAnalyticsFilterPresetType>): boolean => {
                 return presets.results.length > 0
             },
         ],
         canSavePreset: [
             (s) => [s.presetFormName],
-            (name): boolean => {
+            (name: string): boolean => {
                 return name.trim().length > 0
             },
         ],
         activePreset: [
             (s) => [s.appliedPreset],
-            (appliedPreset): WebAnalyticsFilterPresetType | null => {
+            (appliedPreset: WebAnalyticsFilterPresetType | null): WebAnalyticsFilterPresetType | null => {
                 if (!appliedPreset) {
                     return null
                 }
@@ -231,14 +424,20 @@ export const webAnalyticsFilterPresetsLogic = kea<webAnalyticsFilterPresetsLogic
         ],
         hasUnsavedChanges: [
             (s) => [s.appliedPreset, s.currentFiltersConfig],
-            (appliedPreset, currentFiltersConfig): boolean => {
+            (
+                appliedPreset: WebAnalyticsFilterPresetType | null,
+                currentFiltersConfig: import('~/types').WebAnalyticsFiltersConfig
+            ): boolean => {
                 if (!appliedPreset) {
                     return false
                 }
                 return !objectsEqual(appliedPreset.filters, currentFiltersConfig)
             },
         ],
-        isEditMode: [(s) => [s.editingPreset], (editingPreset): boolean => !!editingPreset],
+        isEditMode: [
+            (s) => [s.editingPreset],
+            (editingPreset: WebAnalyticsFilterPresetType | null): boolean => !!editingPreset,
+        ],
     }),
     afterMount(({ actions }) => {
         actions.loadPresets()
diff --git a/frontend/src/scenes/web-analytics/webAnalyticsLoadTimeLogic.ts b/frontend/src/scenes/web-analytics/webAnalyticsLoadTimeLogic.ts
index 94a4bde12bcf..522ea8f8267f 100644
--- a/frontend/src/scenes/web-analytics/webAnalyticsLoadTimeLogic.ts
+++ b/frontend/src/scenes/web-analytics/webAnalyticsLoadTimeLogic.ts
@@ -1,4 +1,16 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors, sharedListeners } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    afterMount,
+    connect,
+    kea,
+    listeners,
+    path,
+    reducers,
+    selectors,
+    sharedListeners,
+} from 'kea'
+import type { BreakPointFunction } from 'kea'
 import posthog from 'posthog-js'
 
 import { FEATURE_FLAGS } from 'lib/constants'
@@ -13,7 +25,57 @@ import { isWebAnalyticsAchievementsEnabled } from './achievements/gating'
 import { webAnalyticsAchievementsLogic } from './achievements/webAnalyticsAchievementsLogic'
 import { webAnalyticsAchievementsPreferencesLogic } from './achievements/webAnalyticsAchievementsPreferencesLogic'
 import { WEB_ANALYTICS_DATA_COLLECTION_NODE_ID } from './common'
-import type { webAnalyticsLoadTimeLogicType } from './webAnalyticsLoadTimeLogicType'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface webAnalyticsLoadTimeLogicValues {
+    areAnyLoading: boolean // dataNodeCollectionLogic
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    currentProjectId: number | string // teamLogic
+    achievementsOptOut: boolean // webAnalyticsAchievementsPreferencesLogic
+    hasObservedLoading: boolean
+    tileSkeletonsEnabled: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface webAnalyticsLoadTimeLogicActions {
+    collectionNodeLoadData: (id: string) => {
+        id: string
+    } // dataNodeCollectionLogic
+    collectionNodeLoadDataFailure: (id: string) => {
+        id: string
+    } // dataNodeCollectionLogic
+    collectionNodeLoadDataSuccess: (id: string) => {
+        id: string
+    } // dataNodeCollectionLogic
+    recordVisit: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface webAnalyticsLoadTimeLogicMeta {
+    sharedListeners: {
+        maybeCaptureLoaded: (
+            payload: any,
+            breakpoint: BreakPointFunction,
+            action: {
+                type: string
+                payload: any
+            },
+            previousState: any
+        ) => void | Promise<void>
+    }
+    __keaTypeGenInternalSelectorTypes: {
+        tileSkeletonsEnabled: (featureFlags: FeatureFlagsSet) => boolean
+    }
+}
+
+export type webAnalyticsLoadTimeLogicType = MakeLogicType<
+    webAnalyticsLoadTimeLogicValues,
+    webAnalyticsLoadTimeLogicActions,
+    Record<string, any>,
+    webAnalyticsLoadTimeLogicMeta
+>
 
 export const webAnalyticsLoadTimeLogic = kea<webAnalyticsLoadTimeLogicType>([
     path(['scenes', 'webAnalytics', 'webAnalyticsLoadTimeLogic']),
diff --git a/frontend/src/scenes/web-analytics/webAnalyticsLogic.tsx b/frontend/src/scenes/web-analytics/webAnalyticsLogic.tsx
index 08331ad80622..76982dd920f9 100644
--- a/frontend/src/scenes/web-analytics/webAnalyticsLogic.tsx
+++ b/frontend/src/scenes/web-analytics/webAnalyticsLogic.tsx
@@ -1,4 +1,15 @@
-import { BreakPointFunction, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    BreakPointFunction,
+    actions,
+    afterMount,
+    connect,
+    kea,
+    listeners,
+    path,
+    reducers,
+    selectors,
+} from 'kea'
 import { loaders } from 'kea-loaders'
 import { router, urlToAction } from 'kea-router'
 import { subscriptions } from 'kea-subscriptions'
@@ -79,6 +90,8 @@ import {
     WebAnalyticsFiltersConfig,
 } from '~/types'
 
+import type { FeatureFlagsSet } from '../../lib/logic/featureFlagLogic'
+import type { CompareFilter, CurrencyCode } from '../../queries/schema/schema-general'
 import { botAnalyticsLogic } from './botAnalyticsLogic'
 import {
     ActiveHoursTab,
@@ -121,7 +134,6 @@ import { webAnalyticsHealthLogic } from './health'
 import { IncludeHostToggle } from './IncludeHostToggle'
 import { getDashboardItemId, getNewInsightUrlFactory } from './insightsUtils'
 import { webAnalyticsFilterLogic } from './webAnalyticsFilterLogic'
-import type { webAnalyticsLogicType } from './webAnalyticsLogicType'
 
 export interface DateFilterState {
     dateFrom: string | null
@@ -130,6 +142,549 @@ export interface DateFilterState {
     isIntervalManuallySet: boolean
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface webAnalyticsLogicValues {
+    authorizedUrls: string[] // authorizedUrlListLogic
+    isProposedUrlSubmitting: boolean // authorizedUrlListLogic
+    showProposedURLForm: boolean // authorizedUrlListLogic
+    urlSuggestions: any[] // authorizedUrlListLogic
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    isDev: boolean | undefined // preflightLogic
+    baseCurrency: CurrencyCode // teamLogic
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean // userLogic
+    user: UserType | null // userLogic
+    authorizedDomains: string[] // webAnalyticsFilterLogic
+    compareFilter: CompareFilter // webAnalyticsFilterLogic
+    countryFilter: string | null // webAnalyticsFilterLogic
+    deviceTypeFilter: DeviceType | null // webAnalyticsFilterLogic
+    domainFilter: string | null // webAnalyticsFilterLogic
+    hasHostFilter: boolean // webAnalyticsFilterLogic
+    rawWebAnalyticsFilters: WebAnalyticsPropertyFilters // webAnalyticsFilterLogic
+    referrerFilter: string | null // webAnalyticsFilterLogic
+    selectedHost: string | null // webAnalyticsFilterLogic
+    validatedDomainFilter: string | null // webAnalyticsFilterLogic
+    _activeHoursTab: string | null
+    _deviceTab: string | null
+    _geographyTab: string | null
+    _graphsTab: string | null
+    _isPathCleaningEnabled: boolean
+    _pathTab: string | null
+    _sourceTab: string | null
+    activeHoursTab: string
+    breadcrumbs: Breadcrumb[]
+    controls: {
+        filterTestAccounts: boolean
+        includeHostPath: boolean
+        isPathCleaningEnabled: boolean
+        shouldStripQueryParams: boolean
+        useWebAnalyticsPrecompute: boolean | undefined
+    }
+    conversionGoal: WebAnalyticsConversionGoal | null
+    conversionGoalWarning: ConversionGoalWarning | null
+    currentFiltersConfig: WebAnalyticsFiltersConfig
+    dateFilter: DateFilterState
+    deviceTab: string
+    filters: {
+        compareFilter: CompareFilter
+        conversionGoal: WebAnalyticsConversionGoal | null
+        dateFilter: DateFilterState
+        replayFilters: RecordingUniversalFilters
+        tablesOrderBy: WebAnalyticsOrderBy | null
+        webAnalyticsFilters: WebAnalyticsPropertyFilters
+        webVitalsPercentile: WebVitalsPercentile
+        webVitalsTab: WebVitalsMetric
+    }
+    focusModeConcerns: WebAnalyticsConcern[]
+    focusModeDraftConcerns: WebAnalyticsConcern[]
+    focusModeEnabled: boolean
+    focusModeModalIsOnboarding: boolean
+    focusModeModalOpen: boolean
+    focusModeOnboardingModalOpen: boolean
+    geographyTab: string
+    getNewInsightUrl: (tileId: TileId, tabId?: string | undefined) => string | undefined
+    graphsTab: string
+    hasCountryFilter: boolean
+    hasIncompatibleFilters: boolean
+    hasSavedFocusMode: boolean
+    hasSeenFocusModeOnboarding: boolean
+    hiddenTiles: TileId[]
+    includeHostPath: boolean
+    incompatibleFilters: WebAnalyticsPropertyFilters
+    isFocusModeActive: boolean
+    isGreaterThanMd: boolean
+    isPathCleaningEnabled: boolean
+    pathTab: string
+    preAggregatedEnabled: boolean | undefined
+    preZoomDateFilter: {
+        dateFrom: string | null
+        dateTo: string | null
+        interval: IntervalType
+    } | null
+    productTab: ProductTab
+    replayFilters: RecordingUniversalFilters
+    shouldAutoOpenFocusModeOnboarding: boolean
+    shouldFilterTestAccounts: boolean
+    shouldShowGeoIPQueries: any
+    shouldShowGeoIPQueriesLoading: boolean
+    shouldStripQueryParams: boolean
+    showFocusMode: boolean
+    sourceTab: string
+    surveyModalPath: string | null
+    tablesOrderBy: WebAnalyticsOrderBy | null
+    tabs: {
+        activeHoursTab: string
+        deviceTab: string
+        geographyTab: string
+        graphsTab: string
+        pathTab: string
+        shouldShowGeoIPQueries: any
+        sourceTab: string
+    }
+    tileVisualizations: Record<TileId, TileVisualizationOption>
+    tiles: WebAnalyticsTile[]
+    useWebAnalyticsPrecompute: boolean | null
+    webAnalyticsFilters: WebAnalyticsPropertyFilters
+    webVitalsMetricQuery: InsightVizNode<TrendsQuery>
+    webVitalsPercentile: WebVitalsPercentile
+    webVitalsTab: WebVitalsMetric
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface webAnalyticsLogicActions {
+    addAuthorizedUrl: (
+        url: string,
+        launch?: boolean | undefined
+    ) => {
+        launch: boolean | undefined
+        url: string
+    } // authorizedUrlListLogic
+    cancelProposingAuthorizedUrl: () => {
+        value: true
+    } // authorizedUrlListLogic
+    newAuthorizedUrl: () => {
+        value: true
+    } // authorizedUrlListLogic
+    cancelAllLoading: () => {} // dataNodeCollectionLogic
+    updateUser: (
+        user: Partial<UserType>,
+        successCallback?: (() => void) | undefined
+    ) => {
+        successCallback: (() => void) | undefined
+        user: Partial<UserType>
+    } // userLogic
+    loadPreset: (filters: WebAnalyticsFiltersConfig) => {
+        filters: WebAnalyticsFiltersConfig
+    } // webAnalyticsFilterLogic
+    setCompareFilter: (compareFilter: CompareFilter) => {
+        compareFilter: CompareFilter
+    } // webAnalyticsFilterLogic
+    setCountryFilter: (countryCode: string | null) => {
+        countryCode: string | null
+    } // webAnalyticsFilterLogic
+    setDeviceTypeFilter: (deviceType: DeviceType | null) => {
+        deviceType: DeviceType | null
+    } // webAnalyticsFilterLogic
+    setDomainFilter: (domain: string | null) => {
+        domain: string | null
+    } // webAnalyticsFilterLogic
+    setReferrerFilter: (referrer: string | null) => {
+        referrer: string | null
+    } // webAnalyticsFilterLogic
+    setWebAnalyticsFilters: (webAnalyticsFilters: WebAnalyticsPropertyFilters) => {
+        webAnalyticsFilters: WebAnalyticsPropertyFilters
+    } // webAnalyticsFilterLogic
+    togglePropertyFilter: (
+        type: PropertyFilterType.Event | PropertyFilterType.Person | PropertyFilterType.Session,
+        key: string,
+        value: number | string | null,
+        tabChange?:
+            | {
+                  activeHoursTab?: string
+                  deviceTab?: string
+                  geographyTab?: string
+                  graphsTab?: string
+                  pathTab?: string
+                  sourceTab?: string
+              }
+            | undefined
+    ) => {
+        key: string
+        tabChange:
+            | {
+                  activeHoursTab?: string | undefined
+                  deviceTab?: string | undefined
+                  geographyTab?: string | undefined
+                  graphsTab?: string | undefined
+                  pathTab?: string | undefined
+                  sourceTab?: string | undefined
+              }
+            | undefined
+        type: PropertyFilterType.Event | PropertyFilterType.Person | PropertyFilterType.Session
+        value: number | string | null
+    } // webAnalyticsFilterLogic
+    trackTabViewed: () => {
+        value: true
+    } // webAnalyticsHealthLogic
+    applyFocusMode: () => {
+        value: true
+    }
+    clearFilters: () => {
+        value: true
+    }
+    clearTablesOrderBy: () => boolean
+    closeFocusModeModal: () => {
+        value: true
+    }
+    closeSurveyModal: () => {
+        value: true
+    }
+    dismissFocusModeOnboarding: () => {
+        value: true
+    }
+    enterFocusMode: () => {
+        value: true
+    }
+    exitFocusMode: () => {
+        value: true
+    }
+    loadShouldShowGeoIPQueries: () => any
+    loadShouldShowGeoIPQueriesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadShouldShowGeoIPQueriesSuccess: (
+        shouldShowGeoIPQueries: boolean,
+        payload?: any
+    ) => {
+        shouldShowGeoIPQueries: boolean
+        payload?: any
+    }
+    markFocusModeOnboardingSeen: () => {
+        value: true
+    }
+    openAsNewInsight: (
+        tileId: TileId,
+        tabId?: string
+    ) => {
+        tabId: string | undefined
+        tileId: TileId
+    }
+    openFocusModeModal: (onboarding?: boolean) => {
+        onboarding: boolean
+    }
+    openFocusModeOnboarding: () => {
+        value: true
+    }
+    openSurveyModal: (path: string) => {
+        path: string
+    }
+    removeIncompatibleFilters: () => {
+        value: true
+    }
+    resetTileVisibility: () => boolean
+    resetZoom: () => {
+        value: true
+    }
+    setActiveHoursTab: (tab: string) => {
+        tab: string
+    }
+    setConversionGoal: (conversionGoal: WebAnalyticsConversionGoal | null) => {
+        conversionGoal: WebAnalyticsConversionGoal | null
+    }
+    setConversionGoalWarning: (warning: ConversionGoalWarning | null) => {
+        warning: ConversionGoalWarning | null
+    }
+    setDateInterval: (interval: IntervalType) => {
+        interval: IntervalType
+    }
+    setDates: (
+        dateFrom: string | null,
+        dateTo: string | null
+    ) => {
+        dateFrom: string | null
+        dateTo: string | null
+    }
+    setDatesAndInterval: (
+        dateFrom: string | null,
+        dateTo: string | null,
+        interval: IntervalType
+    ) => {
+        dateFrom: string | null
+        dateTo: string | null
+        interval: IntervalType
+    }
+    setDeviceTab: (tab: string) => {
+        tab: string
+    }
+    setFocusModeConcerns: (concerns: WebAnalyticsConcern[]) => {
+        concerns: WebAnalyticsConcern[]
+    }
+    setFocusModeDraftConcerns: (concerns: WebAnalyticsConcern[]) => {
+        concerns: WebAnalyticsConcern[]
+    }
+    setFocusModeEnabled: (enabled: boolean) => {
+        enabled: boolean
+    }
+    setGeographyTab: (tab: string) => {
+        tab: string
+    }
+    setGraphsTab: (tab: string) => {
+        tab: string
+    }
+    setHiddenTiles: (hiddenTiles: TileId[]) => {
+        hiddenTiles: TileId[]
+    }
+    setIncludeHostPath: (includeHostPath: boolean) => {
+        includeHostPath: boolean
+    }
+    setIsPathCleaningEnabled: (isPathCleaningEnabled: boolean) => {
+        isPathCleaningEnabled: boolean
+    }
+    setPathTab: (tab: string) => {
+        tab: string
+    }
+    setPreZoomDateFilter: (
+        filter: {
+            dateFrom: string | null
+            dateTo: string | null
+            interval: IntervalType
+        } | null
+    ) => {
+        filter: {
+            dateFrom: string | null
+            dateTo: string | null
+            interval: IntervalType
+        } | null
+    }
+    setProductTab: (tab: ProductTab) => {
+        tab: ProductTab
+    }
+    setShouldFilterTestAccounts: (shouldFilterTestAccounts: boolean) => {
+        shouldFilterTestAccounts: boolean
+    }
+    setShouldStripQueryParams: (shouldStripQueryParams: boolean) => {
+        shouldStripQueryParams: boolean
+    }
+    setSourceTab: (tab: string) => {
+        tab: string
+    }
+    setTablesOrderBy: (
+        orderBy: WebAnalyticsOrderByFields,
+        direction: WebAnalyticsOrderByDirection
+    ) => {
+        direction: WebAnalyticsOrderByDirection
+        orderBy: WebAnalyticsOrderByFields
+    }
+    setTileVisibility: (
+        tileId: TileId,
+        visible: boolean
+    ) => {
+        tileId: TileId
+        visible: boolean
+    }
+    setTileVisualization: (
+        tileId: TileId,
+        visualization: TileVisualizationOption
+    ) => {
+        tileId: TileId
+        visualization: TileVisualizationOption
+    }
+    setUseWebAnalyticsPrecompute: (useWebAnalyticsPrecompute: boolean | null) => {
+        useWebAnalyticsPrecompute: boolean | null
+    }
+    setWebVitalsPercentile: (percentile: WebVitalsPercentile) => {
+        percentile: WebVitalsPercentile
+    }
+    setWebVitalsTab: (tab: WebVitalsMetric) => {
+        tab: WebVitalsMetric
+    }
+    startFocusModeOnboarding: () => {
+        value: true
+    }
+    toggleFocusModeConcern: (concern: WebAnalyticsConcern) => {
+        concern: WebAnalyticsConcern
+    }
+    zoomIntoPeriod: (
+        dateFrom: string,
+        dateTo: string
+    ) => {
+        dateFrom: string
+        dateTo: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface webAnalyticsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        preAggregatedEnabled: (
+            featureFlags: FeatureFlagsSet,
+            currentTeam: TeamPublicType | TeamType | null
+        ) => boolean | undefined
+        incompatibleFilters: (
+            rawWebAnalyticsFilters: WebAnalyticsPropertyFilters,
+            preAggregatedEnabled: boolean | undefined
+        ) => WebAnalyticsPropertyFilters
+        hasIncompatibleFilters: (incompatibleFilters: WebAnalyticsPropertyFilters) => boolean
+        graphsTab: (_graphsTab: string | null) => string
+        sourceTab: (_sourceTab: string | null) => string
+        deviceTab: (_deviceTab: string | null) => string
+        pathTab: (_pathTab: string | null) => string
+        geographyTab: (_geographyTab: string | null) => string
+        activeHoursTab: (_activeHoursTab: string | null) => string
+        isPathCleaningEnabled: (
+            _isPathCleaningEnabled: boolean,
+            hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean
+        ) => boolean
+        currentFiltersConfig: (
+            rawWebAnalyticsFilters: WebAnalyticsPropertyFilters,
+            domainFilter: string | null,
+            deviceTypeFilter: DeviceType | null,
+            countryFilter: string | null,
+            referrerFilter: string | null,
+            compareFilter: CompareFilter,
+            dateFilter: DateFilterState,
+            conversionGoal: WebAnalyticsConversionGoal | null,
+            isPathCleaningEnabled: boolean,
+            shouldFilterTestAccounts: boolean
+        ) => WebAnalyticsFiltersConfig
+        webAnalyticsFilters: (
+            rawWebAnalyticsFilters: WebAnalyticsPropertyFilters,
+            isPathCleaningEnabled: boolean,
+            selectedHost: string | null,
+            deviceTypeFilter: DeviceType | null,
+            countryFilter: string | null,
+            referrerFilter: string | null
+        ) => WebAnalyticsPropertyFilters
+        tabs: (
+            graphsTab: string,
+            sourceTab: string,
+            deviceTab: string,
+            pathTab: string,
+            geographyTab: string,
+            activeHoursTab: string,
+            shouldShowGeoIPQueries: any
+        ) => {
+            activeHoursTab: string
+            deviceTab: string
+            geographyTab: string
+            graphsTab: string
+            pathTab: string
+            shouldShowGeoIPQueries: any
+            sourceTab: string
+        }
+        controls: (
+            isPathCleaningEnabled: boolean,
+            shouldFilterTestAccounts: boolean,
+            shouldStripQueryParams: boolean,
+            includeHostPath: boolean,
+            useWebAnalyticsPrecompute: boolean | null,
+            featureFlags: FeatureFlagsSet
+        ) => {
+            filterTestAccounts: boolean
+            includeHostPath: boolean
+            isPathCleaningEnabled: boolean
+            shouldStripQueryParams: boolean
+            useWebAnalyticsPrecompute: boolean | undefined
+        }
+        filters: (
+            webAnalyticsFilters: WebAnalyticsPropertyFilters,
+            replayFilters: RecordingUniversalFilters,
+            dateFilter: DateFilterState,
+            compareFilter: CompareFilter,
+            webVitalsTab: WebVitalsMetric,
+            webVitalsPercentile: WebVitalsPercentile,
+            tablesOrderBy: WebAnalyticsOrderBy | null,
+            conversionGoal: WebAnalyticsConversionGoal | null
+        ) => {
+            compareFilter: CompareFilter
+            conversionGoal: WebAnalyticsConversionGoal | null
+            dateFilter: DateFilterState
+            replayFilters: RecordingUniversalFilters
+            tablesOrderBy: WebAnalyticsOrderBy | null
+            webAnalyticsFilters: WebAnalyticsPropertyFilters
+            webVitalsPercentile: WebVitalsPercentile
+            webVitalsTab: WebVitalsMetric
+        }
+        replayFilters: (
+            webAnalyticsFilters: WebAnalyticsPropertyFilters,
+            dateFilter: DateFilterState,
+            shouldFilterTestAccounts: boolean,
+            conversionGoal: WebAnalyticsConversionGoal | null
+        ) => RecordingUniversalFilters
+        hasCountryFilter: (webAnalyticsFilters: WebAnalyticsPropertyFilters) => boolean
+        webVitalsMetricQuery: (
+            webVitalsPercentile: WebVitalsPercentile,
+            webVitalsTab: WebVitalsMetric,
+            dateFilter: DateFilterState,
+            webAnalyticsFilters: WebAnalyticsPropertyFilters,
+            shouldFilterTestAccounts: boolean
+        ) => InsightVizNode<TrendsQuery>
+        showFocusMode: (featureFlags: FeatureFlagsSet, productTab: ProductTab) => boolean
+        hasSavedFocusMode: (focusModeConcerns: WebAnalyticsConcern[]) => boolean
+        hasSeenFocusModeOnboarding: (user: UserType | null, currentTeam: TeamPublicType | TeamType | null) => boolean
+        shouldAutoOpenFocusModeOnboarding: (
+            user: UserType | null,
+            currentTeam: TeamPublicType | TeamType | null,
+            showFocusMode: boolean,
+            hasSavedFocusMode: boolean,
+            hasSeenFocusModeOnboarding: boolean
+        ) => boolean
+        isFocusModeActive: (
+            showFocusMode: boolean,
+            focusModeEnabled: boolean,
+            focusModeConcerns: WebAnalyticsConcern[]
+        ) => boolean
+        tiles: (
+            productTab: ProductTab,
+            tabs: {
+                activeHoursTab: string
+                deviceTab: string
+                geographyTab: string
+                graphsTab: string
+                pathTab: string
+                shouldShowGeoIPQueries: any
+                sourceTab: string
+            },
+            controls: {
+                filterTestAccounts: boolean
+                includeHostPath: boolean
+                isPathCleaningEnabled: boolean
+                shouldStripQueryParams: boolean
+                useWebAnalyticsPrecompute: boolean | undefined
+            },
+            filters: {
+                compareFilter: CompareFilter
+                conversionGoal: WebAnalyticsConversionGoal | null
+                dateFilter: DateFilterState
+                replayFilters: RecordingUniversalFilters
+                tablesOrderBy: WebAnalyticsOrderBy | null
+                webAnalyticsFilters: WebAnalyticsPropertyFilters
+                webVitalsPercentile: WebVitalsPercentile
+                webVitalsTab: WebVitalsMetric
+            },
+            featureFlags: FeatureFlagsSet,
+            isGreaterThanMd: boolean,
+            tileVisualizations: Record<TileId, TileVisualizationOption>,
+            preAggregatedEnabled: boolean | undefined,
+            hiddenTiles: TileId[]
+        ) => WebAnalyticsTile[]
+        getNewInsightUrl: (
+            tiles: WebAnalyticsTile[]
+        ) => (tileId: TileId, tabId?: string | undefined) => string | undefined
+    }
+}
+
+export type webAnalyticsLogicType = MakeLogicType<
+    webAnalyticsLogicValues,
+    webAnalyticsLogicActions,
+    Record<string, any>,
+    webAnalyticsLogicMeta
+>
+
 export const webAnalyticsLogic = kea<webAnalyticsLogicType>([
     path(['scenes', 'webAnalytics', 'webAnalyticsSceneLogic']),
     connect(() => ({
@@ -654,7 +1209,10 @@ export const webAnalyticsLogic = kea<webAnalyticsLogicType>([
         ],
         isPathCleaningEnabled: [
             (s) => [s._isPathCleaningEnabled, s.hasAvailableFeature],
-            (isPathCleaningEnabled: boolean, hasAvailableFeature) => {
+            (
+                isPathCleaningEnabled: boolean,
+                hasAvailableFeature: (feature: AvailableFeature, currentUsage?: number | undefined) => boolean
+            ) => {
                 return hasAvailableFeature(AvailableFeature.PATHS_ADVANCED) && isPathCleaningEnabled
             },
         ],
@@ -672,16 +1230,16 @@ export const webAnalyticsLogic = kea<webAnalyticsLogicType>([
                 s.shouldFilterTestAccounts,
             ],
             (
-                properties,
-                domainFilter,
-                deviceTypeFilter,
-                countryFilter,
-                referrerFilter,
-                compareFilter,
-                dateFilter,
-                conversionGoal,
-                isPathCleaningEnabled,
-                shouldFilterTestAccounts
+                properties: WebAnalyticsPropertyFilters,
+                domainFilter: string | null,
+                deviceTypeFilter: DeviceType | null,
+                countryFilter: string | null,
+                referrerFilter: string | null,
+                compareFilter: import('~/queries/schema/schema-general').CompareFilter,
+                dateFilter: DateFilterState,
+                conversionGoal: WebAnalyticsConversionGoal | null,
+                isPathCleaningEnabled: boolean,
+                shouldFilterTestAccounts: boolean
             ): WebAnalyticsFiltersConfig => ({
                 properties,
                 dateFrom: dateFilter.dateFrom,
@@ -812,7 +1370,15 @@ export const webAnalyticsLogic = kea<webAnalyticsLogicType>([
                 s.activeHoursTab,
                 s.shouldShowGeoIPQueries,
             ],
-            (graphsTab, sourceTab, deviceTab, pathTab, geographyTab, activeHoursTab, shouldShowGeoIPQueries) => ({
+            (
+                graphsTab: string,
+                sourceTab: string,
+                deviceTab: string,
+                pathTab: string,
+                geographyTab: string,
+                activeHoursTab: string,
+                shouldShowGeoIPQueries
+            ) => ({
                 graphsTab,
                 sourceTab,
                 deviceTab,
@@ -870,14 +1436,14 @@ export const webAnalyticsLogic = kea<webAnalyticsLogicType>([
                 s.conversionGoal,
             ],
             (
-                webAnalyticsFilters,
-                replayFilters,
-                dateFilter,
-                compareFilter,
-                webVitalsTab,
-                webVitalsPercentile,
-                tablesOrderBy,
-                conversionGoal
+                webAnalyticsFilters: WebAnalyticsPropertyFilters,
+                replayFilters: RecordingUniversalFilters,
+                dateFilter: DateFilterState,
+                compareFilter: import('~/queries/schema/schema-general').CompareFilter,
+                webVitalsTab: WebVitalsMetric,
+                webVitalsPercentile: WebVitalsPercentile,
+                tablesOrderBy: WebAnalyticsOrderBy | null,
+                conversionGoal: WebAnalyticsConversionGoal | null
             ) => ({
                 webAnalyticsFilters,
                 replayFilters,
@@ -893,9 +1459,9 @@ export const webAnalyticsLogic = kea<webAnalyticsLogicType>([
             (s) => [s.webAnalyticsFilters, s.dateFilter, s.shouldFilterTestAccounts, s.conversionGoal],
             (
                 webAnalyticsFilters: WebAnalyticsPropertyFilters,
-                dateFilter,
-                shouldFilterTestAccounts,
-                conversionGoal
+                dateFilter: DateFilterState,
+                shouldFilterTestAccounts: boolean,
+                conversionGoal: WebAnalyticsConversionGoal | null
             ): RecordingUniversalFilters => {
                 const filters: UniversalFiltersGroupValue[] = [...webAnalyticsFilters]
                 if (conversionGoal) {
@@ -954,11 +1520,11 @@ export const webAnalyticsLogic = kea<webAnalyticsLogicType>([
                 s.shouldFilterTestAccounts,
             ],
             (
-                webVitalsPercentile,
-                webVitalsTab,
+                webVitalsPercentile: WebVitalsPercentile,
+                webVitalsTab: WebVitalsMetric,
                 { dateFrom, dateTo, interval },
-                webAnalyticsFilters,
-                filterTestAccounts
+                webAnalyticsFilters: WebAnalyticsPropertyFilters,
+                filterTestAccounts: boolean
             ): InsightVizNode<TrendsQuery> => ({
                 kind: NodeKind.InsightVizNode,
                 source: {
@@ -1007,7 +1573,7 @@ export const webAnalyticsLogic = kea<webAnalyticsLogicType>([
     selectors(({ actions }) => ({
         showFocusMode: [
             (s) => [s.featureFlags, s.productTab],
-            (featureFlags, productTab: ProductTab): boolean =>
+            (featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet, productTab: ProductTab): boolean =>
                 featureFlags[FEATURE_FLAGS.WEB_ANALYTICS_FOCUS_MODE] === 'test' && productTab === ProductTab.ANALYTICS,
         ],
         hasSavedFocusMode: [
@@ -1047,7 +1613,7 @@ export const webAnalyticsLogic = kea<webAnalyticsLogicType>([
                 s.hiddenTiles,
             ],
             (
-                productTab,
+                productTab: ProductTab,
                 { graphsTab, sourceTab, deviceTab, pathTab, geographyTab, shouldShowGeoIPQueries, activeHoursTab },
                 {
                     isPathCleaningEnabled,
@@ -1066,11 +1632,11 @@ export const webAnalyticsLogic = kea<webAnalyticsLogicType>([
                     webVitalsTab,
                     tablesOrderBy,
                 },
-                featureFlags,
-                isGreaterThanMd,
-                tileVisualizations,
-                preAggregatedEnabled,
-                hiddenTiles
+                featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet,
+                isGreaterThanMd: boolean,
+                tileVisualizations: Record<TileId, TileVisualizationOption>,
+                preAggregatedEnabled: boolean | undefined,
+                hiddenTiles: TileId[]
             ): WebAnalyticsTile[] => {
                 const dateRange = { date_from: dateFrom, date_to: dateTo }
                 const sampling = { enabled: false, forceSamplingRate: { numerator: 1, denominator: 10 } }
diff --git a/frontend/src/scenes/web-analytics/webAnalyticsModalLogic.ts b/frontend/src/scenes/web-analytics/webAnalyticsModalLogic.ts
index ebfd67a3b7f5..9f69a8c04291 100644
--- a/frontend/src/scenes/web-analytics/webAnalyticsModalLogic.ts
+++ b/frontend/src/scenes/web-analytics/webAnalyticsModalLogic.ts
@@ -1,14 +1,14 @@
-import { actions, connect, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, path, reducers, selectors } from 'kea'
 
 import { NodeKind, QuerySchema } from '~/queries/schema/schema-general'
 import { InsightLogicProps } from '~/types'
 
 import { botAnalyticsLogic } from './botAnalyticsLogic'
 import { TileId, WEB_ANALYTICS_DATA_COLLECTION_NODE_ID, WebAnalyticsTile } from './common'
+import type { SectionTile } from './common'
 import { getDashboardItemId, getNewInsightUrlFactory } from './insightsUtils'
 import { pageReportsLogic } from './pageReportsLogic'
 import { webAnalyticsLogic } from './webAnalyticsLogic'
-import type { webAnalyticsModalLogicType } from './webAnalyticsModalLogicType'
 
 export interface WebAnalyticsModalQuery {
     tileId: TileId
@@ -21,6 +21,60 @@ export interface WebAnalyticsModalQuery {
     canOpenInsight?: boolean
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface webAnalyticsModalLogicValues {
+    botAnalyticsTiles: WebAnalyticsTile[] // botAnalyticsLogic
+    pageReportsTiles: SectionTile[] // pageReportsLogic
+    webAnalyticsTiles: WebAnalyticsTile[] // webAnalyticsLogic
+    combinedTiles: WebAnalyticsTile[]
+    getNewInsightUrl: (tileId: TileId, tabId?: string | undefined) => string | undefined
+    modal: WebAnalyticsModalQuery | null
+    modalTileAndTab: {
+        tabId?: string
+        tileId: TileId
+    } | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface webAnalyticsModalLogicActions {
+    closeModal: () => boolean
+    openModal: (
+        tileId: TileId,
+        tabId?: string
+    ) => {
+        tabId: string | undefined
+        tileId: TileId
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface webAnalyticsModalLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        combinedTiles: (
+            webAnalyticsTiles: WebAnalyticsTile[],
+            pageReportsTiles: SectionTile[],
+            botAnalyticsTiles: WebAnalyticsTile[]
+        ) => WebAnalyticsTile[]
+        modal: (
+            combinedTiles: WebAnalyticsTile[],
+            modalTileAndTab: {
+                tabId?: string
+                tileId: TileId
+            } | null
+        ) => WebAnalyticsModalQuery | null
+        getNewInsightUrl: (
+            combinedTiles: WebAnalyticsTile[]
+        ) => (tileId: TileId, tabId?: string | undefined) => string | undefined
+    }
+}
+
+export type webAnalyticsModalLogicType = MakeLogicType<
+    webAnalyticsModalLogicValues,
+    webAnalyticsModalLogicActions,
+    Record<string, any>,
+    webAnalyticsModalLogicMeta
+>
+
 /**
  * This logic serves as a bridge between webAnalyticsLogic and pageReportsLogic
  * It combines tiles from both logics and provides a unified API for the modal
diff --git a/frontend/src/scenes/welcome/welcomeDialogLogic.ts b/frontend/src/scenes/welcome/welcomeDialogLogic.ts
index a077b05a7866..3500582962b3 100644
--- a/frontend/src/scenes/welcome/welcomeDialogLogic.ts
+++ b/frontend/src/scenes/welcome/welcomeDialogLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { subscriptions } from 'kea-subscriptions'
 import posthog from 'posthog-js'
@@ -6,7 +6,7 @@ import posthog from 'posthog-js'
 import api from 'lib/api'
 import { userLogic } from 'scenes/userLogic'
 
-import type { welcomeDialogLogicType } from './welcomeDialogLogicType'
+import type { UserType } from '../../types'
 
 export interface WelcomeInviter {
     name: string
@@ -133,6 +133,95 @@ function wasLookedAround(orgId: string | undefined): boolean {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface welcomeDialogLogicValues {
+    user: UserType | null // userLogic
+    hasLoadedOnce: boolean
+    interactedCards: Record<WelcomeCardKind, boolean>
+    inviter: WelcomeInviter | null
+    locallyClosed: boolean
+    organizationName: string
+    popularDashboards: WelcomePopularDashboard[]
+    productsInUse: string[]
+    recentActivity: WelcomeRecentActivity[]
+    shouldShowDialog: boolean
+    shownAt: number | null
+    storageTick: number
+    suggestedNextSteps: WelcomeSuggestedStep[]
+    teamMembers: WelcomeTeamMember[]
+    welcomeData: WelcomePayload
+    welcomeDataError: boolean
+    welcomeDataLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface welcomeDialogLogicActions {
+    acknowledgeStorageChange: () => {
+        value: true
+    }
+    closeDialog: () => {
+        value: true
+    }
+    dismissWelcome: () => {
+        value: true
+    }
+    loadWelcomeData: () => any
+    loadWelcomeDataFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadWelcomeDataSuccess: (
+        welcomeData: WelcomePayload,
+        payload?: any
+    ) => {
+        welcomeData: WelcomePayload
+        payload?: any
+    }
+    markCardInteracted: (card: WelcomeCardKind) => {
+        card: WelcomeCardKind
+    }
+    markShown: () => {
+        value: true
+    }
+    resetForOrgChange: () => {
+        value: true
+    }
+    setWelcomeDataError: (error: boolean) => {
+        error: boolean
+    }
+    trackCardClick: (
+        card: WelcomeCardKind,
+        targetHref: string
+    ) => {
+        card: WelcomeCardKind
+        targetHref: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface welcomeDialogLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        inviter: (welcomeData: WelcomePayload) => WelcomeInviter | null
+        teamMembers: (welcomeData: WelcomePayload) => WelcomeTeamMember[]
+        recentActivity: (welcomeData: WelcomePayload) => WelcomeRecentActivity[]
+        popularDashboards: (welcomeData: WelcomePayload) => WelcomePopularDashboard[]
+        productsInUse: (welcomeData: WelcomePayload) => string[]
+        suggestedNextSteps: (welcomeData: WelcomePayload) => WelcomeSuggestedStep[]
+        organizationName: (welcomeData: WelcomePayload, user: UserType | null) => string
+        shouldShowDialog: (user: UserType | null, locallyClosed: boolean, storageTick: number) => boolean
+    }
+}
+
+export type welcomeDialogLogicType = MakeLogicType<
+    welcomeDialogLogicValues,
+    welcomeDialogLogicActions,
+    Record<string, any>,
+    welcomeDialogLogicMeta
+>
+
 export const welcomeDialogLogic = kea<welcomeDialogLogicType>([
     path(['scenes', 'welcome', 'welcomeDialogLogic']),
 
@@ -228,21 +317,31 @@ export const welcomeDialogLogic = kea<welcomeDialogLogicType>([
     })),
 
     selectors({
-        inviter: [(s) => [s.welcomeData], (data): WelcomeInviter | null => data.inviter],
-        teamMembers: [(s) => [s.welcomeData], (data): WelcomeTeamMember[] => data.team_members],
-        recentActivity: [(s) => [s.welcomeData], (data): WelcomeRecentActivity[] => data.recent_activity],
-        popularDashboards: [(s) => [s.welcomeData], (data): WelcomePopularDashboard[] => data.popular_dashboards],
-        productsInUse: [(s) => [s.welcomeData], (data): string[] => data.products_in_use],
-        suggestedNextSteps: [(s) => [s.welcomeData], (data): WelcomeSuggestedStep[] => data.suggested_next_steps],
+        inviter: [(s) => [s.welcomeData], (data: WelcomePayload): WelcomeInviter | null => data.inviter],
+        teamMembers: [(s) => [s.welcomeData], (data: WelcomePayload): WelcomeTeamMember[] => data.team_members],
+        recentActivity: [
+            (s) => [s.welcomeData],
+            (data: WelcomePayload): WelcomeRecentActivity[] => data.recent_activity,
+        ],
+        popularDashboards: [
+            (s) => [s.welcomeData],
+            (data: WelcomePayload): WelcomePopularDashboard[] => data.popular_dashboards,
+        ],
+        productsInUse: [(s) => [s.welcomeData], (data: WelcomePayload): string[] => data.products_in_use],
+        suggestedNextSteps: [
+            (s) => [s.welcomeData],
+            (data: WelcomePayload): WelcomeSuggestedStep[] => data.suggested_next_steps,
+        ],
         organizationName: [
             (s) => [s.welcomeData, s.user],
-            (data, user): string => data.organization_name || user?.organization?.name || '',
+            (data: WelcomePayload, user: null | import('../../types').UserType): string =>
+                data.organization_name || user?.organization?.name || '',
         ],
         // Only open for invitees (not the org creator) who haven't already dismissed it.
         // `storageTick` is in the dependency list so cross-tab localStorage changes re-run the selector.
         shouldShowDialog: [
             (s) => [s.user, s.locallyClosed, s.storageTick],
-            (user, locallyClosed): boolean => {
+            (user: null | import('../../types').UserType, locallyClosed: boolean): boolean => {
                 if (!user || user.is_organization_first_user !== false) {
                     return false
                 }
diff --git a/frontend/src/scenes/wizard/wizardLogic.tsx b/frontend/src/scenes/wizard/wizardLogic.tsx
index 8bf1fd03bbb4..5cc97ae5fd51 100644
--- a/frontend/src/scenes/wizard/wizardLogic.tsx
+++ b/frontend/src/scenes/wizard/wizardLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { urlToAction } from 'kea-router'
 
@@ -6,12 +6,109 @@ import api from 'lib/api'
 import { organizationLogic } from 'scenes/organizationLogic'
 import { projectLogic } from 'scenes/projectLogic'
 
-import type { wizardLogicType } from './wizardLogicType'
+import type { OrganizationType, ProjectType } from '../../types'
 
 export interface WizardTokenResponseType {
     success: boolean
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface wizardLogicValues {
+    currentOrganization: OrganizationType | null // organizationLogic
+    currentProject: ProjectType | null // projectLogic
+    availableProjects: {
+        api_token: string
+        label: string
+        organization: string
+        value: number
+    }[]
+    selectedProject:
+        | {
+              api_token: string
+              label: string
+              organization: string
+              value: number
+          }
+        | undefined
+    selectedProjectId: number | null
+    view: 'invalid' | 'pending' | 'project' | 'success'
+    wizardHash: string | null
+    wizardToken: WizardTokenResponseType | null
+    wizardTokenLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface wizardLogicActions {
+    authenticateWizard: (
+        wizardHash: string,
+        projectId: number
+    ) => {
+        projectId: number
+        wizardHash: string
+    }
+    authenticateWizardFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    authenticateWizardSuccess: (
+        wizardToken: WizardTokenResponseType,
+        payload?: {
+            projectId: number
+            wizardHash: string
+        }
+    ) => {
+        wizardToken: WizardTokenResponseType
+        payload?: {
+            projectId: number
+            wizardHash: string
+        }
+    }
+    continueToAuthentication: () => {}
+    handleWizardRouting: () => {}
+    setSelectedProjectId: (projectId: number | null) => {
+        projectId: number | null
+    }
+    setView: (view: 'invalid' | 'pending' | 'project' | 'success') => {
+        view: 'invalid' | 'pending' | 'project' | 'success'
+    }
+    setWizardHash: (wizardHash: string | null) => {
+        wizardHash: string | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface wizardLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        availableProjects: (currentOrganization: OrganizationType | null) => {
+            api_token: string
+            label: string
+            organization: string
+            value: number
+        }[]
+        selectedProject: (
+            availableProjects: {
+                api_token: string
+                label: string
+                organization: string
+                value: number
+            }[],
+            selectedProjectId: number | null
+        ) =>
+            | {
+                  api_token: string
+                  label: string
+                  organization: string
+                  value: number
+              }
+            | undefined
+    }
+}
+
+export type wizardLogicType = MakeLogicType<wizardLogicValues, wizardLogicActions, Record<string, any>, wizardLogicMeta>
+
 export const wizardLogic = kea<wizardLogicType>([
     path(['scenes', 'wizard', 'wizardLogic']),
     connect(() => ({
@@ -70,7 +167,7 @@ export const wizardLogic = kea<wizardLogicType>([
     selectors({
         availableProjects: [
             (s) => [s.currentOrganization],
-            (currentOrganization) => {
+            (currentOrganization: null | import('../../types').OrganizationType) => {
                 return (
                     currentOrganization?.teams?.map((team) => ({
                         value: team.id,
@@ -83,7 +180,15 @@ export const wizardLogic = kea<wizardLogicType>([
         ],
         selectedProject: [
             (s) => [s.availableProjects, s.selectedProjectId],
-            (availableProjects, selectedProjectId) => {
+            (
+                availableProjects: {
+                    api_token: string
+                    label: string
+                    organization: string
+                    value: number
+                }[],
+                selectedProjectId: number | null
+            ) => {
                 return availableProjects.find((project) => project.value === selectedProjectId)
             },
         ],
diff --git a/frontend/src/toolbar/actions/actionsLogic.ts b/frontend/src/toolbar/actions/actionsLogic.ts
index ce1508adee85..a5dc115c7433 100644
--- a/frontend/src/toolbar/actions/actionsLogic.ts
+++ b/frontend/src/toolbar/actions/actionsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { createFuse } from 'lib/utils/fuseSearch'
@@ -7,7 +7,93 @@ import { permanentlyMount } from 'lib/utils/kea-logic-builders'
 import { toolbarApi } from '~/toolbar/toolbarApi'
 import { ActionType } from '~/types'
 
-import type { actionsLogicType } from './actionsLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface actionsLogicValues {
+    actionCount: number
+    allActions: ActionType[]
+    allActionsLoading: boolean
+    searchTerm: string
+    sortedActions: ActionType[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface actionsLogicActions {
+    deleteAction: ({ id }: { id: number }) => {
+        id: number
+    }
+    deleteActionFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteActionSuccess: (
+        allActions: ActionType[],
+        payload?: {
+            id: number
+        }
+    ) => {
+        allActions: ActionType[]
+        payload?: {
+            id: number
+        }
+    }
+    getActions: (_?: any) => any
+    getActionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    getActionsSuccess: (
+        allActions: ActionType[],
+        payload?: any
+    ) => {
+        allActions: ActionType[]
+        payload?: any
+    }
+    setSearchTerm: (searchTerm: string) => {
+        searchTerm: string
+    }
+    updateAction: ({ action }: { action: ActionType }) => {
+        action: ActionType
+    }
+    updateActionFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateActionSuccess: (
+        allActions: ActionType[],
+        payload?: {
+            action: ActionType
+        }
+    ) => {
+        allActions: ActionType[]
+        payload?: {
+            action: ActionType
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface actionsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        sortedActions: (allActions: ActionType[], searchTerm: string) => ActionType[]
+        actionCount: (allActions: ActionType[]) => number
+    }
+}
+
+export type actionsLogicType = MakeLogicType<
+    actionsLogicValues,
+    actionsLogicActions,
+    Record<string, any>,
+    actionsLogicMeta
+>
 
 export const actionsLogic = kea<actionsLogicType>([
     path(['toolbar', 'actions', 'actionsLogic']),
@@ -51,7 +137,7 @@ export const actionsLogic = kea<actionsLogicType>([
     selectors({
         sortedActions: [
             (s) => [s.allActions, s.searchTerm],
-            (allActions, searchTerm) => {
+            (allActions: ActionType[], searchTerm: string) => {
                 const filteredActions = searchTerm
                     ? createFuse(allActions, {
                           keys: ['name'],
@@ -62,7 +148,7 @@ export const actionsLogic = kea<actionsLogicType>([
                 return [...filteredActions].sort((a, b) => (a.name ?? 'Untitled').localeCompare(b.name ?? 'Untitled'))
             },
         ],
-        actionCount: [(s) => [s.allActions], (allActions) => allActions.length],
+        actionCount: [(s) => [s.allActions], (allActions: ActionType[]) => allActions.length],
     }),
     permanentlyMount(),
 ])
diff --git a/frontend/src/toolbar/actions/actionsTabLogic.tsx b/frontend/src/toolbar/actions/actionsTabLogic.tsx
index 2d7770088381..5f921ae18dd5 100644
--- a/frontend/src/toolbar/actions/actionsTabLogic.tsx
+++ b/frontend/src/toolbar/actions/actionsTabLogic.tsx
@@ -1,5 +1,6 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { subscriptions } from 'kea-subscriptions'
 
 import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
@@ -19,7 +20,7 @@ import {
 } from '~/toolbar/utils'
 import { AccessControlLevel, ActionType, ElementType } from '~/types'
 
-import type { actionsTabLogicType } from './actionsTabLogicType'
+import type { ToolbarUserIntent } from '../../types'
 import type { ActionStepPropertyKey } from './ActionStep'
 
 function newAction(
@@ -76,6 +77,173 @@ function toElementsChain(element: HTMLElement): ElementType[] {
     )
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface actionsTabLogicValues {
+    allActions: ActionType[] // actionsLogic
+    actionId: number | null // toolbarConfigLogic
+    buttonVisible: boolean // toolbarConfigLogic
+    dataAttributes: string[] // toolbarConfigLogic
+    uiHost: string // toolbarConfigLogic
+    userIntent: ToolbarUserIntent | null // toolbarConfigLogic
+    actionForm: ActionForm
+    actionFormAllErrors: Record<string, any>
+    actionFormChanged: boolean
+    actionFormElementsChains: Record<number, ElementType[]>
+    actionFormErrors: DeepPartialMap<ActionForm, ValidationErrorType>
+    actionFormHasErrors: boolean
+    actionFormManualErrors: Record<string, any>
+    actionFormTouched: boolean
+    actionFormTouches: Record<string, boolean>
+    actionFormValidationErrors: DeepPartialMap<ActionForm, ValidationErrorType>
+    automaticActionCreationEnabled: boolean
+    automaticCreationIncludedPropertyKeys: ActionStepPropertyKey[]
+    buttonActionsVisible: boolean
+    counter: number
+    editingSelector: number | null
+    editingSelectorValue: string | null
+    elementsChainBeingEdited: ElementType[]
+    inspectingElement: number | null
+    isActionFormSubmitting: boolean
+    isActionFormValid: boolean
+    isReadyForAutomaticSubmit: boolean
+    newActionForElement: HTMLElement | null
+    newActionName: string | null
+    selectedAction: ActionDraftType | ActionType | null
+    selectedActionId: number | 'new' | null
+    showActionFormErrors: boolean
+    showActionsTooltip: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface actionsTabLogicActions {
+    actionCreatedSuccess: (action: ActionType) => {
+        action: ActionType
+    }
+    addAutomaticCreationIncludedPropertyKey: (key: ActionStepPropertyKey) => {
+        key: ActionStepPropertyKey
+    }
+    editSelectorWithIndex: (index: number | null) => {
+        index: number | null
+    }
+    hideButtonActions: () => {
+        value: true
+    }
+    incrementCounter: () => {
+        value: true
+    }
+    inspectElementSelected: (
+        element: HTMLElement,
+        index: number | null
+    ) => {
+        element: HTMLElement
+        index: number | null
+    }
+    inspectForElementWithIndex: (index: number | null) => {
+        index: number | null
+    }
+    newAction: (element?: HTMLElement) => {
+        element: HTMLElement | null
+    }
+    removeAutomaticCreationIncludedPropertyKey: (key: ActionStepPropertyKey) => {
+        key: ActionStepPropertyKey
+    }
+    resetActionForm: (values?: ActionForm) => {
+        values?: ActionForm
+    }
+    saveAction: (formValues: ActionForm) => {
+        formValues: ActionForm
+    }
+    selectAction: (id: number | null) => {
+        id: number | null
+    }
+    setActionFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setActionFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setActionFormValues: (values: DeepPartial<ActionForm>) => {
+        values: DeepPartial<ActionForm>
+    }
+    setAutomaticActionCreationEnabled: (
+        enabled: boolean,
+        name?: string
+    ) => {
+        enabled: boolean
+        name: string | undefined
+    }
+    setElementSelector: (
+        selector: string,
+        index: number
+    ) => {
+        index: number
+        selector: string
+    }
+    setShowActionsTooltip: (showActionsTooltip: boolean) => {
+        showActionsTooltip: boolean
+    }
+    setautomaticCreationIncludedPropertyKeys: (keys: ActionStepPropertyKey[]) => {
+        keys: ActionStepPropertyKey[]
+    }
+    showButtonActions: () => {
+        value: true
+    }
+    submitActionForm: () => {
+        value: boolean
+    }
+    submitActionFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitActionFormRequest: (actionForm: ActionForm) => {
+        actionForm: ActionForm
+    }
+    submitActionFormSuccess: (actionForm: ActionForm) => {
+        actionForm: ActionForm
+    }
+    touchActionFormField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface actionsTabLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        editingSelectorValue: (editingSelector: number | null, actionForm: ActionForm) => string | null
+        elementsChainBeingEdited: (
+            editingSelector: number | null,
+            actionFormElementsChains: Record<number, ElementType[]>
+        ) => ElementType[]
+        selectedAction: (
+            selectedActionId: number | 'new' | null,
+            newActionForElement: HTMLElement | null,
+            allActions: ActionType[],
+            dataAttributes: string[],
+            newActionName: string | null,
+            automaticCreationIncludedPropertyKeys: ActionStepPropertyKey[]
+        ) => ActionDraftType | ActionType | null
+        isReadyForAutomaticSubmit: (
+            automaticActionCreationEnabled: boolean,
+            selectedAction: ActionDraftType | ActionType | null,
+            actionForm: ActionForm
+        ) => boolean
+    }
+}
+
+export type actionsTabLogicType = MakeLogicType<
+    actionsTabLogicValues,
+    actionsTabLogicActions,
+    Record<string, any>,
+    actionsTabLogicMeta
+>
+
 export const actionsTabLogic = kea<actionsTabLogicType>([
     path(['toolbar', 'actions', 'actionsTabLogic']),
     actions({
@@ -268,7 +436,7 @@ export const actionsTabLogic = kea<actionsTabLogicType>([
     selectors({
         editingSelectorValue: [
             (s) => [s.editingSelector, s.actionForm],
-            (editingSelector, actionForm): string | null => {
+            (editingSelector: number | null, actionForm: ActionForm): string | null => {
                 if (editingSelector === null) {
                     return null
                 }
@@ -278,7 +446,7 @@ export const actionsTabLogic = kea<actionsTabLogicType>([
         ],
         elementsChainBeingEdited: [
             (s) => [s.editingSelector, s.actionFormElementsChains],
-            (editingSelector, elementChains): ElementType[] => {
+            (editingSelector: number | null, elementChains: Record<number, ElementType[]>): ElementType[] => {
                 if (editingSelector === null) {
                     return []
                 }
@@ -295,12 +463,12 @@ export const actionsTabLogic = kea<actionsTabLogicType>([
                 s.automaticCreationIncludedPropertyKeys,
             ],
             (
-                selectedActionId,
-                newActionForElement,
-                allActions,
-                dataAttributes,
-                newActionName,
-                automaticCreationIncludedPropertyKeys
+                selectedActionId: number | 'new' | null,
+                newActionForElement: HTMLElement | null,
+                allActions: ActionType[],
+                dataAttributes: string[],
+                newActionName: string | null,
+                automaticCreationIncludedPropertyKeys: ActionStepPropertyKey[]
             ): ActionType | ActionDraftType | null => {
                 if (selectedActionId === 'new') {
                     return newAction(
@@ -315,7 +483,11 @@ export const actionsTabLogic = kea<actionsTabLogicType>([
         ],
         isReadyForAutomaticSubmit: [
             (s) => [s.automaticActionCreationEnabled, s.selectedAction, s.actionForm],
-            (automaticActionCreationEnabled, selectedAction, actionForm): boolean => {
+            (
+                automaticActionCreationEnabled: boolean,
+                selectedAction: ActionDraftType | ActionType | null,
+                actionForm: ActionForm
+            ): boolean => {
                 return (
                     (automaticActionCreationEnabled &&
                         selectedAction?.name &&
diff --git a/frontend/src/toolbar/bar/toolbarLogic.ts b/frontend/src/toolbar/bar/toolbarLogic.ts
index d6f4e400b3f4..cfcf52a1b26c 100644
--- a/frontend/src/toolbar/bar/toolbarLogic.ts
+++ b/frontend/src/toolbar/bar/toolbarLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { windowValues } from 'kea-window-values'
 import { PostHog } from 'posthog-js'
 
@@ -22,8 +22,10 @@ import { toolbarPosthogJS } from '~/toolbar/toolbarPosthogJS'
 import { TOOLBAR_CONTAINER_CLASS, TOOLBAR_ID, inBounds, makeNavigateWrapper } from '~/toolbar/utils'
 import { webVitalsToolbarLogic } from '~/toolbar/web-vitals/webVitalsToolbarLogic'
 
+import type { CommonFilters, HeatmapFilters, HeatmapFixedPositionMode } from '../../lib/components/heatmaps/types'
+import type { HedgehogModeInterface } from '../../lib/components/HedgehogMode/types'
+import type { ActionType } from '../../types'
 import { generatePiiMaskingCSS } from './piiMaskingStyles'
-import type { toolbarLogicType } from './toolbarLogicType'
 
 const MARGIN = 2
 const HEDGEHOG_OFFSET = 80
@@ -56,6 +58,243 @@ export type ToolbarPositionType =
 
 export const TOOLBAR_FIXED_POSITION_HITBOX = 100
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface toolbarLogicValues {
+    allActionsLoading: boolean; // actionsLogic
+    allExperimentsLoading: boolean; // experimentsLogic
+    userFlagsLoading: boolean; // flagsToolbarLogic
+    elementStatsLoading: boolean; // heatmapToolbarMenuLogic
+    isRefreshing: boolean; // heatmapToolbarMenuLogic
+    rawHeatmapLoading: boolean; // heatmapToolbarMenuLogic
+    hedgehogMode: HedgehogModeInterface | null; // hedgehogModeLogic
+    allSurveysLoading: boolean; // surveysToolbarLogic
+    posthog: PostHog | null; // toolbarConfigLogic
+    remoteWebVitalsLoading: boolean; // webVitalsToolbarLogic
+    cspBlocksNewFunction: boolean;
+    currentPathname: string;
+    element: HTMLElement | null;
+    fixedPosition: ToolbarPositionType;
+    fixedPositions: Record<ToolbarPositionType, {
+        x: number;
+        y: number;
+    }>;
+    getHedgehogActor: (() => HedgehogActor | null);
+    hedgehogModeAvailable: boolean;
+    hedgehogModeEnabled: boolean;
+    isBlurred: boolean;
+    isDragging: boolean;
+    isEmbeddedInApp: boolean;
+    isExiting: boolean;
+    isLoading: boolean;
+    lastDragPosition: {
+        x: number;
+        y: number;
+    } | null;
+    menu: HTMLElement | null;
+    menuProperties: {
+        isBelow: boolean;
+        maxHeight: number;
+        transform: string;
+    } | {
+        isBelow?: undefined;
+        maxHeight?: undefined;
+        transform?: undefined;
+    };
+    minimized: boolean;
+    piiMaskingColor: string;
+    piiMaskingEnabled: boolean;
+    piiWarning: string[] | null;
+    position: {
+        x: number;
+        y: number;
+    };
+    theme: "dark" | "light";
+    visibleMenu: MenuState;
+    windowHeight: number;
+    windowWidth: number;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface toolbarLogicActions {
+    actionCreatedSuccess: (action: ActionType) => {
+        action: ActionType;
+    }; // actionsTabLogic
+    hideButtonActions: () => {
+        value: true;
+    }; // actionsTabLogic
+    selectAction: (id: number | null) => {
+        id: number | null;
+    }; // actionsTabLogic
+    setAutomaticActionCreationEnabled: (enabled: boolean, name?: string | undefined) => {
+        enabled: boolean;
+        name: string | undefined;
+    }; // actionsTabLogic
+    showButtonActions: () => {
+        value: true;
+    }; // actionsTabLogic
+    createAction: (element: HTMLElement) => {
+        element: HTMLElement;
+    }; // elementsLogic
+    disableInspect: () => {
+        value: true;
+    }; // elementsLogic
+    enableInspect: () => {
+        value: true;
+    }; // elementsLogic
+    showButtonExperiments: () => {
+        value: true;
+    }; // experimentsTabLogic
+    hideButtonFieldNotes: () => {
+        value: true;
+    }; // fieldNotesLogic
+    showButtonFieldNotes: () => {
+        value: true;
+    }; // fieldNotesLogic
+    disableHeatmap: () => {
+        value: true;
+    }; // heatmapToolbarMenuLogic
+    enableHeatmap: () => {
+        value: true;
+    }; // heatmapToolbarMenuLogic
+    patchHeatmapFilters: (filters: Partial<HeatmapFilters>) => {
+        filters: Partial<HeatmapFilters>;
+    }; // heatmapToolbarMenuLogic
+    setCommonFilters: (filters: CommonFilters) => {
+        filters: CommonFilters;
+    }; // heatmapToolbarMenuLogic
+    setHeatmapColorPalette: (palette: string | null) => {
+        palette: string | null;
+    }; // heatmapToolbarMenuLogic
+    setHeatmapFixedPositionMode: (mode: HeatmapFixedPositionMode) => {
+        mode: HeatmapFixedPositionMode;
+    }; // heatmapToolbarMenuLogic
+    toggleClickmapsEnabled: (enabled: boolean) => {
+        enabled: boolean;
+    }; // heatmapToolbarMenuLogic
+    hideButtonProductTours: () => {
+        value: true;
+    }; // productToursLogic
+    showButtonProductTours: () => {
+        value: true;
+    }; // productToursLogic
+    hideButtonSurveys: () => {
+        value: true;
+    }; // surveysToolbarLogic
+    showButtonSurveys: () => {
+        value: true;
+    }; // surveysToolbarLogic
+    logout: () => {
+        value: true;
+    }; // toolbarConfigLogic
+    setOAuthTokens: (accessToken: string, refreshToken: string, clientId: string) => {
+        accessToken: string;
+        clientId: string;
+        refreshToken: string;
+    }; // toolbarConfigLogic
+    completeGracefulExit: () => {
+        value: true;
+    };
+    maybeSendNavigationMessage: () => {
+        value: true;
+    };
+    onMouseOrTouchDown: (event: MouseEvent | TouchEvent) => {
+        event: MouseEvent | TouchEvent;
+    };
+    openHedgehogOptions: () => {
+        value: true;
+    };
+    setCspBlocksNewFunction: (blocked: boolean) => {
+        blocked: boolean;
+    };
+    setCurrentPathname: (pathname: string) => {
+        pathname: string;
+    };
+    setDragPosition: (x: number, y: number) => {
+        x: number;
+        y: number;
+    };
+    setDragging: (dragging?: any) => {
+        dragging: any;
+    };
+    setElement: (element: HTMLElement | null) => {
+        element: HTMLElement | null;
+    };
+    setFixedPosition: (position: ToolbarPositionType) => {
+        position: ToolbarPositionType;
+    };
+    setHedgehogModeEnabled: (hedgehogModeEnabled: boolean) => {
+        hedgehogModeEnabled: boolean;
+    };
+    setIsBlurred: (isBlurred: boolean) => {
+        isBlurred: boolean;
+    };
+    setIsEmbeddedInApp: (isEmbedded: boolean) => {
+        isEmbedded: boolean;
+    };
+    setMenu: (element: HTMLElement | null) => {
+        element: HTMLElement | null;
+    };
+    setPiiMaskingColor: (color: string) => {
+        color: string;
+    };
+    setVisibleMenu: (visibleMenu: MenuState) => {
+        visibleMenu: MenuState;
+    };
+    startGracefulExit: () => {
+        value: true;
+    };
+    syncWithHedgehog: () => {
+        value: true;
+    };
+    toggleMinimized: (minimized?: boolean) => {
+        minimized: boolean | undefined;
+    };
+    togglePiiMasking: (enabled?: boolean) => {
+        enabled: boolean | undefined;
+    };
+    toggleTheme: (theme?: "dark" | "light") => {
+        theme: "dark" | "light" | undefined;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface toolbarLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        position: (element: HTMLElement | null, lastDragPosition: {
+            x: number;
+            y: number;
+        } | null, windowWidth: number, windowHeight: number, fixedPosition: ToolbarPositionType, fixedPositions: Record<ToolbarPositionType, {
+            x: number;
+            y: number;
+        }>, minimized: boolean) => {
+            x: number;
+            y: number;
+        };
+        fixedPositions: (windowWidth: number, windowHeight: number) => Record<ToolbarPositionType, {
+            x: number;
+            y: number;
+        }>;
+        menuProperties: (element: HTMLElement | null, menu: HTMLElement | null, position: {
+            x: number;
+            y: number;
+        }, windowWidth: number, windowHeight: number, isBlurred: boolean) => {
+            isBelow: boolean;
+            maxHeight: number;
+            transform: string;
+        } | {
+            isBelow?: undefined;
+            maxHeight?: undefined;
+            transform?: undefined;
+        };
+        getHedgehogActor: (hedgehogMode: HedgehogModeInterface | null) => (() => HedgehogActor | null);
+        piiWarning: (posthog: PostHog | null, piiMaskingEnabled: boolean) => string[] | null;
+        isLoading: (elementStatsLoading: boolean, rawHeatmapLoading: boolean, isRefreshing: boolean, allActionsLoading: boolean, userFlagsLoading: boolean, allExperimentsLoading: boolean, remoteWebVitalsLoading: boolean, allSurveysLoading: boolean) => boolean;
+        hedgehogModeAvailable: (cspBlocksNewFunction: boolean) => boolean;
+    };
+}
+
+export type toolbarLogicType = MakeLogicType<toolbarLogicValues, toolbarLogicActions, Record<string, any>, toolbarLogicMeta>;
+
 export const toolbarLogic = kea<toolbarLogicType>([
     path(['toolbar', 'bar', 'toolbarLogic']),
 
@@ -266,7 +505,24 @@ export const toolbarLogic = kea<toolbarLogicType>([
                 s.fixedPositions,
                 s.minimized,
             ],
-            (element, lastDragPosition, windowWidth, windowHeight, fixedPosition, fixedPositions, minimized) => {
+            (
+                element: HTMLElement | null,
+                lastDragPosition: {
+                    x: number
+                    y: number
+                } | null,
+                windowWidth: number,
+                windowHeight: number,
+                fixedPosition: ToolbarPositionType,
+                fixedPositions: Record<
+                    ToolbarPositionType,
+                    {
+                        x: number
+                        y: number
+                    }
+                >,
+                minimized: boolean
+            ) => {
                 const position = lastDragPosition ?? fixedPositions[fixedPosition]
 
                 const width = element
@@ -291,7 +547,7 @@ export const toolbarLogic = kea<toolbarLogicType>([
 
         fixedPositions: [
             (s) => [s.windowWidth, s.windowHeight],
-            (windowWidth, windowHeight): Record<ToolbarPositionType, { x: number; y: number }> => {
+            (windowWidth: number, windowHeight: number): Record<ToolbarPositionType, { x: number; y: number }> => {
                 return {
                     'top-left': {
                         x: 0,
@@ -330,7 +586,17 @@ export const toolbarLogic = kea<toolbarLogicType>([
         ],
         menuProperties: [
             (s) => [s.element, s.menu, s.position, s.windowWidth, s.windowHeight, s.isBlurred],
-            (element, menu, position, windowWidth, windowHeight, isBlurred) => {
+            (
+                element: HTMLElement | null,
+                menu: HTMLElement | null,
+                position: {
+                    x: number
+                    y: number
+                },
+                windowWidth: number,
+                windowHeight: number,
+                isBlurred: boolean
+            ) => {
                 if (!element || !menu) {
                     return {}
                 }
@@ -367,7 +633,9 @@ export const toolbarLogic = kea<toolbarLogicType>([
 
         getHedgehogActor: [
             (s) => [s.hedgehogMode],
-            (hedgehogMode): (() => HedgehogActor | null) => {
+            (
+                hedgehogMode: null | import('lib/components/HedgehogMode/types').HedgehogModeInterface
+            ): (() => HedgehogActor | null) => {
                 return () => {
                     const player = hedgehogMode?.stateManager?.getPlayerHedgehogActor()
                     if (!player || !player.rigidBody) {
@@ -428,14 +696,14 @@ export const toolbarLogic = kea<toolbarLogicType>([
                 s.allSurveysLoading,
             ],
             (
-                elementStatsLoading,
-                rawHeatmapLoading,
-                isRefreshing,
-                allActionsLoading,
-                userFlagsLoading,
-                allExperimentsLoading,
-                remoteWebVitalsLoading,
-                allSurveysLoading
+                elementStatsLoading: boolean,
+                rawHeatmapLoading: boolean,
+                isRefreshing: boolean,
+                allActionsLoading: boolean,
+                userFlagsLoading: boolean,
+                allExperimentsLoading: boolean,
+                remoteWebVitalsLoading: boolean,
+                allSurveysLoading: boolean
             ) =>
                 elementStatsLoading ||
                 rawHeatmapLoading ||
diff --git a/frontend/src/toolbar/debug/eventDebugMenuLogic.ts b/frontend/src/toolbar/debug/eventDebugMenuLogic.ts
index 2021b9ea40a8..b7a984b27436 100644
--- a/frontend/src/toolbar/debug/eventDebugMenuLogic.ts
+++ b/frontend/src/toolbar/debug/eventDebugMenuLogic.ts
@@ -1,4 +1,5 @@
-import { actions, afterMount, connect, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, path, reducers, selectors } from 'kea'
+import type { PostHog } from 'posthog-js'
 
 import { uuid } from 'lib/utils/dom'
 import { permanentlyMount } from 'lib/utils/kea-logic-builders'
@@ -8,8 +9,6 @@ import { CORE_FILTER_DEFINITIONS_BY_GROUP, PROPERTY_KEYS } from '~/taxonomy/taxo
 import { toolbarConfigLogic } from '~/toolbar/toolbarConfigLogic'
 import { EventType } from '~/types'
 
-import type { eventDebugMenuLogicType } from './eventDebugMenuLogicType'
-
 function tryRegexMatch(text: string, pattern: string): boolean {
     // If the pattern looks like /regex/ or /regex/flags, treat as regex
     const regexMatch = pattern.match(/^\/(.+)\/([gimsuy]*)$/)
@@ -40,6 +39,104 @@ export function classifyEvent(e: EventType): EventCategory {
     return 'custom'
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface eventDebugMenuLogicValues {
+    posthog: PostHog | null // toolbarConfigLogic
+    activeFilteredEvents: EventType[]
+    bufferedCount: number
+    bufferedEvents: EventType[]
+    events: EventType[]
+    expandedEvent: string | null | undefined
+    expandedProperties: Record<string, any> | never[]
+    exportableEvents: object[]
+    hidePostHogFlags: boolean
+    hidePostHogProperties: boolean
+    isCollapsedEventRow: (eventId: string | null | undefined) => boolean
+    isPaused: boolean
+    pinnedEventIds: Set<string>
+    pinnedEvents: EventType[]
+    relativeTimestamps: boolean
+    searchFilteredEvents: EventType[]
+    searchFilteredEventsCount: Record<EventCategory, number>
+    searchText: string
+    selectedEventTypes: EventCategory[]
+    totalEventsCount: number
+    unpinnedEvents: EventType[]
+    visibleEvents: EventType[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface eventDebugMenuLogicActions {
+    addEvent: (event: EventType) => {
+        event: EventType
+    }
+    clearEvents: () => {
+        value: true
+    }
+    exportEvents: () => {
+        value: true
+    }
+    markExpanded: (id: string | null | undefined) => {
+        id: string | null | undefined
+    }
+    setHidePostHogFlags: (hide: boolean) => {
+        hide: boolean
+    }
+    setHidePostHogProperties: (hide: boolean) => {
+        hide: boolean
+    }
+    setSearchText: (searchText: string) => {
+        searchText: string
+    }
+    setSelectedEventType: (
+        eventType: EventCategory,
+        enabled: boolean
+    ) => {
+        enabled: boolean
+        eventType: EventCategory
+    }
+    togglePaused: () => {
+        value: true
+    }
+    togglePinnedEvent: (eventId: string) => {
+        eventId: string
+    }
+    toggleRelativeTimestamps: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface eventDebugMenuLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        isCollapsedEventRow: (
+            expandedEvent: string | null | undefined
+        ) => (eventId: string | null | undefined) => boolean
+        visibleEvents: (events: EventType[], bufferedEvents: EventType[], isPaused: boolean) => EventType[]
+        searchFilteredEvents: (visibleEvents: EventType[], searchText: string) => EventType[]
+        searchFilteredEventsCount: (searchFilteredEvents: EventType[]) => Record<EventCategory, number>
+        activeFilteredEvents: (selectedEventTypes: EventCategory[], searchFilteredEvents: EventType[]) => EventType[]
+        totalEventsCount: (visibleEvents: EventType[]) => number
+        bufferedCount: (bufferedEvents: EventType[]) => number
+        pinnedEvents: (activeFilteredEvents: EventType[], pinnedEventIds: Set<string>) => EventType[]
+        unpinnedEvents: (activeFilteredEvents: EventType[], pinnedEventIds: Set<string>) => EventType[]
+        expandedProperties: (
+            expandedEvent: string | null | undefined,
+            events: EventType[],
+            hidePostHogProperties: boolean,
+            hidePostHogFlags: boolean
+        ) => Record<string, any> | never[]
+        exportableEvents: (activeFilteredEvents: EventType[]) => object[]
+    }
+}
+
+export type eventDebugMenuLogicType = MakeLogicType<
+    eventDebugMenuLogicValues,
+    eventDebugMenuLogicActions,
+    Record<string, any>,
+    eventDebugMenuLogicMeta
+>
+
 export const eventDebugMenuLogic = kea<eventDebugMenuLogicType>([
     path(['toolbar', 'debug', 'eventDebugMenuLogic']),
     connect(() => ({
@@ -151,7 +248,7 @@ export const eventDebugMenuLogic = kea<eventDebugMenuLogicType>([
     selectors({
         isCollapsedEventRow: [
             (s) => [s.expandedEvent],
-            (expandedEvent) => {
+            (expandedEvent: string | null | undefined) => {
                 return (eventId: string | null | undefined): boolean => {
                     return eventId !== expandedEvent
                 }
@@ -160,7 +257,7 @@ export const eventDebugMenuLogic = kea<eventDebugMenuLogicType>([
         // When paused, show a frozen snapshot; when live, show all events
         visibleEvents: [
             (s) => [s.events, s.bufferedEvents, s.isPaused],
-            (events, bufferedEvents, isPaused): EventType[] => {
+            (events: EventType[], bufferedEvents: EventType[], isPaused: boolean): EventType[] => {
                 if (isPaused) {
                     // Show events minus anything buffered since pause
                     return events.slice(bufferedEvents.length)
@@ -170,7 +267,7 @@ export const eventDebugMenuLogic = kea<eventDebugMenuLogicType>([
         ],
         searchFilteredEvents: [
             (s) => [s.visibleEvents, s.searchText],
-            (visibleEvents, searchText) => {
+            (visibleEvents: EventType[], searchText: string) => {
                 return visibleEvents.filter((e: EventType) => {
                     if (searchText && !tryRegexMatch(e.event, searchText)) {
                         return false
@@ -181,7 +278,7 @@ export const eventDebugMenuLogic = kea<eventDebugMenuLogicType>([
         ],
         searchFilteredEventsCount: [
             (s) => [s.searchFilteredEvents],
-            (searchFilteredEvents): Record<EventCategory, number> => {
+            (searchFilteredEvents: EventType[]): Record<EventCategory, number> => {
                 const counts: Record<EventCategory, number> = { posthog: 0, custom: 0, snapshot: 0 }
                 searchFilteredEvents.forEach((e: EventType) => {
                     counts[classifyEvent(e)] += 1
@@ -192,20 +289,20 @@ export const eventDebugMenuLogic = kea<eventDebugMenuLogicType>([
 
         activeFilteredEvents: [
             (s) => [s.selectedEventTypes, s.searchFilteredEvents],
-            (selectedEventTypes, searchFilteredEvents) => {
+            (selectedEventTypes: EventCategory[], searchFilteredEvents: EventType[]) => {
                 return searchFilteredEvents.filter((e: EventType) => {
                     return selectedEventTypes.includes(classifyEvent(e))
                 })
             },
         ],
 
-        totalEventsCount: [(s) => [s.visibleEvents], (visibleEvents): number => visibleEvents.length],
+        totalEventsCount: [(s) => [s.visibleEvents], (visibleEvents: EventType[]): number => visibleEvents.length],
 
-        bufferedCount: [(s) => [s.bufferedEvents], (bufferedEvents): number => bufferedEvents.length],
+        bufferedCount: [(s) => [s.bufferedEvents], (bufferedEvents: EventType[]): number => bufferedEvents.length],
 
         pinnedEvents: [
             (s) => [s.activeFilteredEvents, s.pinnedEventIds],
-            (activeFilteredEvents, pinnedEventIds): EventType[] => {
+            (activeFilteredEvents: EventType[], pinnedEventIds: Set<string>): EventType[] => {
                 if (pinnedEventIds.size === 0) {
                     return []
                 }
@@ -215,7 +312,7 @@ export const eventDebugMenuLogic = kea<eventDebugMenuLogicType>([
 
         unpinnedEvents: [
             (s) => [s.activeFilteredEvents, s.pinnedEventIds],
-            (activeFilteredEvents, pinnedEventIds): EventType[] => {
+            (activeFilteredEvents: EventType[], pinnedEventIds: Set<string>): EventType[] => {
                 if (pinnedEventIds.size === 0) {
                     return activeFilteredEvents
                 }
@@ -225,7 +322,12 @@ export const eventDebugMenuLogic = kea<eventDebugMenuLogicType>([
 
         expandedProperties: [
             (s) => [s.expandedEvent, s.events, s.hidePostHogProperties, s.hidePostHogFlags],
-            (expandedEvent, events, hidePostHogProperties, hidePostHogFlags) => {
+            (
+                expandedEvent: string | null | undefined,
+                events: EventType[],
+                hidePostHogProperties: boolean,
+                hidePostHogFlags: boolean
+            ) => {
                 if (!expandedEvent) {
                     return []
                 }
@@ -264,7 +366,7 @@ export const eventDebugMenuLogic = kea<eventDebugMenuLogicType>([
 
         exportableEvents: [
             (s) => [s.activeFilteredEvents],
-            (activeFilteredEvents): object[] => {
+            (activeFilteredEvents: EventType[]): object[] => {
                 return activeFilteredEvents.map((e: EventType) => ({
                     event: e.event,
                     timestamp: e.timestamp,
diff --git a/frontend/src/toolbar/elements/elementsLogic.ts b/frontend/src/toolbar/elements/elementsLogic.ts
index a786fa958b36..bea0997d855d 100644
--- a/frontend/src/toolbar/elements/elementsLogic.ts
+++ b/frontend/src/toolbar/elements/elementsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
 import { collectAllElementsDeep } from 'query-selector-shadow-dom'
 
 import { EXPERIMENT_TARGET_SELECTOR } from 'lib/utils/actions'
@@ -15,7 +15,6 @@ import { ActionType } from '~/types'
 
 import { elementToActionStep, getAllClickTargets, getElementForStep, getRectForElement } from '../utils'
 import { FragileSelectorResult, checkSelectorFragilityCached } from '../utils/selectorQuality'
-import type { elementsLogicType } from './elementsLogicType'
 import { heatmapToolbarMenuLogic } from './heatmapToolbarMenuLogic'
 
 export type ActionElementMap = Map<HTMLElement, ActionElementWithMetadata[]>
@@ -80,6 +79,217 @@ const getMaxZIndex = (element: Element): number => {
     return maxZIndex
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface elementsLogicValues {
+    actionForm: ActionForm // actionsTabLogic
+    href: string // currentPageLogic
+    _actionElements: ElementWithMetadata[]
+    _actionsForElementMap: ActionElementMap
+    actionElements: ElementWithMetadata[]
+    actionsForElementMap: ActionElementMap
+    actionsListElements: ActionElementWithMetadata[]
+    activeMeta:
+        | (ElementWithMetadata & {
+              selectorQuality: FragileSelectorResult | null
+          })
+        | null
+    activeMetaIsSelected: boolean
+    allInspectElements: HTMLElement[]
+    displayActionElements: boolean
+    elementMap: ElementMap
+    elementsToDisplay: ElementWithMetadata[]
+    elementsToDisplayRaw: ElementWithMetadata[]
+    elementsWithActions: HTMLElement[]
+    enabledLast: 'heatmap' | 'inspect' | null
+    heatmapElements: ElementWithMetadata[]
+    heatmapEnabled: boolean
+    highlightElement: HTMLElement | null
+    highlightElementMeta:
+        | (ElementWithMetadata & {
+              selectorQuality: FragileSelectorResult | null
+          })
+        | null
+    hoverElement: HTMLElement | null
+    hoverElementMeta:
+        | (ElementWithMetadata & {
+              selectorQuality: FragileSelectorResult | null
+          })
+        | null
+    inspectElements: ElementWithMetadata[]
+    inspectEnabled: boolean
+    inspectEnabledRaw: boolean
+    labelsToDisplay: ElementWithMetadata[]
+    rectUpdateCounter: number
+    relativePositionCompensation: number
+    selectedElement: HTMLElement | null
+    selectedElementMeta:
+        | (ElementWithMetadata & {
+              selectorQuality: FragileSelectorResult | null
+          })
+        | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface elementsLogicActions {
+    newAction: (element?: HTMLElement | undefined) => {
+        element: HTMLElement | null
+    } // actionsTabLogic
+    selectAction: (id: number | null) => {
+        id: number | null
+    } // actionsTabLogic
+    createAction: (element: HTMLElement) => {
+        element: HTMLElement
+    }
+    disableInspect: () => {
+        value: true
+    }
+    enableInspect: () => {
+        value: true
+    }
+    selectElement: (element: HTMLElement | null) => {
+        element: HTMLElement | null
+    }
+    setHighlightElement: (element: HTMLElement | null) => {
+        element: HTMLElement | null
+    }
+    setHoverElement: (element: HTMLElement | null) => {
+        element: HTMLElement | null
+    }
+    setRelativePositionCompensation: (compensation: number) => {
+        compensation: number
+    }
+    setSelectedElement: (element: HTMLElement | null) => {
+        element: HTMLElement | null
+    }
+    updateRects: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface elementsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        activeMetaIsSelected: (
+            selectedElementMeta:
+                | (ElementWithMetadata & {
+                      selectorQuality: FragileSelectorResult | null
+                  })
+                | null,
+            activeMeta:
+                | (ElementWithMetadata & {
+                      selectorQuality: FragileSelectorResult | null
+                  })
+                | null
+        ) => boolean
+        inspectEnabled: (
+            inspectEnabledRaw: boolean,
+            inspectingElement: number | null,
+            buttonActionsVisible: boolean,
+            inspectingElement2: number | null
+        ) => boolean
+        heatmapEnabled: (heatmapEnabled: boolean) => boolean
+        heatmapElements: (
+            countedElements: import('~/toolbar/types').CountedHTMLElement[],
+            rectUpdateCounter: number,
+            buttonVisible: boolean
+        ) => ElementWithMetadata[]
+        allInspectElements: (inspectEnabled: boolean, href: string) => HTMLElement[]
+        inspectElements: (
+            allInspectElements: HTMLElement[],
+            rectUpdateCounter: number,
+            buttonVisible: boolean
+        ) => ElementWithMetadata[]
+        displayActionElements: (buttonActionsVisible: boolean) => boolean
+        _actionElements: (displayActionElements: boolean, actionForm: ActionForm) => ElementWithMetadata[]
+        actionElements: (
+            _actionElements: ElementWithMetadata[],
+            rectUpdateCounter: number,
+            buttonVisible: boolean
+        ) => ElementWithMetadata[]
+        elementMap: (
+            heatmapElements: ElementWithMetadata[],
+            inspectElements: ElementWithMetadata[],
+            actionElements: ElementWithMetadata[],
+            actionsListElements: ActionElementWithMetadata[]
+        ) => ElementMap
+        _actionsForElementMap: (sortedActions: ActionType[]) => ActionElementMap
+        actionsForElementMap: (
+            _actionsForElementMap: ActionElementMap,
+            rectUpdateCounter: number,
+            buttonVisible: boolean
+        ) => ActionElementMap
+        elementsWithActions: (actionsForElementMap: ActionElementMap) => HTMLElement[]
+        actionsListElements: (actionsForElementMap: ActionElementMap) => ActionElementWithMetadata[]
+        elementsToDisplayRaw: (
+            displayActionElements: boolean,
+            actionElements: ElementWithMetadata[],
+            inspectElements: ElementWithMetadata[],
+            actionsListElements: ActionElementWithMetadata[],
+            selectedAction: ActionType | null | import('~/toolbar/types').ActionDraftType
+        ) => ElementWithMetadata[]
+        elementsToDisplay: (elementsToDisplayRaw: ElementWithMetadata[]) => ElementWithMetadata[]
+        labelsToDisplay: (
+            displayActionElements: boolean,
+            actionElements: ElementWithMetadata[],
+            actionsListElements: ActionElementWithMetadata[],
+            selectedAction: ActionType | null | import('~/toolbar/types').ActionDraftType
+        ) => ElementWithMetadata[]
+        selectedElementMeta: (
+            selectedElement: HTMLElement | null,
+            elementMap: ElementMap,
+            actionsForElementMap: ActionElementMap,
+            dataAttributes: string[]
+        ) =>
+            | (ElementWithMetadata & {
+                  selectorQuality: FragileSelectorResult | null
+              })
+            | null
+        hoverElementMeta: (
+            hoverElement: HTMLElement | null,
+            elementMap: ElementMap,
+            actionsForElementMap: ActionElementMap,
+            dataAttributes: string[]
+        ) =>
+            | (ElementWithMetadata & {
+                  selectorQuality: FragileSelectorResult | null
+              })
+            | null
+        highlightElementMeta: (
+            highlightElement: HTMLElement | null,
+            elementMap: ElementMap,
+            actionsForElementMap: ActionElementMap,
+            dataAttributes: string[]
+        ) =>
+            | (ElementWithMetadata & {
+                  selectorQuality: FragileSelectorResult | null
+              })
+            | null
+        activeMeta: (
+            selectedElementMeta:
+                | (ElementWithMetadata & {
+                      selectorQuality: FragileSelectorResult | null
+                  })
+                | null,
+            hoverElementMeta:
+                | (ElementWithMetadata & {
+                      selectorQuality: FragileSelectorResult | null
+                  })
+                | null
+        ) =>
+            | (ElementWithMetadata & {
+                  selectorQuality: FragileSelectorResult | null
+              })
+            | null
+    }
+}
+
+export type elementsLogicType = MakeLogicType<
+    elementsLogicValues,
+    elementsLogicActions,
+    Record<string, any>,
+    elementsLogicMeta
+>
+
 export const elementsLogic = kea<elementsLogicType>([
     path(['toolbar', 'elements', 'elementsLogic']),
 
@@ -166,7 +376,18 @@ export const elementsLogic = kea<elementsLogicType>([
     selectors({
         activeMetaIsSelected: [
             (s) => [s.selectedElementMeta, s.activeMeta],
-            (selectedElementMeta, activeMeta) => {
+            (
+                selectedElementMeta:
+                    | (ElementWithMetadata & {
+                          selectorQuality: FragileSelectorResult | null
+                      })
+                    | null,
+                activeMeta:
+                    | (ElementWithMetadata & {
+                          selectorQuality: FragileSelectorResult | null
+                      })
+                    | null
+            ) => {
                 return !!selectedElementMeta && !!activeMeta && selectedElementMeta.element === activeMeta.element
             },
         ],
@@ -178,10 +399,10 @@ export const elementsLogic = kea<elementsLogicType>([
                 experimentsTabLogic.selectors.inspectingElement,
             ],
             (
-                inspectEnabledRaw,
-                actionsInspectingElement,
-                actionsButtonActionsVisible,
-                experimentsInspectingElement
+                inspectEnabledRaw: boolean,
+                actionsInspectingElement: number | null,
+                actionsButtonActionsVisible: boolean,
+                experimentsInspectingElement: number | null
             ) => {
                 return (
                     inspectEnabledRaw ||
@@ -191,7 +412,10 @@ export const elementsLogic = kea<elementsLogicType>([
             },
         ],
 
-        heatmapEnabled: [() => [heatmapToolbarMenuLogic.selectors.heatmapEnabled], (heatmapEnabled) => heatmapEnabled],
+        heatmapEnabled: [
+            () => [heatmapToolbarMenuLogic.selectors.heatmapEnabled],
+            (heatmapEnabled: boolean) => heatmapEnabled,
+        ],
 
         heatmapElements: [
             (s) => [
@@ -199,7 +423,7 @@ export const elementsLogic = kea<elementsLogicType>([
                 s.rectUpdateCounter,
                 toolbarConfigLogic.selectors.buttonVisible,
             ],
-            (countedElements) => {
+            (countedElements: import('~/toolbar/types').CountedHTMLElement[]) => {
                 const windowHeight = window.innerHeight
 
                 const result: ElementWithMetadata[] = []
@@ -223,7 +447,7 @@ export const elementsLogic = kea<elementsLogicType>([
 
         allInspectElements: [
             (s) => [s.inspectEnabled, s.href],
-            (inspectEnabled) => {
+            (inspectEnabled: boolean) => {
                 if (!inspectEnabled) {
                     return []
                 }
@@ -239,7 +463,7 @@ export const elementsLogic = kea<elementsLogicType>([
 
         inspectElements: [
             (s) => [s.allInspectElements, s.rectUpdateCounter, toolbarConfigLogic.selectors.buttonVisible],
-            (allInspectElements) =>
+            (allInspectElements: HTMLElement[]) =>
                 allInspectElements
                     .map(
                         (element) =>
@@ -253,7 +477,7 @@ export const elementsLogic = kea<elementsLogicType>([
 
         displayActionElements: [
             () => [actionsTabLogic.selectors.buttonActionsVisible],
-            (buttonActionsVisible) => {
+            (buttonActionsVisible: boolean) => {
                 return buttonActionsVisible
             },
         ],
@@ -281,7 +505,7 @@ export const elementsLogic = kea<elementsLogicType>([
 
         actionElements: [
             (s) => [s._actionElements, s.rectUpdateCounter, toolbarConfigLogic.selectors.buttonVisible],
-            (actionElements) =>
+            (actionElements: ElementWithMetadata[]) =>
                 actionElements.map((element) =>
                     element.element ? { ...element, rect: getRectForElement(element.element) } : element
                 ),
@@ -289,7 +513,12 @@ export const elementsLogic = kea<elementsLogicType>([
 
         elementMap: [
             (s) => [s.heatmapElements, s.inspectElements, s.actionElements, s.actionsListElements],
-            (heatmapElements, inspectElements, actionElements, actionsListElements): ElementMap => {
+            (
+                heatmapElements: ElementWithMetadata[],
+                inspectElements: ElementWithMetadata[],
+                actionElements: ElementWithMetadata[],
+                actionsListElements: ActionElementWithMetadata[]
+            ): ElementMap => {
                 const elementMap = new Map<HTMLElement, ElementWithMetadata>()
 
                 const addElements = (e: ElementWithMetadata): void => {
@@ -337,7 +566,7 @@ export const elementsLogic = kea<elementsLogicType>([
 
         actionsForElementMap: [
             (s) => [s._actionsForElementMap, s.rectUpdateCounter, toolbarConfigLogic.selectors.buttonVisible],
-            (actionsForElementMap): ActionElementMap => {
+            (actionsForElementMap: ActionElementMap): ActionElementMap => {
                 // We recalculate the rects here to avoid calling the expensive getElementForStep
                 actionsForElementMap.forEach((actions, element) => {
                     actions.forEach((action) => {
@@ -351,12 +580,12 @@ export const elementsLogic = kea<elementsLogicType>([
 
         elementsWithActions: [
             (s) => [s.actionsForElementMap],
-            (actionsForElementMap) => [...(actionsForElementMap.keys() as unknown as HTMLElement[])],
+            (actionsForElementMap: ActionElementMap) => [...(actionsForElementMap.keys() as unknown as HTMLElement[])],
         ],
 
         actionsListElements: [
             (s) => [s.actionsForElementMap],
-            (actionsForElementMap) =>
+            (actionsForElementMap: ActionElementMap) =>
                 [...(actionsForElementMap.values() as unknown as ActionElementWithMetadata[][])].map((a) => a[0]),
         ],
 
@@ -368,7 +597,13 @@ export const elementsLogic = kea<elementsLogicType>([
                 s.actionsListElements,
                 actionsTabLogic.selectors.selectedAction,
             ],
-            (displayActionElements, actionElements, inspectElements, actionsListElements, selectedAction) => {
+            (
+                displayActionElements: boolean,
+                actionElements: ElementWithMetadata[],
+                inspectElements: ElementWithMetadata[],
+                actionsListElements: ActionElementWithMetadata[],
+                selectedAction: ActionType | null | import('~/toolbar/types').ActionDraftType
+            ) => {
                 if (inspectElements.length > 0) {
                     return inspectElements
                 }
@@ -384,7 +619,7 @@ export const elementsLogic = kea<elementsLogicType>([
 
         elementsToDisplay: [
             (s) => [s.elementsToDisplayRaw],
-            (elementsToDisplayRaw) => {
+            (elementsToDisplayRaw: ElementWithMetadata[]) => {
                 const result: ElementWithMetadata[] = []
                 elementsToDisplayRaw.forEach((element) => {
                     const { rect, visible } = element
@@ -410,7 +645,12 @@ export const elementsLogic = kea<elementsLogicType>([
                 s.actionsListElements,
                 actionsTabLogic.selectors.selectedAction,
             ],
-            (displayActionElements, actionElements, actionsListElements, selectedAction) => {
+            (
+                displayActionElements: boolean,
+                actionElements: ElementWithMetadata[],
+                actionsListElements: ActionElementWithMetadata[],
+                selectedAction: ActionType | null | import('~/toolbar/types').ActionDraftType
+            ) => {
                 if (displayActionElements && selectedAction && actionElements.length > 0) {
                     return actionElements
                 }
@@ -428,14 +668,22 @@ export const elementsLogic = kea<elementsLogicType>([
                 s.actionsForElementMap,
                 toolbarConfigLogic.selectors.dataAttributes,
             ],
-            (selectedElement, elementMap, actionsForElementMap, dataAttributes) =>
-                getElementMetaWithSelectorQuality(selectedElement, elementMap, actionsForElementMap, dataAttributes),
+            (
+                selectedElement: HTMLElement | null,
+                elementMap: ElementMap,
+                actionsForElementMap: ActionElementMap,
+                dataAttributes: string[]
+            ) => getElementMetaWithSelectorQuality(selectedElement, elementMap, actionsForElementMap, dataAttributes),
         ],
 
         hoverElementMeta: [
             (s) => [s.hoverElement, s.elementMap, s.actionsForElementMap, toolbarConfigLogic.selectors.dataAttributes],
-            (hoverElement, elementMap, actionsForElementMap, dataAttributes) =>
-                getElementMetaWithSelectorQuality(hoverElement, elementMap, actionsForElementMap, dataAttributes),
+            (
+                hoverElement: HTMLElement | null,
+                elementMap: ElementMap,
+                actionsForElementMap: ActionElementMap,
+                dataAttributes: string[]
+            ) => getElementMetaWithSelectorQuality(hoverElement, elementMap, actionsForElementMap, dataAttributes),
         ],
 
         highlightElementMeta: [
@@ -445,12 +693,27 @@ export const elementsLogic = kea<elementsLogicType>([
                 s.actionsForElementMap,
                 toolbarConfigLogic.selectors.dataAttributes,
             ],
-            (highlightElement, elementMap, actionsForElementMap, dataAttributes) =>
-                getElementMetaWithSelectorQuality(highlightElement, elementMap, actionsForElementMap, dataAttributes),
+            (
+                highlightElement: HTMLElement | null,
+                elementMap: ElementMap,
+                actionsForElementMap: ActionElementMap,
+                dataAttributes: string[]
+            ) => getElementMetaWithSelectorQuality(highlightElement, elementMap, actionsForElementMap, dataAttributes),
         ],
         activeMeta: [
             (s) => [s.selectedElementMeta, s.hoverElementMeta],
-            (selectedElementMeta, hoverElementMeta) => {
+            (
+                selectedElementMeta:
+                    | (ElementWithMetadata & {
+                          selectorQuality: FragileSelectorResult | null
+                      })
+                    | null,
+                hoverElementMeta:
+                    | (ElementWithMetadata & {
+                          selectorQuality: FragileSelectorResult | null
+                      })
+                    | null
+            ) => {
                 return selectedElementMeta || hoverElementMeta
             },
         ],
diff --git a/frontend/src/toolbar/elements/heatmapToolbarMenuLogic.ts b/frontend/src/toolbar/elements/heatmapToolbarMenuLogic.ts
index 8c16b51d8292..939fb6c808a0 100644
--- a/frontend/src/toolbar/elements/heatmapToolbarMenuLogic.ts
+++ b/frontend/src/toolbar/elements/heatmapToolbarMenuLogic.ts
@@ -1,4 +1,15 @@
-import { actions, afterMount, beforeUnmount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    afterMount,
+    beforeUnmount,
+    connect,
+    kea,
+    listeners,
+    path,
+    reducers,
+    selectors,
+} from 'kea'
 import { loaders } from 'kea-loaders'
 import { subscriptions } from 'kea-subscriptions'
 import { windowValues } from 'kea-window-values'
@@ -34,7 +45,9 @@ import {
 } from '~/toolbar/utils'
 import { AnyPropertyFilter, PropertyFilterType, PropertyOperator } from '~/types'
 
-import type { heatmapToolbarMenuLogicType } from './heatmapToolbarMenuLogicType'
+import type { HrefMatchType } from '../../lib/components/heatmaps/heatmapDataLogic'
+import type { CommonFilters, HeatmapFilters, HeatmapFixedPositionMode } from '../../lib/components/heatmaps/types'
+import type { HeatmapElement, HeatmapResponseType } from '../types'
 
 export const doesVersionSupportScrollDepth = createVersionChecker('1.99')
 
@@ -323,6 +336,320 @@ const emptyElementsStatsPages: PaginatedResponse<ElementsEventType> = {
     results: [],
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface heatmapToolbarMenuLogicValues {
+    href: string // currentPageLogic
+    wildcardHref: string // currentPageLogic
+    commonFilters: CommonFilters // heatmapDataLogic
+    dateRange: string | null // heatmapDataLogic
+    heatmapColorPalette: string | null // heatmapDataLogic
+    heatmapElements: HeatmapElement[] // heatmapDataLogic
+    heatmapFilters: HeatmapFilters // heatmapDataLogic
+    heatmapFixedPositionMode: HeatmapFixedPositionMode // heatmapDataLogic
+    heatmapTooltipLabel: string // heatmapDataLogic
+    rawHeatmapLoading: boolean // heatmapDataLogic
+    viewportRange: {
+        max: number
+        min: number
+    } // heatmapDataLogic
+    posthog: PostHog | null // toolbarConfigLogic
+    areaCandidates: HTMLElement[]
+    areaHoverAnchor: HTMLElement | null
+    areaHoverElement: HTMLElement | null
+    areaHoverStepped: boolean
+    areaSelectionActive: boolean
+    canLoadMoreElementStats: boolean
+    clickCount: number
+    clickmapsEnabled: boolean
+    countedElements: CountedHTMLElement[]
+    elementCount: number
+    elementMetrics: Map<
+        HTMLElement,
+        {
+            visible: boolean
+        }
+    >
+    elementStats: PaginatedResponse<ElementsEventType> | null
+    elementStatsLoading: boolean
+    elementsLoading: boolean
+    heatmapAreaFilter: {
+        element: HTMLElement
+        selector: string | null
+    } | null
+    heatmapEnabled: boolean
+    highestClickCount: number
+    isRefreshing: boolean
+    lastElementStatsRequest: {
+        limit: number
+        url: string | null
+    } | null
+    loadedElementStatsCount: number
+    matchLinksByHref: boolean
+    processedElements: CountedHTMLElement[]
+    processingInputs: {
+        clickmapsEnabled: boolean
+        dataAttributes: string[]
+        elementStats: PaginatedResponse<ElementsEventType> | null
+        heatmapAreaFilter: {
+            element: HTMLElement
+            selector: string | null
+        } | null
+        href: string
+        matchLinksByHref: boolean
+    }
+    processingProgress: {
+        processed: number
+        total: number
+    } | null
+    samplingFactor: number
+    scrollDepthPosthogJsError: 'disabled' | 'version' | null
+    wantedDataAttributes: string[]
+    windowHeight: number
+    windowWidth: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface heatmapToolbarMenuLogicActions {
+    setHref: (href: string) => {
+        href: string
+    } // currentPageLogic
+    setWildcardHref: (href: string) => {
+        href: string
+    } // currentPageLogic
+    loadHeatmap: () => {
+        value: true
+    } // heatmapDataLogic
+    loadHeatmapFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    } // heatmapDataLogic
+    loadHeatmapSuccess: (
+        rawHeatmap: HeatmapResponseType | null,
+        payload?:
+            | {
+                  value: true
+              }
+            | undefined
+    ) => {
+        payload?: {
+            value: true
+        }
+        rawHeatmap: HeatmapResponseType | null
+    } // heatmapDataLogic
+    patchHeatmapFilters: (filters: Partial<HeatmapFilters>) => {
+        filters: Partial<HeatmapFilters>
+    } // heatmapDataLogic
+    resetHeatmapData: () => any // heatmapDataLogic
+    setCommonFilters: (filters: CommonFilters) => {
+        filters: CommonFilters
+    } // heatmapDataLogic
+    setDataHref: (href: string) => {
+        href: string
+    } // heatmapDataLogic
+    setHeatmapBoundsFilter: (boundsFilter: HeatmapBoundsFilter | null) => {
+        boundsFilter: HeatmapBoundsFilter | null
+    } // heatmapDataLogic
+    setHeatmapColorPalette: (palette: string | null) => {
+        palette: string | null
+    } // heatmapDataLogic
+    setHeatmapFixedPositionMode: (mode: HeatmapFixedPositionMode) => {
+        mode: HeatmapFixedPositionMode
+    } // heatmapDataLogic
+    setHrefMatchType: (matchType: HrefMatchType) => {
+        matchType: HrefMatchType
+    } // heatmapDataLogic
+    cancelAreaSelection: () => {
+        value: true
+    }
+    disableHeatmap: () => {
+        value: true
+    }
+    enableHeatmap: () => {
+        value: true
+    }
+    getElementStats: (
+        url?: string | null,
+        limit?: number
+    ) => {
+        limit: number | undefined
+        url: string | null | undefined
+    }
+    getElementStatsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    getElementStatsSuccess: (
+        elementStats: PaginatedResponse<ElementsEventType>,
+        payload?: {
+            limit: number | undefined
+            url: string | null | undefined
+        }
+    ) => {
+        elementStats: PaginatedResponse<ElementsEventType>
+        payload?: {
+            limit: number | undefined
+            url: string | null | undefined
+        }
+    }
+    loadAllEnabled: () => {
+        value: true
+    }
+    loadMoreElementStats: () => {
+        value: true
+    }
+    maybeLoadClickmap: () => {
+        value: true
+    }
+    maybeLoadHeatmap: () => {
+        value: true
+    }
+    processElements: (trigger: ClickmapProcessingTrigger) => {
+        trigger: ClickmapProcessingTrigger
+    }
+    rebindAreaElement: (element: HTMLElement) => {
+        element: HTMLElement
+    }
+    refreshClickmap: () => {
+        value: true
+    }
+    resetElementStats: () => any
+    resetElementStatsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    resetElementStatsSuccess: (
+        elementStats: PaginatedResponse<ElementsEventType>,
+        payload?: any
+    ) => {
+        elementStats: PaginatedResponse<ElementsEventType>
+        payload?: any
+    }
+    selectHeatmapAreaFilter: (element: HTMLElement | null) => {
+        element: HTMLElement | null
+    }
+    setAreaCandidates: (candidates: HTMLElement[]) => {
+        candidates: HTMLElement[]
+    }
+    setAreaHover: (
+        anchor: HTMLElement,
+        candidate: HTMLElement
+    ) => {
+        anchor: HTMLElement
+        candidate: HTMLElement
+    }
+    setAreaHoverCandidate: (candidate: HTMLElement) => {
+        candidate: HTMLElement
+    }
+    setElementsLoading: (loading: boolean) => {
+        loading: boolean
+    }
+    setHeatmapAreaFilter: (
+        element: HTMLElement | null,
+        selector: string | null
+    ) => {
+        element: HTMLElement | null
+        selector: string | null
+    }
+    setIsRefreshing: (isRefreshing: boolean) => {
+        isRefreshing: boolean
+    }
+    setMatchLinksByHref: (matchLinksByHref: boolean) => {
+        matchLinksByHref: boolean
+    }
+    setProcessedElements: (elements: CountedHTMLElement[]) => {
+        elements: CountedHTMLElement[]
+    }
+    setProcessingProgress: (
+        processed: number,
+        total: number
+    ) => {
+        processed: number
+        total: number
+    }
+    setSamplingFactor: (samplingFactor: number) => {
+        samplingFactor: number
+    }
+    startAreaSelection: () => {
+        value: true
+    }
+    startElementObservation: () => {
+        value: true
+    }
+    stepAreaHover: (direction: 'down' | 'up') => {
+        direction: 'down' | 'up'
+    }
+    stopElementObservation: () => {
+        value: true
+    }
+    toggleClickmapsEnabled: (enabled: boolean) => {
+        enabled: boolean
+    }
+    updateAreaBounds: () => {
+        value: true
+    }
+    updateElementMetrics: (observedElements: [HTMLElement, boolean][]) => {
+        observedElements: [HTMLElement, boolean][]
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface heatmapToolbarMenuLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        countedElements: (
+            processedElements: CountedHTMLElement[],
+            elementMetrics: Map<
+                HTMLElement,
+                {
+                    visible: boolean
+                }
+            >
+        ) => CountedHTMLElement[]
+        elementCount: (countedElements: CountedHTMLElement[]) => number
+        loadedElementStatsCount: (elementStats: PaginatedResponse<ElementsEventType> | null) => number
+        wantedDataAttributes: (dataAttributes: string[]) => string[]
+        clickCount: (countedElements: CountedHTMLElement[]) => number
+        highestClickCount: (countedElements: CountedHTMLElement[]) => number
+        scrollDepthPosthogJsError: (posthog: PostHog | null) => 'disabled' | 'version' | null
+        processingInputs: (
+            elementStats: PaginatedResponse<ElementsEventType> | null,
+            dataAttributes: string[],
+            href: string,
+            matchLinksByHref: boolean,
+            clickmapsEnabled: boolean,
+            heatmapAreaFilter: {
+                element: HTMLElement
+                selector: string | null
+            } | null
+        ) => {
+            clickmapsEnabled: boolean
+            dataAttributes: string[]
+            elementStats: PaginatedResponse<ElementsEventType> | null
+            heatmapAreaFilter: {
+                element: HTMLElement
+                selector: string | null
+            } | null
+            href: string
+            matchLinksByHref: boolean
+        }
+    }
+}
+
+export type heatmapToolbarMenuLogicType = MakeLogicType<
+    heatmapToolbarMenuLogicValues,
+    heatmapToolbarMenuLogicActions,
+    Record<string, any>,
+    heatmapToolbarMenuLogicMeta
+>
+
 export const heatmapToolbarMenuLogic = kea<heatmapToolbarMenuLogicType>([
     path(['toolbar', 'elements', 'heatmapToolbarMenuLogic']),
     connect(() => ({
@@ -625,15 +952,26 @@ export const heatmapToolbarMenuLogic = kea<heatmapToolbarMenuLogicType>([
     selectors(() => ({
         countedElements: [
             (s) => [s.processedElements, s.elementMetrics],
-            (processedElements, elementMetrics) => {
+            (
+                processedElements: CountedHTMLElement[],
+                elementMetrics: Map<
+                    HTMLElement,
+                    {
+                        visible: boolean
+                    }
+                >
+            ) => {
                 return processedElements.map((el: CountedHTMLElement) => {
                     const metrics = elementMetrics.get(el.element)
                     return metrics ? { ...el, visible: metrics.visible } : el
                 })
             },
         ],
-        elementCount: [(s) => [s.countedElements], (countedElements) => countedElements.length],
-        loadedElementStatsCount: [(s) => [s.elementStats], (elementStats) => elementStats?.results?.length ?? 0],
+        elementCount: [(s) => [s.countedElements], (countedElements: CountedHTMLElement[]) => countedElements.length],
+        loadedElementStatsCount: [
+            (s) => [s.elementStats],
+            (elementStats: PaginatedResponse<ElementsEventType> | null) => elementStats?.results?.length ?? 0,
+        ],
         // isTooSimple always reads attr__data-attr, so request it alongside the configured data
         // attributes — first, so it survives the server's entry cap however many are configured
         wantedDataAttributes: [
@@ -642,11 +980,12 @@ export const heatmapToolbarMenuLogic = kea<heatmapToolbarMenuLogicType>([
         ],
         clickCount: [
             (s) => [s.countedElements],
-            (countedElements) => (countedElements ? countedElements.map((e) => e.count).reduce((a, b) => a + b, 0) : 0),
+            (countedElements: CountedHTMLElement[]) =>
+                countedElements ? countedElements.map((e) => e.count).reduce((a, b) => a + b, 0) : 0,
         ],
         highestClickCount: [
             (s) => [s.countedElements],
-            (countedElements) =>
+            (countedElements: CountedHTMLElement[]) =>
                 countedElements ? countedElements.map((e) => e.count).reduce((a, b) => (b > a ? b : a), 0) : 0,
         ],
 
@@ -681,7 +1020,17 @@ export const heatmapToolbarMenuLogic = kea<heatmapToolbarMenuLogicType>([
                 s.clickmapsEnabled,
                 s.heatmapAreaFilter,
             ],
-            (elementStats, dataAttributes, href, matchLinksByHref, clickmapsEnabled, heatmapAreaFilter) => ({
+            (
+                elementStats: PaginatedResponse<ElementsEventType> | null,
+                dataAttributes: string[],
+                href: string,
+                matchLinksByHref: boolean,
+                clickmapsEnabled: boolean,
+                heatmapAreaFilter: {
+                    element: HTMLElement
+                    selector: string | null
+                } | null
+            ) => ({
                 elementStats,
                 dataAttributes,
                 href,
diff --git a/frontend/src/toolbar/experiments/experimentsLogic.ts b/frontend/src/toolbar/experiments/experimentsLogic.ts
index 0e831447578f..69286a1a1daf 100644
--- a/frontend/src/toolbar/experiments/experimentsLogic.ts
+++ b/frontend/src/toolbar/experiments/experimentsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { createFuse } from 'lib/utils/fuseSearch'
@@ -7,7 +7,93 @@ import { permanentlyMount } from 'lib/utils/kea-logic-builders'
 import { toolbarApi } from '~/toolbar/toolbarApi'
 import { WebExperiment } from '~/toolbar/types'
 
-import type { experimentsLogicType } from './experimentsLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface experimentsLogicValues {
+    allExperiments: WebExperiment[]
+    allExperimentsLoading: boolean
+    experimentCount: number
+    searchTerm: string
+    sortedExperiments: WebExperiment[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface experimentsLogicActions {
+    deleteExperiment: ({ id }: { id: number }) => {
+        id: number
+    }
+    deleteExperimentFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteExperimentSuccess: (
+        allExperiments: WebExperiment[],
+        payload?: {
+            id: number
+        }
+    ) => {
+        allExperiments: WebExperiment[]
+        payload?: {
+            id: number
+        }
+    }
+    getExperiments: (_?: any) => any
+    getExperimentsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    getExperimentsSuccess: (
+        allExperiments: WebExperiment[],
+        payload?: any
+    ) => {
+        allExperiments: WebExperiment[]
+        payload?: any
+    }
+    setSearchTerm: (searchTerm: string) => {
+        searchTerm: string
+    }
+    updateExperiment: ({ experiment }: { experiment: WebExperiment }) => {
+        experiment: WebExperiment
+    }
+    updateExperimentFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateExperimentSuccess: (
+        allExperiments: WebExperiment[],
+        payload?: {
+            experiment: WebExperiment
+        }
+    ) => {
+        allExperiments: WebExperiment[]
+        payload?: {
+            experiment: WebExperiment
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface experimentsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        sortedExperiments: (allExperiments: WebExperiment[], searchTerm: string) => WebExperiment[]
+        experimentCount: (allExperiments: WebExperiment[]) => number
+    }
+}
+
+export type experimentsLogicType = MakeLogicType<
+    experimentsLogicValues,
+    experimentsLogicActions,
+    Record<string, any>,
+    experimentsLogicMeta
+>
 
 export const experimentsLogic = kea<experimentsLogicType>([
     path(['toolbar', 'experiments', 'experimentsLogic']),
@@ -53,7 +139,7 @@ export const experimentsLogic = kea<experimentsLogicType>([
     selectors({
         sortedExperiments: [
             (s) => [s.allExperiments, s.searchTerm],
-            (allExperiments, searchTerm) => {
+            (allExperiments: WebExperiment[], searchTerm: string) => {
                 const filteredExperiments = searchTerm
                     ? createFuse(allExperiments, {
                           keys: ['name'],
@@ -64,7 +150,7 @@ export const experimentsLogic = kea<experimentsLogicType>([
                 return [...filteredExperiments]
             },
         ],
-        experimentCount: [(s) => [s.allExperiments], (allExperiments) => allExperiments.length],
+        experimentCount: [(s) => [s.allExperiments], (allExperiments: WebExperiment[]) => allExperiments.length],
     }),
     permanentlyMount(),
 ])
diff --git a/frontend/src/toolbar/experiments/experimentsTabLogic.tsx b/frontend/src/toolbar/experiments/experimentsTabLogic.tsx
index 799babf0bf57..778e6725d815 100644
--- a/frontend/src/toolbar/experiments/experimentsTabLogic.tsx
+++ b/frontend/src/toolbar/experiments/experimentsTabLogic.tsx
@@ -1,5 +1,6 @@
-import { actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { subscriptions } from 'kea-subscriptions'
 
 import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
@@ -21,7 +22,7 @@ import { urls } from '~/toolbar/urls'
 import { elementToQuery, isLaunched, joinWithUiHost, percentageDistribution } from '~/toolbar/utils'
 import { Experiment, ExperimentIdType } from '~/types'
 
-import type { experimentsTabLogicType } from './experimentsTabLogicType'
+import type { ToolbarUserIntent } from '../../types'
 
 function newExperiment(): WebExperimentForm {
     return {
@@ -60,6 +61,174 @@ export const ElementSelectorButtonTypes = {
     images: 'Images',
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface experimentsTabLogicValues {
+    allExperiments: WebExperiment[] // experimentsLogic
+    buttonVisible: boolean // toolbarConfigLogic
+    dataAttributes: string[] // toolbarConfigLogic
+    experimentId: ExperimentIdType | null // toolbarConfigLogic
+    uiHost: string // toolbarConfigLogic
+    userIntent: ToolbarUserIntent | null // toolbarConfigLogic
+    addVariantAvailable: boolean | undefined
+    buttonExperimentsVisible: boolean
+    elementSelector: string
+    experimentForm: WebExperimentForm
+    experimentFormAllErrors: Record<string, any>
+    experimentFormChanged: boolean
+    experimentFormErrors: DeepPartialMap<WebExperimentForm, ValidationErrorType>
+    experimentFormHasErrors: boolean
+    experimentFormManualErrors: Record<string, any>
+    experimentFormTouched: boolean
+    experimentFormTouches: Record<string, boolean>
+    experimentFormValidationErrors: DeepPartialMap<WebExperimentForm, ValidationErrorType>
+    inspectingElement: number | null
+    isExperimentFormSubmitting: boolean
+    isExperimentFormValid: boolean
+    newExperimentForElement: HTMLElement | null
+    removeVariantAvailable: boolean | undefined
+    selectedElementType: string
+    selectedExperiment: Experiment | WebExperimentDraftType | null
+    selectedExperimentId: number | 'new' | 'web' | null
+    selectedVariant: string
+    showExperimentFormErrors: boolean
+    showExperimentsTooltip: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface experimentsTabLogicActions {
+    getExperiments: (_?: any) => any // experimentsLogic
+    addNewTransformation: (variant: string) => {
+        variant: string
+    }
+    addNewVariant: () => {}
+    applyVariant: (newVariantKey: string) => {
+        newVariantKey: string
+    }
+    editSelectorWithIndex: (
+        variant: string,
+        index: number | null
+    ) => {
+        index: number | null
+        variant: string
+    }
+    hideButtonExperiments: () => {
+        value: true
+    }
+    inspectElementSelected: (
+        element: HTMLElement,
+        variant: string,
+        index: number | null,
+        selector?: string | null
+    ) => {
+        element: HTMLElement
+        index: number | null
+        selector: string | null | undefined
+        variant: string
+    }
+    inspectForElementWithIndex: (
+        variant: string,
+        type: ElementSelectorType,
+        index: number | null
+    ) => {
+        index: number | null
+        type: ElementSelectorType
+        variant: string
+    }
+    newExperiment: (element?: HTMLElement) => {
+        element: HTMLElement | null
+    }
+    rebalanceRolloutPercentage: () => {}
+    removeElement: (
+        variant: string,
+        index: number
+    ) => {
+        index: number
+        variant: string
+    }
+    removeVariant: (variant: string) => {
+        variant: string
+    }
+    resetExperimentForm: (values?: WebExperimentForm) => {
+        values?: WebExperimentForm
+    }
+    saveExperiment: (formValues: WebExperimentForm) => {
+        formValues: WebExperimentForm
+    }
+    selectElementType: (elementType: ElementSelectorType) => {
+        elementType: ElementSelectorType
+    }
+    selectExperiment: (id: ExperimentIdType | null) => {
+        id: ExperimentIdType | null
+    }
+    selectVariant: (variant: string) => {
+        variant: string
+    }
+    setElementSelector: (
+        selector: string,
+        index: number
+    ) => {
+        index: number
+        selector: string
+    }
+    setExperimentFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setExperimentFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setExperimentFormValues: (values: DeepPartial<WebExperimentForm>) => {
+        values: DeepPartial<WebExperimentForm>
+    }
+    setShowExperimentsTooltip: (showExperimentsTooltip: boolean) => {
+        showExperimentsTooltip: boolean
+    }
+    showButtonExperiments: () => {
+        value: true
+    }
+    submitExperimentForm: () => {
+        value: boolean
+    }
+    submitExperimentFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitExperimentFormRequest: (experimentForm: WebExperimentForm) => {
+        experimentForm: WebExperimentForm
+    }
+    submitExperimentFormSuccess: (experimentForm: WebExperimentForm) => {
+        experimentForm: WebExperimentForm
+    }
+    touchExperimentFormField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface experimentsTabLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        removeVariantAvailable: (experimentForm: WebExperimentForm) => boolean | undefined
+        addVariantAvailable: (experimentForm: WebExperimentForm) => boolean | undefined
+        selectedExperiment: (
+            selectedExperimentId: number | 'new' | 'web' | null,
+            allExperiments: WebExperiment[]
+        ) => Experiment | WebExperimentDraftType | null
+    }
+}
+
+export type experimentsTabLogicType = MakeLogicType<
+    experimentsTabLogicValues,
+    experimentsTabLogicActions,
+    Record<string, any>,
+    experimentsTabLogicMeta
+>
+
 export const experimentsTabLogic = kea<experimentsTabLogicType>([
     path(['toolbar', 'experiments', 'experimentsTabLogic']),
     actions({
@@ -250,7 +419,10 @@ export const experimentsTabLogic = kea<experimentsTabLogicType>([
         ],
         selectedExperiment: [
             (s) => [s.selectedExperimentId, s.allExperiments],
-            (selectedExperimentId, allExperiments: WebExperiment[]): Experiment | WebExperimentDraftType | null => {
+            (
+                selectedExperimentId: number | 'new' | 'web' | null,
+                allExperiments: WebExperiment[]
+            ): Experiment | WebExperimentDraftType | null => {
                 if (selectedExperimentId === 'new') {
                     return newExperiment()
                 }
diff --git a/frontend/src/toolbar/field-notes/fieldNotesLogic.ts b/frontend/src/toolbar/field-notes/fieldNotesLogic.ts
index 23188d657642..2414a5077e65 100644
--- a/frontend/src/toolbar/field-notes/fieldNotesLogic.ts
+++ b/frontend/src/toolbar/field-notes/fieldNotesLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from 'lib/lemon-ui/LemonToast'
@@ -13,8 +13,6 @@ import { ElementRect } from '~/toolbar/types'
 import { TOOLBAR_ID, elementToActionStep, getRectForElement, joinWithUiHost } from '~/toolbar/utils'
 import { captureAndUploadElementScreenshot } from '~/toolbar/utils/screenshot'
 
-import type { fieldNotesLogicType } from './fieldNotesLogicType'
-
 export interface PageContext {
     url: string
     host: string
@@ -52,6 +50,111 @@ function isToolbarElement(element: HTMLElement): boolean {
     return toolbar?.contains(element) ?? false
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface fieldNotesLogicValues {
+    dataAttributes: string[] // toolbarConfigLogic
+    uiHost: string // toolbarConfigLogic
+    buttonFieldNotesVisible: boolean
+    comment: string
+    deletingId: string | null
+    fieldNotes: FieldNote[]
+    fieldNotesLoading: boolean
+    hasOpenedFieldNotes: boolean
+    hoverElement: HTMLElement | null
+    hoverElementRect: ElementRect | null
+    isFieldNoting: boolean
+    pageContext: PageContext | null
+    rectUpdateCounter: number
+    screenshotUrl: string | null
+    selectedElement: HTMLElement | null
+    selectedElementRect: ElementRect | null
+    submitResult: FieldNote | null
+    submitResultLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface fieldNotesLogicActions {
+    clearSelection: () => {
+        value: true
+    }
+    deleteFieldNote: (id: string) => {
+        id: string
+    }
+    hideButtonFieldNotes: () => {
+        value: true
+    }
+    loadFieldNotes: () => any
+    loadFieldNotesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadFieldNotesSuccess: (
+        fieldNotes: FieldNote[],
+        payload?: any
+    ) => {
+        fieldNotes: FieldNote[]
+        payload?: any
+    }
+    selectElement: (element: HTMLElement) => {
+        element: HTMLElement
+        page: PageContext
+    }
+    setComment: (comment: string) => {
+        comment: string
+    }
+    setHoverElement: (element: HTMLElement | null) => {
+        element: HTMLElement | null
+    }
+    setScreenshotUrl: (url: string | null) => {
+        url: string | null
+    }
+    showButtonFieldNotes: () => {
+        value: true
+    }
+    startFieldNote: () => {
+        value: true
+    }
+    stopFieldNote: () => {
+        value: true
+    }
+    submitFieldNote: () => any
+    submitFieldNoteFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    submitFieldNoteSuccess: (
+        submitResult: FieldNote | null,
+        payload?: any
+    ) => {
+        submitResult: FieldNote | null
+        payload?: any
+    }
+    updateRects: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface fieldNotesLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        hoverElementRect: (hoverElement: HTMLElement | null, rectUpdateCounter: number) => ElementRect | null
+        selectedElementRect: (selectedElement: HTMLElement | null, rectUpdateCounter: number) => ElementRect | null
+    }
+}
+
+export type fieldNotesLogicType = MakeLogicType<
+    fieldNotesLogicValues,
+    fieldNotesLogicActions,
+    Record<string, any>,
+    fieldNotesLogicMeta
+>
+
 export const fieldNotesLogic = kea<fieldNotesLogicType>([
     path(['toolbar', 'field-notes', 'fieldNotesLogic']),
 
@@ -180,11 +283,13 @@ export const fieldNotesLogic = kea<fieldNotesLogicType>([
     selectors({
         hoverElementRect: [
             (s) => [s.hoverElement, s.rectUpdateCounter],
-            (hoverElement): ElementRect | null => (hoverElement ? getRectForElement(hoverElement) : null),
+            (hoverElement: HTMLElement | null): ElementRect | null =>
+                hoverElement ? getRectForElement(hoverElement) : null,
         ],
         selectedElementRect: [
             (s) => [s.selectedElement, s.rectUpdateCounter],
-            (selectedElement): ElementRect | null => (selectedElement ? getRectForElement(selectedElement) : null),
+            (selectedElement: HTMLElement | null): ElementRect | null =>
+                selectedElement ? getRectForElement(selectedElement) : null,
         ],
     }),
 
diff --git a/frontend/src/toolbar/flags/flagsToolbarLogic.ts b/frontend/src/toolbar/flags/flagsToolbarLogic.ts
index 826e265faee5..45b426a20059 100644
--- a/frontend/src/toolbar/flags/flagsToolbarLogic.ts
+++ b/frontend/src/toolbar/flags/flagsToolbarLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import type { PostHog } from 'posthog-js'
 
@@ -11,7 +11,7 @@ import { toolbarLogger } from '~/toolbar/toolbarLogger'
 import { captureToolbarException, toolbarPosthogJS } from '~/toolbar/toolbarPosthogJS'
 import { CombinedFeatureFlagAndValueType } from '~/types'
 
-import type { flagsToolbarLogicType } from './flagsToolbarLogicType'
+import type { FeatureFlagType } from '../../types'
 
 export type PayloadOverrides = Record<string, any>
 
@@ -20,6 +20,195 @@ type EvaluationReasonsResponse = Record<
     { value: boolean | string; evaluation: { reason: string; condition_index: number | null } }
 >
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface flagsToolbarLogicValues {
+    posthog: PostHog | null // toolbarConfigLogic
+    countFlagsOverridden: number
+    draftDistinctId: string
+    draftPayloads: Record<string, string>
+    filteredFlags: {
+        currentValue: boolean | string
+        feature_flag: FeatureFlagType
+        hasOverride: boolean
+        hasVariants: boolean
+        payloadOverride: any
+        value: boolean | string
+    }[]
+    impersonatedDistinctId: string | null
+    impersonatedFlagValues: Record<string, boolean | string> | null
+    impersonationOpen: boolean
+    localOverrides: Record<string, boolean | string>
+    openPayloadEditors: Record<string, boolean>
+    payloadErrors: Record<string, string | null>
+    payloadOverrides: PayloadOverrides
+    posthogClientFlagValues: Record<string, boolean | string>
+    searchTerm: string
+    userFlags: CombinedFeatureFlagAndValueType[]
+    userFlagsLoading: boolean
+    userFlagsWithOverrideInfo: {
+        currentValue: boolean | string
+        feature_flag: FeatureFlagType
+        hasOverride: boolean
+        hasVariants: boolean
+        payloadOverride: any
+        value: boolean | string
+    }[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface flagsToolbarLogicActions {
+    logout: () => {
+        value: true
+    } // toolbarConfigLogic
+    tokenExpired: () => {
+        value: true
+    } // toolbarConfigLogic
+    checkLocalOverrides: () => {
+        value: true
+    }
+    clearAllOverrides: () => {
+        value: true
+    }
+    clearImpersonation: () => {
+        value: true
+    }
+    deleteOverriddenUserFlag: (flagKey: string) => {
+        flagKey: string
+    }
+    getUserFlags: () => {
+        value: true
+    }
+    getUserFlagsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    getUserFlagsSuccess: (
+        userFlags: CombinedFeatureFlagAndValueType[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        userFlags: CombinedFeatureFlagAndValueType[]
+        payload?: {
+            value: true
+        }
+    }
+    loadFlagsForDistinctId: (distinctId: string) => {
+        distinctId: string
+    }
+    savePayloadOverride: (flagKey: string) => {
+        flagKey: string
+    }
+    setDraftDistinctId: (draftDistinctId: string) => {
+        draftDistinctId: string
+    }
+    setDraftPayload: (
+        flagKey: string,
+        draftPayload: string
+    ) => {
+        draftPayload: string
+        flagKey: string
+    }
+    setFeatureFlagValueFromPostHogClient: (
+        flags: string[],
+        variants: Record<string, boolean | string>
+    ) => {
+        flags: string[]
+        variants: Record<string, boolean | string>
+    }
+    setImpersonatedFlagValues: (flagValues: Record<string, boolean | string>) => {
+        flagValues: Record<string, boolean | string>
+    }
+    setImpersonationOpen: (isOpen: boolean) => {
+        isOpen: boolean
+    }
+    setOverriddenUserFlag: (
+        flagKey: string,
+        overrideValue: boolean | string,
+        payloadOverride?: PayloadOverrides
+    ) => {
+        flagKey: string
+        overrideValue: boolean | string
+        payloadOverride: PayloadOverrides | undefined
+    }
+    setPayloadEditorOpen: (
+        flagKey: string,
+        isOpen: boolean
+    ) => {
+        flagKey: string
+        isOpen: boolean
+    }
+    setPayloadError: (
+        flagKey: string,
+        error: string | null
+    ) => {
+        error: string | null
+        flagKey: string
+    }
+    setPayloadOverride: (
+        flagKey: string,
+        payload: any
+    ) => {
+        flagKey: string
+        payload: any
+    }
+    setSearchTerm: (searchTerm: string) => {
+        searchTerm: string
+    }
+    storeLocalOverrides: (localOverrides: Record<string, boolean | string>) => {
+        localOverrides: Record<string, boolean | string>
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface flagsToolbarLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        userFlagsWithOverrideInfo: (
+            userFlags: CombinedFeatureFlagAndValueType[],
+            localOverrides: Record<string, boolean | string>,
+            posthogClientFlagValues: Record<string, boolean | string>,
+            payloadOverrides: PayloadOverrides,
+            impersonatedFlagValues: Record<string, boolean | string> | null
+        ) => {
+            currentValue: boolean | string
+            feature_flag: FeatureFlagType
+            hasOverride: boolean
+            hasVariants: boolean
+            payloadOverride: any
+            value: boolean | string
+        }[]
+        filteredFlags: (
+            searchTerm: string,
+            userFlagsWithOverrideInfo: {
+                currentValue: boolean | string
+                feature_flag: FeatureFlagType
+                hasOverride: boolean
+                hasVariants: boolean
+                payloadOverride: any
+                value: boolean | string
+            }[]
+        ) => {
+            currentValue: boolean | string
+            feature_flag: FeatureFlagType
+            hasOverride: boolean
+            hasVariants: boolean
+            payloadOverride: any
+            value: boolean | string
+        }[]
+        countFlagsOverridden: (localOverrides: Record<string, boolean | string>) => number
+    }
+}
+
+export type flagsToolbarLogicType = MakeLogicType<
+    flagsToolbarLogicValues,
+    flagsToolbarLogicActions,
+    Record<string, any>,
+    flagsToolbarLogicMeta
+>
+
 export const flagsToolbarLogic = kea<flagsToolbarLogicType>([
     path(['toolbar', 'flags', 'flagsToolbarLogic']),
     connect(() => ({
@@ -193,7 +382,13 @@ export const flagsToolbarLogic = kea<flagsToolbarLogicType>([
                 s.payloadOverrides,
                 s.impersonatedFlagValues,
             ],
-            (userFlags, localOverrides, posthogClientFlagValues, payloadOverrides, impersonatedFlagValues) => {
+            (
+                userFlags: CombinedFeatureFlagAndValueType[],
+                localOverrides: Record<string, boolean | string>,
+                posthogClientFlagValues: Record<string, boolean | string>,
+                payloadOverrides: PayloadOverrides,
+                impersonatedFlagValues: Record<string, boolean | string> | null
+            ) => {
                 return userFlags.map((flag) => {
                     const hasVariants = (flag.feature_flag.filters?.multivariate?.variants?.length || 0) > 0
 
@@ -216,7 +411,17 @@ export const flagsToolbarLogic = kea<flagsToolbarLogicType>([
         ],
         filteredFlags: [
             (s) => [s.searchTerm, s.userFlagsWithOverrideInfo],
-            (searchTerm, userFlagsWithOverrideInfo) => {
+            (
+                searchTerm: string,
+                userFlagsWithOverrideInfo: {
+                    currentValue: boolean | string
+                    feature_flag: import('~/types').FeatureFlagType
+                    hasOverride: boolean
+                    hasVariants: boolean
+                    payloadOverride: any
+                    value: boolean | string
+                }[]
+            ) => {
                 return searchTerm
                     ? createFuse(userFlagsWithOverrideInfo, {
                           keys: ['feature_flag.key', 'feature_flag.name'],
@@ -226,7 +431,10 @@ export const flagsToolbarLogic = kea<flagsToolbarLogicType>([
                     : userFlagsWithOverrideInfo
             },
         ],
-        countFlagsOverridden: [(s) => [s.localOverrides], (localOverrides) => Object.keys(localOverrides).length],
+        countFlagsOverridden: [
+            (s) => [s.localOverrides],
+            (localOverrides: Record<string, boolean | string>) => Object.keys(localOverrides).length,
+        ],
     }),
     listeners(({ actions, values }) => {
         const clearFeatureFlagOverrides = (): void => {
diff --git a/frontend/src/toolbar/product-tours/productToursLogic.ts b/frontend/src/toolbar/product-tours/productToursLogic.ts
index bbf1ba1a072d..870a17d3524b 100644
--- a/frontend/src/toolbar/product-tours/productToursLogic.ts
+++ b/frontend/src/toolbar/product-tours/productToursLogic.ts
@@ -1,5 +1,5 @@
 import { deepEqual as equal } from 'fast-equals'
-import { actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { subscriptions } from 'kea-subscriptions'
@@ -31,8 +31,10 @@ import { captureAndUploadElementScreenshot } from '~/toolbar/utils/screenshot'
 import { ProductTour, ProductTourStep, ProductTourStepType } from '~/types'
 
 import { inferSelector } from './elementInference'
-import type { productToursLogicType } from './productToursLogicType'
 import { PRODUCT_TOURS_SIDEBAR_TRANSITION_MS } from './utils'
+import type { ToolbarUserIntent } from '../../types'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
+import type { PostHog } from 'posthog-js/dist/module'
 
 /**
  * Editor state machine - explicit states instead of multiple boolean flags.
@@ -147,6 +149,179 @@ async function buildDraftPayload(form: TourForm, tours: ProductTour[]): Promise<
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface productToursLogicValues {
+    dataAttributes: string[]; // toolbarConfigLogic
+    posthog: PostHog | null; // toolbarConfigLogic
+    productTourId: string | null; // toolbarConfigLogic
+    uiHost: string; // toolbarConfigLogic
+    userIntent: ToolbarUserIntent | null; // toolbarConfigLogic
+    buttonProductToursVisible: boolean;
+    draftSaveStatus: "saved" | "saving" | "unsaved" | null;
+    editorState: EditorState;
+    expandedStepIndex: number | null;
+    expandedStepRect: ElementRect | null;
+    hoverElement: HTMLElement | null;
+    hoverElementRect: ElementRect | null;
+    isPreviewing: boolean;
+    isSelecting: boolean;
+    isTourFormSubmitting: boolean;
+    isTourFormValid: boolean;
+    launchedFromMainApp: boolean;
+    rectUpdateCounter: number;
+    selectedElement: HTMLElement | null;
+    selectedElementRect: ElementRect | null;
+    selectedTour: TourForm | null;
+    selectedTourId: string | "new" | null;
+    selectingStepIndex: number | null;
+    sessionRecordingConsent: boolean | null;
+    showTourFormErrors: boolean;
+    sidebarPosition: "left" | "right";
+    sidebarTransitioning: boolean;
+    stepCount: number;
+    tourForm: TourForm;
+    tourFormAllErrors: Record<string, any>;
+    tourFormChanged: boolean;
+    tourFormErrors: DeepPartialMap<TourForm, ValidationErrorType>;
+    tourFormHasErrors: boolean;
+    tourFormManualErrors: Record<string, any>;
+    tourFormTouched: boolean;
+    tourFormTouches: Record<string, boolean>;
+    tourFormValidationErrors: DeepPartialMap<TourForm, ValidationErrorType>;
+    tours: ProductTour[];
+    toursLoading: boolean;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface productToursLogicActions {
+    addStep: (stepType: ProductTourStepType) => {
+        stepType: ProductTourStepType;
+    };
+    cancelEditing: () => {
+        value: true;
+    };
+    clearSelectedElement: () => {
+        value: true;
+    };
+    deleteTour: (id: string) => {
+        id: string;
+    };
+    draftAutoSave: () => {
+        value: true;
+    };
+    hideButtonProductTours: () => {
+        value: true;
+    };
+    loadTours: () => any;
+    loadToursFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadToursSuccess: (tours: ProductTour[], payload?: any) => {
+        tours: ProductTour[];
+        payload?: any;
+    };
+    newTour: () => {
+        value: true;
+    };
+    previewTour: () => {
+        value: true;
+    };
+    removeStep: (index: number) => {
+        index: number;
+    };
+    resetTourForm: (values?: TourForm) => {
+        values?: TourForm;
+    };
+    saveTour: () => {
+        value: true;
+    };
+    selectElement: (element: HTMLElement) => {
+        element: HTMLElement;
+    };
+    selectTour: (id: string | null) => {
+        id: string | null;
+    };
+    setEditorState: (state: EditorState) => {
+        state: EditorState;
+    };
+    setExpandedStepIndex: (index: number | null) => {
+        index: number | null;
+    };
+    setHoverElement: (element: HTMLElement | null) => {
+        element: HTMLElement | null;
+    };
+    setLaunchedFromMainApp: (value: boolean) => {
+        value: boolean;
+    };
+    setSessionRecordingConsent: (consent: boolean) => {
+        consent: boolean;
+    };
+    setSidebarTransitioning: (transitioning: boolean) => {
+        transitioning: boolean;
+    };
+    setTourFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>;
+    };
+    setTourFormValue: (key: FieldName, value: any) => {
+        name: FieldName;
+        value: any;
+    };
+    setTourFormValues: (values: DeepPartial<TourForm>) => {
+        values: DeepPartial<TourForm>;
+    };
+    showButtonProductTours: () => {
+        value: true;
+    };
+    startPreviewMode: () => {
+        value: true;
+    };
+    stopPreview: () => {
+        value: true;
+    };
+    submitTourForm: () => {
+        value: boolean;
+    };
+    submitTourFormFailure: (error: Error, errors: Record<string, any>) => {
+        error: Error;
+        errors: Record<string, any>;
+    };
+    submitTourFormRequest: (tourForm: TourForm) => {
+        tourForm: TourForm;
+    };
+    submitTourFormSuccess: (tourForm: TourForm) => {
+        tourForm: TourForm;
+    };
+    toggleSidebarPosition: () => {
+        value: true;
+    };
+    touchTourFormField: (key: string) => {
+        key: string;
+    };
+    updateRects: () => {
+        value: true;
+    };
+    updateStep: (index: number, patch: Partial<TourStep>) => {
+        index: number;
+        patch: Partial<TourStep>;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface productToursLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        selectedTour: (selectedTourId: string | null, tours: ProductTour[]) => TourForm | null;
+        isSelecting: (editorState: EditorState) => boolean;
+        selectingStepIndex: (editorState: EditorState) => number | null;
+        hoverElementRect: (hoverElement: HTMLElement | null, rectUpdateCounter: number) => ElementRect | null;
+        selectedElementRect: (selectedElement: HTMLElement | null, rectUpdateCounter: number) => ElementRect | null;
+        stepCount: (tourForm: TourForm) => number;
+        expandedStepRect: (expandedStepIndex: number | null, tourForm: TourForm, rectUpdateCounter: number, editorState: EditorState) => ElementRect | null;
+    };
+}
+
+export type productToursLogicType = MakeLogicType<productToursLogicValues, productToursLogicActions, Record<string, any>, productToursLogicMeta>;
+
 export const productToursLogic = kea<productToursLogicType>([
     path(['toolbar', 'product-tours', 'productToursLogic']),
 
@@ -368,7 +543,7 @@ export const productToursLogic = kea<productToursLogicType>([
     selectors({
         selectedTour: [
             (s) => [s.selectedTourId, s.tours],
-            (selectedTourId, tours): TourForm | null => {
+            (selectedTourId: string | null, tours: ProductTour[]): TourForm | null => {
                 if (selectedTourId === 'new') {
                     return newTour()
                 }
@@ -381,14 +556,14 @@ export const productToursLogic = kea<productToursLogicType>([
                 return null
             },
         ],
-        isSelecting: [(s) => [s.editorState], (editorState) => editorState.mode === 'selecting'],
+        isSelecting: [(s) => [s.editorState], (editorState: EditorState) => editorState.mode === 'selecting'],
         selectingStepIndex: [
             (s) => [s.editorState],
-            (editorState): number | null => (editorState.mode === 'selecting' ? editorState.stepIndex : null),
+            (editorState: EditorState): number | null => (editorState.mode === 'selecting' ? editorState.stepIndex : null),
         ],
         hoverElementRect: [
             (s) => [s.hoverElement, s.rectUpdateCounter],
-            (hoverElement): ElementRect | null => {
+            (hoverElement: HTMLElement | null): ElementRect | null => {
                 if (!hoverElement) {
                     return null
                 }
@@ -397,17 +572,17 @@ export const productToursLogic = kea<productToursLogicType>([
         ],
         selectedElementRect: [
             (s) => [s.selectedElement, s.rectUpdateCounter],
-            (selectedElement): ElementRect | null => {
+            (selectedElement: HTMLElement | null): ElementRect | null => {
                 if (!selectedElement) {
                     return null
                 }
                 return getRectForElement(selectedElement)
             },
         ],
-        stepCount: [(s) => [s.tourForm], (tourForm) => tourForm?.steps?.length ?? 0],
+        stepCount: [(s) => [s.tourForm], (tourForm: TourForm) => tourForm?.steps?.length ?? 0],
         expandedStepRect: [
             (s) => [s.expandedStepIndex, s.tourForm, s.rectUpdateCounter, s.editorState],
-            (expandedStepIndex, tourForm, _, editorState): ElementRect | null => {
+            (expandedStepIndex: number | null, tourForm: TourForm, _: number, editorState: EditorState): ElementRect | null => {
                 if (editorState.mode === 'selecting') {
                     return null
                 }
diff --git a/frontend/src/toolbar/screenshot-upload/screenshotUploadLogic.ts b/frontend/src/toolbar/screenshot-upload/screenshotUploadLogic.ts
index 874fdae70565..b7e8c195a9fb 100644
--- a/frontend/src/toolbar/screenshot-upload/screenshotUploadLogic.ts
+++ b/frontend/src/toolbar/screenshot-upload/screenshotUploadLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, props, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from 'lib/lemon-ui/LemonToast'
@@ -10,12 +10,94 @@ import { safeFetch } from '~/toolbar/utils'
 import { captureElementScreenshot, uploadScreenshot } from '~/toolbar/utils/screenshot'
 import { EventDefinition } from '~/types'
 
-import type { screenshotUploadLogicType } from './screenshotUploadLogicType'
-
 export interface ScreenshotUploadLogicProps {
     onSuccess?: () => void
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface screenshotUploadLogicValues {
+    eventDefinitions: EventDefinition[]
+    eventDefinitionsLoading: boolean
+    eventName: string
+    isModalOpen: boolean
+    isTakingScreenshot: boolean
+    previewUrl: string | null
+    selectedDefinition: EventDefinition | null
+    showSuggestions: boolean
+    uploadResult: {
+        success: boolean
+    } | null
+    uploadResultLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface screenshotUploadLogicActions {
+    closeModal: () => {
+        value: true
+    }
+    openModal: (previewUrl: string) => {
+        previewUrl: string
+    }
+    searchEvents: ({ query }: { query: string }) => {
+        query: string
+    }
+    searchEventsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    searchEventsSuccess: (
+        eventDefinitions: EventDefinition[],
+        payload?: {
+            query: string
+        }
+    ) => {
+        eventDefinitions: EventDefinition[]
+        payload?: {
+            query: string
+        }
+    }
+    selectEvent: (definition: EventDefinition) => {
+        definition: EventDefinition
+    }
+    setEventName: (name: string) => {
+        name: string
+    }
+    setShowSuggestions: (show: boolean) => {
+        show: boolean
+    }
+    submitUpload: (_: any) => any
+    submitUploadFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    submitUploadSuccess: (
+        uploadResult: {
+            success: true
+        } | null,
+        payload?: any
+    ) => {
+        uploadResult: {
+            success: true
+        } | null
+        payload?: any
+    }
+    takeScreenshot: () => {
+        value: true
+    }
+}
+
+export type screenshotUploadLogicType = MakeLogicType<
+    screenshotUploadLogicValues,
+    screenshotUploadLogicActions,
+    ScreenshotUploadLogicProps
+>
+
 export const screenshotUploadLogic = kea<screenshotUploadLogicType>([
     path(['toolbar', 'screenshot-upload', 'screenshotUploadLogic']),
     props({} as ScreenshotUploadLogicProps),
diff --git a/frontend/src/toolbar/shims/featureFlagLogic.ts b/frontend/src/toolbar/shims/featureFlagLogic.ts
index a9148f50638a..ddab85839607 100644
--- a/frontend/src/toolbar/shims/featureFlagLogic.ts
+++ b/frontend/src/toolbar/shims/featureFlagLogic.ts
@@ -1,6 +1,4 @@
-import { kea, path, reducers } from 'kea'
-
-import type { featureFlagLogicType } from './featureFlagLogicType'
+import { MakeLogicType, kea, path, reducers } from 'kea'
 
 // Toolbar shim — no feature flags available in toolbar context
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -8,6 +6,13 @@ export function getFeatureFlagPayload(_flag: string): undefined {
     return undefined
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface featureFlagLogicValues {
+    featureFlags: Record<string, boolean | string>
+}
+
+export type featureFlagLogicType = MakeLogicType<featureFlagLogicValues, {}>
+
 export const featureFlagLogic = kea<featureFlagLogicType>([
     path(['toolbar', 'shims', 'featureFlagLogic']),
     reducers({
diff --git a/frontend/src/toolbar/shims/membersLogic.ts b/frontend/src/toolbar/shims/membersLogic.ts
index 547dd93cadd1..b04d7b28a0a3 100644
--- a/frontend/src/toolbar/shims/membersLogic.ts
+++ b/frontend/src/toolbar/shims/membersLogic.ts
@@ -1,6 +1,18 @@
-import { actions, kea, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers } from 'kea'
 
-import type { membersLogicType } from './membersLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface membersLogicValues {
+    members: unknown[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface membersLogicActions {
+    ensureAllMembersLoaded: () => {
+        value: true
+    }
+}
+
+export type membersLogicType = MakeLogicType<membersLogicValues, membersLogicActions>
 
 // Toolbar shim — prevents the real membersLogic from auto-mounting and making API requests to the wrong host
 export const membersLogic = kea<membersLogicType>([
diff --git a/frontend/src/toolbar/shims/sceneLogic.ts b/frontend/src/toolbar/shims/sceneLogic.ts
index d191844324ca..8d97abecf5a8 100644
--- a/frontend/src/toolbar/shims/sceneLogic.ts
+++ b/frontend/src/toolbar/shims/sceneLogic.ts
@@ -1,6 +1,11 @@
-import { kea, path, reducers } from 'kea'
+import { MakeLogicType, kea, path, reducers } from 'kea'
 
-import type { sceneLogicType } from './sceneLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sceneLogicValues {
+    sceneConfig: Record<string, unknown> | null
+}
+
+export type sceneLogicType = MakeLogicType<sceneLogicValues, {}>
 
 // Toolbar shim — prevents the real sceneLogic from hijacking routing.
 // null sceneConfig makes themeLogic fall through to system dark mode preference.
diff --git a/frontend/src/toolbar/shims/surveyQuestionLabelsLogic.ts b/frontend/src/toolbar/shims/surveyQuestionLabelsLogic.ts
index 10fc8ec2ce8b..6883dfd0dff7 100644
--- a/frontend/src/toolbar/shims/surveyQuestionLabelsLogic.ts
+++ b/frontend/src/toolbar/shims/surveyQuestionLabelsLogic.ts
@@ -1,6 +1,4 @@
-import { kea, path, reducers } from 'kea'
-
-import type { surveyQuestionLabelsLogicType } from './surveyQuestionLabelsLogicType'
+import { MakeLogicType, kea, path, reducers } from 'kea'
 
 // Toolbar shim — survey question labels come from an authenticated endpoint the toolbar can't
 // reach on customer pages (lib/api is denied), so the labels are always empty here. Consumers
@@ -12,6 +10,13 @@ export interface SurveyQuestionLabel {
     questionIndex: number
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface surveyQuestionLabelsLogicValues {
+    surveyQuestionLabels: Record<string, SurveyQuestionLabel>
+}
+
+export type surveyQuestionLabelsLogicType = MakeLogicType<surveyQuestionLabelsLogicValues, {}>
+
 export const surveyQuestionLabelsLogic = kea<surveyQuestionLabelsLogicType>([
     path(['toolbar', 'shims', 'surveyQuestionLabelsLogic']),
     reducers({
diff --git a/frontend/src/toolbar/shims/teamLogic.ts b/frontend/src/toolbar/shims/teamLogic.ts
index b2ad1778a2a2..14584813d090 100644
--- a/frontend/src/toolbar/shims/teamLogic.ts
+++ b/frontend/src/toolbar/shims/teamLogic.ts
@@ -1,12 +1,27 @@
-import { kea, path, reducers, selectors } from 'kea'
-
-import type { teamLogicType } from './teamLogicType'
+import { MakeLogicType, kea, path, reducers, selectors } from 'kea'
 
 // Toolbar shim — prevents the real teamLogic from auto-mounting and making API requests to the wrong host
 export function isAuthenticatedTeam(team: unknown): boolean {
     return !!team && typeof team === 'object' && 'api_token' in team
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface teamLogicValues {
+    currentTeam: Record<string, unknown> | null
+    timezone: string
+    weekStartDay: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface teamLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        timezone: (currentTeam: Record<string, unknown> | null) => string
+        weekStartDay: (currentTeam: Record<string, unknown> | null) => number
+    }
+}
+
+export type teamLogicType = MakeLogicType<teamLogicValues, {}, Record<string, any>, teamLogicMeta>
+
 export const teamLogic = kea<teamLogicType>([
     path(['toolbar', 'shims', 'teamLogic']),
     reducers({
diff --git a/frontend/src/toolbar/shims/userLogic.ts b/frontend/src/toolbar/shims/userLogic.ts
index 9504354be748..c38fc79a82e6 100644
--- a/frontend/src/toolbar/shims/userLogic.ts
+++ b/frontend/src/toolbar/shims/userLogic.ts
@@ -1,6 +1,22 @@
-import { actions, kea, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers } from 'kea'
 
-import type { userLogicType } from './userLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface userLogicValues {
+    themeMode: string
+    user: Record<string, unknown> | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface userLogicActions {
+    loadUserSuccess: (user: unknown) => {
+        user: unknown
+    }
+    updateUser: (payload: unknown) => {
+        payload: unknown
+    }
+}
+
+export type userLogicType = MakeLogicType<userLogicValues, userLogicActions>
 
 // Toolbar shim — prevents the real userLogic from auto-mounting and making API requests to the wrong host
 export const userLogic = kea<userLogicType>([
diff --git a/frontend/src/toolbar/stats/currentPageLogic.ts b/frontend/src/toolbar/stats/currentPageLogic.ts
index ed0593c2b62b..bc9599b05fcc 100644
--- a/frontend/src/toolbar/stats/currentPageLogic.ts
+++ b/frontend/src/toolbar/stats/currentPageLogic.ts
@@ -1,9 +1,7 @@
-import { actions, afterMount, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, listeners, path, reducers } from 'kea'
 
 import { makeNavigateWrapper } from '~/toolbar/utils'
 
-import type { currentPageLogicType } from './currentPageLogicType'
-
 const replaceWithWildcard = (part: string): string => {
     // replace uuids
     if (part.match(/^([a-f]|[0-9]){8}-([a-f]|[0-9]){4}-([a-f]|[0-9]){4}-([a-f]|[0-9]){4}-([a-f]|[0-9]){12}$/)) {
@@ -67,6 +65,31 @@ export function withoutPostHogInit(href: string): string {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface currentPageLogicValues {
+    autoWildcardEnabled: boolean
+    href: string
+    wildcardHref: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface currentPageLogicActions {
+    autoWildcardHref: () => {
+        value: true
+    }
+    setAutoWildcardEnabled: (enabled: boolean) => {
+        enabled: boolean
+    }
+    setHref: (href: string) => {
+        href: string
+    }
+    setWildcardHref: (href: string) => {
+        href: string
+    }
+}
+
+export type currentPageLogicType = MakeLogicType<currentPageLogicValues, currentPageLogicActions>
+
 export const currentPageLogic = kea<currentPageLogicType>([
     path(['toolbar', 'stats', 'currentPageLogic']),
 
diff --git a/frontend/src/toolbar/surveys/surveysToolbarLogic.ts b/frontend/src/toolbar/surveys/surveysToolbarLogic.ts
index 2bc05daaeab7..18c2527b0c76 100644
--- a/frontend/src/toolbar/surveys/surveysToolbarLogic.ts
+++ b/frontend/src/toolbar/surveys/surveysToolbarLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
@@ -19,8 +19,6 @@ import {
     SurveyType,
 } from '~/types'
 
-import type { surveysToolbarLogicType } from './surveysToolbarLogicType'
-
 export type SurveyStatus = 'draft' | 'active' | 'complete'
 
 export type QuickSurveyQuestionType = 'open' | 'rating' | 'single_choice'
@@ -341,6 +339,125 @@ async function patchAndRefreshSurvey(
     return true
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface surveysToolbarLogicValues {
+    allSurveys: Survey[]
+    allSurveysLoading: boolean
+    canProceed: boolean
+    canProceedReason: string | null
+    editingSurvey: Survey | null
+    editingSurveyId: string | null
+    hasMoreSurveys: boolean
+    isCreating: boolean
+    isLifecyclePending: boolean
+    isSubmitting: boolean
+    previewSurvey: Survey | null
+    quickForm: QuickSurveyForm
+    searchTerm: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface surveysToolbarLogicActions {
+    archiveSurvey: (survey: Survey) => {
+        survey: Survey
+    }
+    cancelQuickCreate: () => {
+        value: true
+    }
+    hideButtonSurveys: () => {
+        value: true
+    }
+    launchSurvey: (survey: Survey) => {
+        survey: Survey
+    }
+    loadMoreSurveys: () => any
+    loadMoreSurveysFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadMoreSurveysSuccess: (
+        allSurveys: Survey[],
+        payload?: any
+    ) => {
+        allSurveys: Survey[]
+        payload?: any
+    }
+    loadSurveys: () => any
+    loadSurveysFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSurveysSuccess: (
+        allSurveys: Survey[],
+        payload?: any
+    ) => {
+        allSurveys: Survey[]
+        payload?: any
+    }
+    resumeSurvey: (survey: Survey) => {
+        survey: Survey
+    }
+    setFormField: (
+        field: keyof QuickSurveyForm,
+        value: unknown
+    ) => {
+        field: keyof QuickSurveyForm
+        value: unknown
+    }
+    setHasMoreSurveys: (hasMore: boolean) => {
+        hasMore: boolean
+    }
+    setLifecyclePending: (pending: boolean) => {
+        pending: boolean
+    }
+    setSearchTerm: (searchTerm: string) => {
+        searchTerm: string
+    }
+    showButtonSurveys: () => {
+        value: true
+    }
+    startQuickCreate: () => {
+        value: true
+    }
+    startQuickEdit: (survey: Survey) => {
+        survey: Survey
+    }
+    stopSurvey: (survey: Survey) => {
+        survey: Survey
+    }
+    submitQuickCreate: (launch?: boolean) => {
+        launch: boolean
+    }
+    submitQuickCreateFailure: () => {
+        value: true
+    }
+    submitQuickCreateSuccess: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface surveysToolbarLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        previewSurvey: (quickForm: QuickSurveyForm, isCreating: boolean, editingSurvey: Survey | null) => Survey | null
+        canProceed: (quickForm: QuickSurveyForm) => boolean
+        canProceedReason: (quickForm: QuickSurveyForm) => string | null
+    }
+}
+
+export type surveysToolbarLogicType = MakeLogicType<
+    surveysToolbarLogicValues,
+    surveysToolbarLogicActions,
+    Record<string, any>,
+    surveysToolbarLogicMeta
+>
+
 export const surveysToolbarLogic = kea<surveysToolbarLogicType>([
     path(['toolbar', 'surveys', 'surveysToolbarLogic']),
 
@@ -494,7 +611,7 @@ export const surveysToolbarLogic = kea<surveysToolbarLogicType>([
     selectors({
         previewSurvey: [
             (s) => [s.quickForm, s.isCreating, s.editingSurvey],
-            (form, isCreating, editingSurvey): Survey | null => {
+            (form: QuickSurveyForm, isCreating: boolean, editingSurvey: Survey | null): Survey | null => {
                 if (!isCreating) {
                     return null
                 }
@@ -528,7 +645,7 @@ export const surveysToolbarLogic = kea<surveysToolbarLogicType>([
         ],
         canProceed: [
             (s) => [s.quickForm],
-            (form): boolean => {
+            (form: QuickSurveyForm): boolean => {
                 return (
                     !!form.name.trim() &&
                     !!form.questionText.trim() &&
@@ -542,7 +659,7 @@ export const surveysToolbarLogic = kea<surveysToolbarLogicType>([
         // "needs at least two single-choice options".
         canProceedReason: [
             (s) => [s.quickForm],
-            (form): string | null => {
+            (form: QuickSurveyForm): string | null => {
                 if (!form.name.trim()) {
                     return 'Add a survey name'
                 }
diff --git a/frontend/src/toolbar/toolbarConfigLogic.ts b/frontend/src/toolbar/toolbarConfigLogic.ts
index fef4f25fd979..a3c705401d94 100644
--- a/frontend/src/toolbar/toolbarConfigLogic.ts
+++ b/frontend/src/toolbar/toolbarConfigLogic.ts
@@ -1,4 +1,16 @@
-import { actions, afterMount, beforeUnmount, kea, listeners, path, props, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    afterMount,
+    beforeUnmount,
+    kea,
+    listeners,
+    path,
+    props,
+    reducers,
+    selectors,
+} from 'kea'
+import type { PostHog } from 'posthog-js'
 
 import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
 
@@ -6,7 +18,7 @@ import { toolbarLogger } from '~/toolbar/toolbarLogger'
 import { captureToolbarException, toolbarPosthogJS } from '~/toolbar/toolbarPosthogJS'
 import { TOOLBAR_USER_INTENTS, ToolbarProps, ToolbarUserIntent } from '~/types'
 
-import type { toolbarConfigLogicType } from './toolbarConfigLogicType'
+import type { ExperimentIdType } from '../types'
 import {
     asNonEmptyString,
     cleanToolbarAuthHash,
@@ -27,6 +39,109 @@ const asUserIntent = (v: unknown): ToolbarUserIntent | null => {
     return s && VALID_USER_INTENTS.has(s as ToolbarUserIntent) ? (s as ToolbarUserIntent) : null
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface toolbarConfigLogicValues {
+    accessToken: string | null
+    actionId: number | null
+    apiHost: string
+    apiHostResolution: {
+        host: string
+        source: ApiHostSource
+    }
+    authConfirmModalVisible: boolean
+    authStatus: 'authenticating' | 'checking' | 'error' | 'idle'
+    buttonVisible: boolean
+    clientId: string | null
+    dataAttributes: string[]
+    experimentId: ExperimentIdType | null
+    isAuthenticated: boolean
+    isTrustedUiHost: boolean
+    posthog: PostHog | null
+    productTourId: string | null
+    props: ToolbarProps
+    refreshToken: string | null
+    toolbarFlagsKey: string | undefined
+    uiHost: string
+    uiHostConfigModalVisible: boolean
+    userIntent: ToolbarUserIntent | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface toolbarConfigLogicActions {
+    authenticate: () => {
+        value: true
+    }
+    clearUserIntent: () => {
+        value: true
+    }
+    closeAuthConfirmModal: () => {
+        value: true
+    }
+    closeUiHostConfigModal: () => {
+        value: true
+    }
+    confirmAuthenticate: () => {
+        value: true
+    }
+    hideButton: () => {
+        value: true
+    }
+    logout: () => {
+        value: true
+    }
+    openAuthConfirmModal: () => {
+        value: true
+    }
+    openUiHostConfigModal: () => {
+        value: true
+    }
+    persistConfig: () => {
+        value: true
+    }
+    setAuthStatus: (status: 'authenticating' | 'checking' | 'error' | 'idle') => {
+        status: 'authenticating' | 'checking' | 'error' | 'idle'
+    }
+    setOAuthTokens: (
+        accessToken: string,
+        refreshToken: string,
+        clientId: string
+    ) => {
+        accessToken: string
+        clientId: string
+        refreshToken: string
+    }
+    showButton: () => {
+        value: true
+    }
+    tokenExpired: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface toolbarConfigLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        posthog: (props: ToolbarProps) => PostHog | null
+        uiHost: (props: ToolbarProps) => string
+        apiHostResolution: (props: ToolbarProps) => {
+            host: string
+            source: ApiHostSource
+        }
+        apiHost: (apiHostResolution: { host: string; source: ApiHostSource }) => string
+        dataAttributes: (props: ToolbarProps) => string[]
+        isAuthenticated: (accessToken: string | null) => boolean
+        toolbarFlagsKey: (props: ToolbarProps) => string | undefined
+        isTrustedUiHost: (uiHost: string) => boolean
+    }
+}
+
+export type toolbarConfigLogicType = MakeLogicType<
+    toolbarConfigLogicValues,
+    toolbarConfigLogicActions,
+    ToolbarProps,
+    toolbarConfigLogicMeta
+>
+
 export const toolbarConfigLogic = kea<toolbarConfigLogicType>([
     path(['toolbar', 'toolbarConfigLogic']),
     props({} as ToolbarProps),
@@ -97,7 +212,7 @@ export const toolbarConfigLogic = kea<toolbarConfigLogicType>([
     })),
 
     selectors({
-        posthog: [(s) => [s.props], (props) => props.posthog ?? null],
+        posthog: [(s) => [s.props], (props: ToolbarProps) => props.posthog ?? null],
         // PostHog app URL used for OAuth and navigation links.
         //
         // Every candidate (props.uiHost, requestRouter, config.ui_host, apiURL) is
@@ -184,9 +299,9 @@ export const toolbarConfigLogic = kea<toolbarConfigLogicType>([
             (s) => [s.apiHostResolution],
             (resolution: { host: string; source: ApiHostSource }): string => resolution.host,
         ],
-        dataAttributes: [(s) => [s.props], (props): string[] => props.dataAttributes ?? []],
-        isAuthenticated: [(s) => [s.accessToken], (accessToken) => !!accessToken],
-        toolbarFlagsKey: [(s) => [s.props], (props): string | undefined => props.toolbarFlagsKey],
+        dataAttributes: [(s) => [s.props], (props: ToolbarProps): string[] => props.dataAttributes ?? []],
+        isAuthenticated: [(s) => [s.accessToken], (accessToken: string | null) => !!accessToken],
+        toolbarFlagsKey: [(s) => [s.props], (props: ToolbarProps): string | undefined => props.toolbarFlagsKey],
         // True when uiHost is a PostHog Cloud host (us/eu) — safe to skip the
         // "are you sure you want to authenticate here?" confirmation.
         isTrustedUiHost: [(s) => [s.uiHost], (uiHost: string): boolean => isPostHogCloudHost(uiHost)],
diff --git a/frontend/src/toolbar/web-vitals/webVitalsToolbarLogic.ts b/frontend/src/toolbar/web-vitals/webVitalsToolbarLogic.ts
index b6ab6766cde1..e98fb18ab8a2 100644
--- a/frontend/src/toolbar/web-vitals/webVitalsToolbarLogic.ts
+++ b/frontend/src/toolbar/web-vitals/webVitalsToolbarLogic.ts
@@ -1,6 +1,7 @@
-import { actions, afterMount, connect, kea, path, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, path, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router, urlToAction } from 'kea-router'
+import type { PostHog } from 'posthog-js'
 
 import { inStorybook, inStorybookTestRunner } from 'lib/utils/dom'
 import { permanentlyMount } from 'lib/utils/kea-logic-builders'
@@ -9,8 +10,6 @@ import { WebVitalsMetric } from '~/queries/schema/schema-general'
 import { toolbarApi } from '~/toolbar/toolbarApi'
 import { toolbarConfigLogic } from '~/toolbar/toolbarConfigLogic'
 
-import type { webVitalsToolbarLogicType } from './webVitalsToolbarLogicType'
-
 // We're giving different meaning for `undefined` and `null` here.
 // `undefined` means we don't have a value yet, while `null` means we didn't get a value from the server.
 export type WebVitalsMetrics = Record<WebVitalsMetric, number | null | undefined>
@@ -23,6 +22,54 @@ export type WebVitalsMetricsResponse = {
     }[]
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface webVitalsToolbarLogicValues {
+    posthog: PostHog | null // toolbarConfigLogic
+    localWebVitals: WebVitalsMetrics
+    remoteWebVitals: WebVitalsMetrics
+    remoteWebVitalsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface webVitalsToolbarLogicActions {
+    getWebVitals: () => {
+        value: true
+    }
+    getWebVitalsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    getWebVitalsSuccess: (
+        remoteWebVitals: WebVitalsMetrics,
+        payload?: {
+            value: true
+        }
+    ) => {
+        remoteWebVitals: WebVitalsMetrics
+        payload?: {
+            value: true
+        }
+    }
+    nullifyLocalWebVitals: () => {
+        value: true
+    }
+    resetLocalWebVitals: () => {
+        value: true
+    }
+    setLocalWebVital: (
+        webVitalMetric: WebVitalsMetric,
+        value: number | null
+    ) => {
+        value: number | null
+        webVitalMetric: WebVitalsMetric
+    }
+}
+
+export type webVitalsToolbarLogicType = MakeLogicType<webVitalsToolbarLogicValues, webVitalsToolbarLogicActions>
+
 export const webVitalsToolbarLogic = kea<webVitalsToolbarLogicType>([
     path(['toolbar', 'web-vitals', 'webVitalsToolbarLogic']),
     connect(() => ({
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6a8eb07c0b51..074159d51abd 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -61,8 +61,8 @@ catalogs:
       specifier: ^16.0.0
       version: 16.0.0
     kea:
-      specifier: ^4.0.0-pre.5
-      version: 4.0.0-pre.5
+      specifier: ^4.0.0-pre.6
+      version: 4.0.0-pre.6
     kea-forms:
       specifier: ^3.2.0
       version: 3.2.0
@@ -1069,31 +1069,31 @@ importers:
         version: 4.1.0
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-forms:
         specifier: 'catalog:'
-        version: 3.2.0(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.2.0(kea@4.0.0-pre.6(react@18.3.1))
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-localstorage:
         specifier: 'catalog:'
-        version: 3.1.0(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.0(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-subscriptions:
         specifier: 'catalog:'
-        version: 3.0.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.0.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-test-utils:
         specifier: 'catalog:'
-        version: 0.2.4(kea@4.0.0-pre.5(react@18.3.1))
+        version: 0.2.4(kea@4.0.0-pre.6(react@18.3.1))
       kea-waitfor:
         specifier: 'catalog:'
-        version: 0.2.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 0.2.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-window-values:
         specifier: 'catalog:'
-        version: 3.0.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.0.1(kea@4.0.0-pre.6(react@18.3.1))
       liquidjs:
         specifier: ^10.27.0
         version: 10.27.0
@@ -1396,8 +1396,8 @@ importers:
         specifier: ^16.0.0
         version: 16.0.0
       kea-typegen:
-        specifier: 3.8.2
-        version: 3.8.2(typescript@6.0.3)
+        specifier: 3.8.3
+        version: 3.8.3(typescript@6.0.3)
       less:
         specifier: ^3.12.2
         version: 3.13.1
@@ -2271,26 +2271,26 @@ importers:
         version: 6.6.2
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-forms:
         specifier: 'catalog:'
-        version: 3.2.0(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.2.0(kea@4.0.0-pre.6(react@18.3.1))
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-subscriptions:
         specifier: 'catalog:'
-        version: 3.0.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.0.1(kea@4.0.0-pre.6(react@18.3.1))
       react:
         specifier: 18.3.1
         version: 18.3.1
     devDependencies:
       kea-test-utils:
         specifier: 'catalog:'
-        version: 0.2.4(kea@4.0.0-pre.5(react@18.3.1))
+        version: 0.2.4(kea@4.0.0-pre.6(react@18.3.1))
 
   products/agent_platform: {}
 
@@ -2638,16 +2638,16 @@ importers:
         version: 2.1.1
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-forms:
         specifier: 'catalog:'
-        version: 3.2.0(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.2.0(kea@4.0.0-pre.6(react@18.3.1))
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       posthog-js:
         specifier: 'catalog:'
         version: 1.401.0
@@ -2657,7 +2657,7 @@ importers:
     devDependencies:
       kea-test-utils:
         specifier: 'catalog:'
-        version: 0.2.4(kea@4.0.0-pre.5(react@18.3.1))
+        version: 0.2.4(kea@4.0.0-pre.6(react@18.3.1))
 
   products/ai_observability:
     dependencies:
@@ -2693,19 +2693,19 @@ importers:
         version: 30.0.5(esbuild-register@3.6.0(esbuild@0.28.1))
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-forms:
         specifier: 'catalog:'
-        version: 3.2.0(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.2.0(kea@4.0.0-pre.6(react@18.3.1))
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-subscriptions:
         specifier: 'catalog:'
-        version: 3.0.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.0.1(kea@4.0.0-pre.6(react@18.3.1))
       papaparse:
         specifier: '*'
         version: 5.4.1
@@ -2739,7 +2739,7 @@ importers:
         version: 14.3.1(@types/react@18.3.27)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       kea-test-utils:
         specifier: 'catalog:'
-        version: 0.2.4(kea@4.0.0-pre.5(react@18.3.1))
+        version: 0.2.4(kea@4.0.0-pre.6(react@18.3.1))
 
   products/alerts:
     dependencies:
@@ -2751,7 +2751,7 @@ importers:
         version: 0.38.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@posthog/lemon-ui':
         specifier: '*'
-        version: 0.0.0(antd@5.26.0(date-fns@4.1.0)(luxon@3.7.2)(moment@2.29.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(kea-router@3.4.1(kea@4.0.0-pre.5(react@18.3.1)))(kea@4.0.0-pre.5(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 0.0.0(antd@5.26.0(date-fns@4.1.0)(luxon@3.7.2)(moment@2.29.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(kea-router@3.4.1(kea@4.0.0-pre.6(react@18.3.1)))(kea@4.0.0-pre.6(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@types/react':
         specifier: 18.3.27
         version: 18.3.27
@@ -2763,19 +2763,19 @@ importers:
         version: 6.0.1
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-forms:
         specifier: 'catalog:'
-        version: 3.2.0(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.2.0(kea@4.0.0-pre.6(react@18.3.1))
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-subscriptions:
         specifier: 'catalog:'
-        version: 3.0.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.0.1(kea@4.0.0-pre.6(react@18.3.1))
       posthog-js:
         specifier: 'catalog:'
         version: 1.401.0
@@ -2794,7 +2794,7 @@ importers:
         version: 10.4.6(@types/react-dom@18.3.7(@types/react@18.3.27))(@types/react@18.3.27)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@10.4.6(@testing-library/dom@10.4.0)(@types/react@18.3.27)(prettier@3.8.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@6.0.3)
       kea-test-utils:
         specifier: 'catalog:'
-        version: 0.2.4(kea@4.0.0-pre.5(react@18.3.1))
+        version: 0.2.4(kea@4.0.0-pre.6(react@18.3.1))
 
   products/analytics_platform: {}
 
@@ -2811,22 +2811,22 @@ importers:
         version: 0.38.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@posthog/lemon-ui':
         specifier: '*'
-        version: 0.0.0(antd@5.26.0(date-fns@4.1.0)(luxon@3.7.2)(moment@2.29.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(kea-router@3.4.1(kea@4.0.0-pre.5(react@18.3.1)))(kea@4.0.0-pre.5(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 0.0.0(antd@5.26.0(date-fns@4.1.0)(luxon@3.7.2)(moment@2.29.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(kea-router@3.4.1(kea@4.0.0-pre.6(react@18.3.1)))(kea@4.0.0-pre.6(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@types/react':
         specifier: 18.3.27
         version: 18.3.27
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-forms:
         specifier: 'catalog:'
-        version: 3.2.0(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.2.0(kea@4.0.0-pre.6(react@18.3.1))
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       posthog-js:
         specifier: 'catalog:'
         version: 1.401.0
@@ -2852,13 +2852,13 @@ importers:
         version: 6.6.2
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       react:
         specifier: 18.3.1
         version: 18.3.1
@@ -2874,7 +2874,7 @@ importers:
         version: 0.38.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@posthog/lemon-ui':
         specifier: '*'
-        version: 0.0.0(antd@5.26.0(date-fns@4.1.0)(luxon@3.7.2)(moment@2.29.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(kea-router@3.4.1(kea@4.0.0-pre.5(react@18.3.1)))(kea@4.0.0-pre.5(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 0.0.0(antd@5.26.0(date-fns@4.1.0)(luxon@3.7.2)(moment@2.29.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(kea-router@3.4.1(kea@4.0.0-pre.6(react@18.3.1)))(kea@4.0.0-pre.6(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@tiptap/core':
         specifier: 3.20.6
         version: 3.20.6(@tiptap/pm@3.20.6)
@@ -2919,16 +2919,16 @@ importers:
         version: 1.2.1
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-subscriptions:
         specifier: 'catalog:'
-        version: 3.0.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.0.1(kea@4.0.0-pre.6(react@18.3.1))
       lowlight:
         specifier: '*'
         version: 3.3.0
@@ -2959,7 +2959,7 @@ importers:
         version: 29.7.0(@types/node@25.8.0)(ts-node@10.9.1(@swc/core@1.15.18)(@types/node@25.8.0)(typescript@6.0.3))
       kea-test-utils:
         specifier: 'catalog:'
-        version: 0.2.4(kea@4.0.0-pre.5(react@18.3.1))
+        version: 0.2.4(kea@4.0.0-pre.6(react@18.3.1))
 
   products/core_events: {}
 
@@ -3009,19 +3009,19 @@ importers:
         version: 6.6.2
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-forms:
         specifier: 'catalog:'
-        version: 3.2.0(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.2.0(kea@4.0.0-pre.6(react@18.3.1))
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-test-utils:
         specifier: 'catalog:'
-        version: 0.2.4(kea@4.0.0-pre.5(react@18.3.1))
+        version: 0.2.4(kea@4.0.0-pre.6(react@18.3.1))
       posthog-js:
         specifier: 'catalog:'
         version: 1.401.0
@@ -3054,13 +3054,13 @@ importers:
         version: 6.6.2
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       posthog-js:
         specifier: 'catalog:'
         version: 1.401.0
@@ -3088,7 +3088,7 @@ importers:
         version: 29.7.0(@types/node@25.8.0)(ts-node@10.9.1(@swc/core@1.15.18)(@types/node@25.8.0)(typescript@6.0.3))
       kea-test-utils:
         specifier: 'catalog:'
-        version: 0.2.4(kea@4.0.0-pre.5(react@18.3.1))
+        version: 0.2.4(kea@4.0.0-pre.6(react@18.3.1))
 
   products/data_catalog: {}
 
@@ -3108,16 +3108,16 @@ importers:
         version: 1.2.1
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-forms:
         specifier: 'catalog:'
-        version: 3.2.0(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.2.0(kea@4.0.0-pre.6(react@18.3.1))
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       react:
         specifier: 18.3.1
         version: 18.3.1
@@ -3141,7 +3141,7 @@ importers:
         version: 0.38.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@posthog/lemon-ui':
         specifier: '*'
-        version: 0.0.0(antd@5.26.0(date-fns@4.1.0)(luxon@3.7.2)(moment@2.29.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(kea-router@3.4.1(kea@4.0.0-pre.5(react@18.3.1)))(kea@4.0.0-pre.5(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 0.0.0(antd@5.26.0(date-fns@4.1.0)(luxon@3.7.2)(moment@2.29.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(kea-router@3.4.1(kea@4.0.0-pre.6(react@18.3.1)))(kea@4.0.0-pre.6(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@storybook/react':
         specifier: 'catalog:'
         version: 10.4.6(@types/react-dom@18.3.7(@types/react@18.3.27))(@types/react@18.3.27)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@10.4.6(@testing-library/dom@10.4.0)(@types/react@18.3.27)(prettier@3.8.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@6.0.3)
@@ -3150,19 +3150,19 @@ importers:
         version: 18.3.27
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-forms:
         specifier: 'catalog:'
-        version: 3.2.0(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.2.0(kea@4.0.0-pre.6(react@18.3.1))
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-test-utils:
         specifier: 'catalog:'
-        version: 0.2.4(kea@4.0.0-pre.5(react@18.3.1))
+        version: 0.2.4(kea@4.0.0-pre.6(react@18.3.1))
       posthog-js:
         specifier: 'catalog:'
         version: 1.401.0
@@ -3188,19 +3188,19 @@ importers:
         version: 1.2.1
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-forms:
         specifier: 'catalog:'
-        version: 3.2.0(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.2.0(kea@4.0.0-pre.6(react@18.3.1))
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-subscriptions:
         specifier: 'catalog:'
-        version: 3.0.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.0.1(kea@4.0.0-pre.6(react@18.3.1))
       react:
         specifier: 18.3.1
         version: 18.3.1
@@ -3224,16 +3224,16 @@ importers:
         version: 6.6.2
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-forms:
         specifier: 'catalog:'
-        version: 3.2.0(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.2.0(kea@4.0.0-pre.6(react@18.3.1))
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       react:
         specifier: 18.3.1
         version: 18.3.1
@@ -3258,20 +3258,20 @@ importers:
         version: 18.3.27
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       react:
         specifier: 18.3.1
         version: 18.3.1
     devDependencies:
       kea-test-utils:
         specifier: 'catalog:'
-        version: 0.2.4(kea@4.0.0-pre.5(react@18.3.1))
+        version: 0.2.4(kea@4.0.0-pre.6(react@18.3.1))
 
   products/error_tracking:
     dependencies:
@@ -3328,19 +3328,19 @@ importers:
         version: 6.6.2
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-forms:
         specifier: 'catalog:'
-        version: 3.2.0(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.2.0(kea@4.0.0-pre.6(react@18.3.1))
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-subscriptions:
         specifier: 'catalog:'
-        version: 3.0.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.0.1(kea@4.0.0-pre.6(react@18.3.1))
       posthog-js:
         specifier: 'catalog:'
         version: 1.401.0
@@ -3362,7 +3362,7 @@ importers:
     devDependencies:
       kea-test-utils:
         specifier: 'catalog:'
-        version: 0.2.4(kea@4.0.0-pre.5(react@18.3.1))
+        version: 0.2.4(kea@4.0.0-pre.6(react@18.3.1))
 
   products/event_definitions: {}
 
@@ -3382,13 +3382,13 @@ importers:
         version: 6.6.2
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       react:
         specifier: 18.3.1
         version: 18.3.1
@@ -3415,13 +3415,13 @@ importers:
         version: 6.6.2
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       posthog-js:
         specifier: 'catalog:'
         version: 1.401.0
@@ -3434,7 +3434,7 @@ importers:
         version: 10.4.6(@types/react-dom@18.3.7(@types/react@18.3.27))(@types/react@18.3.27)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@10.4.6(@testing-library/dom@10.4.0)(@types/react@18.3.27)(prettier@3.8.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@6.0.3)
       kea-test-utils:
         specifier: 'catalog:'
-        version: 0.2.4(kea@4.0.0-pre.5(react@18.3.1))
+        version: 0.2.4(kea@4.0.0-pre.6(react@18.3.1))
 
   products/field_notes: {}
 
@@ -3454,13 +3454,13 @@ importers:
         version: 6.6.2
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       react:
         specifier: 18.3.1
         version: 18.3.1
@@ -3481,13 +3481,13 @@ importers:
         version: 6.6.2
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       react:
         specifier: 18.3.1
         version: 18.3.1
@@ -3511,10 +3511,10 @@ importers:
         version: 30.0.5(esbuild-register@3.6.0(esbuild@0.28.1))
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       react:
         specifier: 18.3.1
         version: 18.3.1
@@ -3529,7 +3529,7 @@ importers:
         version: 0.38.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@posthog/lemon-ui':
         specifier: '*'
-        version: 0.0.0(antd@5.26.0(date-fns@4.1.0)(luxon@3.7.2)(moment@2.29.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(kea-router@3.4.1(kea@4.0.0-pre.5(react@18.3.1)))(kea@4.0.0-pre.5(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 0.0.0(antd@5.26.0(date-fns@4.1.0)(luxon@3.7.2)(moment@2.29.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(kea-router@3.4.1(kea@4.0.0-pre.6(react@18.3.1)))(kea@4.0.0-pre.6(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@storybook/react':
         specifier: 'catalog:'
         version: 10.4.6(@types/react-dom@18.3.7(@types/react@18.3.27))(@types/react@18.3.27)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@10.4.6(@testing-library/dom@9.3.4)(@types/react@18.3.27)(prettier@3.8.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@6.0.3)
@@ -3544,16 +3544,16 @@ importers:
         version: 18.3.27
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-forms:
         specifier: 'catalog:'
-        version: 3.2.0(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.2.0(kea@4.0.0-pre.6(react@18.3.1))
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       posthog-js:
         specifier: 'catalog:'
         version: 1.401.0
@@ -3577,16 +3577,16 @@ importers:
         version: 1.2.1
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-forms:
         specifier: 'catalog:'
-        version: 3.2.0(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.2.0(kea@4.0.0-pre.6(react@18.3.1))
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       qrcode.react:
         specifier: ^4.2.0
         version: 4.2.0(react@18.3.1)
@@ -3601,7 +3601,7 @@ importers:
         version: 0.38.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@posthog/lemon-ui':
         specifier: '*'
-        version: 0.0.0(antd@5.26.0(date-fns@4.1.0)(luxon@3.7.2)(moment@2.29.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(kea-router@3.4.1(kea@4.0.0-pre.5(react@18.3.1)))(kea@4.0.0-pre.5(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 0.0.0(antd@5.26.0(date-fns@4.1.0)(luxon@3.7.2)(moment@2.29.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(kea-router@3.4.1(kea@4.0.0-pre.6(react@18.3.1)))(kea@4.0.0-pre.6(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@types/react':
         specifier: 18.3.27
         version: 18.3.27
@@ -3616,10 +3616,10 @@ importers:
         version: 7.3.0
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       react:
         specifier: 18.3.1
         version: 18.3.1
@@ -3629,7 +3629,7 @@ importers:
     devDependencies:
       kea-test-utils:
         specifier: 'catalog:'
-        version: 0.2.4(kea@4.0.0-pre.5(react@18.3.1))
+        version: 0.2.4(kea@4.0.0-pre.6(react@18.3.1))
 
   products/llm_analytics: {}
 
@@ -3691,19 +3691,19 @@ importers:
         version: 29.7.0(@types/node@25.8.0)(ts-node@10.9.1(@swc/core@1.15.18)(@types/node@25.8.0)(typescript@6.0.3))
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-forms:
         specifier: 'catalog:'
-        version: 3.2.0(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.2.0(kea@4.0.0-pre.6(react@18.3.1))
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-subscriptions:
         specifier: 'catalog:'
-        version: 3.0.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.0.1(kea@4.0.0-pre.6(react@18.3.1))
       papaparse:
         specifier: '*'
         version: 5.4.1
@@ -3734,7 +3734,7 @@ importers:
         version: 14.3.1(@types/react@18.3.27)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       kea-test-utils:
         specifier: 'catalog:'
-        version: 0.2.4(kea@4.0.0-pre.5(react@18.3.1))
+        version: 0.2.4(kea@4.0.0-pre.6(react@18.3.1))
 
   products/managed_migrations:
     dependencies:
@@ -3743,22 +3743,22 @@ importers:
         version: 0.38.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@posthog/lemon-ui':
         specifier: '*'
-        version: 0.0.0(antd@5.26.0(date-fns@4.1.0)(luxon@3.7.2)(moment@2.29.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(kea-router@3.4.1(kea@4.0.0-pre.5(react@18.3.1)))(kea@4.0.0-pre.5(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 0.0.0(antd@5.26.0(date-fns@4.1.0)(luxon@3.7.2)(moment@2.29.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(kea-router@3.4.1(kea@4.0.0-pre.6(react@18.3.1)))(kea@4.0.0-pre.6(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@types/react':
         specifier: 18.3.27
         version: 18.3.27
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-forms:
         specifier: 'catalog:'
-        version: 3.2.0(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.2.0(kea@4.0.0-pre.6(react@18.3.1))
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       react:
         specifier: 18.3.1
         version: 18.3.1
@@ -3790,20 +3790,20 @@ importers:
         version: 18.3.27
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       react:
         specifier: 18.3.1
         version: 18.3.1
     devDependencies:
       kea-test-utils:
         specifier: 'catalog:'
-        version: 0.2.4(kea@4.0.0-pre.5(react@18.3.1))
+        version: 0.2.4(kea@4.0.0-pre.6(react@18.3.1))
 
   products/mcp_store:
     dependencies:
@@ -3815,16 +3815,16 @@ importers:
         version: 18.3.27
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-forms:
         specifier: 'catalog:'
-        version: 3.2.0(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.2.0(kea@4.0.0-pre.6(react@18.3.1))
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       react:
         specifier: 18.3.1
         version: 18.3.1
@@ -3853,13 +3853,13 @@ importers:
         version: 2.1.1
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       posthog-js:
         specifier: 'catalog:'
         version: 1.401.0
@@ -3872,7 +3872,7 @@ importers:
     devDependencies:
       kea-test-utils:
         specifier: 'catalog:'
-        version: 0.2.4(kea@4.0.0-pre.5(react@18.3.1))
+        version: 0.2.4(kea@4.0.0-pre.6(react@18.3.1))
 
   products/notebooks:
     dependencies:
@@ -3890,13 +3890,13 @@ importers:
         version: 6.6.2
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       react:
         specifier: 18.3.1
         version: 18.3.1
@@ -3905,7 +3905,7 @@ importers:
     dependencies:
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
 
   products/persons:
     dependencies:
@@ -3923,13 +3923,13 @@ importers:
         version: 6.6.2
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       react:
         specifier: 18.3.1
         version: 18.3.1
@@ -3964,19 +3964,19 @@ importers:
         version: 3.0.6
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-forms:
         specifier: 'catalog:'
-        version: 3.2.0(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.2.0(kea@4.0.0-pre.6(react@18.3.1))
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-subscriptions:
         specifier: 'catalog:'
-        version: 3.0.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.0.1(kea@4.0.0-pre.6(react@18.3.1))
       marked:
         specifier: '*'
         version: 17.0.4
@@ -4004,7 +4004,7 @@ importers:
         version: 14.3.1(@types/react@18.3.27)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       kea-test-utils:
         specifier: 'catalog:'
-        version: 0.2.4(kea@4.0.0-pre.5(react@18.3.1))
+        version: 0.2.4(kea@4.0.0-pre.6(react@18.3.1))
       msw:
         specifier: '*'
         version: 2.14.6(@types/node@25.8.0)(typescript@6.0.3)
@@ -4028,13 +4028,13 @@ importers:
         version: 6.6.2
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       posthog-js:
         specifier: 'catalog:'
         version: 1.401.0
@@ -4069,13 +4069,13 @@ importers:
         version: 6.6.2
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       react:
         specifier: 18.3.1
         version: 18.3.1
@@ -4090,7 +4090,7 @@ importers:
         version: 0.38.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@posthog/lemon-ui':
         specifier: '*'
-        version: 0.0.0(antd@5.26.0(date-fns@4.1.0)(luxon@3.7.2)(moment@2.29.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(kea-router@3.4.1(kea@4.0.0-pre.5(react@18.3.1)))(kea@4.0.0-pre.5(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 0.0.0(antd@5.26.0(date-fns@4.1.0)(luxon@3.7.2)(moment@2.29.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(kea-router@3.4.1(kea@4.0.0-pre.6(react@18.3.1)))(kea@4.0.0-pre.6(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@posthog/quill-charts':
         specifier: workspace:*
         version: link:../../packages/quill/packages/charts
@@ -4105,16 +4105,16 @@ importers:
         version: 2.1.1
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-forms:
         specifier: 'catalog:'
-        version: 3.2.0(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.2.0(kea@4.0.0-pre.6(react@18.3.1))
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       lodash.uniqby:
         specifier: ^4.7.0
         version: 4.7.0
@@ -4130,7 +4130,7 @@ importers:
         version: 14.3.1(@types/react@18.3.27)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       kea-test-utils:
         specifier: 'catalog:'
-        version: 0.2.4(kea@4.0.0-pre.5(react@18.3.1))
+        version: 0.2.4(kea@4.0.0-pre.6(react@18.3.1))
 
   products/revenue_analytics:
     dependencies:
@@ -4151,16 +4151,16 @@ importers:
         version: 1.2.1
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-forms:
         specifier: 'catalog:'
-        version: 3.2.0(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.2.0(kea@4.0.0-pre.6(react@18.3.1))
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       react:
         specifier: 18.3.1
         version: 18.3.1
@@ -4175,13 +4175,13 @@ importers:
         version: 18.3.27
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       react:
         specifier: 18.3.1
         version: 18.3.1
@@ -4193,7 +4193,7 @@ importers:
         version: 18.3.27
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       react:
         specifier: 18.3.1
         version: 18.3.1
@@ -4208,13 +4208,13 @@ importers:
         version: 18.3.27
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       react:
         specifier: 18.3.1
         version: 18.3.1
@@ -4234,16 +4234,16 @@ importers:
         version: 2.1.1
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-forms:
         specifier: 'catalog:'
-        version: 3.2.0(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.2.0(kea@4.0.0-pre.6(react@18.3.1))
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       react:
         specifier: 18.3.1
         version: 18.3.1
@@ -4256,7 +4256,7 @@ importers:
         version: 10.4.6(@types/react-dom@18.3.7(@types/react@18.3.27))(@types/react@18.3.27)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@10.4.6(@testing-library/dom@10.4.0)(@types/react@18.3.27)(prettier@3.8.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@6.0.3)
       kea-test-utils:
         specifier: 'catalog:'
-        version: 0.2.4(kea@4.0.0-pre.5(react@18.3.1))
+        version: 0.2.4(kea@4.0.0-pre.6(react@18.3.1))
 
   products/slack_app: {}
 
@@ -4290,16 +4290,16 @@ importers:
         version: 18.3.7(@types/react@18.3.27)
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-forms:
         specifier: 'catalog:'
-        version: 3.2.0(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.2.0(kea@4.0.0-pre.6(react@18.3.1))
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       posthog-js:
         specifier: 'catalog:'
         version: 1.401.0
@@ -4315,7 +4315,7 @@ importers:
     devDependencies:
       kea-test-utils:
         specifier: 'catalog:'
-        version: 0.2.4(kea@4.0.0-pre.5(react@18.3.1))
+        version: 0.2.4(kea@4.0.0-pre.6(react@18.3.1))
 
   products/surveys:
     dependencies:
@@ -4333,13 +4333,13 @@ importers:
         version: 6.6.2
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       react:
         specifier: 18.3.1
         version: 18.3.1
@@ -4367,13 +4367,13 @@ importers:
         version: 1.2.1
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       react:
         specifier: 18.3.1
         version: 18.3.1
@@ -4383,7 +4383,7 @@ importers:
     devDependencies:
       kea-test-utils:
         specifier: 'catalog:'
-        version: 0.2.4(kea@4.0.0-pre.5(react@18.3.1))
+        version: 0.2.4(kea@4.0.0-pre.6(react@18.3.1))
 
   products/toolbar: {}
 
@@ -4409,16 +4409,16 @@ importers:
         version: 6.0.1
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-subscriptions:
         specifier: 'catalog:'
-        version: 3.0.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.0.1(kea@4.0.0-pre.6(react@18.3.1))
       posthog-js:
         specifier: 'catalog:'
         version: 1.401.0
@@ -4431,7 +4431,7 @@ importers:
     devDependencies:
       kea-test-utils:
         specifier: 'catalog:'
-        version: 0.2.4(kea@4.0.0-pre.5(react@18.3.1))
+        version: 0.2.4(kea@4.0.0-pre.6(react@18.3.1))
 
   products/user_interviews:
     dependencies:
@@ -4455,13 +4455,13 @@ importers:
         version: 30.0.5(esbuild-register@3.6.0(esbuild@0.28.1))
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       posthog-js:
         specifier: 'catalog:'
         version: 1.401.0
@@ -4491,13 +4491,13 @@ importers:
         version: 18.3.27
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       posthog-js:
         specifier: 'catalog:'
         version: 1.401.0
@@ -4507,7 +4507,7 @@ importers:
     devDependencies:
       kea-test-utils:
         specifier: 'catalog:'
-        version: 0.2.4(kea@4.0.0-pre.5(react@18.3.1))
+        version: 0.2.4(kea@4.0.0-pre.6(react@18.3.1))
 
   products/warehouse_sources: {}
 
@@ -4529,13 +4529,13 @@ importers:
         version: 6.6.2
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       react:
         specifier: 18.3.1
         version: 18.3.1
@@ -4547,7 +4547,7 @@ importers:
         version: 18.3.27
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       posthog-js:
         specifier: 'catalog:'
         version: 1.401.0
@@ -4557,7 +4557,7 @@ importers:
     devDependencies:
       kea-test-utils:
         specifier: 'catalog:'
-        version: 0.2.4(kea@4.0.0-pre.5(react@18.3.1))
+        version: 0.2.4(kea@4.0.0-pre.6(react@18.3.1))
 
   products/workflows:
     dependencies:
@@ -4587,19 +4587,19 @@ importers:
         version: 6.6.2
       kea:
         specifier: 'catalog:'
-        version: 4.0.0-pre.5(react@18.3.1)
+        version: 4.0.0-pre.6(react@18.3.1)
       kea-forms:
         specifier: 'catalog:'
-        version: 3.2.0(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.2.0(kea@4.0.0-pre.6(react@18.3.1))
       kea-loaders:
         specifier: 'catalog:'
-        version: 3.1.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.1.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-router:
         specifier: 'catalog:'
-        version: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       kea-subscriptions:
         specifier: 'catalog:'
-        version: 3.0.1(kea@4.0.0-pre.5(react@18.3.1))
+        version: 3.0.1(kea@4.0.0-pre.6(react@18.3.1))
       posthog-js:
         specifier: 'catalog:'
         version: 1.401.0
@@ -4624,7 +4624,7 @@ importers:
         version: 14.3.1(@types/react@18.3.27)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       kea-test-utils:
         specifier: 'catalog:'
-        version: 0.2.4(kea@4.0.0-pre.5(react@18.3.1))
+        version: 0.2.4(kea@4.0.0-pre.6(react@18.3.1))
 
   rust/common/hogvm/node: {}
 
@@ -17762,8 +17762,8 @@ packages:
     peerDependencies:
       kea: '>= 3'
 
-  kea-typegen@3.8.2:
-    resolution: {integrity: sha512-EiRWMT2c61p+uJlerEgKcZs7bLrUTku03sVceSAZXb0lZr/8vqios3UcnnP3H3Xag/vtb8RFsPoxgme8O4Xycg==}
+  kea-typegen@3.8.3:
+    resolution: {integrity: sha512-LA+D1Ig7ZYo6eENpbzzvEHw8Dd0kJL9Nv2GNGVDJ41IuA5vp3rvMCwfjM8gX7RT/oTXE8kjiyHahITbFK4c90Q==}
     hasBin: true
     peerDependencies:
       typescript: 6.0.3
@@ -17778,8 +17778,8 @@ packages:
     peerDependencies:
       kea: '>= 3'
 
-  kea@4.0.0-pre.5:
-    resolution: {integrity: sha512-GMF6Bdfe7qt3xk7u3mFhhjrwt41neTlmG8JDXJxGyCojHRU8AuEtZ7Ac+x81JoqvCusHHvDVhvrdF/zYT0cn7Q==}
+  kea@4.0.0-pre.6:
+    resolution: {integrity: sha512-ADk9cT93zSHY+HF6YOKXOtPVC3LlndYpwYOFzoBqBOEpuXdbQYfdDTUkzfVq6YjyaKFdlOorQGB2QJz/Q4BCBg==}
     peerDependencies:
       react: 18.3.1
 
@@ -20750,9 +20750,6 @@ packages:
   requires-port@1.0.0:
     resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==}
 
-  reselect@5.1.1:
-    resolution: {integrity: sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w==}
-
   reselect@5.2.0:
     resolution: {integrity: sha512-AgZ3UOZm3YndfrJ4OYjgrT7bmCm/1iqkjvEfH/oYjzh6PD2qw4QuT3jjnXIrpdt4MTpMXclMT3lXbmRY+XRakw==}
 
@@ -30044,11 +30041,11 @@ snapshots:
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
 
-  '@posthog/lemon-ui@0.0.0(antd@5.26.0(date-fns@4.1.0)(luxon@3.7.2)(moment@2.29.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(kea-router@3.4.1(kea@4.0.0-pre.5(react@18.3.1)))(kea@4.0.0-pre.5(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@posthog/lemon-ui@0.0.0(antd@5.26.0(date-fns@4.1.0)(luxon@3.7.2)(moment@2.29.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(kea-router@3.4.1(kea@4.0.0-pre.6(react@18.3.1)))(kea@4.0.0-pre.6(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
       antd: 5.26.0(date-fns@4.1.0)(luxon@3.7.2)(moment@2.29.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      kea: 4.0.0-pre.5(react@18.3.1)
-      kea-router: 3.4.1(kea@4.0.0-pre.5(react@18.3.1))
+      kea: 4.0.0-pre.6(react@18.3.1)
+      kea-router: 3.4.1(kea@4.0.0-pre.6(react@18.3.1))
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
 
@@ -39871,33 +39868,33 @@ snapshots:
 
   kdbush@4.0.2: {}
 
-  kea-forms@3.2.0(kea@4.0.0-pre.5(react@18.3.1)):
+  kea-forms@3.2.0(kea@4.0.0-pre.6(react@18.3.1)):
     dependencies:
-      kea: 4.0.0-pre.5(react@18.3.1)
+      kea: 4.0.0-pre.6(react@18.3.1)
 
-  kea-loaders@3.1.1(kea@4.0.0-pre.5(react@18.3.1)):
+  kea-loaders@3.1.1(kea@4.0.0-pre.6(react@18.3.1)):
     dependencies:
-      kea: 4.0.0-pre.5(react@18.3.1)
+      kea: 4.0.0-pre.6(react@18.3.1)
 
-  kea-localstorage@3.1.0(kea@4.0.0-pre.5(react@18.3.1)):
+  kea-localstorage@3.1.0(kea@4.0.0-pre.6(react@18.3.1)):
     dependencies:
-      kea: 4.0.0-pre.5(react@18.3.1)
+      kea: 4.0.0-pre.6(react@18.3.1)
 
-  kea-router@3.4.1(kea@4.0.0-pre.5(react@18.3.1)):
+  kea-router@3.4.1(kea@4.0.0-pre.6(react@18.3.1)):
     dependencies:
-      kea: 4.0.0-pre.5(react@18.3.1)
+      kea: 4.0.0-pre.6(react@18.3.1)
       url-pattern: 1.0.3
 
-  kea-subscriptions@3.0.1(kea@4.0.0-pre.5(react@18.3.1)):
+  kea-subscriptions@3.0.1(kea@4.0.0-pre.6(react@18.3.1)):
     dependencies:
-      kea: 4.0.0-pre.5(react@18.3.1)
+      kea: 4.0.0-pre.6(react@18.3.1)
 
-  kea-test-utils@0.2.4(kea@4.0.0-pre.5(react@18.3.1)):
+  kea-test-utils@0.2.4(kea@4.0.0-pre.6(react@18.3.1)):
     dependencies:
-      kea: 4.0.0-pre.5(react@18.3.1)
-      kea-waitfor: 0.2.1(kea@4.0.0-pre.5(react@18.3.1))
+      kea: 4.0.0-pre.6(react@18.3.1)
+      kea-waitfor: 0.2.1(kea@4.0.0-pre.6(react@18.3.1))
 
-  kea-typegen@3.8.2(typescript@6.0.3):
+  kea-typegen@3.8.3(typescript@6.0.3):
     dependencies:
       '@babel/core': 7.29.0
       '@babel/preset-env': 7.23.5(@babel/core@7.29.0)
@@ -39910,19 +39907,19 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  kea-waitfor@0.2.1(kea@4.0.0-pre.5(react@18.3.1)):
+  kea-waitfor@0.2.1(kea@4.0.0-pre.6(react@18.3.1)):
     dependencies:
-      kea: 4.0.0-pre.5(react@18.3.1)
+      kea: 4.0.0-pre.6(react@18.3.1)
 
-  kea-window-values@3.0.1(kea@4.0.0-pre.5(react@18.3.1)):
+  kea-window-values@3.0.1(kea@4.0.0-pre.6(react@18.3.1)):
     dependencies:
-      kea: 4.0.0-pre.5(react@18.3.1)
+      kea: 4.0.0-pre.6(react@18.3.1)
 
-  kea@4.0.0-pre.5(react@18.3.1):
+  kea@4.0.0-pre.6(react@18.3.1):
     dependencies:
       react: 18.3.1
       redux: 5.0.1
-      reselect: 5.1.1
+      reselect: 5.2.0
       use-sync-external-store: 1.6.0(react@18.3.1)
 
   keyv@4.5.4:
@@ -43682,8 +43679,6 @@ snapshots:
 
   requires-port@1.0.0: {}
 
-  reselect@5.1.1: {}
-
   reselect@5.2.0: {}
 
   resize-observer-polyfill@1.5.1: {}
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 8d78ea57d538..e031c4af53dc 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -33,7 +33,7 @@ trustPolicy: no-downgrade
 
 catalog:
     # Kea ecosystem - state management
-    kea: ^4.0.0-pre.5
+    kea: ^4.0.0-pre.6
     kea-forms: ^3.2.0
     kea-loaders: ^3.1.1
     kea-localstorage: ^3.1.0
@@ -88,7 +88,7 @@ minimumReleaseAgeExclude:
     - posthog-js-lite
     - posthog-node
     - '@posthog/*'
-    - kea@4.0.0-pre.5
+    - kea@4.0.0-pre.6
     - '@earendil-works/*'
     - typebox
     - chartjs-plugin-stacked100@1.7.1
diff --git a/products/actions/frontend/logics/actionEditLogic.tsx b/products/actions/frontend/logics/actionEditLogic.tsx
index 8593e6f5ffd1..9001371ca744 100644
--- a/products/actions/frontend/logics/actionEditLogic.tsx
+++ b/products/actions/frontend/logics/actionEditLogic.tsx
@@ -1,5 +1,6 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { beforeUnload, router, urlToAction } from 'kea-router'
 import { CombinedLocation } from 'kea-router/lib/utils'
@@ -19,7 +20,6 @@ import { ActionStepType, ActionType } from '~/types'
 
 import type { ActionReferenceApi } from '../generated/api.schemas'
 import { deleteActionWithWarning } from '../utils/deleteAction'
-import type { actionEditLogicType } from './actionEditLogicType'
 import { actionLogic } from './actionLogic'
 
 export const REFERENCE_TYPE_LABELS: Record<string, string> = {
@@ -43,6 +43,162 @@ export const DEFAULT_ACTION_STEP: ActionStepType = {
     href_matching: 'contains',
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface actionEditLogicValues {
+    action: ActionType
+    actionAllErrors: Record<string, any>
+    actionChanged: boolean
+    actionErrors: DeepPartialMap<ActionType, ValidationErrorType>
+    actionHasErrors: boolean
+    actionLoading: boolean
+    actionManualErrors: Record<string, any>
+    actionTouched: boolean
+    actionTouches: Record<string, boolean>
+    actionValidationErrors: DeepPartialMap<ActionType, ValidationErrorType>
+    analyticsReferences: ActionReferenceApi[]
+    createNew: boolean
+    filteredReferences: ActionReferenceApi[]
+    hasCohortFilters: boolean
+    isActionSubmitting: boolean
+    isActionValid: boolean
+    originalAction: ActionType | null
+    originalActionHasCohortFilters: boolean
+    references: ActionReferenceApi[]
+    referencesLoading: boolean
+    referencesSearch: string
+    showActionErrors: boolean
+    showCohortDisablesFunctionsWarning: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface actionEditLogicActions {
+    loadActions: () => any // actionsModel
+    loadEventDefinitions: (url?: string | null | undefined) => {
+        url: string | null
+    } // eventDefinitionsTableLogic
+    loadTags: () => any // tagsModel
+    actionAlreadyExists: (actionId: number | null) => {
+        actionId: number | null
+    }
+    deleteAction: () => {
+        value: true
+    }
+    loadReferences: () => any
+    loadReferencesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadReferencesSuccess: (
+        references: ActionReferenceApi[],
+        payload?: any
+    ) => {
+        references: ActionReferenceApi[]
+        payload?: any
+    }
+    migrateToHogFunction: () => {
+        value: true
+    }
+    resetAction: (values?: ActionType) => {
+        values?: ActionType
+    }
+    setAction: (
+        action: Partial<ActionType>,
+        options?: SetActionProps
+    ) => {
+        action: Partial<ActionType>
+        options: SetActionProps
+    }
+    setActionFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    setActionManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setActionSuccess: (
+        action: ActionType,
+        payload?: {
+            action: Partial<ActionType>
+            options: SetActionProps
+        }
+    ) => {
+        action: ActionType
+        payload?: {
+            action: Partial<ActionType>
+            options: SetActionProps
+        }
+    }
+    setActionValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setActionValues: (values: DeepPartial<ActionType>) => {
+        values: DeepPartial<ActionType>
+    }
+    setCreateNew: (createNew: boolean) => {
+        createNew: boolean
+    }
+    setOriginalAction: (action: ActionType | null) => {
+        action: ActionType | null
+    }
+    setReferencesSearch: (search: string) => {
+        search: string
+    }
+    submitAction: () => {
+        value: boolean
+    }
+    submitActionFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitActionRequest: (action: ActionType) => {
+        action: ActionType
+    }
+    submitActionSuccess: (action: ActionType) => {
+        action: ActionType
+    }
+    touchActionField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface actionEditLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        hasCohortFilters: (action: ActionType) => boolean
+        originalActionHasCohortFilters: (originalAction: ActionType | null) => boolean
+        showCohortDisablesFunctionsWarning: (
+            hasCohortFilters: boolean,
+            originalActionHasCohortFilters: boolean
+        ) => boolean
+        analyticsReferences: (references: ActionReferenceApi[]) => ActionReferenceApi[]
+        filteredReferences: (
+            analyticsReferences: ActionReferenceApi[],
+            referencesSearch: string
+        ) => ActionReferenceApi[]
+    }
+}
+
+export type actionEditLogicType = MakeLogicType<
+    actionEditLogicValues,
+    actionEditLogicActions,
+    ActionEditLogicProps,
+    actionEditLogicMeta
+>
+
 export const actionEditLogic = kea<actionEditLogicType>([
     path((key) => ['scenes', 'actions', 'actionEditLogic', key]),
     props({} as ActionEditLogicProps),
@@ -178,19 +334,20 @@ export const actionEditLogic = kea<actionEditLogicType>([
     selectors({
         hasCohortFilters: [
             (s) => [s.action],
-            (action) =>
+            (action: ActionType) =>
                 action?.steps?.some((step: ActionStepType) => step.properties?.find((p: any) => p.type === 'cohort')) ??
                 false,
         ],
         originalActionHasCohortFilters: [
             (s) => [s.originalAction],
-            (action) =>
+            (action: ActionType | null) =>
                 action?.steps?.some((step: ActionStepType) => step.properties?.find((p: any) => p.type === 'cohort')) ??
                 false,
         ],
         showCohortDisablesFunctionsWarning: [
             (s) => [s.hasCohortFilters, s.originalActionHasCohortFilters],
-            (hasCohortFilters, originalActionHasCohortFilters) => hasCohortFilters && !originalActionHasCohortFilters,
+            (hasCohortFilters: boolean, originalActionHasCohortFilters: boolean) =>
+                hasCohortFilters && !originalActionHasCohortFilters,
         ],
     }),
 
diff --git a/products/actions/frontend/logics/actionLogic.ts b/products/actions/frontend/logics/actionLogic.ts
index d497720693a0..dca779a120e7 100644
--- a/products/actions/frontend/logics/actionLogic.ts
+++ b/products/actions/frontend/logics/actionLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -10,13 +10,87 @@ import { urls } from 'scenes/urls'
 import { SIDE_PANEL_CONTEXT_KEY, SidePanelSceneContext } from '~/layout/navigation-3000/sidepanel/types'
 import { ActionStepType, ActionType, ActivityScope, Breadcrumb, HogFunctionType, ProjectTreeRef } from '~/types'
 
+import type { FeatureFlagsSet } from '../../../../frontend/src/lib/logic/featureFlagLogic'
 import { actionEditLogic } from './actionEditLogic'
-import type { actionLogicType } from './actionLogicType'
 
 export interface ActionLogicProps {
     id: ActionType['id']
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface actionLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    action: ActionType | null
+    actionLoading: boolean
+    breadcrumbs: Breadcrumb[]
+    hasCohortFilters: boolean
+    isComplete: boolean
+    matchingHogFunctions: HogFunctionType[] | null
+    matchingHogFunctionsLoading: boolean
+    pollTimeout: number | null
+    projectTreeRef: ProjectTreeRef
+    sidePanelContext: SidePanelSceneContext | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface actionLogicActions {
+    checkIsFinished: (action: any) => {
+        action: any
+    }
+    loadAction: () => any
+    loadActionFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadActionSuccess: (
+        action: ActionType,
+        payload?: any
+    ) => {
+        action: ActionType
+        payload?: any
+    }
+    loadMatchingHogFunctions: () => any
+    loadMatchingHogFunctionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadMatchingHogFunctionsSuccess: (
+        matchingHogFunctions: HogFunctionType[],
+        payload?: any
+    ) => {
+        matchingHogFunctions: HogFunctionType[]
+        payload?: any
+    }
+    setIsComplete: (isComplete: any) => {
+        isComplete: any
+    }
+    setPollTimeout: (pollTimeout: any) => {
+        pollTimeout: any
+    }
+    updateAction: (action: Partial<ActionType>) => {
+        action: Partial<ActionType>
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface actionLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        projectTreeRef: (id: number) => ProjectTreeRef
+        hasCohortFilters: (action: ActionType | null) => boolean
+        breadcrumbs: (action: ActionType | null, arg: string | null) => Breadcrumb[]
+        sidePanelContext: (action: ActionType | null) => SidePanelSceneContext | null
+    }
+}
+
+export type actionLogicType = MakeLogicType<actionLogicValues, actionLogicActions, ActionLogicProps, actionLogicMeta>
+
 export const actionLogic = kea<actionLogicType>([
     props({} as ActionLogicProps),
     key((props) => `${props.id || 'new'}`),
@@ -76,10 +150,10 @@ export const actionLogic = kea<actionLogicType>([
         ],
     })),
     selectors({
-        projectTreeRef: [(_, p) => [p.id], (id): ProjectTreeRef => ({ type: 'action', ref: String(id) })],
+        projectTreeRef: [(_, p) => [p.id], (id: number): ProjectTreeRef => ({ type: 'action', ref: String(id) })],
         hasCohortFilters: [
             (s) => [s.action],
-            (action) =>
+            (action: ActionType | null) =>
                 action?.steps?.some((step: ActionStepType) => step.properties?.find((p: any) => p.type === 'cohort')) ??
                 false,
         ],
@@ -89,7 +163,7 @@ export const actionLogic = kea<actionLogicType>([
                 s.action,
                 (state, props) => actionEditLogic.findMounted({ id: props?.id })?.selectors.action(state).name || null,
             ],
-            (action, inProgressName): Breadcrumb[] => [
+            (action: ActionType | null, inProgressName: string | null): Breadcrumb[] => [
                 {
                     key: DataManagementTab.Actions,
                     name: 'Actions',
@@ -107,7 +181,7 @@ export const actionLogic = kea<actionLogicType>([
 
         [SIDE_PANEL_CONTEXT_KEY]: [
             (s) => [s.action],
-            (action): SidePanelSceneContext | null => {
+            (action: ActionType | null): SidePanelSceneContext | null => {
                 return action?.id
                     ? {
                           activity_scope: ActivityScope.ACTION,
diff --git a/products/actions/frontend/logics/actionsLogic.ts b/products/actions/frontend/logics/actionsLogic.ts
index f92a8acb12c9..3f5301d3db67 100644
--- a/products/actions/frontend/logics/actionsLogic.ts
+++ b/products/actions/frontend/logics/actionsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, urlToAction } from 'kea-router'
 
@@ -13,7 +13,7 @@ import { urls } from 'scenes/urls'
 import { SIDE_PANEL_CONTEXT_KEY, SidePanelSceneContext } from '~/layout/navigation-3000/sidepanel/types'
 import { ActionType, ActivityScope, Breadcrumb } from '~/types'
 
-import type { actionsLogicType } from './actionsLogicType'
+import type { FeatureFlagsSet } from '../../../../frontend/src/lib/logic/featureFlagLogic'
 
 export const ACTIONS_PER_PAGE = 50
 
@@ -31,6 +31,129 @@ const DEFAULT_FILTERS: ActionsFilters = {
     ordering: '-created_by',
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface actionsLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    actionCount: number
+    actionsList: ActionType[]
+    actionsResponse: ActionsResponse
+    actionsResponseLoading: boolean
+    apiParams: string
+    breadcrumbs: Breadcrumb[]
+    filters: ActionsFilters
+    hasActiveFilters: boolean
+    page: number
+    searchTerm: string
+    shouldShowEmptyState: boolean
+    sidePanelContext: SidePanelSceneContext
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface actionsLogicActions {
+    loadActions: () => any
+    loadActionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadActionsSuccess: (
+        actionsResponse: {
+            count: number
+            results: ActionType[]
+        },
+        payload?: any
+    ) => {
+        actionsResponse: {
+            count: number
+            results: ActionType[]
+        }
+        payload?: any
+    }
+    pinAction: (action: ActionType) => ActionType
+    pinActionFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    pinActionSuccess: (
+        actionsResponse: {
+            count: number
+            next?: string | null | undefined
+            previous?: string | null | undefined
+            results: ActionType[]
+        },
+        payload?: ActionType
+    ) => {
+        actionsResponse: {
+            count: number
+            next?: string | null | undefined
+            previous?: string | null | undefined
+            results: ActionType[]
+        }
+        payload?: ActionType
+    }
+    setFilters: (filters: Partial<ActionsFilters>) => {
+        filters: Partial<ActionsFilters>
+    }
+    setPage: (page: number) => {
+        page: number
+    }
+    setSearchTerm: (searchTerm: string) => {
+        searchTerm: string
+    }
+    unpinAction: (action: ActionType) => ActionType
+    unpinActionFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    unpinActionSuccess: (
+        actionsResponse: {
+            count: number
+            next?: string | null | undefined
+            previous?: string | null | undefined
+            results: ActionType[]
+        },
+        payload?: ActionType
+    ) => {
+        actionsResponse: {
+            count: number
+            next?: string | null | undefined
+            previous?: string | null | undefined
+            results: ActionType[]
+        }
+        payload?: ActionType
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface actionsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        actionsList: (actionsResponse: ActionsResponse) => ActionType[]
+        actionCount: (actionsResponse: ActionsResponse) => number
+        apiParams: (searchTerm: string, filters: ActionsFilters, page: number, featureFlags: FeatureFlagsSet) => string
+        hasActiveFilters: (searchTerm: string, filters: ActionsFilters) => boolean
+        shouldShowEmptyState: (
+            actionCount: number,
+            actionsResponseLoading: boolean,
+            hasActiveFilters: boolean
+        ) => boolean
+    }
+}
+
+export type actionsLogicType = MakeLogicType<
+    actionsLogicValues,
+    actionsLogicActions,
+    Record<string, any>,
+    actionsLogicMeta
+>
+
 export const actionsLogic = kea<actionsLogicType>([
     path(['products', 'actions', 'actionsLogic']),
     connect(() => ({
@@ -99,11 +222,16 @@ export const actionsLogic = kea<actionsLogicType>([
         ],
     })),
     selectors({
-        actionsList: [(s) => [s.actionsResponse], (response): ActionType[] => response.results],
-        actionCount: [(s) => [s.actionsResponse], (response): number => response.count],
+        actionsList: [(s) => [s.actionsResponse], (response: ActionsResponse): ActionType[] => response.results],
+        actionCount: [(s) => [s.actionsResponse], (response: ActionsResponse): number => response.count],
         apiParams: [
             (s) => [s.searchTerm, s.filters, s.page, s.featureFlags],
-            (searchTerm, filters, page, featureFlags): string => {
+            (
+                searchTerm: string,
+                filters: ActionsFilters,
+                page: number,
+                featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet
+            ): string => {
                 const params: Record<string, any> = {
                     limit: ACTIONS_PER_PAGE,
                     offset: (page - 1) * ACTIONS_PER_PAGE,
@@ -127,7 +255,7 @@ export const actionsLogic = kea<actionsLogicType>([
         ],
         hasActiveFilters: [
             (s) => [s.searchTerm, s.filters],
-            (searchTerm, filters): boolean =>
+            (searchTerm: string, filters: ActionsFilters): boolean =>
                 !!searchTerm.trim() || filters.createdBy.length > 0 || filters.tags.length > 0,
         ],
         shouldShowEmptyState: [
diff --git a/products/ai_gateway/frontend/aiGatewayLogic.ts b/products/ai_gateway/frontend/aiGatewayLogic.ts
index 5f28ad031c67..8e61b65b6155 100644
--- a/products/ai_gateway/frontend/aiGatewayLogic.ts
+++ b/products/ai_gateway/frontend/aiGatewayLogic.ts
@@ -1,11 +1,10 @@
-import { actions, afterMount, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
 import { humanFriendlyCurrency } from 'lib/utils/numbers'
 import { teamLogic } from 'scenes/teamLogic'
 
-import type { aiGatewayLogicType } from './aiGatewayLogicType'
 import {
     buildSpendChartData,
     fetchGatewaySpendByDay,
@@ -18,6 +17,98 @@ import {
 export type EndpointTab = 'typescript' | 'python' | 'curl'
 export type EndpointProvider = 'openai' | 'anthropic'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiGatewayLogicValues {
+    endpointProvider: EndpointProvider
+    endpointTab: EndpointTab
+    hasUsage: boolean
+    isTopUpModalOpen: boolean
+    modelUsage: GatewayModelUsage[]
+    modelUsageLoading: boolean
+    spendChart: {
+        data: number[]
+        labels: string[]
+    }
+    spendSeries: GatewaySpendPoint[]
+    spendSeriesLoading: boolean
+    topUpAmountUsd: number
+    usage: GatewayUsage
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiGatewayLogicActions {
+    closeTopUpModal: () => {
+        value: true
+    }
+    confirmTopUp: () => {
+        value: true
+    }
+    loadModelUsage: () => any
+    loadModelUsageFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadModelUsageSuccess: (
+        modelUsage: GatewayModelUsage[],
+        payload?: any
+    ) => {
+        modelUsage: GatewayModelUsage[]
+        payload?: any
+    }
+    loadSpendSeries: () => any
+    loadSpendSeriesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSpendSeriesSuccess: (
+        spendSeries: GatewaySpendPoint[],
+        payload?: any
+    ) => {
+        spendSeries: GatewaySpendPoint[]
+        payload?: any
+    }
+    openTopUpModal: () => {
+        value: true
+    }
+    setEndpointProvider: (provider: EndpointProvider) => {
+        provider: EndpointProvider
+    }
+    setEndpointTab: (tab: EndpointTab) => {
+        tab: EndpointTab
+    }
+    setTopUpAmount: (amountUsd: number) => {
+        amountUsd: number
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiGatewayLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        usage: (modelUsage: GatewayModelUsage[]) => GatewayUsage
+        spendChart: (
+            spendSeries: GatewaySpendPoint[],
+            timezone: string
+        ) => {
+            data: number[]
+            labels: string[]
+        }
+        hasUsage: (modelUsage: GatewayModelUsage[]) => boolean
+    }
+}
+
+export type aiGatewayLogicType = MakeLogicType<
+    aiGatewayLogicValues,
+    aiGatewayLogicActions,
+    Record<string, any>,
+    aiGatewayLogicMeta
+>
+
 export const aiGatewayLogic = kea<aiGatewayLogicType>([
     path(['products', 'ai_gateway', 'frontend', 'aiGatewayLogic']),
     actions({
@@ -51,7 +142,7 @@ export const aiGatewayLogic = kea<aiGatewayLogicType>([
     selectors({
         usage: [
             (s) => [s.modelUsage],
-            (modelUsage): GatewayUsage =>
+            (modelUsage: GatewayModelUsage[]): GatewayUsage =>
                 modelUsage.reduce(
                     (acc, model) => ({
                         requests: acc.requests + model.requests,
@@ -64,9 +155,10 @@ export const aiGatewayLogic = kea<aiGatewayLogicType>([
         ],
         spendChart: [
             (s) => [s.spendSeries, teamLogic.selectors.timezone],
-            (spendSeries, timezone): { data: number[]; labels: string[] } => buildSpendChartData(spendSeries, timezone),
+            (spendSeries: GatewaySpendPoint[], timezone: string): { data: number[]; labels: string[] } =>
+                buildSpendChartData(spendSeries, timezone),
         ],
-        hasUsage: [(s) => [s.modelUsage], (modelUsage): boolean => modelUsage.length > 0],
+        hasUsage: [(s) => [s.modelUsage], (modelUsage: GatewayModelUsage[]): boolean => modelUsage.length > 0],
     }),
     listeners(({ values, actions }) => ({
         confirmTopUp: () => {
diff --git a/products/ai_observability/frontend/ConversationDisplay/messageActionsMenuLogic.ts b/products/ai_observability/frontend/ConversationDisplay/messageActionsMenuLogic.ts
index 41d53508aea5..8f96dd00a6d1 100644
--- a/products/ai_observability/frontend/ConversationDisplay/messageActionsMenuLogic.ts
+++ b/products/ai_observability/frontend/ConversationDisplay/messageActionsMenuLogic.ts
@@ -1,11 +1,10 @@
-import { actions, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
 import { organizationLogic } from 'scenes/organizationLogic'
 
 import supportedLanguagesJson from '../../shared/supported_languages.json'
-import type { messageActionsMenuLogicType } from './messageActionsMenuLogicType'
 
 const STORAGE_KEY = 'posthog-translate-language'
 export const MAX_TRANSLATE_LENGTH = 10000
@@ -52,6 +51,81 @@ export interface MessageActionsMenuLogicProps {
     content: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface messageActionsMenuLogicValues {
+    content: any
+    currentLanguageLabel: string
+    dataProcessingAccepted: boolean
+    isTooLong: boolean
+    showConsentPopover: boolean
+    showTranslatePopover: boolean
+    targetLanguage: LanguageCode
+    textToTranslate: any
+    translatedWithLanguage: LanguageCode | null
+    translation: {
+        targetLanguage: LanguageCode
+        translation: string
+    } | null
+    translationError: string | null
+    translationLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface messageActionsMenuLogicActions {
+    resetTranslation: () => {
+        value: true
+    }
+    setShowConsentPopover: (show: boolean) => {
+        show: boolean
+    }
+    setShowTranslatePopover: (show: boolean) => {
+        show: boolean
+    }
+    setTargetLanguage: (language: LanguageCode) => {
+        language: string
+    }
+    translate: () => any
+    translateFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    translateSuccess: (
+        translation: {
+            targetLanguage: string
+            translation: string
+        },
+        payload?: any
+    ) => {
+        translation: {
+            targetLanguage: string
+            translation: string
+        }
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface messageActionsMenuLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        isTooLong: (content: any) => boolean
+        textToTranslate: (content: any, isTooLong: boolean) => any
+        content: (arg: any) => any
+        currentLanguageLabel: (targetLanguage: string) => string
+        dataProcessingAccepted: (currentOrganization: null | import('~/types').OrganizationType) => boolean
+    }
+}
+
+export type messageActionsMenuLogicType = MakeLogicType<
+    messageActionsMenuLogicValues,
+    messageActionsMenuLogicActions,
+    MessageActionsMenuLogicProps,
+    messageActionsMenuLogicMeta
+>
+
 export const messageActionsMenuLogic = kea<messageActionsMenuLogicType>([
     path(['products', 'ai_observability', 'frontend', 'ConversationDisplay', 'messageActionsMenuLogic']),
     props({} as MessageActionsMenuLogicProps),
@@ -106,16 +180,18 @@ export const messageActionsMenuLogic = kea<messageActionsMenuLogicType>([
         isTooLong: [(s) => [s.content], (content) => content.length > MAX_TRANSLATE_LENGTH],
         textToTranslate: [
             (s) => [s.content, s.isTooLong],
-            (content, isTooLong) => (isTooLong ? content.substring(0, MAX_TRANSLATE_LENGTH) : content),
+            (content, isTooLong: boolean) => (isTooLong ? content.substring(0, MAX_TRANSLATE_LENGTH) : content),
         ],
         content: [() => [(_, props) => props.content], (content) => content],
         currentLanguageLabel: [
             (s) => [s.targetLanguage],
-            (targetLanguage) => SUPPORTED_LANGUAGES.find((lang) => lang.value === targetLanguage)?.label || 'English',
+            (targetLanguage: LanguageCode) =>
+                SUPPORTED_LANGUAGES.find((lang) => lang.value === targetLanguage)?.label || 'English',
         ],
         dataProcessingAccepted: [
             () => [organizationLogic.selectors.currentOrganization],
-            (currentOrganization): boolean => !!currentOrganization?.is_ai_data_processing_approved,
+            (currentOrganization: null | import('~/types').OrganizationType): boolean =>
+                !!currentOrganization?.is_ai_data_processing_approved,
         ],
     }),
     loaders(({ values }) => ({
diff --git a/products/ai_observability/frontend/aiObservabilityAIDataLogic.ts b/products/ai_observability/frontend/aiObservabilityAIDataLogic.ts
index 7e2729e09d1b..98032e280409 100644
--- a/products/ai_observability/frontend/aiObservabilityAIDataLogic.ts
+++ b/products/ai_observability/frontend/aiObservabilityAIDataLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -7,7 +7,6 @@ import { dayjs } from 'lib/dayjs'
 import { ProductKey } from '~/queries/schema/schema-general'
 import { hogql } from '~/queries/utils'
 
-import type { aiObservabilityAIDataLogicType } from './aiObservabilityAIDataLogicType'
 import { parsePartialJSON } from './utils'
 
 const AI_DATA_QUERY_TAGS = {
@@ -216,6 +215,68 @@ async function loadAIDataAsync(params: LoadAIDataParams): Promise<AIData> {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilityAIDataLogicValues {
+    aiDataCache: Record<string, AIData>
+    aiDataForEvent:
+        | (AIData & {
+              eventId: string
+          })
+        | null
+    aiDataForEventLoading: boolean
+    isEventLoading: (eventId: string) => boolean
+    loadingEventIds: Set<string>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilityAIDataLogicActions {
+    clearAIDataForEvent: (eventId: string) => {
+        eventId: string
+    }
+    clearAllAIData: () => {
+        value: true
+    }
+    loadAIDataForEvent: (params: LoadAIDataParams) => LoadAIDataParams
+    loadAIDataForEventFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAIDataForEventSuccess: (
+        aiDataForEvent: {
+            eventId: string
+            input: unknown
+            output: unknown
+            tools: unknown
+        },
+        payload?: LoadAIDataParams
+    ) => {
+        aiDataForEvent: {
+            eventId: string
+            input: unknown
+            output: unknown
+            tools: unknown
+        }
+        payload?: LoadAIDataParams
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilityAIDataLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        isEventLoading: (loadingEventIds: Set<string>) => (eventId: string) => boolean
+    }
+}
+
+export type aiObservabilityAIDataLogicType = MakeLogicType<
+    aiObservabilityAIDataLogicValues,
+    aiObservabilityAIDataLogicActions,
+    Record<string, any>,
+    aiObservabilityAIDataLogicMeta
+>
+
 export const aiObservabilityAIDataLogic = kea<aiObservabilityAIDataLogicType>([
     path(['products', 'ai_observability', 'frontend', 'aiObservabilityAIDataLogic']),
 
@@ -270,7 +331,7 @@ export const aiObservabilityAIDataLogic = kea<aiObservabilityAIDataLogicType>([
     selectors({
         isEventLoading: [
             (s) => [s.loadingEventIds],
-            (loadingEventIds): ((eventId: string) => boolean) => {
+            (loadingEventIds: Set<string>): ((eventId: string) => boolean) => {
                 return (eventId: string) => loadingEventIds.has(eventId)
             },
         ],
diff --git a/products/ai_observability/frontend/aiObservabilitySessionDataLogic.ts b/products/ai_observability/frontend/aiObservabilitySessionDataLogic.ts
index 89e96cceb5a6..c961cbecac2c 100644
--- a/products/ai_observability/frontend/aiObservabilitySessionDataLogic.ts
+++ b/products/ai_observability/frontend/aiObservabilitySessionDataLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { subscriptions } from 'kea-subscriptions'
 
 import api from 'lib/api'
@@ -18,7 +18,20 @@ import {
 } from '~/queries/schema/schema-general'
 import { InsightLogicProps } from '~/types'
 
-import type { aiObservabilitySessionDataLogicType } from './aiObservabilitySessionDataLogicType'
+import type {
+    ErrorTrackingQueryResponse,
+    HogQLAutocompleteResponse,
+    HogQLMetadataResponse,
+    HogQLQueryResponse,
+    HogQueryResponse,
+    LogAttributesQueryResponse,
+    LogValuesQueryResponse,
+    MetricsQueryResponse,
+    SessionsQueryResponse,
+    TraceSpansAggregationQueryResponse,
+    TraceSpansAttributeBreakdownQueryResponse,
+    TraceSpansQueryResponse,
+} from '../../../frontend/src/queries/schema/schema-general'
 import { aiObservabilitySessionLogic } from './aiObservabilitySessionLogic'
 import { restoreTree } from './aiObservabilityTraceDataLogic'
 import { SessionTurn, extractSessionTurns } from './extractSessionTurns'
@@ -90,6 +103,169 @@ function resolveFocusEventId(trace: LLMTrace, focusKey: string): string | null {
     return match?.id ?? null
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilitySessionDataLogicValues {
+    dateRange: {
+        dateFrom: string | null
+        dateTo: string | null
+    } | null // aiObservabilitySessionLogic
+    sessionId: string // aiObservabilitySessionLogic
+    canLoadNextData: boolean // dataNodeLogic
+    hasMoreData: boolean // dataNodeLogic
+    nextDataLoading: boolean // dataNodeLogic
+    response:
+        | ErrorTrackingQueryResponse
+        | HogQLAutocompleteResponse
+        | HogQLMetadataResponse
+        | HogQLQueryResponse<any[]>
+        | HogQueryResponse
+        | LogAttributesQueryResponse
+        | LogValuesQueryResponse
+        | MetricsQueryResponse
+        | Record<string, any>
+        | SessionsQueryResponse
+        | TraceSpansAggregationQueryResponse
+        | TraceSpansAttributeBreakdownQueryResponse
+        | TraceSpansQueryResponse
+        | null // dataNodeLogic
+    responseError: string | null // dataNodeLogic
+    responseLoading: boolean // dataNodeLogic
+    dataProcessingAccepted: boolean // maxGlobalLogic
+    currentTeamId: number | null // teamLogic
+    drawerFocusKey: string | null
+    drawerTraceId: string | null
+    expandedGenerationIds: Set<string>
+    fullTraceDateRangeCacheKeys: Record<string, string>
+    fullTraces: Record<string, LLMTrace>
+    initialLoading: boolean
+    loadingFullTraces: Set<string>
+    sessionTurns: SessionTurn[]
+    summariesLoading: boolean
+    traceSummaries: Record<string, TraceSummary>
+    traces: LLMTrace[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilitySessionDataLogicActions {
+    setDateRange: (
+        dateFrom: string | null,
+        dateTo?: string | null | undefined
+    ) => {
+        dateFrom: string | null
+        dateTo: string | null | undefined
+    } // aiObservabilitySessionLogic
+    loadNextData: () => any // dataNodeLogic
+    clearTraceDetails: () => {
+        value: true
+    }
+    clearTraceSummaries: () => {
+        value: true
+    }
+    closeStepsDrawer: () => {
+        value: true
+    }
+    focusGenerationExpanded: (generationId: string) => {
+        generationId: string
+    }
+    loadCachedSummaries: (traceIds: string[]) => {
+        traceIds: string[]
+    }
+    loadCachedSummariesSuccess: (
+        summaries: Array<{
+            title: string
+            trace_id: string
+        }>
+    ) => {
+        summaries: {
+            title: string
+            trace_id: string
+        }[]
+    }
+    loadFullTrace: (traceId: string) => {
+        traceId: string
+    }
+    loadFullTraceFailure: (traceId: string) => {
+        traceId: string
+    }
+    loadFullTraceSuccess: (
+        traceId: string,
+        trace: LLMTrace,
+        dateRangeCacheKey: string
+    ) => {
+        dateRangeCacheKey: string
+        trace: LLMTrace
+        traceId: string
+    }
+    openStepsDrawer: (
+        traceId: string,
+        focusEventKey?: string | null
+    ) => {
+        focusEventKey: string | null
+        traceId: string
+    }
+    summarizeAllTraces: () => {
+        value: true
+    }
+    summarizeTrace: (
+        traceId: string,
+        forceRefresh?: boolean
+    ) => {
+        forceRefresh: boolean
+        traceId: string
+    }
+    summarizeTraceFailure: (
+        traceId: string,
+        error: string
+    ) => {
+        error: string
+        traceId: string
+    }
+    summarizeTraceSuccess: (
+        traceId: string,
+        title: string
+    ) => {
+        title: string
+        traceId: string
+    }
+    toggleGenerationExpanded: (generationId: string) => {
+        generationId: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilitySessionDataLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        traces: (
+            response:
+                | ErrorTrackingQueryResponse
+                | HogQLAutocompleteResponse
+                | HogQLMetadataResponse
+                | HogQLQueryResponse<any[]>
+                | HogQueryResponse
+                | LogAttributesQueryResponse
+                | LogValuesQueryResponse
+                | MetricsQueryResponse
+                | Record<string, any>
+                | SessionsQueryResponse
+                | TraceSpansAggregationQueryResponse
+                | TraceSpansAttributeBreakdownQueryResponse
+                | TraceSpansQueryResponse
+                | null
+        ) => LLMTrace[]
+        sessionTurns: (traces: LLMTrace[], fullTraces: Record<string, LLMTrace>) => SessionTurn[]
+        summariesLoading: (traceSummaries: Record<string, TraceSummary>) => boolean
+        initialLoading: (responseLoading: boolean) => boolean
+    }
+}
+
+export type aiObservabilitySessionDataLogicType = MakeLogicType<
+    aiObservabilitySessionDataLogicValues,
+    aiObservabilitySessionDataLogicActions,
+    SessionDataLogicProps,
+    aiObservabilitySessionDataLogicMeta
+>
+
 export const aiObservabilitySessionDataLogic = kea<aiObservabilitySessionDataLogicType>([
     path(['scenes', 'ai-observability', 'aiObservabilitySessionDataLogic']),
     props({} as SessionDataLogicProps),
diff --git a/products/ai_observability/frontend/aiObservabilitySessionFeedbackLogic.ts b/products/ai_observability/frontend/aiObservabilitySessionFeedbackLogic.ts
index c634acababa8..81f26c1890a2 100644
--- a/products/ai_observability/frontend/aiObservabilitySessionFeedbackLogic.ts
+++ b/products/ai_observability/frontend/aiObservabilitySessionFeedbackLogic.ts
@@ -1,11 +1,9 @@
-import { actions, afterMount, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, key, listeners, path, props, reducers } from 'kea'
 
 import api from 'lib/api'
 
 import { HogQLQuery, NodeKind } from '~/queries/schema/schema-general'
 
-import type { aiObservabilitySessionFeedbackLogicType } from './aiObservabilitySessionFeedbackLogicType'
-
 export interface SessionFeedback {
     rating: string
     triggerType: string
@@ -23,6 +21,48 @@ export interface SessionFeedbackLogicProps {
     sessionId: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilitySessionFeedbackLogicValues {
+    feedbackLoading: boolean
+    sessionFeedback: SessionFeedback[]
+    sessionSupportTickets: SessionSupportTicket[]
+    supportTicketsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilitySessionFeedbackLogicActions {
+    loadSessionFeedback: () => {
+        value: true
+    }
+    loadSessionFeedbackFailure: () => {
+        value: true
+    }
+    loadSessionFeedbackSuccess: (feedback: SessionFeedback[]) => {
+        feedback: SessionFeedback[]
+    }
+    loadSessionSupportTickets: () => {
+        value: true
+    }
+    loadSessionSupportTicketsFailure: () => {
+        value: true
+    }
+    loadSessionSupportTicketsSuccess: (tickets: SessionSupportTicket[]) => {
+        tickets: SessionSupportTicket[]
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilitySessionFeedbackLogicMeta {
+    key: string
+}
+
+export type aiObservabilitySessionFeedbackLogicType = MakeLogicType<
+    aiObservabilitySessionFeedbackLogicValues,
+    aiObservabilitySessionFeedbackLogicActions,
+    SessionFeedbackLogicProps,
+    aiObservabilitySessionFeedbackLogicMeta
+>
+
 export const aiObservabilitySessionFeedbackLogic = kea<aiObservabilitySessionFeedbackLogicType>([
     path(['scenes', 'ai-observability', 'aiObservabilitySessionFeedbackLogic']),
     props({} as SessionFeedbackLogicProps),
diff --git a/products/ai_observability/frontend/aiObservabilitySessionLogic.ts b/products/ai_observability/frontend/aiObservabilitySessionLogic.ts
index 30cd9a40a514..6aacd9b60aa3 100644
--- a/products/ai_observability/frontend/aiObservabilitySessionLogic.ts
+++ b/products/ai_observability/frontend/aiObservabilitySessionLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, path, props, reducers, selectors } from 'kea'
 import { router, urlToAction } from 'kea-router'
 
 import { urls } from 'scenes/urls'
@@ -8,7 +8,6 @@ import { insightVizDataNodeKey } from '~/queries/nodes/InsightViz/insightVizKeys
 import { AnyResponseType, DataTableNode, NodeKind, SessionQuery } from '~/queries/schema/schema-general'
 import { Breadcrumb, InsightLogicProps } from '~/types'
 
-import type { aiObservabilitySessionLogicType } from './aiObservabilitySessionLogicType'
 import { aiObservabilitySharedLogic } from './aiObservabilitySharedLogic'
 
 export interface AIObservabilitySessionDataNodeLogicParams {
@@ -38,6 +37,62 @@ export function getDataNodeLogicProps({
 
 export type AIObservabilitySessionLogicProps = Record<string, never>
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilitySessionLogicValues {
+    dateFilter: {
+        dateFrom: string | null
+        dateTo: string | null
+    } // aiObservabilitySharedLogic
+    breadcrumbs: Breadcrumb[]
+    dateRange: {
+        dateFrom: string | null
+        dateTo: string | null
+    } | null
+    query: DataTableNode
+    sessionId: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilitySessionLogicActions {
+    setDateRange: (
+        dateFrom: string | null,
+        dateTo?: string | null
+    ) => {
+        dateFrom: string | null
+        dateTo: string | null | undefined
+    }
+    setSessionId: (sessionId: string) => {
+        sessionId: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilitySessionLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        query: (
+            sessionId: string,
+            dateRange: {
+                dateFrom: string | null
+                dateTo: string | null
+            } | null
+        ) => DataTableNode
+        breadcrumbs: (
+            sessionId: string,
+            dateFilter: {
+                dateFrom: string | null
+                dateTo: string | null
+            }
+        ) => Breadcrumb[]
+    }
+}
+
+export type aiObservabilitySessionLogicType = MakeLogicType<
+    aiObservabilitySessionLogicValues,
+    aiObservabilitySessionLogicActions,
+    AIObservabilitySessionLogicProps,
+    aiObservabilitySessionLogicMeta
+>
+
 export const aiObservabilitySessionLogic = kea<aiObservabilitySessionLogicType>([
     path(['scenes', 'ai-observability', 'aiObservabilitySessionLogic']),
     props({} as AIObservabilitySessionLogicProps),
diff --git a/products/ai_observability/frontend/aiObservabilitySharedLogic.ts b/products/ai_observability/frontend/aiObservabilitySharedLogic.ts
index 49c3e6e68cf0..105e33748d28 100644
--- a/products/ai_observability/frontend/aiObservabilitySharedLogic.ts
+++ b/products/ai_observability/frontend/aiObservabilitySharedLogic.ts
@@ -1,4 +1,17 @@
-import { actions, afterMount, beforeUnmount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    afterMount,
+    beforeUnmount,
+    connect,
+    kea,
+    key,
+    listeners,
+    path,
+    props,
+    reducers,
+    selectors,
+} from 'kea'
 import { loaders } from 'kea-loaders'
 import { router, urlToAction } from 'kea-router'
 
@@ -16,7 +29,9 @@ import { isAnyPropertyFilters } from '~/queries/schema-guards'
 import { ProductIntentContext, ProductKey } from '~/queries/schema/schema-general'
 import { AnyPropertyFilter, Breadcrumb } from '~/types'
 
-import type { aiObservabilitySharedLogicType } from './aiObservabilitySharedLogicType'
+import type { FeatureFlagsSet } from '../../../frontend/src/lib/logic/featureFlagLogic'
+import type { ProductIntentProperties } from '../../../frontend/src/lib/utils/product-intents'
+import type { UserType } from '../../../frontend/src/types'
 import { AI_OBSERVABILITY_CLUSTER_URL_PATTERN } from './clusters/constants'
 import { parserRecipesLogic } from './settings/parserRecipesLogic'
 import { hasRecentAIEvents } from './utils/aiEvents'
@@ -114,6 +129,74 @@ export function buildApplyUrlStatePayload({
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilitySharedLogicValues {
+    featureFlags: FeatureFlagsSet; // featureFlagLogic
+    filterTestAccountsDefault: boolean; // filterTestAccountsDefaultsLogic
+    sceneKey: string | null; // sceneLogic
+    user: UserType | null; // userLogic
+    activeTab: AIObservabilityTabId;
+    breadcrumbs: Breadcrumb[];
+    dashboardDateFilter: {
+        dateFrom: string | null;
+        dateTo: string | null;
+    };
+    dateFilter: {
+        dateFrom: string | null;
+        dateTo: string | null;
+    };
+    hasSentAiEvent: boolean | undefined;
+    hasSentAiEventLoading: boolean;
+    propertyFilters: AnyPropertyFilter[];
+    searchQuery: string;
+    shouldFilterSupportTraces: boolean;
+    shouldFilterTestAccounts: boolean;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilitySharedLogicActions {
+    setLocalDefault: (value: boolean) => {
+        value: boolean;
+    }; // filterTestAccountsDefaultsLogic
+    addProductIntent: (properties: ProductIntentProperties) => ProductIntentProperties; // teamLogic
+    applyUrlState: (state: ApplyUrlStatePayload) => ApplyUrlStatePayload;
+    loadAIEventDefinition: () => any;
+    loadAIEventDefinitionFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadAIEventDefinitionSuccess: (hasSentAiEvent: boolean, payload?: any) => {
+        hasSentAiEvent: boolean;
+        payload?: any;
+    };
+    setDates: (dateFrom: string | null, dateTo: string | null) => {
+        dateFrom: string | null;
+        dateTo: string | null;
+    };
+    setPropertyFilters: (propertyFilters: AnyPropertyFilter[]) => {
+        propertyFilters: AnyPropertyFilter[];
+    };
+    setSearchQuery: (searchQuery: string) => {
+        searchQuery: string;
+    };
+    setShouldFilterSupportTraces: (shouldFilterSupportTraces: boolean) => {
+        shouldFilterSupportTraces: boolean;
+    };
+    setShouldFilterTestAccounts: (shouldFilterTestAccounts: boolean) => {
+        shouldFilterTestAccounts: boolean;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilitySharedLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        activeTab: (sceneKey: string | null) => AIObservabilityTabId;
+    };
+}
+
+export type aiObservabilitySharedLogicType = MakeLogicType<aiObservabilitySharedLogicValues, aiObservabilitySharedLogicActions, AIObservabilitySharedLogicProps, aiObservabilitySharedLogicMeta>;
+
 export const aiObservabilitySharedLogic = kea<aiObservabilitySharedLogicType>([
     path(['products', 'ai_observability', 'frontend', 'aiObservabilitySharedLogic']),
     props({} as AIObservabilitySharedLogicProps),
@@ -229,7 +312,7 @@ export const aiObservabilitySharedLogic = kea<aiObservabilitySharedLogicType>([
     selectors({
         activeTab: [
             (s) => [s.sceneKey],
-            (sceneKey): AIObservabilityTabId => {
+            (sceneKey: string | null): AIObservabilityTabId => {
                 if (sceneKey === 'aiObservabilityGenerations') {
                     return 'generations'
                 } else if (sceneKey === 'aiObservabilityReviews') {
diff --git a/products/ai_observability/frontend/aiObservabilityTraceDataLogic.ts b/products/ai_observability/frontend/aiObservabilityTraceDataLogic.ts
index 8f7ff336f502..a0ee29d7dd70 100644
--- a/products/ai_observability/frontend/aiObservabilityTraceDataLogic.ts
+++ b/products/ai_observability/frontend/aiObservabilityTraceDataLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { subscriptions } from 'kea-subscriptions'
 import posthog from 'posthog-js'
 
@@ -18,7 +18,20 @@ import {
 } from '~/queries/schema/schema-general'
 import { InsightLogicProps } from '~/types'
 
-import type { aiObservabilityTraceDataLogicType } from './aiObservabilityTraceDataLogicType'
+import type {
+    ErrorTrackingQueryResponse,
+    HogQLAutocompleteResponse,
+    HogQLMetadataResponse,
+    HogQLQueryResponse,
+    HogQueryResponse,
+    LogAttributesQueryResponse,
+    LogValuesQueryResponse,
+    MetricsQueryResponse,
+    SessionsQueryResponse,
+    TraceSpansAggregationQueryResponse,
+    TraceSpansAttributeBreakdownQueryResponse,
+    TraceSpansQueryResponse,
+} from '../../../frontend/src/queries/schema/schema-general'
 import { type TraceGitMetadata, aiObservabilityTraceLogic } from './aiObservabilityTraceLogic'
 import { llmPersonsLazyLoaderLogic } from './llmPersonsLazyLoaderLogic'
 import { captureNormalizationFailure, normalizeMessages } from './messageNormalization'
@@ -217,6 +230,149 @@ export function deriveTraceGitMetadata(trace: LLMTrace | undefined): TraceGitMet
     return lastFeature ?? first
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilityTraceDataLogicValues {
+    eventId: string | null // aiObservabilityTraceLogic
+    initialTab: string | null // aiObservabilityTraceLogic
+    searchQuery: string // aiObservabilityTraceLogic
+    elapsedTime: number | null // dataNodeLogic
+    response:
+        | ErrorTrackingQueryResponse
+        | HogQLAutocompleteResponse
+        | HogQLMetadataResponse
+        | HogQLQueryResponse<any[]>
+        | HogQueryResponse
+        | LogAttributesQueryResponse
+        | LogValuesQueryResponse
+        | MetricsQueryResponse
+        | Record<string, any>
+        | SessionsQueryResponse
+        | TraceSpansAggregationQueryResponse
+        | TraceSpansAttributeBreakdownQueryResponse
+        | TraceSpansQueryResponse
+        | null // dataNodeLogic
+    responseError: string | null // dataNodeLogic
+    responseLoading: boolean // dataNodeLogic
+    availableEventTypes: string[]
+    effectiveEventId: string | null
+    enrichedTree: EnrichedTraceTreeNode[]
+    event: LLMTrace | LLMTraceEvent | null
+    eventMetadata: Record<string, unknown> | undefined
+    feedbackEvents: LLMTraceEvent[] | undefined
+    filteredEvents: LLMTraceEvent[]
+    filteredTree: TraceTreeNode[]
+    hasScrolledToEvent: boolean
+    highlightedEventId: string | null
+    initialFocusEventId: string | null
+    metricEvents: LLMTraceEvent[] | undefined
+    metricsAndFeedbackEvents: {
+        metric: string
+        value: any
+    }[]
+    mostRelevantEvent: LLMTraceEvent | null
+    searchOccurrences: SearchOccurrence[]
+    selectedNode: EnrichedTraceTreeNode | null
+    sessionId: string | null
+    showableEvents: LLMTraceEvent[]
+    singleTraceLoadReported: boolean
+    trace: LLMTrace | undefined
+    traceGitMetadata: TraceGitMetadata | null
+    tree: TraceTreeNode[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilityTraceDataLogicActions {
+    setEventId: (eventId: string | null) => {
+        eventId: string | null
+    } // aiObservabilityTraceLogic
+    reportSingleTraceLoadIfReady: () => {
+        value: true
+    }
+    setHasScrolledToEvent: () => {
+        value: true
+    }
+    setSingleTraceLoadReported: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilityTraceDataLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        trace: (
+            response:
+                | ErrorTrackingQueryResponse
+                | HogQLAutocompleteResponse
+                | HogQLMetadataResponse
+                | HogQLQueryResponse<any[]>
+                | HogQueryResponse
+                | LogAttributesQueryResponse
+                | LogValuesQueryResponse
+                | MetricsQueryResponse
+                | Record<string, any>
+                | SessionsQueryResponse
+                | TraceSpansAggregationQueryResponse
+                | TraceSpansAttributeBreakdownQueryResponse
+                | TraceSpansQueryResponse
+                | null
+        ) => LLMTrace | undefined
+        showableEvents: (trace: LLMTrace | undefined) => LLMTraceEvent[]
+        filteredEvents: (showableEvents: LLMTraceEvent[], searchQuery: string, traceId: string) => LLMTraceEvent[]
+        filteredTree: (
+            traceId: string,
+            trace: LLMTrace | undefined,
+            searchQuery: string,
+            filteredEvents: LLMTraceEvent[]
+        ) => TraceTreeNode[]
+        mostRelevantEvent: (filteredEvents: LLMTraceEvent[], searchQuery: string) => LLMTraceEvent | null
+        searchOccurrences: (
+            showableEvents: LLMTraceEvent[],
+            searchQuery: string,
+            trace: LLMTrace | undefined
+        ) => SearchOccurrence[]
+        metricEvents: (trace: LLMTrace | undefined) => LLMTraceEvent[] | undefined
+        feedbackEvents: (trace: LLMTrace | undefined) => LLMTraceEvent[] | undefined
+        traceGitMetadata: (trace: LLMTrace | undefined) => TraceGitMetadata | null
+        metricsAndFeedbackEvents: (
+            metricEvents: LLMTraceEvent[] | undefined,
+            feedbackEvents: LLMTraceEvent[] | undefined
+        ) => {
+            metric: string
+            value: any
+        }[]
+        initialFocusEventId: (
+            trace: LLMTrace | undefined,
+            filteredTree: TraceTreeNode[],
+            initialTab: string | null
+        ) => string | null
+        effectiveEventId: (eventId: string | null, initialFocusEventId: string | null) => string | null
+        event: (
+            traceId: string,
+            effectiveEventId: string | null,
+            trace: LLMTrace | undefined,
+            showableEvents: LLMTraceEvent[]
+        ) => LLMTrace | LLMTraceEvent | null
+        tree: (filteredTree: TraceTreeNode[]) => TraceTreeNode[]
+        enrichedTree: (filteredTree: TraceTreeNode[]) => EnrichedTraceTreeNode[]
+        eventMetadata: (event: LLMTrace | LLMTraceEvent | null) => Record<string, unknown> | undefined
+        highlightedEventId: (event: LLMTrace | LLMTraceEvent | null) => string | null
+        selectedNode: (
+            event: LLMTrace | LLMTraceEvent | null,
+            enrichedTree: EnrichedTraceTreeNode[]
+        ) => EnrichedTraceTreeNode | null
+        sessionId: (selectedNode: EnrichedTraceTreeNode | null, event: LLMTrace | LLMTraceEvent | null) => string | null
+        availableEventTypes: (enrichedTree: EnrichedTraceTreeNode[]) => string[]
+    }
+}
+
+export type aiObservabilityTraceDataLogicType = MakeLogicType<
+    aiObservabilityTraceDataLogicValues,
+    aiObservabilityTraceDataLogicActions,
+    TraceDataLogicProps,
+    aiObservabilityTraceDataLogicMeta
+>
+
 export const aiObservabilityTraceDataLogic = kea<aiObservabilityTraceDataLogicType>([
     path(['scenes', 'ai-observability', 'aiObservabilityTraceDataLogic']),
     props({} as TraceDataLogicProps),
@@ -252,14 +408,30 @@ export const aiObservabilityTraceDataLogic = kea<aiObservabilityTraceDataLogicTy
     selectors({
         trace: [
             (s) => [s.response],
-            (response): LLMTrace | undefined => {
+            (
+                response:
+                    | Record<string, any>
+                    | null
+                    | import('~/queries/schema').ErrorTrackingQueryResponse
+                    | import('~/queries/schema').HogQLAutocompleteResponse
+                    | import('~/queries/schema').HogQLMetadataResponse
+                    | import('~/queries/schema').HogQLQueryResponse<any[]>
+                    | import('~/queries/schema').HogQueryResponse
+                    | import('~/queries/schema').LogAttributesQueryResponse
+                    | import('~/queries/schema').LogValuesQueryResponse
+                    | import('~/queries/schema').MetricsQueryResponse
+                    | import('~/queries/schema').SessionsQueryResponse
+                    | import('~/queries/schema').TraceSpansAggregationQueryResponse
+                    | import('~/queries/schema').TraceSpansAttributeBreakdownQueryResponse
+                    | import('~/queries/schema').TraceSpansQueryResponse
+            ): LLMTrace | undefined => {
                 const traceResponse = response as TraceQueryResponse | null
                 return traceResponse?.results?.[0]
             },
         ],
         showableEvents: [
             (s) => [s.trace],
-            (trace): LLMTraceEvent[] =>
+            (trace: LLMTrace | undefined): LLMTraceEvent[] =>
                 trace ? trace.events.filter((event) => !FEEDBACK_EVENTS.has(event.event)) : [],
         ],
         filteredEvents: [
@@ -289,7 +461,12 @@ export const aiObservabilityTraceDataLogic = kea<aiObservabilityTraceDataLogicTy
         ],
         filteredTree: [
             (s, p) => [p.traceId, s.trace, s.searchQuery, s.filteredEvents],
-            (traceId, trace, searchQuery, filteredEvents): TraceTreeNode[] => {
+            (
+                traceId: string,
+                trace: LLMTrace | undefined,
+                searchQuery: string,
+                filteredEvents: LLMTraceEvent[]
+            ): TraceTreeNode[] => {
                 if (!searchQuery.trim()) {
                     return restoreTree(trace?.events || [], traceId)
                 }
@@ -298,7 +475,7 @@ export const aiObservabilityTraceDataLogic = kea<aiObservabilityTraceDataLogicTy
         ],
         mostRelevantEvent: [
             (s) => [s.filteredEvents, s.searchQuery],
-            (filteredEvents, searchQuery): LLMTraceEvent | null => {
+            (filteredEvents: LLMTraceEvent[], searchQuery: string): LLMTraceEvent | null => {
                 if (!searchQuery.trim() || !filteredEvents.length) {
                     return null
                 }
@@ -354,7 +531,7 @@ export const aiObservabilityTraceDataLogic = kea<aiObservabilityTraceDataLogicTy
         ],
         searchOccurrences: [
             (s) => [s.showableEvents, s.searchQuery, s.trace],
-            (showableEvents, searchQuery, trace): SearchOccurrence[] => {
+            (showableEvents: LLMTraceEvent[], searchQuery: string, trace: LLMTrace | undefined): SearchOccurrence[] => {
                 if (!searchQuery.trim()) {
                     return []
                 }
@@ -372,18 +549,24 @@ export const aiObservabilityTraceDataLogic = kea<aiObservabilityTraceDataLogicTy
         ],
         metricEvents: [
             (s) => [s.trace],
-            (trace): LLMTraceEvent[] | undefined =>
+            (trace: LLMTrace | undefined): LLMTraceEvent[] | undefined =>
                 trace?.events.filter((event) => event.event === '$ai_metric' && event.properties.$ai_metric_value),
         ],
         feedbackEvents: [
             (s) => [s.trace],
-            (trace): LLMTraceEvent[] | undefined =>
+            (trace: LLMTrace | undefined): LLMTraceEvent[] | undefined =>
                 trace?.events.filter((event) => event.event === '$ai_feedback' && event.properties.$ai_feedback_text),
         ],
-        traceGitMetadata: [(s) => [s.trace], (trace): TraceGitMetadata | null => deriveTraceGitMetadata(trace)],
+        traceGitMetadata: [
+            (s) => [s.trace],
+            (trace: LLMTrace | undefined): TraceGitMetadata | null => deriveTraceGitMetadata(trace),
+        ],
         metricsAndFeedbackEvents: [
             (s) => [s.metricEvents, s.feedbackEvents],
-            (metricEvents, feedbackEvents): { metric: string; value: any }[] =>
+            (
+                metricEvents: LLMTraceEvent[] | undefined,
+                feedbackEvents: LLMTraceEvent[] | undefined
+            ): { metric: string; value: any }[] =>
                 [...(metricEvents ?? []), ...(feedbackEvents ?? [])].map((event) => ({
                     metric:
                         event.event === '$ai_metric' ? (event.properties.$ai_metric_name ?? 'Metric') : 'User feedback',
@@ -402,7 +585,12 @@ export const aiObservabilityTraceDataLogic = kea<aiObservabilityTraceDataLogicTy
         ],
         event: [
             (s, p) => [p.traceId, s.effectiveEventId, s.trace, s.showableEvents],
-            (traceId, effectiveEventId, trace, showableEvents): LLMTrace | LLMTraceEvent | null => {
+            (
+                traceId: string,
+                effectiveEventId: string | null,
+                trace: LLMTrace | undefined,
+                showableEvents: LLMTraceEvent[]
+            ): LLMTrace | LLMTraceEvent | null => {
                 if (!effectiveEventId || effectiveEventId === traceId) {
                     return trace || null
                 }
@@ -417,14 +605,14 @@ export const aiObservabilityTraceDataLogic = kea<aiObservabilityTraceDataLogicTy
                 return matchedEvent || trace || null
             },
         ],
-        tree: [(s) => [s.filteredTree], (filteredTree): TraceTreeNode[] => filteredTree],
+        tree: [(s) => [s.filteredTree], (filteredTree: TraceTreeNode[]): TraceTreeNode[] => filteredTree],
         enrichedTree: [
             (s) => [s.filteredTree],
             (filteredTree: TraceTreeNode[]): EnrichedTraceTreeNode[] => filteredTree.map(enrichNode),
         ],
         eventMetadata: [
             (s) => [s.event],
-            (event): Record<string, unknown> | undefined => {
+            (event: LLMTrace | LLMTraceEvent | null): Record<string, unknown> | undefined => {
                 if (event && isLLMEvent(event)) {
                     // Filter out all system properties as they're typically useless for datasets.
                     return Object.fromEntries(Object.entries(event.properties).filter(([key]) => !key.startsWith('$')))
diff --git a/products/ai_observability/frontend/aiObservabilityTraceLogic.ts b/products/ai_observability/frontend/aiObservabilityTraceLogic.ts
index e86fdcb8ae82..678eea67372f 100644
--- a/products/ai_observability/frontend/aiObservabilityTraceLogic.ts
+++ b/products/ai_observability/frontend/aiObservabilityTraceLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { combineUrl, router, urlToAction } from 'kea-router'
 import { subscriptions } from 'kea-subscriptions'
@@ -31,8 +31,8 @@ import { ActivityScope, AnyPropertyFilter, Breadcrumb, InsightLogicProps } from
 import { engineeringAnalyticsResolveBranch } from 'products/engineering_analytics/frontend/generated/api'
 import type { BranchPRMatchApi } from 'products/engineering_analytics/frontend/generated/api.schemas'
 
+import type { FeatureFlagsSet } from '../../../frontend/src/lib/logic/featureFlagLogic'
 import { aiObservabilitySharedLogic } from './aiObservabilitySharedLogic'
-import type { aiObservabilityTraceLogicType } from './aiObservabilityTraceLogicType'
 import { buildAiObservabilityStorageConfig } from './preferenceStorage'
 
 export enum DisplayOption {
@@ -107,6 +107,256 @@ export function branchPRResolutionKey(gitMetadata: TraceGitMetadata | null): str
 
 const projectId = (): string => String(ApiConfig.getCurrentProjectId())
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilityTraceLogicValues {
+    dateFilter: {
+        dateFrom: string | null
+        dateTo: string | null
+    } // aiObservabilitySharedLogic
+    propertyFilters: AnyPropertyFilter[] // aiObservabilitySharedLogic
+    shouldFilterSupportTraces: boolean // aiObservabilitySharedLogic
+    shouldFilterTestAccounts: boolean // aiObservabilitySharedLogic
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    branchPRMatches: BranchPRMatchApi[]
+    branchPRResolution: BranchPRResolution
+    branchPRResolutionLoading: boolean
+    breadcrumbs: Breadcrumb[]
+    commentCount: number
+    commentCountLoading: boolean
+    dateRange: {
+        dateFrom: string | null
+        dateTo: string | null
+    } | null
+    displayOption: DisplayOption
+    eventId: string | null
+    eventTypeExpanded: (eventType: string) => boolean
+    eventTypeExpandedMap: Record<string, boolean>
+    highlightMessageIndex: number | null
+    initialTab: string | null
+    inputMessageShowStates: boolean[]
+    isRenderingMarkdown: boolean
+    isRenderingXml: boolean
+    isTraceReviewPanelExpanded: boolean
+    lastGitMetadata: TraceGitMetadata | null
+    lineNumber: number | null
+    messageShowStates: {
+        input: boolean[]
+        output: boolean[]
+    }
+    neighbors: TraceNeighborsQueryResponse | null
+    neighborsLoading: boolean
+    newerTimestamp: string | null
+    newerTraceId: string | null
+    olderTimestamp: string | null
+    olderTraceId: string | null
+    outputMessageShowStates: boolean[]
+    query: DataTableNode
+    resolvingKey: string | null
+    searchQuery: string
+    sidePanelContext: SidePanelSceneContext
+    traceId: string
+    viewMode: TraceViewMode
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilityTraceLogicActions {
+    applySearchResults: (
+        inputMatches: boolean[],
+        outputMatches: boolean[]
+    ) => {
+        inputMatches: boolean[]
+        outputMatches: boolean[]
+    }
+    copyLinePermalink: (lineNumber: number) => {
+        lineNumber: number
+    }
+    handleTextViewFallback: () => {
+        value: true
+    }
+    hideAllMessages: (type: 'input' | 'output') => {
+        type: 'input' | 'output'
+    }
+    initializeMessageStates: (
+        inputCount: number,
+        outputCount: number
+    ) => {
+        inputCount: number
+        outputCount: number
+    }
+    loadBranchPRMatches: (gitMetadata: TraceGitMetadata | null) => TraceGitMetadata | null
+    loadBranchPRMatchesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadBranchPRMatchesSuccess: (
+        branchPRResolution:
+            | {
+                  gated: boolean
+                  key: string | null
+                  matches: never[]
+              }
+            | {
+                  gated?: undefined
+                  key: string | null
+                  matches: BranchPRMatchApi[]
+              },
+        payload?: TraceGitMetadata | null
+    ) => {
+        branchPRResolution:
+            | {
+                  gated: boolean
+                  key: string | null
+                  matches: never[]
+              }
+            | {
+                  gated?: undefined
+                  key: string | null
+                  matches: BranchPRMatchApi[]
+              }
+        payload?: TraceGitMetadata | null
+    }
+    loadCommentCount: () => {
+        value: true
+    }
+    loadCommentCountFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadCommentCountSuccess: (
+        commentCount: number,
+        payload?: {
+            value: true
+        }
+    ) => {
+        commentCount: number
+        payload?: {
+            value: true
+        }
+    }
+    loadNeighbors: (
+        traceId: string,
+        timestamp: string
+    ) => {
+        timestamp: string
+        traceId: string
+    }
+    loadNeighborsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadNeighborsSuccess: (
+        neighbors: TraceNeighborsQueryResponse | null,
+        payload?: {
+            timestamp: string
+            traceId: string
+        }
+    ) => {
+        neighbors: TraceNeighborsQueryResponse | null
+        payload?: {
+            timestamp: string
+            traceId: string
+        }
+    }
+    setDateRange: (
+        dateFrom: string | null,
+        dateTo?: string | null
+    ) => {
+        dateFrom: string | null
+        dateTo: string | null | undefined
+    }
+    setDisplayOption: (displayOption: DisplayOption) => {
+        displayOption: DisplayOption
+    }
+    setEventId: (eventId: string | null) => {
+        eventId: string | null
+    }
+    setHighlightMessageIndex: (highlightMessageIndex: number | null) => {
+        highlightMessageIndex: number | null
+    }
+    setInitialTab: (tab: string | null) => {
+        tab: string | null
+    }
+    setIsRenderingMarkdown: (isRenderingMarkdown: boolean) => {
+        isRenderingMarkdown: boolean
+    }
+    setIsRenderingXml: (isRenderingXml: boolean) => {
+        isRenderingXml: boolean
+    }
+    setLineNumber: (lineNumber: number | null) => {
+        lineNumber: number | null
+    }
+    setSearchQuery: (searchQuery: string) => {
+        searchQuery: string
+    }
+    setTraceId: (traceId: string) => {
+        traceId: string
+    }
+    setTraceReviewPanelExpanded: (isExpanded: boolean) => {
+        isExpanded: boolean
+    }
+    setViewMode: (viewMode: TraceViewMode) => {
+        viewMode: TraceViewMode
+    }
+    showAllMessages: (type: 'input' | 'output') => {
+        type: 'input' | 'output'
+    }
+    toggleEventTypeExpanded: (eventType: string) => {
+        eventType: string
+    }
+    toggleMarkdownRendering: () => {
+        value: true
+    }
+    toggleMessage: (
+        type: 'input' | 'output',
+        index: number
+    ) => {
+        index: number
+        type: 'input' | 'output'
+    }
+    toggleXmlRendering: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilityTraceLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        branchPRMatches: (branchPRResolution: BranchPRResolution, resolvingKey: string | null) => BranchPRMatchApi[]
+        inputMessageShowStates: (messageShowStates: { input: boolean[]; output: boolean[] }) => boolean[]
+        outputMessageShowStates: (messageShowStates: { input: boolean[]; output: boolean[] }) => boolean[]
+        query: (
+            traceId: string,
+            dateRange: {
+                dateFrom: string | null
+                dateTo: string | null
+            } | null
+        ) => DataTableNode
+        breadcrumbs: (traceId: string, searchParams: Record<string, any>) => Breadcrumb[]
+        eventTypeExpanded: (eventTypeExpandedMap: Record<string, boolean>) => (eventType: string) => boolean
+        newerTraceId: (neighbors: TraceNeighborsQueryResponse | null) => string | null
+        newerTimestamp: (neighbors: TraceNeighborsQueryResponse | null) => string | null
+        olderTraceId: (neighbors: TraceNeighborsQueryResponse | null) => string | null
+        olderTimestamp: (neighbors: TraceNeighborsQueryResponse | null) => string | null
+        sidePanelContext: (traceId: string) => SidePanelSceneContext
+    }
+}
+
+export type aiObservabilityTraceLogicType = MakeLogicType<
+    aiObservabilityTraceLogicValues,
+    aiObservabilityTraceLogicActions,
+    AIObservabilityTraceLogicProps,
+    aiObservabilityTraceLogicMeta
+>
+
 export const aiObservabilityTraceLogic = kea<aiObservabilityTraceLogicType>([
     path(['scenes', 'ai-observability', 'aiObservabilityTraceLogic']),
     props({} as AIObservabilityTraceLogicProps),
@@ -407,14 +657,26 @@ export const aiObservabilityTraceLogic = kea<aiObservabilityTraceLogicType>([
         // another repo's) PR.
         branchPRMatches: [
             (s) => [s.branchPRResolution, s.resolvingKey],
-            (resolution, resolvingKey): BranchPRMatchApi[] =>
+            (resolution: BranchPRResolution, resolvingKey: string | null): BranchPRMatchApi[] =>
                 resolution.key === resolvingKey ? resolution.matches : [],
         ],
-        inputMessageShowStates: [(s) => [s.messageShowStates], (messageStates) => messageStates.input],
-        outputMessageShowStates: [(s) => [s.messageShowStates], (messageStates) => messageStates.output],
+        inputMessageShowStates: [
+            (s) => [s.messageShowStates],
+            (messageStates: { input: boolean[]; output: boolean[] }) => messageStates.input,
+        ],
+        outputMessageShowStates: [
+            (s) => [s.messageShowStates],
+            (messageStates: { input: boolean[]; output: boolean[] }) => messageStates.output,
+        ],
         query: [
             (s) => [s.traceId, s.dateRange],
-            (traceId, dateRange): DataTableNode => {
+            (
+                traceId: string,
+                dateRange: {
+                    dateFrom: string | null
+                    dateTo: string | null
+                } | null
+            ): DataTableNode => {
                 const traceQuery: TraceQuery = {
                     kind: NodeKind.TraceQuery,
                     traceId,
@@ -464,18 +726,30 @@ export const aiObservabilityTraceLogic = kea<aiObservabilityTraceLogicType>([
         ],
         eventTypeExpanded: [
             (s) => [s.eventTypeExpandedMap],
-            (eventTypeExpandedMap) =>
+            (eventTypeExpandedMap: Record<string, boolean>) =>
                 (eventType: string): boolean => {
                     return eventTypeExpandedMap[eventType] ?? true
                 },
         ],
-        newerTraceId: [(s) => [s.neighbors], (neighbors) => neighbors?.newerTraceId ?? null],
-        newerTimestamp: [(s) => [s.neighbors], (neighbors) => neighbors?.newerTimestamp ?? null],
-        olderTraceId: [(s) => [s.neighbors], (neighbors) => neighbors?.olderTraceId ?? null],
-        olderTimestamp: [(s) => [s.neighbors], (neighbors) => neighbors?.olderTimestamp ?? null],
+        newerTraceId: [
+            (s) => [s.neighbors],
+            (neighbors: TraceNeighborsQueryResponse | null) => neighbors?.newerTraceId ?? null,
+        ],
+        newerTimestamp: [
+            (s) => [s.neighbors],
+            (neighbors: TraceNeighborsQueryResponse | null) => neighbors?.newerTimestamp ?? null,
+        ],
+        olderTraceId: [
+            (s) => [s.neighbors],
+            (neighbors: TraceNeighborsQueryResponse | null) => neighbors?.olderTraceId ?? null,
+        ],
+        olderTimestamp: [
+            (s) => [s.neighbors],
+            (neighbors: TraceNeighborsQueryResponse | null) => neighbors?.olderTimestamp ?? null,
+        ],
         [SIDE_PANEL_CONTEXT_KEY]: [
             (s) => [s.traceId],
-            (traceId): SidePanelSceneContext => {
+            (traceId: string): SidePanelSceneContext => {
                 // Discussions are always at the trace level, accessible from anywhere in the trace
                 return {
                     activity_scope: ActivityScope.LLM_TRACE,
diff --git a/products/ai_observability/frontend/clusters/clusterDetailLogic.ts b/products/ai_observability/frontend/clusters/clusterDetailLogic.ts
index 6e2fb1da7000..b607ef228d8f 100644
--- a/products/ai_observability/frontend/clusters/clusterDetailLogic.ts
+++ b/products/ai_observability/frontend/clusters/clusterDetailLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { urlToAction } from 'kea-router'
 import posthog from 'posthog-js'
@@ -13,8 +13,9 @@ import { EventsQuery, NodeKind, ProductIntentContext, ProductKey } from '~/queri
 import { hogql } from '~/queries/utils'
 import { AnyPropertyFilter, Breadcrumb, PropertyFilterType, PropertyOperator } from '~/types'
 
+import type { ProductIntentProperties } from '../../../../frontend/src/lib/utils/product-intents'
 import { aiObservabilitySharedLogic } from '../aiObservabilitySharedLogic'
-import type { clusterDetailLogicType } from './clusterDetailLogicType'
+import type { ApplyUrlStatePayload } from '../aiObservabilitySharedLogic'
 import { loadClusterMetrics } from './clusterMetricsLoader'
 import {
     FILTER_QUERY_MAX_ROWS,
@@ -66,6 +67,150 @@ export interface ScatterDataset {
     pointStyle?: 'circle' | 'crossRot'
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface clusterDetailLogicValues {
+    propertyFilters: AnyPropertyFilter[] // aiObservabilitySharedLogic
+    shouldFilterTestAccounts: boolean // aiObservabilitySharedLogic
+    breadcrumbs: Breadcrumb[]
+    cluster: Cluster | null
+    clusterData: ClusterData | null
+    clusterDataLoading: boolean
+    clusterMetrics: ClusterMetrics | null
+    clusterMetricsLoading: boolean
+    clusteringLevel: ClusteringLevel
+    currentPage: number
+    filteredItemIds: Set<string> | null
+    filteredItemIdsLoading: boolean
+    hasActiveFilters: boolean
+    isOutlierCluster: boolean
+    paginatedTraceIds: string[]
+    paginatedTracesWithSummaries: TraceWithSummary[]
+    runTimestamp: string
+    scatterPlotDatasets: ScatterDataset[]
+    sortedTraceIds: string[]
+    totalPages: number
+    totalTraces: number
+    traceSummaries: Record<string, TraceSummary>
+    traceSummariesLoading: boolean
+    unfilteredTotalTraces: number
+    windowEnd: string
+    windowStart: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface clusterDetailLogicActions {
+    applyUrlState: (state: ApplyUrlStatePayload) => ApplyUrlStatePayload // aiObservabilitySharedLogic
+    setPropertyFilters: (propertyFilters: AnyPropertyFilter[]) => {
+        propertyFilters: AnyPropertyFilter[]
+    } // aiObservabilitySharedLogic
+    setShouldFilterTestAccounts: (shouldFilterTestAccounts: boolean) => {
+        shouldFilterTestAccounts: boolean
+    } // aiObservabilitySharedLogic
+    addProductIntent: (properties: ProductIntentProperties) => ProductIntentProperties // teamLogic
+    loadClusterData: () => any
+    loadClusterDataFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadClusterDataSuccess: (
+        clusterData: {
+            cluster: Cluster
+            clusteringLevel: ClusteringLevel
+            runTimestamp: string
+            windowEnd: string
+            windowStart: string
+        } | null,
+        payload?: any
+    ) => {
+        clusterData: {
+            cluster: Cluster
+            clusteringLevel: ClusteringLevel
+            runTimestamp: string
+            windowEnd: string
+            windowStart: string
+        } | null
+        payload?: any
+    }
+    loadClusterMetricsForCluster: () => {
+        value: true
+    }
+    loadFilteredItemIds: () => {
+        value: true
+    }
+    loadFilteredItemIdsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadFilteredItemIdsSuccess: (
+        filteredItemIds: Set<string> | null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        filteredItemIds: Set<string> | null
+        payload?: {
+            value: true
+        }
+    }
+    loadMoreTraces: () => {
+        value: true
+    }
+    setClusterMetrics: (metrics: ClusterMetrics | null) => {
+        metrics: ClusterMetrics | null
+    }
+    setClusterMetricsLoading: (loading: boolean) => {
+        loading: boolean
+    }
+    setPage: (page: number) => {
+        page: number
+    }
+    setTraceSummaries: (summaries: Record<string, TraceSummary>) => {
+        summaries: Record<string, TraceSummary>
+    }
+    setTraceSummariesLoading: (loading: boolean) => {
+        loading: boolean
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface clusterDetailLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        cluster: (clusterData: ClusterData | null) => Cluster | null
+        runTimestamp: (clusterData: ClusterData | null) => string
+        windowStart: (clusterData: ClusterData | null) => string
+        windowEnd: (clusterData: ClusterData | null) => string
+        clusteringLevel: (clusterData: ClusterData | null) => ClusteringLevel
+        isOutlierCluster: (cluster: Cluster | null) => boolean
+        scatterPlotDatasets: (cluster: Cluster | null, isOutlierCluster: boolean) => ScatterDataset[]
+        sortedTraceIds: (cluster: Cluster | null, filteredItemIds: Set<string> | null) => string[]
+        totalTraces: (sortedTraceIds: string[]) => number
+        unfilteredTotalTraces: (cluster: Cluster | null) => number
+        hasActiveFilters: (propertyFilters: AnyPropertyFilter[], shouldFilterTestAccounts: boolean) => boolean
+        totalPages: (totalTraces: number) => number
+        paginatedTraceIds: (sortedTraceIds: string[], currentPage: number) => string[]
+        paginatedTracesWithSummaries: (
+            paginatedTraceIds: string[],
+            cluster: Cluster | null,
+            traceSummaries: Record<string, TraceSummary>
+        ) => TraceWithSummary[]
+        breadcrumbs: (cluster: Cluster | null, runId: string) => Breadcrumb[]
+    }
+}
+
+export type clusterDetailLogicType = MakeLogicType<
+    clusterDetailLogicValues,
+    clusterDetailLogicActions,
+    ClusterDetailLogicProps,
+    clusterDetailLogicMeta
+>
+
 export const clusterDetailLogic = kea<clusterDetailLogicType>([
     path(['products', 'ai_observability', 'frontend', 'clusters', 'clusterDetailLogic']),
     props({} as ClusterDetailLogicProps),
diff --git a/products/ai_observability/frontend/clusters/clusteringConfigLogic.ts b/products/ai_observability/frontend/clusters/clusteringConfigLogic.ts
index 5e3370476aab..50f2b17da4d5 100644
--- a/products/ai_observability/frontend/clusters/clusteringConfigLogic.ts
+++ b/products/ai_observability/frontend/clusters/clusteringConfigLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -7,8 +7,6 @@ import { teamLogic } from 'scenes/teamLogic'
 
 import type { AnyPropertyFilter } from '~/types'
 
-import type { clusteringConfigLogicType } from './clusteringConfigLogicType'
-
 /** A filter is valid if it has a key set (not just an empty placeholder row). */
 export function isValidFilter(f: AnyPropertyFilter): boolean {
     return 'key' in f && f.key !== undefined && f.key !== ''
@@ -20,6 +18,60 @@ export interface ClusteringConfig {
     updated_at: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface clusteringConfigLogicValues {
+    currentTeamIdStrict: number | string // teamLogic
+    config: ClusteringConfig
+    configLoading: boolean
+    isSettingsPanelOpen: boolean
+    localEventFilters: AnyPropertyFilter[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface clusteringConfigLogicActions {
+    closeSettingsPanel: () => {
+        value: true
+    }
+    loadConfig: () => any
+    loadConfigFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadConfigSuccess: (
+        config: ClusteringConfig,
+        payload?: any
+    ) => {
+        config: ClusteringConfig
+        payload?: any
+    }
+    openSettingsPanel: () => {
+        value: true
+    }
+    saveEventFilters: () => any
+    saveEventFiltersFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    saveEventFiltersSuccess: (
+        config: ClusteringConfig,
+        payload?: any
+    ) => {
+        config: ClusteringConfig
+        payload?: any
+    }
+    setLocalEventFilters: (filters: AnyPropertyFilter[]) => {
+        filters: AnyPropertyFilter[]
+    }
+}
+
+export type clusteringConfigLogicType = MakeLogicType<clusteringConfigLogicValues, clusteringConfigLogicActions>
+
 export const clusteringConfigLogic = kea<clusteringConfigLogicType>([
     path(['products', 'ai_observability', 'frontend', 'clusters', 'clusteringConfigLogic']),
     connect(() => ({ values: [teamLogic, ['currentTeamIdStrict']] })),
diff --git a/products/ai_observability/frontend/clusters/clusteringJobsLogic.ts b/products/ai_observability/frontend/clusters/clusteringJobsLogic.ts
index 22c198e9c175..ec25f4bad330 100644
--- a/products/ai_observability/frontend/clusters/clusteringJobsLogic.ts
+++ b/products/ai_observability/frontend/clusters/clusteringJobsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
@@ -6,9 +6,90 @@ import api from 'lib/api'
 import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
 import { teamLogic } from 'scenes/teamLogic'
 
-import type { clusteringJobsLogicType } from './clusteringJobsLogicType'
 import type { ClusteringJob } from './types'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface clusteringJobsLogicValues {
+    currentTeamIdStrict: number | string // teamLogic
+    editingJob: Partial<ClusteringJob> | null
+    isJobsPanelOpen: boolean
+    jobs: ClusteringJob[]
+    jobsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface clusteringJobsLogicActions {
+    closeJobsPanel: () => {
+        value: true
+    }
+    createJob: (payload: Partial<ClusteringJob>) => Partial<ClusteringJob>
+    createJobFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    createJobSuccess: (
+        jobs: ClusteringJob[],
+        payload?: Partial<ClusteringJob>
+    ) => {
+        jobs: ClusteringJob[]
+        payload?: Partial<ClusteringJob>
+    }
+    deleteJob: (jobId: number) => {
+        jobId: number
+    }
+    loadJobs: () => any
+    loadJobsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadJobsSuccess: (
+        jobs: ClusteringJob[],
+        payload?: any
+    ) => {
+        jobs: ClusteringJob[]
+        payload?: any
+    }
+    openJobsPanel: () => {
+        value: true
+    }
+    setEditingJob: (job: Partial<ClusteringJob> | null) => {
+        job: Partial<ClusteringJob> | null
+    }
+    updateJob: (
+        payload: Partial<ClusteringJob> & {
+            id: number
+        }
+    ) => Partial<ClusteringJob> & {
+        id: number
+    }
+    updateJobFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateJobSuccess: (
+        jobs: ClusteringJob[],
+        payload?: Partial<ClusteringJob> & {
+            id: number
+        }
+    ) => {
+        jobs: ClusteringJob[]
+        payload?: Partial<ClusteringJob> & {
+            id: number
+        }
+    }
+}
+
+export type clusteringJobsLogicType = MakeLogicType<clusteringJobsLogicValues, clusteringJobsLogicActions>
+
 export const clusteringJobsLogic = kea<clusteringJobsLogicType>([
     path(['products', 'ai_observability', 'frontend', 'clusters', 'clusteringJobsLogic']),
     connect(() => ({ values: [teamLogic, ['currentTeamIdStrict']] })),
diff --git a/products/ai_observability/frontend/clusters/clustersAdminLogic.ts b/products/ai_observability/frontend/clusters/clustersAdminLogic.ts
index b8505046fca9..91f7ba2ab356 100644
--- a/products/ai_observability/frontend/clusters/clustersAdminLogic.ts
+++ b/products/ai_observability/frontend/clusters/clustersAdminLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
@@ -9,7 +9,7 @@ import { teamLogic } from 'scenes/teamLogic'
 import type { AnyPropertyFilter } from '~/types'
 
 import { clusteringConfigLogic } from './clusteringConfigLogic'
-import type { clustersAdminLogicType } from './clustersAdminLogicType'
+import type { ClusteringConfig } from './clusteringConfigLogic'
 
 export interface ClusteringRunParams {
     analysis_level: 'trace' | 'generation' | 'evaluation'
@@ -55,6 +55,63 @@ export const DEFAULT_CLUSTERING_PARAMS: ClusteringRunParams = {
     event_filters: [],
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface clustersAdminLogicValues {
+    config: ClusteringConfig // clusteringConfigLogic
+    configLoading: boolean // clusteringConfigLogic
+    currentTeamIdStrict: number | string // teamLogic
+    clusteringRun: ClusteringRunResponse | null
+    clusteringRunLoading: boolean
+    isModalOpen: boolean
+    isRunning: boolean
+    params: ClusteringRunParams
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface clustersAdminLogicActions {
+    closeModal: () => {
+        value: true
+    }
+    openModal: () => {
+        value: true
+    }
+    resetParams: () => {
+        value: true
+    }
+    setParams: (params: Partial<ClusteringRunParams>) => {
+        params: Partial<ClusteringRunParams>
+    }
+    triggerClusteringRun: () => any
+    triggerClusteringRunFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    triggerClusteringRunSuccess: (
+        clusteringRun: ClusteringRunResponse,
+        payload?: any
+    ) => {
+        clusteringRun: ClusteringRunResponse
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface clustersAdminLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        isRunning: (clusteringRunLoading: boolean) => boolean
+    }
+}
+
+export type clustersAdminLogicType = MakeLogicType<
+    clustersAdminLogicValues,
+    clustersAdminLogicActions,
+    Record<string, any>,
+    clustersAdminLogicMeta
+>
+
 export const clustersAdminLogic = kea<clustersAdminLogicType>([
     path(['products', 'ai_observability', 'frontend', 'clusters', 'clustersAdminLogic']),
 
@@ -104,7 +161,7 @@ export const clustersAdminLogic = kea<clustersAdminLogicType>([
     })),
 
     selectors({
-        isRunning: [(s) => [s.clusteringRunLoading], (loading): boolean => loading],
+        isRunning: [(s) => [s.clusteringRunLoading], (loading: boolean): boolean => loading],
     }),
 
     listeners(({ actions, values }) => ({
diff --git a/products/ai_observability/frontend/clusters/clustersLogic.ts b/products/ai_observability/frontend/clusters/clustersLogic.ts
index 5599db318f54..d0edc27e59d7 100644
--- a/products/ai_observability/frontend/clusters/clustersLogic.ts
+++ b/products/ai_observability/frontend/clusters/clustersLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router, urlToAction } from 'kea-router'
 import posthog from 'posthog-js'
@@ -15,8 +15,8 @@ import { hogql } from '~/queries/utils'
 import { AnyPropertyFilter, Breadcrumb, PropertyFilterType, PropertyOperator } from '~/types'
 
 import { aiObservabilitySharedLogic } from '../aiObservabilitySharedLogic'
+import type { ApplyUrlStatePayload } from '../aiObservabilitySharedLogic'
 import { loadClusterMetrics } from './clusterMetricsLoader'
-import type { clustersLogicType } from './clustersLogicType'
 import {
     FILTER_QUERY_MAX_ROWS,
     AI_OBSERVABILITY_CLUSTERS_SCENE_TAG,
@@ -88,6 +88,217 @@ export interface ScatterDataset {
 
 export type ClustersLogicProps = Record<string, never>
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface clustersLogicValues {
+    propertyFilters: AnyPropertyFilter[] // aiObservabilitySharedLogic
+    shouldFilterTestAccounts: boolean // aiObservabilitySharedLogic
+    anyFiltersActive: boolean
+    availableEvaluatorNames: {
+        count: number
+        name: string
+    }[]
+    availableVerdictCounts: Record<EvaluationVerdict, number>
+    breadcrumbs: Breadcrumb[]
+    clusterMembershipPredicate: (id: string) => boolean
+    clusterMetrics: Record<number, ClusterMetrics>
+    clusterMetricsLoading: boolean
+    clusteringLevel: ClusteringLevel
+    clusteringRuns: ClusteringRunOption[]
+    clusteringRunsLoading: boolean
+    currentRun: ClusteringRun | null
+    currentRunLoading: boolean
+    currentRunMatchesLevel: boolean
+    effectiveRunId: string | null
+    evalFilterEvaluatorNames: string[]
+    evalFilterPredicate: (evalId: string) => boolean
+    evalFilterVerdicts: EvaluationVerdict[]
+    evalFiltersActive: boolean
+    evaluationItemAttributes: Record<string, EvaluationItemAttributes>
+    expandedClusterIds: Set<number>
+    filteredItemCount: number
+    filteredSortedClusters: Cluster[]
+    isClusterExpanded: (clusterId: number) => boolean
+    isScatterPlotExpanded: boolean
+    propertyFilteredItemIds: Set<string> | null
+    propertyFilteredItemIdsLoading: boolean
+    propertyFiltersActive: boolean
+    scatterPlotDatasets: ScatterDataset[]
+    selectedRunId: string | null
+    sortedClusters: Cluster[]
+    totalItemCount: number
+    traceSummaries: Record<string, TraceSummary>
+    traceSummariesLoading: boolean
+    traceToClusterTitle: Record<string, string>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface clustersLogicActions {
+    applyUrlState: (state: ApplyUrlStatePayload) => ApplyUrlStatePayload // aiObservabilitySharedLogic
+    setPropertyFilters: (propertyFilters: AnyPropertyFilter[]) => {
+        propertyFilters: AnyPropertyFilter[]
+    } // aiObservabilitySharedLogic
+    setShouldFilterTestAccounts: (shouldFilterTestAccounts: boolean) => {
+        shouldFilterTestAccounts: boolean
+    } // aiObservabilitySharedLogic
+    clearEvalFilters: () => {
+        value: true
+    }
+    loadClusterMetricsForRun: (run: ClusteringRun) => {
+        run: ClusteringRun
+    }
+    loadClusteringRun: (runId: string) => string
+    loadClusteringRunFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadClusteringRunSuccess: (
+        currentRun: ClusteringRun | null,
+        payload?: string
+    ) => {
+        currentRun: ClusteringRun | null
+        payload?: string
+    }
+    loadClusteringRuns: () => any
+    loadClusteringRunsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadClusteringRunsSuccess: (
+        clusteringRuns: {
+            label: string
+            runId: string
+            windowEnd: string
+        }[],
+        payload?: any
+    ) => {
+        clusteringRuns: {
+            label: string
+            runId: string
+            windowEnd: string
+        }[]
+        payload?: any
+    }
+    loadEvaluationAttributesForRun: (run: ClusteringRun) => {
+        run: ClusteringRun
+    }
+    loadPropertyFilteredItemIds: () => {
+        value: true
+    }
+    loadPropertyFilteredItemIdsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPropertyFilteredItemIdsSuccess: (
+        propertyFilteredItemIds: Set<string> | null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        propertyFilteredItemIds: Set<string> | null
+        payload?: {
+            value: true
+        }
+    }
+    loadTraceSummariesForRun: (run: ClusteringRun) => {
+        run: ClusteringRun
+    }
+    setClusterMetrics: (metrics: Record<number, ClusterMetrics>) => {
+        metrics: Record<number, ClusterMetrics>
+    }
+    setClusterMetricsLoading: (loading: boolean) => {
+        loading: boolean
+    }
+    setClusteringLevel: (level: ClusteringLevel) => {
+        level: ClusteringLevel
+    }
+    setEvalEvaluatorNamesFilter: (names: string[]) => {
+        names: string[]
+    }
+    setEvalVerdictsFilter: (verdicts: EvaluationVerdict[]) => {
+        verdicts: EvaluationVerdict[]
+    }
+    setEvaluationItemAttributes: (attributes: Record<string, EvaluationItemAttributes>) => {
+        attributes: Record<string, EvaluationItemAttributes>
+    }
+    setSelectedRunId: (runId: string | null) => {
+        runId: string | null
+    }
+    setTraceSummaries: (summaries: Record<string, TraceSummary>) => {
+        summaries: Record<string, TraceSummary>
+    }
+    setTraceSummariesLoading: (loading: boolean) => {
+        loading: boolean
+    }
+    syncClusteringLevelFromRun: (level: ClusteringLevel) => {
+        level: ClusteringLevel
+    }
+    toggleClusterExpanded: (clusterId: number) => {
+        clusterId: number
+    }
+    toggleScatterPlotExpanded: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface clustersLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        effectiveRunId: (selectedRunId: string | null, clusteringRuns: ClusteringRunOption[]) => string | null
+        currentRunMatchesLevel: (currentRun: ClusteringRun | null, clusteringLevel: ClusteringLevel) => boolean
+        sortedClusters: (currentRun: ClusteringRun | null, currentRunMatchesLevel: boolean) => Cluster[]
+        evalFiltersActive: (
+            clusteringLevel: ClusteringLevel,
+            evalFilterEvaluatorNames: string[],
+            evalFilterVerdicts: EvaluationVerdict[]
+        ) => boolean
+        availableEvaluatorNames: (evaluationItemAttributes: Record<string, EvaluationItemAttributes>) => {
+            count: number
+            name: string
+        }[]
+        availableVerdictCounts: (
+            evaluationItemAttributes: Record<string, EvaluationItemAttributes>
+        ) => Record<EvaluationVerdict, number>
+        evalFilterPredicate: (
+            clusteringLevel: ClusteringLevel,
+            evaluationItemAttributes: Record<string, EvaluationItemAttributes>,
+            evalFilterEvaluatorNames: string[],
+            evalFilterVerdicts: EvaluationVerdict[]
+        ) => (evalId: string) => boolean
+        propertyFiltersActive: (propertyFilters: AnyPropertyFilter[], shouldFilterTestAccounts: boolean) => boolean
+        anyFiltersActive: (evalFiltersActive: boolean, propertyFiltersActive: boolean) => boolean
+        clusterMembershipPredicate: (
+            evalFilterPredicate: (evalId: string) => boolean,
+            propertyFilteredItemIds: Set<string> | null
+        ) => (id: string) => boolean
+        filteredSortedClusters: (
+            sortedClusters: Cluster[],
+            clusterMembershipPredicate: (id: string) => boolean,
+            anyFiltersActive: boolean
+        ) => Cluster[]
+        filteredItemCount: (filteredSortedClusters: Cluster[]) => number
+        totalItemCount: (sortedClusters: Cluster[]) => number
+        isClusterExpanded: (expandedClusterIds: Set<number>) => (clusterId: number) => boolean
+        traceToClusterTitle: (sortedClusters: Cluster[]) => Record<string, string>
+        scatterPlotDatasets: (filteredSortedClusters: Cluster[]) => ScatterDataset[]
+    }
+}
+
+export type clustersLogicType = MakeLogicType<
+    clustersLogicValues,
+    clustersLogicActions,
+    ClustersLogicProps,
+    clustersLogicMeta
+>
+
 export const clustersLogic = kea<clustersLogicType>([
     path(['products', 'ai_observability', 'frontend', 'clusters', 'clustersLogic']),
     props({} as ClustersLogicProps),
diff --git a/products/ai_observability/frontend/components/EvalsTabContent.tsx b/products/ai_observability/frontend/components/EvalsTabContent.tsx
index 62921cc45fac..29abe0ba0d0a 100644
--- a/products/ai_observability/frontend/components/EvalsTabContent.tsx
+++ b/products/ai_observability/frontend/components/EvalsTabContent.tsx
@@ -12,7 +12,7 @@ import { LLMTraceEvent } from '~/queries/schema/schema-general'
 import { aiObservabilityTraceLogic } from '../aiObservabilityTraceLogic'
 import { llmEvaluationsLogic } from '../evaluations/llmEvaluationsLogic'
 import { generationEvaluationRunsLogic } from '../generationEvaluationRunsLogic'
-import { generationEvaluationRunsLogicType } from '../generationEvaluationRunsLogicType'
+import type { generationEvaluationRunsLogicType } from '../generationEvaluationRunsLogic'
 import { llmEvaluationExecutionLogic } from '../llmEvaluationExecutionLogic'
 import { formatLLMEventTitle } from '../utils'
 import { GenerationEvalRunsTable } from './GenerationEvalRunsTable'
diff --git a/products/ai_observability/frontend/components/GenerationEvalRunsTable.tsx b/products/ai_observability/frontend/components/GenerationEvalRunsTable.tsx
index 0b724f42bb76..904e1d7c4481 100644
--- a/products/ai_observability/frontend/components/GenerationEvalRunsTable.tsx
+++ b/products/ai_observability/frontend/components/GenerationEvalRunsTable.tsx
@@ -7,7 +7,7 @@ import { LemonTableColumns } from 'lib/lemon-ui/LemonTable'
 import { urls } from 'scenes/urls'
 
 import { EvaluationRun } from '../evaluations/types'
-import { generationEvaluationRunsLogicType } from '../generationEvaluationRunsLogicType'
+import type { generationEvaluationRunsLogicType } from '../generationEvaluationRunsLogic'
 import { EvaluationResultTag, getEvaluationResultSortValue } from './EvaluationResultTag'
 import { EvaluationRunTargetCell } from './EvaluationRunTargetCell'
 
diff --git a/products/ai_observability/frontend/components/TraceTimeline/traceTimelineLogic.ts b/products/ai_observability/frontend/components/TraceTimeline/traceTimelineLogic.ts
index 8fff51e8358a..3173877ac423 100644
--- a/products/ai_observability/frontend/components/TraceTimeline/traceTimelineLogic.ts
+++ b/products/ai_observability/frontend/components/TraceTimeline/traceTimelineLogic.ts
@@ -1,7 +1,20 @@
-import { actions, kea, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers } from 'kea'
 
 import { buildAiObservabilityStorageConfig } from '../../preferenceStorage'
-import type { traceTimelineLogicType } from './traceTimelineLogicType'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface traceTimelineLogicValues {
+    collapsed: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface traceTimelineLogicActions {
+    setCollapsed: (collapsed: boolean) => {
+        collapsed: boolean
+    }
+}
+
+export type traceTimelineLogicType = MakeLogicType<traceTimelineLogicValues, traceTimelineLogicActions>
 
 export const traceTimelineLogic = kea<traceTimelineLogicType>([
     path(['products', 'ai_observability', 'frontend', 'components', 'TraceTimeline', 'traceTimelineLogic']),
diff --git a/products/ai_observability/frontend/components/clustersTabContentLogic.ts b/products/ai_observability/frontend/components/clustersTabContentLogic.ts
index 6cbd0efc6ba7..4d0317d67e3c 100644
--- a/products/ai_observability/frontend/components/clustersTabContentLogic.ts
+++ b/products/ai_observability/frontend/components/clustersTabContentLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, key, listeners, path, props } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, key, listeners, path, props } from 'kea'
 import { loaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
@@ -8,7 +8,6 @@ import { hogql } from '~/queries/utils'
 
 import { CLUSTERING_RUNS_LOOKBACK_DAYS, NOISE_CLUSTER_ID } from '../clusters/constants'
 import { Cluster } from '../clusters/types'
-import type { clustersTabContentLogicType } from './clustersTabContentLogicType'
 
 export interface ClusterInfo {
     runId: string
@@ -23,6 +22,46 @@ export interface ClustersTabContentLogicProps {
     traceId: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface clustersTabContentLogicValues {
+    clusters: ClusterInfo[]
+    clustersLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface clustersTabContentLogicActions {
+    loadClusters: () => any
+    loadClustersFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadClustersSuccess: (
+        clusters: ClusterInfo[],
+        payload?: any
+    ) => {
+        clusters: ClusterInfo[]
+        payload?: any
+    }
+    refreshClusters: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface clustersTabContentLogicMeta {
+    key: string
+}
+
+export type clustersTabContentLogicType = MakeLogicType<
+    clustersTabContentLogicValues,
+    clustersTabContentLogicActions,
+    ClustersTabContentLogicProps,
+    clustersTabContentLogicMeta
+>
+
 export const clustersTabContentLogic = kea<clustersTabContentLogicType>([
     path(['products', 'ai_observability', 'frontend', 'components', 'clustersTabContentLogic']),
     props({} as ClustersTabContentLogicProps),
diff --git a/products/ai_observability/frontend/datasets/aiObservabilityDatasetLogic.ts b/products/ai_observability/frontend/datasets/aiObservabilityDatasetLogic.ts
index cffbffba384e..7d46d834c5da 100644
--- a/products/ai_observability/frontend/datasets/aiObservabilityDatasetLogic.ts
+++ b/products/ai_observability/frontend/datasets/aiObservabilityDatasetLogic.ts
@@ -1,5 +1,19 @@
-import { actions, afterMount, connect, defaults, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    afterMount,
+    connect,
+    defaults,
+    kea,
+    key,
+    listeners,
+    path,
+    props,
+    reducers,
+    selectors,
+} from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { combineUrl, router, urlToAction } from 'kea-router'
 
@@ -15,8 +29,8 @@ import { teamLogic } from '~/scenes/teamLogic'
 import { urls } from '~/scenes/urls'
 import { Breadcrumb, Dataset, DatasetItem } from '~/types'
 
+import type { ProductIntentProperties } from '../../../../frontend/src/lib/utils/product-intents'
 import { truncateValue } from '../utils'
-import type { aiObservabilityDatasetLogicType } from './aiObservabilityDatasetLogicType'
 import { aiObservabilityDatasetsLogic } from './aiObservabilityDatasetsLogic'
 import { EMPTY_JSON, coerceJsonToObject, isStringJsonObject, prettifyJson } from './utils'
 
@@ -53,6 +67,167 @@ function cleanFilters(values: Partial<DatasetItemsFilters>): DatasetItemsFilters
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilityDatasetLogicValues {
+    activeTab: DatasetTab
+    breadcrumbs: Breadcrumb[]
+    dataset: Dataset | DatasetFormValues | null
+    datasetForm: DatasetFormValues
+    datasetFormAllErrors: Record<string, any>
+    datasetFormChanged: boolean
+    datasetFormErrors: DeepPartialMap<DatasetFormValues, ValidationErrorType>
+    datasetFormHasErrors: boolean
+    datasetFormManualErrors: Record<string, any>
+    datasetFormTouched: boolean
+    datasetFormTouches: Record<string, boolean>
+    datasetFormValidationErrors: DeepPartialMap<DatasetFormValues, ValidationErrorType>
+    datasetItems: CountedPaginatedResponse<DatasetItem>
+    datasetItemsCount: number
+    datasetItemsLoading: boolean
+    datasetLoading: boolean
+    filters: DatasetItemsFilters
+    isDatasetFormSubmitting: boolean
+    isDatasetFormValid: boolean
+    isDatasetItemModalOpen: boolean
+    isDatasetMissing: boolean
+    isDeletingDataset: boolean
+    isEditingDataset: boolean
+    isNewDataset: boolean
+    pagination: PaginationManual
+    rawFilters: Partial<DatasetItemsFilters> | null
+    selectedDatasetItem: DatasetItem | null
+    shouldDisplaySkeleton: boolean
+    showDatasetFormErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilityDatasetLogicActions {
+    addProductIntent: (properties: ProductIntentProperties) => ProductIntentProperties // teamLogic
+    closeModalAndRefetchDatasetItems: (refetchDatasetItems?: boolean) => {
+        refetchDatasetItems: boolean | undefined
+    }
+    deleteDataset: () => {
+        value: true
+    }
+    deleteDatasetItem: (itemId: string) => {
+        itemId: string
+    }
+    editDataset: (editing: boolean) => {
+        editing: boolean
+    }
+    loadDataset: () => any
+    loadDatasetFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadDatasetItems: (debounce?: boolean) => boolean
+    loadDatasetItemsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadDatasetItemsSuccess: (
+        datasetItems: CountedPaginatedResponse<DatasetItem>,
+        payload?: boolean
+    ) => {
+        datasetItems: CountedPaginatedResponse<DatasetItem>
+        payload?: boolean
+    }
+    loadDatasetSuccess: (
+        dataset: Dataset,
+        payload?: any
+    ) => {
+        dataset: Dataset
+        payload?: any
+    }
+    onUnmount: () => {
+        value: true
+    }
+    resetDatasetForm: (values?: DatasetFormValues) => {
+        values?: DatasetFormValues
+    }
+    setActiveTab: (tab: DatasetTab) => {
+        tab: DatasetTab
+    }
+    setDataset: (dataset: Dataset | DatasetFormValues) => {
+        dataset: Dataset | DatasetFormValues
+    }
+    setDatasetFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setDatasetFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setDatasetFormValues: (values: DeepPartial<DatasetFormValues>) => {
+        values: DeepPartial<DatasetFormValues>
+    }
+    setDeletingDataset: (deleting: boolean) => {
+        deleting: boolean
+    }
+    setFilters: (
+        filters: Partial<DatasetItemsFilters>,
+        debounce?: boolean
+    ) => {
+        debounce: boolean
+        filters: Partial<DatasetItemsFilters>
+    }
+    setSelectedDatasetItem: (datasetItem: DatasetItem) => {
+        datasetItem: DatasetItem
+    }
+    submitDatasetForm: () => {
+        value: boolean
+    }
+    submitDatasetFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitDatasetFormRequest: (datasetForm: DatasetFormValues) => {
+        datasetForm: DatasetFormValues
+    }
+    submitDatasetFormSuccess: (datasetForm: DatasetFormValues) => {
+        datasetForm: DatasetFormValues
+    }
+    touchDatasetFormField: (key: string) => {
+        key: string
+    }
+    triggerDatasetItemModal: (open: boolean) => {
+        open: boolean
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilityDatasetLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        isNewDataset: (arg: any) => boolean
+        isDatasetMissing: (dataset: Dataset | DatasetFormValues | null, datasetLoading: boolean) => boolean
+        shouldDisplaySkeleton: (dataset: Dataset | DatasetFormValues | null, datasetLoading: boolean) => boolean
+        filters: (rawFilters: Partial<DatasetItemsFilters> | null) => DatasetItemsFilters
+        datasetItemsCount: (datasetItems: CountedPaginatedResponse<DatasetItem>) => number
+        pagination: (filters: DatasetItemsFilters, datasetItemsCount: number) => PaginationManual
+        breadcrumbs: (dataset: Dataset | DatasetFormValues | null, searchParams: Record<string, any>) => Breadcrumb[]
+    }
+}
+
+export type aiObservabilityDatasetLogicType = MakeLogicType<
+    aiObservabilityDatasetLogicValues,
+    aiObservabilityDatasetLogicActions,
+    DatasetLogicProps,
+    aiObservabilityDatasetLogicMeta
+>
+
 export const aiObservabilityDatasetLogic = kea<aiObservabilityDatasetLogicType>([
     path(['scenes', 'ai-observability', 'aiObservabilityDatasetLogic']),
 
@@ -234,12 +409,13 @@ export const aiObservabilityDatasetLogic = kea<aiObservabilityDatasetLogicType>(
 
         isDatasetMissing: [
             (s) => [s.dataset, s.datasetLoading],
-            (dataset, datasetLoading) => !datasetLoading && dataset === null,
+            (dataset: Dataset | DatasetFormValues | null, datasetLoading: boolean) =>
+                !datasetLoading && dataset === null,
         ],
 
         shouldDisplaySkeleton: [
             (s) => [s.dataset, s.datasetLoading],
-            (dataset, datasetLoading) => !dataset && datasetLoading,
+            (dataset: Dataset | DatasetFormValues | null, datasetLoading: boolean) => !dataset && datasetLoading,
         ],
 
         filters: [
diff --git a/products/ai_observability/frontend/datasets/aiObservabilityDatasetsLogic.ts b/products/ai_observability/frontend/datasets/aiObservabilityDatasetsLogic.ts
index ceba42aea581..c3a43d0d8910 100644
--- a/products/ai_observability/frontend/datasets/aiObservabilityDatasetsLogic.ts
+++ b/products/ai_observability/frontend/datasets/aiObservabilityDatasetsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router, urlToAction } from 'kea-router'
 
@@ -15,7 +15,6 @@ import { urls } from '~/scenes/urls'
 import { Dataset } from '~/types'
 
 import { cleanPagedSearchOrderParams } from '../utils'
-import type { aiObservabilityDatasetsLogicType } from './aiObservabilityDatasetsLogicType'
 
 export const DATASETS_PER_PAGE = 30
 
@@ -35,6 +34,73 @@ function cleanFilters(values: Partial<DatasetFilters>): DatasetFilters {
 
 export type AIObservabilityDatasetsLogicProps = Record<string, never>
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilityDatasetsLogicValues {
+    count: number
+    datasetCountLabel: string
+    datasets: CountedPaginatedResponse<Dataset>
+    datasetsLoading: boolean
+    filters: DatasetFilters
+    pagination: PaginationManual
+    rawFilters: Partial<DatasetFilters> | null
+    sorting: Sorting | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilityDatasetsLogicActions {
+    deleteDataset: (datasetId: string) => {
+        datasetId: string
+    }
+    loadDatasets: (debounce?: boolean) => {
+        debounce: boolean
+    }
+    loadDatasetsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadDatasetsSuccess: (
+        datasets: CountedPaginatedResponse<Dataset>,
+        payload?: {
+            debounce: boolean
+        }
+    ) => {
+        datasets: CountedPaginatedResponse<Dataset>
+        payload?: {
+            debounce: boolean
+        }
+    }
+    setFilters: (
+        filters: Partial<DatasetFilters>,
+        merge?: boolean,
+        debounce?: boolean
+    ) => {
+        debounce: boolean
+        filters: Partial<DatasetFilters>
+        merge: boolean
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilityDatasetsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        filters: (rawFilters: Partial<DatasetFilters> | null) => DatasetFilters
+        count: (datasets: CountedPaginatedResponse<Dataset>) => number
+        sorting: (filters: DatasetFilters) => Sorting | null
+        pagination: (filters: DatasetFilters, count: number) => PaginationManual
+        datasetCountLabel: (filters: DatasetFilters, count: number) => string
+    }
+}
+
+export type aiObservabilityDatasetsLogicType = MakeLogicType<
+    aiObservabilityDatasetsLogicValues,
+    aiObservabilityDatasetsLogicActions,
+    AIObservabilityDatasetsLogicProps,
+    aiObservabilityDatasetsLogicMeta
+>
+
 export const aiObservabilityDatasetsLogic = kea<aiObservabilityDatasetsLogicType>([
     path(['scenes', 'ai-observability', 'aiObservabilityDatasetsLogic']),
     props({} as AIObservabilityDatasetsLogicProps),
@@ -139,7 +205,7 @@ export const aiObservabilityDatasetsLogic = kea<aiObservabilityDatasetsLogicType
 
         datasetCountLabel: [
             (s) => [s.filters, s.count],
-            (filters, count) => {
+            (filters: DatasetFilters, count: number) => {
                 const start = (filters.page - 1) * DATASETS_PER_PAGE + 1
                 const end = Math.min(filters.page * DATASETS_PER_PAGE, count)
 
diff --git a/products/ai_observability/frontend/datasets/datasetItemModalLogic.ts b/products/ai_observability/frontend/datasets/datasetItemModalLogic.ts
index cdd08e22ee03..47bf9dc8dfd0 100644
--- a/products/ai_observability/frontend/datasets/datasetItemModalLogic.ts
+++ b/products/ai_observability/frontend/datasets/datasetItemModalLogic.ts
@@ -1,12 +1,12 @@
-import { actions, defaults, kea, key, path, props, propsChanged, reducers } from 'kea'
+import { MakeLogicType, actions, defaults, kea, key, path, props, propsChanged, reducers } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 
 import { lemonToast } from '@posthog/lemon-ui'
 
 import api from '~/lib/api'
 import { DatasetItem } from '~/types'
 
-import type { datasetItemModalLogicType } from './datasetItemModalLogicType'
 import { EMPTY_JSON, coerceJsonToObject, isStringJsonObject, prettifyJson } from './utils'
 
 export type TraceMetadata = Required<Pick<DatasetItem, 'ref_trace_id' | 'ref_source_id' | 'ref_timestamp'>>
@@ -41,6 +41,81 @@ const FORM_DEFAULT_VALUE: DatasetItemFormValues = {
     metadata: EMPTY_JSON,
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface datasetItemModalLogicValues {
+    datasetItemForm: DatasetItemFormValues
+    datasetItemFormAllErrors: Record<string, any>
+    datasetItemFormChanged: boolean
+    datasetItemFormErrors: DeepPartialMap<DatasetItemFormValues, ValidationErrorType>
+    datasetItemFormHasErrors: boolean
+    datasetItemFormManualErrors: Record<string, any>
+    datasetItemFormTouched: boolean
+    datasetItemFormTouches: Record<string, boolean>
+    datasetItemFormValidationErrors: DeepPartialMap<DatasetItemFormValues, ValidationErrorType>
+    isDatasetItemFormSubmitting: boolean
+    isDatasetItemFormValid: boolean
+    refetchDatasetItems: boolean
+    shouldCloseModal: boolean
+    showDatasetItemFormErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface datasetItemModalLogicActions {
+    resetDatasetItemForm: (values?: DatasetItemFormValues) => {
+        values?: DatasetItemFormValues
+    }
+    setDatasetItemFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setDatasetItemFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setDatasetItemFormValues: (values: DeepPartial<DatasetItemFormValues>) => {
+        values: DeepPartial<DatasetItemFormValues>
+    }
+    setRefetchDatasetItems: (refetchDatasetItems: boolean) => {
+        refetchDatasetItems: boolean
+    }
+    setShouldCloseModal: (shouldCloseModal: boolean) => {
+        shouldCloseModal: boolean
+    }
+    submitDatasetItemForm: () => {
+        value: boolean
+    }
+    submitDatasetItemFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitDatasetItemFormRequest: (datasetItemForm: DatasetItemFormValues) => {
+        datasetItemForm: DatasetItemFormValues
+    }
+    submitDatasetItemFormSuccess: (datasetItemForm: DatasetItemFormValues) => {
+        datasetItemForm: DatasetItemFormValues
+    }
+    touchDatasetItemFormField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface datasetItemModalLogicMeta {
+    key: string
+}
+
+export type datasetItemModalLogicType = MakeLogicType<
+    datasetItemModalLogicValues,
+    datasetItemModalLogicActions,
+    DatasetItemModalLogicProps,
+    datasetItemModalLogicMeta
+>
+
 export const datasetItemModalLogic = kea<datasetItemModalLogicType>([
     path(['scenes', 'ai-observability', 'datasetItemModalLogic']),
 
diff --git a/products/ai_observability/frontend/datasets/saveToDatasetButtonLogic.ts b/products/ai_observability/frontend/datasets/saveToDatasetButtonLogic.ts
index ef51e439659b..d8658cf99158 100644
--- a/products/ai_observability/frontend/datasets/saveToDatasetButtonLogic.ts
+++ b/products/ai_observability/frontend/datasets/saveToDatasetButtonLogic.ts
@@ -1,5 +1,17 @@
-import { actions, afterMount, beforeUnmount, kea, listeners, path, props, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    afterMount,
+    beforeUnmount,
+    kea,
+    listeners,
+    path,
+    props,
+    reducers,
+    selectors,
+} from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { encodeParams, router } from 'kea-router'
 
@@ -9,8 +21,6 @@ import { urls } from 'scenes/urls'
 import api from '~/lib/api'
 import { Dataset, DatasetItem } from '~/types'
 
-import type { saveToDatasetButtonLogicType } from './saveToDatasetButtonLogicType'
-
 export interface saveToDatasetButtonLogicProps {
     partialDatasetItem: Partial<DatasetItem> | null
 }
@@ -23,6 +33,145 @@ export interface SearchFormValues {
     datasetId: string | null
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface saveToDatasetButtonLogicValues {
+    datasetStore: Record<string, Dataset[]>
+    datasetStoreLoading: boolean
+    datasets: Dataset[] | null
+    dropdownVisible: boolean
+    editMode: 'create' | 'edit'
+    isLoadingDatasets: boolean
+    isModalMounted: boolean
+    isModalOpen: boolean
+    isSearchFormSubmitting: boolean
+    isSearchFormValid: boolean
+    recentDatasetIds: string[]
+    recentDatasets: Dataset[]
+    recentDatasetsLoading: boolean
+    searchForm: SearchFormValues
+    searchFormAllErrors: Record<string, any>
+    searchFormChanged: boolean
+    searchFormErrors: DeepPartialMap<SearchFormValues, ValidationErrorType>
+    searchFormHasErrors: boolean
+    searchFormManualErrors: Record<string, any>
+    searchFormTouched: boolean
+    searchFormTouches: Record<string, boolean>
+    searchFormValidationErrors: DeepPartialMap<SearchFormValues, ValidationErrorType>
+    selectedDataset: Dataset | null
+    showSearchFormErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface saveToDatasetButtonLogicActions {
+    loadDatasets: (debounce?: boolean) => boolean
+    loadDatasetsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadDatasetsSuccess: (
+        datasetStore: {
+            [x: string]: Dataset[]
+        },
+        payload?: boolean
+    ) => {
+        datasetStore: {
+            [x: string]: Dataset[]
+        }
+        payload?: boolean
+    }
+    loadRecentDatasets: (debounce?: boolean) => boolean
+    loadRecentDatasetsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRecentDatasetsSuccess: (
+        recentDatasets: Dataset[],
+        payload?: boolean
+    ) => {
+        recentDatasets: Dataset[]
+        payload?: boolean
+    }
+    resetSearchForm: (values?: SearchFormValues) => {
+        values?: SearchFormValues
+    }
+    setDropdownVisible: (dropdownVisible: boolean) => {
+        dropdownVisible: boolean
+    }
+    setEditMode: (editMode: 'create' | 'edit') => {
+        editMode: 'create' | 'edit'
+    }
+    setIsModalOpen: (isModalOpen: boolean) => {
+        isModalOpen: boolean
+    }
+    setRecentDatasetIds: (recentDatasetIds: string[]) => {
+        recentDatasetIds: string[]
+    }
+    setRecentDatasets: (recentDatasets: Dataset[]) => {
+        recentDatasets: Dataset[]
+    }
+    setSearchFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setSearchFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setSearchFormValues: (values: DeepPartial<SearchFormValues>) => {
+        values: DeepPartial<SearchFormValues>
+    }
+    setSelectedDataset: (dataset: Dataset | null) => {
+        dataset: Dataset | null
+    }
+    submitSearchForm: () => {
+        value: boolean
+    }
+    submitSearchFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitSearchFormRequest: (searchForm: SearchFormValues) => {
+        searchForm: SearchFormValues
+    }
+    submitSearchFormSuccess: (searchForm: SearchFormValues) => {
+        searchForm: SearchFormValues
+    }
+    touchSearchFormField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface saveToDatasetButtonLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        datasets: (datasetStore: Record<string, Dataset[]>, searchForm: SearchFormValues) => Dataset[] | null
+        isLoadingDatasets: (
+            datasets: Dataset[] | null,
+            datasetStoreLoading: boolean,
+            recentDatasetsLoading: boolean
+        ) => boolean
+        isModalMounted: (editMode: 'create' | 'edit') => boolean
+    }
+}
+
+export type saveToDatasetButtonLogicType = MakeLogicType<
+    saveToDatasetButtonLogicValues,
+    saveToDatasetButtonLogicActions,
+    saveToDatasetButtonLogicProps,
+    saveToDatasetButtonLogicMeta
+>
+
 export const saveToDatasetButtonLogic = kea<saveToDatasetButtonLogicType>([
     path(['scenes', 'ai-observability', 'saveToDatasetButtonLogic']),
 
@@ -208,7 +357,7 @@ export const saveToDatasetButtonLogic = kea<saveToDatasetButtonLogicType>([
     selectors({
         datasets: [
             (s) => [s.datasetStore, s.searchForm],
-            (datasetStore, searchForm): Dataset[] | null => {
+            (datasetStore: Record<string, Dataset[]>, searchForm: SearchFormValues): Dataset[] | null => {
                 const storageKey = getStorageKey(searchForm.search)
                 return datasetStore[storageKey] ?? null
             },
@@ -216,14 +365,14 @@ export const saveToDatasetButtonLogic = kea<saveToDatasetButtonLogicType>([
 
         isLoadingDatasets: [
             (s) => [s.datasets, s.datasetStoreLoading, s.recentDatasetsLoading],
-            (datasets, datasetStoreLoading, recentDatasetsLoading): boolean => {
+            (datasets: Dataset[] | null, datasetStoreLoading: boolean, recentDatasetsLoading: boolean): boolean => {
                 return !datasets && (datasetStoreLoading || recentDatasetsLoading)
             },
         ],
 
         isModalMounted: [
             (s) => [s.editMode],
-            (editMode): boolean => {
+            (editMode: 'create' | 'edit'): boolean => {
                 return editMode === 'edit'
             },
         ],
diff --git a/products/ai_observability/frontend/evaluations/evaluationMetricsLogic.ts b/products/ai_observability/frontend/evaluations/evaluationMetricsLogic.ts
index 1b4b62140df1..bb3f2193f7de 100644
--- a/products/ai_observability/frontend/evaluations/evaluationMetricsLogic.ts
+++ b/products/ai_observability/frontend/evaluations/evaluationMetricsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, props, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, props, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -9,7 +9,6 @@ import { ChartDisplayType, HogQLMathType } from '~/types'
 
 // eslint-disable-next-line import/no-cycle
 import { PASS_RATE_SUCCESS_THRESHOLD } from './components/EvaluationMetrics'
-import type { evaluationMetricsLogicType } from './evaluationMetricsLogicType'
 import { llmEvaluationsLogic } from './llmEvaluationsLogic'
 import { EvaluationConfig } from './types'
 
@@ -59,6 +58,96 @@ function getIntervalFromDateRange(dateFrom: string | null): 'hour' | 'day' {
     return duration.asDays() <= 1 ? 'hour' : 'day'
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface evaluationMetricsLogicValues {
+    dateFilter: {
+        dateFrom: string | null
+        dateTo: string | null
+    } // llmEvaluationsLogic
+    evaluations: EvaluationConfig[] // llmEvaluationsLogic
+    chartQuery: TrendsQuery | null
+    evaluationsWithMetrics: Array<
+        EvaluationConfig & {
+            stats?: EvaluationStats
+        }
+    >
+    stats: EvaluationStats[]
+    statsLoading: boolean
+    summaryMetrics: SummaryMetrics
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface evaluationMetricsLogicActions {
+    setDates: (
+        dateFrom: string | null,
+        dateTo: string | null
+    ) => {
+        dateFrom: string | null
+        dateTo: string | null
+    } // llmEvaluationsLogic
+    loadStats: () => any
+    loadStatsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadStatsSuccess: (
+        stats: {
+            applicability_rate: number
+            applicable_count: number
+            evaluation_id: string
+            pass_count: number
+            pass_rate: number
+            runs_count: number
+        }[],
+        payload?: any
+    ) => {
+        stats: {
+            applicability_rate: number
+            applicable_count: number
+            evaluation_id: string
+            pass_count: number
+            pass_rate: number
+            runs_count: number
+        }[]
+        payload?: any
+    }
+    refreshMetrics: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface evaluationMetricsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        summaryMetrics: (stats: EvaluationStats[]) => SummaryMetrics
+        evaluationsWithMetrics: (
+            evaluations: EvaluationConfig[],
+            stats: EvaluationStats[]
+        ) => Array<
+            EvaluationConfig & {
+                stats?: EvaluationStats
+            }
+        >
+        chartQuery: (
+            evaluations: EvaluationConfig[],
+            dateFilter: {
+                dateFrom: string | null
+                dateTo: string | null
+            }
+        ) => TrendsQuery | null
+    }
+}
+
+export type evaluationMetricsLogicType = MakeLogicType<
+    evaluationMetricsLogicValues,
+    evaluationMetricsLogicActions,
+    EvaluationMetricsLogicProps,
+    evaluationMetricsLogicMeta
+>
+
 export const evaluationMetricsLogic = kea<evaluationMetricsLogicType>([
     path(['products', 'ai_observability', 'frontend', 'evaluations', 'evaluationMetricsLogic']),
     props({} as EvaluationMetricsLogicProps),
diff --git a/products/ai_observability/frontend/evaluations/evaluationReportLogic.ts b/products/ai_observability/frontend/evaluations/evaluationReportLogic.ts
index 02dc9d889860..7ff4aedaaeca 100644
--- a/products/ai_observability/frontend/evaluations/evaluationReportLogic.ts
+++ b/products/ai_observability/frontend/evaluations/evaluationReportLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from 'lib/lemon-ui/LemonToast'
@@ -11,7 +11,6 @@ import {
     llmAnalyticsEvaluationReportsPartialUpdate,
     llmAnalyticsEvaluationReportsRunsList,
 } from '../generated/api'
-import type { evaluationReportLogicType } from './evaluationReportLogicType'
 import type {
     EvaluationReport,
     EvaluationReportDeliveryTarget,
@@ -273,6 +272,209 @@ export async function persistReportDraft(
     return true
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface evaluationReportLogicValues {
+    currentTeamId: number | null // teamLogic
+    activeReport: EvaluationReport | null
+    configDraft: ReportConfigDraft
+    configError: string | null
+    configErrors: ReportConfigErrors
+    generateResult: null
+    generateResultLoading: boolean
+    isConfigDirty: boolean
+    isNewEvaluation: boolean
+    reportRuns: EvaluationReportRun[]
+    reportRunsLoading: boolean
+    reports: EvaluationReport[]
+    reportsLoading: boolean
+    selectedReportRun: EvaluationReportRun | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface evaluationReportLogicActions {
+    createReport: (params: {
+        cooldown_minutes?: number | null
+        delivery_targets: EvaluationReportDeliveryTarget[]
+        enabled: boolean
+        evaluationId: string
+        frequency: EvaluationReportFrequency
+        report_prompt_guidance?: string
+        rrule?: string
+        trigger_threshold?: number | null
+    }) => {
+        evaluationId: string
+        enabled: boolean
+        frequency: EvaluationReportFrequency
+        rrule?: string
+        delivery_targets: EvaluationReportDeliveryTarget[]
+        report_prompt_guidance?: string
+        trigger_threshold?: number | null
+        cooldown_minutes?: number | null
+    }
+    createReportFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    createReportSuccess: (
+        reports: EvaluationReport[],
+        payload?: {
+            evaluationId: string
+            enabled: boolean
+            frequency: EvaluationReportFrequency
+            rrule?: string
+            delivery_targets: EvaluationReportDeliveryTarget[]
+            report_prompt_guidance?: string
+            trigger_threshold?: number | null
+            cooldown_minutes?: number | null
+        }
+    ) => {
+        reports: EvaluationReport[]
+        payload?: {
+            evaluationId: string
+            enabled: boolean
+            frequency: EvaluationReportFrequency
+            rrule?: string
+            delivery_targets: EvaluationReportDeliveryTarget[]
+            report_prompt_guidance?: string
+            trigger_threshold?: number | null
+            cooldown_minutes?: number | null
+        }
+    }
+    generateReport: (reportId: string) => string
+    generateReportFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    generateReportSuccess: (
+        generateResult: null,
+        payload?: string
+    ) => {
+        generateResult: null
+        payload?: string
+    }
+    loadReportRuns: (reportId: string) => string
+    loadReportRunsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadReportRunsSuccess: (
+        reportRuns: EvaluationReportRun[],
+        payload?: string
+    ) => {
+        reportRuns: EvaluationReportRun[]
+        payload?: string
+    }
+    loadReports: () => any
+    loadReportsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadReportsSuccess: (
+        reports: EvaluationReport[],
+        payload?: any
+    ) => {
+        reports: EvaluationReport[]
+        payload?: any
+    }
+    resetDraft: () => {
+        value: true
+    }
+    saveDraft: () => {
+        value: true
+    }
+    seedDraftFromReport: (report: EvaluationReport) => {
+        report: EvaluationReport
+    }
+    selectReportRun: (reportRun: EvaluationReportRun | null) => {
+        reportRun: EvaluationReportRun | null
+    }
+    setDraftCooldownHours: (cooldownHours: number) => {
+        cooldownHours: number
+    }
+    setDraftEmailValue: (emailValue: string) => {
+        emailValue: string
+    }
+    setDraftEnabled: (enabled: boolean) => {
+        enabled: boolean
+    }
+    setDraftFrequency: (frequency: EvaluationReportFrequency) => {
+        frequency: EvaluationReportFrequency
+    }
+    setDraftReportPromptGuidance: (reportPromptGuidance: string) => {
+        reportPromptGuidance: string
+    }
+    setDraftScheduleCadence: (cadence: ReportScheduleCadence) => {
+        cadence: ReportScheduleCadence
+    }
+    setDraftSlackChannelValue: (channelValue: string) => {
+        channelValue: string
+    }
+    setDraftSlackIntegrationId: (integrationId: number | null) => {
+        integrationId: number | null
+    }
+    setDraftTriggerThreshold: (triggerThreshold: number) => {
+        triggerThreshold: number
+    }
+    toggleDraftScheduleWeekday: (weekday: ReportScheduleWeekday) => {
+        weekday: ReportScheduleWeekday
+    }
+    updateReport: ({ reportId, data }: { data: Partial<EvaluationReport>; reportId: string }) => {
+        reportId: string
+        data: Partial<EvaluationReport>
+    }
+    updateReportFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateReportSuccess: (
+        reports: EvaluationReport[],
+        payload?: {
+            reportId: string
+            data: Partial<EvaluationReport>
+        }
+    ) => {
+        reports: EvaluationReport[]
+        payload?: {
+            reportId: string
+            data: Partial<EvaluationReport>
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface evaluationReportLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        isNewEvaluation: (evaluationId: string) => boolean
+        configErrors: (configDraft: ReportConfigDraft) => ReportConfigErrors
+        configError: (configDraft: ReportConfigDraft) => string | null
+        activeReport: (reports: EvaluationReport[]) => EvaluationReport | null
+        isConfigDirty: (activeReport: EvaluationReport | null, configDraft: ReportConfigDraft) => boolean
+    }
+}
+
+export type evaluationReportLogicType = MakeLogicType<
+    evaluationReportLogicValues,
+    evaluationReportLogicActions,
+    EvaluationReportLogicProps,
+    evaluationReportLogicMeta
+>
+
 export const evaluationReportLogic = kea<evaluationReportLogicType>([
     path(['products', 'ai_observability', 'frontend', 'evaluations', 'evaluationReportLogic']),
     props({} as EvaluationReportLogicProps),
@@ -455,13 +657,13 @@ export const evaluationReportLogic = kea<evaluationReportLogicType>([
         ],
         activeReport: [
             (s) => [s.reports],
-            (reports): EvaluationReport | null => {
+            (reports: EvaluationReport[]): EvaluationReport | null => {
                 return reports.find((r: EvaluationReport) => !r.deleted) || null
             },
         ],
         isConfigDirty: [
             (s) => [s.activeReport, s.configDraft],
-            (activeReport, draft): boolean => {
+            (activeReport: EvaluationReport | null, draft: ReportConfigDraft): boolean => {
                 if (!activeReport) {
                     // No report yet: draft is "dirty" if it has any savable content.
                     return (
diff --git a/products/ai_observability/frontend/evaluations/llmEvaluationLogic.ts b/products/ai_observability/frontend/evaluations/llmEvaluationLogic.ts
index 00a0b5878b4d..b2cf3dbf6150 100644
--- a/products/ai_observability/frontend/evaluations/llmEvaluationLogic.ts
+++ b/products/ai_observability/frontend/evaluations/llmEvaluationLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { combineUrl, router, urlToAction } from 'kea-router'
 import posthog from 'posthog-js'
@@ -19,6 +19,7 @@ import {
 } from '../generated/api'
 import { parseTrialProviderKeyId } from '../ModelPicker'
 import { LLMProviderKey, llmProviderKeysLogic } from '../settings/llmProviderKeysLogic'
+import type { EvaluationTrialConfig } from '../settings/llmProviderKeysLogic'
 import { getUnhealthyProviderKey } from '../settings/providerKeyStateUtils'
 import { queryEvaluationRuns } from '../utils'
 import { evaluationErrorMessage } from './apiErrors'
@@ -31,7 +32,6 @@ import {
     isLLMJudgeEvaluation,
 } from './evaluationCapabilities'
 import { evaluationReportLogic, persistReportDraft } from './evaluationReportLogic'
-import type { llmEvaluationLogicType } from './llmEvaluationLogicType'
 import { EvaluationTemplateKey, defaultEvaluationTemplates } from './templates'
 import type {
     EvaluationConditionSet,
@@ -132,6 +132,247 @@ export interface LLMEvaluationLogicProps {
     evaluationType?: EvaluationType
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmEvaluationLogicValues {
+    isTrialGrandfathered: boolean // llmProviderKeysLogic
+    providerKeys: LLMProviderKey[] // llmProviderKeysLogic
+    providerKeysLoading: boolean // llmProviderKeysLogic
+    requiresProviderKey: boolean // llmProviderKeysLogic
+    activeTab: string
+    breadcrumbs: Breadcrumb[]
+    canEnable: boolean
+    canEnableReason: string | null
+    evaluation: EvaluationConfig | null
+    evaluationFormSubmitting: boolean
+    evaluationLoading: boolean
+    evaluationProviderKeyIssue: LLMProviderKey | null
+    evaluationRuns: EvaluationRun[]
+    evaluationRunsLoading: boolean
+    evaluationSummary: EvaluationSummary | null
+    evaluationSummaryError: boolean
+    evaluationSummaryFilter: EvaluationSummaryFilter
+    evaluationSummaryLoading: boolean
+    filteredEvaluationRuns: EvaluationRun[]
+    formValid: boolean
+    hasUnsavedChanges: boolean
+    hogTestResults: HogTestResult[] | null
+    hogTestResultsLoading: boolean
+    isForceRefresh: boolean
+    isNewEvaluation: boolean
+    maxContext: MaxContextInput[]
+    modelSelectionRequired: boolean
+    originalEvaluation: EvaluationConfig | null
+    runsLookup: Record<string, EvaluationRun>
+    runsSummary: {
+        applicabilityRate: number
+        errors: number
+        failed: number
+        successful: number
+        successRate: number
+        total: number
+    } | null
+    runsToSummarizeCount: number
+    selectedModel: string
+    selectedPickerProviderKeyId: string | null
+    summaryExpanded: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmEvaluationLogicActions {
+    loadEvaluationConfigSuccess: (
+        evaluationConfig: EvaluationTrialConfig | null,
+        payload?: any
+    ) => {
+        evaluationConfig: EvaluationTrialConfig | null
+        payload?: any
+    } // llmProviderKeysLogic
+    loadProviderKeys: () => any // llmProviderKeysLogic
+    clearHogTestResults: () => {
+        value: true
+    }
+    generateEvaluationSummary: ({ forceRefresh }: { forceRefresh?: boolean }) => {
+        forceRefresh?: boolean
+    }
+    generateEvaluationSummaryFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    generateEvaluationSummarySuccess: (
+        evaluationSummary: EvaluationSummary | null,
+        payload?: {
+            forceRefresh?: boolean
+        }
+    ) => {
+        evaluationSummary: EvaluationSummary | null
+        payload?: {
+            forceRefresh?: boolean
+        }
+    }
+    loadEvaluation: () => {
+        value: true
+    }
+    loadEvaluationRuns: () => any
+    loadEvaluationRunsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadEvaluationRunsSuccess: (
+        evaluationRuns: EvaluationRun[],
+        payload?: any
+    ) => {
+        evaluationRuns: EvaluationRun[]
+        payload?: any
+    }
+    loadEvaluationSuccess: (evaluation: EvaluationConfig | null) => {
+        evaluation: EvaluationConfig | null
+    }
+    refreshEvaluationRuns: () => {
+        value: true
+    }
+    regenerateEvaluationSummary: () => {
+        value: true
+    }
+    resetEvaluation: () => {
+        value: true
+    }
+    saveEvaluation: () => {
+        value: true
+    }
+    saveEvaluationFailure: (error: string) => {
+        error: string
+    }
+    saveEvaluationSuccess: (evaluation: EvaluationConfig) => {
+        evaluation: EvaluationConfig
+    }
+    selectModelFromPicker: (
+        modelId: string,
+        providerKeyId: string
+    ) => {
+        modelId: string
+        providerKeyId: string
+    }
+    setActiveTab: (tab: string) => {
+        tab: string
+    }
+    setAllowsNA: (allowsNA: boolean) => {
+        allowsNA: boolean
+    }
+    setEvaluationDescription: (description: string) => {
+        description: string
+    }
+    setEvaluationEnabled: (enabled: boolean) => {
+        enabled: boolean
+    }
+    setEvaluationName: (name: string) => {
+        name: string
+    }
+    setEvaluationPrompt: (prompt: string) => {
+        prompt: string
+    }
+    setEvaluationSummaryFilter: (
+        filter: EvaluationSummaryFilter,
+        previousFilter: EvaluationSummaryFilter
+    ) => {
+        filter: EvaluationSummaryFilter
+        previousFilter: EvaluationSummaryFilter
+    }
+    setEvaluationTarget: (target: EvaluationTarget) => {
+        target: EvaluationTarget
+    }
+    setEvaluationType: (evaluationType: EvaluationType) => {
+        evaluationType: EvaluationType
+    }
+    setHogSource: (source: string) => {
+        source: string
+    }
+    setModelConfiguration: (modelConfiguration: ModelConfiguration | null) => {
+        modelConfiguration: ModelConfiguration | null
+    }
+    setTraceWindowSeconds: (windowSeconds: number) => {
+        windowSeconds: number
+    }
+    setTriggerConditions: (conditions: EvaluationConditionSet[]) => {
+        conditions: EvaluationConditionSet[]
+    }
+    testHogOnSample: () => any
+    testHogOnSampleFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    testHogOnSampleSuccess: (
+        hogTestResults: HogTestResult[] | null,
+        payload?: any
+    ) => {
+        hogTestResults: HogTestResult[] | null
+        payload?: any
+    }
+    toggleSummaryExpanded: () => {
+        value: true
+    }
+    trackSummarizeClicked: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmEvaluationLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        isNewEvaluation: (evaluationId: string) => boolean
+        modelSelectionRequired: (
+            evaluation: EvaluationConfig | null,
+            originalEvaluation: EvaluationConfig | null,
+            evaluationId: string
+        ) => boolean
+        formValid: (evaluation: EvaluationConfig | null, modelSelectionRequired: boolean) => boolean
+        canEnable: (
+            evaluation: EvaluationConfig | null,
+            requiresProviderKey: boolean,
+            isTrialGrandfathered: boolean
+        ) => boolean
+        canEnableReason: (canEnable: boolean) => string | null
+        evaluationProviderKeyIssue: (
+            evaluation: EvaluationConfig | null,
+            providerKeys: LLMProviderKey[]
+        ) => LLMProviderKey | null
+        runsLookup: (evaluationRuns: EvaluationRun[]) => Record<string, EvaluationRun>
+        runsSummary: (evaluationRuns: EvaluationRun[]) => {
+            applicabilityRate: number
+            errors: number
+            failed: number
+            successful: number
+            successRate: number
+            total: number
+        } | null
+        filteredEvaluationRuns: (
+            evaluationRuns: EvaluationRun[],
+            evaluationSummaryFilter: EvaluationSummaryFilter
+        ) => EvaluationRun[]
+        runsToSummarizeCount: (
+            filteredEvaluationRuns: EvaluationRun[],
+            evaluationSummaryFilter: EvaluationSummaryFilter
+        ) => number
+        breadcrumbs: (evaluation: EvaluationConfig | null, searchParams: Record<string, any>) => Breadcrumb[]
+        maxContext: (evaluation: EvaluationConfig | null) => MaxContextInput[]
+    }
+}
+
+export type llmEvaluationLogicType = MakeLogicType<
+    llmEvaluationLogicValues,
+    llmEvaluationLogicActions,
+    LLMEvaluationLogicProps,
+    llmEvaluationLogicMeta
+>
+
 export const llmEvaluationLogic = kea<llmEvaluationLogicType>([
     path(['products', 'ai_observability', 'evaluations', 'llmEvaluationLogic']),
     props({} as LLMEvaluationLogicProps),
@@ -780,7 +1021,7 @@ export const llmEvaluationLogic = kea<llmEvaluationLogicType>([
 
         formValid: [
             (s) => [s.evaluation, s.modelSelectionRequired],
-            (evaluation, modelSelectionRequired: boolean) => {
+            (evaluation: EvaluationConfig | null, modelSelectionRequired: boolean) => {
                 if (!evaluation) {
                     return false
                 }
@@ -839,7 +1080,7 @@ export const llmEvaluationLogic = kea<llmEvaluationLogicType>([
 
         runsLookup: [
             (s) => [s.evaluationRuns],
-            (runs): Record<string, EvaluationRun> => {
+            (runs: EvaluationRun[]): Record<string, EvaluationRun> => {
                 const lookup: Record<string, EvaluationRun> = {}
                 for (const run of runs) {
                     if (run.generation_id) {
@@ -852,7 +1093,7 @@ export const llmEvaluationLogic = kea<llmEvaluationLogicType>([
 
         runsSummary: [
             (s) => [s.evaluationRuns],
-            (runs) => {
+            (runs: EvaluationRun[]) => {
                 if (runs.length === 0) {
                     return null
                 }
diff --git a/products/ai_observability/frontend/evaluations/llmEvaluationsLogic.ts b/products/ai_observability/frontend/evaluations/llmEvaluationsLogic.ts
index 95df95c8f324..74e511a6a432 100644
--- a/products/ai_observability/frontend/evaluations/llmEvaluationsLogic.ts
+++ b/products/ai_observability/frontend/evaluations/llmEvaluationsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
 import { combineUrl, router, urlToAction } from 'kea-router'
 
 import api from 'lib/api'
@@ -12,11 +12,12 @@ import { urls } from 'scenes/urls'
 
 import { ProductIntentContext, ProductKey } from '~/queries/schema/schema-general'
 
+import type { FeatureFlagsSet } from '../../../../frontend/src/lib/logic/featureFlagLogic'
+import type { ProductIntentProperties } from '../../../../frontend/src/lib/utils/product-intents'
 import { LLMProviderKey, llmProviderKeysLogic } from '../settings/llmProviderKeysLogic'
 import { getUnhealthyProviderKey } from '../settings/providerKeyStateUtils'
 import { evaluationErrorMessage } from './apiErrors'
 import { evaluationCanResolveModel } from './evaluationCapabilities'
-import type { llmEvaluationsLogicType } from './llmEvaluationsLogicType'
 import { EvaluationConfig } from './types'
 
 const INITIAL_DATE_FROM = '-24h' as string | null
@@ -36,6 +37,107 @@ function redirectToOnlineEvaluations(searchParams: Record<string, unknown>): voi
     )
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmEvaluationsLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    isTrialGrandfathered: boolean // llmProviderKeysLogic
+    providerKeys: LLMProviderKey[] // llmProviderKeysLogic
+    requiresProviderKey: boolean // llmProviderKeysLogic
+    canEnableEvaluation: (evaluation: EvaluationConfig) => boolean
+    dateFilter: {
+        dateFrom: string | null
+        dateTo: string | null
+    }
+    evaluations: EvaluationConfig[]
+    evaluationsFilter: string
+    evaluationsLoading: boolean
+    filteredEvaluations: EvaluationConfig[]
+    unhealthyProviderKeysUsedByEvaluations: LLMProviderKey[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmEvaluationsLogicActions {
+    loadProviderKeys: () => any // llmProviderKeysLogic
+    addProductIntent: (properties: ProductIntentProperties) => ProductIntentProperties // teamLogic
+    createEvaluation: (evaluation: Partial<EvaluationConfig>) => {
+        evaluation: Partial<EvaluationConfig>
+    }
+    createEvaluationSuccess: (evaluation: EvaluationConfig) => {
+        evaluation: EvaluationConfig
+    }
+    deleteEvaluation: (id: string) => {
+        id: string
+    }
+    deleteEvaluationSuccess: (id: string) => {
+        id: string
+    }
+    loadEvaluations: () => {
+        value: true
+    }
+    loadEvaluationsSuccess: (evaluations: EvaluationConfig[]) => {
+        evaluations: EvaluationConfig[]
+    }
+    setDates: (
+        dateFrom: string | null,
+        dateTo: string | null
+    ) => {
+        dateFrom: string | null
+        dateTo: string | null
+    }
+    setEvaluationsFilter: (filter: string) => {
+        filter: string
+    }
+    toggleEvaluationEnabled: (id: string) => {
+        id: string
+    }
+    toggleEvaluationEnabledFailure: (
+        id: string,
+        error: string
+    ) => {
+        error: string
+        id: string
+    }
+    toggleEvaluationEnabledSuccess: (id: string) => {
+        id: string
+    }
+    updateEvaluation: (
+        id: string,
+        evaluation: Partial<EvaluationConfig>
+    ) => {
+        evaluation: Partial<EvaluationConfig>
+        id: string
+    }
+    updateEvaluationSuccess: (
+        id: string,
+        evaluation: Partial<EvaluationConfig>
+    ) => {
+        evaluation: Partial<EvaluationConfig>
+        id: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmEvaluationsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        filteredEvaluations: (evaluations: EvaluationConfig[], evaluationsFilter: string) => EvaluationConfig[]
+        canEnableEvaluation: (
+            requiresProviderKey: boolean,
+            isTrialGrandfathered: boolean
+        ) => (evaluation: EvaluationConfig) => boolean
+        unhealthyProviderKeysUsedByEvaluations: (
+            evaluations: EvaluationConfig[],
+            providerKeys: LLMProviderKey[]
+        ) => LLMProviderKey[]
+    }
+}
+
+export type llmEvaluationsLogicType = MakeLogicType<
+    llmEvaluationsLogicValues,
+    llmEvaluationsLogicActions,
+    LLMEvaluationsLogicProps,
+    llmEvaluationsLogicMeta
+>
+
 export const llmEvaluationsLogic = kea<llmEvaluationsLogicType>([
     path(['products', 'ai_observability', 'evaluations', 'llmEvaluationsLogic']),
     props({} as LLMEvaluationsLogicProps),
diff --git a/products/ai_observability/frontend/evaluations/offlineEvaluationsLogic.ts b/products/ai_observability/frontend/evaluations/offlineEvaluationsLogic.ts
index 2393ffb5de7e..790236c915bc 100644
--- a/products/ai_observability/frontend/evaluations/offlineEvaluationsLogic.ts
+++ b/products/ai_observability/frontend/evaluations/offlineEvaluationsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router, urlToAction } from 'kea-router'
 
@@ -12,7 +12,6 @@ import { getCurrentTeamId } from '~/lib/utils/getAppContext'
 import { hogql } from '~/queries/utils'
 
 import { llmAnalyticsOfflineEvaluationsExperimentItemsCreate as aiObservabilityOfflineEvaluationsExperimentItemsCreate } from '../generated/api'
-import type { offlineEvaluationsLogicType } from './offlineEvaluationsLogicType'
 
 const OFFLINE_EXPERIMENTS_LIMIT = 200
 const INITIAL_OFFLINE_DATE_FROM = 'dStart' as string | null
@@ -333,6 +332,113 @@ export function mapOfflineExperimentItems(rows: RawOfflineExperimentMetricRow[])
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface offlineEvaluationsLogicValues {
+    filteredOfflineExperimentItems: OfflineExperimentItem[]
+    filteredOfflineExperiments: OfflineExperiment[]
+    offlineDateFilter: {
+        dateFrom: string | null
+        dateTo: string | null
+    }
+    offlineExperimentItemsFilter: string
+    offlineExperiments: OfflineExperiment[]
+    offlineExperimentsFilter: string
+    offlineExperimentsLoading: boolean
+    offlineMetricColumns: OfflineMetricColumn[]
+    selectedExperiment: OfflineExperiment | null
+    selectedExperimentData: OfflineExperimentData
+    selectedExperimentDataLoading: boolean
+    selectedExperimentId: string | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface offlineEvaluationsLogicActions {
+    clearSelectedExperiment: () => {
+        value: true
+    }
+    loadOfflineExperiments: () => any
+    loadOfflineExperimentsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadOfflineExperimentsSuccess: (
+        offlineExperiments: OfflineExperiment[],
+        payload?: any
+    ) => {
+        offlineExperiments: OfflineExperiment[]
+        payload?: any
+    }
+    loadSelectedExperimentData: (payload?: { experimentId?: string }) => {
+        experimentId?: string
+    }
+    loadSelectedExperimentDataFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSelectedExperimentDataSuccess: (
+        selectedExperimentData: OfflineExperimentData,
+        payload?: {
+            experimentId?: string
+        }
+    ) => {
+        selectedExperimentData: OfflineExperimentData
+        payload?: {
+            experimentId?: string
+        }
+    }
+    refreshOfflineEvaluations: () => {
+        value: true
+    }
+    selectExperiment: (experimentId: string) => {
+        experimentId: string
+    }
+    setOfflineDates: (
+        dateFrom: string | null,
+        dateTo: string | null
+    ) => {
+        dateFrom: string | null
+        dateTo: string | null
+    }
+    setOfflineExperimentItemsFilter: (filter: string) => {
+        filter: string
+    }
+    setOfflineExperimentsFilter: (filter: string) => {
+        filter: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface offlineEvaluationsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        selectedExperiment: (
+            offlineExperiments: OfflineExperiment[],
+            selectedExperimentId: string | null
+        ) => OfflineExperiment | null
+        filteredOfflineExperiments: (
+            offlineExperiments: OfflineExperiment[],
+            offlineExperimentsFilter: string
+        ) => OfflineExperiment[]
+        offlineMetricColumns: (selectedExperimentData: OfflineExperimentData) => OfflineMetricColumn[]
+        filteredOfflineExperimentItems: (
+            selectedExperimentData: OfflineExperimentData,
+            offlineExperimentItemsFilter: string
+        ) => OfflineExperimentItem[]
+    }
+}
+
+export type offlineEvaluationsLogicType = MakeLogicType<
+    offlineEvaluationsLogicValues,
+    offlineEvaluationsLogicActions,
+    OfflineEvaluationsLogicProps,
+    offlineEvaluationsLogicMeta
+>
+
 export const offlineEvaluationsLogic = kea<offlineEvaluationsLogicType>([
     path(['products', 'ai_observability', 'frontend', 'evaluations', 'offlineEvaluationsLogic']),
     props({} as OfflineEvaluationsLogicProps),
@@ -489,7 +595,7 @@ export const offlineEvaluationsLogic = kea<offlineEvaluationsLogicType>([
 
         offlineMetricColumns: [
             (s) => [s.selectedExperimentData],
-            (selectedExperimentData) => selectedExperimentData.metricColumns,
+            (selectedExperimentData: OfflineExperimentData) => selectedExperimentData.metricColumns,
         ],
 
         filteredOfflineExperimentItems: [
diff --git a/products/ai_observability/frontend/feedback-view/feedbackViewLogic.ts b/products/ai_observability/frontend/feedback-view/feedbackViewLogic.ts
index 5158972fde0b..88406ef4a261 100644
--- a/products/ai_observability/frontend/feedback-view/feedbackViewLogic.ts
+++ b/products/ai_observability/frontend/feedback-view/feedbackViewLogic.ts
@@ -1,4 +1,4 @@
-import { afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { subscriptions } from 'kea-subscriptions'
 
@@ -10,12 +10,85 @@ import { hogql } from '~/queries/utils'
 import { Survey, SurveyEventProperties } from '~/types'
 
 import { aiObservabilityTraceDataLogic } from '../aiObservabilityTraceDataLogic'
-import type { feedbackViewLogicType } from './feedbackViewLogicType'
 
 export interface FeedbackViewLogicProps {
     traceId: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface feedbackViewLogicValues {
+    trace: LLMTrace | undefined // aiObservabilityTraceDataLogic
+    hasLoadingError: boolean
+    surveyEvents: LLMTraceEvent[] | null
+    surveyEventsLoading: boolean
+    surveyIds: string[]
+    surveys: Record<string, Survey>
+    surveysLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface feedbackViewLogicActions {
+    loadSurveyEvents: (createdAt: string) => string
+    loadSurveyEventsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSurveyEventsSuccess: (
+        surveyEvents: {
+            createdAt: any
+            event: any
+            id: any
+            properties: any
+        }[],
+        payload?: string
+    ) => {
+        surveyEvents: {
+            createdAt: any
+            event: any
+            id: any
+            properties: any
+        }[]
+        payload?: string
+    }
+    loadSurveys: () => any
+    loadSurveysFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSurveysSuccess: (
+        surveys: {
+            [k: string]: Survey
+        },
+        payload?: any
+    ) => {
+        surveys: {
+            [k: string]: Survey
+        }
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface feedbackViewLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        surveyIds: (surveyEvents: LLMTraceEvent[] | null) => string[]
+    }
+}
+
+export type feedbackViewLogicType = MakeLogicType<
+    feedbackViewLogicValues,
+    feedbackViewLogicActions,
+    FeedbackViewLogicProps,
+    feedbackViewLogicMeta
+>
+
 export const feedbackViewLogic = kea<feedbackViewLogicType>([
     path(['scenes', 'ai-observability', 'feedbackViewLogic']),
     props({} as FeedbackViewLogicProps),
@@ -78,7 +151,7 @@ export const feedbackViewLogic = kea<feedbackViewLogicType>([
     selectors({
         surveyIds: [
             (s) => [s.surveyEvents],
-            (surveyEvents): string[] => {
+            (surveyEvents: LLMTraceEvent[] | null): string[] => {
                 if (!surveyEvents) {
                     return []
                 }
diff --git a/products/ai_observability/frontend/feedback-view/wizard/feedbackSurveyWizardLogic.ts b/products/ai_observability/frontend/feedback-view/wizard/feedbackSurveyWizardLogic.ts
index 153f16e279f1..e5146dbefb97 100644
--- a/products/ai_observability/frontend/feedback-view/wizard/feedbackSurveyWizardLogic.ts
+++ b/products/ai_observability/frontend/feedback-view/wizard/feedbackSurveyWizardLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 
@@ -16,7 +16,7 @@ import { urls } from 'scenes/urls'
 import { ProductIntentContext, ProductKey } from '~/queries/schema/schema-general'
 import { Survey, SurveyAppearance, SurveyQuestionBranchingType, SurveyQuestionType, SurveyType } from '~/types'
 
-import type { feedbackSurveyWizardLogicType } from './feedbackSurveyWizardLogicType'
+import type { TeamPublicType, TeamType } from '../../../../../frontend/src/types'
 
 export type WizardStep = 'intro' | 'configure' | 'implement'
 
@@ -33,6 +33,116 @@ function generateUniqueSurveyName(existingNames: Set<string>): string {
     return `${BASE_SURVEY_NAME} (${counter})`
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface feedbackSurveyWizardLogicValues {
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    activeSurvey: Survey | null
+    allSurveys: Survey[]
+    allSurveysLoading: boolean
+    appearance: SurveyAppearance
+    canCreateSurvey: boolean
+    createdSurvey: Survey | null
+    createdSurveyLoading: boolean
+    defaultAppearance: SurveyAppearance
+    disabledReason: string | undefined
+    eligibleSurveys: Survey[]
+    existingSurveyNames: Set<string>
+    followUpEnabled: boolean
+    followUpQuestion: string
+    nameIsDuplicate: boolean
+    selectedSurvey: Survey | null
+    step: WizardStep
+    surveyName: string
+    surveysNeedEnabling: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface feedbackSurveyWizardLogicActions {
+    updateCurrentTeam: (payload: Partial<TeamType>) => Partial<TeamType> // teamLogic
+    createSurvey: () => any
+    createSurveyFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    createSurveySuccess: (
+        createdSurvey: Survey,
+        payload?: any
+    ) => {
+        createdSurvey: Survey
+        payload?: any
+    }
+    loadAllSurveys: () => any
+    loadAllSurveysFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAllSurveysSuccess: (
+        allSurveys: Survey[],
+        payload?: any
+    ) => {
+        allSurveys: Survey[]
+        payload?: any
+    }
+    selectExistingSurvey: (survey: Survey) => {
+        survey: Survey
+    }
+    setFollowUpEnabled: (enabled: boolean) => {
+        enabled: boolean
+    }
+    setFollowUpQuestion: (question: string) => {
+        question: string
+    }
+    setStep: (step: WizardStep) => {
+        step: WizardStep
+    }
+    setSurveyName: (name: string) => {
+        name: string
+    }
+    updateAppearance: (updates: Partial<SurveyAppearance>) => {
+        updates: Partial<SurveyAppearance>
+    }
+    viewSurvey: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface feedbackSurveyWizardLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        defaultAppearance: (currentTeam: TeamPublicType | TeamType | null) => SurveyAppearance
+        existingSurveyNames: (allSurveys: Survey[]) => Set<string>
+        nameIsDuplicate: (surveyName: string, existingSurveyNames: Set<string>) => boolean
+        canCreateSurvey: (
+            surveyName: string,
+            nameIsDuplicate: boolean,
+            followUpEnabled: boolean,
+            followUpQuestion: string
+        ) => boolean
+        disabledReason: (
+            surveyName: string,
+            nameIsDuplicate: boolean,
+            followUpEnabled: boolean,
+            followUpQuestion: string
+        ) => string | undefined
+        eligibleSurveys: (allSurveys: Survey[]) => Survey[]
+        activeSurvey: (createdSurvey: Survey | null, selectedSurvey: Survey | null) => Survey | null
+        surveysNeedEnabling: (currentTeam: TeamPublicType | TeamType | null) => boolean
+    }
+}
+
+export type feedbackSurveyWizardLogicType = MakeLogicType<
+    feedbackSurveyWizardLogicValues,
+    feedbackSurveyWizardLogicActions,
+    Record<string, any>,
+    feedbackSurveyWizardLogicMeta
+>
+
 export const feedbackSurveyWizardLogic = kea<feedbackSurveyWizardLogicType>([
     path(['scenes', 'ai-observability', 'feedbackSurveyWizardLogic']),
     connect({
@@ -168,28 +278,38 @@ export const feedbackSurveyWizardLogic = kea<feedbackSurveyWizardLogicType>([
     selectors({
         defaultAppearance: [
             (s) => [s.currentTeam],
-            (currentTeam): SurveyAppearance => ({
+            (currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType): SurveyAppearance => ({
                 ...defaultSurveyAppearance,
                 ...currentTeam?.survey_config?.appearance,
             }),
         ],
         existingSurveyNames: [
             (s) => [s.allSurveys],
-            (allSurveys): Set<string> => new Set(allSurveys.map((survey) => survey.name.toLowerCase())),
+            (allSurveys: Survey[]): Set<string> => new Set(allSurveys.map((survey) => survey.name.toLowerCase())),
         ],
         nameIsDuplicate: [
             (s) => [s.surveyName, s.existingSurveyNames],
-            (surveyName, existingSurveyNames): boolean =>
+            (surveyName: string, existingSurveyNames: Set<string>): boolean =>
                 surveyName.trim() !== '' && existingSurveyNames.has(surveyName.trim().toLowerCase()),
         ],
         canCreateSurvey: [
             (s) => [s.surveyName, s.nameIsDuplicate, s.followUpEnabled, s.followUpQuestion],
-            (surveyName, nameIsDuplicate, followUpEnabled, followUpQuestion): boolean =>
+            (
+                surveyName: string,
+                nameIsDuplicate: boolean,
+                followUpEnabled: boolean,
+                followUpQuestion: string
+            ): boolean =>
                 surveyName.trim() !== '' && !nameIsDuplicate && (!followUpEnabled || followUpQuestion.trim() !== ''),
         ],
         disabledReason: [
             (s) => [s.surveyName, s.nameIsDuplicate, s.followUpEnabled, s.followUpQuestion],
-            (surveyName, nameIsDuplicate, followUpEnabled, followUpQuestion): string | undefined => {
+            (
+                surveyName: string,
+                nameIsDuplicate: boolean,
+                followUpEnabled: boolean,
+                followUpQuestion: string
+            ): string | undefined => {
                 if (nameIsDuplicate) {
                     return 'A survey with this name already exists'
                 }
@@ -204,7 +324,7 @@ export const feedbackSurveyWizardLogic = kea<feedbackSurveyWizardLogicType>([
         ],
         eligibleSurveys: [
             (s) => [s.allSurveys],
-            (allSurveys): Survey[] => {
+            (allSurveys: Survey[]): Survey[] => {
                 return allSurveys
                     .filter((survey) => {
                         const firstQuestion = survey.questions?.[0]
@@ -216,9 +336,14 @@ export const feedbackSurveyWizardLogic = kea<feedbackSurveyWizardLogicType>([
         ],
         activeSurvey: [
             (s) => [s.createdSurvey, s.selectedSurvey],
-            (createdSurvey, selectedSurvey): Survey | null => createdSurvey ?? selectedSurvey,
+            (createdSurvey: Survey | null, selectedSurvey: Survey | null): Survey | null =>
+                createdSurvey ?? selectedSurvey,
+        ],
+        surveysNeedEnabling: [
+            (s) => [s.currentTeam],
+            (currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType): boolean =>
+                !currentTeam?.surveys_opt_in,
         ],
-        surveysNeedEnabling: [(s) => [s.currentTeam], (currentTeam): boolean => !currentTeam?.surveys_opt_in],
     }),
     listeners(({ actions, values }) => ({
         loadAllSurveysSuccess: ({ allSurveys }) => {
diff --git a/products/ai_observability/frontend/generationEvaluationRunsLogic.ts b/products/ai_observability/frontend/generationEvaluationRunsLogic.ts
index 055634dce781..f52763a99af5 100644
--- a/products/ai_observability/frontend/generationEvaluationRunsLogic.ts
+++ b/products/ai_observability/frontend/generationEvaluationRunsLogic.ts
@@ -1,14 +1,58 @@
-import { actions, afterMount, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, key, listeners, path, props, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { EvaluationRun } from './evaluations/types'
-import type { generationEvaluationRunsLogicType } from './generationEvaluationRunsLogicType'
 import { queryEvaluationRuns } from './utils'
 
 export interface GenerationEvaluationRunsLogicProps {
     traceId: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface generationEvaluationRunsLogicValues {
+    generationEvaluationRuns: EvaluationRun[]
+    generationEvaluationRunsLoading: boolean
+    isForceRefresh: boolean
+    selectedEvaluationId: string | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface generationEvaluationRunsLogicActions {
+    loadGenerationEvaluationRuns: () => any
+    loadGenerationEvaluationRunsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadGenerationEvaluationRunsSuccess: (
+        generationEvaluationRuns: EvaluationRun[],
+        payload?: any
+    ) => {
+        generationEvaluationRuns: EvaluationRun[]
+        payload?: any
+    }
+    refreshGenerationEvaluationRuns: () => {
+        value: true
+    }
+    setSelectedEvaluationId: (evaluationId: string | null) => {
+        evaluationId: string | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface generationEvaluationRunsLogicMeta {
+    key: string
+}
+
+export type generationEvaluationRunsLogicType = MakeLogicType<
+    generationEvaluationRunsLogicValues,
+    generationEvaluationRunsLogicActions,
+    GenerationEvaluationRunsLogicProps,
+    generationEvaluationRunsLogicMeta
+>
+
 export const generationEvaluationRunsLogic = kea<generationEvaluationRunsLogicType>([
     path(['products', 'ai_observability', 'frontend', 'generationEvaluationRunsLogic']),
     props({} as GenerationEvaluationRunsLogicProps),
diff --git a/products/ai_observability/frontend/generationTagRunsLogic.ts b/products/ai_observability/frontend/generationTagRunsLogic.ts
index c60d33ee8dd1..4d2cdd70f90e 100644
--- a/products/ai_observability/frontend/generationTagRunsLogic.ts
+++ b/products/ai_observability/frontend/generationTagRunsLogic.ts
@@ -1,11 +1,10 @@
-import { afterMount, kea, key, path, props } from 'kea'
+import { MakeLogicType, afterMount, kea, key, path, props } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
 
 import { HogQLQuery, NodeKind } from '~/queries/schema/schema-general'
 
-import type { generationTagRunsLogicType } from './generationTagRunsLogicType'
 import { TagRun } from './tags/llmTaggerLogic'
 
 export interface GenerationTagRunsLogicProps {
@@ -31,6 +30,61 @@ export function parseTagsCell(raw: unknown): string[] {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface generationTagRunsLogicValues {
+    generationTagRuns: TagRun[]
+    generationTagRunsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface generationTagRunsLogicActions {
+    loadGenerationTagRuns: () => any
+    loadGenerationTagRunsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadGenerationTagRunsSuccess: (
+        generationTagRuns: {
+            reasoning: any
+            tagger_id: any
+            tagger_name: any
+            tags: string[]
+            target_event_id: any
+            timestamp: any
+            trace_id: any
+            uuid: any
+        }[],
+        payload?: any
+    ) => {
+        generationTagRuns: {
+            reasoning: any
+            tagger_id: any
+            tagger_name: any
+            tags: string[]
+            target_event_id: any
+            timestamp: any
+            trace_id: any
+            uuid: any
+        }[]
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface generationTagRunsLogicMeta {
+    key: string
+}
+
+export type generationTagRunsLogicType = MakeLogicType<
+    generationTagRunsLogicValues,
+    generationTagRunsLogicActions,
+    GenerationTagRunsLogicProps,
+    generationTagRunsLogicMeta
+>
+
 export const generationTagRunsLogic = kea<generationTagRunsLogicType>([
     path(['products', 'llm_analytics', 'frontend', 'generationTagRunsLogic']),
     props({} as GenerationTagRunsLogicProps),
diff --git a/products/ai_observability/frontend/llmEvaluationExecutionLogic.ts b/products/ai_observability/frontend/llmEvaluationExecutionLogic.ts
index 558531fe9205..219b6897736d 100644
--- a/products/ai_observability/frontend/llmEvaluationExecutionLogic.ts
+++ b/products/ai_observability/frontend/llmEvaluationExecutionLogic.ts
@@ -1,11 +1,83 @@
-import { actions, connect, kea, path, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, path, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
 import { lemonToast } from 'lib/lemon-ui/LemonToast'
 import { teamLogic } from 'scenes/teamLogic'
 
-import type { llmEvaluationExecutionLogicType } from './llmEvaluationExecutionLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmEvaluationExecutionLogicValues {
+    currentTeamId: number | null // teamLogic
+    evaluationRun: {
+        workflow_id: string
+    } | null
+    evaluationRunLoading: boolean
+    lastRunWorkflowId: string | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmEvaluationExecutionLogicActions {
+    runEvaluation: (
+        evaluationId: string,
+        targetEventId: string,
+        timestamp: string,
+        event: string,
+        distinctId?: string
+    ) => {
+        distinctId: string | undefined
+        evaluationId: string
+        event: string
+        targetEventId: string
+        timestamp: string
+    }
+    runEvaluationFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    runEvaluationSuccess: (
+        evaluationRun: {
+            evaluation: {
+                id: string
+                name: string
+            }
+            status: string
+            target_event_id: string
+            workflow_id: string
+        },
+        payload?: {
+            distinctId: string | undefined
+            evaluationId: string
+            event: string
+            targetEventId: string
+            timestamp: string
+        }
+    ) => {
+        evaluationRun: {
+            evaluation: {
+                id: string
+                name: string
+            }
+            status: string
+            target_event_id: string
+            workflow_id: string
+        }
+        payload?: {
+            distinctId: string | undefined
+            evaluationId: string
+            event: string
+            targetEventId: string
+            timestamp: string
+        }
+    }
+}
+
+export type llmEvaluationExecutionLogicType = MakeLogicType<
+    llmEvaluationExecutionLogicValues,
+    llmEvaluationExecutionLogicActions
+>
 
 export const llmEvaluationExecutionLogic = kea<llmEvaluationExecutionLogicType>([
     path(['products', 'ai_observability', 'frontend', 'llmEvaluationExecutionLogic']),
diff --git a/products/ai_observability/frontend/llmGenerationSentimentLazyLoaderLogic.ts b/products/ai_observability/frontend/llmGenerationSentimentLazyLoaderLogic.ts
index 4584f41ee2a2..755d22cb9d7c 100644
--- a/products/ai_observability/frontend/llmGenerationSentimentLazyLoaderLogic.ts
+++ b/products/ai_observability/frontend/llmGenerationSentimentLazyLoaderLogic.ts
@@ -1,9 +1,9 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 
 import { chunk } from 'lib/utils/arrays'
 import { teamLogic } from 'scenes/teamLogic'
 
-import type { llmGenerationSentimentLazyLoaderLogicType } from './llmGenerationSentimentLazyLoaderLogicType'
+import type { LLMSentimentResult } from '../../../frontend/src/queries/schema/schema-general'
 import { fetchStoredGenerationSentiments, type GenerationSentimentLookup } from './sentimentQueries'
 import type { GenerationSentiment } from './sentimentResults'
 import { runWithConcurrency } from './utils'
@@ -12,6 +12,52 @@ const BATCH_MAX_SIZE = 100
 const MAX_CONCURRENT_BATCHES = 2
 const BATCH_TIMER_DISPOSABLE_KEY = 'generationSentimentBatchTimer'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmGenerationSentimentLazyLoaderLogicValues {
+    currentTeamId: number | null // teamLogic
+    getGenerationSentiment: (key: string) => GenerationSentiment | null | undefined
+    isGenerationLoading: (key: string) => boolean
+    loadingGenerationKeys: Set<string>
+    sentimentByGenerationKey: Record<string, GenerationSentiment | null>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmGenerationSentimentLazyLoaderLogicActions {
+    clearLoadingGeneration: (key: string) => {
+        key: string
+    }
+    ensureGenerationSentimentLoaded: (lookup: GenerationSentimentLookup) => {
+        lookup: GenerationSentimentLookup
+    }
+    loadGenerationSentimentBatchFailure: (requestedKeys: string[]) => {
+        requestedKeys: string[]
+    }
+    loadGenerationSentimentBatchSuccess: (
+        results: Record<string, GenerationSentiment | null>,
+        requestedKeys: string[]
+    ) => {
+        requestedKeys: string[]
+        results: Record<string, LLMSentimentResult | null>
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmGenerationSentimentLazyLoaderLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        isGenerationLoading: (loadingGenerationKeys: Set<string>) => (key: string) => boolean
+        getGenerationSentiment: (
+            sentimentByGenerationKey: Record<string, LLMSentimentResult | null>
+        ) => (key: string) => GenerationSentiment | null | undefined
+    }
+}
+
+export type llmGenerationSentimentLazyLoaderLogicType = MakeLogicType<
+    llmGenerationSentimentLazyLoaderLogicValues,
+    llmGenerationSentimentLazyLoaderLogicActions,
+    Record<string, any>,
+    llmGenerationSentimentLazyLoaderLogicMeta
+>
+
 export const llmGenerationSentimentLazyLoaderLogic = kea<llmGenerationSentimentLazyLoaderLogicType>([
     path(['products', 'ai_observability', 'frontend', 'llmGenerationSentimentLazyLoaderLogic']),
 
@@ -100,13 +146,15 @@ export const llmGenerationSentimentLazyLoaderLogic = kea<llmGenerationSentimentL
     selectors({
         isGenerationLoading: [
             (s) => [s.loadingGenerationKeys],
-            (loadingGenerationKeys): ((key: string) => boolean) => {
+            (loadingGenerationKeys: Set<string>): ((key: string) => boolean) => {
                 return (key: string) => loadingGenerationKeys.has(key)
             },
         ],
         getGenerationSentiment: [
             (s) => [s.sentimentByGenerationKey],
-            (sentimentByGenerationKey): ((key: string) => GenerationSentiment | null | undefined) => {
+            (
+                sentimentByGenerationKey: Record<string, GenerationSentiment | null>
+            ): ((key: string) => GenerationSentiment | null | undefined) => {
                 return (key: string) => sentimentByGenerationKey[key]
             },
         ],
diff --git a/products/ai_observability/frontend/llmGenerationSentimentLazyLoaderLogicType.ts b/products/ai_observability/frontend/llmGenerationSentimentLazyLoaderLogicType.ts
deleted file mode 100644
index df54455563b6..000000000000
--- a/products/ai_observability/frontend/llmGenerationSentimentLazyLoaderLogicType.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-// Generated by kea-typegen on Thu, 25 Jun 2026 14:15:26 GMT. DO NOT EDIT THIS FILE MANUALLY.
-
-import type { Logic } from 'kea'
-
-import type { GenerationSentimentLookup } from './sentimentQueries'
-import type { GenerationSentiment } from './sentimentResults'
-import type { LLMSentimentResult } from '../../../frontend/src/queries/schema/schema-general'
-
-export interface llmGenerationSentimentLazyLoaderLogicType extends Logic {
-    actionCreators: {
-        ensureGenerationSentimentLoaded: (lookup: GenerationSentimentLookup) => ({
-            type: "ensure generation sentiment loaded (products.ai_observability.frontend.llmGenerationSentimentLazyLoaderLogic)";
-            payload: {
-                lookup: GenerationSentimentLookup;
-            };
-        });
-        loadGenerationSentimentBatchSuccess: (results: Record<string, GenerationSentiment | null>, requestedKeys: string[]) => ({
-            type: "load generation sentiment batch success (products.ai_observability.frontend.llmGenerationSentimentLazyLoaderLogic)";
-            payload: {
-                requestedKeys: string[];
-                results: Record<string, LLMSentimentResult | null>;
-            };
-        });
-        loadGenerationSentimentBatchFailure: (requestedKeys: string[]) => ({
-            type: "load generation sentiment batch failure (products.ai_observability.frontend.llmGenerationSentimentLazyLoaderLogic)";
-            payload: {
-                requestedKeys: string[];
-            };
-        });
-        clearLoadingGeneration: (key: string) => ({
-            type: "clear loading generation (products.ai_observability.frontend.llmGenerationSentimentLazyLoaderLogic)";
-            payload: {
-                key: string;
-            };
-        });
-    };
-    actionKeys: {
-        "ensure generation sentiment loaded (products.ai_observability.frontend.llmGenerationSentimentLazyLoaderLogic)": "ensureGenerationSentimentLoaded";
-        "load generation sentiment batch success (products.ai_observability.frontend.llmGenerationSentimentLazyLoaderLogic)": "loadGenerationSentimentBatchSuccess";
-        "load generation sentiment batch failure (products.ai_observability.frontend.llmGenerationSentimentLazyLoaderLogic)": "loadGenerationSentimentBatchFailure";
-        "clear loading generation (products.ai_observability.frontend.llmGenerationSentimentLazyLoaderLogic)": "clearLoadingGeneration";
-    };
-    actionTypes: {
-        ensureGenerationSentimentLoaded: "ensure generation sentiment loaded (products.ai_observability.frontend.llmGenerationSentimentLazyLoaderLogic)";
-        loadGenerationSentimentBatchSuccess: "load generation sentiment batch success (products.ai_observability.frontend.llmGenerationSentimentLazyLoaderLogic)";
-        loadGenerationSentimentBatchFailure: "load generation sentiment batch failure (products.ai_observability.frontend.llmGenerationSentimentLazyLoaderLogic)";
-        clearLoadingGeneration: "clear loading generation (products.ai_observability.frontend.llmGenerationSentimentLazyLoaderLogic)";
-    };
-    actions: {
-        ensureGenerationSentimentLoaded: (lookup: GenerationSentimentLookup) => void;
-        loadGenerationSentimentBatchSuccess: (results: Record<string, GenerationSentiment | null>, requestedKeys: string[]) => void;
-        loadGenerationSentimentBatchFailure: (requestedKeys: string[]) => void;
-        clearLoadingGeneration: (key: string) => void;
-    };
-    asyncActions: {
-        ensureGenerationSentimentLoaded: (lookup: GenerationSentimentLookup) => Promise<any>;
-        loadGenerationSentimentBatchSuccess: (results: Record<string, GenerationSentiment | null>, requestedKeys: string[]) => Promise<any>;
-        loadGenerationSentimentBatchFailure: (requestedKeys: string[]) => Promise<any>;
-        clearLoadingGeneration: (key: string) => Promise<any>;
-    };
-    defaults: {
-        sentimentByGenerationKey: Record<string, GenerationSentiment | null>;
-        loadingGenerationKeys: Set<string>;
-    };
-    events: {};
-    key: undefined;
-    listeners: {
-        "ensureGenerationSentimentLoaded": ((action: {
-            type: "ensure generation sentiment loaded (products.ai_observability.frontend.llmGenerationSentimentLazyLoaderLogic)";
-            payload: {
-                lookup: GenerationSentimentLookup;
-            };
-        }, previousState: any) => void | Promise<void>)[];
-    };
-    path: [
-        "products",
-        "ai_observability",
-        "frontend",
-        "llmGenerationSentimentLazyLoaderLogic"
-    ];
-    pathString: "products.ai_observability.frontend.llmGenerationSentimentLazyLoaderLogic";
-    props: Record<string, unknown>;
-    reducer: (state: any, action: any, fullState: any) => {
-        sentimentByGenerationKey: Record<string, GenerationSentiment | null>;
-        loadingGenerationKeys: Set<string>;
-    };
-    reducers: {
-        sentimentByGenerationKey: (state: Record<string, GenerationSentiment | null>, action: any, fullState: any) => Record<string, GenerationSentiment | null>;
-        loadingGenerationKeys: (state: Set<string>, action: any, fullState: any) => Set<string>;
-    };
-    selector: (state: any) => {
-        sentimentByGenerationKey: Record<string, GenerationSentiment | null>;
-        loadingGenerationKeys: Set<string>;
-    };
-    selectors: {
-        sentimentByGenerationKey: (state: any, props?: any) => Record<string, GenerationSentiment | null>;
-        loadingGenerationKeys: (state: any, props?: any) => Set<string>;
-        currentTeamId: (state: any, props?: any) => number | null;
-        isGenerationLoading: (state: any, props?: any) => ((key: string) => boolean);
-        getGenerationSentiment: (state: any, props?: any) => ((key: string) => GenerationSentiment | null | undefined);
-    };
-    sharedListeners: {};
-    values: {
-        sentimentByGenerationKey: Record<string, GenerationSentiment | null>;
-        loadingGenerationKeys: Set<string>;
-        currentTeamId: number | null;
-        isGenerationLoading: ((key: string) => boolean);
-        getGenerationSentiment: ((key: string) => GenerationSentiment | null | undefined);
-    };
-    _isKea: true;
-    _isKeaWithKey: false;
-    __keaTypeGenInternalSelectorTypes: {
-        isGenerationLoading: (loadingGenerationKeys: Set<string>) => ((key: string) => boolean);
-        getGenerationSentiment: (sentimentByGenerationKey: Record<string, GenerationSentiment | null>) => ((key: string) => GenerationSentiment | null | undefined);
-    };
-}
\ No newline at end of file
diff --git a/products/ai_observability/frontend/llmPersonsLazyLoaderLogic.ts b/products/ai_observability/frontend/llmPersonsLazyLoaderLogic.ts
index 810d4f8772c1..081ce94b9554 100644
--- a/products/ai_observability/frontend/llmPersonsLazyLoaderLogic.ts
+++ b/products/ai_observability/frontend/llmPersonsLazyLoaderLogic.ts
@@ -1,12 +1,10 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 
 import api from 'lib/api'
 import { teamLogic } from 'scenes/teamLogic'
 
 import { LLMTracePerson } from '~/queries/schema/schema-general'
 
-import type { llmPersonsLazyLoaderLogicType } from './llmPersonsLazyLoaderLogicType'
-
 interface PersonAPIResponse {
     uuid: string
     name: string
@@ -28,6 +26,48 @@ function toTracePerson(apiPerson: PersonAPIResponse, distinctId: string): LLMTra
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmPersonsLazyLoaderLogicValues {
+    currentTeamId: number | null // teamLogic
+    isDistinctIdLoading: (distinctId: string) => boolean
+    loadingDistinctIds: Set<string>
+    personsCache: Record<string, LLMTracePerson | null>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmPersonsLazyLoaderLogicActions {
+    ensurePersonLoaded: (distinctId: string) => {
+        distinctId: string
+    }
+    loadPersonsBatchFailure: (requestedDistinctIds: string[]) => {
+        requestedDistinctIds: string[]
+    }
+    loadPersonsBatchSuccess: (
+        persons: Record<string, LLMTracePerson>,
+        requestedDistinctIds: string[]
+    ) => {
+        persons: Record<string, LLMTracePerson>
+        requestedDistinctIds: string[]
+    }
+    queuePersonLoad: (distinctId: string) => {
+        distinctId: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmPersonsLazyLoaderLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        isDistinctIdLoading: (loadingDistinctIds: Set<string>) => (distinctId: string) => boolean
+    }
+}
+
+export type llmPersonsLazyLoaderLogicType = MakeLogicType<
+    llmPersonsLazyLoaderLogicValues,
+    llmPersonsLazyLoaderLogicActions,
+    Record<string, any>,
+    llmPersonsLazyLoaderLogicMeta
+>
+
 export const llmPersonsLazyLoaderLogic = kea<llmPersonsLazyLoaderLogicType>([
     path(['products', 'ai_observability', 'frontend', 'llmPersonsLazyLoaderLogic']),
 
@@ -107,7 +147,7 @@ export const llmPersonsLazyLoaderLogic = kea<llmPersonsLazyLoaderLogicType>([
     selectors({
         isDistinctIdLoading: [
             (s) => [s.loadingDistinctIds],
-            (loadingDistinctIds): ((distinctId: string) => boolean) => {
+            (loadingDistinctIds: Set<string>): ((distinctId: string) => boolean) => {
                 return (distinctId: string) => loadingDistinctIds.has(distinctId)
             },
         ],
diff --git a/products/ai_observability/frontend/llmSessionTitleLazyLoaderLogic.ts b/products/ai_observability/frontend/llmSessionTitleLazyLoaderLogic.ts
index c00e62052dd3..647ed35cba77 100644
--- a/products/ai_observability/frontend/llmSessionTitleLazyLoaderLogic.ts
+++ b/products/ai_observability/frontend/llmSessionTitleLazyLoaderLogic.ts
@@ -1,4 +1,4 @@
-import { actions, events, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, events, kea, listeners, path, reducers, selectors } from 'kea'
 
 import api from 'lib/api'
 import { chunk } from 'lib/utils/arrays'
@@ -6,7 +6,6 @@ import { chunk } from 'lib/utils/arrays'
 import { HogQLQuery, NodeKind } from '~/queries/schema/schema-general'
 import { escapeHogQLString } from '~/queries/utils'
 
-import type { llmSessionTitleLazyLoaderLogicType } from './llmSessionTitleLazyLoaderLogicType'
 import { resolveTitleFromInputs } from './sessionTitle'
 import type { DateRangeFilter } from './types'
 import { parsePartialJSON } from './utils'
@@ -182,6 +181,53 @@ async function fetchSessionTitles(
     return titles
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmSessionTitleLazyLoaderLogicValues {
+    getSessionTitle: (sessionId: string) => string | null | undefined
+    loadingSessionIds: Set<string>
+    titlesBySessionId: Map<string, string | null>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmSessionTitleLazyLoaderLogicActions {
+    ensureSessionTitleLoaded: (
+        sessionId: string,
+        dateRange?: DateRangeFilter
+    ) => {
+        dateRange: DateRangeFilter | undefined
+        sessionId: string
+    }
+    loadSessionTitlesBatchFailure: (requestedSessionIds: string[]) => {
+        requestedSessionIds: string[]
+    }
+    loadSessionTitlesBatchSuccess: (
+        titles: Map<string, string | null>,
+        requestedSessionIds: string[]
+    ) => {
+        requestedSessionIds: string[]
+        titles: Map<string, string | null>
+    }
+    markSessionIdsLoading: (sessionIds: string[]) => {
+        sessionIds: string[]
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmSessionTitleLazyLoaderLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        getSessionTitle: (
+            titlesBySessionId: Map<string, string | null>
+        ) => (sessionId: string) => string | null | undefined
+    }
+}
+
+export type llmSessionTitleLazyLoaderLogicType = MakeLogicType<
+    llmSessionTitleLazyLoaderLogicValues,
+    llmSessionTitleLazyLoaderLogicActions,
+    Record<string, any>,
+    llmSessionTitleLazyLoaderLogicMeta
+>
+
 /**
  * Lazily derives a human-readable title for each session, shared by the Sessions
  * list and the session detail hero. Both fetch by session id, time-bounded to the
@@ -258,7 +304,7 @@ export const llmSessionTitleLazyLoaderLogic = kea<llmSessionTitleLazyLoaderLogic
     selectors({
         getSessionTitle: [
             (s) => [s.titlesBySessionId],
-            (titlesBySessionId): ((sessionId: string) => string | null | undefined) => {
+            (titlesBySessionId: Map<string, string | null>): ((sessionId: string) => string | null | undefined) => {
                 return (sessionId: string) => titlesBySessionId.get(sessionId)
             },
         ],
diff --git a/products/ai_observability/frontend/modelPickerLogic.ts b/products/ai_observability/frontend/modelPickerLogic.ts
index 4a80545b5340..af4a61253a56 100644
--- a/products/ai_observability/frontend/modelPickerLogic.ts
+++ b/products/ai_observability/frontend/modelPickerLogic.ts
@@ -1,9 +1,8 @@
-import { afterMount, connect, kea, listeners, path, selectors } from 'kea'
+import { MakeLogicType, afterMount, connect, kea, listeners, path, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
 
-import type { modelPickerLogicType } from './modelPickerLogicType'
 import {
     type LLMProvider,
     LLMProviderKey,
@@ -12,6 +11,7 @@ import {
     providerSortIndex,
     toLLMProvider,
 } from './settings/llmProviderKeysLogic'
+import type { CreateLLMProviderKeyPayload, UpdateLLMProviderKeyPayload } from './settings/llmProviderKeysLogic'
 import { isUnhealthyProviderKeyState, providerKeyStateSuffix } from './settings/providerKeyStateUtils'
 
 export interface ModelOption {
@@ -58,6 +58,104 @@ export function buildTrialProviderModelGroups(models: ModelOption[]): ProviderMo
         })
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface modelPickerLogicValues {
+    providerKeys: LLMProviderKey[] // llmProviderKeysLogic
+    providerKeysLoading: boolean // llmProviderKeysLogic
+    byokModels: ModelOption[]
+    byokModelsLoading: boolean
+    hasByokKeys: boolean
+    providerModelGroups: ProviderModelGroup[]
+    trialModels: ModelOption[]
+    trialModelsLoading: boolean
+    trialProviderModelGroups: ProviderModelGroup[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface modelPickerLogicActions {
+    createProviderKeySuccess: (
+        providerKeys: LLMProviderKey[],
+        payload?:
+            | {
+                  payload: CreateLLMProviderKeyPayload
+              }
+            | undefined
+    ) => {
+        payload?: {
+            payload: CreateLLMProviderKeyPayload
+        }
+        providerKeys: LLMProviderKey[]
+    } // llmProviderKeysLogic
+    loadProviderKeysSuccess: (
+        providerKeys: LLMProviderKey[],
+        payload?: any
+    ) => {
+        payload?: any
+        providerKeys: LLMProviderKey[]
+    } // llmProviderKeysLogic
+    updateProviderKeySuccess: (
+        providerKeys: LLMProviderKey[],
+        payload?:
+            | {
+                  id: string
+                  payload: UpdateLLMProviderKeyPayload
+              }
+            | undefined
+    ) => {
+        payload?: {
+            id: string
+            payload: UpdateLLMProviderKeyPayload
+        }
+        providerKeys: LLMProviderKey[]
+    } // llmProviderKeysLogic
+    loadByokModels: () => any
+    loadByokModelsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadByokModelsSuccess: (
+        byokModels: ModelOption[],
+        payload?: any
+    ) => {
+        byokModels: ModelOption[]
+        payload?: any
+    }
+    loadTrialModels: () => any
+    loadTrialModelsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadTrialModelsSuccess: (
+        trialModels: ModelOption[],
+        payload?: any
+    ) => {
+        trialModels: ModelOption[]
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface modelPickerLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        hasByokKeys: (providerKeys: LLMProviderKey[]) => boolean
+        trialProviderModelGroups: (trialModels: ModelOption[]) => ProviderModelGroup[]
+        providerModelGroups: (byokModels: ModelOption[], providerKeys: LLMProviderKey[]) => ProviderModelGroup[]
+    }
+}
+
+export type modelPickerLogicType = MakeLogicType<
+    modelPickerLogicValues,
+    modelPickerLogicActions,
+    Record<string, any>,
+    modelPickerLogicMeta
+>
+
 export const modelPickerLogic = kea<modelPickerLogicType>([
     path(['products', 'ai_observability', 'frontend', 'modelPickerLogic']),
 
diff --git a/products/ai_observability/frontend/playground/llmPlaygroundModelLogic.ts b/products/ai_observability/frontend/playground/llmPlaygroundModelLogic.ts
index 77edebc7e8be..4dec11ab4e66 100644
--- a/products/ai_observability/frontend/playground/llmPlaygroundModelLogic.ts
+++ b/products/ai_observability/frontend/playground/llmPlaygroundModelLogic.ts
@@ -1,13 +1,14 @@
-import { actions, afterMount, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api, { ApiError } from 'lib/api'
 import { teamLogic } from 'scenes/teamLogic'
 
 import { modelPickerLogic, type ModelOption } from '../modelPickerLogic'
+import type { ProviderModelGroup } from '../modelPickerLogic'
 import { LLMProviderKey, llmProviderKeysLogic, normalizeLLMProvider } from '../settings/llmProviderKeysLogic'
-import type { llmPlaygroundModelLogicType } from './llmPlaygroundModelLogicType'
 import { llmPlaygroundPromptsLogic, type PromptConfig } from './llmPlaygroundPromptsLogic'
+import type { PlaygroundSetupPayload } from './llmPlaygroundPromptsLogic'
 import {
     isTraceLikeSelection,
     matchClosestModel,
@@ -39,6 +40,154 @@ function normalizePromptsToAvailableModels(
 
 export type LLMPlaygroundModelLogicProps = Record<string, never>
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmPlaygroundModelLogicValues {
+    activePromptConfig: PromptConfig // llmPlaygroundPromptsLogic
+    pendingTargetIsTrace: boolean // llmPlaygroundPromptsLogic
+    pendingTargetModel: string | null // llmPlaygroundPromptsLogic
+    pendingTargetProvider: string | null // llmPlaygroundPromptsLogic
+    promptConfigs: PromptConfig[] // llmPlaygroundPromptsLogic
+    providerKeys: LLMProviderKey[] // llmProviderKeysLogic
+    providerKeysLoading: boolean // llmProviderKeysLogic
+    byokModels: ModelOption[] // modelPickerLogic
+    byokModelsLoading: boolean // modelPickerLogic
+    hasByokKeys: boolean // modelPickerLogic
+    trialModels: ModelOption[] // modelPickerLogic
+    trialModelsLoading: boolean // modelPickerLogic
+    trialProviderModelGroups: ProviderModelGroup[] // modelPickerLogic
+    activeProviderKeyId: string | null
+    allModelOptions: ModelOption[]
+    byokModelsSettled: boolean
+    effectiveModelOptions: ModelOption[]
+    evaluationConfig: {
+        active_provider_key: {
+            id: string
+        } | null
+    } | null
+    evaluationConfigLoading: boolean
+    hasProviderKey: boolean
+    providerKeyForCurrentModel: LLMProviderKey | null
+    providerKeysSettled: boolean
+    trialModelsErrorStatus: number | null
+    trialModelsSettled: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmPlaygroundModelLogicActions {
+    clearPendingTargetModel: () => {
+        value: true
+    } // llmPlaygroundPromptsLogic
+    setModel: (
+        model: string,
+        providerKeyId?: string | undefined,
+        promptId?: string | undefined
+    ) => {
+        model: string
+        promptId: string | undefined
+        providerKeyId: string | undefined
+    } // llmPlaygroundPromptsLogic
+    setPromptConfigs: (promptConfigs: PromptConfig[]) => {
+        promptConfigs: PromptConfig[]
+    } // llmPlaygroundPromptsLogic
+    setupPlaygroundFromEvent: (payload: PlaygroundSetupPayload) => {
+        payload: PlaygroundSetupPayload
+    } // llmPlaygroundPromptsLogic
+    loadProviderKeys: () => any // llmProviderKeysLogic
+    loadProviderKeysFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    } // llmProviderKeysLogic
+    loadProviderKeysSuccess: (
+        providerKeys: LLMProviderKey[],
+        payload?: any
+    ) => {
+        payload?: any
+        providerKeys: LLMProviderKey[]
+    } // llmProviderKeysLogic
+    loadByokModelsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    } // modelPickerLogic
+    loadByokModelsSuccess: (
+        byokModels: ModelOption[],
+        payload?: any
+    ) => {
+        byokModels: ModelOption[]
+        payload?: any
+    } // modelPickerLogic
+    loadTrialModelsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    } // modelPickerLogic
+    loadTrialModelsSuccess: (
+        trialModels: ModelOption[],
+        payload?: any
+    ) => {
+        payload?: any
+        trialModels: ModelOption[]
+    } // modelPickerLogic
+    loadEvaluationConfig: () => any
+    loadEvaluationConfigFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadEvaluationConfigSuccess: (
+        evaluationConfig: {
+            active_provider_key: {
+                id: string
+            } | null
+        } | null,
+        payload?: any
+    ) => {
+        evaluationConfig: {
+            active_provider_key: {
+                id: string
+            } | null
+        } | null
+        payload?: any
+    }
+    setActiveProviderKeyId: (id: string | null) => {
+        id: string | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmPlaygroundModelLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        effectiveModelOptions: (
+            hasByokKeys: boolean,
+            byokModels: ModelOption[],
+            trialModels: ModelOption[]
+        ) => ModelOption[]
+        allModelOptions: (trialModels: ModelOption[], byokModels: ModelOption[]) => ModelOption[]
+        providerKeyForCurrentModel: (
+            activePromptConfig: PromptConfig,
+            effectiveModelOptions: ModelOption[],
+            providerKeys: LLMProviderKey[]
+        ) => LLMProviderKey | null
+        hasProviderKey: (providerKeyForCurrentModel: LLMProviderKey | null) => boolean
+    }
+}
+
+export type llmPlaygroundModelLogicType = MakeLogicType<
+    llmPlaygroundModelLogicValues,
+    llmPlaygroundModelLogicActions,
+    LLMPlaygroundModelLogicProps,
+    llmPlaygroundModelLogicMeta
+>
+
 export const llmPlaygroundModelLogic = kea<llmPlaygroundModelLogicType>([
     path(['products', 'ai_observability', 'frontend', 'playground', 'llmPlaygroundModelLogic']),
     props({} as LLMPlaygroundModelLogicProps),
diff --git a/products/ai_observability/frontend/playground/llmPlaygroundPromptsLogic.ts b/products/ai_observability/frontend/playground/llmPlaygroundPromptsLogic.ts
index a24adf36ee45..8dea49e8d5ba 100644
--- a/products/ai_observability/frontend/playground/llmPlaygroundPromptsLogic.ts
+++ b/products/ai_observability/frontend/playground/llmPlaygroundPromptsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, listeners, path, props, reducers, selectors } from 'kea'
 import { combineUrl, router, urlToAction } from 'kea-router'
 import posthog from 'posthog-js'
 
@@ -17,7 +17,6 @@ import { llmPromptLogic } from '../prompts/llmPromptLogic'
 import { getApiErrorDetail } from '../prompts/utils'
 import { normalizeLLMProvider } from '../settings/llmProviderKeysLogic'
 import { isOTelPartsMessage, normalizeRole, safeStringify } from '../utils'
-import type { llmPlaygroundPromptsLogicType } from './llmPlaygroundPromptsLogicType'
 import { isTraceLikeSelection } from './playgroundModelMatching'
 
 const SOURCE_PARAM_KEYS = ['source_prompt_name', 'source_prompt_version', 'source_evaluation_id'] as const
@@ -441,6 +440,290 @@ function appendRawMessage(conversation: Message[], raw: RawMessage): void {
 
 export type LLMPlaygroundPromptsLogicProps = Record<string, never>
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmPlaygroundPromptsLogicValues {
+    activePromptConfig: PromptConfig
+    activePromptId: string | null
+    collapsedSections: Record<string, boolean>
+    editModal: {
+        messageIndex?: number
+        promptId: string
+        type: 'message' | 'system' | 'tools'
+    } | null
+    hasRunnablePrompts: boolean
+    linkedSource: {
+        evaluationId: string | null
+        evaluationName: string | null
+        promptName: string | null
+        promptVersion: number | null
+        type: 'evaluation' | 'prompt' | null
+    }
+    localToolsJsonByPromptId: Record<string, string | null>
+    maxTokens: number | null
+    messages: Message[]
+    model: string
+    pendingTargetIsTrace: boolean
+    pendingTargetModel: string | null
+    pendingTargetProvider: string | null
+    promptConfigs: PromptConfig[]
+    reasoningLevel: ReasoningLevel
+    saving: boolean
+    selectedProviderKeyId: string | null
+    sourceSetupLoading: boolean
+    systemPrompt: string
+    temperature: number | null
+    thinking: boolean
+    tools: Record<string, unknown>[] | null
+    toolsJsonErrorByPromptId: Record<string, string | null>
+    topP: number | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmPlaygroundPromptsLogicActions {
+    addMessage: (
+        message?: Partial<Message>,
+        promptId?: string
+    ) => {
+        message: Partial<Message> | undefined
+        promptId: string | undefined
+    }
+    addPromptConfig: (sourcePromptId?: string) => {
+        newPromptId: string
+        sourcePromptId: string | undefined
+    }
+    addResultToConversation: (
+        response: string,
+        promptId?: string
+    ) => {
+        promptId: string | undefined
+        response: string
+    }
+    clearConversation: (promptId?: string) => {
+        promptId: string | undefined
+    }
+    clearLinkedSource: () => {
+        value: true
+    }
+    clearPendingTargetModel: () => {
+        value: true
+    }
+    deleteMessage: (
+        index: number,
+        promptId?: string
+    ) => {
+        index: number
+        promptId: string | undefined
+    }
+    removePromptConfig: (promptId: string) => {
+        promptId: string
+    }
+    resetPlayground: () => {
+        value: true
+    }
+    saveAsNewEvaluation: (
+        promptId: string,
+        name: string,
+        modelConfig: {
+            model: string
+            provider: string
+            provider_key_id: string | null
+        } | null
+    ) => {
+        modelConfig: {
+            model: string
+            provider: string
+            provider_key_id: string | null
+        } | null
+        name: string
+        promptId: string
+    }
+    saveAsNewPrompt: (
+        promptId: string,
+        name: string
+    ) => {
+        name: string
+        promptId: string
+    }
+    saveComplete: () => {
+        value: true
+    }
+    saveToLinkedEvaluation: (
+        promptId: string,
+        modelConfig: {
+            model: string
+            provider: string
+            provider_key_id: string | null
+        } | null
+    ) => {
+        modelConfig: {
+            model: string
+            provider: string
+            provider_key_id: string | null
+        } | null
+        promptId: string
+    }
+    saveToLinkedPrompt: (promptId: string) => {
+        promptId: string
+    }
+    setActivePromptId: (promptId: string | null) => {
+        promptId: string | null
+    }
+    setEditModal: (
+        target: {
+            messageIndex?: number
+            promptId: string
+            type: 'message' | 'system' | 'tools'
+        } | null
+    ) => {
+        target: {
+            messageIndex?: number | undefined
+            promptId: string
+            type: 'message' | 'system' | 'tools'
+        } | null
+    }
+    setLocalToolsJson: (
+        json: string | null,
+        promptId?: string
+    ) => {
+        json: string | null
+        promptId: string | undefined
+    }
+    setMaxTokens: (
+        maxTokens: number | null,
+        promptId?: string
+    ) => {
+        maxTokens: number | null
+        promptId: string | undefined
+    }
+    setMessages: (
+        messages: Message[],
+        promptId?: string
+    ) => {
+        messages: Message[]
+        promptId: string | undefined
+    }
+    setModel: (
+        model: string,
+        providerKeyId?: string,
+        promptId?: string
+    ) => {
+        model: string
+        promptId: string | undefined
+        providerKeyId: string | undefined
+    }
+    setPromptConfigs: (promptConfigs: PromptConfig[]) => {
+        promptConfigs: PromptConfig[]
+    }
+    setReasoningLevel: (
+        reasoningLevel: ReasoningLevel,
+        promptId?: string
+    ) => {
+        promptId: string | undefined
+        reasoningLevel: ReasoningLevel
+    }
+    setSourceNames: (
+        promptName: string | null,
+        evaluationName: string | null,
+        promptId?: string
+    ) => {
+        evaluationName: string | null
+        promptId: string | undefined
+        promptName: string | null
+    }
+    setSourceSetupLoading: (isLoading: boolean) => {
+        isLoading: boolean
+    }
+    setSystemPrompt: (
+        systemPrompt: string,
+        promptId?: string
+    ) => {
+        promptId: string | undefined
+        systemPrompt: string
+    }
+    setTemperature: (
+        temperature: number | null,
+        promptId?: string
+    ) => {
+        promptId: string | undefined
+        temperature: number | null
+    }
+    setThinking: (
+        thinking: boolean,
+        promptId?: string
+    ) => {
+        promptId: string | undefined
+        thinking: boolean
+    }
+    setTools: (
+        tools: Record<string, unknown>[] | null,
+        promptId?: string
+    ) => {
+        promptId: string | undefined
+        tools: Record<string, unknown>[] | null
+    }
+    setToolsJsonError: (
+        promptId: string,
+        error: string | null
+    ) => {
+        error: string | null
+        promptId: string
+    }
+    setTopP: (
+        topP: number | null,
+        promptId?: string
+    ) => {
+        promptId: string | undefined
+        topP: number | null
+    }
+    setupPlaygroundFromEvent: (payload: PlaygroundSetupPayload) => {
+        payload: PlaygroundSetupPayload
+    }
+    toggleCollapsed: (key: string) => {
+        key: string
+    }
+    updateMessage: (
+        index: number,
+        payload: Partial<Message>,
+        promptId?: string
+    ) => {
+        index: number
+        payload: Partial<Message>
+        promptId: string | undefined
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmPlaygroundPromptsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        activePromptConfig: (promptConfigs: PromptConfig[], activePromptId: string | null) => PromptConfig
+        model: (activePromptConfig: PromptConfig) => string
+        selectedProviderKeyId: (activePromptConfig: PromptConfig) => string | null
+        systemPrompt: (activePromptConfig: PromptConfig) => string
+        maxTokens: (activePromptConfig: PromptConfig) => number | null
+        thinking: (activePromptConfig: PromptConfig) => boolean
+        temperature: (activePromptConfig: PromptConfig) => number | null
+        topP: (activePromptConfig: PromptConfig) => number | null
+        reasoningLevel: (activePromptConfig: PromptConfig) => ReasoningLevel
+        tools: (activePromptConfig: PromptConfig) => Record<string, unknown>[] | null
+        messages: (activePromptConfig: PromptConfig) => Message[]
+        linkedSource: (promptConfigs: PromptConfig[]) => {
+            evaluationId: string | null
+            evaluationName: string | null
+            promptName: string | null
+            promptVersion: number | null
+            type: 'evaluation' | 'prompt' | null
+        }
+        hasRunnablePrompts: (promptConfigs: PromptConfig[]) => boolean
+    }
+}
+
+export type llmPlaygroundPromptsLogicType = MakeLogicType<
+    llmPlaygroundPromptsLogicValues,
+    llmPlaygroundPromptsLogicActions,
+    LLMPlaygroundPromptsLogicProps,
+    llmPlaygroundPromptsLogicMeta
+>
+
 export const llmPlaygroundPromptsLogic = kea<llmPlaygroundPromptsLogicType>([
     path(['products', 'ai_observability', 'frontend', 'playground', 'llmPlaygroundPromptsLogic']),
     props({} as LLMPlaygroundPromptsLogicProps),
diff --git a/products/ai_observability/frontend/playground/llmPlaygroundRunLogic.ts b/products/ai_observability/frontend/playground/llmPlaygroundRunLogic.ts
index 4cec67b5cc6a..daa463b9bf3a 100644
--- a/products/ai_observability/frontend/playground/llmPlaygroundRunLogic.ts
+++ b/products/ai_observability/frontend/playground/llmPlaygroundRunLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, props, reducers } from 'kea'
 import posthog from 'posthog-js'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -9,9 +9,9 @@ import { uuid } from 'lib/utils/dom'
 
 import type { ModelOption } from '../modelPickerLogic'
 import { llmProviderKeysLogic } from '../settings/llmProviderKeysLogic'
+import type { LLMProviderKey } from '../settings/llmProviderKeysLogic'
 import { llmPlaygroundModelLogic } from './llmPlaygroundModelLogic'
 import { llmPlaygroundPromptsLogic, type Message, type PromptConfig } from './llmPlaygroundPromptsLogic'
-import type { llmPlaygroundRunLogicType } from './llmPlaygroundRunLogicType'
 import { resolveProviderKeyForPrompt } from './playgroundModelMatching'
 
 interface ToolCallChunk {
@@ -153,6 +153,56 @@ let currentAbortController: AbortController | null = null
 
 export type LLMPlaygroundRunLogicProps = Record<string, never>
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmPlaygroundRunLogicValues {
+    activeProviderKeyId: string | null // llmPlaygroundModelLogic
+    effectiveModelOptions: ModelOption[] // llmPlaygroundModelLogic
+    promptConfigs: PromptConfig[] // llmPlaygroundPromptsLogic
+    providerKeys: LLMProviderKey[] // llmProviderKeysLogic
+    comparisonItems: ComparisonItem[]
+    rateLimitedUntil: number | null
+    submitting: boolean
+    subscriptionRequired: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmPlaygroundRunLogicActions {
+    resetPlayground: () => {
+        value: true
+    } // llmPlaygroundPromptsLogic
+    abortRun: () => {
+        value: true
+    }
+    addToComparison: (item: ComparisonItem) => {
+        item: ComparisonItem
+    }
+    finishSubmitPrompt: () => {
+        value: true
+    }
+    setRateLimited: (retryAfterSeconds: number) => {
+        retryAfterSeconds: number
+    }
+    setSubscriptionRequired: (required: boolean) => {
+        required: boolean
+    }
+    submitPrompt: () => {
+        value: true
+    }
+    updateComparisonItem: (
+        id: string,
+        payload: Partial<ComparisonItem>
+    ) => {
+        id: string
+        payload: Partial<ComparisonItem>
+    }
+}
+
+export type llmPlaygroundRunLogicType = MakeLogicType<
+    llmPlaygroundRunLogicValues,
+    llmPlaygroundRunLogicActions,
+    LLMPlaygroundRunLogicProps
+>
+
 export const llmPlaygroundRunLogic = kea<llmPlaygroundRunLogicType>([
     path(['products', 'ai_observability', 'frontend', 'playground', 'llmPlaygroundRunLogic']),
     props({} as LLMPlaygroundRunLogicProps),
diff --git a/products/ai_observability/frontend/prompts/createPromptExperimentModalLogic.ts b/products/ai_observability/frontend/prompts/createPromptExperimentModalLogic.ts
index 612360f01a77..26e5f0b881bd 100644
--- a/products/ai_observability/frontend/prompts/createPromptExperimentModalLogic.ts
+++ b/products/ai_observability/frontend/prompts/createPromptExperimentModalLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 import posthog from 'posthog-js'
@@ -16,13 +16,108 @@ import type {
     ExperimentsPromptTemplatesRetrieve200Item,
     TemplatesEnumApi,
 } from '../../../experiments/frontend/generated/api.schemas'
-import type { createPromptExperimentModalLogicType } from './createPromptExperimentModalLogicType'
 
 export const MIN_VERSIONS = 2
 export const MAX_VERSIONS = 10
 
 export type VersionSlots = (number | null)[]
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface createPromptExperimentModalLogicValues {
+    canAddSlot: boolean
+    canSubmit: boolean
+    disabledVersionsByIndex: Set<number>[]
+    isModalOpen: boolean
+    isSubmitting: boolean
+    promptName: string | null
+    promptVersions: LLMPromptVersionSummary[]
+    selectedTemplates: TemplatesEnumApi[]
+    selectedVersions: number[]
+    templates: ExperimentsPromptTemplatesRetrieve200Item[]
+    templatesLoading: boolean
+    versionSlots: VersionSlots
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface createPromptExperimentModalLogicActions {
+    addVersionSlot: () => {
+        value: true
+    }
+    closeModal: () => {
+        value: true
+    }
+    loadTemplates: () => any
+    loadTemplatesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadTemplatesSuccess: (
+        templates: ExperimentsPromptTemplatesRetrieve200Item[],
+        payload?: any
+    ) => {
+        templates: ExperimentsPromptTemplatesRetrieve200Item[]
+        payload?: any
+    }
+    openModal: (
+        promptName: string,
+        promptVersions: LLMPromptVersionSummary[]
+    ) => {
+        promptName: string
+        promptVersions: LLMPromptVersionSummary[]
+    }
+    removeVersionSlot: (index: number) => {
+        index: number
+    }
+    setSelectedTemplates: (templates: TemplatesEnumApi[]) => {
+        templates: TemplatesEnumApi[]
+    }
+    setVersionAt: (
+        index: number,
+        version: number | null
+    ) => {
+        index: number
+        version: number | null
+    }
+    submitCreate: () => {
+        value: true
+    }
+    submitCreateFailure: (error: string) => {
+        error: string
+    }
+    submitCreateSuccess: (experimentId: number) => {
+        experimentId: number
+    }
+    toggleTemplate: (template: TemplatesEnumApi) => {
+        template: TemplatesEnumApi
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface createPromptExperimentModalLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        selectedVersions: (versionSlots: VersionSlots) => number[]
+        canSubmit: (
+            selectedVersions: number[],
+            selectedTemplates: TemplatesEnumApi[],
+            isSubmitting: boolean,
+            promptName: string | null,
+            versionSlots: VersionSlots
+        ) => boolean
+        disabledVersionsByIndex: (versionSlots: VersionSlots) => Set<number>[]
+        canAddSlot: (versionSlots: VersionSlots) => boolean
+    }
+}
+
+export type createPromptExperimentModalLogicType = MakeLogicType<
+    createPromptExperimentModalLogicValues,
+    createPromptExperimentModalLogicActions,
+    Record<string, any>,
+    createPromptExperimentModalLogicMeta
+>
+
 export const createPromptExperimentModalLogic = kea<createPromptExperimentModalLogicType>([
     path(['products', 'ai_observability', 'frontend', 'prompts', 'createPromptExperimentModalLogic']),
 
diff --git a/products/ai_observability/frontend/prompts/llmPromptLogic.ts b/products/ai_observability/frontend/prompts/llmPromptLogic.ts
index 59ceb5ab2c67..cda1fb74204d 100644
--- a/products/ai_observability/frontend/prompts/llmPromptLogic.ts
+++ b/products/ai_observability/frontend/prompts/llmPromptLogic.ts
@@ -1,4 +1,5 @@
 import {
+    MakeLogicType,
     actions,
     afterMount,
     beforeUnmount,
@@ -13,6 +14,7 @@ import {
     selectors,
 } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, combineUrl, router, urlToAction } from 'kea-router'
 
@@ -41,7 +43,7 @@ import {
     PropertyOperator,
 } from '~/types'
 
-import type { llmPromptLogicType } from './llmPromptLogicType'
+import type { ProductIntentProperties } from '../../../../frontend/src/lib/utils/product-intents'
 import { llmPromptsLogic } from './llmPromptsLogic'
 import { LLM_PROMPTS_FORCE_RELOAD_PARAM } from './llmPromptsLogic'
 import { getApiErrorDetail, openDiscardChangesDialog, requestPromptDuplicate, validatePromptName } from './utils'
@@ -145,6 +147,263 @@ function isNameFieldValidationError(error: unknown): error is { attr: 'name'; de
     )
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmPromptLogicValues {
+    analyticsScope: PromptAnalyticsScope
+    breadcrumbs: Breadcrumb[]
+    canCompareVersions: boolean
+    canLoadMoreVersions: boolean
+    comparePrompt: LLMPrompt | null
+    comparePromptLoading: boolean
+    compareVersion: number | null
+    compareVersionOptions: Array<{
+        label: string
+        value: number
+    }>
+    defaultRelatedTracesQuery: DataTableNode | null
+    isDiffVisible: boolean
+    isEditMode: boolean
+    isHistoricalVersion: boolean
+    isNewPrompt: boolean
+    isOutlineExpanded: boolean
+    isPromptFormDirty: boolean
+    isPromptFormSubmitting: boolean
+    isPromptFormValid: boolean
+    isPromptMissing: boolean
+    isPublishReviewOpen: boolean
+    isRenderingMarkdown: boolean
+    isViewMode: boolean
+    mode: PromptMode
+    nextVersion: number | null
+    prompt: PromptFormValues | ResolvedLLMPrompt | null
+    promptForm: PromptFormValues
+    promptFormAllErrors: Record<string, any>
+    promptFormChanged: boolean
+    promptFormErrors: DeepPartialMap<PromptFormValues, ValidationErrorType>
+    promptFormHasErrors: boolean
+    promptFormManualErrors: Record<string, any>
+    promptFormTouched: boolean
+    promptFormTouches: Record<string, boolean>
+    promptFormValidationErrors: DeepPartialMap<PromptFormValues, ValidationErrorType>
+    promptLoading: boolean
+    promptUsageLogQuery: DataTableNode
+    promptUsagePropertyFilter: AnyPropertyFilter[]
+    promptUsageTrendQuery: InsightVizNode
+    promptVariables: string[]
+    publishConflict: PublishConflict | null
+    relatedTracesQuery: DataTableNode | null
+    relatedTracesQueryOverride: DataTableNode | null
+    shouldDisplaySkeleton: boolean
+    showPromptFormErrors: boolean
+    snippetLanguage: PromptSnippetLanguage
+    tracePropertyFilters: AnyPropertyFilter[]
+    versionDescription: string
+    versions: LLMPromptVersionSummary[]
+    versionsLoading: boolean
+    viewAllTracesUrl: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmPromptLogicActions {
+    addProductIntent: (properties: ProductIntentProperties) => ProductIntentProperties // teamLogic
+    cancelEditing: () => {
+        value: true
+    }
+    closePublishReview: () => {
+        value: true
+    }
+    deletePrompt: () => {
+        value: true
+    }
+    duplicatePrompt: (
+        sourceName: string,
+        newName: string
+    ) => {
+        newName: string
+        sourceName: string
+    }
+    loadComparePrompt: (version: number) => number
+    loadComparePromptFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadComparePromptSuccess: (
+        comparePrompt: LLMPrompt,
+        payload?: number
+    ) => {
+        comparePrompt: LLMPrompt
+        payload?: number
+    }
+    loadMoreVersions: () => {
+        value: true
+    }
+    loadPrompt: () => any
+    loadPromptFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPromptSuccess: (
+        prompt: ResolvedLLMPrompt,
+        payload?: any
+    ) => {
+        prompt: ResolvedLLMPrompt
+        payload?: any
+    }
+    openPublishReview: () => {
+        value: true
+    }
+    requestPublish: () => {
+        value: true
+    }
+    resetPromptForm: (values?: PromptFormValues) => {
+        values?: PromptFormValues
+    }
+    setAnalyticsScope: (analyticsScope: PromptAnalyticsScope) => {
+        analyticsScope: PromptAnalyticsScope
+    }
+    setCompareVersion: (compareVersion: number | null) => {
+        compareVersion: number | null
+    }
+    setMode: (mode: PromptMode) => {
+        mode: PromptMode
+    }
+    setPrompt: (prompt: PromptFormValues | ResolvedLLMPrompt) => {
+        prompt: PromptFormValues | ResolvedLLMPrompt
+    }
+    setPromptFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setPromptFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setPromptFormValues: (values: DeepPartial<PromptFormValues>) => {
+        values: DeepPartial<PromptFormValues>
+    }
+    setPublishConflict: (publishConflict: PublishConflict | null) => {
+        publishConflict: PublishConflict | null
+    }
+    setRelatedTracesQuery: (query: DataTableNode) => {
+        query: DataTableNode
+    }
+    setSnippetLanguage: (snippetLanguage: PromptSnippetLanguage) => {
+        snippetLanguage: PromptSnippetLanguage
+    }
+    setVersionDescription: (versionDescription: string) => {
+        versionDescription: string
+    }
+    setVersionsLoading: (versionsLoading: boolean) => {
+        versionsLoading: boolean
+    }
+    submitPromptForm: () => {
+        value: boolean
+    }
+    submitPromptFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitPromptFormRequest: (promptForm: PromptFormValues) => {
+        promptForm: PromptFormValues
+    }
+    submitPromptFormSuccess: (promptForm: PromptFormValues) => {
+        promptForm: PromptFormValues
+    }
+    toggleMarkdownRendering: () => {
+        value: true
+    }
+    toggleOutlineExpanded: () => {
+        value: true
+    }
+    touchPromptFormField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmPromptLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        isNewPrompt: (arg: any) => boolean
+        isPromptMissing: (prompt: PromptFormValues | ResolvedLLMPrompt | null, promptLoading: boolean) => boolean
+        shouldDisplaySkeleton: (prompt: PromptFormValues | ResolvedLLMPrompt | null, promptLoading: boolean) => boolean
+        isHistoricalVersion: (prompt: PromptFormValues | ResolvedLLMPrompt | null) => boolean
+        isPromptFormDirty: (
+            promptForm: PromptFormValues,
+            prompt: PromptFormValues | ResolvedLLMPrompt | null,
+            isNewPrompt: boolean
+        ) => boolean
+        nextVersion: (prompt: PromptFormValues | ResolvedLLMPrompt | null) => number | null
+        promptVariables: (promptForm: PromptFormValues) => string[]
+        breadcrumbs: (
+            prompt: PromptFormValues | ResolvedLLMPrompt | null,
+            searchParams: Record<string, any>
+        ) => Breadcrumb[]
+        isViewMode: (mode: PromptMode, arg: any) => boolean
+        isEditMode: (mode: PromptMode, arg: any) => boolean
+        versions: (prompt: PromptFormValues | ResolvedLLMPrompt | null) => LLMPromptVersionSummary[]
+        canLoadMoreVersions: (prompt: PromptFormValues | ResolvedLLMPrompt | null) => boolean
+        isDiffVisible: (compareVersion: number | null) => boolean
+        canCompareVersions: (prompt: PromptFormValues | ResolvedLLMPrompt | null) => boolean
+        compareVersionOptions: (
+            prompt: PromptFormValues | ResolvedLLMPrompt | null,
+            versions: LLMPromptVersionSummary[]
+        ) => Array<{
+            label: string
+            value: number
+        }>
+        tracePropertyFilters: (
+            prompt: PromptFormValues | ResolvedLLMPrompt | null,
+            analyticsScope: PromptAnalyticsScope
+        ) => AnyPropertyFilter[]
+        defaultRelatedTracesQuery: (
+            prompt: PromptFormValues | ResolvedLLMPrompt | null,
+            tracePropertyFilters: AnyPropertyFilter[]
+        ) => DataTableNode | null
+        relatedTracesQuery: (
+            defaultRelatedTracesQuery: DataTableNode | null,
+            relatedTracesQueryOverride: DataTableNode | null
+        ) => DataTableNode | null
+        viewAllTracesUrl: (
+            prompt: PromptFormValues | ResolvedLLMPrompt | null,
+            relatedTracesQuery: DataTableNode | null,
+            tracePropertyFilters: AnyPropertyFilter[]
+        ) => string
+        promptUsagePropertyFilter: (
+            prompt: PromptFormValues | ResolvedLLMPrompt | null,
+            analyticsScope: PromptAnalyticsScope
+        ) => AnyPropertyFilter[]
+        promptUsageTrendQuery: (
+            prompt: PromptFormValues | ResolvedLLMPrompt | null,
+            promptUsagePropertyFilter: AnyPropertyFilter[],
+            analyticsScope: PromptAnalyticsScope
+        ) => InsightVizNode
+        promptUsageLogQuery: (
+            prompt: PromptFormValues | ResolvedLLMPrompt | null,
+            promptUsagePropertyFilter: AnyPropertyFilter[],
+            analyticsScope: PromptAnalyticsScope
+        ) => DataTableNode
+    }
+}
+
+export type llmPromptLogicType = MakeLogicType<
+    llmPromptLogicValues,
+    llmPromptLogicActions,
+    PromptLogicProps,
+    llmPromptLogicMeta
+>
+
 export const llmPromptLogic = kea<llmPromptLogicType>([
     path(['scenes', 'ai-observability', 'llmPromptLogic']),
     props({ promptName: 'new' } as PromptLogicProps),
@@ -397,19 +656,27 @@ export const llmPromptLogic = kea<llmPromptLogicType>([
 
         isPromptMissing: [
             (s) => [s.prompt, s.promptLoading],
-            (prompt, promptLoading) => !promptLoading && prompt === null,
+            (prompt: PromptFormValues | ResolvedLLMPrompt | null, promptLoading: boolean) =>
+                !promptLoading && prompt === null,
         ],
 
         shouldDisplaySkeleton: [
             (s) => [s.prompt, s.promptLoading],
-            (prompt, promptLoading) => !prompt && promptLoading,
+            (prompt: PromptFormValues | ResolvedLLMPrompt | null, promptLoading: boolean) => !prompt && promptLoading,
         ],
 
-        isHistoricalVersion: [(s) => [s.prompt], (prompt) => (isPrompt(prompt) ? !prompt.is_latest : false)],
+        isHistoricalVersion: [
+            (s) => [s.prompt],
+            (prompt: PromptFormValues | ResolvedLLMPrompt | null) => (isPrompt(prompt) ? !prompt.is_latest : false),
+        ],
 
         isPromptFormDirty: [
             (s) => [s.promptForm, s.prompt, s.isNewPrompt],
-            (promptForm, prompt, isNewPrompt): boolean => {
+            (
+                promptForm: PromptFormValues,
+                prompt: PromptFormValues | ResolvedLLMPrompt | null,
+                isNewPrompt: boolean
+            ): boolean => {
                 if (isNewPrompt) {
                     return !!promptForm.name.trim() || !!promptForm.prompt.trim()
                 }
@@ -419,7 +686,8 @@ export const llmPromptLogic = kea<llmPromptLogicType>([
 
         nextVersion: [
             (s) => [s.prompt],
-            (prompt): number | null => (isPrompt(prompt) ? (prompt.latest_version ?? prompt.version) + 1 : null),
+            (prompt: PromptFormValues | ResolvedLLMPrompt | null): number | null =>
+                isPrompt(prompt) ? (prompt.latest_version ?? prompt.version) + 1 : null,
         ],
 
         promptVariables: [
@@ -460,25 +728,39 @@ export const llmPromptLogic = kea<llmPromptLogicType>([
 
         isViewMode: [
             (s) => [s.mode, (_, props) => props],
-            (mode, props) => props.promptName !== 'new' && mode === PromptMode.View,
+            (mode: PromptMode, props) => props.promptName !== 'new' && mode === PromptMode.View,
         ],
 
         isEditMode: [
             (s) => [s.mode, (_, props) => props],
-            (mode, props) => props.promptName === 'new' || mode === PromptMode.Edit,
+            (mode: PromptMode, props) => props.promptName === 'new' || mode === PromptMode.Edit,
         ],
 
-        versions: [(s) => [s.prompt], (prompt): LLMPromptVersionSummary[] => (isPrompt(prompt) ? prompt.versions : [])],
+        versions: [
+            (s) => [s.prompt],
+            (prompt: PromptFormValues | ResolvedLLMPrompt | null): LLMPromptVersionSummary[] =>
+                isPrompt(prompt) ? prompt.versions : [],
+        ],
 
-        canLoadMoreVersions: [(s) => [s.prompt], (prompt) => (isPrompt(prompt) ? prompt.has_more : false)],
+        canLoadMoreVersions: [
+            (s) => [s.prompt],
+            (prompt: PromptFormValues | ResolvedLLMPrompt | null) => (isPrompt(prompt) ? prompt.has_more : false),
+        ],
 
-        isDiffVisible: [(s) => [s.compareVersion], (compareVersion): boolean => compareVersion !== null],
+        isDiffVisible: [(s) => [s.compareVersion], (compareVersion: number | null): boolean => compareVersion !== null],
 
-        canCompareVersions: [(s) => [s.prompt], (prompt): boolean => isPrompt(prompt) && prompt.version_count > 1],
+        canCompareVersions: [
+            (s) => [s.prompt],
+            (prompt: PromptFormValues | ResolvedLLMPrompt | null): boolean =>
+                isPrompt(prompt) && prompt.version_count > 1,
+        ],
 
         compareVersionOptions: [
             (s) => [s.prompt, s.versions],
-            (prompt, versions: LLMPromptVersionSummary[]): Array<{ value: number; label: string }> => {
+            (
+                prompt: PromptFormValues | ResolvedLLMPrompt | null,
+                versions: LLMPromptVersionSummary[]
+            ): Array<{ value: number; label: string }> => {
                 if (!isPrompt(prompt)) {
                     return []
                 }
@@ -493,7 +775,10 @@ export const llmPromptLogic = kea<llmPromptLogicType>([
 
         tracePropertyFilters: [
             (s) => [s.prompt, s.analyticsScope],
-            (prompt, analyticsScope): AnyPropertyFilter[] => {
+            (
+                prompt: PromptFormValues | ResolvedLLMPrompt | null,
+                analyticsScope: PromptAnalyticsScope
+            ): AnyPropertyFilter[] => {
                 if (!isPrompt(prompt)) {
                     return []
                 }
@@ -528,7 +813,10 @@ export const llmPromptLogic = kea<llmPromptLogicType>([
 
         defaultRelatedTracesQuery: [
             (s) => [s.prompt, s.tracePropertyFilters],
-            (prompt, tracePropertyFilters): DataTableNode | null => {
+            (
+                prompt: PromptFormValues | ResolvedLLMPrompt | null,
+                tracePropertyFilters: AnyPropertyFilter[]
+            ): DataTableNode | null => {
                 if (!isPrompt(prompt)) {
                     return null
                 }
@@ -568,7 +856,10 @@ export const llmPromptLogic = kea<llmPromptLogicType>([
         ],
         relatedTracesQuery: [
             (s) => [s.defaultRelatedTracesQuery, s.relatedTracesQueryOverride],
-            (defaultRelatedTracesQuery, relatedTracesQueryOverride): DataTableNode | null => {
+            (
+                defaultRelatedTracesQuery: DataTableNode | null,
+                relatedTracesQueryOverride: DataTableNode | null
+            ): DataTableNode | null => {
                 if (!defaultRelatedTracesQuery) {
                     return null
                 }
@@ -597,7 +888,11 @@ export const llmPromptLogic = kea<llmPromptLogicType>([
 
         viewAllTracesUrl: [
             (s) => [s.prompt, s.relatedTracesQuery, s.tracePropertyFilters],
-            (prompt, relatedTracesQuery, tracePropertyFilters): string => {
+            (
+                prompt: PromptFormValues | ResolvedLLMPrompt | null,
+                relatedTracesQuery: DataTableNode | null,
+                tracePropertyFilters: AnyPropertyFilter[]
+            ): string => {
                 if (!isPrompt(prompt)) {
                     return urls.aiObservabilityTraces()
                 }
@@ -619,7 +914,10 @@ export const llmPromptLogic = kea<llmPromptLogicType>([
 
         promptUsagePropertyFilter: [
             (s) => [s.prompt, s.analyticsScope],
-            (prompt, analyticsScope): AnyPropertyFilter[] => {
+            (
+                prompt: PromptFormValues | ResolvedLLMPrompt | null,
+                analyticsScope: PromptAnalyticsScope
+            ): AnyPropertyFilter[] => {
                 if (!isPrompt(prompt)) {
                     return []
                 }
diff --git a/products/ai_observability/frontend/prompts/llmPromptsLogic.ts b/products/ai_observability/frontend/prompts/llmPromptsLogic.ts
index 79907f0329a4..e702331a4780 100644
--- a/products/ai_observability/frontend/prompts/llmPromptsLogic.ts
+++ b/products/ai_observability/frontend/prompts/llmPromptsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router, urlToAction } from 'kea-router'
 
@@ -14,7 +14,6 @@ import { urls } from '~/scenes/urls'
 import { LLMPrompt } from '~/types'
 
 import { cleanPagedSearchOrderParams } from '../utils'
-import type { llmPromptsLogicType } from './llmPromptsLogicType'
 import { getApiErrorDetail, requestPromptDuplicate } from './utils'
 
 export const PROMPTS_PER_PAGE = 30
@@ -38,6 +37,88 @@ function cleanFilters(values: Partial<PromptFilters>): PromptFilters {
 
 export type LLMPromptsLogicProps = Record<string, never>
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmPromptsLogicValues {
+    count: number
+    filters: PromptFilters
+    pagination: PaginationManual
+    promptCountLabel: string
+    prompts: CountedPaginatedResponse<LLMPrompt>
+    promptsLoaded: boolean
+    promptsLoading: boolean
+    rawFilters: Partial<PromptFilters> | null
+    shouldShowEmptyState: boolean
+    sorting: Sorting | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmPromptsLogicActions {
+    deletePrompt: (promptName: string) => {
+        promptName: string
+    }
+    duplicatePrompt: (
+        promptName: string,
+        newName: string
+    ) => {
+        newName: string
+        promptName: string
+    }
+    loadPrompts: (debounce?: boolean) => {
+        debounce: boolean
+    }
+    loadPromptsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPromptsSuccess: (
+        prompts: CountedPaginatedResponse<LLMPrompt>,
+        payload?: {
+            debounce: boolean
+        }
+    ) => {
+        prompts: CountedPaginatedResponse<LLMPrompt>
+        payload?: {
+            debounce: boolean
+        }
+    }
+    setFilters: (
+        filters: Partial<PromptFilters>,
+        merge?: boolean,
+        debounce?: boolean
+    ) => {
+        debounce: boolean
+        filters: Partial<PromptFilters>
+        merge: boolean
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmPromptsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        filters: (rawFilters: Partial<PromptFilters> | null) => PromptFilters
+        count: (prompts: CountedPaginatedResponse<LLMPrompt>) => number
+        sorting: (filters: PromptFilters) => Sorting | null
+        pagination: (filters: PromptFilters, count: number) => PaginationManual
+        promptCountLabel: (filters: PromptFilters, count: number) => string
+        shouldShowEmptyState: (
+            count: number,
+            promptsLoaded: boolean,
+            promptsLoading: boolean,
+            filters: PromptFilters
+        ) => boolean
+    }
+}
+
+export type llmPromptsLogicType = MakeLogicType<
+    llmPromptsLogicValues,
+    llmPromptsLogicActions,
+    LLMPromptsLogicProps,
+    llmPromptsLogicMeta
+>
+
 export const llmPromptsLogic = kea<llmPromptsLogicType>([
     path(['scenes', 'ai-observability', 'llmPromptsLogic']),
     props({} as LLMPromptsLogicProps),
@@ -140,7 +221,7 @@ export const llmPromptsLogic = kea<llmPromptsLogicType>([
 
         promptCountLabel: [
             (s) => [s.filters, s.count],
-            (filters, count) => {
+            (filters: PromptFilters, count: number) => {
                 const start = (filters.page - 1) * PROMPTS_PER_PAGE + 1
                 const end = Math.min(filters.page * PROMPTS_PER_PAGE, count)
 
@@ -150,7 +231,7 @@ export const llmPromptsLogic = kea<llmPromptsLogicType>([
 
         shouldShowEmptyState: [
             (s) => [s.count, s.promptsLoaded, s.promptsLoading, s.filters],
-            (count, promptsLoaded, promptsLoading, filters): boolean =>
+            (count: number, promptsLoaded: boolean, promptsLoading: boolean, filters: PromptFilters): boolean =>
                 promptsLoaded && !promptsLoading && count === 0 && !filters.search && !filters.created_by_id,
         ],
     }),
diff --git a/products/ai_observability/frontend/prompts/llmPromptsLogicType.ts b/products/ai_observability/frontend/prompts/llmPromptsLogicType.ts
deleted file mode 100644
index 4cacc207da6b..000000000000
--- a/products/ai_observability/frontend/prompts/llmPromptsLogicType.ts
+++ /dev/null
@@ -1,186 +0,0 @@
-// Generated by kea-typegen on Thu, 09 Jul 2026 12:21:22 GMT. DO NOT EDIT THIS FILE MANUALLY.
-
-import type { Logic } from 'kea'
-
-import type { LLMPromptsLogicProps, PromptFilters } from './llmPromptsLogic'
-import type { CountedPaginatedResponse } from '../../../../frontend/src/lib/api'
-import type { LLMPrompt } from '../../../../frontend/src/types'
-import type { Sorting } from '../../../../frontend/src/lib/lemon-ui/LemonTable/index'
-import type { PaginationManual } from '../../../../frontend/src/lib/lemon-ui/PaginationControl/index'
-
-export interface llmPromptsLogicType extends Logic {
-    actionCreators: {
-        setFilters: (filters: Partial<PromptFilters>, merge?: boolean, debounce?: boolean) => ({
-            type: "set filters (scenes.ai-observability.llmPromptsLogic)";
-            payload: {
-                debounce: boolean;
-                filters: Partial<PromptFilters>;
-                merge: boolean;
-            };
-        });
-        loadPrompts: (debounce?: boolean) => ({
-            type: "load prompts (scenes.ai-observability.llmPromptsLogic)";
-            payload: {
-                debounce: boolean;
-            };
-        });
-        deletePrompt: (promptName: string) => ({
-            type: "delete prompt (scenes.ai-observability.llmPromptsLogic)";
-            payload: {
-                promptName: string;
-            };
-        });
-        duplicatePrompt: (promptName: string, newName: string) => ({
-            type: "duplicate prompt (scenes.ai-observability.llmPromptsLogic)";
-            payload: {
-                newName: string;
-                promptName: string;
-            };
-        });
-        loadPromptsSuccess: (prompts: CountedPaginatedResponse<LLMPrompt>, payload?: {
-            debounce: boolean;
-        }) => ({
-            type: "load prompts success (scenes.ai-observability.llmPromptsLogic)";
-            payload: {
-                prompts: CountedPaginatedResponse<LLMPrompt>;
-                payload?: {
-                    debounce: boolean;
-                };
-            };
-        });
-        loadPromptsFailure: (error: string, errorObject?: any) => ({
-            type: "load prompts failure (scenes.ai-observability.llmPromptsLogic)";
-            payload: {
-                error: string;
-                errorObject?: any;
-            };
-        });
-    };
-    actionKeys: {
-        "set filters (scenes.ai-observability.llmPromptsLogic)": "setFilters";
-        "load prompts (scenes.ai-observability.llmPromptsLogic)": "loadPrompts";
-        "delete prompt (scenes.ai-observability.llmPromptsLogic)": "deletePrompt";
-        "duplicate prompt (scenes.ai-observability.llmPromptsLogic)": "duplicatePrompt";
-        "load prompts success (scenes.ai-observability.llmPromptsLogic)": "loadPromptsSuccess";
-        "load prompts failure (scenes.ai-observability.llmPromptsLogic)": "loadPromptsFailure";
-    };
-    actionTypes: {
-        setFilters: "set filters (scenes.ai-observability.llmPromptsLogic)";
-        loadPrompts: "load prompts (scenes.ai-observability.llmPromptsLogic)";
-        deletePrompt: "delete prompt (scenes.ai-observability.llmPromptsLogic)";
-        duplicatePrompt: "duplicate prompt (scenes.ai-observability.llmPromptsLogic)";
-        loadPromptsSuccess: "load prompts success (scenes.ai-observability.llmPromptsLogic)";
-        loadPromptsFailure: "load prompts failure (scenes.ai-observability.llmPromptsLogic)";
-    };
-    actions: {
-        setFilters: (filters: Partial<PromptFilters>, merge?: boolean, debounce?: boolean) => void;
-        loadPrompts: (debounce?: boolean) => void;
-        deletePrompt: (promptName: string) => void;
-        duplicatePrompt: (promptName: string, newName: string) => void;
-        loadPromptsSuccess: (prompts: CountedPaginatedResponse<LLMPrompt>, payload?: {
-            debounce: boolean;
-        }) => void;
-        loadPromptsFailure: (error: string, errorObject?: any) => void;
-    };
-    asyncActions: {
-        setFilters: (filters: Partial<PromptFilters>, merge?: boolean, debounce?: boolean) => Promise<any>;
-        loadPrompts: (debounce?: boolean) => Promise<any>;
-        deletePrompt: (promptName: string) => Promise<any>;
-        duplicatePrompt: (promptName: string, newName: string) => Promise<any>;
-        loadPromptsSuccess: (prompts: CountedPaginatedResponse<LLMPrompt>, payload?: {
-            debounce: boolean;
-        }) => Promise<any>;
-        loadPromptsFailure: (error: string, errorObject?: any) => Promise<any>;
-    };
-    defaults: {
-        rawFilters: Partial<PromptFilters> | null;
-        promptsLoaded: boolean;
-        prompts: CountedPaginatedResponse<LLMPrompt>;
-        promptsLoading: boolean;
-    };
-    events: {};
-    key: undefined;
-    listeners: {
-        "setFilters": ((action: {
-            type: "set filters (scenes.ai-observability.llmPromptsLogic)";
-            payload: {
-                debounce: boolean;
-                filters: Partial<PromptFilters>;
-                merge: boolean;
-            };
-        }, previousState: any) => void | Promise<void>)[];
-        "deletePrompt": ((action: {
-            type: "delete prompt (scenes.ai-observability.llmPromptsLogic)";
-            payload: {
-                promptName: string;
-            };
-        }, previousState: any) => void | Promise<void>)[];
-        "duplicatePrompt": ((action: {
-            type: "duplicate prompt (scenes.ai-observability.llmPromptsLogic)";
-            payload: {
-                newName: string;
-                promptName: string;
-            };
-        }, previousState: any) => void | Promise<void>)[];
-    };
-    path: [
-        "scenes",
-        "ai-observability",
-        "llmPromptsLogic"
-    ];
-    pathString: "scenes.ai-observability.llmPromptsLogic";
-    props: LLMPromptsLogicProps;
-    reducer: (state: any, action: any, fullState: any) => {
-        rawFilters: Partial<PromptFilters> | null;
-        promptsLoaded: boolean;
-        prompts: CountedPaginatedResponse<LLMPrompt>;
-        promptsLoading: boolean;
-    };
-    reducers: {
-        rawFilters: (state: Partial<PromptFilters> | null, action: any, fullState: any) => Partial<PromptFilters> | null;
-        promptsLoaded: (state: boolean, action: any, fullState: any) => boolean;
-        prompts: (state: CountedPaginatedResponse<LLMPrompt>, action: any, fullState: any) => CountedPaginatedResponse<LLMPrompt>;
-        promptsLoading: (state: boolean, action: any, fullState: any) => boolean;
-    };
-    selector: (state: any) => {
-        rawFilters: Partial<PromptFilters> | null;
-        promptsLoaded: boolean;
-        prompts: CountedPaginatedResponse<LLMPrompt>;
-        promptsLoading: boolean;
-    };
-    selectors: {
-        rawFilters: (state: any, props?: any) => Partial<PromptFilters> | null;
-        promptsLoaded: (state: any, props?: any) => boolean;
-        prompts: (state: any, props?: any) => CountedPaginatedResponse<LLMPrompt>;
-        promptsLoading: (state: any, props?: any) => boolean;
-        filters: (state: any, props?: any) => PromptFilters;
-        count: (state: any, props?: any) => number;
-        sorting: (state: any, props?: any) => Sorting | null;
-        pagination: (state: any, props?: any) => PaginationManual;
-        promptCountLabel: (state: any, props?: any) => string;
-        shouldShowEmptyState: (state: any, props?: any) => boolean;
-    };
-    sharedListeners: {};
-    values: {
-        rawFilters: Partial<PromptFilters> | null;
-        promptsLoaded: boolean;
-        prompts: CountedPaginatedResponse<LLMPrompt>;
-        promptsLoading: boolean;
-        filters: PromptFilters;
-        count: number;
-        sorting: Sorting | null;
-        pagination: PaginationManual;
-        promptCountLabel: string;
-        shouldShowEmptyState: boolean;
-    };
-    _isKea: true;
-    _isKeaWithKey: false;
-    __keaTypeGenInternalSelectorTypes: {
-        filters: (rawFilters: Partial<PromptFilters> | null) => PromptFilters;
-        count: (prompts: CountedPaginatedResponse<LLMPrompt>) => number;
-        sorting: (filters: PromptFilters) => Sorting | null;
-        pagination: (filters: PromptFilters, count: number) => PaginationManual;
-        promptCountLabel: (filters: PromptFilters, count: number) => string;
-        shouldShowEmptyState: (count: number, promptsLoaded: boolean, promptsLoading: boolean, filters: PromptFilters) => boolean;
-    };
-}
\ No newline at end of file
diff --git a/products/ai_observability/frontend/prompts/promptExperimentsLogic.ts b/products/ai_observability/frontend/prompts/promptExperimentsLogic.ts
index 8fa28f848552..46f384b9daa0 100644
--- a/products/ai_observability/frontend/prompts/promptExperimentsLogic.ts
+++ b/products/ai_observability/frontend/prompts/promptExperimentsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props } from 'kea'
 import { loaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
@@ -7,12 +7,54 @@ import { ApiConfig } from '~/lib/api'
 import { experimentsList } from '../../../experiments/frontend/generated/api'
 import type { ExperimentBasicApi } from '../../../experiments/frontend/generated/api.schemas'
 import { createPromptExperimentModalLogic } from './createPromptExperimentModalLogic'
-import type { promptExperimentsLogicType } from './promptExperimentsLogicType'
 
 export interface PromptExperimentsLogicProps {
     promptName: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface promptExperimentsLogicValues {
+    experiments: ExperimentBasicApi[]
+    experimentsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface promptExperimentsLogicActions {
+    submitCreateSuccess: (experimentId: number) => {
+        experimentId: number
+    } // createPromptExperimentModalLogic
+    loadExperiments: () => any
+    loadExperimentsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadExperimentsSuccess: (
+        experiments: ExperimentBasicApi[],
+        payload?: any
+    ) => {
+        experiments: ExperimentBasicApi[]
+        payload?: any
+    }
+    refresh: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface promptExperimentsLogicMeta {
+    key: string
+}
+
+export type promptExperimentsLogicType = MakeLogicType<
+    promptExperimentsLogicValues,
+    promptExperimentsLogicActions,
+    PromptExperimentsLogicProps,
+    promptExperimentsLogicMeta
+>
+
 export const promptExperimentsLogic = kea<promptExperimentsLogicType>([
     path((key) => ['products', 'ai_observability', 'frontend', 'prompts', 'promptExperimentsLogic', key]),
     props({} as PromptExperimentsLogicProps),
diff --git a/products/ai_observability/frontend/reviewQueues/aiObservabilityReviewQueuesLogic.ts b/products/ai_observability/frontend/reviewQueues/aiObservabilityReviewQueuesLogic.ts
index 5a1c8bb2ac43..7183f4a6beb0 100644
--- a/products/ai_observability/frontend/reviewQueues/aiObservabilityReviewQueuesLogic.ts
+++ b/products/ai_observability/frontend/reviewQueues/aiObservabilityReviewQueuesLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router, urlToAction } from 'kea-router'
 
@@ -19,7 +19,6 @@ import type {
     ReviewQueueApi,
     ReviewQueueItemApi,
 } from '../generated/api.schemas'
-import type { aiObservabilityReviewQueuesLogicType } from './aiObservabilityReviewQueuesLogicType'
 import { reviewQueuesApi } from './reviewQueuesApi'
 import { getApiErrorDetail } from './reviewQueueUtils'
 
@@ -152,6 +151,181 @@ function getQueueUrlState(
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilityReviewQueuesLogicValues {
+    activeQueue: ReviewQueueApi | null
+    editingQueue: ReviewQueueApi | null
+    hasLoadedQueuesOnce: boolean
+    queueCountLabel: string
+    queueEditorMode: ReviewQueueEditorMode | null
+    queueEditorName: string
+    queueEditorSubmitting: boolean
+    queueEditorTitle: string
+    queueFilters: ReviewQueueFilters
+    queueItemCountLabel: string
+    queueItemFilters: ReviewQueueItemFilters
+    queueItemPagination: PaginationManual
+    queueItemSorting: Sorting | null
+    queueItems: PaginatedReviewQueueItemListApi
+    queueItemsLoading: boolean
+    queuePagination: PaginationManual
+    queueSorting: Sorting | null
+    queues: PaginatedReviewQueueListApi
+    queuesLoading: boolean
+    rawQueueFilters: Partial<ReviewQueueFilters> | null
+    rawQueueItemFilters: Partial<ReviewQueueItemFilters> | null
+    selectedQueue: ReviewQueueApi | null
+    selectedQueueId: string | null
+    visibleQueues: ReviewQueueApi[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilityReviewQueuesLogicActions {
+    closeQueueEditor: () => {
+        value: true
+    }
+    deleteQueue: (queue: ReviewQueueApi) => {
+        queue: ReviewQueueApi
+    }
+    loadQueueItems: (debounce?: boolean) => {
+        debounce: boolean
+    }
+    loadQueueItemsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadQueueItemsSuccess: (
+        queueItems: PaginatedReviewQueueItemListApi,
+        payload?: {
+            debounce: boolean
+        }
+    ) => {
+        queueItems: PaginatedReviewQueueItemListApi
+        payload?: {
+            debounce: boolean
+        }
+    }
+    loadQueues: (debounce?: boolean) => {
+        debounce: boolean
+    }
+    loadQueuesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadQueuesSuccess: (
+        queues: PaginatedReviewQueueListApi,
+        payload?: {
+            debounce: boolean
+        }
+    ) => {
+        queues: PaginatedReviewQueueListApi
+        payload?: {
+            debounce: boolean
+        }
+    }
+    openQueueEditor: (
+        mode: ReviewQueueEditorMode,
+        queue?: ReviewQueueApi | null
+    ) => {
+        mode: ReviewQueueEditorMode
+        queue: ReviewQueueApi | null
+    }
+    removeQueueItem: (item: ReviewQueueItemApi) => {
+        item: ReviewQueueItemApi
+    }
+    requestDeleteQueue: (queue: ReviewQueueApi) => {
+        queue: ReviewQueueApi
+    }
+    requestRemoveQueueItem: (item: ReviewQueueItemApi) => {
+        item: ReviewQueueItemApi
+    }
+    selectQueue: (queueId: string | null) => {
+        queueId: string | null
+    }
+    setQueueEditorName: (name: string) => {
+        name: string
+    }
+    setQueueFilters: (
+        filters: Partial<ReviewQueueFilters>,
+        merge?: boolean,
+        debounce?: boolean
+    ) => {
+        debounce: boolean
+        filters: Partial<ReviewQueueFilters>
+        merge: boolean
+    }
+    setQueueItemFilters: (
+        filters: Partial<ReviewQueueItemFilters>,
+        merge?: boolean,
+        debounce?: boolean
+    ) => {
+        debounce: boolean
+        filters: Partial<ReviewQueueItemFilters>
+        merge: boolean
+    }
+    setSelectedQueue: (queue: ReviewQueueApi | null) => {
+        queue: ReviewQueueApi | null
+    }
+    submitQueueEditor: () => {
+        value: true
+    }
+    submitQueueEditorFailure: () => {
+        value: true
+    }
+    submitQueueEditorSuccess: (
+        queue: ReviewQueueApi,
+        mode: ReviewQueueEditorMode
+    ) => {
+        mode: ReviewQueueEditorMode
+        queue: ReviewQueueApi
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilityReviewQueuesLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        queueFilters: (rawQueueFilters: Partial<ReviewQueueFilters> | null) => ReviewQueueFilters
+        queueItemFilters: (rawQueueItemFilters: Partial<ReviewQueueItemFilters> | null) => ReviewQueueItemFilters
+        activeQueue: (
+            queues: PaginatedReviewQueueListApi,
+            selectedQueueId: string | null,
+            selectedQueue: ReviewQueueApi | null
+        ) => ReviewQueueApi | null
+        visibleQueues: (queues: PaginatedReviewQueueListApi, activeQueue: ReviewQueueApi | null) => ReviewQueueApi[]
+        queueSorting: (queueFilters: ReviewQueueFilters) => Sorting | null
+        queuePagination: (queueFilters: ReviewQueueFilters, queues: PaginatedReviewQueueListApi) => PaginationManual
+        queueItemSorting: (queueItemFilters: ReviewQueueItemFilters) => Sorting | null
+        queueItemPagination: (
+            queueItemFilters: ReviewQueueItemFilters,
+            queueItems: PaginatedReviewQueueItemListApi
+        ) => PaginationManual
+        queueCountLabel: (
+            queues: PaginatedReviewQueueListApi,
+            queueFilters: ReviewQueueFilters,
+            queuesLoading: boolean
+        ) => string
+        queueItemCountLabel: (
+            queueItems: PaginatedReviewQueueItemListApi,
+            queueItemFilters: ReviewQueueItemFilters,
+            queueItemsLoading: boolean
+        ) => string
+        queueEditorTitle: (queueEditorMode: ReviewQueueEditorMode | null) => string
+    }
+}
+
+export type aiObservabilityReviewQueuesLogicType = MakeLogicType<
+    aiObservabilityReviewQueuesLogicValues,
+    aiObservabilityReviewQueuesLogicActions,
+    AIObservabilityReviewQueuesLogicProps,
+    aiObservabilityReviewQueuesLogicMeta
+>
+
 export const aiObservabilityReviewQueuesLogic = kea<aiObservabilityReviewQueuesLogicType>([
     path(['products', 'ai_observability', 'frontend', 'reviewQueues', 'aiObservabilityReviewQueuesLogic']),
     props({} as AIObservabilityReviewQueuesLogicProps),
@@ -411,7 +585,8 @@ export const aiObservabilityReviewQueuesLogic = kea<aiObservabilityReviewQueuesL
         ],
         queueEditorTitle: [
             (s) => [s.queueEditorMode],
-            (queueEditorMode): string => (queueEditorMode === 'rename' ? 'Rename queue' : 'New queue'),
+            (queueEditorMode: ReviewQueueEditorMode | null): string =>
+                queueEditorMode === 'rename' ? 'Rename queue' : 'New queue',
         ],
     }),
 
diff --git a/products/ai_observability/frontend/reviewQueues/reviewQueuePickerModalLogic.ts b/products/ai_observability/frontend/reviewQueues/reviewQueuePickerModalLogic.ts
index c379913e8602..7cb4dd895e5c 100644
--- a/products/ai_observability/frontend/reviewQueues/reviewQueuePickerModalLogic.ts
+++ b/products/ai_observability/frontend/reviewQueues/reviewQueuePickerModalLogic.ts
@@ -1,10 +1,9 @@
-import { actions, afterMount, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from '~/lib/lemon-ui/LemonToast/LemonToast'
 
 import type { PaginatedReviewQueueListApi, ReviewQueueApi } from '../generated/api.schemas'
-import type { reviewQueuePickerModalLogicType } from './reviewQueuePickerModalLogicType'
 import { reviewQueuesApi } from './reviewQueuesApi'
 import { getApiErrorDetail } from './reviewQueueUtils'
 
@@ -25,6 +24,75 @@ const EMPTY_QUEUE_LIST: PaginatedReviewQueueListApi = {
     results: [],
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface reviewQueuePickerModalLogicValues {
+    isCreatingQueue: boolean
+    isSubmitting: boolean
+    queues: PaginatedReviewQueueListApi
+    queuesLoading: boolean
+    selectedQueue: ReviewQueueApi | null
+    selectedQueueKey: string | null
+    selectedQueueValue: string[] | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface reviewQueuePickerModalLogicActions {
+    loadQueues: () => {
+        value: true
+    }
+    loadQueuesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadQueuesSuccess: (
+        queues: PaginatedReviewQueueListApi,
+        payload?: {
+            value: true
+        }
+    ) => {
+        queues: PaginatedReviewQueueListApi
+        payload?: {
+            value: true
+        }
+    }
+    setSelectedQueueKey: (queueKey: string | null) => {
+        queueKey: string | null
+    }
+    submit: (queueKey?: string | null) => {
+        queueKey: string | null
+    }
+    submitFailure: () => {
+        value: true
+    }
+    submitSuccess: (
+        queueId: string,
+        createdQueue: boolean
+    ) => {
+        createdQueue: boolean
+        queueId: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface reviewQueuePickerModalLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        selectedQueueValue: (selectedQueueKey: string | null) => string[] | null
+        selectedQueue: (queues: PaginatedReviewQueueListApi, selectedQueueKey: string | null) => ReviewQueueApi | null
+        isCreatingQueue: (selectedQueueKey: string | null, selectedQueue: ReviewQueueApi | null) => boolean
+    }
+}
+
+export type reviewQueuePickerModalLogicType = MakeLogicType<
+    reviewQueuePickerModalLogicValues,
+    reviewQueuePickerModalLogicActions,
+    ReviewQueuePickerModalProps,
+    reviewQueuePickerModalLogicMeta
+>
+
 export const reviewQueuePickerModalLogic = kea<reviewQueuePickerModalLogicType>([
     path(['products', 'ai_observability', 'frontend', 'reviewQueues', 'reviewQueuePickerModalLogic']),
     props({} as ReviewQueuePickerModalProps),
diff --git a/products/ai_observability/frontend/scoreDefinitions/aiObservabilityScoreDefinitionsLogic.ts b/products/ai_observability/frontend/scoreDefinitions/aiObservabilityScoreDefinitionsLogic.ts
index ba71c928f5c4..1c4771f53d29 100644
--- a/products/ai_observability/frontend/scoreDefinitions/aiObservabilityScoreDefinitionsLogic.ts
+++ b/products/ai_observability/frontend/scoreDefinitions/aiObservabilityScoreDefinitionsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router, urlToAction } from 'kea-router'
 
@@ -21,7 +21,6 @@ import type {
     PaginatedScoreDefinitionListApi,
     ScoreDefinitionApi,
 } from '../generated/api.schemas'
-import type { aiObservabilityScoreDefinitionsLogicType } from './aiObservabilityScoreDefinitionsLogicType'
 import { getApiErrorDetail, getCurrentProjectId, type ScoreDefinitionModalMode } from './scoreDefinitionModalUtils'
 
 export const SCORE_DEFINITIONS_PER_PAGE = 30
@@ -85,6 +84,98 @@ function getUrlFilters(filters: ScoreDefinitionFilters): Record<string, unknown>
 
 export type AIObservabilityScoreDefinitionsLogicProps = Record<string, never>
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilityScoreDefinitionsLogicValues {
+    archivingDefinitionIds: Set<string>
+    count: number
+    filters: ScoreDefinitionFilters
+    isArchivingDefinition: (definitionId: string) => boolean
+    modalMode: ScoreDefinitionModalMode | null
+    pagination: PaginationManual
+    rawFilters: Partial<ScoreDefinitionFilters> | null
+    scoreDefinitionCountLabel: string
+    scoreDefinitions: PaginatedScoreDefinitionListApi
+    scoreDefinitionsLoading: boolean
+    selectedDefinition: ScoreDefinitionApi | null
+    sorting: Sorting | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilityScoreDefinitionsLogicActions {
+    closeModal: () => {
+        value: true
+    }
+    loadScoreDefinitions: (debounce?: boolean) => {
+        debounce: boolean
+    }
+    loadScoreDefinitionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadScoreDefinitionsSuccess: (
+        scoreDefinitions: PaginatedScoreDefinitionListApi,
+        payload?: {
+            debounce: boolean
+        }
+    ) => {
+        scoreDefinitions: PaginatedScoreDefinitionListApi
+        payload?: {
+            debounce: boolean
+        }
+    }
+    openModal: (
+        mode: ScoreDefinitionModalMode,
+        scoreDefinition?: ScoreDefinitionApi | null
+    ) => {
+        mode: ScoreDefinitionModalMode
+        scoreDefinition: ScoreDefinitionApi | null
+    }
+    setFilters: (
+        filters: Partial<ScoreDefinitionFilters>,
+        merge?: boolean,
+        debounce?: boolean
+    ) => {
+        debounce: boolean
+        filters: Partial<ScoreDefinitionFilters>
+        merge: boolean
+    }
+    toggleArchive: (scoreDefinition: ScoreDefinitionApi) => {
+        scoreDefinition: ScoreDefinitionApi
+    }
+    toggleArchiveFailure: (definitionId: string) => {
+        definitionId: string
+    }
+    toggleArchiveSuccess: (definitionId: string) => {
+        definitionId: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilityScoreDefinitionsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        filters: (rawFilters: Partial<ScoreDefinitionFilters> | null) => ScoreDefinitionFilters
+        count: (scoreDefinitions: PaginatedScoreDefinitionListApi) => number
+        sorting: (filters: ScoreDefinitionFilters) => Sorting | null
+        pagination: (filters: ScoreDefinitionFilters, count: number) => PaginationManual
+        scoreDefinitionCountLabel: (
+            filters: ScoreDefinitionFilters,
+            count: number,
+            scoreDefinitionsLoading: boolean
+        ) => string
+        isArchivingDefinition: (archivingDefinitionIds: Set<string>) => (definitionId: string) => boolean
+    }
+}
+
+export type aiObservabilityScoreDefinitionsLogicType = MakeLogicType<
+    aiObservabilityScoreDefinitionsLogicValues,
+    aiObservabilityScoreDefinitionsLogicActions,
+    AIObservabilityScoreDefinitionsLogicProps,
+    aiObservabilityScoreDefinitionsLogicMeta
+>
+
 export const aiObservabilityScoreDefinitionsLogic = kea<aiObservabilityScoreDefinitionsLogicType>([
     path(['products', 'ai_observability', 'frontend', 'scoreDefinitions', 'aiObservabilityScoreDefinitionsLogic']),
     props({} as AIObservabilityScoreDefinitionsLogicProps),
@@ -237,7 +328,7 @@ export const aiObservabilityScoreDefinitionsLogic = kea<aiObservabilityScoreDefi
         ],
         isArchivingDefinition: [
             (s) => [s.archivingDefinitionIds],
-            (archivingDefinitionIds): ((definitionId: string) => boolean) => {
+            (archivingDefinitionIds: Set<string>): ((definitionId: string) => boolean) => {
                 return (definitionId: string) => archivingDefinitionIds.has(definitionId)
             },
         ],
diff --git a/products/ai_observability/frontend/scoreDefinitions/scoreDefinitionModalLogic.ts b/products/ai_observability/frontend/scoreDefinitions/scoreDefinitionModalLogic.ts
index 08aacaecefbb..a4f2b7b96c76 100644
--- a/products/ai_observability/frontend/scoreDefinitions/scoreDefinitionModalLogic.ts
+++ b/products/ai_observability/frontend/scoreDefinitions/scoreDefinitionModalLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 
 import { lemonToast } from '~/lib/lemon-ui/LemonToast/LemonToast'
 
@@ -8,8 +8,8 @@ import {
     llmAnalyticsScoreDefinitionsPartialUpdate as aiObservabilityScoreDefinitionsPartialUpdate,
 } from '../generated/api'
 import type { ScoreDefinitionApi } from '../generated/api.schemas'
+import type { CategoricalScoreOptionApi } from '../generated/api.schemas'
 import { aiObservabilityScoreDefinitionsLogic } from './aiObservabilityScoreDefinitionsLogic'
-import type { scoreDefinitionModalLogicType } from './scoreDefinitionModalLogicType'
 import {
     createDraft,
     buildConfigFromDraft,
@@ -26,6 +26,73 @@ export interface ScoreDefinitionModalLogicProps {
     scoreDefinition: ScoreDefinitionApi | null
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface scoreDefinitionModalLogicValues {
+    draft: ScoreDefinitionDraft
+    isConfigMode: boolean
+    isCreateMode: boolean
+    isMetadataMode: boolean
+    submitting: boolean
+    title: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface scoreDefinitionModalLogicActions {
+    addOption: () => {
+        value: true
+    }
+    beginSubmit: () => {
+        value: true
+    }
+    initializeDraft: (draft: ScoreDefinitionDraft) => {
+        draft: ScoreDefinitionDraft
+    }
+    removeOption: (index: number) => {
+        index: number
+    }
+    setDraftField: (
+        field: keyof ScoreDefinitionDraft,
+        value: ScoreDefinitionDraft[keyof ScoreDefinitionDraft]
+    ) => {
+        field: keyof ScoreDefinitionDraft
+        value: string | CategoricalScoreOptionApi[]
+    }
+    submit: () => {
+        value: true
+    }
+    submitFailure: () => {
+        value: true
+    }
+    submitSuccess: () => {
+        value: true
+    }
+    updateOptionLabel: (
+        index: number,
+        value: string
+    ) => {
+        index: number
+        value: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface scoreDefinitionModalLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        isCreateMode: (arg: any) => boolean
+        isMetadataMode: (arg: any) => boolean
+        isConfigMode: (arg: any) => boolean
+        title: (arg: any) => string
+    }
+}
+
+export type scoreDefinitionModalLogicType = MakeLogicType<
+    scoreDefinitionModalLogicValues,
+    scoreDefinitionModalLogicActions,
+    ScoreDefinitionModalLogicProps,
+    scoreDefinitionModalLogicMeta
+>
+
 export const scoreDefinitionModalLogic = kea<scoreDefinitionModalLogicType>([
     path(['products', 'ai_observability', 'frontend', 'scoreDefinitions', 'scoreDefinitionModalLogic']),
     props({} as ScoreDefinitionModalLogicProps),
diff --git a/products/ai_observability/frontend/sentimentEvaluationAvailabilityLogic.ts b/products/ai_observability/frontend/sentimentEvaluationAvailabilityLogic.ts
index 61543b378f5b..35460a1fcea3 100644
--- a/products/ai_observability/frontend/sentimentEvaluationAvailabilityLogic.ts
+++ b/products/ai_observability/frontend/sentimentEvaluationAvailabilityLogic.ts
@@ -1,11 +1,51 @@
-import { afterMount, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, afterMount, kea, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { getCurrentTeamId } from '~/lib/utils/getAppContext'
 
 import { evaluationsList } from './generated/api'
 import type { EvaluationApi } from './generated/api.schemas'
-import type { sentimentEvaluationAvailabilityLogicType } from './sentimentEvaluationAvailabilityLogicType'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sentimentEvaluationAvailabilityLogicValues {
+    hasLoadedSentimentEvaluations: boolean
+    hasSentimentEvaluations: boolean
+    sentimentEvaluations: EvaluationApi[]
+    sentimentEvaluationsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sentimentEvaluationAvailabilityLogicActions {
+    loadSentimentEvaluations: () => any
+    loadSentimentEvaluationsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSentimentEvaluationsSuccess: (
+        sentimentEvaluations: EvaluationApi[],
+        payload?: any
+    ) => {
+        sentimentEvaluations: EvaluationApi[]
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sentimentEvaluationAvailabilityLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        hasSentimentEvaluations: (sentimentEvaluations: EvaluationApi[]) => boolean
+    }
+}
+
+export type sentimentEvaluationAvailabilityLogicType = MakeLogicType<
+    sentimentEvaluationAvailabilityLogicValues,
+    sentimentEvaluationAvailabilityLogicActions,
+    Record<string, any>,
+    sentimentEvaluationAvailabilityLogicMeta
+>
 
 export const sentimentEvaluationAvailabilityLogic = kea<sentimentEvaluationAvailabilityLogicType>([
     path(['products', 'ai_observability', 'frontend', 'sentimentEvaluationAvailabilityLogic']),
diff --git a/products/ai_observability/frontend/sessionPlaybackLogic.ts b/products/ai_observability/frontend/sessionPlaybackLogic.ts
index 3de18c2f29a8..a56992857705 100644
--- a/products/ai_observability/frontend/sessionPlaybackLogic.ts
+++ b/products/ai_observability/frontend/sessionPlaybackLogic.ts
@@ -1,6 +1,4 @@
-import { actions, kea, key, listeners, path, props, reducers } from 'kea'
-
-import type { sessionPlaybackLogicType } from './sessionPlaybackLogicType'
+import { MakeLogicType, actions, kea, key, listeners, path, props, reducers } from 'kea'
 
 export const PLAYBACK_SPEEDS = [0.5, 1, 1.5, 2, 3, 4, 8, 16]
 const TICK_MS = 50
@@ -9,6 +7,54 @@ export interface SessionPlaybackLogicProps {
     sessionId: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionPlaybackLogicValues {
+    currentMs: number
+    durationMs: number
+    playing: boolean
+    speed: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionPlaybackLogicActions {
+    pause: () => {
+        value: true
+    }
+    play: () => {
+        value: true
+    }
+    seek: (ms: number) => {
+        ms: number
+    }
+    setCurrentMs: (ms: number) => {
+        ms: number
+    }
+    setSpeed: (speed: number) => {
+        speed: number
+    }
+    setTimeline: (durationMs: number) => {
+        durationMs: number
+    }
+    tick: (deltaMs: number) => {
+        deltaMs: number
+    }
+    togglePlay: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionPlaybackLogicMeta {
+    key: string
+}
+
+export type sessionPlaybackLogicType = MakeLogicType<
+    sessionPlaybackLogicValues,
+    sessionPlaybackLogicActions,
+    SessionPlaybackLogicProps,
+    sessionPlaybackLogicMeta
+>
+
 export const sessionPlaybackLogic = kea<sessionPlaybackLogicType>([
     path(['products', 'ai_observability', 'frontend', 'sessionPlaybackLogic']),
     props({} as SessionPlaybackLogicProps),
diff --git a/products/ai_observability/frontend/settings/llmProviderKeysLogic.ts b/products/ai_observability/frontend/settings/llmProviderKeysLogic.ts
index 14c599e6502e..54215f1c6f5e 100644
--- a/products/ai_observability/frontend/settings/llmProviderKeysLogic.ts
+++ b/products/ai_observability/frontend/settings/llmProviderKeysLogic.ts
@@ -1,12 +1,10 @@
-import { actions, afterMount, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api, { ApiError } from 'lib/api'
 import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
 import { teamLogic } from 'scenes/teamLogic'
 
-import type { llmProviderKeysLogicType } from './llmProviderKeysLogicType'
-
 export type LLMProviderKeyState = 'unknown' | 'ok' | 'invalid' | 'error'
 export type LLMProvider =
     | 'openai'
@@ -198,6 +196,282 @@ export interface DependentConfigsResponse {
     alternative_keys: AlternativeKey[]
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmProviderKeysLogicValues {
+    dependentConfigs: DependentConfigsResponse | null
+    dependentConfigsLoading: boolean
+    editingKey: LLMProviderKey | null
+    evaluationConfig: EvaluationTrialConfig | null
+    evaluationConfigLoading: boolean
+    isTrialGrandfathered: boolean
+    keyToDelete: LLMProviderKey | null
+    newKeyModalOpen: boolean
+    newlyCreatedKey: LLMProviderKey | null
+    preValidationResult: KeyValidationResult | null
+    preValidationResultLoading: boolean
+    providerKeys: LLMProviderKey[]
+    providerKeysLoading: boolean
+    requiresProviderKey: boolean
+    trialEvalLimit: number
+    trialEvalsRemaining: number
+    trialEvalsUsed: number
+    trialEvaluations: TrialEvaluation[]
+    trialEvaluationsLoading: boolean
+    validatingKeyId: string | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmProviderKeysLogicActions {
+    clearPreValidation: () => {
+        value: true
+    }
+    confirmAssignKey: (
+        evaluationIds: string[],
+        enable: boolean
+    ) => {
+        enable: boolean
+        evaluationIds: string[]
+    }
+    confirmDelete: (replacementKeyId?: string) => {
+        replacementKeyId: string | undefined
+    }
+    createProviderKey: ({ payload }: { payload: CreateLLMProviderKeyPayload }) => {
+        payload: CreateLLMProviderKeyPayload
+    }
+    createProviderKeyFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    createProviderKeySuccess: (
+        providerKeys: LLMProviderKey[],
+        payload?: {
+            payload: CreateLLMProviderKeyPayload
+        }
+    ) => {
+        providerKeys: LLMProviderKey[]
+        payload?: {
+            payload: CreateLLMProviderKeyPayload
+        }
+    }
+    deleteProviderKey: ({ id, replacementKeyId }: { id: string; replacementKeyId?: string }) => {
+        id: string
+        replacementKeyId?: string
+    }
+    deleteProviderKeyFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteProviderKeySuccess: (
+        providerKeys: LLMProviderKey[],
+        payload?: {
+            id: string
+            replacementKeyId?: string
+        }
+    ) => {
+        providerKeys: LLMProviderKey[]
+        payload?: {
+            id: string
+            replacementKeyId?: string
+        }
+    }
+    dismissAssignKey: () => {
+        value: true
+    }
+    loadDependentConfigs: ({ keyId }: { keyId: string }) => {
+        keyId: string
+    }
+    loadDependentConfigsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadDependentConfigsSuccess: (
+        dependentConfigs: DependentConfigsResponse | null,
+        payload?: {
+            keyId: string
+        }
+    ) => {
+        dependentConfigs: DependentConfigsResponse | null
+        payload?: {
+            keyId: string
+        }
+    }
+    loadEvaluationConfig: () => any
+    loadEvaluationConfigFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadEvaluationConfigSuccess: (
+        evaluationConfig: EvaluationTrialConfig | null,
+        payload?: any
+    ) => {
+        evaluationConfig: EvaluationTrialConfig | null
+        payload?: any
+    }
+    loadProviderKeys: () => any
+    loadProviderKeysFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadProviderKeysSuccess: (
+        providerKeys: LLMProviderKey[],
+        payload?: any
+    ) => {
+        providerKeys: LLMProviderKey[]
+        payload?: any
+    }
+    loadTrialEvaluations: ({ provider }: { provider: LLMProvider }) => {
+        provider: LLMProvider
+    }
+    loadTrialEvaluationsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadTrialEvaluationsSuccess: (
+        trialEvaluations: TrialEvaluation[],
+        payload?: {
+            provider: LLMProvider
+        }
+    ) => {
+        trialEvaluations: TrialEvaluation[]
+        payload?: {
+            provider: LLMProvider
+        }
+    }
+    preValidateKey: ({
+        apiKey,
+        provider,
+        azure_endpoint,
+        api_version,
+    }: {
+        api_version?: string
+        apiKey: string
+        azure_endpoint?: string
+        provider: LLMProvider
+    }) => {
+        apiKey: string
+        provider: LLMProvider
+        azure_endpoint?: string
+        api_version?: string
+    }
+    preValidateKeyFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    preValidateKeySuccess: (
+        preValidationResult: KeyValidationResult,
+        payload?: {
+            apiKey: string
+            provider: LLMProvider
+            azure_endpoint?: string
+            api_version?: string
+        }
+    ) => {
+        preValidationResult: KeyValidationResult
+        payload?: {
+            apiKey: string
+            provider: LLMProvider
+            azure_endpoint?: string
+            api_version?: string
+        }
+    }
+    setEditingKey: (key: LLMProviderKey | null) => {
+        key: LLMProviderKey | null
+    }
+    setKeyToDelete: (key: LLMProviderKey | null) => {
+        key: LLMProviderKey | null
+    }
+    setNewKeyModalOpen: (open: boolean) => {
+        open: boolean
+    }
+    setNewlyCreatedKey: (key: LLMProviderKey | null) => {
+        key: LLMProviderKey | null
+    }
+    updateProviderKey: ({ id, payload }: { id: string; payload: UpdateLLMProviderKeyPayload }) => {
+        id: string
+        payload: UpdateLLMProviderKeyPayload
+    }
+    updateProviderKeyFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateProviderKeySuccess: (
+        providerKeys: LLMProviderKey[],
+        payload?: {
+            id: string
+            payload: UpdateLLMProviderKeyPayload
+        }
+    ) => {
+        providerKeys: LLMProviderKey[]
+        payload?: {
+            id: string
+            payload: UpdateLLMProviderKeyPayload
+        }
+    }
+    validateProviderKey: ({ id }: { id: string }) => {
+        id: string
+    }
+    validateProviderKeyFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    validateProviderKeySuccess: (
+        providerKeys: LLMProviderKey[],
+        payload?: {
+            id: string
+        }
+    ) => {
+        providerKeys: LLMProviderKey[]
+        payload?: {
+            id: string
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmProviderKeysLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        trialEvalsUsed: (evaluationConfig: EvaluationTrialConfig | null) => number
+        trialEvalLimit: (evaluationConfig: EvaluationTrialConfig | null) => number
+        trialEvalsRemaining: (evaluationConfig: EvaluationTrialConfig | null) => number
+        isTrialGrandfathered: (evaluationConfig: EvaluationTrialConfig | null) => boolean
+        requiresProviderKey: (evaluationConfig: EvaluationTrialConfig | null) => boolean
+    }
+}
+
+export type llmProviderKeysLogicType = MakeLogicType<
+    llmProviderKeysLogicValues,
+    llmProviderKeysLogicActions,
+    Record<string, any>,
+    llmProviderKeysLogicMeta
+>
+
 export const llmProviderKeysLogic = kea<llmProviderKeysLogicType>([
     path(['products', 'ai_observability', 'settings', 'llmProviderKeysLogic']),
 
diff --git a/products/ai_observability/frontend/settings/parserRecipesLogic.ts b/products/ai_observability/frontend/settings/parserRecipesLogic.ts
index 08343aabecf7..e19bf05f1d94 100644
--- a/products/ai_observability/frontend/settings/parserRecipesLogic.ts
+++ b/products/ai_observability/frontend/settings/parserRecipesLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { subscriptions } from 'kea-subscriptions'
 import { parse as parseYaml } from 'yaml'
@@ -16,7 +16,6 @@ import {
 import { ParserRecipeApi } from '../generated/api.schemas'
 import { applyTeamParserRecipes } from '../messageNormalization'
 import { compileRecipe, StoredRecipe } from '../normalizer'
-import type { parserRecipesLogicType } from './parserRecipesLogicType'
 
 export interface CustomRecipeItem {
     id: string
@@ -42,6 +41,81 @@ export function sourceCompileError(source: string): string | null {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface parserRecipesLogicValues {
+    currentTeamId: number | null // teamLogic
+    customItems: CustomRecipeItem[]
+    editor: RecipeEditorState | null
+    editorCompileError: string | null
+    recipesVersion: number
+    savingEditor: boolean
+    storedForMerge: StoredRecipe[]
+    storedRecipes: ParserRecipeApi[]
+    storedRecipesLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface parserRecipesLogicActions {
+    closeEditor: () => {
+        value: true
+    }
+    deleteItem: (item: CustomRecipeItem) => {
+        item: CustomRecipeItem
+    }
+    loadRecipes: () => any
+    loadRecipesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRecipesSuccess: (
+        storedRecipes: ParserRecipeApi[],
+        payload?: any
+    ) => {
+        storedRecipes: ParserRecipeApi[]
+        payload?: any
+    }
+    openEditorForItem: (item: CustomRecipeItem) => {
+        item: CustomRecipeItem
+    }
+    openEditorForNew: () => {
+        value: true
+    }
+    recipesApplied: () => {
+        value: true
+    }
+    setEditorName: (name: string) => {
+        name: string
+    }
+    setEditorSource: (source: string) => {
+        source: string
+    }
+    submitEditor: () => {
+        value: true
+    }
+    submitEditorDone: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface parserRecipesLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        storedForMerge: (storedRecipes: ParserRecipeApi[]) => StoredRecipe[]
+        customItems: (storedRecipes: ParserRecipeApi[]) => CustomRecipeItem[]
+        editorCompileError: (editor: RecipeEditorState | null) => string | null
+    }
+}
+
+export type parserRecipesLogicType = MakeLogicType<
+    parserRecipesLogicValues,
+    parserRecipesLogicActions,
+    Record<string, any>,
+    parserRecipesLogicMeta
+>
+
 // Owns the team's custom recipes end to end: loads them, pushes them into the live
 // trace-rendering normalizer, and backs the settings editor. Mounted on every AI
 // observability view via aiObservabilitySharedLogic so customizations apply even when
@@ -101,7 +175,7 @@ export const parserRecipesLogic = kea<parserRecipesLogicType>([
     selectors({
         storedForMerge: [
             (s) => [s.storedRecipes],
-            (rows): StoredRecipe[] => rows.map((row) => ({ id: row.id, source: row.source })),
+            (rows: ParserRecipeApi[]): StoredRecipe[] => rows.map((row) => ({ id: row.id, source: row.source })),
         ],
         customItems: [
             (s) => [s.storedRecipes],
@@ -110,7 +184,7 @@ export const parserRecipesLogic = kea<parserRecipesLogicType>([
         ],
         editorCompileError: [
             (s) => [s.editor],
-            (editor): string | null => (editor ? sourceCompileError(editor.source) : null),
+            (editor: RecipeEditorState | null): string | null => (editor ? sourceCompileError(editor.source) : null),
         ],
     }),
     subscriptions(({ actions }) => ({
diff --git a/products/ai_observability/frontend/summary-view/summaryViewLogic.ts b/products/ai_observability/frontend/summary-view/summaryViewLogic.ts
index 6c96ac43dac5..cf3518f0fa5d 100644
--- a/products/ai_observability/frontend/summary-view/summaryViewLogic.ts
+++ b/products/ai_observability/frontend/summary-view/summaryViewLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -8,7 +8,6 @@ import { teamLogic } from 'scenes/teamLogic'
 import { LLMTrace, LLMTraceEvent } from '~/queries/schema/schema-general'
 
 import { EnrichedTraceTreeNode } from '../aiObservabilityTraceDataLogic'
-import type { summaryViewLogicType } from './summaryViewLogicType'
 
 export type SummaryMode = 'minimal' | 'detailed'
 
@@ -36,6 +35,89 @@ export interface SummaryViewLogicProps {
     autoGenerate?: boolean
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface summaryViewLogicValues {
+    dataProcessingAccepted: boolean // maxGlobalLogic
+    currentTeamId: number | null // teamLogic
+    entityId: string | null
+    isFlowExpanded: boolean
+    isNotesExpanded: boolean
+    isSummaryExpanded: boolean
+    summaryData: {
+        summary: StructuredSummary
+        text_repr: string
+    } | null
+    summaryDataLoading: boolean
+    summaryMode: SummaryMode
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface summaryViewLogicActions {
+    generateSummary: ({ mode, forceRefresh }: { forceRefresh?: boolean; mode: SummaryMode }) => {
+        mode: SummaryMode
+        forceRefresh?: boolean
+    }
+    generateSummaryFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    generateSummarySuccess: (
+        summaryData: {
+            summary: any
+            text_repr: any
+        },
+        payload?: {
+            mode: SummaryMode
+            forceRefresh?: boolean
+        }
+    ) => {
+        summaryData: {
+            summary: any
+            text_repr: any
+        }
+        payload?: {
+            mode: SummaryMode
+            forceRefresh?: boolean
+        }
+    }
+    loadCachedSummary: () => {
+        value: true
+    }
+    regenerateSummary: () => {
+        value: true
+    }
+    setSummaryMode: (mode: SummaryMode) => {
+        mode: SummaryMode
+    }
+    toggleFlowExpanded: () => {
+        value: true
+    }
+    toggleNotesExpanded: () => {
+        value: true
+    }
+    toggleSummaryExpanded: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface summaryViewLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        entityId: (arg: any) => string | null
+    }
+}
+
+export type summaryViewLogicType = MakeLogicType<
+    summaryViewLogicValues,
+    summaryViewLogicActions,
+    SummaryViewLogicProps,
+    summaryViewLogicMeta
+>
+
 export const summaryViewLogic = kea<summaryViewLogicType>([
     path(['products', 'ai_observability', 'frontend', 'summary-view', 'summaryViewLogic']),
     props({} as SummaryViewLogicProps),
diff --git a/products/ai_observability/frontend/tabs/aiObservabilityDashboardLogic.ts b/products/ai_observability/frontend/tabs/aiObservabilityDashboardLogic.ts
index e61f3786b2d8..0b6c595b5c89 100644
--- a/products/ai_observability/frontend/tabs/aiObservabilityDashboardLogic.ts
+++ b/products/ai_observability/frontend/tabs/aiObservabilityDashboardLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 
@@ -22,7 +22,6 @@ import {
 
 import { aiObservabilitySharedLogic } from '../aiObservabilitySharedLogic'
 import { buildAiObservabilityStorageConfig } from '../preferenceStorage'
-import type { aiObservabilityDashboardLogicType } from './aiObservabilityDashboardLogicType'
 
 export type AIObservabilityDashboardLogicProps = Record<string, never>
 
@@ -50,6 +49,106 @@ function getDayDateRange(day: string): { date_from: string; date_to: string } {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilityDashboardLogicValues {
+    dashboardDateFilter: {
+        dateFrom: string | null
+        dateTo: string | null
+    } // aiObservabilitySharedLogic
+    propertyFilters: AnyPropertyFilter[] // aiObservabilitySharedLogic
+    shouldFilterTestAccounts: boolean // aiObservabilitySharedLogic
+    availableDashboards: Array<{
+        description: string
+        id: number
+        name: string
+    }>
+    availableDashboardsLoading: boolean
+    isRefreshing: boolean
+    newestRefreshed: Date | null
+    refreshStatus: Record<
+        string,
+        {
+            loading?: boolean
+            timer?: Date
+        }
+    >
+    selectedDashboardId: number | null
+    tiles: QueryTile[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilityDashboardLogicActions {
+    loadLLMDashboards: () => {
+        value: true
+    }
+    loadLLMDashboardsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadLLMDashboardsSuccess: (
+        availableDashboards: {
+            description: string
+            id: number
+            name: string
+        }[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        availableDashboards: {
+            description: string
+            id: number
+            name: string
+        }[]
+        payload?: {
+            value: true
+        }
+    }
+    refreshAllDashboardItems: () => {
+        value: true
+    }
+    setRefreshStatus: (
+        tileId: string,
+        loading?: boolean
+    ) => {
+        loading: boolean | undefined
+        tileId: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilityDashboardLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        isRefreshing: (
+            refreshStatus: Record<
+                string,
+                {
+                    loading?: boolean
+                    timer?: Date
+                }
+            >
+        ) => boolean
+        tiles: (
+            dashboardDateFilter: {
+                dateFrom: string | null
+                dateTo: string | null
+            },
+            shouldFilterTestAccounts: boolean,
+            propertyFilters: AnyPropertyFilter[]
+        ) => QueryTile[]
+    }
+}
+
+export type aiObservabilityDashboardLogicType = MakeLogicType<
+    aiObservabilityDashboardLogicValues,
+    aiObservabilityDashboardLogicActions,
+    AIObservabilityDashboardLogicProps,
+    aiObservabilityDashboardLogicMeta
+>
+
 export const aiObservabilityDashboardLogic = kea<aiObservabilityDashboardLogicType>([
     path(['products', 'ai_observability', 'frontend', 'tabs', 'aiObservabilityDashboardLogic']),
     props({} as AIObservabilityDashboardLogicProps),
@@ -189,7 +288,14 @@ export const aiObservabilityDashboardLogic = kea<aiObservabilityDashboardLogicTy
         // When feature flag is ON, dashboard is loaded from backend template instead.
         tiles: [
             (s) => [s.dashboardDateFilter, s.shouldFilterTestAccounts, s.propertyFilters],
-            (dashboardDateFilter, shouldFilterTestAccounts, propertyFilters): QueryTile[] => [
+            (
+                dashboardDateFilter: {
+                    dateFrom: string | null
+                    dateTo: string | null
+                },
+                shouldFilterTestAccounts: boolean,
+                propertyFilters: AnyPropertyFilter[]
+            ): QueryTile[] => [
                 {
                     title: 'Traces',
                     query: {
diff --git a/products/ai_observability/frontend/tabs/aiObservabilityErrorsLogic.ts b/products/ai_observability/frontend/tabs/aiObservabilityErrorsLogic.ts
index d7464786e4e9..a51d799cc89e 100644
--- a/products/ai_observability/frontend/tabs/aiObservabilityErrorsLogic.ts
+++ b/products/ai_observability/frontend/tabs/aiObservabilityErrorsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, path, props, reducers, selectors } from 'kea'
 
 import { TaxonomicFilterGroupType } from 'lib/components/TaxonomicFilter/types'
 
@@ -8,10 +8,74 @@ import { AnyPropertyFilter, PropertyFilterType, PropertyOperator } from '~/types
 
 import errorsQueryTemplate from '../../backend/queries/errors.sql?raw'
 import { SortDirection, SortState, aiObservabilitySharedLogic } from '../aiObservabilitySharedLogic'
-import type { aiObservabilityErrorsLogicType } from './aiObservabilityErrorsLogicType'
 
 export type AIObservabilityErrorsLogicProps = Record<string, never>
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilityErrorsLogicValues {
+    dateFilter: {
+        dateFrom: string | null
+        dateTo: string | null
+    } // aiObservabilitySharedLogic
+    propertyFilters: AnyPropertyFilter[] // aiObservabilitySharedLogic
+    shouldFilterTestAccounts: boolean // aiObservabilitySharedLogic
+    groupsTaxonomicTypes: TaxonomicFilterGroupType[] // groupsModel
+    buildAllErrorsTrendQuery: InsightVizNode
+    buildErrorTrendQuery: (errorName: string) => TrendsQuery
+    errorsQuery: DataTableNode
+    errorsSort: SortState
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilityErrorsLogicActions {
+    setErrorsSort: (
+        column: string,
+        direction: SortDirection
+    ) => {
+        column: string
+        direction: SortDirection
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilityErrorsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        errorsQuery: (
+            dateFilter: {
+                dateFrom: string | null
+                dateTo: string | null
+            },
+            shouldFilterTestAccounts: boolean,
+            propertyFilters: AnyPropertyFilter[],
+            errorsSort: SortState,
+            groupsTaxonomicTypes: TaxonomicFilterGroupType[]
+        ) => DataTableNode
+        buildErrorTrendQuery: (
+            dateFilter: {
+                dateFrom: string | null
+                dateTo: string | null
+            },
+            shouldFilterTestAccounts: boolean,
+            propertyFilters: AnyPropertyFilter[]
+        ) => (errorName: string) => TrendsQuery
+        buildAllErrorsTrendQuery: (
+            dateFilter: {
+                dateFrom: string | null
+                dateTo: string | null
+            },
+            shouldFilterTestAccounts: boolean,
+            propertyFilters: AnyPropertyFilter[]
+        ) => InsightVizNode
+    }
+}
+
+export type aiObservabilityErrorsLogicType = MakeLogicType<
+    aiObservabilityErrorsLogicValues,
+    aiObservabilityErrorsLogicActions,
+    AIObservabilityErrorsLogicProps,
+    aiObservabilityErrorsLogicMeta
+>
+
 export const aiObservabilityErrorsLogic = kea<aiObservabilityErrorsLogicType>([
     path(['products', 'ai_observability', 'frontend', 'tabs', 'aiObservabilityErrorsLogic']),
     props({} as AIObservabilityErrorsLogicProps),
diff --git a/products/ai_observability/frontend/tabs/aiObservabilityGenerationsLogic.ts b/products/ai_observability/frontend/tabs/aiObservabilityGenerationsLogic.ts
index 71efe0117ea9..f47b026ed88a 100644
--- a/products/ai_observability/frontend/tabs/aiObservabilityGenerationsLogic.ts
+++ b/products/ai_observability/frontend/tabs/aiObservabilityGenerationsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
 
 import api from 'lib/api'
 import { TaxonomicFilterGroupType } from 'lib/components/TaxonomicFilter/types'
@@ -6,10 +6,11 @@ import { TaxonomicFilterGroupType } from 'lib/components/TaxonomicFilter/types'
 import { groupsModel } from '~/models/groupsModel'
 import { DataTableNode, LLMTrace, NodeKind, TraceQuery } from '~/queries/schema/schema-general'
 
+import type { AnyPropertyFilter } from '../../../../frontend/src/types'
 import { SortDirection, SortState, aiObservabilitySharedLogic } from '../aiObservabilitySharedLogic'
+import type { ApplyUrlStatePayload } from '../aiObservabilitySharedLogic'
 import { buildAiObservabilityStorageConfig } from '../preferenceStorage'
 import { GENERATION_SENTIMENT_SELECT } from '../sentimentResults'
-import type { aiObservabilityGenerationsLogicType } from './aiObservabilityGenerationsLogicType'
 
 export type AIObservabilityGenerationsLogicProps = Record<string, never>
 
@@ -29,6 +30,100 @@ export function getDefaultGenerationsColumns(): string[] {
     ]
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilityGenerationsLogicValues {
+    dateFilter: {
+        dateFrom: string | null
+        dateTo: string | null
+    } // aiObservabilitySharedLogic
+    propertyFilters: AnyPropertyFilter[] // aiObservabilitySharedLogic
+    shouldFilterTestAccounts: boolean // aiObservabilitySharedLogic
+    groupsTaxonomicTypes: TaxonomicFilterGroupType[] // groupsModel
+    defaultGenerationsQuery: DataTableNode
+    expandedGenerationIds: Set<string>
+    generationsColumns: string[] | null
+    generationsQuery: DataTableNode
+    generationsQueryOverride: DataTableNode | null
+    generationsSort: SortState
+    loadedTraces: Record<string, LLMTrace>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilityGenerationsLogicActions {
+    applyUrlState: (state: ApplyUrlStatePayload) => ApplyUrlStatePayload // aiObservabilitySharedLogic
+    setDates: (
+        dateFrom: string | null,
+        dateTo: string | null
+    ) => {
+        dateFrom: string | null
+        dateTo: string | null
+    } // aiObservabilitySharedLogic
+    setPropertyFilters: (propertyFilters: AnyPropertyFilter[]) => {
+        propertyFilters: AnyPropertyFilter[]
+    } // aiObservabilitySharedLogic
+    setShouldFilterTestAccounts: (shouldFilterTestAccounts: boolean) => {
+        shouldFilterTestAccounts: boolean
+    } // aiObservabilitySharedLogic
+    clearExpandedGenerations: () => {
+        value: true
+    }
+    setGenerationsColumns: (columns: string[]) => {
+        columns: string[]
+    }
+    setGenerationsQuery: (query: DataTableNode) => {
+        query: DataTableNode
+    }
+    setGenerationsSort: (
+        column: string,
+        direction: SortDirection
+    ) => {
+        column: string
+        direction: SortDirection
+    }
+    setLoadedTrace: (
+        traceId: string,
+        trace: LLMTrace
+    ) => {
+        trace: LLMTrace
+        traceId: string
+    }
+    toggleGenerationExpanded: (
+        uuid: string,
+        traceId: string
+    ) => {
+        traceId: string
+        uuid: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilityGenerationsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        generationsQuery: (
+            generationsQueryOverride: DataTableNode | null,
+            defaultGenerationsQuery: DataTableNode
+        ) => DataTableNode
+        defaultGenerationsQuery: (
+            dateFilter: {
+                dateFrom: string | null
+                dateTo: string | null
+            },
+            shouldFilterTestAccounts: boolean,
+            propertyFilters: AnyPropertyFilter[],
+            generationsColumns: string[] | null,
+            generationsSort: SortState,
+            groupsTaxonomicTypes: TaxonomicFilterGroupType[]
+        ) => DataTableNode
+    }
+}
+
+export type aiObservabilityGenerationsLogicType = MakeLogicType<
+    aiObservabilityGenerationsLogicValues,
+    aiObservabilityGenerationsLogicActions,
+    AIObservabilityGenerationsLogicProps,
+    aiObservabilityGenerationsLogicMeta
+>
+
 export const aiObservabilityGenerationsLogic = kea<aiObservabilityGenerationsLogicType>([
     path(['products', 'ai_observability', 'frontend', 'tabs', 'aiObservabilityGenerationsLogic']),
     // Singleton (unkeyed): the persisted column selection lives in a single localStorage key
@@ -151,7 +246,7 @@ export const aiObservabilityGenerationsLogic = kea<aiObservabilityGenerationsLog
     selectors({
         generationsQuery: [
             (s) => [s.generationsQueryOverride, s.defaultGenerationsQuery],
-            (override, defQuery) => override || defQuery,
+            (override: DataTableNode | null, defQuery: DataTableNode) => override || defQuery,
         ],
 
         defaultGenerationsQuery: [
@@ -164,12 +259,15 @@ export const aiObservabilityGenerationsLogic = kea<aiObservabilityGenerationsLog
                 s.groupsTaxonomicTypes,
             ],
             (
-                dateFilter,
-                shouldFilterTestAccounts,
-                propertyFilters,
-                generationsColumns,
-                generationsSort,
-                groupsTaxonomicTypes
+                dateFilter: {
+                    dateFrom: string | null
+                    dateTo: string | null
+                },
+                shouldFilterTestAccounts: boolean,
+                propertyFilters: import('~/types').AnyPropertyFilter[],
+                generationsColumns: string[] | null,
+                generationsSort: SortState,
+                groupsTaxonomicTypes: TaxonomicFilterGroupType[]
             ): DataTableNode => ({
                 kind: NodeKind.DataTableNode,
                 source: {
diff --git a/products/ai_observability/frontend/tabs/aiObservabilitySentimentLogic.ts b/products/ai_observability/frontend/tabs/aiObservabilitySentimentLogic.ts
index fc74faee7da1..b38824e572bd 100644
--- a/products/ai_observability/frontend/tabs/aiObservabilitySentimentLogic.ts
+++ b/products/ai_observability/frontend/tabs/aiObservabilitySentimentLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { subscriptions } from 'kea-subscriptions'
 import posthog from 'posthog-js'
@@ -7,12 +7,13 @@ import { TaxonomicFilterGroupType } from 'lib/components/TaxonomicFilter/types'
 
 import { groupsModel } from '~/models/groupsModel'
 
+import type { AnyPropertyFilter } from '../../../../frontend/src/types'
 import { aiObservabilitySharedLogic } from '../aiObservabilitySharedLogic'
+import type { AIObservabilityTabId } from '../aiObservabilitySharedLogic'
 import { sentimentEvaluationAvailabilityLogic } from '../sentimentEvaluationAvailabilityLogic'
 import { fetchSentimentGenerationsPage, GENERATIONS_PAGE_SIZE, type SentimentGeneration } from '../sentimentQueries'
 import type { MessageSentiment } from '../sentimentResults'
 import { extractContentText } from '../sentimentUtils'
-import type { aiObservabilitySentimentLogicType } from './aiObservabilitySentimentLogicType'
 
 export type { SentimentGeneration } from '../sentimentQueries'
 
@@ -147,6 +148,133 @@ function captureEngagementEvents(
 let lastRawFetchCount = 0
 let nextGenerationsOffset = 0
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilitySentimentLogicValues {
+    activeTab: AIObservabilityTabId // aiObservabilitySharedLogic
+    dateFilter: {
+        dateFrom: string | null
+        dateTo: string | null
+    } // aiObservabilitySharedLogic
+    propertyFilters: AnyPropertyFilter[] // aiObservabilitySharedLogic
+    shouldFilterTestAccounts: boolean // aiObservabilitySharedLogic
+    groupsTaxonomicTypes: TaxonomicFilterGroupType[] // groupsModel
+    hasLoadedSentimentEvaluations: boolean // sentimentEvaluationAvailabilityLogic
+    hasSentimentEvaluations: boolean // sentimentEvaluationAvailabilityLogic
+    sentimentEvaluationsLoading: boolean // sentimentEvaluationAvailabilityLogic
+    activeFilters: Set<SentimentCategory>
+    autoLoadRounds: number
+    expandedCardIds: Set<string>
+    generations: SentimentGeneration[]
+    generationsError: boolean
+    generationsLoading: boolean
+    groupedSentimentCards: GroupedSentimentCard[]
+    hasLoadedOnce: boolean
+    hasMore: boolean
+    intensityThreshold: number
+    sentimentCards: SentimentCard[]
+    sentimentFilter: SentimentFilterLabel
+    sentimentSummary: Record<SentimentCategory, number>
+    showSentimentEvaluationOnboarding: boolean
+    stillAnalyzing: boolean
+    taxonomicGroupTypes: TaxonomicFilterGroupType[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilitySentimentLogicActions {
+    activate: () => {
+        value: true
+    }
+    loadGenerations: () => any
+    loadGenerationsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadGenerationsSuccess: (
+        generations: SentimentGeneration[],
+        payload?: any
+    ) => {
+        generations: SentimentGeneration[]
+        payload?: any
+    }
+    loadMoreGenerations: () => {
+        value: true
+    }
+    loadMoreGenerationsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadMoreGenerationsSuccess: (
+        generations: SentimentGeneration[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        generations: SentimentGeneration[]
+        payload?: {
+            value: true
+        }
+    }
+    setHasMore: (hasMore: boolean) => {
+        hasMore: boolean
+    }
+    setIntensityThreshold: (intensityThreshold: number) => {
+        intensityThreshold: number
+    }
+    setSentimentFilter: (sentimentFilter: SentimentFilterLabel) => {
+        sentimentFilter: SentimentFilterLabel
+    }
+    toggleCardExpanded: (cardKey: string) => {
+        cardKey: string
+    }
+    toggleSentimentCategory: (category: SentimentCategory) => {
+        category: SentimentCategory
+    }
+    trackTraceClicked: (card: SentimentCard) => {
+        card: SentimentCard
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilitySentimentLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        taxonomicGroupTypes: (groupsTaxonomicTypes: TaxonomicFilterGroupType[]) => TaxonomicFilterGroupType[]
+        sentimentCards: (
+            generations: SentimentGeneration[],
+            activeFilters: Set<SentimentCategory>,
+            intensityThreshold: number
+        ) => SentimentCard[]
+        sentimentSummary: (
+            generations: SentimentGeneration[],
+            intensityThreshold: number
+        ) => Record<SentimentCategory, number>
+        groupedSentimentCards: (sentimentCards: SentimentCard[]) => GroupedSentimentCard[]
+        stillAnalyzing: (generationsLoading: boolean) => boolean
+        showSentimentEvaluationOnboarding: (
+            hasLoadedSentimentEvaluations: boolean,
+            hasSentimentEvaluations: boolean,
+            hasLoadedOnce: boolean,
+            generations: SentimentGeneration[],
+            generationsLoading: boolean,
+            generationsError: boolean,
+            hasMore: boolean,
+            autoLoadRounds: number
+        ) => boolean
+    }
+}
+
+export type aiObservabilitySentimentLogicType = MakeLogicType<
+    aiObservabilitySentimentLogicValues,
+    aiObservabilitySentimentLogicActions,
+    AIObservabilitySentimentLogicProps,
+    aiObservabilitySentimentLogicMeta
+>
+
 export const aiObservabilitySentimentLogic = kea<aiObservabilitySentimentLogicType>([
     path(['products', 'ai_observability', 'frontend', 'tabs', 'aiObservabilitySentimentLogic']),
     props({} as AIObservabilitySentimentLogicProps),
diff --git a/products/ai_observability/frontend/tabs/aiObservabilitySessionsViewLogic.ts b/products/ai_observability/frontend/tabs/aiObservabilitySessionsViewLogic.ts
index 73c53896f6b5..8154293e6394 100644
--- a/products/ai_observability/frontend/tabs/aiObservabilitySessionsViewLogic.ts
+++ b/products/ai_observability/frontend/tabs/aiObservabilitySessionsViewLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
 import { actionToUrl, combineUrl, router, urlToAction } from 'kea-router'
 import { subscriptions } from 'kea-subscriptions'
 
@@ -9,11 +9,13 @@ import { urls } from 'scenes/urls'
 import { groupsModel } from '~/models/groupsModel'
 import { DataTableNode, HogQLQuery, NodeKind, RefreshType } from '~/queries/schema/schema-general'
 
+import type { AnyPropertyFilter } from '../../../../frontend/src/types'
 import sessionsQueryTemplate from '../../backend/queries/sessions.sql?raw'
 import type { SortDirection, SortState } from '../aiObservabilitySharedLogic'
 import { aiObservabilitySharedLogic } from '../aiObservabilitySharedLogic'
+import type { AIObservabilityTabId } from '../aiObservabilitySharedLogic'
 import { llmSessionTitleLazyLoaderLogic } from '../llmSessionTitleLazyLoaderLogic'
-import type { aiObservabilitySessionsViewLogicType } from './aiObservabilitySessionsViewLogicType'
+import type { DateRangeFilter } from '../types'
 
 export type AIObservabilitySessionsViewLogicProps = Record<string, never>
 
@@ -52,6 +54,96 @@ function parseSessionsResponse(response: { columns?: unknown[]; results?: unknow
     }))
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilitySessionsViewLogicValues {
+    activeTab: AIObservabilityTabId // aiObservabilitySharedLogic
+    dateFilter: {
+        dateFrom: string | null
+        dateTo: string | null
+    } // aiObservabilitySharedLogic
+    propertyFilters: AnyPropertyFilter[] // aiObservabilitySharedLogic
+    shouldFilterTestAccounts: boolean // aiObservabilitySharedLogic
+    groupsTaxonomicTypes: TaxonomicFilterGroupType[] // groupsModel
+    getSessionTitle: (sessionId: string) => string | null | undefined // llmSessionTitleLazyLoaderLogic
+    hasMoreSessions: boolean
+    moreSessionsLoading: boolean
+    selectedSessionId: string | null
+    sessions: SessionListRow[]
+    sessionsLoading: boolean
+    sessionsQuery: DataTableNode
+    sessionsSort: SortState
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilitySessionsViewLogicActions {
+    ensureSessionTitleLoaded: (
+        sessionId: string,
+        dateRange?: DateRangeFilter | undefined
+    ) => {
+        dateRange: DateRangeFilter | undefined
+        sessionId: string
+    } // llmSessionTitleLazyLoaderLogic
+    loadMoreSessions: () => {
+        value: true
+    }
+    loadMoreSessionsFailure: () => {
+        value: true
+    }
+    loadMoreSessionsSuccess: (
+        sessions: SessionListRow[],
+        hasMoreSessions: boolean
+    ) => {
+        hasMoreSessions: boolean
+        sessions: SessionListRow[]
+    }
+    loadSessions: (payload?: { refresh?: RefreshType }) => {
+        refresh: RefreshType | undefined
+    }
+    loadSessionsFailure: () => {
+        value: true
+    }
+    loadSessionsSuccess: (
+        sessions: SessionListRow[],
+        hasMoreSessions: boolean
+    ) => {
+        hasMoreSessions: boolean
+        sessions: SessionListRow[]
+    }
+    selectSession: (sessionId: string | null) => {
+        sessionId: string | null
+    }
+    setSessionsSort: (
+        column: string,
+        direction: SortDirection
+    ) => {
+        column: string
+        direction: SortDirection
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilitySessionsViewLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        sessionsQuery: (
+            dateFilter: {
+                dateFrom: string | null
+                dateTo: string | null
+            },
+            shouldFilterTestAccounts: boolean,
+            propertyFilters: AnyPropertyFilter[],
+            sessionsSort: SortState,
+            groupsTaxonomicTypes: TaxonomicFilterGroupType[]
+        ) => DataTableNode
+    }
+}
+
+export type aiObservabilitySessionsViewLogicType = MakeLogicType<
+    aiObservabilitySessionsViewLogicValues,
+    aiObservabilitySessionsViewLogicActions,
+    AIObservabilitySessionsViewLogicProps,
+    aiObservabilitySessionsViewLogicMeta
+>
+
 export const aiObservabilitySessionsViewLogic = kea<aiObservabilitySessionsViewLogicType>([
     path(['products', 'ai_observability', 'frontend', 'tabs', 'aiObservabilitySessionsViewLogic']),
     props({} as AIObservabilitySessionsViewLogicProps),
@@ -213,7 +305,7 @@ export const aiObservabilitySessionsViewLogic = kea<aiObservabilitySessionsViewL
             (
                 dateFilter: { dateFrom: string | null; dateTo: string | null },
                 shouldFilterTestAccounts: boolean,
-                propertyFilters,
+                propertyFilters: import('~/types').AnyPropertyFilter[],
                 sessionsSort: { column: string; direction: 'ASC' | 'DESC' },
                 groupsTaxonomicTypes: TaxonomicFilterGroupType[]
             ): DataTableNode => {
diff --git a/products/ai_observability/frontend/tabs/aiObservabilityToolsLogic.ts b/products/ai_observability/frontend/tabs/aiObservabilityToolsLogic.ts
index 5744fa515f71..042bec48fcdc 100644
--- a/products/ai_observability/frontend/tabs/aiObservabilityToolsLogic.ts
+++ b/products/ai_observability/frontend/tabs/aiObservabilityToolsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, path, props, reducers, selectors } from 'kea'
 
 import { TaxonomicFilterGroupType } from 'lib/components/TaxonomicFilter/types'
 import { escapeRegex } from 'lib/utils/actions'
@@ -16,10 +16,101 @@ import { AnyPropertyFilter, ChartDisplayType, PathType, PropertyFilterType, Prop
 
 import toolsQueryTemplate from '../../backend/queries/tools.sql?raw'
 import { SortDirection, SortState, aiObservabilitySharedLogic } from '../aiObservabilitySharedLogic'
-import type { aiObservabilityToolsLogicType } from './aiObservabilityToolsLogicType'
 
 export type AIObservabilityToolsLogicProps = Record<string, never>
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilityToolsLogicValues {
+    dateFilter: {
+        dateFrom: string | null
+        dateTo: string | null
+    } // aiObservabilitySharedLogic
+    propertyFilters: AnyPropertyFilter[] // aiObservabilitySharedLogic
+    shouldFilterTestAccounts: boolean // aiObservabilitySharedLogic
+    groupsTaxonomicTypes: TaxonomicFilterGroupType[] // groupsModel
+    buildAllToolsTrendQuery: InsightVizNode
+    buildToolHeatmapQuery: DataVisualizationNode
+    buildToolPathsQuery: (toolName: string) => PathsQuery
+    buildToolSequencesQuery: (toolName: string) => TrendsQuery
+    buildToolTrendQuery: (toolName: string) => TrendsQuery
+    toolsQuery: DataTableNode
+    toolsSort: SortState
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilityToolsLogicActions {
+    setToolsSort: (
+        column: string,
+        direction: SortDirection
+    ) => {
+        column: string
+        direction: SortDirection
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilityToolsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        toolsQuery: (
+            dateFilter: {
+                dateFrom: string | null
+                dateTo: string | null
+            },
+            shouldFilterTestAccounts: boolean,
+            propertyFilters: AnyPropertyFilter[],
+            toolsSort: SortState,
+            groupsTaxonomicTypes: TaxonomicFilterGroupType[]
+        ) => DataTableNode
+        buildToolPathsQuery: (
+            dateFilter: {
+                dateFrom: string | null
+                dateTo: string | null
+            },
+            shouldFilterTestAccounts: boolean,
+            propertyFilters: AnyPropertyFilter[]
+        ) => (toolName: string) => PathsQuery
+        buildToolSequencesQuery: (
+            dateFilter: {
+                dateFrom: string | null
+                dateTo: string | null
+            },
+            shouldFilterTestAccounts: boolean,
+            propertyFilters: AnyPropertyFilter[]
+        ) => (toolName: string) => TrendsQuery
+        buildToolTrendQuery: (
+            dateFilter: {
+                dateFrom: string | null
+                dateTo: string | null
+            },
+            shouldFilterTestAccounts: boolean,
+            propertyFilters: AnyPropertyFilter[]
+        ) => (toolName: string) => TrendsQuery
+        buildAllToolsTrendQuery: (
+            dateFilter: {
+                dateFrom: string | null
+                dateTo: string | null
+            },
+            shouldFilterTestAccounts: boolean,
+            propertyFilters: AnyPropertyFilter[]
+        ) => InsightVizNode
+        buildToolHeatmapQuery: (
+            dateFilter: {
+                dateFrom: string | null
+                dateTo: string | null
+            },
+            shouldFilterTestAccounts: boolean,
+            propertyFilters: AnyPropertyFilter[]
+        ) => DataVisualizationNode
+    }
+}
+
+export type aiObservabilityToolsLogicType = MakeLogicType<
+    aiObservabilityToolsLogicValues,
+    aiObservabilityToolsLogicActions,
+    AIObservabilityToolsLogicProps,
+    aiObservabilityToolsLogicMeta
+>
+
 export const aiObservabilityToolsLogic = kea<aiObservabilityToolsLogicType>([
     path(['products', 'ai_observability', 'frontend', 'tabs', 'aiObservabilityToolsLogic']),
     props({} as AIObservabilityToolsLogicProps),
diff --git a/products/ai_observability/frontend/tabs/aiObservabilityTracesTabLogic.ts b/products/ai_observability/frontend/tabs/aiObservabilityTracesTabLogic.ts
index 30ea83de76d3..e21ae7b82116 100644
--- a/products/ai_observability/frontend/tabs/aiObservabilityTracesTabLogic.ts
+++ b/products/ai_observability/frontend/tabs/aiObservabilityTracesTabLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, path, props, reducers, selectors } from 'kea'
 
 import { TaxonomicFilterGroupType } from 'lib/components/TaxonomicFilter/types'
 import { FEATURE_FLAGS } from 'lib/constants'
@@ -8,10 +8,11 @@ import { userLogic } from 'scenes/userLogic'
 import { groupsModel } from '~/models/groupsModel'
 import { DataTableNode, NodeKind } from '~/queries/schema/schema-general'
 
+import type { FeatureFlagsSet } from '../../../../frontend/src/lib/logic/featureFlagLogic'
+import type { AnyPropertyFilter, UserType } from '../../../../frontend/src/types'
 import { aiObservabilitySharedLogic } from '../aiObservabilitySharedLogic'
 import { buildAiObservabilityStorageConfig } from '../preferenceStorage'
 import { LLM_TRACES_PAGE_SIZE } from '../utils'
-import type { aiObservabilityTracesTabLogicType } from './aiObservabilityTracesTabLogicType'
 
 export interface AIObservabilityTracesTabLogicProps {
     personId?: string
@@ -21,6 +22,71 @@ export interface AIObservabilityTracesTabLogicProps {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilityTracesTabLogicValues {
+    dateFilter: {
+        dateFrom: string | null
+        dateTo: string | null
+    } // aiObservabilitySharedLogic
+    propertyFilters: AnyPropertyFilter[] // aiObservabilitySharedLogic
+    searchQuery: string // aiObservabilitySharedLogic
+    shouldFilterSupportTraces: boolean // aiObservabilitySharedLogic
+    shouldFilterTestAccounts: boolean // aiObservabilitySharedLogic
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    groupsTaxonomicTypes: TaxonomicFilterGroupType[] // groupsModel
+    user: UserType | null // userLogic
+    defaultTracesQuery: DataTableNode
+    showInputOutputColumns: boolean
+    showSentimentColumn: boolean
+    tracesQuery: DataTableNode
+    tracesQueryOverride: DataTableNode | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilityTracesTabLogicActions {
+    setShowInputOutputColumns: (show: boolean) => {
+        show: boolean
+    }
+    setShowSentimentColumn: (show: boolean) => {
+        show: boolean
+    }
+    setTracesQuery: (query: DataTableNode) => {
+        query: DataTableNode
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilityTracesTabLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        tracesQuery: (tracesQueryOverride: DataTableNode | null, defaultTracesQuery: DataTableNode) => DataTableNode
+        defaultTracesQuery: (
+            dateFilter: {
+                dateFrom: string | null
+                dateTo: string | null
+            },
+            shouldFilterTestAccounts: boolean,
+            shouldFilterSupportTraces: boolean,
+            propertyFilters: AnyPropertyFilter[],
+            searchQuery: string,
+            arg: any,
+            arg2: any,
+            groupsTaxonomicTypes: TaxonomicFilterGroupType[],
+            featureFlags: FeatureFlagsSet,
+            user: UserType | null,
+            showInputOutputColumns: boolean,
+            showSentimentColumn: boolean
+        ) => DataTableNode
+    }
+}
+
+export type aiObservabilityTracesTabLogicType = MakeLogicType<
+    aiObservabilityTracesTabLogicValues,
+    aiObservabilityTracesTabLogicActions,
+    AIObservabilityTracesTabLogicProps,
+    aiObservabilityTracesTabLogicMeta
+>
+
 export const aiObservabilityTracesTabLogic = kea<aiObservabilityTracesTabLogicType>([
     path(['products', 'ai_observability', 'frontend', 'tabs', 'aiObservabilityTracesTabLogic']),
     key((props: AIObservabilityTracesTabLogicProps) => props?.personId || 'aiObservabilityScene'),
@@ -70,7 +136,7 @@ export const aiObservabilityTracesTabLogic = kea<aiObservabilityTracesTabLogicTy
     selectors({
         tracesQuery: [
             (s) => [s.tracesQueryOverride, s.defaultTracesQuery],
-            (override, defQuery) => override || defQuery,
+            (override: DataTableNode | null, defQuery: DataTableNode) => override || defQuery,
         ],
 
         defaultTracesQuery: [
@@ -92,7 +158,7 @@ export const aiObservabilityTracesTabLogic = kea<aiObservabilityTracesTabLogicTy
                 dateFilter: { dateFrom: string | null; dateTo: string | null },
                 shouldFilterTestAccounts: boolean,
                 shouldFilterSupportTraces: boolean,
-                propertyFilters,
+                propertyFilters: import('~/types').AnyPropertyFilter[],
                 searchQuery: string,
                 personId: string | undefined,
                 group: { groupKey: string; groupTypeIndex: number } | undefined,
diff --git a/products/ai_observability/frontend/tabs/aiObservabilityUsersLogic.ts b/products/ai_observability/frontend/tabs/aiObservabilityUsersLogic.ts
index 0fae2fce90ad..09ebc6f9f01f 100644
--- a/products/ai_observability/frontend/tabs/aiObservabilityUsersLogic.ts
+++ b/products/ai_observability/frontend/tabs/aiObservabilityUsersLogic.ts
@@ -1,15 +1,62 @@
-import { actions, connect, kea, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, path, props, reducers, selectors } from 'kea'
 
 import { TaxonomicFilterGroupType } from 'lib/components/TaxonomicFilter/types'
 
 import { groupsModel } from '~/models/groupsModel'
 import { DataTableNode, NodeKind } from '~/queries/schema/schema-general'
 
+import type { AnyPropertyFilter } from '../../../../frontend/src/types'
 import { SortDirection, SortState, aiObservabilitySharedLogic } from '../aiObservabilitySharedLogic'
-import type { aiObservabilityUsersLogicType } from './aiObservabilityUsersLogicType'
 
 export type AIObservabilityUsersLogicProps = Record<string, never>
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilityUsersLogicValues {
+    dateFilter: {
+        dateFrom: string | null
+        dateTo: string | null
+    } // aiObservabilitySharedLogic
+    propertyFilters: AnyPropertyFilter[] // aiObservabilitySharedLogic
+    shouldFilterTestAccounts: boolean // aiObservabilitySharedLogic
+    groupsTaxonomicTypes: TaxonomicFilterGroupType[] // groupsModel
+    usersQuery: DataTableNode
+    usersSort: SortState
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilityUsersLogicActions {
+    setUsersSort: (
+        column: string,
+        direction: SortDirection
+    ) => {
+        column: string
+        direction: SortDirection
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilityUsersLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        usersQuery: (
+            dateFilter: {
+                dateFrom: string | null
+                dateTo: string | null
+            },
+            shouldFilterTestAccounts: boolean,
+            propertyFilters: AnyPropertyFilter[],
+            usersSort: SortState,
+            groupsTaxonomicTypes: TaxonomicFilterGroupType[]
+        ) => DataTableNode
+    }
+}
+
+export type aiObservabilityUsersLogicType = MakeLogicType<
+    aiObservabilityUsersLogicValues,
+    aiObservabilityUsersLogicActions,
+    AIObservabilityUsersLogicProps,
+    aiObservabilityUsersLogicMeta
+>
+
 export const aiObservabilityUsersLogic = kea<aiObservabilityUsersLogicType>([
     path(['products', 'ai_observability', 'frontend', 'tabs', 'aiObservabilityUsersLogic']),
     props({} as AIObservabilityUsersLogicProps),
@@ -39,11 +86,14 @@ export const aiObservabilityUsersLogic = kea<aiObservabilityUsersLogicType>([
         usersQuery: [
             (s) => [s.dateFilter, s.shouldFilterTestAccounts, s.propertyFilters, s.usersSort, s.groupsTaxonomicTypes],
             (
-                dateFilter,
-                shouldFilterTestAccounts,
-                propertyFilters,
-                usersSort,
-                groupsTaxonomicTypes
+                dateFilter: {
+                    dateFrom: string | null
+                    dateTo: string | null
+                },
+                shouldFilterTestAccounts: boolean,
+                propertyFilters: import('~/types').AnyPropertyFilter[],
+                usersSort: SortState,
+                groupsTaxonomicTypes: TaxonomicFilterGroupType[]
             ): DataTableNode => ({
                 kind: NodeKind.DataTableNode,
                 source: {
diff --git a/products/ai_observability/frontend/tags/llmTaggerLogic.ts b/products/ai_observability/frontend/tags/llmTaggerLogic.ts
index 29b1aacea9b4..eb59eb2c778b 100644
--- a/products/ai_observability/frontend/tags/llmTaggerLogic.ts
+++ b/products/ai_observability/frontend/tags/llmTaggerLogic.ts
@@ -1,5 +1,6 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { router } from 'kea-router'
 
 import api from 'lib/api'
@@ -14,7 +15,6 @@ import { ChartDisplayType, PropertyFilterType, PropertyOperator } from '~/types'
 import { aiObservabilitySharedLogic } from '../aiObservabilitySharedLogic'
 import { parseTrialProviderKeyId } from '../ModelPicker'
 import { LLMProviderKey, llmProviderKeysLogic } from '../settings/llmProviderKeysLogic'
-import type { llmTaggerLogicType } from './llmTaggerLogicType'
 import { llmTaggersLogic } from './llmTaggersLogic'
 import {
     getIntervalFromDateRange,
@@ -86,6 +86,165 @@ const DEFAULT_FORM: TaggerForm = {
     model_configuration: null,
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmTaggerLogicValues {
+    dateFilter: {
+        dateFrom: string | null
+        dateTo: string | null
+    } // aiObservabilitySharedLogic
+    providerKeys: LLMProviderKey[] // llmProviderKeysLogic
+    activeTab: string
+    hogTestLoading: boolean
+    hogTestResults: HogTestResult[] | null
+    isNewTagger: boolean
+    isTaggerFormSubmitting: boolean
+    isTaggerFormValid: boolean
+    runsChartQuery: TrendsQuery | null
+    selectedModel: string
+    selectedPickerProviderKeyId: string | null
+    showTaggerFormErrors: boolean
+    tagRuns: TagRun[]
+    tagRunsLoading: boolean
+    tagger: Tagger | null
+    taggerForm: TaggerForm
+    taggerFormAllErrors: Record<string, any>
+    taggerFormChanged: boolean
+    taggerFormErrors: DeepPartialMap<TaggerForm, ValidationErrorType>
+    taggerFormHasErrors: boolean
+    taggerFormManualErrors: Record<string, any>
+    taggerFormTouched: boolean
+    taggerFormTouches: Record<string, boolean>
+    taggerFormValidationErrors: DeepPartialMap<TaggerForm, ValidationErrorType>
+    taggerLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmTaggerLogicActions {
+    setDates: (
+        dateFrom: string | null,
+        dateTo: string | null
+    ) => {
+        dateFrom: string | null
+        dateTo: string | null
+    } // aiObservabilitySharedLogic
+    loadProviderKeys: () => any // llmProviderKeysLogic
+    addCondition: () => {
+        value: true
+    }
+    addTag: () => {
+        value: true
+    }
+    clearHogTestResults: () => {
+        value: true
+    }
+    deleteTagger: () => {
+        value: true
+    }
+    loadTagRuns: () => {
+        value: true
+    }
+    loadTagRunsSuccess: (runs: TagRun[]) => {
+        runs: TagRun[]
+    }
+    loadTagger: () => {
+        value: true
+    }
+    loadTaggerSuccess: (tagger: Tagger) => {
+        tagger: Tagger
+    }
+    removeCondition: (index: number) => {
+        index: number
+    }
+    removeTag: (index: number) => {
+        index: number
+    }
+    resetTaggerForm: (values?: TaggerForm) => {
+        values?: TaggerForm
+    }
+    selectModelFromPicker: (
+        modelId: string,
+        providerKeyId: string
+    ) => {
+        modelId: string
+        providerKeyId: string
+    }
+    setActiveTab: (tab: 'configuration' | 'runs') => {
+        tab: 'configuration' | 'runs'
+    }
+    setConditions: (conditions: TaggerConditionSet[]) => {
+        conditions: TaggerConditionSet[]
+    }
+    setTaggerFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setTaggerFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setTaggerFormValues: (values: DeepPartial<TaggerForm>) => {
+        values: DeepPartial<TaggerForm>
+    }
+    submitTaggerForm: () => {
+        value: boolean
+    }
+    submitTaggerFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitTaggerFormRequest: (taggerForm: TaggerForm) => {
+        taggerForm: TaggerForm
+    }
+    submitTaggerFormSuccess: (taggerForm: TaggerForm) => {
+        taggerForm: TaggerForm
+    }
+    testHogTagger: () => {
+        value: true
+    }
+    testHogTaggerSuccess: (results: HogTestResult[]) => {
+        results: HogTestResult[]
+    }
+    touchTaggerFormField: (key: string) => {
+        key: string
+    }
+    updateTag: (
+        index: number,
+        field: 'description' | 'name',
+        value: string
+    ) => {
+        field: 'description' | 'name'
+        index: number
+        value: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmTaggerLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        isNewTagger: (id: string) => boolean
+        runsChartQuery: (
+            id: string,
+            dateFilter: {
+                dateFrom: string | null
+                dateTo: string | null
+            }
+        ) => TrendsQuery | null
+    }
+}
+
+export type llmTaggerLogicType = MakeLogicType<
+    llmTaggerLogicValues,
+    llmTaggerLogicActions,
+    LLMTaggerLogicProps,
+    llmTaggerLogicMeta
+>
+
 export const llmTaggerLogic = kea<llmTaggerLogicType>([
     path(['products', 'ai_observability', 'taggers', 'llmTaggerLogic']),
     props({} as LLMTaggerLogicProps),
diff --git a/products/ai_observability/frontend/tags/llmTaggersLogic.ts b/products/ai_observability/frontend/tags/llmTaggersLogic.ts
index 0b3813a28124..927f008a80b4 100644
--- a/products/ai_observability/frontend/tags/llmTaggersLogic.ts
+++ b/products/ai_observability/frontend/tags/llmTaggersLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -8,9 +8,10 @@ import { teamLogic } from 'scenes/teamLogic'
 import { HogQLQuery, NodeKind, TrendsQuery } from '~/queries/schema/schema-general'
 import { ChartDisplayType } from '~/types'
 
+import type { FeatureFlagsSet } from '../../../../frontend/src/lib/logic/featureFlagLogic'
+import type { ProductIntentProperties } from '../../../../frontend/src/lib/utils/product-intents'
 import { aiObservabilitySharedLogic } from '../aiObservabilitySharedLogic'
 import { llmProviderKeysLogic } from '../settings/llmProviderKeysLogic'
-import type { llmTaggersLogicType } from './llmTaggersLogicType'
 import { defaultTaggerTemplates } from './templates'
 import { getIntervalFromDateRange, Tagger } from './types'
 
@@ -30,6 +31,133 @@ export interface TaggerTagCount {
 type RawStatsRow = [tagger_id: string, runs_count: number]
 type RawTagCountRow = [tagger_id: string, tag_name: string, count: number]
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmTaggersLogicValues {
+    dateFilter: {
+        dateFrom: string | null
+        dateTo: string | null
+    } // aiObservabilitySharedLogic
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    chartQuery: TrendsQuery | null
+    filteredTaggers: Tagger[]
+    hasSeededDefaults: boolean
+    runStats: TaggerRunStats[]
+    runStatsLoading: boolean
+    runStatsMap: Record<string, number>
+    tagCounts: TaggerTagCount[]
+    tagCountsLoading: boolean
+    tagDistributionMap: Record<
+        string,
+        Array<{
+            name: string
+            percent: number
+        }>
+    >
+    taggers: Tagger[]
+    taggersFilter: string
+    taggersLoading: boolean
+    totalRuns: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmTaggersLogicActions {
+    setDates: (
+        dateFrom: string | null,
+        dateTo: string | null
+    ) => {
+        dateFrom: string | null
+        dateTo: string | null
+    } // aiObservabilitySharedLogic
+    loadProviderKeys: () => any // llmProviderKeysLogic
+    addProductIntent: (properties: ProductIntentProperties) => ProductIntentProperties // teamLogic
+    loadRunStats: () => any
+    loadRunStatsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRunStatsSuccess: (
+        runStats: {
+            runs_count: number
+            tagger_id: string
+        }[],
+        payload?: any
+    ) => {
+        runStats: {
+            runs_count: number
+            tagger_id: string
+        }[]
+        payload?: any
+    }
+    loadTagCounts: () => any
+    loadTagCountsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadTagCountsSuccess: (
+        tagCounts: {
+            count: number
+            tag_name: string
+            tagger_id: string
+        }[],
+        payload?: any
+    ) => {
+        tagCounts: {
+            count: number
+            tag_name: string
+            tagger_id: string
+        }[]
+        payload?: any
+    }
+    loadTaggers: () => {
+        value: true
+    }
+    loadTaggersSuccess: (taggers: Tagger[]) => {
+        taggers: Tagger[]
+    }
+    setTaggersFilter: (filter: string) => {
+        filter: string
+    }
+    toggleTaggerEnabled: (id: string) => {
+        id: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmTaggersLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        filteredTaggers: (taggers: Tagger[], taggersFilter: string) => Tagger[]
+        runStatsMap: (runStats: TaggerRunStats[]) => Record<string, number>
+        tagDistributionMap: (tagCounts: TaggerTagCount[]) => Record<
+            string,
+            Array<{
+                name: string
+                percent: number
+            }>
+        >
+        totalRuns: (runStats: TaggerRunStats[]) => number
+        chartQuery: (
+            taggers: Tagger[],
+            dateFilter: {
+                dateFrom: string | null
+                dateTo: string | null
+            }
+        ) => TrendsQuery | null
+    }
+}
+
+export type llmTaggersLogicType = MakeLogicType<
+    llmTaggersLogicValues,
+    llmTaggersLogicActions,
+    LLMTaggersLogicProps,
+    llmTaggersLogicMeta
+>
+
 export const llmTaggersLogic = kea<llmTaggersLogicType>([
     path(['products', 'ai_observability', 'taggers', 'llmTaggersLogic']),
     props({} as LLMTaggersLogicProps),
diff --git a/products/ai_observability/frontend/tags/tagMetricsLogic.ts b/products/ai_observability/frontend/tags/tagMetricsLogic.ts
index 5c4e0cbfd025..39e2e9d64877 100644
--- a/products/ai_observability/frontend/tags/tagMetricsLogic.ts
+++ b/products/ai_observability/frontend/tags/tagMetricsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -7,7 +7,6 @@ import { HogQLQuery, NodeKind, TrendsQuery } from '~/queries/schema/schema-gener
 import { ChartDisplayType, PropertyFilterType, PropertyOperator } from '~/types'
 
 import { llmTaggersLogic } from './llmTaggersLogic'
-import type { tagMetricsLogicType } from './tagMetricsLogicType'
 import { getIntervalFromDateRange, Tagger } from './types'
 
 export interface TagStats {
@@ -24,6 +23,103 @@ export interface TagSummaryMetrics {
 
 export type TagMetricsLogicProps = Record<string, never>
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tagMetricsLogicValues {
+    taggers: Tagger[] // llmTaggersLogic
+    chartQuery: TrendsQuery | null
+    dateFilter: {
+        dateFrom: string | null
+        dateTo: string | null
+    }
+    enabledTaggerCount: number
+    summaryMetrics: TagSummaryMetrics
+    tagStats: {
+        count: number
+        tag: string
+    }[]
+    tagStatsLoading: boolean
+    totalRuns: number
+    totalRunsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tagMetricsLogicActions {
+    loadTagStats: () => any
+    loadTagStatsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadTagStatsSuccess: (
+        tagStats: {
+            count: number
+            tag: string
+        }[],
+        payload?: any
+    ) => {
+        tagStats: {
+            count: number
+            tag: string
+        }[]
+        payload?: any
+    }
+    loadTotalRuns: () => any
+    loadTotalRunsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadTotalRunsSuccess: (
+        totalRuns: number,
+        payload?: any
+    ) => {
+        totalRuns: number
+        payload?: any
+    }
+    setDates: (
+        dateFrom: string | null,
+        dateTo: string | null
+    ) => {
+        dateFrom: string | null
+        dateTo: string | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tagMetricsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        summaryMetrics: (
+            tagStats: {
+                count: number
+                tag: string
+            }[],
+            totalRuns: number
+        ) => TagSummaryMetrics
+        enabledTaggerCount: (taggers: Tagger[]) => number
+        chartQuery: (
+            tagStats: {
+                count: number
+                tag: string
+            }[],
+            dateFilter: {
+                dateFrom: string | null
+                dateTo: string | null
+            }
+        ) => TrendsQuery | null
+    }
+}
+
+export type tagMetricsLogicType = MakeLogicType<
+    tagMetricsLogicValues,
+    tagMetricsLogicActions,
+    TagMetricsLogicProps,
+    tagMetricsLogicMeta
+>
+
 export const tagMetricsLogic = kea<tagMetricsLogicType>([
     path(['products', 'ai_observability', 'frontend', 'tags', 'tagMetricsLogic']),
     props({} as TagMetricsLogicProps),
diff --git a/products/ai_observability/frontend/text-view/textViewLogic.ts b/products/ai_observability/frontend/text-view/textViewLogic.ts
index 3d21626f5a3d..28c86c869685 100644
--- a/products/ai_observability/frontend/text-view/textViewLogic.ts
+++ b/products/ai_observability/frontend/text-view/textViewLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, kea, key, listeners, path, props, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -6,7 +6,6 @@ import api from 'lib/api'
 import { LLMTrace, LLMTraceEvent } from '~/queries/schema/schema-general'
 
 import { FALLBACK_DELAY_MS, TEXT_REPR_API_TIMEOUT_MS, UI_TEXT_REPR_MAX_LENGTH } from './constants'
-import type { textViewLogicType } from './textViewLogicType'
 
 interface TraceTreeNode {
     event: LLMTraceEvent
@@ -52,6 +51,64 @@ export interface TextViewLogicProps {
     onFallback?: () => void
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface textViewLogicValues {
+    copied: boolean
+    expandedSegments: Set<number | string>
+    popoutSegment: number | string | null
+    textRepr: string | null
+    textReprLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface textViewLogicActions {
+    fetchTextRepr: () => any
+    fetchTextReprFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    fetchTextReprSuccess: (
+        textRepr: string | null,
+        payload?: any
+    ) => {
+        textRepr: string | null
+        payload?: any
+    }
+    resetUIState: () => {
+        value: true
+    }
+    setCopied: (copied: boolean) => {
+        copied: boolean
+    }
+    setExpandedSegments: (segments: Set<number | string>) => {
+        segments: Set<number | string>
+    }
+    setPopoutSegment: (index: number | string | null) => {
+        index: number | string | null
+    }
+    toggleSegment: (index: number | string) => {
+        index: number | string
+    }
+    triggerFallback: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface textViewLogicMeta {
+    key: string
+}
+
+export type textViewLogicType = MakeLogicType<
+    textViewLogicValues,
+    textViewLogicActions,
+    TextViewLogicProps,
+    textViewLogicMeta
+>
+
 export const textViewLogic = kea<textViewLogicType>([
     path(['products', 'ai_observability', 'frontend', 'text-view', 'textViewLogic']),
     props({} as TextViewLogicProps),
diff --git a/products/ai_observability/frontend/traceMessagesLazyLoaderLogic.ts b/products/ai_observability/frontend/traceMessagesLazyLoaderLogic.ts
index b189a80422c0..bf5aac43bc4c 100644
--- a/products/ai_observability/frontend/traceMessagesLazyLoaderLogic.ts
+++ b/products/ai_observability/frontend/traceMessagesLazyLoaderLogic.ts
@@ -1,4 +1,4 @@
-import { actions, events, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, events, kea, listeners, path, reducers, selectors } from 'kea'
 
 import api from 'lib/api'
 import { chunk } from 'lib/utils/arrays'
@@ -6,7 +6,6 @@ import { chunk } from 'lib/utils/arrays'
 import { HogQLQuery, NodeKind } from '~/queries/schema/schema-general'
 import { escapeHogQLString } from '~/queries/utils'
 
-import type { traceMessagesLazyLoaderLogicType } from './traceMessagesLazyLoaderLogicType'
 import { parsePartialJSON } from './utils'
 
 export interface TraceMessages {
@@ -37,6 +36,49 @@ function formatHogqlDateTime(d: Date): string {
     return d.toISOString().replace('T', ' ').slice(0, 19)
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface traceMessagesLazyLoaderLogicValues {
+    getTraceMessages: (traceId: string) => TraceMessages | null | undefined
+    loadingTraceIds: Set<string>
+    messagesByTraceId: Record<string, TraceMessages | null>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface traceMessagesLazyLoaderLogicActions {
+    ensureTraceMessagesLoaded: (requests: TraceLazyLoadRequest[]) => {
+        requests: TraceLazyLoadRequest[]
+    }
+    loadTraceMessagesBatchFailure: (requestedTraceIds: string[]) => {
+        requestedTraceIds: string[]
+    }
+    loadTraceMessagesBatchSuccess: (
+        results: Record<string, TraceMessages>,
+        requestedTraceIds: string[]
+    ) => {
+        requestedTraceIds: string[]
+        results: Record<string, TraceMessages>
+    }
+    markTraceIdsLoading: (traceIds: string[]) => {
+        traceIds: string[]
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface traceMessagesLazyLoaderLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        getTraceMessages: (
+            messagesByTraceId: Record<string, TraceMessages | null>
+        ) => (traceId: string) => TraceMessages | null | undefined
+    }
+}
+
+export type traceMessagesLazyLoaderLogicType = MakeLogicType<
+    traceMessagesLazyLoaderLogicValues,
+    traceMessagesLazyLoaderLogicActions,
+    Record<string, any>,
+    traceMessagesLazyLoaderLogicMeta
+>
+
 export const traceMessagesLazyLoaderLogic = kea<traceMessagesLazyLoaderLogicType>([
     path(['products', 'ai_observability', 'frontend', 'traceMessagesLazyLoaderLogic']),
 
@@ -109,7 +151,9 @@ export const traceMessagesLazyLoaderLogic = kea<traceMessagesLazyLoaderLogicType
     selectors({
         getTraceMessages: [
             (s) => [s.messagesByTraceId],
-            (messagesByTraceId): ((traceId: string) => TraceMessages | null | undefined) => {
+            (
+                messagesByTraceId: Record<string, TraceMessages | null>
+            ): ((traceId: string) => TraceMessages | null | undefined) => {
                 return (traceId: string) => messagesByTraceId[traceId]
             },
         ],
diff --git a/products/ai_observability/frontend/traceReviews/aiObservabilityReviewsLogic.ts b/products/ai_observability/frontend/traceReviews/aiObservabilityReviewsLogic.ts
index 3ffa8fff53bc..3dd5b7cb90bb 100644
--- a/products/ai_observability/frontend/traceReviews/aiObservabilityReviewsLogic.ts
+++ b/products/ai_observability/frontend/traceReviews/aiObservabilityReviewsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, isBreakpoint, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, isBreakpoint, kea, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router, urlToAction } from 'kea-router'
 
@@ -17,7 +17,6 @@ import { urls } from '~/scenes/urls'
 
 import { llmAnalyticsScoreDefinitionsList as aiObservabilityScoreDefinitionsList } from '../generated/api'
 import type { ScoreDefinitionApi } from '../generated/api.schemas'
-import type { aiObservabilityReviewsLogicType } from './aiObservabilityReviewsLogicType'
 import { buildTraceReviewsListUrl, traceReviewListParamsFromFilters, traceReviewsApi } from './traceReviewsApi'
 import { fetchAllReviewsForExport, formatReviewsForClipboard, type ReviewClipboardFormat } from './traceReviewsExport'
 import type { TraceReview } from './types'
@@ -71,6 +70,98 @@ function getUrlFilters(filters: TraceReviewFilters): Record<string, unknown> {
 
 export type AIObservabilityReviewsLogicProps = Record<string, never>
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilityReviewsLogicValues {
+    count: number
+    exportPath: string
+    filters: TraceReviewFilters
+    pagination: PaginationManual
+    rawFilters: Partial<TraceReviewFilters> | null
+    reviewCountLabel: string
+    reviews: CountedPaginatedResponse<TraceReview>
+    reviewsLoading: boolean
+    scoreDefinitionOptions: ScoreDefinitionApi[]
+    scoreDefinitionOptionsLoading: boolean
+    sorting: Sorting | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilityReviewsLogicActions {
+    copyReviewsToClipboard: (format: ReviewClipboardFormat) => {
+        format: ReviewClipboardFormat
+    }
+    loadReviews: (debounce?: boolean) => {
+        debounce: boolean
+    }
+    loadReviewsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadReviewsSuccess: (
+        reviews: CountedPaginatedResponse<TraceReview>,
+        payload?: {
+            debounce: boolean
+        }
+    ) => {
+        reviews: CountedPaginatedResponse<TraceReview>
+        payload?: {
+            debounce: boolean
+        }
+    }
+    loadScoreDefinitionOptions: () => {
+        value: true
+    }
+    loadScoreDefinitionOptionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadScoreDefinitionOptionsSuccess: (
+        scoreDefinitionOptions: ScoreDefinitionApi[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        scoreDefinitionOptions: ScoreDefinitionApi[]
+        payload?: {
+            value: true
+        }
+    }
+    setFilters: (
+        filters: Partial<TraceReviewFilters>,
+        merge?: boolean,
+        debounce?: boolean
+    ) => {
+        debounce: boolean
+        filters: Partial<TraceReviewFilters>
+        merge: boolean
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface aiObservabilityReviewsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        filters: (rawFilters: Partial<TraceReviewFilters> | null) => TraceReviewFilters
+        count: (reviews: CountedPaginatedResponse<TraceReview>) => number
+        sorting: (filters: TraceReviewFilters) => Sorting | null
+        pagination: (filters: TraceReviewFilters, count: number) => PaginationManual
+        reviewCountLabel: (filters: TraceReviewFilters, count: number) => string
+        exportPath: (filters: TraceReviewFilters) => string
+    }
+}
+
+export type aiObservabilityReviewsLogicType = MakeLogicType<
+    aiObservabilityReviewsLogicValues,
+    aiObservabilityReviewsLogicActions,
+    AIObservabilityReviewsLogicProps,
+    aiObservabilityReviewsLogicMeta
+>
+
 export const aiObservabilityReviewsLogic = kea<aiObservabilityReviewsLogicType>([
     path(['products', 'ai_observability', 'frontend', 'traceReviews', 'aiObservabilityReviewsLogic']),
     props({} as AIObservabilityReviewsLogicProps),
diff --git a/products/ai_observability/frontend/traceReviews/traceReviewModalLogic.ts b/products/ai_observability/frontend/traceReviews/traceReviewModalLogic.ts
index 0a29f0a3a267..2595b00fabcf 100644
--- a/products/ai_observability/frontend/traceReviews/traceReviewModalLogic.ts
+++ b/products/ai_observability/frontend/traceReviews/traceReviewModalLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 
 import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
 import { teamLogic } from 'scenes/teamLogic'
@@ -7,7 +7,6 @@ import { ApiConfig } from '~/lib/api'
 
 import { llmAnalyticsScoreDefinitionsList as aiObservabilityScoreDefinitionsList } from '../generated/api'
 import type { ScoreDefinitionApi } from '../generated/api.schemas'
-import type { traceReviewModalLogicType } from './traceReviewModalLogicType'
 import { traceReviewsApi } from './traceReviewsApi'
 import { traceReviewsLazyLoaderLogic } from './traceReviewsLazyLoaderLogic'
 import type {
@@ -156,6 +155,167 @@ function mergeDefinitions(
     return mergedDefinitions
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface traceReviewModalLogicValues {
+    currentTeamId: number | null // teamLogic
+    canSave: boolean
+    comment: string
+    currentReview: TraceReview | null
+    definitionOptionsLoading: boolean
+    definitionResultsLabel: string | null
+    definitionSearch: string
+    hasMoreDefinitions: boolean
+    isBusy: boolean
+    isFormValid: boolean
+    isOpen: boolean
+    loadedDefinitions: ScoreDefinitionApi[]
+    modalDataLoading: boolean
+    removing: boolean
+    saving: boolean
+    scoreValues: Record<string, TraceReviewFormScoreValue>
+    selectableDefinitions: ScoreDefinitionApi[]
+    selectedDefinitionIds: string[]
+    selectedDefinitionSnapshots: Record<string, ScoreDefinitionApi>
+    selectedDefinitions: ScoreDefinitionApi[]
+    submitPayload: TraceReviewUpsertPayload
+    totalDefinitionCount: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface traceReviewModalLogicActions {
+    cacheTraceReview: (review: TraceReview) => {
+        review: TraceReview
+    } // traceReviewsLazyLoaderLogic
+    setTraceAsUnreviewed: (traceId: string) => {
+        traceId: string
+    } // traceReviewsLazyLoaderLogic
+    closeModal: () => {
+        value: true
+    }
+    loadDefinitionOptions: (replace?: boolean) => {
+        replace: boolean
+    }
+    loadDefinitionOptionsFailure: () => {
+        value: true
+    }
+    loadDefinitionOptionsSuccess: (
+        definitions: ScoreDefinitionApi[],
+        totalCount: number,
+        replace: boolean
+    ) => {
+        definitions: ScoreDefinitionApi[]
+        replace: boolean
+        totalCount: number
+    }
+    loadModalData: () => {
+        value: true
+    }
+    loadModalDataFailure: () => {
+        value: true
+    }
+    loadModalDataSuccess: (
+        review: TraceReview | null,
+        definitions: ScoreDefinitionApi[],
+        totalCount: number
+    ) => {
+        definitions: ScoreDefinitionApi[]
+        review: TraceReview | null
+        totalCount: number
+    }
+    loadMoreDefinitions: () => {
+        value: true
+    }
+    openModal: () => {
+        value: true
+    }
+    populateForm: (review: TraceReview | null) => {
+        review: TraceReview | null
+    }
+    removeCurrentReview: () => {
+        value: true
+    }
+    removeCurrentReviewFailure: () => {
+        value: true
+    }
+    removeCurrentReviewSuccess: () => {
+        value: true
+    }
+    removeSelectedDefinition: (definitionId: string) => {
+        definitionId: string
+    }
+    resetForm: () => {
+        value: true
+    }
+    saveCurrentReview: () => {
+        value: true
+    }
+    saveCurrentReviewFailure: () => {
+        value: true
+    }
+    saveCurrentReviewSuccess: (review: TraceReview) => {
+        review: TraceReview
+    }
+    selectDefinition: (definition: ScoreDefinitionApi) => {
+        definition: ScoreDefinitionApi
+    }
+    setComment: (comment: string) => {
+        comment: string
+    }
+    setDefinitionSearch: (search: string) => {
+        search: string
+    }
+    setScoreValue: (
+        definitionId: string,
+        value: TraceReviewFormScoreValue
+    ) => {
+        definitionId: string
+        value: TraceReviewFormScoreValue
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface traceReviewModalLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        selectedDefinitions: (
+            loadedDefinitions: ScoreDefinitionApi[],
+            selectedDefinitionSnapshots: Record<string, ScoreDefinitionApi>,
+            selectedDefinitionIds: string[]
+        ) => ScoreDefinitionApi[]
+        selectableDefinitions: (
+            loadedDefinitions: ScoreDefinitionApi[],
+            selectedDefinitionIds: string[]
+        ) => ScoreDefinitionApi[]
+        hasMoreDefinitions: (loadedDefinitions: ScoreDefinitionApi[], totalDefinitionCount: number) => boolean
+        definitionResultsLabel: (
+            loadedDefinitions: ScoreDefinitionApi[],
+            totalDefinitionCount: number,
+            definitionSearch: string
+        ) => string | null
+        isFormValid: (
+            selectedDefinitions: ScoreDefinitionApi[],
+            scoreValues: Record<string, TraceReviewFormScoreValue>
+        ) => boolean
+        isBusy: (modalDataLoading: boolean, saving: boolean, removing: boolean) => boolean
+        canSave: (isFormValid: boolean, isBusy: boolean) => boolean
+        submitPayload: (
+            selectedDefinitions: ScoreDefinitionApi[],
+            scoreValues: Record<string, TraceReviewFormScoreValue>,
+            comment: string,
+            currentReview: TraceReview | null,
+            arg: any,
+            arg2: any
+        ) => TraceReviewUpsertPayload
+    }
+}
+
+export type traceReviewModalLogicType = MakeLogicType<
+    traceReviewModalLogicValues,
+    traceReviewModalLogicActions,
+    TraceReviewModalLogicProps,
+    traceReviewModalLogicMeta
+>
+
 export const traceReviewModalLogic = kea<traceReviewModalLogicType>([
     path(['products', 'ai_observability', 'frontend', 'traceReviews', 'traceReviewModalLogic']),
     props({} as TraceReviewModalLogicProps),
@@ -369,7 +529,11 @@ export const traceReviewModalLogic = kea<traceReviewModalLogicType>([
     selectors({
         selectedDefinitions: [
             (s) => [s.loadedDefinitions, s.selectedDefinitionSnapshots, s.selectedDefinitionIds],
-            (loadedDefinitions, selectedDefinitionSnapshots, selectedDefinitionIds): ScoreDefinitionApi[] => {
+            (
+                loadedDefinitions: ScoreDefinitionApi[],
+                selectedDefinitionSnapshots: Record<string, ScoreDefinitionApi>,
+                selectedDefinitionIds: string[]
+            ): ScoreDefinitionApi[] => {
                 const loadedDefinitionsById = new Map(
                     loadedDefinitions.map((definition) => [definition.id, definition])
                 )
@@ -385,18 +549,23 @@ export const traceReviewModalLogic = kea<traceReviewModalLogicType>([
 
         selectableDefinitions: [
             (s) => [s.loadedDefinitions, s.selectedDefinitionIds],
-            (loadedDefinitions, selectedDefinitionIds): ScoreDefinitionApi[] =>
+            (loadedDefinitions: ScoreDefinitionApi[], selectedDefinitionIds: string[]): ScoreDefinitionApi[] =>
                 loadedDefinitions.filter((definition) => !selectedDefinitionIds.includes(definition.id)),
         ],
 
         hasMoreDefinitions: [
             (s) => [s.loadedDefinitions, s.totalDefinitionCount],
-            (loadedDefinitions, totalDefinitionCount): boolean => loadedDefinitions.length < totalDefinitionCount,
+            (loadedDefinitions: ScoreDefinitionApi[], totalDefinitionCount: number): boolean =>
+                loadedDefinitions.length < totalDefinitionCount,
         ],
 
         definitionResultsLabel: [
             (s) => [s.loadedDefinitions, s.totalDefinitionCount, s.definitionSearch],
-            (loadedDefinitions, totalDefinitionCount, definitionSearch): string | null => {
+            (
+                loadedDefinitions: ScoreDefinitionApi[],
+                totalDefinitionCount: number,
+                definitionSearch: string
+            ): string | null => {
                 if (totalDefinitionCount === 0) {
                     return null
                 }
@@ -411,7 +580,10 @@ export const traceReviewModalLogic = kea<traceReviewModalLogicType>([
 
         isFormValid: [
             (s) => [s.selectedDefinitions, s.scoreValues],
-            (selectedDefinitions, scoreValues): boolean =>
+            (
+                selectedDefinitions: ScoreDefinitionApi[],
+                scoreValues: Record<string, TraceReviewFormScoreValue>
+            ): boolean =>
                 selectedDefinitions.every((definition) => {
                     const value = scoreValues[definition.id]
 
@@ -433,10 +605,14 @@ export const traceReviewModalLogic = kea<traceReviewModalLogicType>([
 
         isBusy: [
             (s) => [s.modalDataLoading, s.saving, s.removing],
-            (modalDataLoading, saving, removing): boolean => modalDataLoading || saving || removing,
+            (modalDataLoading: boolean, saving: boolean, removing: boolean): boolean =>
+                modalDataLoading || saving || removing,
         ],
 
-        canSave: [(s) => [s.isFormValid, s.isBusy], (isFormValid, isBusy): boolean => isFormValid && !isBusy],
+        canSave: [
+            (s) => [s.isFormValid, s.isBusy],
+            (isFormValid: boolean, isBusy: boolean): boolean => isFormValid && !isBusy,
+        ],
 
         submitPayload: [
             (s) => [
@@ -447,7 +623,14 @@ export const traceReviewModalLogic = kea<traceReviewModalLogicType>([
                 (_, props) => props.traceId,
                 (_, props) => props.queueId,
             ],
-            (selectedDefinitions, scoreValues, comment, currentReview, traceId, queueId): TraceReviewUpsertPayload => {
+            (
+                selectedDefinitions: ScoreDefinitionApi[],
+                scoreValues: Record<string, TraceReviewFormScoreValue>,
+                comment: string,
+                currentReview: TraceReview | null,
+                traceId,
+                queueId
+            ): TraceReviewUpsertPayload => {
                 const existingScoresByDefinitionId = getExistingScoreLookup(currentReview)
 
                 return {
diff --git a/products/ai_observability/frontend/traceReviews/traceReviewsLazyLoaderLogic.ts b/products/ai_observability/frontend/traceReviews/traceReviewsLazyLoaderLogic.ts
index 5c832c043d26..26a377eb54e0 100644
--- a/products/ai_observability/frontend/traceReviews/traceReviewsLazyLoaderLogic.ts
+++ b/products/ai_observability/frontend/traceReviews/traceReviewsLazyLoaderLogic.ts
@@ -1,14 +1,68 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 
 import { chunk } from 'lib/utils/arrays'
 import { teamLogic } from 'scenes/teamLogic'
 
 import { traceReviewsApi } from './traceReviewsApi'
-import type { traceReviewsLazyLoaderLogicType } from './traceReviewsLazyLoaderLogicType'
 import type { TraceReview } from './types'
 
 const BATCH_MAX_SIZE = 100
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface traceReviewsLazyLoaderLogicValues {
+    currentTeamId: number | null // teamLogic
+    didTraceReviewLoadFail: (traceId: string) => boolean
+    failedTraceIds: Set<string>
+    getTraceReview: (traceId: string) => TraceReview | null | undefined
+    isTraceLoading: (traceId: string) => boolean
+    loadingTraceIds: Set<string>
+    reviewsByTraceId: Record<string, TraceReview | null>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface traceReviewsLazyLoaderLogicActions {
+    ensureReviewsLoaded: (traceIds: string[]) => {
+        traceIds: string[]
+    }
+    loadReviewsBatchFailure: (requestedTraceIds: string[]) => {
+        requestedTraceIds: string[]
+    }
+    loadReviewsBatchSuccess: (
+        results: Record<string, TraceReview | null>,
+        requestedTraceIds: string[]
+    ) => {
+        requestedTraceIds: string[]
+        results: Record<string, TraceReview | null>
+    }
+    markTraceIdsLoading: (traceIds: string[]) => {
+        traceIds: string[]
+    }
+    setTraceAsUnreviewed: (traceId: string) => {
+        traceId: string
+    }
+    setTraceReview: (review: TraceReview) => {
+        review: TraceReview
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface traceReviewsLazyLoaderLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        isTraceLoading: (loadingTraceIds: Set<string>) => (traceId: string) => boolean
+        getTraceReview: (
+            reviewsByTraceId: Record<string, TraceReview | null>
+        ) => (traceId: string) => TraceReview | null | undefined
+        didTraceReviewLoadFail: (failedTraceIds: Set<string>) => (traceId: string) => boolean
+    }
+}
+
+export type traceReviewsLazyLoaderLogicType = MakeLogicType<
+    traceReviewsLazyLoaderLogicValues,
+    traceReviewsLazyLoaderLogicActions,
+    Record<string, any>,
+    traceReviewsLazyLoaderLogicMeta
+>
+
 export const traceReviewsLazyLoaderLogic = kea<traceReviewsLazyLoaderLogicType>([
     path(['products', 'ai_observability', 'frontend', 'traceReviews', 'traceReviewsLazyLoaderLogic']),
 
@@ -144,19 +198,21 @@ export const traceReviewsLazyLoaderLogic = kea<traceReviewsLazyLoaderLogicType>(
     selectors({
         isTraceLoading: [
             (s) => [s.loadingTraceIds],
-            (loadingTraceIds): ((traceId: string) => boolean) => {
+            (loadingTraceIds: Set<string>): ((traceId: string) => boolean) => {
                 return (traceId: string) => loadingTraceIds.has(traceId)
             },
         ],
         getTraceReview: [
             (s) => [s.reviewsByTraceId],
-            (reviewsByTraceId): ((traceId: string) => TraceReview | null | undefined) => {
+            (
+                reviewsByTraceId: Record<string, TraceReview | null>
+            ): ((traceId: string) => TraceReview | null | undefined) => {
                 return (traceId: string) => reviewsByTraceId[traceId]
             },
         ],
         didTraceReviewLoadFail: [
             (s) => [s.failedTraceIds],
-            (failedTraceIds): ((traceId: string) => boolean) => {
+            (failedTraceIds: Set<string>): ((traceId: string) => boolean) => {
                 return (traceId: string) => failedTraceIds.has(traceId)
             },
         ],
diff --git a/products/alerts/frontend/logic/alertFormLogic.ts b/products/alerts/frontend/logic/alertFormLogic.ts
index 1599e4913e1e..9ea07c63053b 100644
--- a/products/alerts/frontend/logic/alertFormLogic.ts
+++ b/products/alerts/frontend/logic/alertFormLogic.ts
@@ -1,5 +1,6 @@
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 import { subscriptions } from 'kea-subscriptions'
@@ -41,7 +42,6 @@ import {
     isTrendsAlertConfig,
     supportsOngoingInterval,
 } from '../types'
-import type { alertFormLogicType } from './alertFormLogicType'
 import { getAlertFormValidationErrors } from './alertFormSchema'
 import { alertLogic } from './alertLogic'
 import { alertNotificationLogic } from './alertNotificationLogic'
@@ -256,6 +256,194 @@ const getThresholdBounds = (goalLines?: GoalLine[] | null): InsightsThresholdBou
     return { upper: smallerValue }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface alertFormLogicValues {
+    insightData: Record<string, any> // insightVizDataLogic
+    goalLines: GoalLine[] | null | undefined // trendsDataLogic
+    alertForm: AlertFormType
+    alertFormAllErrors: Record<string, any>
+    alertFormChanged: boolean
+    alertFormErrors: DeepPartialMap<AlertFormType, ValidationErrorType>
+    alertFormHasErrors: boolean
+    alertFormManualErrors: Record<string, any>
+    alertFormSubmitAttempted: boolean
+    alertFormTouched: boolean
+    alertFormTouches: Record<string, boolean>
+    alertFormValidationErrors: DeepPartialMap<AlertFormType, ValidationErrorType>
+    funnelAlertPreview: FunnelAlertPreview | null
+    hogqlAlertPreview: HogQLAlertPreview | null
+    hogqlConfigPrefill: Partial<Pick<HogQLAlertConfig, 'column' | 'label_column'>> | null
+    hogqlLabelColumnOptions: {
+        label: string
+        value: string
+    }[]
+    hogqlNumericColumns: string[] | null
+    hogqlResultColumns: string[] | null
+    hogqlSuggestedColumn: string | null
+    hogqlValueColumnOptions: {
+        label: string
+        value: string
+    }[]
+    isAlertFormSubmitting: boolean
+    isAlertFormValid: boolean
+    showAlertFormErrors: boolean
+    simulationDateFrom: string | null
+    simulationResult: AlertSimulationResult | null
+    simulationResultLoading: boolean
+    thresholdBoundsFormError: string | undefined
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface alertFormLogicActions {
+    clearSimulation: () => {
+        value: true
+    }
+    clearSimulationFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    clearSimulationSuccess: (
+        simulationResult: null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        simulationResult: null
+        payload?: {
+            value: true
+        }
+    }
+    clearSnooze: () => {
+        value: true
+    }
+    deleteAlert: () => {
+        value: true
+    }
+    resetAlertForm: (values?: AlertFormType) => {
+        values?: AlertFormType
+    }
+    setAlertFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setAlertFormSubmitAttempted: () => {
+        value: true
+    }
+    setAlertFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setAlertFormValues: (values: DeepPartial<AlertFormType>) => {
+        values: DeepPartial<AlertFormType>
+    }
+    setSimulationDateFrom: (dateFrom: string) => {
+        dateFrom: string
+    }
+    simulateAlert: () => {
+        value: true
+    }
+    simulateAlertFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    simulateAlertSuccess: (
+        simulationResult: AlertSimulationResult | null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        simulationResult: AlertSimulationResult | null
+        payload?: {
+            value: true
+        }
+    }
+    snoozeAlert: (snoozeUntil: string) => {
+        snoozeUntil: string
+    }
+    submitAlertForm: () => {
+        value: boolean
+    }
+    submitAlertFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitAlertFormRequest: (alertForm: AlertFormType) => {
+        alertForm: AlertFormType
+    }
+    submitAlertFormSuccess: (alertForm: AlertFormType) => {
+        alertForm: AlertFormType
+    }
+    touchAlertFormField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface alertFormLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        thresholdBoundsFormError: (
+            alertFormSubmitAttempted: boolean,
+            alertFormErrors: DeepPartialMap<AlertFormType, ValidationErrorType>
+        ) => string | undefined
+        hogqlAlertPreview: (
+            insightData: Record<string, any>,
+            arg: AlertConfig,
+            arg2: InsightsThresholdBounds | undefined
+        ) => HogQLAlertPreview | null
+        funnelAlertPreview: (
+            insightData: Record<string, any>,
+            arg: AlertConfig,
+            arg2: InsightsThresholdBounds | undefined,
+            arg3: AlertConditionType,
+            arg4: InsightThresholdType
+        ) => FunnelAlertPreview | null
+        hogqlResultColumns: (insightData: Record<string, any>) => string[] | null
+        hogqlNumericColumns: (insightData: Record<string, any>, hogqlResultColumns: string[] | null) => string[] | null
+        hogqlSuggestedColumn: (
+            hogqlResultColumns: string[] | null,
+            hogqlNumericColumns: string[] | null
+        ) => string | null
+        hogqlConfigPrefill: (
+            hogqlResultColumns: string[] | null,
+            hogqlSuggestedColumn: string | null,
+            arg: AlertConfig
+        ) => Partial<Pick<HogQLAlertConfig, 'column' | 'label_column'>> | null
+        hogqlValueColumnOptions: (
+            hogqlResultColumns: string[] | null,
+            hogqlNumericColumns: string[] | null
+        ) => {
+            label: string
+            value: string
+        }[]
+        hogqlLabelColumnOptions: (
+            hogqlResultColumns: string[] | null,
+            arg: AlertConfig
+        ) => {
+            label: string
+            value: string
+        }[]
+    }
+}
+
+export type alertFormLogicType = MakeLogicType<
+    alertFormLogicValues,
+    alertFormLogicActions,
+    AlertFormLogicProps,
+    alertFormLogicMeta
+>
+
 export const alertFormLogic = kea<alertFormLogicType>([
     path(['lib', 'components', 'Alerts', 'alertFormLogic']),
     props({} as AlertFormLogicProps),
@@ -493,7 +681,13 @@ export const alertFormLogic = kea<alertFormLogicType>([
     selectors(({ props }) => ({
         thresholdBoundsFormError: [
             (s) => [s.alertFormSubmitAttempted, s.alertFormErrors],
-            (submitAttempted, alertFormErrors): string | undefined => {
+            (
+                submitAttempted: boolean,
+                alertFormErrors: import('node_modules/kea-forms/lib').DeepPartialMap<
+                    AlertFormType,
+                    import('node_modules/kea-forms/lib').ValidationErrorType
+                >
+            ): string | undefined => {
                 if (!submitAttempted) {
                     return undefined
                 }
@@ -546,7 +740,7 @@ export const alertFormLogic = kea<alertFormLogicType>([
         /** Result column names of the SQL insight, for the column pickers. */
         hogqlResultColumns: [
             (s) => [s.insightData],
-            (insightData): string[] | null =>
+            (insightData: Record<string, any>): string[] | null =>
                 props.insightAlertKind === 'hogql' && Array.isArray(insightData?.columns)
                     ? insightData.columns.map(String)
                     : null,
@@ -554,7 +748,7 @@ export const alertFormLogic = kea<alertFormLogicType>([
         /** Result columns with numeric cells — the only valid picks for the evaluated column. */
         hogqlNumericColumns: [
             (s) => [s.insightData, s.hogqlResultColumns],
-            (insightData, resultColumns): string[] | null =>
+            (insightData: Record<string, any>, resultColumns: string[] | null): string[] | null =>
                 resultColumns && Array.isArray(insightData?.result)
                     ? resultColumns.filter((_, index) => columnIsNumeric(insightData.result, index))
                     : null,
@@ -565,7 +759,7 @@ export const alertFormLogic = kea<alertFormLogicType>([
          * (single-column results) or nothing numeric is detectable. */
         hogqlSuggestedColumn: [
             (s) => [s.hogqlResultColumns, s.hogqlNumericColumns],
-            (resultColumns, numericColumns): string | null =>
+            (resultColumns: string[] | null, numericColumns: string[] | null): string | null =>
                 (resultColumns?.length ?? 0) > 1 && numericColumns && numericColumns.length > 0
                     ? numericColumns[numericColumns.length - 1]
                     : null,
diff --git a/products/alerts/frontend/logic/alertLogic.ts b/products/alerts/frontend/logic/alertLogic.ts
index 9b490b594187..c2ed17f64184 100644
--- a/products/alerts/frontend/logic/alertLogic.ts
+++ b/products/alerts/frontend/logic/alertLogic.ts
@@ -1,4 +1,4 @@
-import { actions, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -8,7 +8,6 @@ import { formatDate } from 'lib/utils/datetime'
 import { AlertState } from '~/queries/schema/schema-general'
 
 import type { AlertCheck, AlertType } from '../types'
-import type { alertLogicType } from './alertLogicType'
 
 export const CHART_CHECKS_LIMIT = 50
 export const TABLE_CHECKS_PAGE_SIZE = 25
@@ -56,6 +55,81 @@ function getCheckPlotValue(check: AlertCheck, isAnomalyDetection: boolean): numb
     return v != null && !Number.isNaN(v) ? v : null
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface alertLogicValues {
+    alert: AlertType | null
+    alertHistoryChartSeries: AlertHistoryChartPoint[]
+    alertHistoryChartSeriesName: 'Anomaly score' | 'Value'
+    alertHistoryChecksSortedDesc: AlertCheck[]
+    alertHistoryHasHistory: boolean
+    alertHistoryIsAnomalyDetection: boolean
+    alertHistoryTableEntryCount: number
+    alertHistoryTablePageCount: number
+    alertHistoryUsesAnomalyScores: boolean
+    alertHistoryView: 'chart' | 'table'
+    alertLoading: boolean
+    checksHistoryParams: ChecksHistoryParams
+    checksHistoryTablePage: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface alertLogicActions {
+    alertHistoryTablePageBackward: () => {
+        value: true
+    }
+    alertHistoryTablePageForward: () => {
+        value: true
+    }
+    loadAlert: () => any
+    loadAlertFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAlertSuccess: (
+        alert: AlertType | null,
+        payload?: any
+    ) => {
+        alert: AlertType | null
+        payload?: any
+    }
+    selectAlertHistoryView: (view: 'chart' | 'table') => {
+        view: 'chart' | 'table'
+    }
+    setAlertHistoryView: (view: 'chart' | 'table') => {
+        view: 'chart' | 'table'
+    }
+    setChecksHistoryParams: (
+        limit: number,
+        offset: number
+    ) => {
+        limit: number
+        offset: number
+    }
+    setChecksHistoryTablePage: (page: number) => {
+        page: number
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface alertLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        alertHistoryIsAnomalyDetection: (alert: AlertType | null) => boolean
+        alertHistoryChecksSortedDesc: (alert: AlertType | null) => AlertCheck[]
+        alertHistoryChartSeries: (alert: AlertType | null) => AlertHistoryChartPoint[]
+        alertHistoryUsesAnomalyScores: (alert: AlertType | null) => boolean
+        alertHistoryChartSeriesName: (alertHistoryUsesAnomalyScores: boolean) => 'Anomaly score' | 'Value'
+        alertHistoryHasHistory: (alert: AlertType | null) => boolean
+        alertHistoryTablePageCount: (alert: AlertType | null) => number
+        alertHistoryTableEntryCount: (alert: AlertType | null) => number
+    }
+}
+
+export type alertLogicType = MakeLogicType<alertLogicValues, alertLogicActions, AlertLogicProps, alertLogicMeta>
+
 export const alertLogic = kea<alertLogicType>([
     path(['lib', 'components', 'Alerts', 'alertLogic']),
     props({
diff --git a/products/alerts/frontend/logic/alertNotificationLogic.ts b/products/alerts/frontend/logic/alertNotificationLogic.ts
index 0d84cf8ff0f1..1f5a1824a9cb 100644
--- a/products/alerts/frontend/logic/alertNotificationLogic.ts
+++ b/products/alerts/frontend/logic/alertNotificationLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -20,7 +20,7 @@ import {
     buildHogFunctionPayload,
 } from 'products/alerts/frontend/logic/alertNotifications'
 
-import type { alertNotificationLogicType } from './alertNotificationLogicType'
+import type { UserBasicType } from '../../../../frontend/src/types'
 
 export const ALERT_NOTIFICATION_TYPE_OPTIONS = [
     { label: 'Slack', value: ALERT_NOTIFICATION_TYPE_SLACK },
@@ -33,6 +33,183 @@ export interface AlertNotificationLogicProps {
     alertId?: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface alertNotificationLogicValues {
+    slackIntegrations: IntegrationType[] | undefined // integrationsLogic
+    currentProjectId: number | null // projectLogic
+    existingHogFunctions: HogFunctionType[]
+    existingHogFunctionsLoading: boolean
+    firstSlackIntegration: IntegrationType | undefined
+    pendingNotifications: PendingAlertNotification[]
+    selectedType: AlertNotificationType
+    slackChannelValue: string | null
+    webhookUrl: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface alertNotificationLogicActions {
+    loadIntegrationsSuccess: (
+        integrations: {
+            config: any
+            created_at: string
+            created_by?: UserBasicType | null | undefined
+            display_name: string
+            errors?: string | undefined
+            icon_url: any
+            id: number
+            kind:
+                | 'apns'
+                | 'aws-s3'
+                | 'azure-blob'
+                | 'bing-ads'
+                | 'clickup'
+                | 'customerio-app'
+                | 'customerio-track'
+                | 'customerio-webhook'
+                | 'databricks'
+                | 'email'
+                | 'firebase'
+                | 'github'
+                | 'gitlab'
+                | 'google-ads'
+                | 'google-analytics'
+                | 'google-cloud-service-account'
+                | 'google-cloud-storage'
+                | 'google-pubsub'
+                | 'google-search-console'
+                | 'google-sheets'
+                | 'hubspot'
+                | 'intercom'
+                | 'jira'
+                | 'linear'
+                | 'linkedin-ads'
+                | 'meta-ads'
+                | 'pinterest-ads'
+                | 'postgresql'
+                | 'reddit-ads'
+                | 's3-compatible'
+                | 'salesforce'
+                | 'slack'
+                | 'snapchat'
+                | 'stripe'
+                | 'tiktok-ads'
+                | 'twilio'
+                | 'vercel'
+        }[],
+        payload?: any
+    ) => {
+        integrations: {
+            config: any
+            created_at: string
+            created_by?: UserBasicType | null | undefined
+            display_name: string
+            errors?: string | undefined
+            icon_url: any
+            id: number
+            kind:
+                | 'apns'
+                | 'aws-s3'
+                | 'azure-blob'
+                | 'bing-ads'
+                | 'clickup'
+                | 'customerio-app'
+                | 'customerio-track'
+                | 'customerio-webhook'
+                | 'databricks'
+                | 'email'
+                | 'firebase'
+                | 'github'
+                | 'gitlab'
+                | 'google-ads'
+                | 'google-analytics'
+                | 'google-cloud-service-account'
+                | 'google-cloud-storage'
+                | 'google-pubsub'
+                | 'google-search-console'
+                | 'google-sheets'
+                | 'hubspot'
+                | 'intercom'
+                | 'jira'
+                | 'linear'
+                | 'linkedin-ads'
+                | 'meta-ads'
+                | 'pinterest-ads'
+                | 'postgresql'
+                | 'reddit-ads'
+                | 's3-compatible'
+                | 'salesforce'
+                | 'slack'
+                | 'snapchat'
+                | 'stripe'
+                | 'tiktok-ads'
+                | 'twilio'
+                | 'vercel'
+        }[]
+        payload?: any
+    } // integrationsLogic
+    addPendingNotification: (notification: PendingAlertNotification) => {
+        notification: PendingAlertNotification
+    }
+    clearPendingNotifications: () => {
+        value: true
+    }
+    createPendingHogFunctions: (
+        alertId: string,
+        alertName?: string
+    ) => {
+        alertId: string
+        alertName: string | undefined
+    }
+    deleteExistingHogFunction: (hogFunction: HogFunctionType) => {
+        hogFunction: HogFunctionType
+    }
+    loadExistingHogFunctions: () => any
+    loadExistingHogFunctionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadExistingHogFunctionsSuccess: (
+        existingHogFunctions: HogFunctionType[],
+        payload?: any
+    ) => {
+        existingHogFunctions: HogFunctionType[]
+        payload?: any
+    }
+    removePendingNotification: (index: number) => {
+        index: number
+    }
+    setPendingNotifications: (notifications: PendingAlertNotification[]) => {
+        notifications: PendingAlertNotification[]
+    }
+    setSelectedType: (selectedType: AlertNotificationType) => {
+        selectedType: AlertNotificationType
+    }
+    setSlackChannelValue: (slackChannelValue: string | null) => {
+        slackChannelValue: string | null
+    }
+    setWebhookUrl: (webhookUrl: string) => {
+        webhookUrl: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface alertNotificationLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        firstSlackIntegration: (slackIntegrations: IntegrationType[] | undefined) => IntegrationType | undefined
+    }
+}
+
+export type alertNotificationLogicType = MakeLogicType<
+    alertNotificationLogicValues,
+    alertNotificationLogicActions,
+    AlertNotificationLogicProps,
+    alertNotificationLogicMeta
+>
+
 export const alertNotificationLogic = kea<alertNotificationLogicType>([
     path(['lib', 'components', 'Alerts', 'alertNotificationLogic']),
     props({} as AlertNotificationLogicProps),
diff --git a/products/alerts/frontend/logic/alertsLogic.ts b/products/alerts/frontend/logic/alertsLogic.ts
index 220bd8d97548..47ec9b05ac7d 100644
--- a/products/alerts/frontend/logic/alertsLogic.ts
+++ b/products/alerts/frontend/logic/alertsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { PaginationManual } from '@posthog/lemon-ui'
@@ -10,7 +10,6 @@ import { AlertState } from '~/queries/schema/schema-general'
 
 import { AlertType } from '../types'
 import { AlertLogicProps } from './alertLogic'
-import type { alertsLogicType } from './alertsLogicType'
 
 export interface AlertsLogicProps extends AlertLogicProps {}
 
@@ -26,6 +25,66 @@ export const DEFAULT_ALERTS_FILTERS: AlertsFilters = {
     createdBy: 'All users',
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface alertsLogicValues {
+    alerts: AlertType[]
+    alertsCount: number
+    alertsResponse: {
+        count: number
+        results: AlertType[]
+    }
+    alertsResponseLoading: boolean
+    alertsSortedByState: AlertType[]
+    filters: AlertsFilters
+    isFiltering: boolean
+    page: number
+    pagination: PaginationManual
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface alertsLogicActions {
+    loadAlerts: () => any
+    loadAlertsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAlertsSuccess: (
+        alertsResponse: {
+            count: number
+            results: AlertType[]
+        },
+        payload?: any
+    ) => {
+        alertsResponse: {
+            count: number
+            results: AlertType[]
+        }
+        payload?: any
+    }
+    setFilters: (filters: Partial<AlertsFilters>) => {
+        filters: Partial<AlertsFilters>
+    }
+    setPage: (page: number) => {
+        page: number
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface alertsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        alerts: (alertsResponse: { count: number; results: AlertType[] }) => AlertType[]
+        alertsCount: (alertsResponse: { count: number; results: AlertType[] }) => number
+        isFiltering: (filters: AlertsFilters) => boolean
+        alertsSortedByState: (alerts: AlertType[]) => AlertType[]
+        pagination: (page: number, alertsCount: number) => PaginationManual
+    }
+}
+
+export type alertsLogicType = MakeLogicType<alertsLogicValues, alertsLogicActions, Record<string, any>, alertsLogicMeta>
+
 export const alertsLogic = kea<alertsLogicType>([
     path(['lib', 'components', 'Alerts', 'alertsLogic']),
 
@@ -73,11 +132,17 @@ export const alertsLogic = kea<alertsLogicType>([
     })),
 
     selectors(({ actions }) => ({
-        alerts: [(s) => [s.alertsResponse], (response): AlertType[] => response.results],
-        alertsCount: [(s) => [s.alertsResponse], (response): number => response.count],
+        alerts: [
+            (s) => [s.alertsResponse],
+            (response: { count: number; results: AlertType[] }): AlertType[] => response.results,
+        ],
+        alertsCount: [
+            (s) => [s.alertsResponse],
+            (response: { count: number; results: AlertType[] }): number => response.count,
+        ],
         isFiltering: [
             (s) => [s.filters],
-            (filters): boolean =>
+            (filters: AlertsFilters): boolean =>
                 filters.search !== DEFAULT_ALERTS_FILTERS.search ||
                 filters.createdBy !== DEFAULT_ALERTS_FILTERS.createdBy,
         ],
@@ -88,7 +153,7 @@ export const alertsLogic = kea<alertsLogicType>([
         ],
         pagination: [
             (s) => [s.page, s.alertsCount],
-            (page, count): PaginationManual => ({
+            (page: number, count: number): PaginationManual => ({
                 controlled: true,
                 pageSize: ALERTS_PER_PAGE,
                 currentPage: page,
diff --git a/products/alerts/frontend/logic/insightAlertsLogic.ts b/products/alerts/frontend/logic/insightAlertsLogic.ts
index 3c5148da3e1e..90e0e8590e65 100644
--- a/products/alerts/frontend/logic/insightAlertsLogic.ts
+++ b/products/alerts/frontend/logic/insightAlertsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -18,8 +18,10 @@ import {
 } from '~/queries/utils'
 import { FunnelVizType, InsightLogicProps } from '~/types'
 
+import type { FeatureFlagsSet } from '../../../../frontend/src/lib/logic/featureFlagLogic'
+import type { Node } from '../../../../frontend/src/queries/schema/schema-general'
+import type { QueryBasedInsightModel } from '../../../../frontend/src/types'
 import { AlertType, AnomalyPoint, isTrendsAlertConfig } from '../types'
-import type { insightAlertsLogicType } from './insightAlertsLogicType'
 
 export interface InsightAlertsLogicProps {
     insightId: number
@@ -135,6 +137,84 @@ export function alertsToThresholdGoalLines(alerts: AlertType[]): GoalLine[] {
     })
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightAlertsLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    insight: Partial<QueryBasedInsightModel<Node<Record<string, any>>>> // insightLogic
+    breakdownFilter: BreakdownFilter | null | undefined // insightVizDataLogic
+    showAlertThresholdLines: boolean | null | undefined // insightVizDataLogic
+    alertAnomalyPoints: AnomalyPoint[]
+    alertThresholdLines: GoalLine[]
+    alerts: AlertType[]
+    alertsLoading: boolean
+    hasDetectorAlerts: boolean
+    shouldShowAlertDeletionWarning: boolean
+    showAlertAnomalyPointsFlag: boolean
+    simulationAnomalyPoints: AnomalyPoint[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightAlertsLogicActions {
+    setQuery: (query: Node<Record<string, any>> | null) => {
+        query: Node<Record<string, any>> | null
+    } // insightVizDataLogic
+    clearSimulationAnomalyPoints: () => {
+        value: true
+    }
+    loadAlerts: () => any
+    loadAlertsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAlertsSuccess: (
+        alerts: AlertType[],
+        payload?: any
+    ) => {
+        alerts: AlertType[]
+        payload?: any
+    }
+    removeAlert: (alertId: AlertType['id']) => {
+        alertId: string
+    }
+    setShouldShowAlertDeletionWarning: (show: boolean) => {
+        show: boolean
+    }
+    setShowAlertAnomalyPoints: (show: boolean) => {
+        show: boolean
+    }
+    setSimulationAnomalyPoints: (points: AnomalyPoint[]) => {
+        points: AnomalyPoint[]
+    }
+    upsertAlert: (alert: AlertType) => {
+        alert: AlertType
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightAlertsLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        alertThresholdLines: (alerts: AlertType[], showAlertThresholdLines: boolean | null | undefined) => GoalLine[]
+        hasDetectorAlerts: (alerts: AlertType[]) => boolean
+        alertAnomalyPoints: (
+            alerts: AlertType[],
+            showAlertAnomalyPointsFlag: boolean,
+            simulationAnomalyPoints: AnomalyPoint[],
+            breakdownFilter: BreakdownFilter | null | undefined
+        ) => AnomalyPoint[]
+    }
+}
+
+export type insightAlertsLogicType = MakeLogicType<
+    insightAlertsLogicValues,
+    insightAlertsLogicActions,
+    InsightAlertsLogicProps,
+    insightAlertsLogicMeta
+>
+
 export const insightAlertsLogic = kea<insightAlertsLogicType>([
     path(['lib', 'components', 'Alerts', 'insightAlertsLogic']),
     props({} as InsightAlertsLogicProps),
diff --git a/products/business_knowledge/frontend/scenes/businessKnowledgeLogic.ts b/products/business_knowledge/frontend/scenes/businessKnowledgeLogic.ts
index a0dc0f5dca63..1a495d28df62 100644
--- a/products/business_knowledge/frontend/scenes/businessKnowledgeLogic.ts
+++ b/products/business_knowledge/frontend/scenes/businessKnowledgeLogic.ts
@@ -1,5 +1,6 @@
-import { actions, afterMount, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, listeners, path, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
@@ -22,7 +23,6 @@ import {
     businessKnowledgeGapSuggestionsList,
 } from '../generated/api'
 import type { KnowledgeSourceApi } from '../generated/api.schemas'
-import type { businessKnowledgeLogicType } from './businessKnowledgeLogicType'
 
 export interface AggregatedGap {
     normalized_topic: string
@@ -110,6 +110,449 @@ function splitGlobs(raw: string): string[] {
         .filter(Boolean)
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface businessKnowledgeLogicValues {
+    acceptingGapTopic: string | null
+    createTab: CreateTab
+    editSource: TextSourceFormValues
+    editSourceAllErrors: Record<string, any>
+    editSourceChanged: boolean
+    editSourceErrors: DeepPartialMap<TextSourceFormValues, ValidationErrorType>
+    editSourceHasErrors: boolean
+    editSourceManualErrors: Record<string, any>
+    editSourceTouched: boolean
+    editSourceTouches: Record<string, boolean>
+    editSourceValidationErrors: DeepPartialMap<TextSourceFormValues, ValidationErrorType>
+    editUrlSource: UrlSourceFormValues
+    editUrlSourceAllErrors: Record<string, any>
+    editUrlSourceChanged: boolean
+    editUrlSourceErrors: DeepPartialMap<UrlSourceFormValues, ValidationErrorType>
+    editUrlSourceHasErrors: boolean
+    editUrlSourceManualErrors: Record<string, any>
+    editUrlSourceTouched: boolean
+    editUrlSourceTouches: Record<string, boolean>
+    editUrlSourceValidationErrors: DeepPartialMap<UrlSourceFormValues, ValidationErrorType>
+    editingSource: KnowledgeSource | null
+    editingSourceText: {
+        id: string
+        text: string
+    }
+    editingSourceTextLoading: boolean
+    fileSource: FileSourceFormValues
+    fileSourceAllErrors: Record<string, any>
+    fileSourceChanged: boolean
+    fileSourceErrors: DeepPartialMap<FileSourceFormValues, ValidationErrorType>
+    fileSourceHasErrors: boolean
+    fileSourceManualErrors: Record<string, any>
+    fileSourceTouched: boolean
+    fileSourceTouches: Record<string, boolean>
+    fileSourceValidationErrors: DeepPartialMap<FileSourceFormValues, ValidationErrorType>
+    gapSuggestions: AggregatedGap[]
+    gapSuggestionsLoading: boolean
+    isCreateModalOpen: boolean
+    isEditModalOpen: boolean
+    isEditSourceSubmitting: boolean
+    isEditSourceValid: boolean
+    isEditUrlSourceSubmitting: boolean
+    isEditUrlSourceValid: boolean
+    isFileSourceSubmitting: boolean
+    isFileSourceValid: boolean
+    isTextSourceSubmitting: boolean
+    isTextSourceValid: boolean
+    isUrlSourceSubmitting: boolean
+    isUrlSourceValid: boolean
+    readyCount: number
+    refreshingIds: string[]
+    showEditSourceErrors: boolean
+    showEditUrlSourceErrors: boolean
+    showFileSourceErrors: boolean
+    showTextSourceErrors: boolean
+    showUrlSourceErrors: boolean
+    sources: KnowledgeSource[]
+    sourcesLoading: boolean
+    textSource: TextSourceFormValues
+    textSourceAllErrors: Record<string, any>
+    textSourceChanged: boolean
+    textSourceErrors: DeepPartialMap<TextSourceFormValues, ValidationErrorType>
+    textSourceHasErrors: boolean
+    textSourceManualErrors: Record<string, any>
+    textSourceTouched: boolean
+    textSourceTouches: Record<string, boolean>
+    textSourceValidationErrors: DeepPartialMap<TextSourceFormValues, ValidationErrorType>
+    totalChunks: number
+    urlSource: UrlSourceFormValues
+    urlSourceAllErrors: Record<string, any>
+    urlSourceChanged: boolean
+    urlSourceErrors: DeepPartialMap<UrlSourceFormValues, ValidationErrorType>
+    urlSourceHasErrors: boolean
+    urlSourceManualErrors: Record<string, any>
+    urlSourceTouched: boolean
+    urlSourceTouches: Record<string, boolean>
+    urlSourceValidationErrors: DeepPartialMap<UrlSourceFormValues, ValidationErrorType>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface businessKnowledgeLogicActions {
+    acceptGapSuggestion: (
+        normalizedTopic: string,
+        topic: string
+    ) => {
+        normalizedTopic: string
+        topic: string
+    }
+    closeCreateModal: () => {
+        value: true
+    }
+    closeEditModal: () => {
+        value: true
+    }
+    confirmGapAccept: (
+        normalizedTopic: string,
+        sourceId: string
+    ) => {
+        normalizedTopic: string
+        sourceId: string
+    }
+    deleteSource: (id: string) => {
+        id: string
+    }
+    dismissGapSuggestion: (normalizedTopic: string) => {
+        normalizedTopic: string
+    }
+    loadEditingSourceText: ({ id }: { id: string }) => {
+        id: string
+    }
+    loadEditingSourceTextFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadEditingSourceTextSuccess: (
+        editingSourceText: {
+            id: string
+            text: string
+        },
+        payload?: {
+            id: string
+        }
+    ) => {
+        editingSourceText: {
+            id: string
+            text: string
+        }
+        payload?: {
+            id: string
+        }
+    }
+    loadGapSuggestions: () => {
+        value: true
+    }
+    loadGapSuggestionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadGapSuggestionsSuccess: (
+        gapSuggestions: AggregatedGap[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        gapSuggestions: AggregatedGap[]
+        payload?: {
+            value: true
+        }
+    }
+    loadSources: () => any
+    loadSourcesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSourcesSuccess: (
+        sources: KnowledgeSourceApi[],
+        payload?: any
+    ) => {
+        sources: KnowledgeSourceApi[]
+        payload?: any
+    }
+    openCreateModal: (prefillName?: string) => {
+        prefillName: string | undefined
+    }
+    openEditModal: (source: KnowledgeSource) => {
+        source: KnowledgeSourceApi
+    }
+    refreshSource: (id: string) => {
+        id: string
+    }
+    refreshSourceDone: (id: string) => {
+        id: string
+    }
+    removeSourceFromList: ({ id }: { id: string }) => {
+        id: string
+    }
+    removeSourceFromListFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    removeSourceFromListSuccess: (
+        sources: KnowledgeSourceApi[],
+        payload?: {
+            id: string
+        }
+    ) => {
+        sources: KnowledgeSourceApi[]
+        payload?: {
+            id: string
+        }
+    }
+    replaceSourceInList: ({ source }: { source: KnowledgeSource }) => {
+        source: KnowledgeSource
+    }
+    replaceSourceInListFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    replaceSourceInListSuccess: (
+        sources: KnowledgeSourceApi[],
+        payload?: {
+            source: KnowledgeSource
+        }
+    ) => {
+        sources: KnowledgeSourceApi[]
+        payload?: {
+            source: KnowledgeSource
+        }
+    }
+    resetEditSource: (values?: TextSourceFormValues) => {
+        values?: TextSourceFormValues
+    }
+    resetEditUrlSource: (values?: UrlSourceFormValues) => {
+        values?: UrlSourceFormValues
+    }
+    resetEditingSourceText: () => any
+    resetEditingSourceTextFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    resetEditingSourceTextSuccess: (
+        editingSourceText: {
+            id: string
+            text: string
+        },
+        payload?: any
+    ) => {
+        editingSourceText: {
+            id: string
+            text: string
+        }
+        payload?: any
+    }
+    resetFileSource: (values?: FileSourceFormValues) => {
+        values?: FileSourceFormValues
+    }
+    resetTextSource: (values?: TextSourceFormValues) => {
+        values?: TextSourceFormValues
+    }
+    resetUrlSource: (values?: UrlSourceFormValues) => {
+        values?: UrlSourceFormValues
+    }
+    setCreateTab: (tab: CreateTab) => {
+        tab: CreateTab
+    }
+    setEditSourceManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setEditSourceValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setEditSourceValues: (values: DeepPartial<TextSourceFormValues>) => {
+        values: DeepPartial<TextSourceFormValues>
+    }
+    setEditUrlSourceManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setEditUrlSourceValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setEditUrlSourceValues: (values: DeepPartial<UrlSourceFormValues>) => {
+        values: DeepPartial<UrlSourceFormValues>
+    }
+    setFileSourceManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setFileSourceValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setFileSourceValues: (values: DeepPartial<FileSourceFormValues>) => {
+        values: DeepPartial<FileSourceFormValues>
+    }
+    setTextSourceManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setTextSourceValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setTextSourceValues: (values: DeepPartial<TextSourceFormValues>) => {
+        values: DeepPartial<TextSourceFormValues>
+    }
+    setUrlSourceManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setUrlSourceValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setUrlSourceValues: (values: DeepPartial<UrlSourceFormValues>) => {
+        values: DeepPartial<UrlSourceFormValues>
+    }
+    submitEditSource: () => {
+        value: boolean
+    }
+    submitEditSourceFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitEditSourceRequest: (editSource: TextSourceFormValues) => {
+        editSource: TextSourceFormValues
+    }
+    submitEditSourceSuccess: (editSource: TextSourceFormValues) => {
+        editSource: TextSourceFormValues
+    }
+    submitEditUrlSource: () => {
+        value: boolean
+    }
+    submitEditUrlSourceFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitEditUrlSourceRequest: (editUrlSource: UrlSourceFormValues) => {
+        editUrlSource: UrlSourceFormValues
+    }
+    submitEditUrlSourceSuccess: (editUrlSource: UrlSourceFormValues) => {
+        editUrlSource: UrlSourceFormValues
+    }
+    submitFileSource: () => {
+        value: boolean
+    }
+    submitFileSourceFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitFileSourceRequest: (fileSource: FileSourceFormValues) => {
+        fileSource: FileSourceFormValues
+    }
+    submitFileSourceSuccess: (fileSource: FileSourceFormValues) => {
+        fileSource: FileSourceFormValues
+    }
+    submitTextSource: () => {
+        value: boolean
+    }
+    submitTextSourceFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitTextSourceRequest: (textSource: TextSourceFormValues) => {
+        textSource: TextSourceFormValues
+    }
+    submitTextSourceSuccess: (textSource: TextSourceFormValues) => {
+        textSource: TextSourceFormValues
+    }
+    submitUrlSource: () => {
+        value: boolean
+    }
+    submitUrlSourceFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitUrlSourceRequest: (urlSource: UrlSourceFormValues) => {
+        urlSource: UrlSourceFormValues
+    }
+    submitUrlSourceSuccess: (urlSource: UrlSourceFormValues) => {
+        urlSource: UrlSourceFormValues
+    }
+    touchEditSourceField: (key: string) => {
+        key: string
+    }
+    touchEditUrlSourceField: (key: string) => {
+        key: string
+    }
+    touchFileSourceField: (key: string) => {
+        key: string
+    }
+    touchTextSourceField: (key: string) => {
+        key: string
+    }
+    touchUrlSourceField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface businessKnowledgeLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        readyCount: (sources: KnowledgeSourceApi[]) => number
+        totalChunks: (sources: KnowledgeSourceApi[]) => number
+        isEditModalOpen: (editingSource: KnowledgeSourceApi | null) => boolean
+    }
+}
+
+export type businessKnowledgeLogicType = MakeLogicType<
+    businessKnowledgeLogicValues,
+    businessKnowledgeLogicActions,
+    Record<string, any>,
+    businessKnowledgeLogicMeta
+>
+
 export const businessKnowledgeLogic = kea<businessKnowledgeLogicType>([
     path(['products', 'business_knowledge', 'businessKnowledgeLogic']),
     actions({
diff --git a/products/conversations/frontend/browserNotificationLogic.ts b/products/conversations/frontend/browserNotificationLogic.ts
index 71b3b88824f3..58fdaf925ae8 100644
--- a/products/conversations/frontend/browserNotificationLogic.ts
+++ b/products/conversations/frontend/browserNotificationLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { router } from 'kea-router'
 import { subscriptions } from 'kea-subscriptions'
 
@@ -6,7 +6,7 @@ import { getCurrentTeamIdOrNone } from 'lib/utils/getAppContext'
 import { teamLogic } from 'scenes/teamLogic'
 import { urls } from 'scenes/urls'
 
-import type { browserNotificationLogicType } from './browserNotificationLogicType'
+import type { TeamPublicType, TeamType } from '../../../frontend/src/types'
 import type { NotificationPermission } from './types'
 
 const STORAGE_KEY_PREFIX = 'posthog-support-notifications'
@@ -42,6 +42,52 @@ const setStoredPreference = (enabled: boolean): void => {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface browserNotificationLogicValues {
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    canShowNotifications: boolean
+    enabled: boolean
+    isPermissionDenied: boolean
+    isSupported: boolean
+    permission: NotificationPermission
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface browserNotificationLogicActions {
+    requestPermission: () => {
+        value: true
+    }
+    setEnabled: (enabled: boolean) => {
+        enabled: boolean
+    }
+    setPermission: (permission: NotificationPermission) => {
+        permission: NotificationPermission
+    }
+    showNotification: (count: number) => {
+        count: number
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface browserNotificationLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        canShowNotifications: (
+            isSupported: boolean,
+            permission: NotificationPermission,
+            enabled: boolean,
+            currentTeam: TeamPublicType | TeamType | null
+        ) => boolean
+        isPermissionDenied: (isSupported: boolean, permission: NotificationPermission) => boolean
+    }
+}
+
+export type browserNotificationLogicType = MakeLogicType<
+    browserNotificationLogicValues,
+    browserNotificationLogicActions,
+    Record<string, any>,
+    browserNotificationLogicMeta
+>
+
 export const browserNotificationLogic = kea<browserNotificationLogicType>([
     path(['products', 'conversations', 'frontend', 'browserNotificationLogic']),
     connect(() => ({
@@ -124,12 +170,17 @@ export const browserNotificationLogic = kea<browserNotificationLogicType>([
         isSupported: [() => [], () => isNotificationSupported()],
         canShowNotifications: [
             (s) => [s.isSupported, s.permission, s.enabled, s.currentTeam],
-            (isSupported, permission, enabled, currentTeam): boolean =>
-                isSupported && permission === 'granted' && enabled && !!currentTeam?.conversations_enabled,
+            (
+                isSupported: boolean,
+                permission: NotificationPermission,
+                enabled: boolean,
+                currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType
+            ): boolean => isSupported && permission === 'granted' && enabled && !!currentTeam?.conversations_enabled,
         ],
         isPermissionDenied: [
             (s) => [s.isSupported, s.permission],
-            (isSupported, permission): boolean => isSupported && permission === 'denied',
+            (isSupported: boolean, permission: NotificationPermission): boolean =>
+                isSupported && permission === 'denied',
         ],
     }),
     subscriptions(({ actions }) => ({
diff --git a/products/conversations/frontend/components/Assignee/assigneeSelectLogic.tsx b/products/conversations/frontend/components/Assignee/assigneeSelectLogic.tsx
index 9272e755ae48..ae928b7b3f7e 100644
--- a/products/conversations/frontend/components/Assignee/assigneeSelectLogic.tsx
+++ b/products/conversations/frontend/components/Assignee/assigneeSelectLogic.tsx
@@ -1,5 +1,5 @@
 import Fuse from 'fuse.js'
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 
 import { createFuse } from 'lib/utils/fuseSearch'
 import { membersLogic } from 'scenes/organization/membersLogic'
@@ -7,11 +7,61 @@ import { rolesLogic } from 'scenes/settings/organization/Permissions/Roles/roles
 
 import type { RoleType } from '~/types'
 
-import type { assigneeSelectLogicType } from './assigneeSelectLogicType'
+import type { OrganizationMemberType } from '../../../../../frontend/src/types'
 import { Assignee, TicketAssignee } from './types'
 
 export interface RolesFuse extends Fuse<RoleType> {}
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface assigneeSelectLogicValues {
+    filteredMembers: OrganizationMemberType[] // membersLogic
+    meFirstMembers: OrganizationMemberType[] // membersLogic
+    membersLoading: boolean // membersLogic
+    roles: RoleType[] // rolesLogic
+    rolesLoading: boolean // rolesLogic
+    filteredRoles: RoleType[]
+    loading: boolean
+    resolveAssignee: (assignee: TicketAssignee) => Assignee
+    rolesFuse: RolesFuse
+    search: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface assigneeSelectLogicActions {
+    ensureAllMembersLoaded: () => {
+        value: true
+    } // membersLogic
+    setMembersSearch: (search: any) => {
+        search: any
+    } // membersLogic
+    ensureAssigneeTypesLoaded: () => {
+        value: true
+    }
+    setSearch: (search: string) => {
+        search: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface assigneeSelectLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        loading: (membersLoading: boolean, rolesLoading: boolean) => boolean
+        rolesFuse: (roles: RoleType[]) => RolesFuse
+        filteredRoles: (roles: RoleType[], rolesFuse: RolesFuse, search: string) => RoleType[]
+        resolveAssignee: (
+            roles: RoleType[],
+            meFirstMembers: OrganizationMemberType[]
+        ) => (assignee: TicketAssignee) => Assignee
+    }
+}
+
+export type assigneeSelectLogicType = MakeLogicType<
+    assigneeSelectLogicValues,
+    assigneeSelectLogicActions,
+    Record<string, any>,
+    assigneeSelectLogicMeta
+>
+
 export const assigneeSelectLogic = kea<assigneeSelectLogicType>([
     path(['products', 'conversations', 'frontend', 'components', 'Assignee', 'assigneeSelectLogic']),
     connect(() => ({
@@ -41,22 +91,25 @@ export const assigneeSelectLogic = kea<assigneeSelectLogicType>([
     selectors({
         loading: [
             (s) => [s.membersLoading, s.rolesLoading],
-            (membersLoading, rolesLoading): boolean => membersLoading || rolesLoading,
+            (membersLoading: boolean, rolesLoading: boolean): boolean => membersLoading || rolesLoading,
         ],
 
         rolesFuse: [
             (s) => [s.roles],
-            (roles): RolesFuse => createFuse<RoleType>(roles, { keys: ['name'], threshold: 0.3 }),
+            (roles: RoleType[]): RolesFuse => createFuse<RoleType>(roles, { keys: ['name'], threshold: 0.3 }),
         ],
 
         filteredRoles: [
             (s) => [s.roles, s.rolesFuse, s.search],
-            (roles, rolesFuse, search): RoleType[] =>
+            (roles: RoleType[], rolesFuse: RolesFuse, search: string): RoleType[] =>
                 search ? rolesFuse.search(search).map((result) => result.item) : (roles ?? []),
         ],
         resolveAssignee: [
             (s) => [s.roles, s.meFirstMembers],
-            (roles, members): ((assignee: TicketAssignee) => Assignee) => {
+            (
+                roles: RoleType[],
+                members: import('~/types').OrganizationMemberType[]
+            ): ((assignee: TicketAssignee) => Assignee) => {
                 return (assignee: TicketAssignee) => {
                     if (assignee) {
                         if (assignee.type === 'role') {
diff --git a/products/conversations/frontend/components/ComposeTicket/composeTicketLogic.ts b/products/conversations/frontend/components/ComposeTicket/composeTicketLogic.ts
index 29727623ea36..9b2656163fe9 100644
--- a/products/conversations/frontend/components/ComposeTicket/composeTicketLogic.ts
+++ b/products/conversations/frontend/components/ComposeTicket/composeTicketLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 
@@ -8,7 +8,75 @@ import api from 'lib/api'
 import { urls } from 'scenes/urls'
 
 import type { EmailConfigStatus } from '../../scenes/settings/supportSettingsLogic'
-import type { composeTicketLogicType } from './composeTicketLogicType'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface composeTicketLogicValues {
+    composingLoading: boolean
+    emailConfigId: string
+    emailConfigs: EmailConfigStatus[]
+    emailConfigsLoading: boolean
+    emailSubject: string
+    isOpen: boolean
+    recipientDistinctId: string
+    recipientEmail: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface composeTicketLogicActions {
+    closeComposeModal: () => {
+        value: true
+    }
+    loadEmailConfigs: () => any
+    loadEmailConfigsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadEmailConfigsSuccess: (
+        emailConfigs: EmailConfigStatus[],
+        payload?: any
+    ) => {
+        emailConfigs: EmailConfigStatus[]
+        payload?: any
+    }
+    openComposeModal: (prefill?: { distinctId?: string; email?: string }) => {
+        prefill:
+            | {
+                  distinctId?: string | undefined
+                  email?: string | undefined
+              }
+            | undefined
+    }
+    resetForm: () => {
+        value: true
+    }
+    setEmailConfigId: (configId: string) => {
+        configId: string
+    }
+    setEmailSubject: (subject: string) => {
+        subject: string
+    }
+    setRecipientDistinctId: (distinctId: string) => {
+        distinctId: string
+    }
+    setRecipientEmail: (email: string) => {
+        email: string
+    }
+    submitCompose: (
+        message: string,
+        richContent: Record<string, unknown> | null
+    ) => {
+        message: string
+        richContent: Record<string, unknown> | null
+    }
+    submitComposeFinished: () => {
+        value: true
+    }
+}
+
+export type composeTicketLogicType = MakeLogicType<composeTicketLogicValues, composeTicketLogicActions>
 
 export const composeTicketLogic = kea<composeTicketLogicType>([
     path(['products', 'conversations', 'frontend', 'components', 'ComposeTicket', 'composeTicketLogic']),
diff --git a/products/conversations/frontend/components/SavedViews/ticketViewsLogic.ts b/products/conversations/frontend/components/SavedViews/ticketViewsLogic.ts
index 265d40510d4b..a21f327ffc02 100644
--- a/products/conversations/frontend/components/SavedViews/ticketViewsLogic.ts
+++ b/products/conversations/frontend/components/SavedViews/ticketViewsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -14,7 +14,6 @@ import {
 import type { PatchedTicketViewApi, TicketViewApiFilters } from '../../generated/api.schemas'
 import { supportTicketsSceneLogic } from '../../scenes/tickets/supportTicketsSceneLogic'
 import type { SavedTicketView, TicketViewFilters } from '../../types'
-import type { ticketViewsLogicType } from './ticketViewsLogicType'
 
 export interface TicketViewsLogicProps {
     id: string
@@ -25,6 +24,96 @@ export interface TicketViewChanges {
     filters?: TicketViewFilters
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface ticketViewsLogicValues {
+    activeView: SavedTicketView | null; // supportTicketsSceneLogic
+    currentFilters: TicketViewFilters; // supportTicketsSceneLogic
+    currentTeamId: number | null; // teamLogic
+    isModalOpen: boolean;
+    isSaveModalOpen: boolean;
+    viewName: string;
+    views: SavedTicketView[];
+    viewsLoading: boolean;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface ticketViewsLogicActions {
+    applyViewFilters: (filters: TicketViewFilters) => {
+        filters: TicketViewFilters;
+    }; // supportTicketsSceneLogic
+    setActiveView: (view: SavedTicketView | null) => {
+        view: SavedTicketView | null;
+    }; // supportTicketsSceneLogic
+    closeModal: () => {
+        value: true;
+    };
+    closeSaveModal: () => {
+        value: true;
+    };
+    createView: ({ name, filters }: {
+        filters: TicketViewFilters;
+        name: string;
+    }) => {
+        name: string;
+        filters: TicketViewFilters;
+    };
+    createViewFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    createViewSuccess: (views: SavedTicketView[], payload?: {
+        name: string;
+        filters: TicketViewFilters;
+    }) => {
+        views: SavedTicketView[];
+        payload?: {
+            name: string;
+            filters: TicketViewFilters;
+        };
+    };
+    deleteView: (shortId: string) => {
+        shortId: string;
+    };
+    loadView: (view: SavedTicketView) => {
+        view: SavedTicketView;
+    };
+    loadViews: () => any;
+    loadViewsFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadViewsSuccess: (views: SavedTicketView[], payload?: any) => {
+        views: SavedTicketView[];
+        payload?: any;
+    };
+    openModal: () => {
+        value: true;
+    };
+    openSaveModal: () => {
+        value: true;
+    };
+    saveView: () => {
+        value: true;
+    };
+    setViewName: (viewName: string) => {
+        viewName: string;
+    };
+    updateView: (shortId: string, changes: TicketViewChanges) => {
+        changes: TicketViewChanges;
+        shortId: string;
+    };
+    viewUpdated: (view: SavedTicketView) => {
+        view: SavedTicketView;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface ticketViewsLogicMeta {
+    key: string;
+}
+
+export type ticketViewsLogicType = MakeLogicType<ticketViewsLogicValues, ticketViewsLogicActions, TicketViewsLogicProps, ticketViewsLogicMeta>;
+
 export const ticketViewsLogic = kea<ticketViewsLogicType>([
     props({} as TicketViewsLogicProps),
     key((props) => props.id),
diff --git a/products/conversations/frontend/components/ScenesTabs/scenesTabsLogic.ts b/products/conversations/frontend/components/ScenesTabs/scenesTabsLogic.ts
index 5fbd234030b9..ee729d215eb7 100644
--- a/products/conversations/frontend/components/ScenesTabs/scenesTabsLogic.ts
+++ b/products/conversations/frontend/components/ScenesTabs/scenesTabsLogic.ts
@@ -1,10 +1,9 @@
-import { actions, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers, selectors } from 'kea'
 import { router, urlToAction } from 'kea-router'
 
 import { urls } from 'scenes/urls'
 
 import type { SceneTabKey } from '../../types'
-import type { scenesTabsLogicType } from './scenesTabsLogicType'
 
 export type SceneTabConfig = {
     key: SceneTabKey
@@ -25,6 +24,24 @@ export const SCENE_TABS: SceneTabConfig[] = [
     },
 ]
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface scenesTabsLogicValues {
+    activeTab: SceneTabKey
+    tabs: SceneTabConfig[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface scenesTabsLogicActions {
+    setActiveTab: (tab: SceneTabKey) => {
+        tab: SceneTabKey
+    }
+    setTab: (tab: SceneTabKey) => {
+        tab: SceneTabKey
+    }
+}
+
+export type scenesTabsLogicType = MakeLogicType<scenesTabsLogicValues, scenesTabsLogicActions>
+
 export const scenesTabsLogic = kea<scenesTabsLogicType>([
     path(['products', 'conversations', 'frontend', 'components', 'ScenesTabs', 'scenesTabsLogic']),
     actions({
diff --git a/products/conversations/frontend/components/SidePanel/sidepanelTicketsLogic.ts b/products/conversations/frontend/components/SidePanel/sidepanelTicketsLogic.ts
index bca4ac1bf432..eca8f9b4e0a1 100644
--- a/products/conversations/frontend/components/SidePanel/sidepanelTicketsLogic.ts
+++ b/products/conversations/frontend/components/SidePanel/sidepanelTicketsLogic.ts
@@ -1,5 +1,16 @@
 import { JSONContent } from '@tiptap/core'
-import { actions, beforeUnmount, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    beforeUnmount,
+    afterMount,
+    connect,
+    kea,
+    listeners,
+    path,
+    reducers,
+    selectors,
+} from 'kea'
 import { router } from 'kea-router'
 import { subscriptions } from 'kea-subscriptions'
 import posthog from 'posthog-js'
@@ -11,6 +22,8 @@ import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
 
 import { sidePanelStateLogic } from '~/layout/navigation-3000/sidepanel/sidePanelStateLogic'
 
+import type { SupportFormFields } from '../../../../../frontend/src/lib/components/Support/supportLogic'
+import type { FeatureFlagsSet } from '../../../../../frontend/src/lib/logic/featureFlagLogic'
 import type {
     ChatMessage,
     ConversationMessage,
@@ -18,7 +31,6 @@ import type {
     RestoreFlowState,
     SidePanelViewState,
 } from '../../types'
-import type { sidepanelTicketsLogicType } from './sidepanelTicketsLogicType'
 
 const POLL_INTERVAL = 60 * 1000 // 60 seconds
 
@@ -39,6 +51,134 @@ function messageToRichContent(message: string): JSONContent {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sidepanelTicketsLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    sidePanelOpen: boolean // sidePanelStateLogic
+    isEmailFormOpen: boolean // supportLogic
+    pendingViewTicket: {
+        created_at: string
+        id: string
+        status: string
+    } | null // supportLogic
+    sendSupportRequest: SupportFormFields // supportLogic
+    currentTicket: ConversationTicket | null
+    hasMoreMessages: boolean
+    isEnabled: boolean
+    messageSending: boolean
+    messages: ChatMessage[]
+    messagesLoading: boolean
+    newTicketDraft: JSONContent | null
+    newTicketDraftRevision: number
+    restoreError: string | null
+    restoreState: RestoreFlowState
+    tickets: ConversationTicket[]
+    ticketsLoading: boolean
+    totalUnreadCount: number
+    view: SidePanelViewState
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sidepanelTicketsLogicActions {
+    clearPendingViewTicket: () => {
+        value: true
+    } // supportLogic
+    closeEmailForm: () => {
+        value: true
+    } // supportLogic
+    closeSupportForm: () => {
+        value: true
+    } // supportLogic
+    resetSendSupportRequest: (values?: SupportFormFields | undefined) => {
+        values?: SupportFormFields
+    } // supportLogic
+    initTickets: () => {
+        value: true
+    }
+    loadMessages: (ticketId: string) => {
+        ticketId: string
+    }
+    loadTickets: () => {
+        value: true
+    }
+    markAsRead: (ticketId: string) => {
+        ticketId: string
+    }
+    openPendingTicket: () => {
+        value: true
+    }
+    requestRestoreLink: (email: string) => {
+        email: string
+    }
+    restoreFromUrlToken: (token: string) => {
+        token: string
+    }
+    sendMessage: (
+        content: string,
+        onSuccess: () => void
+    ) => {
+        content: string
+        onSuccess: () => void
+    }
+    setCurrentTicket: (ticket: ConversationTicket) => {
+        ticket: ConversationTicket
+    }
+    setHasMoreMessages: (hasMore: boolean) => {
+        hasMore: boolean
+    }
+    setMessageSending: (sending: boolean) => {
+        sending: boolean
+    }
+    setMessages: (messages: ChatMessage[]) => {
+        messages: ChatMessage[]
+    }
+    setMessagesLoading: (loading: boolean) => {
+        loading: boolean
+    }
+    setNewTicketDraft: (content: JSONContent | null) => {
+        content: JSONContent | null
+    }
+    setRestoreError: (error: string | null) => {
+        error: string | null
+    }
+    setRestoreState: (state: RestoreFlowState) => {
+        state: RestoreFlowState
+    }
+    setTickets: (tickets: ConversationTicket[]) => {
+        tickets: ConversationTicket[]
+    }
+    setTicketsLoading: (loading: boolean) => {
+        loading: boolean
+    }
+    setView: (view: SidePanelViewState) => {
+        view: SidePanelViewState
+    }
+    startPolling: () => {
+        value: true
+    }
+    startTicketFromSupportForm: () => {
+        value: true
+    }
+    stopPolling: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sidepanelTicketsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        isEnabled: (featureFlags: FeatureFlagsSet) => boolean
+        totalUnreadCount: (tickets: ConversationTicket[]) => number
+    }
+}
+
+export type sidepanelTicketsLogicType = MakeLogicType<
+    sidepanelTicketsLogicValues,
+    sidepanelTicketsLogicActions,
+    Record<string, any>,
+    sidepanelTicketsLogicMeta
+>
+
 export const sidepanelTicketsLogic = kea<sidepanelTicketsLogicType>([
     path(['products', 'conversations', 'frontend', 'components', 'SidePanel', 'sidepanelTicketsLogic']),
     connect(() => ({
@@ -162,9 +302,13 @@ export const sidepanelTicketsLogic = kea<sidepanelTicketsLogicType>([
     selectors({
         isEnabled: [
             (s) => [s.featureFlags],
-            (featureFlags): boolean => !!featureFlags[FEATURE_FLAGS.PRODUCT_SUPPORT_SIDE_PANEL],
+            (featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet): boolean =>
+                !!featureFlags[FEATURE_FLAGS.PRODUCT_SUPPORT_SIDE_PANEL],
+        ],
+        totalUnreadCount: [
+            (s) => [s.tickets],
+            (tickets: ConversationTicket[]) => tickets.reduce((sum, t) => sum + (t.unread_count ?? 0), 0),
         ],
-        totalUnreadCount: [(s) => [s.tickets], (tickets) => tickets.reduce((sum, t) => sum + (t.unread_count ?? 0), 0)],
     }),
     listeners(({ actions, values, cache }) => ({
         initTickets: () => {
diff --git a/products/conversations/frontend/scenes/settings/supportSettingsLogic.ts b/products/conversations/frontend/scenes/settings/supportSettingsLogic.ts
index 567084f3b47d..6f89e3bc5edd 100644
--- a/products/conversations/frontend/scenes/settings/supportSettingsLogic.ts
+++ b/products/conversations/frontend/scenes/settings/supportSettingsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -9,8 +9,9 @@ import { teamLogic } from 'scenes/teamLogic'
 
 import { SlackChannelType, UserBasicType } from '~/types'
 
+import type { FeatureFlagsSet } from '../../../../../frontend/src/lib/logic/featureFlagLogic'
+import type { TeamPublicType, TeamType } from '../../../../../frontend/src/types'
 import { TicketChannel } from '../../types'
-import type { supportSettingsLogicType } from './supportSettingsLogicType'
 
 const BASE_AI_CHANNELS: TicketChannel[] = ['widget', 'email', 'slack']
 
@@ -36,6 +37,530 @@ export interface EmailConfigStatus {
     is_default: boolean
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface supportSettingsLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    currentTeamLoading: boolean // teamLogic
+    addEmailFormVisible: boolean
+    aiAllChannels: TicketChannel[]
+    aiDiagnosticsEnabled: boolean
+    aiDiagnosticsLoading: boolean
+    aiEnabledChannels: TicketChannel[]
+    aiReplyModes: Record<string, Record<string, 'bot_reply' | 'private_note'>>
+    aiResolutionChannels: TicketChannel[]
+    aiSuggestionsEnabled: boolean
+    aiSuggestionsLoading: boolean
+    conversationsDomains: string[]
+    conversationsEnabledLoading: boolean
+    domainInputValue: string
+    editingDomainIndex: number | null
+    emailConfigs: EmailConfigStatus[]
+    emailConnected: boolean
+    emailConnecting: boolean
+    emailTestingConfigId: string | null
+    emailVerifyingConfigId: string | null
+    githubConnected: boolean
+    githubIntegrations: {
+        id: number
+        name: string
+    }[]
+    githubIntegrationsLoading: boolean
+    githubRepos: {
+        full_name: string
+        name: string
+    }[]
+    githubReposLoading: boolean
+    githubSelectedRepos: string[]
+    greetingInputValue: string | null
+    identificationFormDescriptionValue: string | null
+    identificationFormTitleValue: string | null
+    isAddingDomain: boolean
+    newEmailFromEmail: string
+    newEmailFromName: string
+    notificationRecipients: number[]
+    placeholderTextValue: string | null
+    settingDefaultEmailConfigId: string | null
+    slackAlertChannelId: string | null
+    slackBotDisplayName: string | null
+    slackBotDisplayNameValue: string | null
+    slackBotIconUrl: string | null
+    slackBotIconUrlValue: string | null
+    slackChannelIds: string[]
+    slackChannels: SlackChannelType[]
+    slackChannelsLoading: boolean
+    slackConnected: boolean
+    slackEnabled: boolean
+    slackNotifyOnJoin: boolean
+    slackNotifyOnLeave: boolean
+    slackNudgeEnabled: boolean
+    slackTicketEmoji: string
+    slackTicketEmojiValue: string | null
+    teamsChannelId: string | null
+    teamsChannelName: string | null
+    teamsChannelPairLoading: string | null
+    teamsChannelPairs: {
+        channel_id: string
+        channel_name?: string | null
+        membership_type?: string | null
+        team_id: string
+        team_name?: string | null
+    }[]
+    teamsChannels: {
+        id: string
+        membership_type?: string | null
+        name: string
+    }[]
+    teamsChannelsCache: Record<
+        string,
+        {
+            id: string
+            membership_type?: string | null
+            name: string
+        }[]
+    >
+    teamsChannelsLoading: boolean
+    teamsConnected: boolean
+    teamsInstallStatus: 'error' | 'idle' | 'installed' | 'installing' | 'needs_org_catalog'
+    teamsInstallingForTeamId: string | null
+    teamsTeamId: string | null
+    teamsTeamName: string | null
+    teamsTeams: {
+        id: string
+        name: string
+    }[]
+    teamsTeamsLoading: boolean
+    widgetEnabledLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface supportSettingsLogicActions {
+    loadCurrentTeam: () => any // teamLogic
+    updateCurrentTeam: (payload: Partial<TeamType>) => Partial<TeamType> // teamLogic
+    updateCurrentTeamFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    } // teamLogic
+    updateCurrentTeamSuccess: (
+        currentTeam: TeamPublicType | TeamType,
+        payload?: Partial<TeamType> | undefined
+    ) => {
+        currentTeam: TeamPublicType | TeamType
+        payload?: Partial<TeamType>
+    } // teamLogic
+    addTeamsChannelPair: (
+        teamId: string,
+        channelId: string
+    ) => {
+        channelId: string
+        teamId: string
+    }
+    cacheTeamsChannelsForTeam: (
+        teamId: string,
+        channels: {
+            id: string
+            membership_type?: string | null
+            name: string
+        }[]
+    ) => {
+        channels: {
+            id: string
+            membership_type?: string | null | undefined
+            name: string
+        }[]
+        teamId: string
+    }
+    cancelDomainEdit: () => {
+        value: true
+    }
+    connectEmail: () => {
+        value: true
+    }
+    connectEmailDone: (config: EmailConfigStatus | null) => {
+        config: EmailConfigStatus | null
+    }
+    connectGithub: (integrationId: number) => {
+        integrationId: number
+    }
+    connectSlack: (nextPath: string) => {
+        nextPath: string
+    }
+    connectTeams: (nextPath: string) => {
+        nextPath: string
+    }
+    disconnectEmail: (configId: string) => {
+        configId: string
+    }
+    disconnectEmailDone: (configId: string) => {
+        configId: string
+    }
+    disconnectGithub: () => {
+        value: true
+    }
+    disconnectSlack: () => {
+        value: true
+    }
+    disconnectTeams: () => {
+        value: true
+    }
+    generateNewToken: () => {
+        value: true
+    }
+    installTeamsApp: (teamId: string) => {
+        teamId: string
+    }
+    loadEmailConfigs: () => {
+        value: true
+    }
+    loadEmailConfigsDone: (configs: EmailConfigStatus[]) => {
+        configs: EmailConfigStatus[]
+    }
+    loadGithubIntegrations: () => any
+    loadGithubIntegrationsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadGithubIntegrationsSuccess: (
+        githubIntegrations: {
+            id: any
+            name: any
+        }[],
+        payload?: any
+    ) => {
+        githubIntegrations: {
+            id: any
+            name: any
+        }[]
+        payload?: any
+    }
+    loadGithubRepos: () => {
+        value: true
+    }
+    loadGithubReposFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadGithubReposSuccess: (
+        githubRepos: {
+            full_name: string
+            name: string
+        }[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        githubRepos: {
+            full_name: string
+            name: string
+        }[]
+        payload?: {
+            value: true
+        }
+    }
+    loadSlackChannelsWithToken: () => {
+        value: true
+    }
+    loadSlackChannelsWithTokenFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSlackChannelsWithTokenSuccess: (
+        slackChannels: SlackChannelType[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        slackChannels: SlackChannelType[]
+        payload?: {
+            value: true
+        }
+    }
+    loadTeamsChannelsForTeam: (teamId: string) => {
+        teamId: string
+    }
+    loadTeamsChannelsForTeamFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadTeamsChannelsForTeamSuccess: (
+        teamsChannels: {
+            id: string
+            membership_type?: string | null
+            name: string
+        }[],
+        payload?: {
+            teamId: string
+        }
+    ) => {
+        teamsChannels: {
+            id: string
+            membership_type?: string | null
+            name: string
+        }[]
+        payload?: {
+            teamId: string
+        }
+    }
+    loadTeamsTeamsWithToken: () => {
+        value: true
+    }
+    loadTeamsTeamsWithTokenFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadTeamsTeamsWithTokenSuccess: (
+        teamsTeams: {
+            id: string
+            name: string
+        }[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        teamsTeams: {
+            id: string
+            name: string
+        }[]
+        payload?: {
+            value: true
+        }
+    }
+    removeDomain: (index: number) => {
+        index: number
+    }
+    removeTeamsChannelPair: (channelId: string) => {
+        channelId: string
+    }
+    saveDomain: (
+        value: string,
+        editingIndex: number | null
+    ) => {
+        editingIndex: number | null
+        value: string
+    }
+    saveGreetingText: () => {
+        value: true
+    }
+    saveIdentificationFormDescription: () => {
+        value: true
+    }
+    saveIdentificationFormTitle: () => {
+        value: true
+    }
+    savePlaceholderText: () => {
+        value: true
+    }
+    saveSlackBotSettings: () => {
+        value: true
+    }
+    saveSlackTicketEmoji: () => {
+        value: true
+    }
+    sendTestEmail: (configId: string) => {
+        configId: string
+    }
+    sendTestEmailDone: (configId: string) => {
+        configId: string
+    }
+    setAddEmailFormVisible: (visible: boolean) => {
+        visible: boolean
+    }
+    setAiDiagnosticsEnabled: (enabled: boolean) => {
+        enabled: boolean
+    }
+    setAiDiagnosticsLoading: (loading: boolean) => {
+        loading: boolean
+    }
+    setAiReplyMode: (
+        channel: string,
+        ticketType: string,
+        mode: 'bot_reply' | 'private_note'
+    ) => {
+        channel: string
+        mode: 'bot_reply' | 'private_note'
+        ticketType: string
+    }
+    setAiResolutionChannels: (channels: TicketChannel[]) => {
+        channels: TicketChannel[]
+    }
+    setAiSuggestionsEnabled: (enabled: boolean) => {
+        enabled: boolean
+    }
+    setAiSuggestionsLoading: (loading: boolean) => {
+        loading: boolean
+    }
+    setConversationsEnabledLoading: (loading: boolean) => {
+        loading: boolean
+    }
+    setDefaultEmail: (configId: string) => {
+        configId: string
+    }
+    setDefaultEmailDone: (configId: string) => {
+        configId: string
+    }
+    setDefaultEmailFailed: () => {
+        value: true
+    }
+    setDomainInputValue: (value: string) => {
+        value: string
+    }
+    setEditingDomainIndex: (index: number | null) => {
+        index: number | null
+    }
+    setGithubRepos: (repos: string[]) => {
+        repos: string[]
+    }
+    setGreetingInputValue: (value: string | null) => {
+        value: string | null
+    }
+    setIdentificationFormDescriptionValue: (value: string | null) => {
+        value: string | null
+    }
+    setIdentificationFormTitleValue: (value: string | null) => {
+        value: string | null
+    }
+    setIsAddingDomain: (isAdding: boolean) => {
+        isAdding: boolean
+    }
+    setNewEmailFromEmail: (value: string) => {
+        value: string
+    }
+    setNewEmailFromName: (value: string) => {
+        value: string
+    }
+    setNotificationRecipients: (users: UserBasicType[]) => {
+        users: UserBasicType[]
+    }
+    setPlaceholderTextValue: (value: string | null) => {
+        value: string | null
+    }
+    setSlackAlertChannel: (channelId: string | null) => {
+        channelId: string | null
+    }
+    setSlackBotDisplayNameValue: (value: string | null) => {
+        value: string | null
+    }
+    setSlackBotIconUrlValue: (value: string | null) => {
+        value: string | null
+    }
+    setSlackChannels: (channelIds: string[]) => {
+        channelIds: string[]
+    }
+    setSlackNotifyOnJoin: (enabled: boolean) => {
+        enabled: boolean
+    }
+    setSlackNotifyOnLeave: (enabled: boolean) => {
+        enabled: boolean
+    }
+    setSlackNudgeEnabled: (enabled: boolean) => {
+        enabled: boolean
+    }
+    setSlackTicketEmojiValue: (value: string | null) => {
+        value: string | null
+    }
+    setTeamsChannelPairLoading: (channelId: string | null) => {
+        channelId: string | null
+    }
+    setTeamsInstallStatus: (
+        status: 'error' | 'idle' | 'installed' | 'installing' | 'needs_org_catalog',
+        teamId?: string | null
+    ) => {
+        status: 'error' | 'idle' | 'installed' | 'installing' | 'needs_org_catalog'
+        teamId: string | null
+    }
+    setWidgetEnabledLoading: (loading: boolean) => {
+        loading: boolean
+    }
+    startEditDomain: (index: number) => {
+        index: number
+    }
+    verifyEmailDomain: (configId: string) => {
+        configId: string
+    }
+    verifyEmailDomainDone: (
+        configId: string,
+        verified: boolean,
+        dnsRecords: Record<string, any> | null
+    ) => {
+        configId: string
+        dnsRecords: Record<string, any> | null
+        verified: boolean
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface supportSettingsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        conversationsDomains: (currentTeam: TeamPublicType | TeamType | null) => string[]
+        notificationRecipients: (currentTeam: TeamPublicType | TeamType | null) => number[]
+        slackEnabled: (currentTeam: TeamPublicType | TeamType | null) => boolean
+        slackChannelIds: (currentTeam: TeamPublicType | TeamType | null) => string[]
+        slackTicketEmoji: (currentTeam: TeamPublicType | TeamType | null) => string
+        slackConnected: (currentTeam: TeamPublicType | TeamType | null) => boolean
+        slackBotIconUrl: (currentTeam: TeamPublicType | TeamType | null) => string | null
+        slackBotDisplayName: (currentTeam: TeamPublicType | TeamType | null) => string | null
+        slackNotifyOnJoin: (currentTeam: TeamPublicType | TeamType | null) => boolean
+        slackNotifyOnLeave: (currentTeam: TeamPublicType | TeamType | null) => boolean
+        slackNudgeEnabled: (currentTeam: TeamPublicType | TeamType | null) => boolean
+        slackAlertChannelId: (currentTeam: TeamPublicType | TeamType | null) => string | null
+        emailConnected: (emailConfigs: EmailConfigStatus[]) => boolean
+        teamsConnected: (currentTeam: TeamPublicType | TeamType | null) => boolean
+        teamsTeamId: (currentTeam: TeamPublicType | TeamType | null) => string | null
+        teamsTeamName: (currentTeam: TeamPublicType | TeamType | null) => string | null
+        teamsChannelId: (currentTeam: TeamPublicType | TeamType | null) => string | null
+        teamsChannelName: (currentTeam: TeamPublicType | TeamType | null) => string | null
+        teamsChannelPairs: (currentTeam: TeamPublicType | TeamType | null) => {
+            channel_id: string
+            channel_name?: string | null
+            membership_type?: string | null
+            team_id: string
+            team_name?: string | null
+        }[]
+        githubConnected: (currentTeam: TeamPublicType | TeamType | null) => boolean
+        githubSelectedRepos: (currentTeam: TeamPublicType | TeamType | null) => string[]
+        aiSuggestionsEnabled: (currentTeam: TeamPublicType | TeamType | null) => boolean
+        aiDiagnosticsEnabled: (currentTeam: TeamPublicType | TeamType | null) => boolean
+        aiEnabledChannels: (
+            currentTeam: TeamPublicType | TeamType | null,
+            emailConfigs: EmailConfigStatus[]
+        ) => TicketChannel[]
+        aiAllChannels: (featureFlags: FeatureFlagsSet) => TicketChannel[]
+        aiResolutionChannels: (
+            currentTeam: TeamPublicType | TeamType | null,
+            aiEnabledChannels: TicketChannel[],
+            aiAllChannels: TicketChannel[]
+        ) => TicketChannel[]
+        aiReplyModes: (
+            currentTeam: TeamPublicType | TeamType | null
+        ) => Record<string, Record<string, 'bot_reply' | 'private_note'>>
+    }
+}
+
+export type supportSettingsLogicType = MakeLogicType<
+    supportSettingsLogicValues,
+    supportSettingsLogicActions,
+    Record<string, any>,
+    supportSettingsLogicMeta
+>
+
 export const supportSettingsLogic = kea<supportSettingsLogicType>([
     path(['products', 'conversations', 'frontend', 'scenes', 'settings', 'supportSettingsLogic']),
     connect(() => ({
@@ -440,19 +965,22 @@ export const supportSettingsLogic = kea<supportSettingsLogicType>([
     selectors({
         conversationsDomains: [
             (s) => [s.currentTeam],
-            (currentTeam): string[] => currentTeam?.conversations_settings?.widget_domains || [],
+            (currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType): string[] =>
+                currentTeam?.conversations_settings?.widget_domains || [],
         ],
         notificationRecipients: [
             (s) => [s.currentTeam],
-            (currentTeam): number[] => currentTeam?.conversations_settings?.notification_recipients || [],
+            (currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType): number[] =>
+                currentTeam?.conversations_settings?.notification_recipients || [],
         ],
         slackEnabled: [
             (s) => [s.currentTeam],
-            (currentTeam): boolean => !!currentTeam?.conversations_settings?.slack_enabled,
+            (currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType): boolean =>
+                !!currentTeam?.conversations_settings?.slack_enabled,
         ],
         slackChannelIds: [
             (s) => [s.currentTeam],
-            (currentTeam): string[] => {
+            (currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType): string[] => {
                 const cs = currentTeam?.conversations_settings
                 if (Array.isArray(cs?.slack_channel_ids)) {
                     return cs.slack_channel_ids
@@ -462,61 +990,77 @@ export const supportSettingsLogic = kea<supportSettingsLogicType>([
         ],
         slackTicketEmoji: [
             (s) => [s.currentTeam],
-            (currentTeam): string => currentTeam?.conversations_settings?.slack_ticket_emoji ?? 'ticket',
+            (currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType): string =>
+                currentTeam?.conversations_settings?.slack_ticket_emoji ?? 'ticket',
         ],
         slackConnected: [
             (s) => [s.currentTeam],
-            (currentTeam): boolean => !!currentTeam?.conversations_settings?.slack_enabled,
+            (currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType): boolean =>
+                !!currentTeam?.conversations_settings?.slack_enabled,
         ],
         slackBotIconUrl: [
             (s) => [s.currentTeam],
-            (currentTeam): string | null => currentTeam?.conversations_settings?.slack_bot_icon_url ?? null,
+            (currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType): string | null =>
+                currentTeam?.conversations_settings?.slack_bot_icon_url ?? null,
         ],
         slackBotDisplayName: [
             (s) => [s.currentTeam],
-            (currentTeam): string | null => currentTeam?.conversations_settings?.slack_bot_display_name ?? null,
+            (currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType): string | null =>
+                currentTeam?.conversations_settings?.slack_bot_display_name ?? null,
         ],
         slackNotifyOnJoin: [
             (s) => [s.currentTeam],
-            (currentTeam): boolean => !!currentTeam?.conversations_settings?.slack_notify_on_join,
+            (currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType): boolean =>
+                !!currentTeam?.conversations_settings?.slack_notify_on_join,
         ],
         slackNotifyOnLeave: [
             (s) => [s.currentTeam],
-            (currentTeam): boolean => !!currentTeam?.conversations_settings?.slack_notify_on_leave,
+            (currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType): boolean =>
+                !!currentTeam?.conversations_settings?.slack_notify_on_leave,
         ],
         slackNudgeEnabled: [
             (s) => [s.currentTeam],
-            (currentTeam): boolean => currentTeam?.conversations_settings?.slack_nudge_enabled ?? true,
+            (currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType): boolean =>
+                currentTeam?.conversations_settings?.slack_nudge_enabled ?? true,
         ],
         slackAlertChannelId: [
             (s) => [s.currentTeam],
-            (currentTeam): string | null => currentTeam?.conversations_settings?.slack_alert_channel_id ?? null,
+            (currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType): string | null =>
+                currentTeam?.conversations_settings?.slack_alert_channel_id ?? null,
+        ],
+        emailConnected: [
+            (s) => [s.emailConfigs],
+            (emailConfigs: EmailConfigStatus[]): boolean => emailConfigs.length > 0,
         ],
-        emailConnected: [(s) => [s.emailConfigs], (emailConfigs): boolean => emailConfigs.length > 0],
         teamsConnected: [
             (s) => [s.currentTeam],
-            (currentTeam): boolean => !!currentTeam?.conversations_settings?.teams_enabled,
+            (currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType): boolean =>
+                !!currentTeam?.conversations_settings?.teams_enabled,
         ],
         teamsTeamId: [
             (s) => [s.currentTeam],
-            (currentTeam): string | null => currentTeam?.conversations_settings?.teams_team_id ?? null,
+            (currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType): string | null =>
+                currentTeam?.conversations_settings?.teams_team_id ?? null,
         ],
         teamsTeamName: [
             (s) => [s.currentTeam],
-            (currentTeam): string | null => currentTeam?.conversations_settings?.teams_team_name ?? null,
+            (currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType): string | null =>
+                currentTeam?.conversations_settings?.teams_team_name ?? null,
         ],
         teamsChannelId: [
             (s) => [s.currentTeam],
-            (currentTeam): string | null => currentTeam?.conversations_settings?.teams_channel_id ?? null,
+            (currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType): string | null =>
+                currentTeam?.conversations_settings?.teams_channel_id ?? null,
         ],
         teamsChannelName: [
             (s) => [s.currentTeam],
-            (currentTeam): string | null => currentTeam?.conversations_settings?.teams_channel_name ?? null,
+            (currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType): string | null =>
+                currentTeam?.conversations_settings?.teams_channel_name ?? null,
         ],
         teamsChannelPairs: [
             (s) => [s.currentTeam],
             (
-                currentTeam
+                currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType
             ): {
                 team_id: string
                 team_name?: string | null
@@ -544,23 +1088,30 @@ export const supportSettingsLogic = kea<supportSettingsLogicType>([
         ],
         githubConnected: [
             (s) => [s.currentTeam],
-            (currentTeam): boolean => !!currentTeam?.conversations_settings?.github_enabled,
+            (currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType): boolean =>
+                !!currentTeam?.conversations_settings?.github_enabled,
         ],
         githubSelectedRepos: [
             (s) => [s.currentTeam],
-            (currentTeam): string[] => currentTeam?.conversations_settings?.github_repos || [],
+            (currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType): string[] =>
+                currentTeam?.conversations_settings?.github_repos || [],
         ],
         aiSuggestionsEnabled: [
             (s) => [s.currentTeam],
-            (currentTeam): boolean => !!currentTeam?.conversations_settings?.ai_suggestions_enabled,
+            (currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType): boolean =>
+                !!currentTeam?.conversations_settings?.ai_suggestions_enabled,
         ],
         aiDiagnosticsEnabled: [
             (s) => [s.currentTeam],
-            (currentTeam): boolean => !!currentTeam?.conversations_settings?.ai_diagnostics_enabled,
+            (currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType): boolean =>
+                !!currentTeam?.conversations_settings?.ai_diagnostics_enabled,
         ],
         aiEnabledChannels: [
             (s) => [s.currentTeam, s.emailConfigs],
-            (currentTeam, emailConfigs): TicketChannel[] => {
+            (
+                currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType,
+                emailConfigs: EmailConfigStatus[]
+            ): TicketChannel[] => {
                 const cs = currentTeam?.conversations_settings
                 if (!cs) {
                     return []
@@ -584,11 +1135,16 @@ export const supportSettingsLogic = kea<supportSettingsLogicType>([
         ],
         aiAllChannels: [
             (s) => [s.featureFlags],
-            (featureFlags): TicketChannel[] => aiAllChannelsForFeatureFlags(featureFlags),
+            (featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet): TicketChannel[] =>
+                aiAllChannelsForFeatureFlags(featureFlags),
         ],
         aiResolutionChannels: [
             (s) => [s.currentTeam, s.aiEnabledChannels, s.aiAllChannels],
-            (currentTeam, aiEnabledChannels, aiAllChannels): TicketChannel[] => {
+            (
+                currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType,
+                aiEnabledChannels: TicketChannel[],
+                aiAllChannels: TicketChannel[]
+            ): TicketChannel[] => {
                 const allowed = aiEnabledChannels.filter((channel) => aiAllChannels.includes(channel))
                 const stored = currentTeam?.conversations_settings?.ai_resolution_channels
                 if (Array.isArray(stored)) {
@@ -601,7 +1157,9 @@ export const supportSettingsLogic = kea<supportSettingsLogicType>([
         ],
         aiReplyModes: [
             (s) => [s.currentTeam],
-            (currentTeam): Record<string, Record<string, 'private_note' | 'bot_reply'>> => {
+            (
+                currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType
+            ): Record<string, Record<string, 'private_note' | 'bot_reply'>> => {
                 return currentTeam?.conversations_settings?.ai_reply_modes ?? {}
             },
         ],
diff --git a/products/conversations/frontend/scenes/settings/zendeskImportLogic.ts b/products/conversations/frontend/scenes/settings/zendeskImportLogic.ts
index 577896e055d6..996bd2cdfa91 100644
--- a/products/conversations/frontend/scenes/settings/zendeskImportLogic.ts
+++ b/products/conversations/frontend/scenes/settings/zendeskImportLogic.ts
@@ -1,4 +1,15 @@
-import { actions, afterMount, beforeUnmount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    afterMount,
+    beforeUnmount,
+    connect,
+    kea,
+    listeners,
+    path,
+    reducers,
+    selectors,
+} from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
@@ -7,13 +18,102 @@ import { getCurrentTeamId } from 'lib/utils/getAppContext'
 import { conversationsZendeskImportsCreate, conversationsZendeskImportsStatusRetrieve } from '../../generated/api'
 import type { ZendeskImportJobApi } from '../../generated/api.schemas'
 import { supportSettingsLogic } from './supportSettingsLogic'
-import type { zendeskImportLogicType } from './zendeskImportLogicType'
+import type { EmailConfigStatus } from './supportSettingsLogic'
 
 export type ZendeskImportJobStatus = ZendeskImportJobApi['status']
 
 const TERMINAL_STATUSES: ZendeskImportJobStatus[] = ['completed', 'failed']
 const POLL_INTERVAL_MS = 3000
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface zendeskImportLogicValues {
+    emailConfigs: EmailConfigStatus[] // supportSettingsLogic
+    apiToken: string
+    defaultEmailChannelId: string | null
+    emailAddress: string
+    importJob: ZendeskImportJobApi | null
+    importJobLoading: boolean
+    importProgressLabel: string | null
+    isImportRunning: boolean
+    subdomain: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface zendeskImportLogicActions {
+    loadEmailConfigs: () => {
+        value: true
+    } // supportSettingsLogic
+    loadImportJob: () => any
+    loadImportJobFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadImportJobSuccess: (
+        importJob: ZendeskImportJobApi | null,
+        payload?: any
+    ) => {
+        importJob: ZendeskImportJobApi | null
+        payload?: any
+    }
+    setApiToken: (apiToken: string) => {
+        apiToken: string
+    }
+    setDefaultEmailChannelId: (defaultEmailChannelId: string | null) => {
+        defaultEmailChannelId: string | null
+    }
+    setEmailAddress: (emailAddress: string) => {
+        emailAddress: string
+    }
+    setSubdomain: (subdomain: string) => {
+        subdomain: string
+    }
+    startPolling: () => {
+        value: true
+    }
+    stopPolling: () => {
+        value: true
+    }
+    submitImport: () => {
+        value: true
+    }
+    submitImportFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    submitImportSuccess: (
+        importJob: ZendeskImportJobApi,
+        payload?: {
+            value: true
+        }
+    ) => {
+        importJob: ZendeskImportJobApi
+        payload?: {
+            value: true
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface zendeskImportLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        isImportRunning: (importJob: ZendeskImportJobApi | null) => boolean
+        importProgressLabel: (importJob: ZendeskImportJobApi | null) => string | null
+    }
+}
+
+export type zendeskImportLogicType = MakeLogicType<
+    zendeskImportLogicValues,
+    zendeskImportLogicActions,
+    Record<string, any>,
+    zendeskImportLogicMeta
+>
+
 export const zendeskImportLogic = kea<zendeskImportLogicType>([
     path(['products', 'conversations', 'frontend', 'scenes', 'settings', 'zendeskImportLogic']),
     connect(() => ({
diff --git a/products/conversations/frontend/scenes/ticket/creationGroupLogic.ts b/products/conversations/frontend/scenes/ticket/creationGroupLogic.ts
index 0d3b1985604e..0ec0fdee2da1 100644
--- a/products/conversations/frontend/scenes/ticket/creationGroupLogic.ts
+++ b/products/conversations/frontend/scenes/ticket/creationGroupLogic.ts
@@ -1,4 +1,4 @@
-import { afterMount, connect, kea, key, path, props } from 'kea'
+import { MakeLogicType, afterMount, connect, kea, key, path, props } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -7,13 +7,49 @@ import { teamLogic } from 'scenes/teamLogic'
 
 import { Group } from '~/types'
 
-import type { creationGroupLogicType } from './creationGroupLogicType'
-
 export type CreationGroupLogicProps = {
     groupTypeIndex: number | null
     groupKey: string | null
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface creationGroupLogicValues {
+    currentTeamId: number | null // teamLogic
+    group: Group | null
+    groupLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface creationGroupLogicActions {
+    loadGroup: () => any
+    loadGroupFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadGroupSuccess: (
+        group: Group | null,
+        payload?: any
+    ) => {
+        group: Group | null
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface creationGroupLogicMeta {
+    key: string
+}
+
+export type creationGroupLogicType = MakeLogicType<
+    creationGroupLogicValues,
+    creationGroupLogicActions,
+    CreationGroupLogicProps,
+    creationGroupLogicMeta
+>
+
 // Fetches the group a ticket was created with (its organization_id snapshot) so the related-groups
 // panel can show its name and a working link even when it has dropped out of the live related list.
 export const creationGroupLogic = kea<creationGroupLogicType>([
diff --git a/products/conversations/frontend/scenes/ticket/supportTicketSceneLogic.ts b/products/conversations/frontend/scenes/ticket/supportTicketSceneLogic.ts
index dd1dd0719b08..7eef00e1d8a5 100644
--- a/products/conversations/frontend/scenes/ticket/supportTicketSceneLogic.ts
+++ b/products/conversations/frontend/scenes/ticket/supportTicketSceneLogic.ts
@@ -1,5 +1,18 @@
 import { JSONContent } from '@tiptap/core'
-import { actions, afterMount, beforeUnmount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    afterMount,
+    beforeUnmount,
+    connect,
+    kea,
+    key,
+    listeners,
+    path,
+    props,
+    reducers,
+    selectors,
+} from 'kea'
 import { loaders } from 'kea-loaders'
 import { beforeUnload, router } from 'kea-router'
 
@@ -24,6 +37,7 @@ import {
     businessKnowledgeGapSuggestionsList,
 } from 'products/business_knowledge/frontend/generated/api'
 
+import type { TeamPublicType, TeamType } from '../../../../../frontend/src/types'
 import type { TicketAssignee } from '../../components/Assignee'
 import { supportTicketCounterLogic } from '../../supportTicketCounterLogic'
 import type {
@@ -35,7 +49,6 @@ import type {
     TicketStatus,
 } from '../../types'
 import { supportTicketsSceneLogic } from '../tickets/supportTicketsSceneLogic'
-import type { supportTicketSceneLogicType } from './supportTicketSceneLogicType'
 
 const MESSAGE_POLL_INTERVAL = 5000 // 5 seconds
 
@@ -147,6 +160,236 @@ export function getEmailReplyBlockedReason(
     return null
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface supportTicketSceneLogicValues {
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    assignee: TicketAssignee
+    chatMessages: ChatMessage[]
+    chatPanelWidth: (desiredSize: number | null) => number
+    draftContent: JSONContent | null
+    draftIsPrivate: boolean
+    emailReplyBlockedReason: EmailReplyBlockedReason | null
+    eventsQuery: DataTableNode | null
+    exceptionsQuery: DataTableNode | null
+    feedbackByMessageId: Record<string, AiReplyFeedbackRating>
+    hasMoreMessages: boolean
+    hasPendingWork: boolean
+    hasUnsavedChanges: boolean
+    knowledgeGaps: KnowledgeGapSuggestion[]
+    knowledgeGapsLoading: boolean
+    latestAiMessage: ChatMessage | null
+    messageSending: boolean
+    messages: CommentType[]
+    messagesLoading: boolean
+    olderMessagesLoading: boolean
+    person: PersonType | null
+    personLoading: boolean
+    previousTickets: Ticket[]
+    previousTicketsLoading: boolean
+    priority: TicketPriority | null
+    snoozedUntil: string | null
+    status: TicketStatus | null
+    tags: string[]
+    ticket: Ticket | null
+    ticketLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface supportTicketSceneLogicActions {
+    loadTickets: () => {
+        value: true
+    } // supportTicketsSceneLogic
+    dismissKnowledgeGap: (suggestionId: string) => {
+        suggestionId: string
+    }
+    incrementUnreadCustomerCount: () => {
+        value: true
+    }
+    loadKnowledgeGaps: () => {
+        value: true
+    }
+    loadKnowledgeGapsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadKnowledgeGapsSuccess: (
+        knowledgeGaps: KnowledgeGapSuggestion[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        knowledgeGaps: KnowledgeGapSuggestion[]
+        payload?: {
+            value: true
+        }
+    }
+    loadMessages: () => {
+        value: true
+    }
+    loadOlderMessages: () => {
+        value: true
+    }
+    loadPerson: () => {
+        value: true
+    }
+    loadPersonFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPersonSuccess: (
+        person: PersonType | null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        person: PersonType | null
+        payload?: {
+            value: true
+        }
+    }
+    loadPreviousTickets: () => {
+        value: true
+    }
+    loadPreviousTicketsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPreviousTicketsSuccess: (
+        previousTickets: Ticket[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        previousTickets: Ticket[]
+        payload?: {
+            value: true
+        }
+    }
+    loadTicket: () => {
+        value: true
+    }
+    recordAiReplyFeedback: (
+        messageId: string,
+        rating: AiReplyFeedbackRating
+    ) => {
+        messageId: string
+        rating: AiReplyFeedbackRating
+    }
+    sendMessage: (
+        content: string,
+        richContent: Record<string, unknown> | null,
+        isPrivate: boolean,
+        onSuccess?: () => void
+    ) => {
+        content: string
+        isPrivate: boolean
+        onSuccess: (() => void) | undefined
+        richContent: Record<string, unknown> | null
+    }
+    setAssignee: (assignee: TicketAssignee) => {
+        assignee: TicketAssignee
+    }
+    setDraftContent: (content: JSONContent | null) => {
+        content: JSONContent | null
+    }
+    setDraftIsPrivate: (isPrivate: boolean) => {
+        isPrivate: boolean
+    }
+    setHasMoreMessages: (hasMore: boolean) => {
+        hasMore: boolean
+    }
+    setMessageSending: (sending: boolean) => {
+        sending: boolean
+    }
+    setMessages: (messages: CommentType[]) => {
+        messages: CommentType[]
+    }
+    setMessagesLoading: (loading: boolean) => {
+        loading: boolean
+    }
+    setOlderMessages: (olderMessages: CommentType[]) => {
+        olderMessages: CommentType[]
+    }
+    setOlderMessagesLoading: (loading: boolean) => {
+        loading: boolean
+    }
+    setPriority: (priority: TicketPriority) => {
+        priority: TicketPriority
+    }
+    setSnoozedUntil: (snoozedUntil: string | null) => {
+        snoozedUntil: string | null
+    }
+    setStatus: (status: TicketStatus) => {
+        status: TicketStatus
+    }
+    setTags: (tags: string[]) => {
+        tags: string[]
+    }
+    setTicket: (ticket: Ticket | null) => {
+        ticket: Ticket | null
+    }
+    setTicketLoading: (loading: boolean) => {
+        loading: boolean
+    }
+    submitAiReplyFeedback: (
+        messageId: string,
+        rating: AiReplyFeedbackRating,
+        feedbackText?: string
+    ) => {
+        feedbackText: string | undefined
+        messageId: string
+        rating: AiReplyFeedbackRating
+    }
+    updateTicket: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface supportTicketSceneLogicProps {
+    id: number | string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface supportTicketSceneLogicMeta {
+    key: number | string
+    __keaTypeGenInternalSelectorTypes: {
+        emailReplyBlockedReason: (
+            ticket: Ticket | null,
+            currentTeam: TeamPublicType | TeamType | null
+        ) => EmailReplyBlockedReason | null
+        hasUnsavedChanges: (
+            status: TicketStatus | null,
+            priority: TicketPriority | null,
+            assignee: TicketAssignee,
+            tags: string[],
+            snoozedUntil: string | null,
+            ticket: Ticket | null
+        ) => boolean
+        hasPendingWork: (hasUnsavedChanges: boolean) => boolean
+        chatMessages: (messages: CommentType[], ticket: Ticket | null) => ChatMessage[]
+        eventsQuery: (ticket: Ticket | null) => DataTableNode | null
+        exceptionsQuery: (ticket: Ticket | null) => DataTableNode | null
+        latestAiMessage: (chatMessages: ChatMessage[]) => ChatMessage | null
+    }
+}
+
+export type supportTicketSceneLogicType = MakeLogicType<
+    supportTicketSceneLogicValues,
+    supportTicketSceneLogicActions,
+    supportTicketSceneLogicProps,
+    supportTicketSceneLogicMeta
+>
+
 export const supportTicketSceneLogic = kea<supportTicketSceneLogicType>([
     path(['products', 'conversations', 'frontend', 'scenes', 'ticket', 'supportTicketSceneLogic']),
     props({ id: 'new' as string | number }),
@@ -407,12 +650,22 @@ export const supportTicketSceneLogic = kea<supportTicketSceneLogicType>([
     selectors({
         emailReplyBlockedReason: [
             (s) => [s.ticket, s.currentTeam],
-            (ticket, currentTeam): EmailReplyBlockedReason | null =>
+            (
+                ticket: Ticket | null,
+                currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType
+            ): EmailReplyBlockedReason | null =>
                 getEmailReplyBlockedReason(ticket, currentTeam?.conversations_settings),
         ],
         hasUnsavedChanges: [
             (s) => [s.status, s.priority, s.assignee, s.tags, s.snoozedUntil, s.ticket],
-            (status, priority, assignee, tags, snoozedUntil, ticket): boolean => {
+            (
+                status: TicketStatus | null,
+                priority: TicketPriority | null,
+                assignee: TicketAssignee,
+                tags: string[],
+                snoozedUntil: string | null,
+                ticket: Ticket | null
+            ): boolean => {
                 if (!ticket) {
                     return false
                 }
@@ -426,7 +679,7 @@ export const supportTicketSceneLogic = kea<supportTicketSceneLogicType>([
                 )
             },
         ],
-        hasPendingWork: [(s) => [s.hasUnsavedChanges], (hasUnsavedChanges): boolean => hasUnsavedChanges],
+        hasPendingWork: [(s) => [s.hasUnsavedChanges], (hasUnsavedChanges: boolean): boolean => hasUnsavedChanges],
         chatPanelWidth: [
             () => [],
             () =>
diff --git a/products/conversations/frontend/scenes/tickets/supportTicketsSceneLogic.ts b/products/conversations/frontend/scenes/tickets/supportTicketsSceneLogic.ts
index 875bd8f296e6..16af2770f504 100644
--- a/products/conversations/frontend/scenes/tickets/supportTicketsSceneLogic.ts
+++ b/products/conversations/frontend/scenes/tickets/supportTicketsSceneLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { router } from 'kea-router'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -21,7 +21,6 @@ import type {
     TicketTagsMatch,
     TicketViewFilters,
 } from '../../types'
-import type { supportTicketsSceneLogicType } from './supportTicketsSceneLogicType'
 
 export const SUPPORT_TICKETS_PAGE_SIZE = 20
 
@@ -30,6 +29,150 @@ export interface SupportTicketsSceneLogicProps {
     distinctIds?: string[]
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface supportTicketsSceneLogicValues {
+    activeView: SavedTicketView | null
+    aiEnabled: boolean
+    aiTriageResultFilter: AITriageFilterValue[]
+    assigneeFilter: AssigneeFilterValue
+    bulkUpdating: boolean
+    channelFilter: TicketChannel | 'all'
+    currentFilters: TicketViewFilters
+    currentPage: number
+    dateFrom: string | null
+    dateTo: string | null
+    orderBy: string
+    priorityFilter: TicketPriority[]
+    searchQuery: string
+    selectedTicketIds: string[]
+    selectedTickets: Ticket[]
+    slaFilter: TicketSlaState | 'all'
+    sorting: Sorting | null
+    statusFilter: TicketStatus[]
+    tagsExcludeFilter: string[]
+    tagsFilter: string[]
+    tagsMatch: TicketTagsMatch
+    tickets: Ticket[]
+    ticketsLoading: boolean
+    totalCount: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface supportTicketsSceneLogicActions {
+    applyViewFilters: (filters: TicketViewFilters) => {
+        filters: TicketViewFilters
+    }
+    bulkUpdateStatus: (
+        ids: string[],
+        status: TicketStatus
+    ) => {
+        ids: string[]
+        status: TicketStatus
+    }
+    clearActiveView: () => {
+        value: true
+    }
+    clearSelectedTickets: () => {
+        value: true
+    }
+    loadTickets: () => {
+        value: true
+    }
+    setActiveView: (view: SavedTicketView | null) => {
+        view: SavedTicketView | null
+    }
+    setAiTriageResultFilter: (results: AITriageFilterValue[]) => {
+        results: AITriageFilterValue[]
+    }
+    setAssigneeFilter: (assignee: AssigneeFilterValue) => {
+        assignee: AssigneeFilterValue
+    }
+    setBulkUpdating: (updating: boolean) => {
+        updating: boolean
+    }
+    setChannelFilter: (channel: TicketChannel | 'all') => {
+        channel: TicketChannel | 'all'
+    }
+    setCurrentPage: (page: number) => {
+        page: number
+    }
+    setDateRange: (
+        dateFrom: string | null,
+        dateTo: string | null
+    ) => {
+        dateFrom: string | null
+        dateTo: string | null
+    }
+    setPriorityFilter: (priorities: TicketPriority[]) => {
+        priorities: TicketPriority[]
+    }
+    setSearchQuery: (query: string) => {
+        query: string
+    }
+    setSelectedTicketIds: (ids: string[]) => {
+        ids: string[]
+    }
+    setSlaFilter: (sla: TicketSlaState | 'all') => {
+        sla: TicketSlaState | 'all'
+    }
+    setSorting: (sorting: Sorting | null) => {
+        sorting: Sorting | null
+    }
+    setStatusFilter: (statuses: TicketStatus[]) => {
+        statuses: TicketStatus[]
+    }
+    setTagsExcludeFilter: (tags: string[]) => {
+        tags: string[]
+    }
+    setTagsFilter: (tags: string[]) => {
+        tags: string[]
+    }
+    setTagsMatch: (match: TicketTagsMatch) => {
+        match: TicketTagsMatch
+    }
+    setTickets: (tickets: Ticket[]) => {
+        tickets: Ticket[]
+    }
+    setTicketsLoading: (loading: boolean) => {
+        loading: boolean
+    }
+    setTotalCount: (count: number) => {
+        count: number
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface supportTicketsSceneLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        aiEnabled: (currentTeam: TeamType | null | import('~/types').TeamPublicType) => boolean
+        orderBy: (sorting: Sorting | null) => string
+        selectedTickets: (tickets: Ticket[], selectedTicketIds: string[]) => Ticket[]
+        currentFilters: (
+            statusFilter: TicketStatus[],
+            priorityFilter: TicketPriority[],
+            channelFilter: TicketChannel | 'all',
+            slaFilter: TicketSlaState | 'all',
+            aiTriageResultFilter: AITriageFilterValue[],
+            assigneeFilter: AssigneeFilterValue,
+            tagsFilter: string[],
+            tagsMatch: TicketTagsMatch,
+            tagsExcludeFilter: string[],
+            dateFrom: string | null,
+            dateTo: string | null,
+            sorting: Sorting | null,
+            searchQuery: string
+        ) => TicketViewFilters
+    }
+}
+
+export type supportTicketsSceneLogicType = MakeLogicType<
+    supportTicketsSceneLogicValues,
+    supportTicketsSceneLogicActions,
+    SupportTicketsSceneLogicProps,
+    supportTicketsSceneLogicMeta
+>
+
 export const supportTicketsSceneLogic = kea<supportTicketsSceneLogicType>([
     path(['products', 'conversations', 'frontend', 'scenes', 'tickets', 'supportTicketsSceneLogic']),
     props({} as SupportTicketsSceneLogicProps),
diff --git a/products/conversations/frontend/supportTicketCounterLogic.ts b/products/conversations/frontend/supportTicketCounterLogic.ts
index 0a5958e8887f..d3d042c822e8 100644
--- a/products/conversations/frontend/supportTicketCounterLogic.ts
+++ b/products/conversations/frontend/supportTicketCounterLogic.ts
@@ -1,13 +1,13 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { subscriptions } from 'kea-subscriptions'
 
 import api from 'lib/api'
 import { teamLogic } from 'scenes/teamLogic'
 
+import type { TeamPublicType, TeamType } from '../../../frontend/src/types'
 import { browserNotificationLogic } from './browserNotificationLogic'
 import { supportTicketsSceneLogic } from './scenes/tickets/supportTicketsSceneLogic'
-import type { supportTicketCounterLogicType } from './supportTicketCounterLogicType'
 
 const POLL_INTERVAL = 5 * 1000 // 5 seconds - backend is cached so frequent polling is cheap
 
@@ -15,6 +15,91 @@ export interface UnreadCountResponse {
     count: number
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface supportTicketCounterLogicValues {
+    canShowNotifications: boolean // browserNotificationLogic
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    errorCounter: number
+    isSupportEnabled: boolean
+    unreadCount: number
+    unreadCountLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface supportTicketCounterLogicActions {
+    showNotification: (count: number) => {
+        count: number
+    } // browserNotificationLogic
+    clearErrorCount: () => {
+        value: true
+    }
+    incrementErrorCount: () => {
+        value: true
+    }
+    loadUnreadCount: () => {
+        value: true
+    }
+    loadUnreadCountFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadUnreadCountSuccess: (
+        unreadCount: number,
+        payload?: {
+            value: true
+        }
+    ) => {
+        unreadCount: number
+        payload?: {
+            value: true
+        }
+    }
+    refreshCount: () => {
+        value: true
+    }
+    resetCount: () => {
+        value: true
+    }
+    resetCountFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    resetCountSuccess: (
+        unreadCount: number,
+        payload?: {
+            value: true
+        }
+    ) => {
+        unreadCount: number
+        payload?: {
+            value: true
+        }
+    }
+    schedulePoll: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface supportTicketCounterLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        isSupportEnabled: (currentTeam: TeamPublicType | TeamType | null) => boolean
+    }
+}
+
+export type supportTicketCounterLogicType = MakeLogicType<
+    supportTicketCounterLogicValues,
+    supportTicketCounterLogicActions,
+    Record<string, any>,
+    supportTicketCounterLogicMeta
+>
+
 export const supportTicketCounterLogic = kea<supportTicketCounterLogicType>([
     path(['products', 'conversations', 'frontend', 'supportTicketCounterLogic']),
     connect(() => ({
@@ -65,7 +150,11 @@ export const supportTicketCounterLogic = kea<supportTicketCounterLogicType>([
         ],
     })),
     selectors({
-        isSupportEnabled: [(s) => [s.currentTeam], (currentTeam): boolean => !!currentTeam?.conversations_enabled],
+        isSupportEnabled: [
+            (s) => [s.currentTeam],
+            (currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType): boolean =>
+                !!currentTeam?.conversations_enabled,
+        ],
     }),
     listeners(({ actions, values, cache }) => ({
         // Re-schedule after each load completes. The loader catches API errors
diff --git a/products/customer_analytics/frontend/components/AccountNotes/accountNotesLogic.ts b/products/customer_analytics/frontend/components/AccountNotes/accountNotesLogic.ts
index 02cec42ae9a7..0e7b975d8747 100644
--- a/products/customer_analytics/frontend/components/AccountNotes/accountNotesLogic.ts
+++ b/products/customer_analytics/frontend/components/AccountNotes/accountNotesLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
@@ -14,15 +14,155 @@ import type {
     PaginatedAccountNoteListApi,
 } from 'products/customer_analytics/frontend/generated/api.schemas'
 
+import type { UserType } from '../../../../../frontend/src/types'
 import { customerAnalyticsSceneLogic } from '../../customerAnalyticsSceneLogic'
 import { AccountsEvents, type NotesTabFilterType } from '../Accounts/constants'
-import type { accountNotesLogicType } from './accountNotesLogicType'
 
 const RESULTS_PER_PAGE = 50
 const ACCOUNT_OPTIONS_LIMIT = 50
 
 export type AccountFilterOption = { id: string; name: string }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accountNotesLogicValues {
+    mineOnly: boolean // customerAnalyticsSceneLogic
+    currentTeamId: number | null // teamLogic
+    user: UserType | null // userLogic
+    accountFilter: AccountFilterOption | null
+    accountNotes: AccountNoteApi[]
+    accountNotesResponse: PaginatedAccountNoteListApi | null
+    accountNotesResponseLoading: boolean
+    accountOptions: {
+        key: string
+        label: string
+    }[]
+    accountOptionsResponse: PaginatedAccountListApi | null
+    accountOptionsResponseLoading: boolean
+    accountSearch: string
+    assignedToCurrentUser: boolean
+    assignedToFilter: number[]
+    createdByCurrentUser: boolean
+    createdByFilter: number[]
+    currentUserId: number | null
+    page: number
+    pagination: PaginationManual
+    search: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accountNotesLogicActions {
+    setMineOnly: (mineOnly: boolean) => {
+        mineOnly: boolean
+    } // customerAnalyticsSceneLogic
+    loadUserSuccess: (
+        user: UserType | null,
+        payload?:
+            | {
+                  resetOnFailure: boolean | undefined
+              }
+            | undefined
+    ) => {
+        payload?: {
+            resetOnFailure: boolean | undefined
+        }
+        user: UserType | null
+    } // userLogic
+    loadAccountNotes: () => {
+        value: true
+    }
+    loadAccountNotesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAccountNotesSuccess: (
+        accountNotesResponse: PaginatedAccountNoteListApi,
+        payload?: {
+            value: true
+        }
+    ) => {
+        accountNotesResponse: PaginatedAccountNoteListApi
+        payload?: {
+            value: true
+        }
+    }
+    loadAccountOptions: ({ query }: { query: string }) => {
+        query: string
+    }
+    loadAccountOptionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAccountOptionsSuccess: (
+        accountOptionsResponse: PaginatedAccountListApi,
+        payload?: {
+            query: string
+        }
+    ) => {
+        accountOptionsResponse: PaginatedAccountListApi
+        payload?: {
+            query: string
+        }
+    }
+    reportFilterChange: (filterType: NotesTabFilterType) => {
+        filterType: NotesTabFilterType
+    }
+    setAccountFilter: (account: AccountFilterOption | null) => {
+        account: AccountFilterOption | null
+    }
+    setAccountSearch: (query: string) => {
+        query: string
+    }
+    setAssignedToCurrentUser: (value: boolean) => {
+        value: boolean
+    }
+    setAssignedToFilter: (userIds: number[]) => {
+        userIds: number[]
+    }
+    setCreatedByCurrentUser: (value: boolean) => {
+        value: boolean
+    }
+    setCreatedByFilter: (userIds: number[]) => {
+        userIds: number[]
+    }
+    setPage: (page: number) => {
+        page: number
+    }
+    setSearch: (search: string) => {
+        search: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accountNotesLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        accountNotes: (accountNotesResponse: PaginatedAccountNoteListApi | null) => AccountNoteApi[]
+        currentUserId: (user: UserType | null) => number | null
+        createdByCurrentUser: (createdByFilter: number[], currentUserId: number | null) => boolean
+        assignedToCurrentUser: (assignedToFilter: number[], currentUserId: number | null) => boolean
+        pagination: (page: number, accountNotesResponse: PaginatedAccountNoteListApi | null) => PaginationManual
+        accountOptions: (
+            accountOptionsResponse: PaginatedAccountListApi | null,
+            accountFilter: AccountFilterOption | null
+        ) => {
+            key: string
+            label: string
+        }[]
+    }
+}
+
+export type accountNotesLogicType = MakeLogicType<
+    accountNotesLogicValues,
+    accountNotesLogicActions,
+    Record<string, any>,
+    accountNotesLogicMeta
+>
+
 export const accountNotesLogic = kea<accountNotesLogicType>([
     path(['products', 'customer_analytics', 'frontend', 'components', 'AccountNotes', 'accountNotesLogic']),
     connect(() => ({
@@ -98,7 +238,7 @@ export const accountNotesLogic = kea<accountNotesLogicType>([
             (s) => [s.accountNotesResponse],
             (response: PaginatedAccountNoteListApi | null): AccountNoteApi[] => response?.results ?? [],
         ],
-        currentUserId: [(s) => [s.user], (user): number | null => user?.id ?? null],
+        currentUserId: [(s) => [s.user], (user: null | import('~/types').UserType): number | null => user?.id ?? null],
         // "My notes" is a shorthand, not separate state: checked iff the created-by filter is exactly [me].
         createdByCurrentUser: [
             (s) => [s.createdByFilter, s.currentUserId],
diff --git a/products/customer_analytics/frontend/components/AccountPropertiesInput/accountPropertiesInputLogic.ts b/products/customer_analytics/frontend/components/AccountPropertiesInput/accountPropertiesInputLogic.ts
index a56560c9fbb9..9080fc592ab2 100644
--- a/products/customer_analytics/frontend/components/AccountPropertiesInput/accountPropertiesInputLogic.ts
+++ b/products/customer_analytics/frontend/components/AccountPropertiesInput/accountPropertiesInputLogic.ts
@@ -1,4 +1,4 @@
-import { afterMount, connect, kea, listeners, path } from 'kea'
+import { MakeLogicType, afterMount, connect, kea, listeners, path } from 'kea'
 import { loaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
@@ -7,7 +7,36 @@ import { projectLogic } from 'scenes/projectLogic'
 import { customPropertyDefinitionsList } from 'products/customer_analytics/frontend/generated/api'
 import type { CustomPropertyDefinitionApi } from 'products/customer_analytics/frontend/generated/api.schemas'
 
-import type { accountPropertiesInputLogicType } from './accountPropertiesInputLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accountPropertiesInputLogicValues {
+    currentProjectId: number | null // projectLogic
+    definitions: CustomPropertyDefinitionApi[]
+    definitionsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accountPropertiesInputLogicActions {
+    loadDefinitions: () => any
+    loadDefinitionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadDefinitionsSuccess: (
+        definitions: CustomPropertyDefinitionApi[],
+        payload?: any
+    ) => {
+        definitions: CustomPropertyDefinitionApi[]
+        payload?: any
+    }
+}
+
+export type accountPropertiesInputLogicType = MakeLogicType<
+    accountPropertiesInputLogicValues,
+    accountPropertiesInputLogicActions
+>
 
 export const accountPropertiesInputLogic = kea<accountPropertiesInputLogicType>([
     path([
diff --git a/products/customer_analytics/frontend/components/AccountRelationshipsInput/accountRelationshipsInputLogic.ts b/products/customer_analytics/frontend/components/AccountRelationshipsInput/accountRelationshipsInputLogic.ts
index af8f70f849cb..762a62ab5d72 100644
--- a/products/customer_analytics/frontend/components/AccountRelationshipsInput/accountRelationshipsInputLogic.ts
+++ b/products/customer_analytics/frontend/components/AccountRelationshipsInput/accountRelationshipsInputLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
@@ -7,7 +7,43 @@ import { projectLogic } from 'scenes/projectLogic'
 import { accountRelationshipDefinitionsList } from 'products/customer_analytics/frontend/generated/api'
 import type { AccountRelationshipDefinitionApi } from 'products/customer_analytics/frontend/generated/api.schemas'
 
-import type { accountRelationshipsInputLogicType } from './accountRelationshipsInputLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accountRelationshipsInputLogicValues {
+    currentProjectId: number | null // projectLogic
+    definitions: AccountRelationshipDefinitionApi[]
+    definitionsLoading: boolean
+    pendingDefinitionIds: string[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accountRelationshipsInputLogicActions {
+    addPendingDefinition: (definitionId: string) => {
+        definitionId: string
+    }
+    loadDefinitions: () => any
+    loadDefinitionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadDefinitionsSuccess: (
+        definitions: AccountRelationshipDefinitionApi[],
+        payload?: any
+    ) => {
+        definitions: AccountRelationshipDefinitionApi[]
+        payload?: any
+    }
+    removePendingDefinition: (definitionId: string) => {
+        definitionId: string
+    }
+}
+
+export type accountRelationshipsInputLogicType = MakeLogicType<
+    accountRelationshipsInputLogicValues,
+    accountRelationshipsInputLogicActions
+>
 
 export const accountRelationshipsInputLogic = kea<accountRelationshipsInputLogicType>([
     path([
diff --git a/products/customer_analytics/frontend/components/Accounts/accountBillingLogic.ts b/products/customer_analytics/frontend/components/Accounts/accountBillingLogic.ts
index 4658084f47e9..0f76a5a01125 100644
--- a/products/customer_analytics/frontend/components/Accounts/accountBillingLogic.ts
+++ b/products/customer_analytics/frontend/components/Accounts/accountBillingLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, isBreakpoint, kea, key, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, isBreakpoint, kea, key, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
@@ -9,7 +9,7 @@ import { insightsApi } from 'scenes/insights/utils/api'
 import { DataVisualizationNode, HogQLVariable, NodeKind } from '~/queries/schema/schema-general'
 import { InsightShortId, QueryBasedInsightModel } from '~/types'
 
-import type { accountBillingLogicType } from './accountBillingLogicType'
+import type { Node } from '../../../../../frontend/src/queries/schema/schema-general'
 
 export type AccountBillingKind = 'usage' | 'spend'
 
@@ -73,6 +73,63 @@ function buildVariableOverrides(
     return overrides
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accountBillingLogicValues {
+    dateRange: BillingDateRange
+    queryKeyFor: (shortId: string) => string
+    resolvedDateRange: BillingDateRange
+    savedInsights: QueryBasedInsightModel[] | null
+    savedInsightsLoading: boolean
+    variableOverridesByShortId: Record<string, Record<string, HogQLVariable>>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accountBillingLogicActions {
+    loadSavedInsights: (_?: any) => any
+    loadSavedInsightsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSavedInsightsSuccess: (
+        savedInsights: QueryBasedInsightModel<Node<Record<string, any>>>[],
+        payload?: any
+    ) => {
+        savedInsights: QueryBasedInsightModel<Node<Record<string, any>>>[]
+        payload?: any
+    }
+    setDateRange: (
+        dateFrom: string | null,
+        dateTo: string | null
+    ) => {
+        dateFrom: string | null
+        dateTo: string | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accountBillingLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        resolvedDateRange: (dateRange: BillingDateRange) => BillingDateRange
+        variableOverridesByShortId: (
+            savedInsights: QueryBasedInsightModel<Node<Record<string, any>>>[] | null,
+            resolvedDateRange: BillingDateRange,
+            arg: any
+        ) => Record<string, Record<string, HogQLVariable>>
+        queryKeyFor: (resolvedDateRange: BillingDateRange, arg: any, arg2: any) => (shortId: string) => string
+    }
+}
+
+export type accountBillingLogicType = MakeLogicType<
+    accountBillingLogicValues,
+    accountBillingLogicActions,
+    AccountBillingLogicProps,
+    accountBillingLogicMeta
+>
+
 export const accountBillingLogic = kea<accountBillingLogicType>([
     path((key) => ['scenes', 'customerAnalytics', 'accounts', 'accountBillingLogic', key]),
     props({} as AccountBillingLogicProps),
@@ -119,7 +176,7 @@ export const accountBillingLogic = kea<accountBillingLogicType>([
         // The saved insights filter on a calendar date column, so the range must be resolved to absolute dates.
         resolvedDateRange: [
             (s) => [s.dateRange],
-            (dateRange): BillingDateRange => {
+            (dateRange: BillingDateRange): BillingDateRange => {
                 const from = dateStringToDayJs(dateRange.date_from)
                 const to = dateRange.date_to ? dateStringToDayJs(dateRange.date_to) : dayjs()
                 return {
@@ -130,7 +187,11 @@ export const accountBillingLogic = kea<accountBillingLogicType>([
         ],
         variableOverridesByShortId: [
             (s) => [s.savedInsights, s.resolvedDateRange, (_, p) => p.externalId],
-            (savedInsights, resolvedDateRange, externalId): Record<string, Record<string, HogQLVariable>> => {
+            (
+                savedInsights: QueryBasedInsightModel[] | null,
+                resolvedDateRange: BillingDateRange,
+                externalId
+            ): Record<string, Record<string, HogQLVariable>> => {
                 const overridesByShortId: Record<string, Record<string, HogQLVariable>> = {}
                 for (const insight of savedInsights ?? []) {
                     const overrides = buildVariableOverrides(insight, resolvedDateRange, externalId)
@@ -145,7 +206,7 @@ export const accountBillingLogic = kea<accountBillingLogicType>([
         // change must remount it. Keying on the resolved range gives each insight a key that changes with the range.
         queryKeyFor: [
             (s) => [s.resolvedDateRange, (_, p) => p.accountId, (_, p) => p.kind],
-            (resolvedDateRange, accountId, kind) =>
+            (resolvedDateRange: BillingDateRange, accountId, kind) =>
                 (shortId: string): string =>
                     `account-billing-${accountId}-${kind}-${shortId}-${resolvedDateRange.date_from}-${resolvedDateRange.date_to}`,
         ],
diff --git a/products/customer_analytics/frontend/components/Accounts/accountLinksLogic.ts b/products/customer_analytics/frontend/components/Accounts/accountLinksLogic.ts
index 0779c3982218..5a11060004ac 100644
--- a/products/customer_analytics/frontend/components/Accounts/accountLinksLogic.ts
+++ b/products/customer_analytics/frontend/components/Accounts/accountLinksLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { combineUrl, router } from 'kea-router'
 import posthog from 'posthog-js'
@@ -14,7 +14,6 @@ import type {
     PatchedAccountApiProperties,
 } from 'products/customer_analytics/frontend/generated/api.schemas'
 
-import type { accountLinksLogicType } from './accountLinksLogicType'
 import { SALESFORCE_ORIGIN } from './constants'
 
 const ORGANIZATION_GROUP_TYPE_INDEX = 0
@@ -65,6 +64,88 @@ function revenueDashboardUrl(externalId: string, billingId: string | null): stri
     return `${urls.dashboard(REVENUE_DASHBOARD_ID)}?query_variables=${encodeURIComponent(queryVariables)}`
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accountLinksLogicValues {
+    currentTeamId: number | null // teamLogic
+    account: AccountApi | null
+    accountLoading: boolean
+    currentFieldValues: AccountLinkFieldValues
+    editorOpen: boolean
+    formValues: AccountLinkFieldValues
+    links: AccountLink[]
+    savingLinks: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accountLinksLogicActions {
+    closeEditor: () => {
+        value: true
+    }
+    loadAccount: () => any
+    loadAccountFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAccountSuccess: (
+        account: AccountApi | null,
+        payload?: any
+    ) => {
+        account: AccountApi | null
+        payload?: any
+    }
+    openEditor: () => {
+        value: true
+    }
+    saveFinished: () => {
+        value: true
+    }
+    saveLinks: () => {
+        value: true
+    }
+    saveStarted: () => {
+        value: true
+    }
+    setFieldValue: (
+        fieldKey: AccountLinkFieldKey,
+        value: string
+    ) => {
+        fieldKey: AccountLinkFieldKey
+        value: string
+    }
+    setFormValues: (values: AccountLinkFieldValues) => {
+        values: AccountLinkFieldValues
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accountLinksLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        currentFieldValues: (account: AccountApi | null) => AccountLinkFieldValues
+        links: (
+            account: AccountApi | null,
+            currentLocation: {
+                hash: string
+                hashParams: Record<string, any>
+                method: string
+                pathname: string
+                search: string
+                searchParams: Record<string, any>
+            }
+        ) => AccountLink[]
+    }
+}
+
+export type accountLinksLogicType = MakeLogicType<
+    accountLinksLogicValues,
+    accountLinksLogicActions,
+    AccountLinksLogicProps,
+    accountLinksLogicMeta
+>
+
 export const accountLinksLogic = kea<accountLinksLogicType>([
     path((key) => ['scenes', 'customerAnalytics', 'accounts', 'accountLinksLogic', key]),
     props({} as AccountLinksLogicProps),
@@ -132,7 +213,17 @@ export const accountLinksLogic = kea<accountLinksLogicType>([
         ],
         links: [
             (s) => [s.account, router.selectors.currentLocation],
-            (account: AccountApi | null, currentLocation): AccountLink[] => {
+            (
+                account: AccountApi | null,
+                currentLocation: {
+                    hash: string
+                    hashParams: Record<string, any>
+                    method: string
+                    pathname: string
+                    search: string
+                    searchParams: Record<string, any>
+                }
+            ): AccountLink[] => {
                 const externalId = account?.external_id ?? null
                 const billingId = account?.properties?.billing_id ?? null
                 const slackChannelId = account?.properties?.slack_channel_id ?? null
diff --git a/products/customer_analytics/frontend/components/Accounts/accountNotebooksLogic.ts b/products/customer_analytics/frontend/components/Accounts/accountNotebooksLogic.ts
index 3a2c5c922078..18f72c13eee8 100644
--- a/products/customer_analytics/frontend/components/Accounts/accountNotebooksLogic.ts
+++ b/products/customer_analytics/frontend/components/Accounts/accountNotebooksLogic.ts
@@ -1,4 +1,17 @@
-import { actions, afterMount, connect, isBreakpoint, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    afterMount,
+    connect,
+    isBreakpoint,
+    kea,
+    key,
+    listeners,
+    path,
+    props,
+    reducers,
+    selectors,
+} from 'kea'
 import { loaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
@@ -15,7 +28,6 @@ import type {
     PaginatedAccountNotebookListApi,
 } from 'products/customer_analytics/frontend/generated/api.schemas'
 
-import type { accountNotebooksLogicType } from './accountNotebooksLogicType'
 import { AccountsEvents } from './constants'
 
 export const NOTES_PER_PAGE = 5
@@ -34,6 +46,100 @@ function sortingToOrdering(sorting: Sorting | null): string | undefined {
     return sorting.order === -1 ? `-${sorting.columnKey}` : sorting.columnKey
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accountNotebooksLogicValues {
+    currentTeamId: number | null // teamLogic
+    createdNote: AccountNotebookApi | null
+    createdNoteLoading: boolean
+    notebooks: AccountNotebookApi[] | null
+    notebooksCount: number
+    notebooksResponse: PaginatedAccountNotebookListApi | null
+    notebooksResponseLoading: boolean
+    page: number
+    pagination: PaginationManual
+    searchTerm: string
+    sorting: Sorting | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accountNotebooksLogicActions {
+    selectNotebook: (
+        id: string,
+        options?:
+            | {
+                  autofocus?: import('@tiptap/core').FocusPosition
+                  silent?: boolean
+              }
+            | undefined
+    ) => {
+        autofocus?: import('@tiptap/core').FocusPosition | undefined
+        id: string
+        silent?: boolean | undefined
+    } // notebookPanelLogic
+    createNote: () => {
+        value: true
+    }
+    createNoteFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    createNoteSuccess: (
+        createdNote: AccountNotebookApi,
+        payload?: {
+            value: true
+        }
+    ) => {
+        createdNote: AccountNotebookApi
+        payload?: {
+            value: true
+        }
+    }
+    loadNotebooks: (_?: any) => any
+    loadNotebooksFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadNotebooksSuccess: (
+        notebooksResponse: PaginatedAccountNotebookListApi,
+        payload?: any
+    ) => {
+        notebooksResponse: PaginatedAccountNotebookListApi
+        payload?: any
+    }
+    setPage: (page: number) => {
+        page: number
+    }
+    setSearchTerm: (searchTerm: string) => {
+        searchTerm: string
+    }
+    setSorting: (sorting: Sorting | null) => {
+        sorting: Sorting | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accountNotebooksLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        notebooks: (notebooksResponse: PaginatedAccountNotebookListApi | null) => AccountNotebookApi[] | null
+        notebooksCount: (notebooksResponse: PaginatedAccountNotebookListApi | null) => number
+        pagination: (page: number, notebooksCount: number) => PaginationManual
+    }
+}
+
+export type accountNotebooksLogicType = MakeLogicType<
+    accountNotebooksLogicValues,
+    accountNotebooksLogicActions,
+    AccountNotebooksLogicProps,
+    accountNotebooksLogicMeta
+>
+
 export const accountNotebooksLogic = kea<accountNotebooksLogicType>([
     path((key) => ['scenes', 'customerAnalytics', 'accounts', 'accountNotebooksLogic', key]),
     props({} as AccountNotebooksLogicProps),
@@ -101,11 +207,18 @@ export const accountNotebooksLogic = kea<accountNotebooksLogicType>([
         page: [1, { setPage: (_, { page }) => page }],
     }),
     selectors(({ actions }) => ({
-        notebooks: [(s) => [s.notebooksResponse], (response): AccountNotebookApi[] | null => response?.results ?? null],
-        notebooksCount: [(s) => [s.notebooksResponse], (response): number => response?.count ?? 0],
+        notebooks: [
+            (s) => [s.notebooksResponse],
+            (response: PaginatedAccountNotebookListApi | null): AccountNotebookApi[] | null =>
+                response?.results ?? null,
+        ],
+        notebooksCount: [
+            (s) => [s.notebooksResponse],
+            (response: PaginatedAccountNotebookListApi | null): number => response?.count ?? 0,
+        ],
         pagination: [
             (s) => [s.page, s.notebooksCount],
-            (page, count): PaginationManual => ({
+            (page: number, count: number): PaginationManual => ({
                 controlled: true,
                 pageSize: NOTES_PER_PAGE,
                 currentPage: page,
diff --git a/products/customer_analytics/frontend/components/Accounts/accountOpportunitiesLogic.ts b/products/customer_analytics/frontend/components/Accounts/accountOpportunitiesLogic.ts
index b51c683c03b6..2b6e9b8bbc57 100644
--- a/products/customer_analytics/frontend/components/Accounts/accountOpportunitiesLogic.ts
+++ b/products/customer_analytics/frontend/components/Accounts/accountOpportunitiesLogic.ts
@@ -1,4 +1,4 @@
-import { afterMount, connect, kea, key, path, props } from 'kea'
+import { MakeLogicType, afterMount, connect, kea, key, path, props } from 'kea'
 import { loaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
@@ -11,7 +11,6 @@ import { hogql } from '~/queries/utils'
 import { accountsRetrieve } from 'products/customer_analytics/frontend/generated/api'
 
 import { CUSTOMER_ANALYTICS_DEFAULT_QUERY_TAGS } from '../../constants'
-import type { accountOpportunitiesLogicType } from './accountOpportunitiesLogicType'
 
 export interface AccountOpportunitiesLogicProps {
     accountId: string
@@ -48,6 +47,44 @@ const isExpectedMissingTableError = (error: unknown): boolean => {
     )
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accountOpportunitiesLogicValues {
+    currentTeamId: number | null // teamLogic
+    opportunitiesResult: AccountOpportunitiesResult
+    opportunitiesResultLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accountOpportunitiesLogicActions {
+    loadOpportunities: () => any
+    loadOpportunitiesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadOpportunitiesSuccess: (
+        opportunitiesResult: AccountOpportunitiesResult,
+        payload?: any
+    ) => {
+        opportunitiesResult: AccountOpportunitiesResult
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accountOpportunitiesLogicMeta {
+    key: string
+}
+
+export type accountOpportunitiesLogicType = MakeLogicType<
+    accountOpportunitiesLogicValues,
+    accountOpportunitiesLogicActions,
+    AccountOpportunitiesLogicProps,
+    accountOpportunitiesLogicMeta
+>
+
 export const accountOpportunitiesLogic = kea<accountOpportunitiesLogicType>([
     path((key) => ['scenes', 'customerAnalytics', 'accounts', 'accountOpportunitiesLogic', key]),
     props({} as AccountOpportunitiesLogicProps),
diff --git a/products/customer_analytics/frontend/components/Accounts/accountRelatedUsersLogic.ts b/products/customer_analytics/frontend/components/Accounts/accountRelatedUsersLogic.ts
index 63b7020e5246..6bd65cf44156 100644
--- a/products/customer_analytics/frontend/components/Accounts/accountRelatedUsersLogic.ts
+++ b/products/customer_analytics/frontend/components/Accounts/accountRelatedUsersLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, isBreakpoint, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, isBreakpoint, kea, key, listeners, path, props, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
@@ -7,8 +7,6 @@ import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
 
 import { OrganizationMemberType } from '~/types'
 
-import type { accountRelatedUsersLogicType } from './accountRelatedUsersLogicType'
-
 // The account org-members endpoint returns a slim member shape — only id + user are serialized.
 export type AccountOrganizationMember = Pick<OrganizationMemberType, 'id' | 'user'>
 
@@ -18,6 +16,47 @@ export interface AccountRelatedUsersLogicProps {
     externalId: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accountRelatedUsersLogicValues {
+    membersResponse: CountedPaginatedResponse<AccountOrganizationMember> | null
+    membersResponseLoading: boolean
+    page: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accountRelatedUsersLogicActions {
+    loadMembers: (_?: any) => any
+    loadMembersFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadMembersSuccess: (
+        membersResponse: CountedPaginatedResponse<Pick<OrganizationMemberType, 'id' | 'user'>>,
+        payload?: any
+    ) => {
+        membersResponse: CountedPaginatedResponse<Pick<OrganizationMemberType, 'id' | 'user'>>
+        payload?: any
+    }
+    setPage: (page: number) => {
+        page: number
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accountRelatedUsersLogicMeta {
+    key: string
+}
+
+export type accountRelatedUsersLogicType = MakeLogicType<
+    accountRelatedUsersLogicValues,
+    accountRelatedUsersLogicActions,
+    AccountRelatedUsersLogicProps,
+    accountRelatedUsersLogicMeta
+>
+
 export const accountRelatedUsersLogic = kea<accountRelatedUsersLogicType>([
     path((key) => ['scenes', 'customerAnalytics', 'accounts', 'accountRelatedUsersLogic', key]),
     props({} as AccountRelatedUsersLogicProps),
diff --git a/products/customer_analytics/frontend/components/Accounts/accountRelationshipsLogic.ts b/products/customer_analytics/frontend/components/Accounts/accountRelationshipsLogic.ts
index 7b236d81e25b..94af5b72831b 100644
--- a/products/customer_analytics/frontend/components/Accounts/accountRelationshipsLogic.ts
+++ b/products/customer_analytics/frontend/components/Accounts/accountRelationshipsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
@@ -19,7 +19,6 @@ import type {
 } from 'products/customer_analytics/frontend/generated/api.schemas'
 
 import { ACCOUNTS_HOGQL_DATA_NODE_KEY, ACCOUNTS_METRICS_DATA_NODE_KEY } from '../../constants'
-import type { accountRelationshipsLogicType } from './accountRelationshipsLogicType'
 import { accountsColumnConfigLogic, ROLE_KEY_BY_NAME } from './accountsColumnConfigLogic'
 import { AccountsEvents } from './constants'
 
@@ -33,6 +32,86 @@ function refreshAccountsList(): void {
     dataNodeLogic.findMounted({ key: ACCOUNTS_METRICS_DATA_NODE_KEY })?.actions.loadData('force_async')
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accountRelationshipsLogicValues {
+    relationshipDefinitions: AccountRelationshipDefinitionApi[] // accountsColumnConfigLogic
+    currentTeamId: number | null // teamLogic
+    activeRelationships: AccountRelationshipApi[]
+    assignDefinition: AccountRelationshipDefinitionApi | null
+    assignDefinitionId: string | null
+    definitionFilter: string | null
+    definitionFilterOptions: AccountRelationshipDefinitionApi[]
+    displayedRelationships: AccountRelationshipApi[]
+    relationshipSaving: boolean
+    relationships: AccountRelationshipApi[] | null
+    relationshipsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accountRelationshipsLogicActions {
+    assignRelationship: (
+        definition: AccountRelationshipDefinitionApi,
+        user: UserBasicType
+    ) => {
+        definition: AccountRelationshipDefinitionApi
+        user: UserBasicType
+    }
+    endRelationship: (relationship: AccountRelationshipApi) => {
+        relationship: AccountRelationshipApi
+    }
+    loadRelationships: () => any
+    loadRelationshipsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRelationshipsSuccess: (
+        relationships: AccountRelationshipApi[],
+        payload?: any
+    ) => {
+        relationships: AccountRelationshipApi[]
+        payload?: any
+    }
+    relationshipSaveFinished: () => {
+        value: true
+    }
+    relationshipSaveStarted: () => {
+        value: true
+    }
+    setAssignDefinitionId: (definitionId: string | null) => {
+        definitionId: string | null
+    }
+    setDefinitionFilter: (definitionId: string | null) => {
+        definitionId: string | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accountRelationshipsLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        activeRelationships: (relationships: AccountRelationshipApi[] | null) => AccountRelationshipApi[]
+        displayedRelationships: (
+            relationships: AccountRelationshipApi[] | null,
+            definitionFilter: string | null
+        ) => AccountRelationshipApi[]
+        assignDefinition: (
+            assignDefinitionId: string | null,
+            relationshipDefinitions: AccountRelationshipDefinitionApi[]
+        ) => AccountRelationshipDefinitionApi | null
+        definitionFilterOptions: (relationships: AccountRelationshipApi[] | null) => AccountRelationshipDefinitionApi[]
+    }
+}
+
+export type accountRelationshipsLogicType = MakeLogicType<
+    accountRelationshipsLogicValues,
+    accountRelationshipsLogicActions,
+    AccountRelationshipsLogicProps,
+    accountRelationshipsLogicMeta
+>
+
 export const accountRelationshipsLogic = kea<accountRelationshipsLogicType>([
     path((key) => ['scenes', 'customerAnalytics', 'accounts', 'accountRelationshipsLogic', key]),
     props({} as AccountRelationshipsLogicProps),
@@ -88,12 +167,15 @@ export const accountRelationshipsLogic = kea<accountRelationshipsLogicType>([
     selectors({
         activeRelationships: [
             (s) => [s.relationships],
-            (relationships): AccountRelationshipApi[] =>
+            (relationships: AccountRelationshipApi[] | null): AccountRelationshipApi[] =>
                 (relationships ?? []).filter((relationship) => !relationship.ended_at),
         ],
         displayedRelationships: [
             (s) => [s.relationships, s.definitionFilter],
-            (relationships, definitionFilter): AccountRelationshipApi[] =>
+            (
+                relationships: AccountRelationshipApi[] | null,
+                definitionFilter: string | null
+            ): AccountRelationshipApi[] =>
                 (relationships ?? [])
                     .filter((relationship) => !definitionFilter || relationship.definition.id === definitionFilter)
                     .sort(
@@ -103,14 +185,17 @@ export const accountRelationshipsLogic = kea<accountRelationshipsLogicType>([
         ],
         assignDefinition: [
             (s) => [s.assignDefinitionId, s.relationshipDefinitions],
-            (assignDefinitionId, relationshipDefinitions): AccountRelationshipDefinitionApi | null =>
+            (
+                assignDefinitionId: string | null,
+                relationshipDefinitions: AccountRelationshipDefinitionApi[]
+            ): AccountRelationshipDefinitionApi | null =>
                 relationshipDefinitions.find((definition) => definition.id === assignDefinitionId) ?? null,
         ],
         // Limited to definitions in this account's timeline — any other filter value
         // would just show an empty table.
         definitionFilterOptions: [
             (s) => [s.relationships],
-            (relationships): AccountRelationshipDefinitionApi[] => {
+            (relationships: AccountRelationshipApi[] | null): AccountRelationshipDefinitionApi[] => {
                 const byId = new Map<string, AccountRelationshipDefinitionApi>()
                 for (const relationship of relationships ?? []) {
                     byId.set(relationship.definition.id, relationship.definition)
diff --git a/products/customer_analytics/frontend/components/Accounts/accountsColumnConfigLogic.ts b/products/customer_analytics/frontend/components/Accounts/accountsColumnConfigLogic.ts
index d3f96d472773..11e77e229614 100644
--- a/products/customer_analytics/frontend/components/Accounts/accountsColumnConfigLogic.ts
+++ b/products/customer_analytics/frontend/components/Accounts/accountsColumnConfigLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { objectsEqual } from 'lib/utils/objects'
@@ -20,8 +20,6 @@ import type {
 } from 'products/customer_analytics/frontend/generated/api.schemas'
 import { joinsLogic } from 'products/data_warehouse/frontend/shared/logics/joinsLogic'
 
-import type { accountsColumnConfigLogicType } from './accountsColumnConfigLogicType'
-
 // Mandatory — the backend emits it as `tuple(name, external_id, id)` so the
 // row identity (id) and copy-able external_id ride along with the display name.
 export const ACCOUNTS_NAME_COLUMN = 'name'
@@ -306,6 +304,138 @@ export function buildAccountColumnGroups(
     ]
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accountsColumnConfigLogicValues {
+    allTablesMap: Record<string, DatabaseSchemaTable> // databaseTableListLogic
+    databaseLoading: boolean // databaseTableListLogic
+    warehouseJoins: DataWarehouseViewLink[] // joinsLogic
+    warehouseJoinsLoading: boolean // joinsLogic
+    currentProjectId: number | null // projectLogic
+    currentTeamId: number | null // teamLogic
+    accountsColumnGroups: AccountColumnGroup[]
+    aliasToDefinition: Record<string, CustomPropertyDefinitionApi>
+    aliasToRelationshipDefinition: Record<string, AccountRelationshipDefinitionApi>
+    columnConfiguratorVisible: boolean
+    customPropertyDefinitions: CustomPropertyDefinitionApi[]
+    customPropertyDefinitionsLoading: boolean
+    defaultSelectColumns: string[]
+    querySelectColumns: string[]
+    relationshipDefinitions: AccountRelationshipDefinitionApi[]
+    relationshipDefinitionsLoaded: boolean
+    relationshipDefinitionsLoading: boolean
+    roleKeyToDefinition: Partial<Record<AccountRoleKey, AccountRelationshipDefinitionApi>>
+    selectColumns: string[]
+    visibleColumnNames: string[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accountsColumnConfigLogicActions {
+    loadDatabase: (
+        args_0?:
+            | {
+                  force?: boolean
+              }
+            | undefined
+    ) => {
+        force?: boolean
+    } // databaseTableListLogic
+    loadJoins: () => any // joinsLogic
+    hideColumnConfigurator: () => {
+        value: true
+    }
+    loadCustomPropertyDefinitions: () => any
+    loadCustomPropertyDefinitionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadCustomPropertyDefinitionsSuccess: (
+        customPropertyDefinitions: CustomPropertyDefinitionApi[],
+        payload?: any
+    ) => {
+        customPropertyDefinitions: CustomPropertyDefinitionApi[]
+        payload?: any
+    }
+    loadRelationshipDefinitions: () => any
+    loadRelationshipDefinitionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRelationshipDefinitionsSuccess: (
+        relationshipDefinitions: AccountRelationshipDefinitionApi[],
+        payload?: any
+    ) => {
+        relationshipDefinitions: AccountRelationshipDefinitionApi[]
+        payload?: any
+    }
+    moveColumn: (
+        oldIndex: number,
+        newIndex: number
+    ) => {
+        newIndex: number
+        oldIndex: number
+    }
+    resetColumns: () => {
+        value: true
+    }
+    selectColumn: (column: string) => {
+        column: string
+    }
+    setSelectColumns: (columns: string[]) => {
+        columns: string[]
+    }
+    showColumnConfigurator: () => {
+        value: true
+    }
+    unselectColumn: (column: string) => {
+        column: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accountsColumnConfigLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        defaultSelectColumns: (relationshipDefinitions: AccountRelationshipDefinitionApi[]) => string[]
+        roleKeyToDefinition: (
+            relationshipDefinitions: AccountRelationshipDefinitionApi[]
+        ) => Partial<Record<AccountRoleKey, AccountRelationshipDefinitionApi>>
+        querySelectColumns: (
+            selectColumns: string[],
+            roleKeyToDefinition: Partial<
+                Record<'account_executive' | 'account_owner' | 'csm', AccountRelationshipDefinitionApi>
+            >
+        ) => string[]
+        visibleColumnNames: (querySelectColumns: string[]) => string[]
+        accountsColumnGroups: (
+            allTablesMap: Record<string, DatabaseSchemaTable>,
+            warehouseJoins: DataWarehouseViewLink[],
+            customPropertyDefinitions: CustomPropertyDefinitionApi[],
+            relationshipDefinitions: AccountRelationshipDefinitionApi[]
+        ) => AccountColumnGroup[]
+        aliasToDefinition: (
+            customPropertyDefinitions: CustomPropertyDefinitionApi[]
+        ) => Record<string, CustomPropertyDefinitionApi>
+        aliasToRelationshipDefinition: (
+            relationshipDefinitions: AccountRelationshipDefinitionApi[],
+            roleKeyToDefinition: Partial<
+                Record<'account_executive' | 'account_owner' | 'csm', AccountRelationshipDefinitionApi>
+            >
+        ) => Record<string, AccountRelationshipDefinitionApi>
+    }
+}
+
+export type accountsColumnConfigLogicType = MakeLogicType<
+    accountsColumnConfigLogicValues,
+    accountsColumnConfigLogicActions,
+    Record<string, any>,
+    accountsColumnConfigLogicMeta
+>
+
 export const accountsColumnConfigLogic = kea<accountsColumnConfigLogicType>([
     path(['scenes', 'customerAnalytics', 'accounts', 'accountsColumnConfigLogic']),
     connect(() => ({
diff --git a/products/customer_analytics/frontend/components/Accounts/accountsExpansionLogic.ts b/products/customer_analytics/frontend/components/Accounts/accountsExpansionLogic.ts
index 690d7cf36e69..2cab60be2052 100644
--- a/products/customer_analytics/frontend/components/Accounts/accountsExpansionLogic.ts
+++ b/products/customer_analytics/frontend/components/Accounts/accountsExpansionLogic.ts
@@ -1,7 +1,6 @@
-import { actions, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers, selectors } from 'kea'
 import posthog from 'posthog-js'
 
-import type { accountsExpansionLogicType } from './accountsExpansionLogicType'
 import { AccountsEvents } from './constants'
 
 export type AccountExpansionTab = 'notes' | 'users' | 'relationships' | 'usage' | 'spend' | 'opportunities'
@@ -17,6 +16,52 @@ export const ACCOUNT_EXPANSION_TABS: AccountExpansionTab[] = [
 
 export const DEFAULT_ACCOUNT_TAB: AccountExpansionTab = 'notes'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accountsExpansionLogicValues {
+    activeTabByAccount: Record<string, AccountExpansionTab>
+    activeTabFor: (accountId: string) => AccountExpansionTab
+    expandedAccountIds: string[]
+    isAccountExpanded: (accountId: string) => boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accountsExpansionLogicActions {
+    openAccountTab: (
+        accountId: string,
+        tab: AccountExpansionTab
+    ) => {
+        accountId: string
+        tab: AccountExpansionTab
+    }
+    setActiveTab: (
+        accountId: string,
+        tab: AccountExpansionTab
+    ) => {
+        accountId: string
+        tab: AccountExpansionTab
+    }
+    toggleAccountExpanded: (accountId: string) => {
+        accountId: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accountsExpansionLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        isAccountExpanded: (expandedAccountIds: string[]) => (accountId: string) => boolean
+        activeTabFor: (
+            activeTabByAccount: Record<string, AccountExpansionTab>
+        ) => (accountId: string) => AccountExpansionTab
+    }
+}
+
+export type accountsExpansionLogicType = MakeLogicType<
+    accountsExpansionLogicValues,
+    accountsExpansionLogicActions,
+    Record<string, any>,
+    accountsExpansionLogicMeta
+>
+
 export const accountsExpansionLogic = kea<accountsExpansionLogicType>([
     path(['scenes', 'customerAnalytics', 'accounts', 'accountsExpansionLogic']),
     actions({
@@ -44,13 +89,13 @@ export const accountsExpansionLogic = kea<accountsExpansionLogicType>([
     selectors({
         isAccountExpanded: [
             (s) => [s.expandedAccountIds],
-            (expandedAccountIds) =>
+            (expandedAccountIds: string[]) =>
                 (accountId: string): boolean =>
                     expandedAccountIds.includes(accountId),
         ],
         activeTabFor: [
             (s) => [s.activeTabByAccount],
-            (activeTabByAccount) =>
+            (activeTabByAccount: Record<string, AccountExpansionTab>) =>
                 (accountId: string): AccountExpansionTab =>
                     activeTabByAccount[accountId] ?? DEFAULT_ACCOUNT_TAB,
         ],
diff --git a/products/customer_analytics/frontend/components/Accounts/accountsLogic.ts b/products/customer_analytics/frontend/components/Accounts/accountsLogic.ts
index e24c393dda1b..3c65048ac042 100644
--- a/products/customer_analytics/frontend/components/Accounts/accountsLogic.ts
+++ b/products/customer_analytics/frontend/components/Accounts/accountsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 import posthog from 'posthog-js'
 
@@ -20,12 +20,14 @@ import {
     accountsRelationshipsList,
 } from 'products/customer_analytics/frontend/generated/api'
 
+import type { UserType } from '../../../../../frontend/src/types'
 import {
     ACCOUNTS_HOGQL_DATA_NODE_KEY,
     ACCOUNTS_METRICS_DATA_NODE_KEY,
     CUSTOMER_ANALYTICS_DEFAULT_QUERY_TAGS,
 } from '../../constants'
 import { customerAnalyticsSceneLogic } from '../../customerAnalyticsSceneLogic'
+import type { AccountRelationshipDefinitionApi } from '../../generated/api.schemas'
 import { ACCOUNTS_NAME_COLUMN, accountsColumnConfigLogic, isLegacyRoleColumn } from './accountsColumnConfigLogic'
 import {
     ACCOUNT_EXPANSION_TABS,
@@ -33,7 +35,6 @@ import {
     accountsExpansionLogic,
     DEFAULT_ACCOUNT_TAB,
 } from './accountsExpansionLogic'
-import type { accountsLogicType } from './accountsLogicType'
 import { accountsOverviewTilesLogic, TileFilter } from './accountsOverviewTilesLogic'
 import { normalizeRoleFilter } from './accountsViewState'
 import { AccountsEvents } from './constants'
@@ -139,6 +140,220 @@ export interface AccountsViewUrlState {
     tileFilter?: TileFilter
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accountsLogicValues {
+    aliasToRelationshipDefinition: Record<string, AccountRelationshipDefinitionApi> // accountsColumnConfigLogic
+    defaultSelectColumns: string[] // accountsColumnConfigLogic
+    querySelectColumns: string[] // accountsColumnConfigLogic
+    relationshipDefinitionsLoaded: boolean // accountsColumnConfigLogic
+    selectColumns: string[] // accountsColumnConfigLogic
+    visibleColumnNames: string[] // accountsColumnConfigLogic
+    overviewMetrics: string[] // accountsOverviewTilesLogic
+    tileFilter: TileFilter | null // accountsOverviewTilesLogic
+    mineOnly: boolean // customerAnalyticsSceneLogic
+    currentTeamId: number | null // teamLogic
+    user: UserType | null // userLogic
+    accountIdFilter: string | null
+    accountsQuerySource: AccountsQuery | null
+    activeFilterCount: number
+    allRolesUnassigned: boolean
+    assignedToCurrentUser: boolean
+    assignedToFilter: RoleFilterValue
+    currentUserId: number | null
+    hogqlQuery: DataTableNode
+    isRoleSaving: (accountId: string, column: string) => boolean
+    metricsQuery: AccountsQuery | null
+    relationshipOverrides: Record<string, number[]>
+    savingRoles: Record<string, true>
+    searchInput: string
+    searchQuery: string
+    sortOrder: AccountSortOrder
+    tagsFilter: string[]
+    viewUrlState: AccountsViewUrlState
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accountsLogicActions {
+    moveColumn: (
+        oldIndex: number,
+        newIndex: number
+    ) => {
+        newIndex: number
+        oldIndex: number
+    } // accountsColumnConfigLogic
+    resetColumns: () => {
+        value: true
+    } // accountsColumnConfigLogic
+    selectColumn: (column: string) => {
+        column: string
+    } // accountsColumnConfigLogic
+    setSelectColumns: (columns: string[]) => {
+        columns: string[]
+    } // accountsColumnConfigLogic
+    unselectColumn: (column: string) => {
+        column: string
+    } // accountsColumnConfigLogic
+    openAccountTab: (
+        accountId: string,
+        tab: AccountExpansionTab
+    ) => {
+        accountId: string
+        tab: AccountExpansionTab
+    } // accountsExpansionLogic
+    setTileFilter: (filter: TileFilter | null) => {
+        filter: TileFilter | null
+    } // accountsOverviewTilesLogic
+    setMineOnly: (mineOnly: boolean) => {
+        mineOnly: boolean
+    } // customerAnalyticsSceneLogic
+    ensureAllMembersLoaded: () => {
+        value: true
+    } // membersLogic
+    loadUserSuccess: (
+        user: UserType | null,
+        payload?:
+            | {
+                  resetOnFailure: boolean | undefined
+              }
+            | undefined
+    ) => {
+        payload?: {
+            resetOnFailure: boolean | undefined
+        }
+        user: UserType | null
+    } // userLogic
+    openAccount: (
+        accountId: string,
+        externalId: string | null,
+        name: string,
+        tab: AccountExpansionTab
+    ) => {
+        accountId: string
+        externalId: string | null
+        name: string
+        tab: AccountExpansionTab
+    }
+    refresh: () => {
+        value: true
+    }
+    reportFilterChange: (filterType: AccountFilterType) => {
+        filterType: AccountFilterType
+    }
+    roleUpdateFinished: (
+        accountId: string,
+        column: string
+    ) => {
+        accountId: string
+        column: string
+    }
+    roleUpdateStarted: (
+        accountId: string,
+        column: string
+    ) => {
+        accountId: string
+        column: string
+    }
+    setAccountIdFilter: (accountId: string | null) => {
+        accountId: string | null
+    }
+    setAllRolesUnassigned: (value: boolean) => {
+        value: boolean
+    }
+    setAssignedToCurrentUser: (value: boolean) => {
+        value: boolean
+    }
+    setAssignedToFilter: (value: RoleFilterValue) => {
+        value: RoleFilterValue
+    }
+    setRelationshipOverride: (
+        accountId: string,
+        column: string,
+        userIds: number[]
+    ) => {
+        accountId: string
+        column: string
+        userIds: number[]
+    }
+    setSearchInput: (query: string) => {
+        query: string
+    }
+    setSearchQuery: (query: string) => {
+        query: string
+    }
+    setSortOrder: (sortOrder: AccountSortOrder) => {
+        sortOrder: AccountSortOrder
+    }
+    setTagsFilter: (tags: string[]) => {
+        tags: string[]
+    }
+    toggleSort: (column: AccountSortableColumn) => {
+        column: string
+    }
+    updateAccountRole: (
+        accountId: string,
+        column: string,
+        user: UserBasicType | null
+    ) => {
+        accountId: string
+        column: string
+        user: UserBasicType | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accountsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        currentUserId: (user: UserType | null) => number | null
+        assignedToCurrentUser: (assignedToFilter: RoleFilterValue, currentUserId: number | null) => boolean
+        isRoleSaving: (savingRoles: Record<string, true>) => (accountId: string, column: string) => boolean
+        activeFilterCount: (
+            searchQuery: string,
+            tagsFilter: string[],
+            allRolesUnassigned: boolean,
+            assignedToFilter: RoleFilterValue
+        ) => number
+        viewUrlState: (
+            searchQuery: string,
+            tagsFilter: string[],
+            allRolesUnassigned: boolean,
+            assignedToFilter: RoleFilterValue,
+            sortOrder: AccountSortOrder,
+            selectColumns: string[],
+            defaultSelectColumns: string[],
+            tileFilter: TileFilter | null
+        ) => AccountsViewUrlState
+        hogqlQuery: (
+            searchQuery: string,
+            tagsFilter: string[],
+            allRolesUnassigned: boolean,
+            assignedToFilter: RoleFilterValue,
+            accountIdFilter: string | null,
+            tileFilter: TileFilter | null,
+            sortOrder: AccountSortOrder,
+            querySelectColumns: string[],
+            visibleColumnNames: string[]
+        ) => DataTableNode
+        accountsQuerySource: (hogqlQuery: DataTableNode, relationshipDefinitionsLoaded: boolean) => AccountsQuery | null
+        metricsQuery: (
+            overviewMetrics: string[],
+            searchQuery: string,
+            tagsFilter: string[],
+            allRolesUnassigned: boolean,
+            assignedToFilter: RoleFilterValue,
+            accountIdFilter: string | null,
+            tileFilter: TileFilter | null,
+            relationshipDefinitionsLoaded: boolean
+        ) => AccountsQuery | null
+    }
+}
+
+export type accountsLogicType = MakeLogicType<
+    accountsLogicValues,
+    accountsLogicActions,
+    Record<string, any>,
+    accountsLogicMeta
+>
+
 export const accountsLogic = kea<accountsLogicType>([
     path(['scenes', 'customerAnalytics', 'accounts', 'accountsLogic']),
     connect(() => ({
@@ -285,7 +500,7 @@ export const accountsLogic = kea<accountsLogicType>([
         ],
     }),
     selectors({
-        currentUserId: [(s) => [s.user], (user): number | null => user?.id ?? null],
+        currentUserId: [(s) => [s.user], (user: null | import('~/types').UserType): number | null => user?.id ?? null],
         // The "My accounts" checkbox is checked exactly when the assigned-to
         // filter is just the current user — i.e. the user-agnostic id filter
         // happens to point at you.
diff --git a/products/customer_analytics/frontend/components/Accounts/accountsOverviewTilesLogic.ts b/products/customer_analytics/frontend/components/Accounts/accountsOverviewTilesLogic.ts
index d68a8e073367..4369ca9495b8 100644
--- a/products/customer_analytics/frontend/components/Accounts/accountsOverviewTilesLogic.ts
+++ b/products/customer_analytics/frontend/components/Accounts/accountsOverviewTilesLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import posthog from 'posthog-js'
 import { v4 as uuidv4 } from 'uuid'
 
@@ -9,10 +9,23 @@ import { AccountsQueryResponse, DataNode } from '~/queries/schema/schema-general
 
 import type { CustomPropertyDisplayTypeEnumApi } from 'products/customer_analytics/frontend/generated/api.schemas'
 
+import type {
+    ErrorTrackingQueryResponse,
+    HogQLAutocompleteResponse,
+    HogQLMetadataResponse,
+    HogQLQueryResponse,
+    HogQueryResponse,
+    LogAttributesQueryResponse,
+    LogValuesQueryResponse,
+    MetricsQueryResponse,
+    SessionsQueryResponse,
+    TraceSpansAggregationQueryResponse,
+    TraceSpansAttributeBreakdownQueryResponse,
+    TraceSpansQueryResponse,
+} from '../../../../../frontend/src/queries/schema/schema-general'
 import { ACCOUNTS_METRICS_DATA_NODE_KEY } from '../../constants'
 import { isNumericDisplayType } from '../../scenes/CustomerAnalyticsConfigurationScene/account/customPropertyTypes'
 import { AccountColumnGroup, AccountColumnOption, accountsColumnConfigLogic } from './accountsColumnConfigLogic'
-import type { accountsOverviewTilesLogicType } from './accountsOverviewTilesLogicType'
 import {
     ACCOUNTS_OVERVIEW_LEGACY_TILES_PREFIX,
     AccountsEvents,
@@ -187,6 +200,125 @@ function readLegacyOverviewTiles(): AccountsOverviewTile[] | null {
     return null
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accountsOverviewTilesLogicValues {
+    accountsColumnGroups: AccountColumnGroup[] // accountsColumnConfigLogic
+    accountsResponse:
+        | ErrorTrackingQueryResponse
+        | HogQLAutocompleteResponse
+        | HogQLMetadataResponse
+        | HogQLQueryResponse<any[]>
+        | HogQueryResponse
+        | LogAttributesQueryResponse
+        | LogValuesQueryResponse
+        | MetricsQueryResponse
+        | Record<string, any>
+        | SessionsQueryResponse
+        | TraceSpansAggregationQueryResponse
+        | TraceSpansAttributeBreakdownQueryResponse
+        | TraceSpansQueryResponse
+        | null // dataNodeLogic
+    accountsResponseLoading: boolean // dataNodeLogic
+    editorVisible: boolean
+    metrics: string[]
+    numericColumnExpressions: Set<string>
+    numericColumns: AccountColumnOption[]
+    reconciledTiles: AccountsOverviewTile[]
+    selectedTileId: string | null
+    tileFilter: TileFilter | null
+    tileValues: Record<string, number | null>
+    tiles: AccountsOverviewTile[]
+    tilesLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accountsOverviewTilesLogicActions {
+    addTile: (
+        tile: Omit<AccountsOverviewTile, 'id'> & {
+            id?: string
+        }
+    ) => {
+        tile: Omit<AccountsOverviewTile, 'id'> & {
+            id?: string | undefined
+        }
+    }
+    hideEditor: () => {
+        value: true
+    }
+    moveTile: (
+        oldIndex: number,
+        newIndex: number
+    ) => {
+        newIndex: number
+        oldIndex: number
+    }
+    removeTile: (id: string) => {
+        id: string
+    }
+    resetTiles: () => {
+        value: true
+    }
+    setTileFilter: (filter: TileFilter | null) => {
+        filter: TileFilter | null
+    }
+    setTiles: (tiles: AccountsOverviewTile[]) => {
+        tiles: AccountsOverviewTile[]
+    }
+    showEditor: () => {
+        value: true
+    }
+    toggleTileSelection: (tile: AccountsOverviewTile) => {
+        tile: AccountsOverviewTile
+    }
+    updateTile: (
+        id: string,
+        tile: Omit<AccountsOverviewTile, 'id'>
+    ) => {
+        id: string
+        tile: Omit<AccountsOverviewTile, 'id'>
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accountsOverviewTilesLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        numericColumns: (accountsColumnGroups: AccountColumnGroup[]) => AccountColumnOption[]
+        numericColumnExpressions: (numericColumns: AccountColumnOption[]) => Set<string>
+        reconciledTiles: (
+            tiles: AccountsOverviewTile[],
+            numericColumnExpressions: Set<string>
+        ) => AccountsOverviewTile[]
+        metrics: (reconciledTiles: AccountsOverviewTile[]) => string[]
+        tileValues: (
+            accountsResponse:
+                | ErrorTrackingQueryResponse
+                | HogQLAutocompleteResponse
+                | HogQLMetadataResponse
+                | HogQLQueryResponse<any[]>
+                | HogQueryResponse
+                | LogAttributesQueryResponse
+                | LogValuesQueryResponse
+                | MetricsQueryResponse
+                | Record<string, any>
+                | SessionsQueryResponse
+                | TraceSpansAggregationQueryResponse
+                | TraceSpansAttributeBreakdownQueryResponse
+                | TraceSpansQueryResponse
+                | null,
+            reconciledTiles: AccountsOverviewTile[]
+        ) => Record<string, number | null>
+        tilesLoading: (accountsResponseLoading: boolean) => boolean
+        selectedTileId: (tileFilter: TileFilter | null) => string | null
+    }
+}
+
+export type accountsOverviewTilesLogicType = MakeLogicType<
+    accountsOverviewTilesLogicValues,
+    accountsOverviewTilesLogicActions,
+    Record<string, any>,
+    accountsOverviewTilesLogicMeta
+>
+
 export const accountsOverviewTilesLogic = kea<accountsOverviewTilesLogicType>([
     path(['scenes', 'customerAnalytics', 'accounts', 'accountsOverviewTilesLogic']),
     connect(() => ({
diff --git a/products/customer_analytics/frontend/components/Accounts/accountsViewsLogic.ts b/products/customer_analytics/frontend/components/Accounts/accountsViewsLogic.ts
index 88c01adb1137..e59e60e02a05 100644
--- a/products/customer_analytics/frontend/components/Accounts/accountsViewsLogic.ts
+++ b/products/customer_analytics/frontend/components/Accounts/accountsViewsLogic.ts
@@ -1,5 +1,6 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 import posthog from 'posthog-js'
@@ -13,10 +14,12 @@ import { userLogic } from 'scenes/userLogic'
 
 import { ColumnConfigurationApi } from 'products/product_analytics/frontend/generated/api.schemas'
 
+import type { UserType } from '../../../../../frontend/src/types'
 import { ACCOUNTS_COLUMN_CONFIG_KEY, accountsColumnConfigLogic } from './accountsColumnConfigLogic'
 import { accountsLogic } from './accountsLogic'
+import type { AccountSortOrder, RoleFilterValue } from './accountsLogic'
 import { accountsOverviewTilesLogic } from './accountsOverviewTilesLogic'
-import type { accountsViewsLogicType } from './accountsViewsLogicType'
+import type { AccountsOverviewTile, TileFilter } from './accountsOverviewTilesLogic'
 import {
     AccountsViewProperties,
     AccountsViewState,
@@ -27,6 +30,336 @@ import { AccountsEvents, DEFAULT_TILES } from './constants'
 
 export type ViewVisibility = 'private' | 'shared'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accountsViewsLogicValues {
+    selectColumns: string[] // accountsColumnConfigLogic
+    allRolesUnassigned: boolean // accountsLogic
+    assignedToFilter: RoleFilterValue // accountsLogic
+    searchQuery: string // accountsLogic
+    sortOrder: AccountSortOrder // accountsLogic
+    tagsFilter: string[] // accountsLogic
+    tileFilter: TileFilter | null // accountsOverviewTilesLogic
+    tiles: AccountsOverviewTile[] // accountsOverviewTilesLogic
+    currentTeamId: number | null // teamLogic
+    user: UserType | null // userLogic
+    canEditCurrentView: boolean
+    currentView: ColumnConfigurationApi | null
+    currentViewId: string | null
+    isCreating: boolean
+    isDirty: boolean
+    isNewViewFormSubmitting: boolean
+    isNewViewFormValid: boolean
+    isRenameViewFormSubmitting: boolean
+    isRenameViewFormValid: boolean
+    liveViewState: AccountsViewState
+    newViewForm: {
+        name: string
+        visibility: ViewVisibility
+    }
+    newViewFormAllErrors: Record<string, any>
+    newViewFormChanged: boolean
+    newViewFormErrors: DeepPartialMap<
+        {
+            name: string
+            visibility: ViewVisibility
+        },
+        ValidationErrorType
+    >
+    newViewFormHasErrors: boolean
+    newViewFormManualErrors: Record<string, any>
+    newViewFormTouched: boolean
+    newViewFormTouches: Record<string, boolean>
+    newViewFormValidationErrors: DeepPartialMap<
+        {
+            name: string
+            visibility: ViewVisibility
+        },
+        ValidationErrorType
+    >
+    renameViewForm: {
+        name: string
+    }
+    renameViewFormAllErrors: Record<string, any>
+    renameViewFormChanged: boolean
+    renameViewFormErrors: DeepPartialMap<
+        {
+            name: string
+        },
+        ValidationErrorType
+    >
+    renameViewFormHasErrors: boolean
+    renameViewFormManualErrors: Record<string, any>
+    renameViewFormTouched: boolean
+    renameViewFormTouches: Record<string, boolean>
+    renameViewFormValidationErrors: DeepPartialMap<
+        {
+            name: string
+        },
+        ValidationErrorType
+    >
+    showNewViewFormErrors: boolean
+    showRenameViewFormErrors: boolean
+    viewToDelete: string | null
+    viewToRename: string | null
+    views: ColumnConfigurationApi[]
+    viewsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accountsViewsLogicActions {
+    setSelectColumns: (columns: string[]) => {
+        columns: string[]
+    } // accountsColumnConfigLogic
+    setAllRolesUnassigned: (value: boolean) => {
+        value: boolean
+    } // accountsLogic
+    setAssignedToFilter: (value: RoleFilterValue) => {
+        value: RoleFilterValue
+    } // accountsLogic
+    setSearchQuery: (query: string) => {
+        query: string
+    } // accountsLogic
+    setSortOrder: (sortOrder: AccountSortOrder) => {
+        sortOrder: AccountSortOrder
+    } // accountsLogic
+    setTagsFilter: (tags: string[]) => {
+        tags: string[]
+    } // accountsLogic
+    setTileFilter: (filter: TileFilter | null) => {
+        filter: TileFilter | null
+    } // accountsOverviewTilesLogic
+    setTiles: (tiles: AccountsOverviewTile[]) => {
+        tiles: AccountsOverviewTile[]
+    } // accountsOverviewTilesLogic
+    applyView: (view: ColumnConfigurationApi) => {
+        view: ColumnConfigurationApi
+    }
+    deleteView: ({ id }: { id: string }) => {
+        id: string
+    }
+    deleteViewFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteViewSuccess: (
+        views: ColumnConfigurationApi[],
+        payload?: {
+            id: string
+        }
+    ) => {
+        views: ColumnConfigurationApi[]
+        payload?: {
+            id: string
+        }
+    }
+    loadViews: () => any
+    loadViewsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadViewsSuccess: (
+        views: ColumnConfigurationApi[],
+        payload?: any
+    ) => {
+        views: ColumnConfigurationApi[]
+        payload?: any
+    }
+    patchViewProperties: ({ id, properties }: { id: string; properties: AccountsViewProperties }) => {
+        id: string
+        properties: AccountsViewProperties
+    }
+    patchViewPropertiesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    patchViewPropertiesSuccess: (
+        views: ColumnConfigurationApi[],
+        payload?: {
+            id: string
+            properties: AccountsViewProperties
+        }
+    ) => {
+        views: ColumnConfigurationApi[]
+        payload?: {
+            id: string
+            properties: AccountsViewProperties
+        }
+    }
+    resetNewViewForm: (values?: { name: string; visibility: ViewVisibility }) => {
+        values?: {
+            name: string
+            visibility: ViewVisibility
+        }
+    }
+    resetRenameViewForm: (values?: { name: string }) => {
+        values?: {
+            name: string
+        }
+    }
+    selectView: (id: string) => {
+        id: string
+    }
+    setCurrentViewId: (id: string | null) => {
+        id: string | null
+    }
+    setIsCreating: (isCreating: boolean) => {
+        isCreating: boolean
+    }
+    setNewViewFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setNewViewFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setNewViewFormValues: (
+        values: DeepPartial<{
+            name: string
+            visibility: ViewVisibility
+        }>
+    ) => {
+        values: DeepPartial<{
+            name: string
+            visibility: ViewVisibility
+        }>
+    }
+    setRenameViewFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setRenameViewFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setRenameViewFormValues: (
+        values: DeepPartial<{
+            name: string
+        }>
+    ) => {
+        values: DeepPartial<{
+            name: string
+        }>
+    }
+    setViewToDelete: (id: string | null) => {
+        id: string | null
+    }
+    setViewToRename: (id: string | null) => {
+        id: string | null
+    }
+    submitNewViewForm: () => {
+        value: boolean
+    }
+    submitNewViewFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitNewViewFormRequest: (newViewForm: { name: string; visibility: ViewVisibility }) => {
+        newViewForm: {
+            name: string
+            visibility: ViewVisibility
+        }
+    }
+    submitNewViewFormSuccess: (newViewForm: { name: string; visibility: ViewVisibility }) => {
+        newViewForm: {
+            name: string
+            visibility: ViewVisibility
+        }
+    }
+    submitRenameViewForm: () => {
+        value: boolean
+    }
+    submitRenameViewFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitRenameViewFormRequest: (renameViewForm: { name: string }) => {
+        renameViewForm: {
+            name: string
+        }
+    }
+    submitRenameViewFormSuccess: (renameViewForm: { name: string }) => {
+        renameViewForm: {
+            name: string
+        }
+    }
+    touchNewViewFormField: (key: string) => {
+        key: string
+    }
+    touchRenameViewFormField: (key: string) => {
+        key: string
+    }
+    updateView: ({ id, updates }: { id: string; updates: Partial<ColumnConfigurationApi> }) => {
+        id: string
+        updates: Partial<ColumnConfigurationApi>
+    }
+    updateViewFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateViewSuccess: (
+        views: ColumnConfigurationApi[],
+        payload?: {
+            id: string
+            updates: Partial<ColumnConfigurationApi>
+        }
+    ) => {
+        views: ColumnConfigurationApi[]
+        payload?: {
+            id: string
+            updates: Partial<ColumnConfigurationApi>
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface accountsViewsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        liveViewState: (
+            selectColumns: string[],
+            searchQuery: string,
+            tagsFilter: string[],
+            allRolesUnassigned: boolean,
+            assignedToFilter: RoleFilterValue,
+            sortOrder: AccountSortOrder,
+            tileFilter: TileFilter | null,
+            tiles: AccountsOverviewTile[]
+        ) => AccountsViewState
+        currentView: (views: ColumnConfigurationApi[], currentViewId: string | null) => ColumnConfigurationApi | null
+        isDirty: (currentView: ColumnConfigurationApi | null, liveViewState: AccountsViewState) => boolean
+        canEditCurrentView: (currentView: ColumnConfigurationApi | null, user: UserType | null) => boolean
+    }
+}
+
+export type accountsViewsLogicType = MakeLogicType<
+    accountsViewsLogicValues,
+    accountsViewsLogicActions,
+    Record<string, any>,
+    accountsViewsLogicMeta
+>
+
 export const accountsViewsLogic = kea<accountsViewsLogicType>([
     path(['scenes', 'customerAnalytics', 'accounts', 'accountsViewsLogic']),
     connect(() => ({
@@ -142,14 +475,14 @@ export const accountsViewsLogic = kea<accountsViewsLogicType>([
                 s.tiles,
             ],
             (
-                selectColumns,
-                searchQuery,
-                tagsFilter,
-                allRolesUnassigned,
-                assignedToFilter,
-                sortOrder,
-                tileFilter,
-                tiles
+                selectColumns: string[],
+                searchQuery: string,
+                tagsFilter: string[],
+                allRolesUnassigned: boolean,
+                assignedToFilter: import('./accountsLogic').RoleFilterValue,
+                sortOrder: import('./accountsLogic').AccountSortOrder,
+                tileFilter: null | import('./accountsOverviewTilesLogic').TileFilter,
+                tiles: import('./accountsOverviewTilesLogic').AccountsOverviewTile[]
             ): AccountsViewState => ({
                 columns: selectColumns,
                 sortOrder,
@@ -165,12 +498,12 @@ export const accountsViewsLogic = kea<accountsViewsLogicType>([
         ],
         currentView: [
             (s) => [s.views, s.currentViewId],
-            (views, currentViewId): ColumnConfigurationApi | null =>
+            (views: ColumnConfigurationApi[], currentViewId: string | null): ColumnConfigurationApi | null =>
                 views.find((view) => view.id === currentViewId) ?? null,
         ],
         isDirty: [
             (s) => [s.currentView, s.liveViewState],
-            (currentView, liveViewState): boolean =>
+            (currentView: ColumnConfigurationApi | null, liveViewState: AccountsViewState): boolean =>
                 currentView
                     ? !objectsEqual(
                           serializeAccountsView(deserializeAccountsView(currentView)),
@@ -180,7 +513,8 @@ export const accountsViewsLogic = kea<accountsViewsLogicType>([
         ],
         canEditCurrentView: [
             (s) => [s.currentView, s.user],
-            (currentView, user): boolean => !!currentView && !!user && currentView.created_by === user.id,
+            (currentView: ColumnConfigurationApi | null, user: null | import('~/types').UserType): boolean =>
+                !!currentView && !!user && currentView.created_by === user.id,
         ],
     }),
     forms(({ actions, values }) => ({
diff --git a/products/customer_analytics/frontend/components/CustomerJourneys/customerJourneysLogic.ts b/products/customer_analytics/frontend/components/CustomerJourneys/customerJourneysLogic.ts
index b9e6a17a2215..65a1042668d3 100644
--- a/products/customer_analytics/frontend/components/CustomerJourneys/customerJourneysLogic.ts
+++ b/products/customer_analytics/frontend/components/CustomerJourneys/customerJourneysLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { lazyLoaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
@@ -15,7 +15,7 @@ import { FunnelVizType, PropertyFilterType, PropertyOperator, QueryBasedInsightM
 
 import { CustomerJourneyApi } from 'products/customer_analytics/frontend/generated/api.schemas'
 
-import type { customerJourneysLogicType } from './customerJourneysLogicType'
+import type { Node } from '../../../../../frontend/src/queries/schema/schema-general'
 
 export interface CustomerJourneysLogicProps {
     key?: string
@@ -24,6 +24,172 @@ export interface CustomerJourneysLogicProps {
     groupTypeIndex?: number
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface customerJourneysLogicValues {
+    activeInsight: QueryBasedInsightModel | null
+    activeInsightLoading: boolean
+    activeJourney: CustomerJourneyApi | null
+    activeJourneyFullQuery: InsightVizNode<FunnelsQuery> | null
+    activeJourneyId: string | null
+    filteredQuery: InsightVizNode<FunnelsQuery> | null
+    isProfileMode: boolean
+    journeyOptions: LemonSelectOptions<string>
+    journeys: CustomerJourneyApi[]
+    journeysLoading: boolean
+    queryOverride: InsightVizNode<FunnelsQuery> | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface customerJourneysLogicActions {
+    reportCustomerJourneyViewed: (
+        journeyId: string,
+        journeyName: string,
+        stepCount: number,
+        delay?: number | undefined
+    ) => {
+        delay: number | undefined
+        journeyId: string
+        journeyName: string
+        stepCount: number
+    } // eventUsageLogic
+    addJourney: ({ insightId, name, description }: { description?: string; insightId: number; name: string }) => {
+        insightId: number
+        name: string
+        description?: string
+    }
+    addJourneyFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    addJourneySuccess: (
+        journeys: CustomerJourneyApi[],
+        payload?: {
+            insightId: number
+            name: string
+            description?: string
+        }
+    ) => {
+        journeys: CustomerJourneyApi[]
+        payload?: {
+            insightId: number
+            name: string
+            description?: string
+        }
+    }
+    deleteJourney: (journeyId: string) => string
+    deleteJourneyFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteJourneySuccess: (
+        journeys: CustomerJourneyApi[],
+        payload?: string
+    ) => {
+        journeys: CustomerJourneyApi[]
+        payload?: string
+    }
+    loadActiveInsight: () => any
+    loadActiveInsightFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadActiveInsightSuccess: (
+        activeInsight: QueryBasedInsightModel<Node<Record<string, any>>> | null,
+        payload?: any
+    ) => {
+        activeInsight: QueryBasedInsightModel<Node<Record<string, any>>> | null
+        payload?: any
+    }
+    loadJourneys: () => any
+    loadJourneysFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadJourneysSuccess: (
+        journeys: CustomerJourneyApi[],
+        payload?: any
+    ) => {
+        journeys: CustomerJourneyApi[]
+        payload?: any
+    }
+    selectFirstJourneyIfNeeded: (journeys: CustomerJourneyApi[]) => {
+        journeys: CustomerJourneyApi[]
+    }
+    setActiveJourneyId: (journeyId: string | null) => {
+        journeyId: string | null
+    }
+    setQueryOverride: (query: InsightVizNode<FunnelsQuery>) => {
+        query: InsightVizNode<FunnelsQuery>
+    }
+    updateJourney: ({ journeyId, name, description }: { description?: string; journeyId: string; name: string }) => {
+        journeyId: string
+        name: string
+        description?: string
+    }
+    updateJourneyFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateJourneySuccess: (
+        journeys: CustomerJourneyApi[],
+        payload?: {
+            journeyId: string
+            name: string
+            description?: string
+        }
+    ) => {
+        journeys: CustomerJourneyApi[]
+        payload?: {
+            journeyId: string
+            name: string
+            description?: string
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface customerJourneysLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        journeyOptions: (journeys: CustomerJourneyApi[]) => LemonSelectOptions<string>
+        activeJourney: (journeys: CustomerJourneyApi[], activeJourneyId: string | null) => CustomerJourneyApi | null
+        activeJourneyFullQuery: (
+            activeInsight: QueryBasedInsightModel<Node<Record<string, any>>> | null,
+            queryOverride: InsightVizNode<FunnelsQuery> | null
+        ) => InsightVizNode<FunnelsQuery> | null
+        isProfileMode: (arg: any, arg2: any) => boolean
+        filteredQuery: (
+            activeJourneyFullQuery: InsightVizNode<FunnelsQuery> | null,
+            isProfileMode: boolean,
+            arg: any,
+            arg2: any,
+            arg3: any
+        ) => InsightVizNode<FunnelsQuery> | null
+    }
+}
+
+export type customerJourneysLogicType = MakeLogicType<
+    customerJourneysLogicValues,
+    customerJourneysLogicActions,
+    CustomerJourneysLogicProps,
+    customerJourneysLogicMeta
+>
+
 export const customerJourneysLogic = kea<customerJourneysLogicType>([
     path(['products', 'customer_analytics', 'frontend', 'components', 'CustomerJourneys', 'customerJourneysLogic']),
     props({} as CustomerJourneysLogicProps),
@@ -156,7 +322,7 @@ export const customerJourneysLogic = kea<customerJourneysLogicType>([
     selectors({
         journeyOptions: [
             (s) => [s.journeys],
-            (journeys): LemonSelectOptions<string> =>
+            (journeys: CustomerJourneyApi[]): LemonSelectOptions<string> =>
                 journeys.map((journey) => ({
                     value: journey.id,
                     label: journey.name,
@@ -164,7 +330,7 @@ export const customerJourneysLogic = kea<customerJourneysLogicType>([
         ],
         activeJourney: [
             (s) => [s.journeys, s.activeJourneyId],
-            (journeys, activeId): CustomerJourneyApi | null => {
+            (journeys: CustomerJourneyApi[], activeId: string | null): CustomerJourneyApi | null => {
                 if (!activeId) {
                     return null
                 }
@@ -173,7 +339,10 @@ export const customerJourneysLogic = kea<customerJourneysLogicType>([
         ],
         activeJourneyFullQuery: [
             (s) => [s.activeInsight, s.queryOverride],
-            (activeInsight, queryOverride): InsightVizNode<FunnelsQuery> | null => {
+            (
+                activeInsight: QueryBasedInsightModel | null,
+                queryOverride: InsightVizNode<FunnelsQuery> | null
+            ): InsightVizNode<FunnelsQuery> | null => {
                 if (queryOverride) {
                     return queryOverride
                 }
@@ -207,7 +376,13 @@ export const customerJourneysLogic = kea<customerJourneysLogicType>([
                 (_, p) => p.groupKey,
                 (_, p) => p.groupTypeIndex,
             ],
-            (query, isProfileMode, personId, groupKey, groupTypeIndex): InsightVizNode<FunnelsQuery> | null => {
+            (
+                query: InsightVizNode<FunnelsQuery> | null,
+                isProfileMode: boolean,
+                personId,
+                groupKey,
+                groupTypeIndex
+            ): InsightVizNode<FunnelsQuery> | null => {
                 if (!query || !isProfileMode) {
                     return query
                 }
diff --git a/products/customer_analytics/frontend/components/CustomerJourneys/journeyBuilderLogic.ts b/products/customer_analytics/frontend/components/CustomerJourneys/journeyBuilderLogic.ts
index 2e3934f357af..99610f84d1ca 100644
--- a/products/customer_analytics/frontend/components/CustomerJourneys/journeyBuilderLogic.ts
+++ b/products/customer_analytics/frontend/components/CustomerJourneys/journeyBuilderLogic.ts
@@ -1,4 +1,15 @@
-import { actions, afterMount, connect, isBreakpoint, kea, listeners, path, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    afterMount,
+    connect,
+    isBreakpoint,
+    kea,
+    listeners,
+    path,
+    reducers,
+    selectors,
+} from 'kea'
 import { router, urlToAction } from 'kea-router'
 import posthog from 'posthog-js'
 
@@ -35,9 +46,10 @@ import {
     StepOrderValue,
 } from '~/types'
 
+import type { Node } from '../../../../../frontend/src/queries/schema/schema-general'
 import { customerAnalyticsConfigLogic } from '../../customerAnalyticsConfigLogic'
+import type { CustomerJourneyApi } from '../../generated/api.schemas'
 import { customerJourneysLogic } from './customerJourneysLogic'
-import type { journeyBuilderLogicType } from './journeyBuilderLogicType'
 
 const JOURNEY_NAME_MAX_LENGTH = 64
 const INSIGHT_NAME_PREFIX = 'Journey: '
@@ -133,6 +145,202 @@ function createDefaultQuery(): InsightVizNode<FunnelsQuery> {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface journeyBuilderLogicValues {
+    paymentEvent: AnyEntityNode // customerAnalyticsConfigLogic
+    signupEvent: AnyEntityNode // customerAnalyticsConfigLogic
+    signupPageviewEvent: AnyEntityNode // customerAnalyticsConfigLogic
+    breadcrumbs: Breadcrumb[]
+    creationSource: string | null
+    editingInsightId: number | null
+    editingJourneyId: string | null
+    isEditMode: boolean
+    isSaving: boolean
+    journeyDescription: string
+    journeyName: string
+    query: InsightVizNode<FunnelsQuery>
+    series: AnyEntityNode[]
+    stepCount: number
+    taxonomicGroupTypes: TaxonomicFilterGroupType[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface journeyBuilderLogicActions {
+    addJourney: (args_0: { description?: string; insightId: number; name: string }) => {
+        description?: string
+        insightId: number
+        name: string
+    } // customerJourneysLogic
+    addJourneyFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    } // customerJourneysLogic
+    addJourneySuccess: (
+        journeys: CustomerJourneyApi[],
+        payload?:
+            | {
+                  description?: string
+                  insightId: number
+                  name: string
+              }
+            | undefined
+    ) => {
+        journeys: CustomerJourneyApi[]
+        payload?: {
+            description?: string
+            insightId: number
+            name: string
+        }
+    } // customerJourneysLogic
+    updateJourney: (args_0: { description?: string; journeyId: string; name: string }) => {
+        description?: string
+        journeyId: string
+        name: string
+    } // customerJourneysLogic
+    updateJourneyFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    } // customerJourneysLogic
+    updateJourneySuccess: (
+        journeys: CustomerJourneyApi[],
+        payload?:
+            | {
+                  description?: string
+                  journeyId: string
+                  name: string
+              }
+            | undefined
+    ) => {
+        journeys: CustomerJourneyApi[]
+        payload?: {
+            description?: string
+            journeyId: string
+            name: string
+        }
+    } // customerJourneysLogic
+    reportCustomerJourneyBuilderStepAdded: (
+        stepIndex: number,
+        stepCount: number
+    ) => {
+        stepCount: number
+        stepIndex: number
+    } // eventUsageLogic
+    reportCustomerJourneyBuilderStepRemoved: (
+        stepIndex: number,
+        stepCount: number
+    ) => {
+        stepCount: number
+        stepIndex: number
+    } // eventUsageLogic
+    reportCustomerJourneyCreated: (
+        journeyName: string,
+        stepCount: number,
+        creationSource: string | null
+    ) => {
+        creationSource: string | null
+        journeyName: string
+        stepCount: number
+    } // eventUsageLogic
+    reportCustomerJourneyUpdated: (
+        journeyId: string,
+        journeyName: string,
+        stepCount: number
+    ) => {
+        journeyId: string
+        journeyName: string
+        stepCount: number
+    } // eventUsageLogic
+    collapsePath: () => {
+        value: true
+    } // funnelPathsExpansionLogic
+    setInsightQuery: (query: Node<Record<string, any>> | null) => {
+        query: Node<Record<string, any>> | null
+    } // insightDataLogic
+    addStep: (insertAtIndex: number) => {
+        insertAtIndex: number
+    }
+    addStepFromPath: (
+        eventName: string,
+        expansion: PathExpansion,
+        funnelStepCount: number
+    ) => {
+        eventName: string
+        expansion: PathExpansion
+        funnelStepCount: number
+    }
+    applyTemplate: (templateKey: string) => {
+        templateKey: string
+    }
+    loadFromInsight: (insightId: number) => {
+        insightId: number
+    }
+    removeStep: (stepIndex: number) => {
+        stepIndex: number
+    }
+    resetBuilder: () => {
+        value: true
+    }
+    saveJourney: () => {
+        value: true
+    }
+    saveJourneyFailure: (error: string) => {
+        error: string
+    }
+    setEditingJourney: (
+        journeyId: string,
+        insightId: number
+    ) => {
+        insightId: number
+        journeyId: string
+    }
+    setJourneyDescription: (description: string) => {
+        description: string
+    }
+    setJourneyName: (name: string) => {
+        name: string
+    }
+    setQuery: (query: InsightVizNode<FunnelsQuery>) => {
+        query: InsightVizNode<FunnelsQuery>
+    }
+    setQueryFromViz: (query: InsightVizNode<FunnelsQuery>) => {
+        query: InsightVizNode<FunnelsQuery>
+    }
+    updateStepEvent: (
+        stepIndex: number,
+        value: string | null,
+        groupType: TaxonomicFilterGroupType,
+        item: Record<string, any>
+    ) => {
+        groupType: TaxonomicFilterGroupType
+        item: Record<string, any>
+        stepIndex: number
+        value: string | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface journeyBuilderLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        isEditMode: (editingJourneyId: string | null) => boolean
+        breadcrumbs: (isEditMode: boolean, journeyName: string) => Breadcrumb[]
+        stepCount: (query: InsightVizNode<FunnelsQuery>) => number
+        series: (query: InsightVizNode<FunnelsQuery>) => AnyEntityNode[]
+    }
+}
+
+export type journeyBuilderLogicType = MakeLogicType<
+    journeyBuilderLogicValues,
+    journeyBuilderLogicActions,
+    Record<string, any>,
+    journeyBuilderLogicMeta
+>
+
 export const journeyBuilderLogic = kea<journeyBuilderLogicType>([
     path(['products', 'customer_analytics', 'frontend', 'components', 'CustomerJourneys', 'journeyBuilderLogic']),
 
@@ -253,10 +461,10 @@ export const journeyBuilderLogic = kea<journeyBuilderLogicType>([
     }),
 
     selectors({
-        isEditMode: [(s) => [s.editingJourneyId], (id): boolean => !!id],
+        isEditMode: [(s) => [s.editingJourneyId], (id: string | null): boolean => !!id],
         breadcrumbs: [
             (s) => [s.isEditMode, s.journeyName],
-            (isEditMode, journeyName): Breadcrumb[] => [
+            (isEditMode: boolean, journeyName: string): Breadcrumb[] => [
                 {
                     key: Scene.CustomerAnalytics,
                     name: 'Customer analytics',
@@ -288,8 +496,11 @@ export const journeyBuilderLogic = kea<journeyBuilderLogicType>([
                       ]),
             ],
         ],
-        stepCount: [(s) => [s.query], (query): number => query.source.series.length],
-        series: [(s) => [s.query], (query): AnyEntityNode[] => query.source.series as AnyEntityNode[]],
+        stepCount: [(s) => [s.query], (query: InsightVizNode<FunnelsQuery>): number => query.source.series.length],
+        series: [
+            (s) => [s.query],
+            (query: InsightVizNode<FunnelsQuery>): AnyEntityNode[] => query.source.series as AnyEntityNode[],
+        ],
         taxonomicGroupTypes: [
             () => [],
             (): TaxonomicFilterGroupType[] => {
diff --git a/products/customer_analytics/frontend/components/CustomerJourneys/journeyEditorLogic.ts b/products/customer_analytics/frontend/components/CustomerJourneys/journeyEditorLogic.ts
index cc00b86016a7..9f9637a7caa1 100644
--- a/products/customer_analytics/frontend/components/CustomerJourneys/journeyEditorLogic.ts
+++ b/products/customer_analytics/frontend/components/CustomerJourneys/journeyEditorLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 
 import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
 import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
@@ -11,7 +11,6 @@ import { insightsApi } from '~/scenes/insights/utils/api'
 import { FunnelPathType } from '~/types'
 
 import { customerJourneysLogic } from './customerJourneysLogic'
-import type { journeyEditorLogicType } from './journeyEditorLogicType'
 
 export interface StagedNode {
     nodeId: string
@@ -28,6 +27,92 @@ function layerIndexFromNodeId(nodeId: string): number {
     return extractLayerIndex(rawName)
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface journeyEditorLogicValues {
+    expansionContext: ExpansionContext | null
+    insertionIndex: number
+    isEditMode: boolean
+    isSaving: boolean
+    newSeriesEntries: EventsNode[]
+    sortedStagedNodes: StagedNode[]
+    stagedNodeIds: Set<string>
+    stagedNodeOptional: Record<string, boolean>
+    stagedNodeOptionalMap: Map<string, boolean>
+    stagedNodes: StagedNode[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface journeyEditorLogicActions {
+    reportCustomerJourneyStepAddedFromPath: (
+        eventName: string,
+        pathType: string,
+        stepIndex: number
+    ) => {
+        eventName: string
+        pathType: string
+        stepIndex: number
+    } // eventUsageLogic
+    reportCustomerJourneyStepsSavedFromEditor: (
+        stepsAdded: number,
+        journeyId: string | null
+    ) => {
+        journeyId: string | null
+        stepsAdded: number
+    } // eventUsageLogic
+    cancelChanges: () => {
+        value: true
+    }
+    saveChanges: () => {
+        value: true
+    }
+    saveChangesFailure: (error: string) => {
+        error: string
+    }
+    saveChangesSuccess: () => {
+        value: true
+    }
+    stagePathNode: (
+        nodeId: string,
+        eventName: string,
+        expansion: PathExpansion,
+        funnelStepCount: number
+    ) => {
+        eventName: string
+        expansion: PathExpansion
+        funnelStepCount: number
+        nodeId: string
+    }
+    toggleStagedNodeOptional: (nodeId: string) => {
+        nodeId: string
+    }
+    unstagePathNode: (nodeId: string) => {
+        nodeId: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface journeyEditorLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        isEditMode: (stagedNodes: StagedNode[]) => boolean
+        stagedNodeIds: (stagedNodes: StagedNode[]) => Set<string>
+        insertionIndex: (expansionContext: ExpansionContext | null) => number
+        sortedStagedNodes: (stagedNodes: StagedNode[]) => StagedNode[]
+        stagedNodeOptionalMap: (stagedNodeOptional: Record<string, boolean>) => Map<string, boolean>
+        newSeriesEntries: (
+            sortedStagedNodes: StagedNode[],
+            insertionIndex: number,
+            stagedNodeOptional: Record<string, boolean>
+        ) => EventsNode[]
+    }
+}
+
+export type journeyEditorLogicType = MakeLogicType<
+    journeyEditorLogicValues,
+    journeyEditorLogicActions,
+    Record<string, any>,
+    journeyEditorLogicMeta
+>
+
 export const journeyEditorLogic = kea<journeyEditorLogicType>([
     path(['products', 'customer_analytics', 'frontend', 'components', 'CustomerJourneys', 'journeyEditorLogic']),
 
@@ -97,14 +182,14 @@ export const journeyEditorLogic = kea<journeyEditorLogicType>([
     }),
 
     selectors({
-        isEditMode: [(s) => [s.stagedNodes], (stagedNodes): boolean => stagedNodes.length > 0],
+        isEditMode: [(s) => [s.stagedNodes], (stagedNodes: StagedNode[]): boolean => stagedNodes.length > 0],
         stagedNodeIds: [
             (s) => [s.stagedNodes],
-            (stagedNodes): Set<string> => new Set(stagedNodes.map((n) => n.nodeId)),
+            (stagedNodes: StagedNode[]): Set<string> => new Set(stagedNodes.map((n) => n.nodeId)),
         ],
         insertionIndex: [
             (s) => [s.expansionContext],
-            (ctx): number => {
+            (ctx: ExpansionContext | null): number => {
                 if (!ctx) {
                     return 0
                 }
@@ -123,16 +208,21 @@ export const journeyEditorLogic = kea<journeyEditorLogicType>([
         ],
         sortedStagedNodes: [
             (s) => [s.stagedNodes],
-            (stagedNodes): StagedNode[] =>
+            (stagedNodes: StagedNode[]): StagedNode[] =>
                 [...stagedNodes].sort((a, b) => layerIndexFromNodeId(a.nodeId) - layerIndexFromNodeId(b.nodeId)),
         ],
         stagedNodeOptionalMap: [
             (s) => [s.stagedNodeOptional],
-            (stagedNodeOptional): Map<string, boolean> => new Map(Object.entries(stagedNodeOptional)),
+            (stagedNodeOptional: Record<string, boolean>): Map<string, boolean> =>
+                new Map(Object.entries(stagedNodeOptional)),
         ],
         newSeriesEntries: [
             (s) => [s.sortedStagedNodes, s.insertionIndex, s.stagedNodeOptional],
-            (sortedNodes, insertionIndex, stagedNodeOptional): EventsNode[] => {
+            (
+                sortedNodes: StagedNode[],
+                insertionIndex: number,
+                stagedNodeOptional: Record<string, boolean>
+            ): EventsNode[] => {
                 return sortedNodes.map((node, i) => {
                     const entry = eventNameToEventsNode(node.eventName)
                     const isFirstFunnelStep = insertionIndex === 0 && i === 0
diff --git a/products/customer_analytics/frontend/components/ZendeskTicketsFilters/zendeskTicketsFiltersLogic.ts b/products/customer_analytics/frontend/components/ZendeskTicketsFilters/zendeskTicketsFiltersLogic.ts
index e0724556b93f..8fb11e76584a 100644
--- a/products/customer_analytics/frontend/components/ZendeskTicketsFilters/zendeskTicketsFiltersLogic.ts
+++ b/products/customer_analytics/frontend/components/ZendeskTicketsFilters/zendeskTicketsFiltersLogic.ts
@@ -1,6 +1,4 @@
-import { actions, kea, key, path, props, reducers } from 'kea'
-
-import type { zendeskTicketsFiltersLogicType } from './zendeskTicketsFiltersLogicType'
+import { MakeLogicType, actions, kea, key, path, props, reducers } from 'kea'
 
 const DEFAULT_PRIORITY = 'all'
 const DEFAULT_STATUS = 'all'
@@ -11,6 +9,42 @@ export interface ZendeskTicketsFiltersLogicProps {
     logicKey: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface zendeskTicketsFiltersLogicValues {
+    orderBy: string
+    orderDirection: string
+    priority: string
+    status: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface zendeskTicketsFiltersLogicActions {
+    setOrderBy: (orderBy: string) => {
+        orderBy: string
+    }
+    setOrderDirection: (orderDirection: string) => {
+        orderDirection: string
+    }
+    setPriority: (priority: string) => {
+        priority: string
+    }
+    setStatus: (status: string) => {
+        status: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface zendeskTicketsFiltersLogicMeta {
+    key: string
+}
+
+export type zendeskTicketsFiltersLogicType = MakeLogicType<
+    zendeskTicketsFiltersLogicValues,
+    zendeskTicketsFiltersLogicActions,
+    ZendeskTicketsFiltersLogicProps,
+    zendeskTicketsFiltersLogicMeta
+>
+
 export const zendeskTicketsFiltersLogic = kea<zendeskTicketsFiltersLogicType>([
     path(['products', 'customer_analytics', 'components', 'ZendeskTicketsFilters', 'zendeskTicketsFiltersLogic']),
     props({} as ZendeskTicketsFiltersLogicProps),
diff --git a/products/customer_analytics/frontend/customerAnalyticsConfigLogic.ts b/products/customer_analytics/frontend/customerAnalyticsConfigLogic.ts
index 24ba139e5151..f08ff2b30d93 100644
--- a/products/customer_analytics/frontend/customerAnalyticsConfigLogic.ts
+++ b/products/customer_analytics/frontend/customerAnalyticsConfigLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, selectors } from 'kea'
 
 import { isEmptyObject } from 'lib/utils/guards'
 import { teamLogic } from 'scenes/teamLogic'
@@ -12,7 +12,46 @@ import {
     GroupNode,
 } from '~/queries/schema/schema-general'
 
-import type { customerAnalyticsConfigLogicType } from './customerAnalyticsConfigLogicType'
+import type { TeamType } from '../../../frontend/src/types'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface customerAnalyticsConfigLogicValues {
+    customerAnalyticsConfig: CustomerAnalyticsConfig // teamLogic
+    activityEvent: AnyEntityNode
+    paymentEvent: AnyEntityNode
+    signupEvent: AnyEntityNode
+    signupPageviewEvent: AnyEntityNode
+    subscriptionEvent: AnyEntityNode
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface customerAnalyticsConfigLogicActions {
+    updateCurrentTeam: (payload: Partial<TeamType>) => Partial<TeamType> // teamLogic
+    loadConfig: () => {
+        value: true
+    }
+    updateEvents: (events: Record<string, ActionsNode | DataWarehouseNode | EventsNode | GroupNode>) => {
+        events: Record<string, ActionsNode | DataWarehouseNode | EventsNode | GroupNode<DataWarehouseNode>>
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface customerAnalyticsConfigLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        activityEvent: (customerAnalyticsConfig: CustomerAnalyticsConfig) => AnyEntityNode
+        signupEvent: (customerAnalyticsConfig: CustomerAnalyticsConfig) => AnyEntityNode
+        signupPageviewEvent: (customerAnalyticsConfig: CustomerAnalyticsConfig) => AnyEntityNode
+        subscriptionEvent: (customerAnalyticsConfig: CustomerAnalyticsConfig) => AnyEntityNode
+        paymentEvent: (customerAnalyticsConfig: CustomerAnalyticsConfig) => AnyEntityNode
+    }
+}
+
+export type customerAnalyticsConfigLogicType = MakeLogicType<
+    customerAnalyticsConfigLogicValues,
+    customerAnalyticsConfigLogicActions,
+    Record<string, any>,
+    customerAnalyticsConfigLogicMeta
+>
 
 export const customerAnalyticsConfigLogic = kea<customerAnalyticsConfigLogicType>([
     path(['products', 'customerAnalytics', 'customerAnalyticsConfigModel']),
diff --git a/products/customer_analytics/frontend/customerAnalyticsSceneLogic.ts b/products/customer_analytics/frontend/customerAnalyticsSceneLogic.ts
index 6ef978acaa66..ff79f12c78c2 100644
--- a/products/customer_analytics/frontend/customerAnalyticsSceneLogic.ts
+++ b/products/customer_analytics/frontend/customerAnalyticsSceneLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, path, reducers, selectors } from 'kea'
 import { router, urlToAction } from 'kea-router'
 
 import { FunnelLayout } from 'lib/constants'
@@ -35,9 +35,11 @@ import {
     StepOrderValue,
 } from '~/types'
 
+import type { Noun } from '../../../frontend/src/models/groupsModel'
+import type { CustomerAnalyticsConfig } from '../../../frontend/src/queries/schema/schema-general'
+import type { GroupType } from '../../../frontend/src/types'
 import { CUSTOMER_ANALYTICS_DEFAULT_QUERY_TAGS } from './constants'
 import { customerAnalyticsConfigLogic } from './customerAnalyticsConfigLogic'
-import type { customerAnalyticsSceneLogicType } from './customerAnalyticsSceneLogicType'
 
 export type BusinessType = 'b2c' | 'b2b'
 
@@ -77,6 +79,123 @@ const setQueryParams = (params: Record<string, string>): string => {
     return `${currentPath}${urlParams.toString() ? '?' + urlParams.toString() : ''}`
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface customerAnalyticsSceneLogicValues {
+    activityEvent: AnyEntityNode; // customerAnalyticsConfigLogic
+    customerAnalyticsConfig: CustomerAnalyticsConfig; // customerAnalyticsConfigLogic
+    paymentEvent: AnyEntityNode; // customerAnalyticsConfigLogic
+    signupEvent: AnyEntityNode; // customerAnalyticsConfigLogic
+    signupPageviewEvent: AnyEntityNode; // customerAnalyticsConfigLogic
+    subscriptionEvent: AnyEntityNode; // customerAnalyticsConfigLogic
+    aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun; // groupsModel
+    groupTypesRaw: Array<GroupType>; // groupsModel
+    groupsEnabled: boolean; // groupsModel
+    sceneKey: string | null; // sceneLogic
+    activeTab: "accounts" | "dashboard" | "journeys" | "notes";
+    activeUsersInsights: InsightDefinition[];
+    breadcrumbs: Breadcrumb[];
+    businessType: BusinessType;
+    customerLabel: {
+        plural: string;
+        singular: string;
+    };
+    dateFilter: {
+        dateFrom: string | null;
+        dateTo: string | null;
+        interval: SimpleIntervalType;
+    };
+    dateRange: {
+        date_from: string | null;
+        date_to: string | null;
+    };
+    dauSeries: AnyEntityNode | null;
+    filterTestAccounts: boolean;
+    groupOptions: {
+        label: string;
+        value: number;
+    }[];
+    mauSeries: AnyEntityNode | null;
+    mineOnly: boolean;
+    paymentSeries: AnyEntityNode | null;
+    selectedGroupType: number;
+    sessionInsights: InsightDefinition[];
+    signupInsights: InsightDefinition[];
+    signupPageviewSeries: AnyEntityNode | null;
+    signupSeries: AnyEntityNode | null;
+    subscriptionSeries: AnyEntityNode | null;
+    wauSeries: AnyEntityNode | null;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface customerAnalyticsSceneLogicActions {
+    setBusinessType: (businessType: BusinessType) => {
+        businessType: BusinessType;
+    };
+    setDates: (dateFrom: string | null, dateTo: string | null) => {
+        dateFrom: string | null;
+        dateTo: string | null;
+    };
+    setFilterTestAccounts: (filterTestAccounts: boolean) => {
+        filterTestAccounts: boolean;
+    };
+    setMineOnly: (mineOnly: boolean) => {
+        mineOnly: boolean;
+    };
+    setSelectedGroupType: (selectedGroupType: number) => {
+        selectedGroupType: number;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface customerAnalyticsSceneLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        activeTab: (sceneKey: string | null) => "accounts" | "dashboard" | "journeys" | "notes";
+        customerLabel: (aggregationLabel: (groupTypeIndex: number | null | undefined, deferToUserWording?: boolean) => Noun, businessType: BusinessType, selectedGroupType: number) => {
+            plural: string;
+            singular: string;
+        };
+        dateRange: (dateFilter: {
+            dateFrom: string | null;
+            dateTo: string | null;
+            interval: SimpleIntervalType;
+        }) => {
+            date_from: string | null;
+            date_to: string | null;
+        };
+        groupOptions: (groupTypesRaw: GroupType[]) => {
+            label: string;
+            value: number;
+        }[];
+        dauSeries: (activityEvent: AnyEntityNode, businessType: BusinessType, selectedGroupType: number) => AnyEntityNode | null;
+        wauSeries: (activityEvent: AnyEntityNode, businessType: BusinessType, selectedGroupType: number) => AnyEntityNode | null;
+        mauSeries: (activityEvent: AnyEntityNode, businessType: BusinessType, selectedGroupType: number) => AnyEntityNode | null;
+        signupSeries: (businessType: BusinessType, selectedGroupType: number, signupEvent: AnyEntityNode) => AnyEntityNode | null;
+        signupPageviewSeries: (businessType: BusinessType, selectedGroupType: number, signupPageviewEvent: AnyEntityNode) => AnyEntityNode | null;
+        subscriptionSeries: (businessType: BusinessType, selectedGroupType: number, subscriptionEvent: AnyEntityNode) => AnyEntityNode | null;
+        paymentSeries: (businessType: BusinessType, selectedGroupType: number, paymentEvent: AnyEntityNode) => AnyEntityNode | null;
+        activeUsersInsights: (customerLabel: {
+            plural: string;
+            singular: string;
+        }, dauSeries: AnyEntityNode | null, wauSeries: AnyEntityNode | null, mauSeries: AnyEntityNode | null, dateRange: {
+            date_from: string | null;
+            date_to: string | null;
+        }, filterTestAccounts: boolean) => InsightDefinition[];
+        sessionInsights: (customerLabel: {
+            plural: string;
+            singular: string;
+        }, filterTestAccounts: boolean) => InsightDefinition[];
+        signupInsights: (businessType: BusinessType, customerLabel: {
+            plural: string;
+            singular: string;
+        }, signupSeries: AnyEntityNode | null, paymentSeries: AnyEntityNode | null, selectedGroupType: number, subscriptionSeries: AnyEntityNode | null, signupPageviewSeries: AnyEntityNode | null, dauSeries: AnyEntityNode | null, dateRange: {
+            date_from: string | null;
+            date_to: string | null;
+        }, filterTestAccounts: boolean) => InsightDefinition[];
+    };
+}
+
+export type customerAnalyticsSceneLogicType = MakeLogicType<customerAnalyticsSceneLogicValues, customerAnalyticsSceneLogicActions, Record<string, any>, customerAnalyticsSceneLogicMeta>;
+
 export const customerAnalyticsSceneLogic = kea<customerAnalyticsSceneLogicType>([
     path(['scenes', 'customerAnalytics', 'customerAnalyticsScene']),
     connect(() => ({
@@ -150,7 +269,7 @@ export const customerAnalyticsSceneLogic = kea<customerAnalyticsSceneLogicType>(
     selectors({
         activeTab: [
             (s) => [s.sceneKey],
-            (sceneKey): 'dashboard' | 'journeys' | 'accounts' | 'notes' => {
+            (sceneKey: string | null): 'dashboard' | 'journeys' | 'accounts' | 'notes' => {
                 if (sceneKey === 'customerAnalyticsJourneys') {
                     return 'journeys'
                 }
@@ -280,7 +399,11 @@ export const customerAnalyticsSceneLogic = kea<customerAnalyticsSceneLogicType>(
         ],
         signupSeries: [
             (s) => [s.businessType, s.selectedGroupType, s.signupEvent],
-            (businessType: BusinessType, selectedGroupType: GroupTypeIndex, signupEvent): AnyEntityNode | null => {
+            (
+                businessType: BusinessType,
+                selectedGroupType: GroupTypeIndex,
+                signupEvent: AnyEntityNode
+            ): AnyEntityNode | null => {
                 if (Object.keys(signupEvent).length === 0) {
                     return null
                 }
@@ -302,7 +425,7 @@ export const customerAnalyticsSceneLogic = kea<customerAnalyticsSceneLogicType>(
             (
                 businessType: BusinessType,
                 selectedGroupType: GroupTypeIndex,
-                signupPageviewEvent
+                signupPageviewEvent: AnyEntityNode
             ): AnyEntityNode | null => {
                 if (Object.keys(signupPageviewEvent).length === 0) {
                     return null
@@ -325,7 +448,7 @@ export const customerAnalyticsSceneLogic = kea<customerAnalyticsSceneLogicType>(
             (
                 businessType: BusinessType,
                 selectedGroupType: GroupTypeIndex,
-                subscriptionEvent
+                subscriptionEvent: AnyEntityNode
             ): AnyEntityNode | null => {
                 if (Object.keys(subscriptionEvent).length === 0) {
                     return null
@@ -345,7 +468,11 @@ export const customerAnalyticsSceneLogic = kea<customerAnalyticsSceneLogicType>(
         ],
         paymentSeries: [
             (s) => [s.businessType, s.selectedGroupType, s.paymentEvent],
-            (businessType: BusinessType, selectedGroupType: GroupTypeIndex, paymentEvent): AnyEntityNode | null => {
+            (
+                businessType: BusinessType,
+                selectedGroupType: GroupTypeIndex,
+                paymentEvent: AnyEntityNode
+            ): AnyEntityNode | null => {
                 if (Object.keys(paymentEvent).length === 0) {
                     return null
                 }
@@ -486,7 +613,13 @@ export const customerAnalyticsSceneLogic = kea<customerAnalyticsSceneLogicType>(
         ],
         sessionInsights: [
             (s) => [s.customerLabel, s.filterTestAccounts],
-            (customerLabel, filterTestAccounts): InsightDefinition[] => [
+            (
+                customerLabel: {
+                    plural: string
+                    singular: string
+                },
+                filterTestAccounts: boolean
+            ): InsightDefinition[] => [
                 {
                     name: 'Unique sessions',
                     description: 'Events without session IDs are excluded.',
@@ -629,16 +762,22 @@ export const customerAnalyticsSceneLogic = kea<customerAnalyticsSceneLogicType>(
                 s.filterTestAccounts,
             ],
             (
-                businessType,
-                customerLabel,
-                signupSeries,
-                paymentSeries,
-                selectedGroupType,
-                subscriptionSeries,
-                signupPageviewSeries,
-                dauSeries,
-                dateRange,
-                filterTestAccounts
+                businessType: BusinessType,
+                customerLabel: {
+                    plural: string
+                    singular: string
+                },
+                signupSeries: AnyEntityNode | null,
+                paymentSeries: AnyEntityNode | null,
+                selectedGroupType: number,
+                subscriptionSeries: AnyEntityNode | null,
+                signupPageviewSeries: AnyEntityNode | null,
+                dauSeries: AnyEntityNode | null,
+                dateRange: {
+                    date_from: string | null
+                    date_to: string | null
+                },
+                filterTestAccounts: boolean
             ): InsightDefinition[] => [
                 {
                     name: `${capitalizeFirstLetter(customerLabel.singular)} signups`,
diff --git a/products/customer_analytics/frontend/customerProfileConfigLogic.ts b/products/customer_analytics/frontend/customerProfileConfigLogic.ts
index a4e4e601f9d6..4b105ff7b160 100644
--- a/products/customer_analytics/frontend/customerProfileConfigLogic.ts
+++ b/products/customer_analytics/frontend/customerProfileConfigLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -7,12 +7,130 @@ import { teamLogic } from 'scenes/teamLogic'
 
 import { CustomerProfileConfigType, CustomerProfileScope } from '~/types'
 
-import type { customerProfileConfigLogicType } from './customerProfileConfigLogicType'
-
 export interface CustomerProfileConfigLogicProps {
     scope?: CustomerProfileScope
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface customerProfileConfigLogicValues {
+    currentTeamId: number | null // teamLogic
+    configs: CustomerProfileConfigType[]
+    configsLoading: boolean
+    customerProfileConfig: CustomerProfileConfigType | undefined
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface customerProfileConfigLogicActions {
+    createConfig: (config: Partial<CustomerProfileConfigType>) => {
+        config: Partial<CustomerProfileConfigType>
+    }
+    createConfigFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    createConfigSuccess: (
+        configs: CustomerProfileConfigType[],
+        payload?: {
+            config: Partial<CustomerProfileConfigType>
+        }
+    ) => {
+        configs: CustomerProfileConfigType[]
+        payload?: {
+            config: Partial<CustomerProfileConfigType>
+        }
+    }
+    deleteConfig: (id: CustomerProfileConfigType['id']) => {
+        id: string
+    }
+    deleteConfigFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteConfigSuccess: (
+        configs: CustomerProfileConfigType[],
+        payload?: {
+            id: string
+        }
+    ) => {
+        configs: CustomerProfileConfigType[]
+        payload?: {
+            id: string
+        }
+    }
+    loadConfigs: () => {
+        value: true
+    }
+    loadConfigsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadConfigsSuccess: (
+        configs: CustomerProfileConfigType[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        configs: CustomerProfileConfigType[]
+        payload?: {
+            value: true
+        }
+    }
+    setConfigs: (configs: CustomerProfileConfigType[]) => {
+        configs: CustomerProfileConfigType[]
+    }
+    updateConfig: (
+        id: CustomerProfileConfigType['id'],
+        config: Partial<CustomerProfileConfigType>
+    ) => {
+        config: Partial<CustomerProfileConfigType>
+        id: string
+    }
+    updateConfigFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateConfigSuccess: (
+        configs: CustomerProfileConfigType[],
+        payload?: {
+            config: Partial<CustomerProfileConfigType>
+            id: string
+        }
+    ) => {
+        configs: CustomerProfileConfigType[]
+        payload?: {
+            config: Partial<CustomerProfileConfigType>
+            id: string
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface customerProfileConfigLogicMeta {
+    key: CustomerProfileScope | 'all'
+    __keaTypeGenInternalSelectorTypes: {
+        customerProfileConfig: (configs: CustomerProfileConfigType[], arg: any) => CustomerProfileConfigType | undefined
+    }
+}
+
+export type customerProfileConfigLogicType = MakeLogicType<
+    customerProfileConfigLogicValues,
+    customerProfileConfigLogicActions,
+    CustomerProfileConfigLogicProps,
+    customerProfileConfigLogicMeta
+>
+
 export const customerProfileConfigLogic = kea<customerProfileConfigLogicType>([
     path(['products', 'customer_analytics', 'customerProfileConfigLogic']),
     props({} as CustomerProfileConfigLogicProps),
@@ -84,7 +202,8 @@ export const customerProfileConfigLogic = kea<customerProfileConfigLogicType>([
     selectors({
         customerProfileConfig: [
             (s) => [s.configs, (_, props) => props.scope],
-            (configs, scope): CustomerProfileConfigType | undefined => configs.find((c) => c.scope === scope),
+            (configs: CustomerProfileConfigType[], scope): CustomerProfileConfigType | undefined =>
+                configs.find((c) => c.scope === scope),
         ],
     }),
 
diff --git a/products/customer_analytics/frontend/customerProfileLogic.ts b/products/customer_analytics/frontend/customerProfileLogic.ts
index dd6baddbaee8..b6b78a1d663a 100644
--- a/products/customer_analytics/frontend/customerProfileLogic.ts
+++ b/products/customer_analytics/frontend/customerProfileLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 
 import { JSONContent } from 'lib/components/RichContentEditor/types'
 import { FEATURE_FLAGS } from 'lib/constants'
@@ -12,8 +12,15 @@ import { CustomerProfileScope, GroupTypeIndex } from '~/types'
 
 import { sourceManagementLogic } from 'products/data_warehouse/frontend/shared/logics/sourceManagementLogic'
 
+import type { PaginatedResponse } from '../../../frontend/src/lib/api'
+import type { FeatureFlagsSet } from '../../../frontend/src/lib/logic/featureFlagLogic'
+import type {
+    CustomerProfileConfigType,
+    ExternalDataSource,
+    TeamPublicType,
+    TeamType,
+} from '../../../frontend/src/types'
 import { customerProfileConfigLogic } from './customerProfileConfigLogic'
-import type { customerProfileLogicType } from './customerProfileLogicType'
 
 export const DEFAULT_PERSON_PROFILE_SIDEBAR: JSONContent[] = [
     { type: NotebookNodeType.Person, attrs: { title: 'Info' } },
@@ -96,6 +103,176 @@ export interface PersonProfileLogicProps {
     canvasShortId: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface customerProfileLogicValues {
+    customerProfileConfig: CustomerProfileConfigType | undefined // customerProfileConfigLogic
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    dataWarehouseSourcesLoading: boolean // sourceManagementLogic
+    hasZendeskSource: boolean // sourceManagementLogic
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    changed: boolean
+    content: JSONContent[]
+    defaultContent: JSONContent[]
+    isProfileConfigEnabled: boolean | string | undefined
+    profileLocalContent: JSONContent[] | null
+    scopedAddAttrFunction: ({ attrs, node, children }: AddAttrsToNodeProps) => JSONContent
+    scopedSidebarContent: JSONContent[]
+    storedContent: JSONContent[] | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface customerProfileLogicActions {
+    createConfig: (config: Partial<CustomerProfileConfigType>) => {
+        config: Partial<CustomerProfileConfigType>
+    } // customerProfileConfigLogic
+    createConfigSuccess: (
+        configs: CustomerProfileConfigType[],
+        payload?:
+            | {
+                  config: Partial<CustomerProfileConfigType>
+              }
+            | undefined
+    ) => {
+        configs: CustomerProfileConfigType[]
+        payload?: {
+            config: Partial<CustomerProfileConfigType>
+        }
+    } // customerProfileConfigLogic
+    loadConfigsSuccess: (
+        configs: CustomerProfileConfigType[],
+        payload?:
+            | {
+                  value: true
+              }
+            | undefined
+    ) => {
+        configs: CustomerProfileConfigType[]
+        payload?: {
+            value: true
+        }
+    } // customerProfileConfigLogic
+    updateConfig: (
+        id: string,
+        config: Partial<CustomerProfileConfigType>
+    ) => {
+        config: Partial<CustomerProfileConfigType>
+        id: string
+    } // customerProfileConfigLogic
+    updateConfigSuccess: (
+        configs: CustomerProfileConfigType[],
+        payload?:
+            | {
+                  config: Partial<CustomerProfileConfigType>
+                  id: string
+              }
+            | undefined
+    ) => {
+        configs: CustomerProfileConfigType[]
+        payload?: {
+            config: Partial<CustomerProfileConfigType>
+            id: string
+        }
+    } // customerProfileConfigLogic
+    setLocalContent: (
+        jsonContent: JSONContent,
+        updateEditor?: any,
+        skipCapture?: any
+    ) => {
+        jsonContent: JSONContent
+        skipCapture: any
+        updateEditor: any
+    } // notebookLogic
+    loadSourcesSuccess: (
+        dataWarehouseSources:
+            | PaginatedResponse<ExternalDataSource>
+            | {
+                  count: number
+                  next: null
+                  previous: null
+                  results: never[]
+              },
+        payload?:
+            | {
+                  value: true
+              }
+            | undefined
+    ) => {
+        dataWarehouseSources:
+            | PaginatedResponse<ExternalDataSource>
+            | {
+                  count: number
+                  next: null
+                  previous: null
+                  results: never[]
+              }
+        payload?: {
+            value: true
+        }
+    } // sourceManagementLogic
+    addNode: (nodeType: string) => {
+        nodeType: string
+    }
+    removeNode: (nodeType: string) => {
+        nodeType: string
+    }
+    resetToDefaults: () => {
+        value: true
+    }
+    saveChanges: () => {
+        value: true
+    }
+    setProfileLocalContent: (content: JSONContent[] | null) => {
+        content: JSONContent[] | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface customerProfileLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        changed: (
+            profileLocalContent: JSONContent[] | null,
+            storedContent: JSONContent[] | null,
+            defaultContent: JSONContent[]
+        ) => boolean
+        isProfileConfigEnabled: (featureFlags: FeatureFlagsSet) => boolean | string | undefined
+        scopedSidebarContent: (arg: any) => JSONContent[]
+        scopedAddAttrFunction: (arg: any) => ({ attrs, node, children }: AddAttrsToNodeProps) => JSONContent
+        defaultContent: (
+            scopedSidebarContent: JSONContent[],
+            scopedAddAttrFunction: ({ attrs, node, children }: AddAttrsToNodeProps) => JSONContent,
+            featureFlags: FeatureFlagsSet,
+            hasZendeskSource: boolean,
+            dataWarehouseSourcesLoading: boolean,
+            currentTeam: TeamPublicType | TeamType | null,
+            arg: any,
+            arg2: any
+        ) => JSONContent[]
+        storedContent: (
+            customerProfileConfig: CustomerProfileConfigType | undefined,
+            scopedAddAttrFunction: ({ attrs, node, children }: AddAttrsToNodeProps) => JSONContent,
+            featureFlags: FeatureFlagsSet,
+            hasZendeskSource: boolean,
+            dataWarehouseSourcesLoading: boolean,
+            currentTeam: TeamPublicType | TeamType | null,
+            arg: any
+        ) => JSONContent[] | null
+        content: (
+            defaultContent: JSONContent[],
+            storedContent: JSONContent[] | null,
+            profileLocalContent: JSONContent[] | null,
+            isProfileConfigEnabled: boolean | string | undefined
+        ) => JSONContent[]
+    }
+}
+
+export type customerProfileLogicType = MakeLogicType<
+    customerProfileLogicValues,
+    customerProfileLogicActions,
+    PersonProfileLogicProps,
+    customerProfileLogicMeta
+>
+
 export const customerProfileLogic = kea<customerProfileLogicType>([
     path(['products', 'customer_analytics', 'frontend', 'customerProfileLogic']),
     props({} as PersonProfileLogicProps),
@@ -144,7 +321,11 @@ export const customerProfileLogic = kea<customerProfileLogicType>([
     selectors({
         changed: [
             (s) => [s.profileLocalContent, s.storedContent, s.defaultContent],
-            (profileLocalContent, storedContent, defaultContent) => {
+            (
+                profileLocalContent: JSONContent[] | null,
+                storedContent: JSONContent[] | null,
+                defaultContent: JSONContent[]
+            ) => {
                 if (!profileLocalContent) {
                     return false
                 }
@@ -167,7 +348,8 @@ export const customerProfileLogic = kea<customerProfileLogicType>([
         ],
         isProfileConfigEnabled: [
             (s) => [s.featureFlags],
-            (featureFlags) => featureFlags[FEATURE_FLAGS.CUSTOMER_PROFILE_CONFIG_BUTTON],
+            (featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet) =>
+                featureFlags[FEATURE_FLAGS.CUSTOMER_PROFILE_CONFIG_BUTTON],
         ],
         scopedSidebarContent: [
             () => [(_, props) => props.scope],
@@ -190,12 +372,12 @@ export const customerProfileLogic = kea<customerProfileLogicType>([
                 (_, props) => props.attrs,
             ],
             (
-                scopedSidebarContent,
-                scopedAddAttrFunction,
-                featureFlags,
-                hasZendeskSource,
-                dataWarehouseSourcesLoading,
-                currentTeam,
+                scopedSidebarContent: JSONContent[],
+                scopedAddAttrFunction: ({ attrs, node, children }: AddAttrsToNodeProps) => JSONContent,
+                featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet,
+                hasZendeskSource: boolean,
+                dataWarehouseSourcesLoading: boolean,
+                currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType,
                 scope,
                 attrs
             ) => {
@@ -231,12 +413,12 @@ export const customerProfileLogic = kea<customerProfileLogicType>([
                 (_, props) => props.attrs,
             ],
             (
-                customerProfileConfig,
-                scopedAddAttrFunction,
-                featureFlags,
-                hasZendeskSource,
-                dataWarehouseSourcesLoading,
-                currentTeam,
+                customerProfileConfig: import('~/types').CustomerProfileConfigType | undefined,
+                scopedAddAttrFunction: ({ attrs, node, children }: AddAttrsToNodeProps) => JSONContent,
+                featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet,
+                hasZendeskSource: boolean,
+                dataWarehouseSourcesLoading: boolean,
+                currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType,
                 attrs
             ): JSONContent[] | null => {
                 if (!customerProfileConfig) {
@@ -268,7 +450,12 @@ export const customerProfileLogic = kea<customerProfileLogicType>([
         ],
         content: [
             (s) => [s.defaultContent, s.storedContent, s.profileLocalContent, s.isProfileConfigEnabled],
-            (defaultContent, storedContent, profileLocalContent, isProfileConfigEnabled): JSONContent[] => {
+            (
+                defaultContent: JSONContent[],
+                storedContent: JSONContent[] | null,
+                profileLocalContent: JSONContent[] | null,
+                isProfileConfigEnabled: boolean | string | undefined
+            ): JSONContent[] => {
                 // Return default content if flag is disabled
                 if (isProfileConfigEnabled) {
                     if (profileLocalContent !== null) {
diff --git a/products/customer_analytics/frontend/scenes/CustomerAnalyticsConfigurationScene/account/customPropertyDefinitionsLogic.ts b/products/customer_analytics/frontend/scenes/CustomerAnalyticsConfigurationScene/account/customPropertyDefinitionsLogic.ts
index 53e3f1c3c2aa..c12c54855e41 100644
--- a/products/customer_analytics/frontend/scenes/CustomerAnalyticsConfigurationScene/account/customPropertyDefinitionsLogic.ts
+++ b/products/customer_analytics/frontend/scenes/CustomerAnalyticsConfigurationScene/account/customPropertyDefinitionsLogic.ts
@@ -1,5 +1,6 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
@@ -27,7 +28,6 @@ import type {
     CustomPropertyReferenceApi,
 } from 'products/customer_analytics/frontend/generated/api.schemas'
 
-import type { customPropertyDefinitionsLogicType } from './customPropertyDefinitionsLogicType'
 import { NEW_OPTION_ID_PREFIX, isNumericDisplayType, optionLabelError } from './customPropertyTypes'
 
 export type CustomPropertySourceMode = 'manual' | 'data_warehouse' | 'workflow'
@@ -135,6 +135,219 @@ const handleNameConflict = (error: unknown, setManualErrors: (errors: { name: st
 
 class MissingNameError extends Error {}
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface customPropertyDefinitionsLogicValues {
+    currentProjectId: number | null // projectLogic
+    columnMappingWarnings: (string | null)[]
+    customPropertyForm: CustomPropertyFormValues
+    customPropertyFormAllErrors: Record<string, any>
+    customPropertyFormChanged: boolean
+    customPropertyFormErrors: DeepPartialMap<CustomPropertyFormValues, ValidationErrorType>
+    customPropertyFormHasErrors: boolean
+    customPropertyFormManualErrors: Record<string, any>
+    customPropertyFormTouched: boolean
+    customPropertyFormTouches: Record<string, boolean>
+    customPropertyFormValidationErrors: DeepPartialMap<CustomPropertyFormValues, ValidationErrorType>
+    definitions: CustomPropertyDefinitionApi[]
+    definitionsLoading: boolean
+    editingDefinition: CustomPropertyDefinitionApi | null
+    editingReferences: readonly CustomPropertyReferenceApi[]
+    isCustomPropertyFormSubmitting: boolean
+    isCustomPropertyFormValid: boolean
+    materializedViews: DataWarehouseSavedQuery[]
+    modalVisible: boolean
+    newWorkflowUrl: string | null
+    newWorkflowUrlLoading: boolean
+    personPropertyDefinitions: PropertyDefinition[]
+    personPropertyDefinitionsLoading: boolean
+    savedQueries: DataWarehouseSavedQuery[]
+    savedQueriesLoading: boolean
+    selectedSourceColumns: string[]
+    selectedWarehouseSchemaId: string | null
+    serializedColumnPropertyMap: Record<string, string>
+    showCustomPropertyFormErrors: boolean
+    warehouseTables: DataWarehouseTable[]
+    warehouseTablesLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface customPropertyDefinitionsLogicActions {
+    closeModal: () => {
+        value: true
+    }
+    createWorkflowForProperty: () => any
+    createWorkflowForPropertyFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    createWorkflowForPropertySuccess: (
+        newWorkflowUrl: string,
+        payload?: any
+    ) => {
+        newWorkflowUrl: string
+        payload?: any
+    }
+    deleteDefinition: ({ id }: { id: string }) => {
+        id: string
+    }
+    deleteDefinitionFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteDefinitionSuccess: (
+        definitions: CustomPropertyDefinitionApi[],
+        payload?: {
+            id: string
+        }
+    ) => {
+        definitions: CustomPropertyDefinitionApi[]
+        payload?: {
+            id: string
+        }
+    }
+    loadDefinitions: () => any
+    loadDefinitionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadDefinitionsSuccess: (
+        definitions: CustomPropertyDefinitionApi[],
+        payload?: any
+    ) => {
+        definitions: CustomPropertyDefinitionApi[]
+        payload?: any
+    }
+    loadPersonPropertyDefinitions: () => any
+    loadPersonPropertyDefinitionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPersonPropertyDefinitionsSuccess: (
+        personPropertyDefinitions: PropertyDefinition[],
+        payload?: any
+    ) => {
+        personPropertyDefinitions: PropertyDefinition[]
+        payload?: any
+    }
+    loadSavedQueries: () => any
+    loadSavedQueriesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSavedQueriesSuccess: (
+        savedQueries: DataWarehouseSavedQuery[],
+        payload?: any
+    ) => {
+        savedQueries: DataWarehouseSavedQuery[]
+        payload?: any
+    }
+    loadWarehouseTables: () => any
+    loadWarehouseTablesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadWarehouseTablesSuccess: (
+        warehouseTables: DataWarehouseTable[],
+        payload?: any
+    ) => {
+        warehouseTables: DataWarehouseTable[]
+        payload?: any
+    }
+    openCreateModal: () => {
+        value: true
+    }
+    openEditModal: (definition: CustomPropertyDefinitionApi) => {
+        definition: CustomPropertyDefinitionApi
+    }
+    resetCustomPropertyForm: (values?: CustomPropertyFormValues) => {
+        values?: CustomPropertyFormValues
+    }
+    setCustomPropertyFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setCustomPropertyFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setCustomPropertyFormValues: (values: DeepPartial<CustomPropertyFormValues>) => {
+        values: DeepPartial<CustomPropertyFormValues>
+    }
+    setEditingDefinition: (definition: CustomPropertyDefinitionApi) => {
+        definition: CustomPropertyDefinitionApi
+    }
+    submitCustomPropertyForm: () => {
+        value: boolean
+    }
+    submitCustomPropertyFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitCustomPropertyFormRequest: (customPropertyForm: CustomPropertyFormValues) => {
+        customPropertyForm: CustomPropertyFormValues
+    }
+    submitCustomPropertyFormSuccess: (customPropertyForm: CustomPropertyFormValues) => {
+        customPropertyForm: CustomPropertyFormValues
+    }
+    touchCustomPropertyFormField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface customPropertyDefinitionsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        materializedViews: (savedQueries: DataWarehouseSavedQuery[]) => DataWarehouseSavedQuery[]
+        selectedSourceColumns: (
+            savedQueries: DataWarehouseSavedQuery[],
+            customPropertyForm: CustomPropertyFormValues
+        ) => string[]
+        selectedWarehouseSchemaId: (
+            warehouseTables: DataWarehouseTable[],
+            customPropertyForm: CustomPropertyFormValues
+        ) => string | null
+        serializedColumnPropertyMap: (customPropertyForm: CustomPropertyFormValues) => Record<string, string>
+        columnMappingWarnings: (
+            customPropertyForm: CustomPropertyFormValues,
+            personPropertyDefinitions: PropertyDefinition[]
+        ) => (string | null)[]
+        editingReferences: (
+            definitions: CustomPropertyDefinitionApi[],
+            editingDefinition: CustomPropertyDefinitionApi | null
+        ) => readonly CustomPropertyReferenceApi[]
+    }
+}
+
+export type customPropertyDefinitionsLogicType = MakeLogicType<
+    customPropertyDefinitionsLogicValues,
+    customPropertyDefinitionsLogicActions,
+    Record<string, any>,
+    customPropertyDefinitionsLogicMeta
+>
+
 export const customPropertyDefinitionsLogic = kea<customPropertyDefinitionsLogicType>([
     path([
         'products',
diff --git a/products/customer_analytics/frontend/scenes/CustomerAnalyticsConfigurationScene/account/relationshipDefinitionsLogic.ts b/products/customer_analytics/frontend/scenes/CustomerAnalyticsConfigurationScene/account/relationshipDefinitionsLogic.ts
index 64717e1875d2..c7d5bb465155 100644
--- a/products/customer_analytics/frontend/scenes/CustomerAnalyticsConfigurationScene/account/relationshipDefinitionsLogic.ts
+++ b/products/customer_analytics/frontend/scenes/CustomerAnalyticsConfigurationScene/account/relationshipDefinitionsLogic.ts
@@ -1,5 +1,6 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
@@ -14,8 +15,6 @@ import {
 } from 'products/customer_analytics/frontend/generated/api'
 import type { AccountRelationshipDefinitionApi } from 'products/customer_analytics/frontend/generated/api.schemas'
 
-import type { relationshipDefinitionsLogicType } from './relationshipDefinitionsLogicType'
-
 export interface RelationshipDefinitionFormValues {
     name: string
     description: string
@@ -47,6 +46,116 @@ const handleNameConflict = (error: unknown, setManualErrors: (errors: { name: st
     return true
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface relationshipDefinitionsLogicValues {
+    currentProjectId: number | null // projectLogic
+    definitions: AccountRelationshipDefinitionApi[]
+    definitionsLoading: boolean
+    editingDefinition: AccountRelationshipDefinitionApi | null
+    isRelationshipDefinitionFormSubmitting: boolean
+    isRelationshipDefinitionFormValid: boolean
+    modalVisible: boolean
+    relationshipDefinitionForm: RelationshipDefinitionFormValues
+    relationshipDefinitionFormAllErrors: Record<string, any>
+    relationshipDefinitionFormChanged: boolean
+    relationshipDefinitionFormErrors: DeepPartialMap<RelationshipDefinitionFormValues, ValidationErrorType>
+    relationshipDefinitionFormHasErrors: boolean
+    relationshipDefinitionFormManualErrors: Record<string, any>
+    relationshipDefinitionFormTouched: boolean
+    relationshipDefinitionFormTouches: Record<string, boolean>
+    relationshipDefinitionFormValidationErrors: DeepPartialMap<RelationshipDefinitionFormValues, ValidationErrorType>
+    showRelationshipDefinitionFormErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface relationshipDefinitionsLogicActions {
+    closeModal: () => {
+        value: true
+    }
+    deleteDefinition: ({ id }: { id: string }) => {
+        id: string
+    }
+    deleteDefinitionFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteDefinitionSuccess: (
+        definitions: AccountRelationshipDefinitionApi[],
+        payload?: {
+            id: string
+        }
+    ) => {
+        definitions: AccountRelationshipDefinitionApi[]
+        payload?: {
+            id: string
+        }
+    }
+    loadDefinitions: () => any
+    loadDefinitionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadDefinitionsSuccess: (
+        definitions: AccountRelationshipDefinitionApi[],
+        payload?: any
+    ) => {
+        definitions: AccountRelationshipDefinitionApi[]
+        payload?: any
+    }
+    openCreateModal: () => {
+        value: true
+    }
+    openEditModal: (definition: AccountRelationshipDefinitionApi) => {
+        definition: AccountRelationshipDefinitionApi
+    }
+    resetRelationshipDefinitionForm: (values?: RelationshipDefinitionFormValues) => {
+        values?: RelationshipDefinitionFormValues
+    }
+    setRelationshipDefinitionFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setRelationshipDefinitionFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setRelationshipDefinitionFormValues: (values: DeepPartial<RelationshipDefinitionFormValues>) => {
+        values: DeepPartial<RelationshipDefinitionFormValues>
+    }
+    submitRelationshipDefinitionForm: () => {
+        value: boolean
+    }
+    submitRelationshipDefinitionFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitRelationshipDefinitionFormRequest: (relationshipDefinitionForm: RelationshipDefinitionFormValues) => {
+        relationshipDefinitionForm: RelationshipDefinitionFormValues
+    }
+    submitRelationshipDefinitionFormSuccess: (relationshipDefinitionForm: RelationshipDefinitionFormValues) => {
+        relationshipDefinitionForm: RelationshipDefinitionFormValues
+    }
+    touchRelationshipDefinitionFormField: (key: string) => {
+        key: string
+    }
+}
+
+export type relationshipDefinitionsLogicType = MakeLogicType<
+    relationshipDefinitionsLogicValues,
+    relationshipDefinitionsLogicActions
+>
+
 export const relationshipDefinitionsLogic = kea<relationshipDefinitionsLogicType>([
     path([
         'products',
diff --git a/products/customer_analytics/frontend/scenes/CustomerAnalyticsConfigurationScene/customerAnalyticsConfigurationSceneLogic.ts b/products/customer_analytics/frontend/scenes/CustomerAnalyticsConfigurationScene/customerAnalyticsConfigurationSceneLogic.ts
index ceed61db5de5..3975fd326c1b 100644
--- a/products/customer_analytics/frontend/scenes/CustomerAnalyticsConfigurationScene/customerAnalyticsConfigurationSceneLogic.ts
+++ b/products/customer_analytics/frontend/scenes/CustomerAnalyticsConfigurationScene/customerAnalyticsConfigurationSceneLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, path, props, reducers, selectors } from 'kea'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 
 import { Scene } from 'scenes/sceneTypes'
@@ -7,8 +7,8 @@ import { urls } from 'scenes/urls'
 
 import { Breadcrumb } from '~/types'
 
+import type { SettingId } from '../../../../../frontend/src/scenes/settings/types'
 import { CUSTOMER_ANALYTICS_LOGIC_KEY } from '../../utils'
-import type { customerAnalyticsConfigurationSceneLogicType } from './customerAnalyticsConfigurationSceneLogicType'
 
 export type ConfigurationSceneTabType =
     | 'group-analytics'
@@ -20,6 +20,36 @@ export interface CustomerAnalyticsConfigurationSceneLogicProps {
     initialTab?: ConfigurationSceneTabType
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface customerAnalyticsConfigurationSceneLogicValues {
+    breadcrumbs: Breadcrumb[]
+    tab: ConfigurationSceneTabType
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface customerAnalyticsConfigurationSceneLogicActions {
+    selectSetting: (setting: SettingId) => {
+        setting: SettingId
+    } // settingsLogic
+    setTab: (tab: ConfigurationSceneTabType) => {
+        tab: ConfigurationSceneTabType
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface customerAnalyticsConfigurationSceneLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        breadcrumbs: (tab: ConfigurationSceneTabType) => Breadcrumb[]
+    }
+}
+
+export type customerAnalyticsConfigurationSceneLogicType = MakeLogicType<
+    customerAnalyticsConfigurationSceneLogicValues,
+    customerAnalyticsConfigurationSceneLogicActions,
+    CustomerAnalyticsConfigurationSceneLogicProps,
+    customerAnalyticsConfigurationSceneLogicMeta
+>
+
 export const customerAnalyticsConfigurationSceneLogic = kea<customerAnalyticsConfigurationSceneLogicType>([
     path(['scenes', 'customer-analytics', 'configuration', 'customerAnalyticsConfigurationSceneLogic']),
     props({} as CustomerAnalyticsConfigurationSceneLogicProps),
@@ -51,7 +81,7 @@ export const customerAnalyticsConfigurationSceneLogic = kea<customerAnalyticsCon
     selectors({
         breadcrumbs: [
             (s) => [s.tab],
-            (tab): Breadcrumb[] => [
+            (tab: ConfigurationSceneTabType): Breadcrumb[] => [
                 {
                     key: Scene.CustomerAnalytics,
                     path:
diff --git a/products/customer_analytics/frontend/scenes/CustomerAnalyticsConfigurationScene/events/customerAnalyticsDashboardEventsLogic.ts b/products/customer_analytics/frontend/scenes/CustomerAnalyticsConfigurationScene/events/customerAnalyticsDashboardEventsLogic.ts
index 12b5ddb8bbe6..eb15e477e892 100644
--- a/products/customer_analytics/frontend/scenes/CustomerAnalyticsConfigurationScene/events/customerAnalyticsDashboardEventsLogic.ts
+++ b/products/customer_analytics/frontend/scenes/CustomerAnalyticsConfigurationScene/events/customerAnalyticsDashboardEventsLogic.ts
@@ -1,4 +1,5 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import type { ActionForPayloadBuilder } from 'kea'
 import { urlToAction } from 'kea-router'
 
 import { isEmptyObject } from 'lib/utils/guards'
@@ -11,8 +12,183 @@ import { FilterType, InsightType } from '~/types'
 
 import { customerAnalyticsConfigLogic } from 'products/customer_analytics/frontend/customerAnalyticsConfigLogic'
 
+import type { AnyEntityNode } from '../../../../../../frontend/src/queries/schema/schema-general'
 import { EventSelectorProps } from './CustomerAnalyticsDashboardEvents'
-import type { customerAnalyticsDashboardEventsLogicType } from './customerAnalyticsDashboardEventsLogicType'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface customerAnalyticsDashboardEventsLogicValues {
+    activityEvent: AnyEntityNode // customerAnalyticsConfigLogic
+    paymentEvent: AnyEntityNode // customerAnalyticsConfigLogic
+    signupEvent: AnyEntityNode // customerAnalyticsConfigLogic
+    signupPageviewEvent: AnyEntityNode // customerAnalyticsConfigLogic
+    subscriptionEvent: AnyEntityNode // customerAnalyticsConfigLogic
+    activityEventFilters: FilterType
+    activityEventSelection: FilterType | null
+    activityEventSelector: EventSelectorProps
+    eventSelectors: EventSelectorProps[]
+    eventsToHighlight: string[]
+    hasChanges: boolean
+    paymentEventFilters: FilterType | null
+    paymentEventSelection: FilterType | null
+    paymentEventSelector: {
+        caption: string
+        filters: FilterType | null
+        prompt: string
+        relatedSeries: string[]
+        setFilters: ActionForPayloadBuilder<
+            (filters: FilterType | null) => {
+                filters: FilterType | null
+            }
+        >
+        title: string
+    }
+    signupEventFilters: FilterType | null
+    signupEventSelection: FilterType | null
+    signupEventSelector: EventSelectorProps
+    signupPageviewEventFilters: FilterType | null
+    signupPageviewEventSelection: FilterType | null
+    signupPageviewEventSelector: EventSelectorProps
+    subscriptionEventFilters: FilterType | null
+    subscriptionEventSelection: FilterType | null
+    subscriptionEventSelector: {
+        caption: string
+        filters: FilterType | null
+        prompt: string
+        relatedSeries: string[]
+        setFilters: ActionForPayloadBuilder<
+            (filters: FilterType | null) => {
+                filters: FilterType | null
+            }
+        >
+        title: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface customerAnalyticsDashboardEventsLogicActions {
+    updateEvents: (
+        events: Record<string, ActionsNode | DataWarehouseNode | EventsNode | GroupNode<DataWarehouseNode>>
+    ) => {
+        events: Record<string, ActionsNode | DataWarehouseNode | EventsNode | GroupNode<DataWarehouseNode>>
+    } // customerAnalyticsConfigLogic
+    addEventToHighlight: (event: string) => {
+        event: string
+    }
+    clearEventsToHighlight: () => {
+        value: true
+    }
+    clearFilterSelections: () => {
+        value: true
+    }
+    saveEvents: () => {
+        value: true
+    }
+    setActivityEventSelection: (filters: FilterType | null) => {
+        filters: FilterType | null
+    }
+    setPaymentEventSelection: (filters: FilterType | null) => {
+        filters: FilterType | null
+    }
+    setSignupEventSelection: (filters: FilterType | null) => {
+        filters: FilterType | null
+    }
+    setSignupPageviewEventSelection: (filters: FilterType | null) => {
+        filters: FilterType | null
+    }
+    setSubscriptionEventSelection: (filters: FilterType | null) => {
+        filters: FilterType | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface customerAnalyticsDashboardEventsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        activityEventFilters: (activityEvent: AnyEntityNode, activityEventSelection: FilterType | null) => FilterType
+        signupEventFilters: (signupEvent: AnyEntityNode, signupEventSelection: FilterType | null) => FilterType | null
+        signupPageviewEventFilters: (
+            signupPageviewEvent: AnyEntityNode,
+            signupPageviewEventSelection: FilterType | null
+        ) => FilterType | null
+        paymentEventFilters: (
+            paymentEvent: AnyEntityNode,
+            paymentEventSelection: FilterType | null
+        ) => FilterType | null
+        subscriptionEventFilters: (
+            subscriptionEvent: AnyEntityNode,
+            subscriptionEventSelection: FilterType | null
+        ) => FilterType | null
+        hasChanges: (
+            activityEventSelection: FilterType | null,
+            signupEventSelection: FilterType | null,
+            signupPageviewEventSelection: FilterType | null,
+            paymentEventSelection: FilterType | null,
+            subscriptionEventSelection: FilterType | null
+        ) => boolean
+        activityEventSelector: (activityEventFilters: FilterType) => EventSelectorProps
+        signupPageviewEventSelector: (signupPageviewEventFilters: FilterType | null) => EventSelectorProps
+        signupEventSelector: (signupEventFilters: FilterType | null) => EventSelectorProps
+        subscriptionEventSelector: (subscriptionEventFilters: FilterType | null) => {
+            caption: string
+            filters: FilterType | null
+            prompt: string
+            relatedSeries: string[]
+            setFilters: ActionForPayloadBuilder<
+                (filters: FilterType | null) => {
+                    filters: FilterType | null
+                }
+            >
+            title: string
+        }
+        paymentEventSelector: (paymentEventFilters: FilterType | null) => {
+            caption: string
+            filters: FilterType | null
+            prompt: string
+            relatedSeries: string[]
+            setFilters: ActionForPayloadBuilder<
+                (filters: FilterType | null) => {
+                    filters: FilterType | null
+                }
+            >
+            title: string
+        }
+        eventSelectors: (
+            activityEventSelector: EventSelectorProps,
+            signupPageviewEventSelector: EventSelectorProps,
+            signupEventSelector: EventSelectorProps,
+            subscriptionEventSelector: {
+                caption: string
+                filters: FilterType | null
+                prompt: string
+                relatedSeries: string[]
+                setFilters: ActionForPayloadBuilder<
+                    (filters: FilterType | null) => {
+                        filters: FilterType | null
+                    }
+                >
+                title: string
+            },
+            paymentEventSelector: {
+                caption: string
+                filters: FilterType | null
+                prompt: string
+                relatedSeries: string[]
+                setFilters: ActionForPayloadBuilder<
+                    (filters: FilterType | null) => {
+                        filters: FilterType | null
+                    }
+                >
+                title: string
+            }
+        ) => EventSelectorProps[]
+    }
+}
+
+export type customerAnalyticsDashboardEventsLogicType = MakeLogicType<
+    customerAnalyticsDashboardEventsLogicValues,
+    customerAnalyticsDashboardEventsLogicActions,
+    Record<string, any>,
+    customerAnalyticsDashboardEventsLogicMeta
+>
 
 export const customerAnalyticsDashboardEventsLogic = kea<customerAnalyticsDashboardEventsLogicType>([
     path(['products', 'customerAnalytics', 'components', 'insights', 'eventConfigModal']),
@@ -91,7 +267,10 @@ export const customerAnalyticsDashboardEventsLogic = kea<customerAnalyticsDashbo
     selectors(({ actions }) => ({
         activityEventFilters: [
             (s) => [s.activityEvent, s.activityEventSelection],
-            (activityEvent, activityEventSelection): FilterType => {
+            (
+                activityEvent: import('~/queries/schema').AnyEntityNode,
+                activityEventSelection: FilterType | null
+            ): FilterType => {
                 if (activityEventSelection) {
                     return activityEventSelection
                 }
@@ -103,7 +282,10 @@ export const customerAnalyticsDashboardEventsLogic = kea<customerAnalyticsDashbo
         ],
         signupEventFilters: [
             (s) => [s.signupEvent, s.signupEventSelection],
-            (signupEvent, signupEventSelection): FilterType | null => {
+            (
+                signupEvent: import('~/queries/schema').AnyEntityNode,
+                signupEventSelection: FilterType | null
+            ): FilterType | null => {
                 if (signupEventSelection) {
                     return signupEventSelection
                 }
@@ -118,7 +300,10 @@ export const customerAnalyticsDashboardEventsLogic = kea<customerAnalyticsDashbo
         ],
         signupPageviewEventFilters: [
             (s) => [s.signupPageviewEvent, s.signupPageviewEventSelection],
-            (signupPageviewEvent, signupPageviewEventSelection): FilterType | null => {
+            (
+                signupPageviewEvent: import('~/queries/schema').AnyEntityNode,
+                signupPageviewEventSelection: FilterType | null
+            ): FilterType | null => {
                 if (signupPageviewEventSelection) {
                     return signupPageviewEventSelection
                 }
@@ -133,7 +318,10 @@ export const customerAnalyticsDashboardEventsLogic = kea<customerAnalyticsDashbo
         ],
         paymentEventFilters: [
             (s) => [s.paymentEvent, s.paymentEventSelection],
-            (paymentEvent, paymentEventSelection): FilterType | null => {
+            (
+                paymentEvent: import('~/queries/schema').AnyEntityNode,
+                paymentEventSelection: FilterType | null
+            ): FilterType | null => {
                 if (paymentEventSelection) {
                     return paymentEventSelection
                 }
@@ -148,7 +336,10 @@ export const customerAnalyticsDashboardEventsLogic = kea<customerAnalyticsDashbo
         ],
         subscriptionEventFilters: [
             (s) => [s.subscriptionEvent, s.subscriptionEventSelection],
-            (subscriptionEvent, subscriptionEventSelection): FilterType | null => {
+            (
+                subscriptionEvent: import('~/queries/schema').AnyEntityNode,
+                subscriptionEventSelection: FilterType | null
+            ): FilterType | null => {
                 if (subscriptionEventSelection) {
                     return subscriptionEventSelection
                 }
@@ -170,11 +361,11 @@ export const customerAnalyticsDashboardEventsLogic = kea<customerAnalyticsDashbo
                 s.subscriptionEventSelection,
             ],
             (
-                activityEventSelection,
-                signupEventSelection,
-                signupPageviewEventSelection,
-                paymentEventSelection,
-                subscriptionEventSelection
+                activityEventSelection: FilterType | null,
+                signupEventSelection: FilterType | null,
+                signupPageviewEventSelection: FilterType | null,
+                paymentEventSelection: FilterType | null,
+                subscriptionEventSelection: FilterType | null
             ): boolean => {
                 return (
                     activityEventSelection !== null ||
@@ -187,7 +378,7 @@ export const customerAnalyticsDashboardEventsLogic = kea<customerAnalyticsDashbo
         ],
         activityEventSelector: [
             (s) => [s.activityEventFilters],
-            (activityEventFilters): EventSelectorProps => ({
+            (activityEventFilters: FilterType): EventSelectorProps => ({
                 title: 'Activity event',
                 caption: 'Defines what is considered user activity for active users and engagement calculations',
                 filters: activityEventFilters,
@@ -198,7 +389,7 @@ export const customerAnalyticsDashboardEventsLogic = kea<customerAnalyticsDashbo
         ],
         signupPageviewEventSelector: [
             (s) => [s.signupPageviewEventFilters],
-            (signupPageviewEventFilters): EventSelectorProps => ({
+            (signupPageviewEventFilters: FilterType | null): EventSelectorProps => ({
                 title: 'Signup pageview event',
                 caption: 'Tracks when users view the signup page. Used to calculate signup conversion',
                 filters: signupPageviewEventFilters,
@@ -209,7 +400,7 @@ export const customerAnalyticsDashboardEventsLogic = kea<customerAnalyticsDashbo
         ],
         signupEventSelector: [
             (s) => [s.signupEventFilters],
-            (signupEventFilters): EventSelectorProps => ({
+            (signupEventFilters: FilterType | null): EventSelectorProps => ({
                 title: 'Signup event',
                 caption: 'Tracks when users complete registration or account creation',
                 filters: signupEventFilters,
@@ -220,7 +411,7 @@ export const customerAnalyticsDashboardEventsLogic = kea<customerAnalyticsDashbo
         ],
         subscriptionEventSelector: [
             (s) => [s.subscriptionEventFilters],
-            (subscriptionEventFilters) => ({
+            (subscriptionEventFilters: FilterType | null) => ({
                 title: 'Subscription event',
                 caption: 'Tracks when users subscribe to a plan. May or may not be associated with a payment',
                 filters: subscriptionEventFilters,
@@ -231,7 +422,7 @@ export const customerAnalyticsDashboardEventsLogic = kea<customerAnalyticsDashbo
         ],
         paymentEventSelector: [
             (s) => [s.paymentEventFilters],
-            (paymentEventFilters) => ({
+            (paymentEventFilters: FilterType | null) => ({
                 title: 'Payment event',
                 caption: 'Tracks when users complete a payment. Used to calculate free-to-paid conversion',
                 filters: paymentEventFilters,
@@ -249,11 +440,25 @@ export const customerAnalyticsDashboardEventsLogic = kea<customerAnalyticsDashbo
                 s.paymentEventSelector,
             ],
             (
-                activityEventSelector,
-                signupPageviewEventSelector,
-                signupEventSelector,
-                subscriptionEventSelector,
-                paymentEventSelector
+                activityEventSelector: EventSelectorProps,
+                signupPageviewEventSelector: EventSelectorProps,
+                signupEventSelector: EventSelectorProps,
+                subscriptionEventSelector: {
+                    caption: string
+                    filters: FilterType | null
+                    prompt: string
+                    relatedSeries: string[]
+                    setFilters: (filters: FilterType | null) => void
+                    title: string
+                },
+                paymentEventSelector: {
+                    caption: string
+                    filters: FilterType | null
+                    prompt: string
+                    relatedSeries: string[]
+                    setFilters: (filters: FilterType | null) => void
+                    title: string
+                }
             ): EventSelectorProps[] => [
                 activityEventSelector,
                 signupPageviewEventSelector,
diff --git a/products/customer_analytics/frontend/scenes/CustomerJourneyTemplatesScene/journeyTemplatePickerLogic.ts b/products/customer_analytics/frontend/scenes/CustomerJourneyTemplatesScene/journeyTemplatePickerLogic.ts
index fd0735f8fc32..2ecedefec247 100644
--- a/products/customer_analytics/frontend/scenes/CustomerJourneyTemplatesScene/journeyTemplatePickerLogic.ts
+++ b/products/customer_analytics/frontend/scenes/CustomerJourneyTemplatesScene/journeyTemplatePickerLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { lazyLoaders } from 'kea-loaders'
 import { router } from 'kea-router'
 
@@ -10,11 +10,85 @@ import { urls } from 'scenes/urls'
 import { getQueryBasedInsightModel } from '~/queries/nodes/InsightViz/utils'
 import { InsightType, QueryBasedInsightModel } from '~/types'
 
+import type { AnyEntityNode, Node } from '../../../../../frontend/src/queries/schema/schema-general'
 import { customerAnalyticsConfigLogic } from '../../customerAnalyticsConfigLogic'
-import type { journeyTemplatePickerLogicType } from './journeyTemplatePickerLogicType'
 
 export type JourneyTemplateKey = 'signup_conversion' | 'free_to_paid' | 'scratch'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface journeyTemplatePickerLogicValues {
+    paymentEvent: AnyEntityNode // customerAnalyticsConfigLogic
+    signupEvent: AnyEntityNode // customerAnalyticsConfigLogic
+    signupPageviewEvent: AnyEntityNode // customerAnalyticsConfigLogic
+    funnels: QueryBasedInsightModel[]
+    funnelsLoading: boolean
+    isFreeToPaidAvailable: boolean
+    isSignupConversionAvailable: boolean
+    searchTerm: string
+    showExistingFunnels: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface journeyTemplatePickerLogicActions {
+    reportCustomerJourneyExistingFunnelSelected: (insightId: number) => {
+        insightId: number
+    } // eventUsageLogic
+    reportCustomerJourneyTemplateSelected: (templateKey: string) => {
+        templateKey: string
+    } // eventUsageLogic
+    loadFunnels: () => {
+        value: true
+    }
+    loadFunnelsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadFunnelsSuccess: (
+        funnels: QueryBasedInsightModel<Node<Record<string, any>>>[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        funnels: QueryBasedInsightModel<Node<Record<string, any>>>[]
+        payload?: {
+            value: true
+        }
+    }
+    resetState: () => {
+        value: true
+    }
+    selectExistingFunnel: (insightId: number) => {
+        insightId: number
+    }
+    selectTemplate: (templateKey: JourneyTemplateKey) => {
+        templateKey: JourneyTemplateKey
+    }
+    setSearchTerm: (term: string) => {
+        term: string
+    }
+    toggleExistingFunnels: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface journeyTemplatePickerLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        isSignupConversionAvailable: (signupPageviewEvent: AnyEntityNode, signupEvent: AnyEntityNode) => boolean
+        isFreeToPaidAvailable: (signupEvent: AnyEntityNode, paymentEvent: AnyEntityNode) => boolean
+    }
+}
+
+export type journeyTemplatePickerLogicType = MakeLogicType<
+    journeyTemplatePickerLogicValues,
+    journeyTemplatePickerLogicActions,
+    Record<string, any>,
+    journeyTemplatePickerLogicMeta
+>
+
 export const journeyTemplatePickerLogic = kea<journeyTemplatePickerLogicType>([
     path([
         'products',
@@ -77,12 +151,17 @@ export const journeyTemplatePickerLogic = kea<journeyTemplatePickerLogicType>([
     selectors({
         isSignupConversionAvailable: [
             (s) => [s.signupPageviewEvent, s.signupEvent],
-            (signupPageviewEvent, signupEvent): boolean =>
-                !isEmptyObject(signupPageviewEvent) && !isEmptyObject(signupEvent),
+            (
+                signupPageviewEvent: import('~/queries/schema').AnyEntityNode,
+                signupEvent: import('~/queries/schema').AnyEntityNode
+            ): boolean => !isEmptyObject(signupPageviewEvent) && !isEmptyObject(signupEvent),
         ],
         isFreeToPaidAvailable: [
             (s) => [s.signupEvent, s.paymentEvent],
-            (signupEvent, paymentEvent): boolean => !isEmptyObject(signupEvent) && !isEmptyObject(paymentEvent),
+            (
+                signupEvent: import('~/queries/schema').AnyEntityNode,
+                paymentEvent: import('~/queries/schema').AnyEntityNode
+            ): boolean => !isEmptyObject(signupEvent) && !isEmptyObject(paymentEvent),
         ],
     }),
 
diff --git a/products/dashboards/frontend/logics/dashboardsFileSystemLogic.ts b/products/dashboards/frontend/logics/dashboardsFileSystemLogic.ts
index 1588e6c75a2d..d2a6b4ed3e1d 100644
--- a/products/dashboards/frontend/logics/dashboardsFileSystemLogic.ts
+++ b/products/dashboards/frontend/logics/dashboardsFileSystemLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
@@ -13,7 +13,6 @@ import { dashboardsModel } from '~/models/dashboardsModel'
 import { FileSystemEntry } from '~/queries/schema/schema-general'
 import { DashboardBasicType } from '~/types'
 
-import type { dashboardsFileSystemLogicType } from './dashboardsFileSystemLogicType'
 import {
     buildEntryByRef,
     buildFolderDashboardCounts,
@@ -65,6 +64,136 @@ async function fetchAllFileSystemEntries(type: 'dashboard' | 'folder'): Promise<
     return entries
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dashboardsFileSystemLogicValues {
+    dashboards: DashboardBasicType[] // dashboardsLogic
+    currentFolder: string
+    currentSubtreeDashboards: DashboardBasicType[]
+    dashboardFileSystemEntries: FileSystemEntry[]
+    dashboardFileSystemEntriesLoading: boolean
+    entryByRef: Record<string, FileSystemEntry>
+    expandedFolders: Record<string, boolean>
+    folderDashboardCounts: Record<string, number>
+    folderEntries: FileSystemEntry[]
+    folderEntriesLoading: boolean
+    folderEntryByPath: Record<string, FileSystemEntry>
+    folderPaths: string[]
+    folderTree: FolderTreeNode[]
+    isTreePanelExpanded: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dashboardsFileSystemLogicActions {
+    createSavedItem: (savedItem: FileSystemEntry) => {
+        savedItem: FileSystemEntry
+    } // projectTreeDataLogic
+    deleteItem: (
+        item: FileSystemEntry,
+        projectTreeLogicKey: string
+    ) => {
+        item: FileSystemEntry
+        projectTreeLogicKey: string
+    } // projectTreeDataLogic
+    movedItem: (
+        item: FileSystemEntry,
+        oldPath: string,
+        newPath: string
+    ) => {
+        item: FileSystemEntry
+        newPath: string
+        oldPath: string
+    } // projectTreeDataLogic
+    createFolder: (
+        name: string,
+        parentPath?: string
+    ) => {
+        name: string
+        parentPath: string | undefined
+    }
+    deleteFolder: (entry: FileSystemEntry) => {
+        entry: FileSystemEntry
+    }
+    loadDashboardFileSystemEntries: () => any
+    loadDashboardFileSystemEntriesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadDashboardFileSystemEntriesSuccess: (
+        dashboardFileSystemEntries: FileSystemEntry[],
+        payload?: any
+    ) => {
+        dashboardFileSystemEntries: FileSystemEntry[]
+        payload?: any
+    }
+    loadFolderEntries: () => any
+    loadFolderEntriesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadFolderEntriesSuccess: (
+        folderEntries: FileSystemEntry[],
+        payload?: any
+    ) => {
+        folderEntries: FileSystemEntry[]
+        payload?: any
+    }
+    navigateToFolder: (folder: string) => {
+        folder: string
+    }
+    renameFolder: (
+        entry: FileSystemEntry,
+        newName: string
+    ) => {
+        entry: FileSystemEntry
+        newName: string
+    }
+    setExpandedFolders: (folders: Record<string, boolean>) => {
+        folders: Record<string, boolean>
+    }
+    toggleFolder: (folder: string) => {
+        folder: string
+    }
+    toggleTreePanel: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface dashboardsFileSystemLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        entryByRef: (dashboardFileSystemEntries: FileSystemEntry[]) => Record<string, FileSystemEntry>
+        folderPaths: (folderEntries: FileSystemEntry[]) => string[]
+        folderEntryByPath: (folderEntries: FileSystemEntry[]) => Record<string, FileSystemEntry>
+        folderTree: (
+            dashboards: DashboardBasicType[],
+            entryByRef: Record<string, FileSystemEntry>,
+            folderPaths: string[]
+        ) => FolderTreeNode[]
+        currentSubtreeDashboards: (
+            dashboards: DashboardBasicType[],
+            entryByRef: Record<string, FileSystemEntry>,
+            currentFolder: string
+        ) => DashboardBasicType[]
+        folderDashboardCounts: (
+            dashboards: DashboardBasicType[],
+            entryByRef: Record<string, FileSystemEntry>
+        ) => Record<string, number>
+    }
+}
+
+export type dashboardsFileSystemLogicType = MakeLogicType<
+    dashboardsFileSystemLogicValues,
+    dashboardsFileSystemLogicActions,
+    Record<string, any>,
+    dashboardsFileSystemLogicMeta
+>
+
 // View state for the tree arm: a folder tree built from the same FileSystem rows that back the sidebar
 // (both dashboard and folder rows, so empty folders appear), the selected folder, its expand state, and the
 // dashboards at or below it. Folder creation calls api.fileSystem.create then
@@ -140,33 +269,43 @@ export const dashboardsFileSystemLogic = kea<dashboardsFileSystemLogicType>([
     selectors({
         entryByRef: [
             (s) => [s.dashboardFileSystemEntries],
-            (entries): Record<string, FileSystemEntry> => buildEntryByRef(entries),
+            (entries: FileSystemEntry[]): Record<string, FileSystemEntry> => buildEntryByRef(entries),
+        ],
+        folderPaths: [
+            (s) => [s.folderEntries],
+            (folderEntries: FileSystemEntry[]): string[] => folderEntries.map((entry) => entry.path),
         ],
-        folderPaths: [(s) => [s.folderEntries], (folderEntries): string[] => folderEntries.map((entry) => entry.path)],
         // Real folder rows keyed by path, so the folder menu can act on a folder's FileSystemEntry (needs its
         // id). Folders that exist only because a dashboard references them (no row) are absent — the menu hides
         // move/rename/delete for those and offers only "New subfolder".
         folderEntryByPath: [
             (s) => [s.folderEntries],
-            (folderEntries): Record<string, FileSystemEntry> =>
+            (folderEntries: FileSystemEntry[]): Record<string, FileSystemEntry> =>
                 Object.fromEntries(folderEntries.map((entry) => [entry.path, entry])),
         ],
         folderTree: [
             (s) => [s.dashboards, s.entryByRef, s.folderPaths],
-            (dashboards, entryByRef, folderPaths): FolderTreeNode[] =>
-                buildFolderTree(dashboards, entryByRef, folderPaths),
+            (
+                dashboards: DashboardBasicType[],
+                entryByRef: Record<string, FileSystemEntry>,
+                folderPaths: string[]
+            ): FolderTreeNode[] => buildFolderTree(dashboards, entryByRef, folderPaths),
         ],
         // Tree arm: every dashboard at or below the selected folder, recursively (root = all). The tree is a
         // scope selector; the content pane (DashboardsTable) shows everything in scope.
         currentSubtreeDashboards: [
             (s) => [s.dashboards, s.entryByRef, s.currentFolder],
-            (dashboards, entryByRef, currentFolder): DashboardBasicType[] =>
-                subtreeDashboards(dashboards, entryByRef, currentFolder),
+            (
+                dashboards: DashboardBasicType[],
+                entryByRef: Record<string, FileSystemEntry>,
+                currentFolder: string
+            ): DashboardBasicType[] => subtreeDashboards(dashboards, entryByRef, currentFolder),
         ],
         // Dashboard count per folder path (subtree), for the tree's trailing count badges.
         folderDashboardCounts: [
             (s) => [s.dashboards, s.entryByRef],
-            (dashboards, entryByRef): Record<string, number> => buildFolderDashboardCounts(dashboards, entryByRef),
+            (dashboards: DashboardBasicType[], entryByRef: Record<string, FileSystemEntry>): Record<string, number> =>
+                buildFolderDashboardCounts(dashboards, entryByRef),
         ],
     }),
     listeners(({ values, actions }) => ({
diff --git a/products/dashboards/frontend/widgets/activity/editActivityEventsWidgetModalLogic.ts b/products/dashboards/frontend/widgets/activity/editActivityEventsWidgetModalLogic.ts
index b9956ef57195..144814ffcada 100644
--- a/products/dashboards/frontend/widgets/activity/editActivityEventsWidgetModalLogic.ts
+++ b/products/dashboards/frontend/widgets/activity/editActivityEventsWidgetModalLogic.ts
@@ -1,10 +1,11 @@
-import { actions, connect, defaults, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, defaults, kea, listeners, path, props, reducers, selectors } from 'kea'
 
 import { filterTestAccountsDefaultsLogic } from 'scenes/settings/environment/filterTestAccountDefaultsLogic'
 
 import type { ActivityEventsWidgetConfig } from '../../generated/widget-configs.zod'
 import { isWidgetConfigValidationError } from '../../utils'
 import { resolveWidgetFilterTestAccounts } from '../../widget_types/widgetConfigShared'
+import type { WidgetDateFromValue } from '../../widget_types/widgetConfigShared'
 import {
     widgetEditModalFilterTestAccountsActions,
     widgetEditModalListFieldActions,
@@ -19,10 +20,459 @@ import {
     validateActivityEventsWidgetConfigInput,
     type ActivityEventsWidgetFieldErrors,
 } from './activityEventsWidgetConfigValidation'
-import type { editActivityEventsWidgetModalLogicType } from './editActivityEventsWidgetModalLogicType'
 
 export type EditActivityEventsWidgetModalLogicProps = Omit<DashboardWidgetEditModalProps, 'isOpen'>
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface editActivityEventsWidgetModalLogicValues {
+    filterTestAccountsDefault: boolean // filterTestAccountsDefaultsLogic
+    activeFieldErrors: ActivityEventsWidgetFieldErrors
+    defaultTitle: string
+    fieldErrors: ActivityEventsWidgetFieldErrors
+    filterTestAccounts: boolean
+    limit: number
+    onClose: () => void
+    saveDisabledReason: string | undefined
+    saving: boolean
+    tileDescription: string
+    tileName: string
+    validation:
+        | {
+              fieldErrors: Partial<Record<'dateRange' | 'filterTestAccounts' | 'limit', string>>
+              success: false
+          }
+        | {
+              config: {
+                  dateRange?:
+                      | {
+                            date_from?:
+                                | '-14d'
+                                | '-1h'
+                                | '-1M'
+                                | '-24h'
+                                | '-30d'
+                                | '-30M'
+                                | '-3h'
+                                | '-7d'
+                                | '-90d'
+                                | null
+                                | undefined
+                        }
+                      | null
+                      | undefined
+                  eventName?: string | null | undefined
+                  filterTestAccounts?: boolean | null | undefined
+                  limit: number
+                  widgetFilters?:
+                      | Record<
+                            string,
+                            {
+                                filterId: string
+                                operator:
+                                    | 'between'
+                                    | 'exact'
+                                    | 'flag_evaluates_to'
+                                    | 'gt'
+                                    | 'gte'
+                                    | 'icontains'
+                                    | 'icontains_multi'
+                                    | 'in'
+                                    | 'is_cleaned_path_exact'
+                                    | 'is_date_after'
+                                    | 'is_date_before'
+                                    | 'is_date_exact'
+                                    | 'is_not'
+                                    | 'is_not_set'
+                                    | 'is_set'
+                                    | 'lt'
+                                    | 'lte'
+                                    | 'max'
+                                    | 'min'
+                                    | 'not_between'
+                                    | 'not_icontains'
+                                    | 'not_icontains_multi'
+                                    | 'not_in'
+                                    | 'not_regex'
+                                    | 'regex'
+                                    | 'semver_caret'
+                                    | 'semver_eq'
+                                    | 'semver_gt'
+                                    | 'semver_gte'
+                                    | 'semver_lt'
+                                    | 'semver_lte'
+                                    | 'semver_neq'
+                                    | 'semver_tilde'
+                                    | 'semver_wildcard'
+                                optionId: string
+                                propertyName: string
+                                value?: string | string[] | null | undefined
+                            }
+                        >
+                      | null
+                      | undefined
+              }
+              success: true
+          }
+    widgetConfig: ActivityEventsWidgetConfig
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface editActivityEventsWidgetModalLogicActions {
+    clearFieldError: (field: keyof ActivityEventsWidgetFieldErrors) => {
+        field: 'dateRange' | 'filterTestAccounts' | 'limit'
+    }
+    setDateFrom: (dateFrom: WidgetDateFromValue) => {
+        dateFrom: WidgetDateFromValue
+    }
+    setFieldErrors: (fieldErrors: ActivityEventsWidgetFieldErrors) => {
+        fieldErrors: Partial<Record<'dateRange' | 'filterTestAccounts' | 'limit', string>>
+    }
+    setFilterTestAccounts: (filterTestAccounts: boolean) => {
+        filterTestAccounts: boolean
+    }
+    setLimit: (limit: number) => {
+        limit: number
+    }
+    setTileDescription: (tileDescription: string) => {
+        tileDescription: string
+    }
+    setTileName: (tileName: string) => {
+        tileName: string
+    }
+    submit: () => {
+        value: true
+    }
+    submitFailure: () => {
+        value: true
+    }
+    submitSuccess: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface editActivityEventsWidgetModalLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        validation: (
+            limit: number,
+            filterTestAccounts: boolean,
+            widgetConfig: {
+                dateRange?:
+                    | {
+                          date_from?:
+                              | '-14d'
+                              | '-1h'
+                              | '-1M'
+                              | '-24h'
+                              | '-30d'
+                              | '-30M'
+                              | '-3h'
+                              | '-7d'
+                              | '-90d'
+                              | null
+                              | undefined
+                      }
+                    | null
+                    | undefined
+                eventName?: string | null | undefined
+                filterTestAccounts?: boolean | null | undefined
+                limit: number
+                widgetFilters?:
+                    | Record<
+                          string,
+                          {
+                              filterId: string
+                              operator:
+                                  | 'between'
+                                  | 'exact'
+                                  | 'flag_evaluates_to'
+                                  | 'gt'
+                                  | 'gte'
+                                  | 'icontains'
+                                  | 'icontains_multi'
+                                  | 'in'
+                                  | 'is_cleaned_path_exact'
+                                  | 'is_date_after'
+                                  | 'is_date_before'
+                                  | 'is_date_exact'
+                                  | 'is_not'
+                                  | 'is_not_set'
+                                  | 'is_set'
+                                  | 'lt'
+                                  | 'lte'
+                                  | 'max'
+                                  | 'min'
+                                  | 'not_between'
+                                  | 'not_icontains'
+                                  | 'not_icontains_multi'
+                                  | 'not_in'
+                                  | 'not_regex'
+                                  | 'regex'
+                                  | 'semver_caret'
+                                  | 'semver_eq'
+                                  | 'semver_gt'
+                                  | 'semver_gte'
+                                  | 'semver_lt'
+                                  | 'semver_lte'
+                                  | 'semver_neq'
+                                  | 'semver_tilde'
+                                  | 'semver_wildcard'
+                              optionId: string
+                              propertyName: string
+                              value?: string | string[] | null | undefined
+                          }
+                      >
+                    | null
+                    | undefined
+            }
+        ) =>
+            | {
+                  fieldErrors: Partial<Record<'dateRange' | 'filterTestAccounts' | 'limit', string>>
+                  success: false
+              }
+            | {
+                  config: {
+                      dateRange?:
+                          | {
+                                date_from?:
+                                    | '-14d'
+                                    | '-1h'
+                                    | '-1M'
+                                    | '-24h'
+                                    | '-30d'
+                                    | '-30M'
+                                    | '-3h'
+                                    | '-7d'
+                                    | '-90d'
+                                    | null
+                                    | undefined
+                            }
+                          | null
+                          | undefined
+                      eventName?: string | null | undefined
+                      filterTestAccounts?: boolean | null | undefined
+                      limit: number
+                      widgetFilters?:
+                          | Record<
+                                string,
+                                {
+                                    filterId: string
+                                    operator:
+                                        | 'between'
+                                        | 'exact'
+                                        | 'flag_evaluates_to'
+                                        | 'gt'
+                                        | 'gte'
+                                        | 'icontains'
+                                        | 'icontains_multi'
+                                        | 'in'
+                                        | 'is_cleaned_path_exact'
+                                        | 'is_date_after'
+                                        | 'is_date_before'
+                                        | 'is_date_exact'
+                                        | 'is_not'
+                                        | 'is_not_set'
+                                        | 'is_set'
+                                        | 'lt'
+                                        | 'lte'
+                                        | 'max'
+                                        | 'min'
+                                        | 'not_between'
+                                        | 'not_icontains'
+                                        | 'not_icontains_multi'
+                                        | 'not_in'
+                                        | 'not_regex'
+                                        | 'regex'
+                                        | 'semver_caret'
+                                        | 'semver_eq'
+                                        | 'semver_gt'
+                                        | 'semver_gte'
+                                        | 'semver_lt'
+                                        | 'semver_lte'
+                                        | 'semver_neq'
+                                        | 'semver_tilde'
+                                        | 'semver_wildcard'
+                                    optionId: string
+                                    propertyName: string
+                                    value?: string | string[] | null | undefined
+                                }
+                            >
+                          | null
+                          | undefined
+                  }
+                  success: true
+              }
+        activeFieldErrors: (
+            validation:
+                | {
+                      config: {
+                          dateRange?:
+                              | {
+                                    date_from?:
+                                        | '-14d'
+                                        | '-1h'
+                                        | '-1M'
+                                        | '-24h'
+                                        | '-30d'
+                                        | '-30M'
+                                        | '-3h'
+                                        | '-7d'
+                                        | '-90d'
+                                        | null
+                                        | undefined
+                                }
+                              | null
+                              | undefined
+                          eventName?: string | null | undefined
+                          filterTestAccounts?: boolean | null | undefined
+                          limit: number
+                          widgetFilters?:
+                              | Record<
+                                    string,
+                                    {
+                                        filterId: string
+                                        operator:
+                                            | 'between'
+                                            | 'exact'
+                                            | 'flag_evaluates_to'
+                                            | 'gt'
+                                            | 'gte'
+                                            | 'icontains'
+                                            | 'icontains_multi'
+                                            | 'in'
+                                            | 'is_cleaned_path_exact'
+                                            | 'is_date_after'
+                                            | 'is_date_before'
+                                            | 'is_date_exact'
+                                            | 'is_not'
+                                            | 'is_not_set'
+                                            | 'is_set'
+                                            | 'lt'
+                                            | 'lte'
+                                            | 'max'
+                                            | 'min'
+                                            | 'not_between'
+                                            | 'not_icontains'
+                                            | 'not_icontains_multi'
+                                            | 'not_in'
+                                            | 'not_regex'
+                                            | 'regex'
+                                            | 'semver_caret'
+                                            | 'semver_eq'
+                                            | 'semver_gt'
+                                            | 'semver_gte'
+                                            | 'semver_lt'
+                                            | 'semver_lte'
+                                            | 'semver_neq'
+                                            | 'semver_tilde'
+                                            | 'semver_wildcard'
+                                        optionId: string
+                                        propertyName: string
+                                        value?: string | string[] | null | undefined
+                                    }
+                                >
+                              | null
+                              | undefined
+                      }
+                      success: true
+                  }
+                | {
+                      fieldErrors: Partial<Record<'dateRange' | 'filterTestAccounts' | 'limit', string>>
+                      success: false
+                  },
+            fieldErrors: Partial<Record<'dateRange' | 'filterTestAccounts' | 'limit', string>>
+        ) => ActivityEventsWidgetFieldErrors
+        saveDisabledReason: (
+            saving: boolean,
+            validation:
+                | {
+                      config: {
+                          dateRange?:
+                              | {
+                                    date_from?:
+                                        | '-14d'
+                                        | '-1h'
+                                        | '-1M'
+                                        | '-24h'
+                                        | '-30d'
+                                        | '-30M'
+                                        | '-3h'
+                                        | '-7d'
+                                        | '-90d'
+                                        | null
+                                        | undefined
+                                }
+                              | null
+                              | undefined
+                          eventName?: string | null | undefined
+                          filterTestAccounts?: boolean | null | undefined
+                          limit: number
+                          widgetFilters?:
+                              | Record<
+                                    string,
+                                    {
+                                        filterId: string
+                                        operator:
+                                            | 'between'
+                                            | 'exact'
+                                            | 'flag_evaluates_to'
+                                            | 'gt'
+                                            | 'gte'
+                                            | 'icontains'
+                                            | 'icontains_multi'
+                                            | 'in'
+                                            | 'is_cleaned_path_exact'
+                                            | 'is_date_after'
+                                            | 'is_date_before'
+                                            | 'is_date_exact'
+                                            | 'is_not'
+                                            | 'is_not_set'
+                                            | 'is_set'
+                                            | 'lt'
+                                            | 'lte'
+                                            | 'max'
+                                            | 'min'
+                                            | 'not_between'
+                                            | 'not_icontains'
+                                            | 'not_icontains_multi'
+                                            | 'not_in'
+                                            | 'not_regex'
+                                            | 'regex'
+                                            | 'semver_caret'
+                                            | 'semver_eq'
+                                            | 'semver_gt'
+                                            | 'semver_gte'
+                                            | 'semver_lt'
+                                            | 'semver_lte'
+                                            | 'semver_neq'
+                                            | 'semver_tilde'
+                                            | 'semver_wildcard'
+                                        optionId: string
+                                        propertyName: string
+                                        value?: string | string[] | null | undefined
+                                    }
+                                >
+                              | null
+                              | undefined
+                      }
+                      success: true
+                  }
+                | {
+                      fieldErrors: Partial<Record<'dateRange' | 'filterTestAccounts' | 'limit', string>>
+                      success: false
+                  }
+        ) => string | undefined
+        widgetConfig: (config: Record<string, unknown>) => ActivityEventsWidgetConfig
+    }
+}
+
+export type editActivityEventsWidgetModalLogicType = MakeLogicType<
+    editActivityEventsWidgetModalLogicValues,
+    editActivityEventsWidgetModalLogicActions,
+    EditActivityEventsWidgetModalLogicProps,
+    editActivityEventsWidgetModalLogicMeta
+>
+
 export const editActivityEventsWidgetModalLogic = kea<editActivityEventsWidgetModalLogicType>([
     path(['products', 'dashboards', 'widgets', 'activity', 'editActivityEventsWidgetModalLogic']),
 
@@ -109,12 +559,12 @@ export const editActivityEventsWidgetModalLogic = kea<editActivityEventsWidgetMo
     selectors({
         widgetConfig: [
             (_, p) => [p.config],
-            (config): ActivityEventsWidgetConfig => parseActivityEventsWidgetConfig(config),
+            (config: Record<string, unknown>): ActivityEventsWidgetConfig => parseActivityEventsWidgetConfig(config),
         ],
         ...widgetEditModalPropSelectors,
         validation: [
             (s) => [s.limit, s.filterTestAccounts, s.widgetConfig],
-            (limit, filterTestAccounts, widgetConfig) =>
+            (limit: number, filterTestAccounts: boolean, widgetConfig: ActivityEventsWidgetConfig) =>
                 validateActivityEventsWidgetConfigInput({
                     limit,
                     filterTestAccounts,
@@ -123,7 +573,86 @@ export const editActivityEventsWidgetModalLogic = kea<editActivityEventsWidgetMo
         ],
         activeFieldErrors: [
             (s) => [s.validation, s.fieldErrors],
-            (validation, fieldErrors): ActivityEventsWidgetFieldErrors => {
+            (
+                validation:
+                    | {
+                          config: {
+                              dateRange?:
+                                  | {
+                                        date_from?:
+                                            | '-14d'
+                                            | '-1h'
+                                            | '-1M'
+                                            | '-24h'
+                                            | '-30d'
+                                            | '-30M'
+                                            | '-3h'
+                                            | '-7d'
+                                            | '-90d'
+                                            | null
+                                            | undefined
+                                    }
+                                  | null
+                                  | undefined
+                              eventName?: string | null | undefined
+                              filterTestAccounts?: boolean | null | undefined
+                              limit: number
+                              widgetFilters?:
+                                  | Record<
+                                        string,
+                                        {
+                                            filterId: string
+                                            operator:
+                                                | 'between'
+                                                | 'exact'
+                                                | 'flag_evaluates_to'
+                                                | 'gt'
+                                                | 'gte'
+                                                | 'icontains'
+                                                | 'icontains_multi'
+                                                | 'in'
+                                                | 'is_cleaned_path_exact'
+                                                | 'is_date_after'
+                                                | 'is_date_before'
+                                                | 'is_date_exact'
+                                                | 'is_not'
+                                                | 'is_not_set'
+                                                | 'is_set'
+                                                | 'lt'
+                                                | 'lte'
+                                                | 'max'
+                                                | 'min'
+                                                | 'not_between'
+                                                | 'not_icontains'
+                                                | 'not_icontains_multi'
+                                                | 'not_in'
+                                                | 'not_regex'
+                                                | 'regex'
+                                                | 'semver_caret'
+                                                | 'semver_eq'
+                                                | 'semver_gt'
+                                                | 'semver_gte'
+                                                | 'semver_lt'
+                                                | 'semver_lte'
+                                                | 'semver_neq'
+                                                | 'semver_tilde'
+                                                | 'semver_wildcard'
+                                            optionId: string
+                                            propertyName: string
+                                            value?: string | string[] | null | undefined
+                                        }
+                                    >
+                                  | null
+                                  | undefined
+                          }
+                          success: true
+                      }
+                    | {
+                          fieldErrors: Partial<Record<'dateRange' | 'filterTestAccounts' | 'limit', string>>
+                          success: false
+                      },
+                fieldErrors: ActivityEventsWidgetFieldErrors
+            ): ActivityEventsWidgetFieldErrors => {
                 if (!validation.success) {
                     return { ...validation.fieldErrors, ...fieldErrors }
                 }
@@ -132,7 +661,86 @@ export const editActivityEventsWidgetModalLogic = kea<editActivityEventsWidgetMo
         ],
         saveDisabledReason: [
             (s) => [s.saving, s.validation],
-            (saving, validation): string | undefined => {
+            (
+                saving: boolean,
+                validation:
+                    | {
+                          config: {
+                              dateRange?:
+                                  | {
+                                        date_from?:
+                                            | '-14d'
+                                            | '-1h'
+                                            | '-1M'
+                                            | '-24h'
+                                            | '-30d'
+                                            | '-30M'
+                                            | '-3h'
+                                            | '-7d'
+                                            | '-90d'
+                                            | null
+                                            | undefined
+                                    }
+                                  | null
+                                  | undefined
+                              eventName?: string | null | undefined
+                              filterTestAccounts?: boolean | null | undefined
+                              limit: number
+                              widgetFilters?:
+                                  | Record<
+                                        string,
+                                        {
+                                            filterId: string
+                                            operator:
+                                                | 'between'
+                                                | 'exact'
+                                                | 'flag_evaluates_to'
+                                                | 'gt'
+                                                | 'gte'
+                                                | 'icontains'
+                                                | 'icontains_multi'
+                                                | 'in'
+                                                | 'is_cleaned_path_exact'
+                                                | 'is_date_after'
+                                                | 'is_date_before'
+                                                | 'is_date_exact'
+                                                | 'is_not'
+                                                | 'is_not_set'
+                                                | 'is_set'
+                                                | 'lt'
+                                                | 'lte'
+                                                | 'max'
+                                                | 'min'
+                                                | 'not_between'
+                                                | 'not_icontains'
+                                                | 'not_icontains_multi'
+                                                | 'not_in'
+                                                | 'not_regex'
+                                                | 'regex'
+                                                | 'semver_caret'
+                                                | 'semver_eq'
+                                                | 'semver_gt'
+                                                | 'semver_gte'
+                                                | 'semver_lt'
+                                                | 'semver_lte'
+                                                | 'semver_neq'
+                                                | 'semver_tilde'
+                                                | 'semver_wildcard'
+                                            optionId: string
+                                            propertyName: string
+                                            value?: string | string[] | null | undefined
+                                        }
+                                    >
+                                  | null
+                                  | undefined
+                          }
+                          success: true
+                      }
+                    | {
+                          fieldErrors: Partial<Record<'dateRange' | 'filterTestAccounts' | 'limit', string>>
+                          success: false
+                      }
+            ): string | undefined => {
                 if (saving) {
                     return 'Saving…'
                 }
diff --git a/products/dashboards/frontend/widgets/error_tracking/editErrorTrackingWidgetModalLogic.ts b/products/dashboards/frontend/widgets/error_tracking/editErrorTrackingWidgetModalLogic.ts
index 9c8efd052d6c..986fae92a041 100644
--- a/products/dashboards/frontend/widgets/error_tracking/editErrorTrackingWidgetModalLogic.ts
+++ b/products/dashboards/frontend/widgets/error_tracking/editErrorTrackingWidgetModalLogic.ts
@@ -1,13 +1,15 @@
-import { actions, connect, defaults, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, defaults, kea, listeners, path, props, reducers, selectors } from 'kea'
 
 import { filterTestAccountsDefaultsLogic } from 'scenes/settings/environment/filterTestAccountDefaultsLogic'
 import { teamLogic } from 'scenes/teamLogic'
 
 import { exceptionIngestionLogic } from 'products/error_tracking/frontend/components/SetupPrompt/exceptionIngestionLogic'
 
+import type { TeamPublicType, TeamType } from '../../../../../frontend/src/types'
 import type { ErrorTrackingWidgetConfig } from '../../generated/widget-configs.zod'
 import { isWidgetConfigValidationError } from '../../utils'
 import { resolveWidgetFilterTestAccounts } from '../../widget_types/widgetConfigShared'
+import type { WidgetDateFromValue } from '../../widget_types/widgetConfigShared'
 import {
     widgetEditModalFilterTestAccountsActions,
     widgetEditModalListFieldActions,
@@ -17,7 +19,6 @@ import {
     getWidgetEditModalTileDefaults,
 } from '../editWidgetModalBuilders'
 import type { DashboardWidgetEditModalProps } from '../registry'
-import type { editErrorTrackingWidgetModalLogicType } from './editErrorTrackingWidgetModalLogicType'
 import {
     parseErrorTrackingWidgetConfig,
     validateErrorTrackingWidgetConfigInput,
@@ -27,6 +28,541 @@ import { canConfigureErrorTrackingWidgetIssues } from './utils'
 
 export type EditErrorTrackingWidgetModalLogicProps = Omit<DashboardWidgetEditModalProps, 'isOpen'>
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface editErrorTrackingWidgetModalLogicValues {
+    hasSentExceptionEvent: boolean | undefined // exceptionIngestionLogic
+    hasSentExceptionEventLoading: boolean // exceptionIngestionLogic
+    filterTestAccountsDefault: boolean // filterTestAccountsDefaultsLogic
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    activeFieldErrors: ErrorTrackingWidgetFieldErrors
+    defaultTitle: string
+    fieldErrors: ErrorTrackingWidgetFieldErrors
+    filterTestAccounts: boolean
+    limit: number
+    onClose: () => void
+    orderBy: 'first_seen' | 'last_seen' | 'occurrences' | 'sessions' | 'users'
+    orderDirection: 'ASC' | 'DESC'
+    saveDisabledReason: string | undefined
+    saving: boolean
+    showIssueSettings: boolean
+    tileDescription: string
+    tileName: string
+    validation:
+        | {
+              fieldErrors: Partial<
+                  Record<'dateRange' | 'filterTestAccounts' | 'limit' | 'orderBy' | 'orderDirection' | 'status', string>
+              >
+              success: false
+          }
+        | {
+              config: {
+                  assignee?:
+                      | {
+                            id: number | string
+                            type: 'role' | 'user'
+                        }
+                      | null
+                      | undefined
+                  dateRange?:
+                      | {
+                            date_from?:
+                                | '-14d'
+                                | '-1h'
+                                | '-1M'
+                                | '-24h'
+                                | '-30d'
+                                | '-30M'
+                                | '-3h'
+                                | '-7d'
+                                | '-90d'
+                                | null
+                                | undefined
+                        }
+                      | null
+                      | undefined
+                  filterTestAccounts?: boolean | null | undefined
+                  limit: number
+                  orderBy: 'first_seen' | 'last_seen' | 'occurrences' | 'sessions' | 'users'
+                  orderDirection: 'ASC' | 'DESC'
+                  status: 'active' | 'all' | 'archived' | 'pending_release' | 'resolved' | 'suppressed'
+                  widgetFilters?:
+                      | Record<
+                            string,
+                            {
+                                filterId: string
+                                operator:
+                                    | 'between'
+                                    | 'exact'
+                                    | 'flag_evaluates_to'
+                                    | 'gt'
+                                    | 'gte'
+                                    | 'icontains'
+                                    | 'icontains_multi'
+                                    | 'in'
+                                    | 'is_cleaned_path_exact'
+                                    | 'is_date_after'
+                                    | 'is_date_before'
+                                    | 'is_date_exact'
+                                    | 'is_not'
+                                    | 'is_not_set'
+                                    | 'is_set'
+                                    | 'lt'
+                                    | 'lte'
+                                    | 'max'
+                                    | 'min'
+                                    | 'not_between'
+                                    | 'not_icontains'
+                                    | 'not_icontains_multi'
+                                    | 'not_in'
+                                    | 'not_regex'
+                                    | 'regex'
+                                    | 'semver_caret'
+                                    | 'semver_eq'
+                                    | 'semver_gt'
+                                    | 'semver_gte'
+                                    | 'semver_lt'
+                                    | 'semver_lte'
+                                    | 'semver_neq'
+                                    | 'semver_tilde'
+                                    | 'semver_wildcard'
+                                optionId: string
+                                propertyName: string
+                                value?: string | string[] | null | undefined
+                            }
+                        >
+                      | null
+                      | undefined
+              }
+              success: true
+          }
+    widgetConfig: ErrorTrackingWidgetConfig
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface editErrorTrackingWidgetModalLogicActions {
+    clearFieldError: (field: keyof ErrorTrackingWidgetFieldErrors) => {
+        field: 'dateRange' | 'filterTestAccounts' | 'limit' | 'orderBy' | 'orderDirection' | 'status'
+    }
+    setDateFrom: (dateFrom: WidgetDateFromValue) => {
+        dateFrom: WidgetDateFromValue
+    }
+    setFieldErrors: (fieldErrors: ErrorTrackingWidgetFieldErrors) => {
+        fieldErrors: Partial<
+            Record<'dateRange' | 'filterTestAccounts' | 'limit' | 'orderBy' | 'orderDirection' | 'status', string>
+        >
+    }
+    setFilterTestAccounts: (filterTestAccounts: boolean) => {
+        filterTestAccounts: boolean
+    }
+    setLimit: (limit: number) => {
+        limit: number
+    }
+    setOrderBy: (orderBy: string) => {
+        orderBy: string
+    }
+    setOrderDirection: (orderDirection: ErrorTrackingWidgetConfig['orderDirection']) => {
+        orderDirection: 'ASC' | 'DESC'
+    }
+    setTileDescription: (tileDescription: string) => {
+        tileDescription: string
+    }
+    setTileName: (tileName: string) => {
+        tileName: string
+    }
+    submit: () => {
+        value: true
+    }
+    submitFailure: () => {
+        value: true
+    }
+    submitSuccess: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface editErrorTrackingWidgetModalLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        validation: (
+            limit: number,
+            orderBy: 'first_seen' | 'last_seen' | 'occurrences' | 'sessions' | 'users',
+            orderDirection: 'ASC' | 'DESC',
+            filterTestAccounts: boolean,
+            widgetConfig: {
+                assignee?:
+                    | {
+                          id: number | string
+                          type: 'role' | 'user'
+                      }
+                    | null
+                    | undefined
+                dateRange?:
+                    | {
+                          date_from?:
+                              | '-14d'
+                              | '-1h'
+                              | '-1M'
+                              | '-24h'
+                              | '-30d'
+                              | '-30M'
+                              | '-3h'
+                              | '-7d'
+                              | '-90d'
+                              | null
+                              | undefined
+                      }
+                    | null
+                    | undefined
+                filterTestAccounts?: boolean | null | undefined
+                limit: number
+                orderBy: 'first_seen' | 'last_seen' | 'occurrences' | 'sessions' | 'users'
+                orderDirection: 'ASC' | 'DESC'
+                status: 'active' | 'all' | 'archived' | 'pending_release' | 'resolved' | 'suppressed'
+                widgetFilters?:
+                    | Record<
+                          string,
+                          {
+                              filterId: string
+                              operator:
+                                  | 'between'
+                                  | 'exact'
+                                  | 'flag_evaluates_to'
+                                  | 'gt'
+                                  | 'gte'
+                                  | 'icontains'
+                                  | 'icontains_multi'
+                                  | 'in'
+                                  | 'is_cleaned_path_exact'
+                                  | 'is_date_after'
+                                  | 'is_date_before'
+                                  | 'is_date_exact'
+                                  | 'is_not'
+                                  | 'is_not_set'
+                                  | 'is_set'
+                                  | 'lt'
+                                  | 'lte'
+                                  | 'max'
+                                  | 'min'
+                                  | 'not_between'
+                                  | 'not_icontains'
+                                  | 'not_icontains_multi'
+                                  | 'not_in'
+                                  | 'not_regex'
+                                  | 'regex'
+                                  | 'semver_caret'
+                                  | 'semver_eq'
+                                  | 'semver_gt'
+                                  | 'semver_gte'
+                                  | 'semver_lt'
+                                  | 'semver_lte'
+                                  | 'semver_neq'
+                                  | 'semver_tilde'
+                                  | 'semver_wildcard'
+                              optionId: string
+                              propertyName: string
+                              value?: string | string[] | null | undefined
+                          }
+                      >
+                    | null
+                    | undefined
+            }
+        ) =>
+            | {
+                  fieldErrors: Partial<
+                      Record<
+                          'dateRange' | 'filterTestAccounts' | 'limit' | 'orderBy' | 'orderDirection' | 'status',
+                          string
+                      >
+                  >
+                  success: false
+              }
+            | {
+                  config: {
+                      assignee?:
+                          | {
+                                id: number | string
+                                type: 'role' | 'user'
+                            }
+                          | null
+                          | undefined
+                      dateRange?:
+                          | {
+                                date_from?:
+                                    | '-14d'
+                                    | '-1h'
+                                    | '-1M'
+                                    | '-24h'
+                                    | '-30d'
+                                    | '-30M'
+                                    | '-3h'
+                                    | '-7d'
+                                    | '-90d'
+                                    | null
+                                    | undefined
+                            }
+                          | null
+                          | undefined
+                      filterTestAccounts?: boolean | null | undefined
+                      limit: number
+                      orderBy: 'first_seen' | 'last_seen' | 'occurrences' | 'sessions' | 'users'
+                      orderDirection: 'ASC' | 'DESC'
+                      status: 'active' | 'all' | 'archived' | 'pending_release' | 'resolved' | 'suppressed'
+                      widgetFilters?:
+                          | Record<
+                                string,
+                                {
+                                    filterId: string
+                                    operator:
+                                        | 'between'
+                                        | 'exact'
+                                        | 'flag_evaluates_to'
+                                        | 'gt'
+                                        | 'gte'
+                                        | 'icontains'
+                                        | 'icontains_multi'
+                                        | 'in'
+                                        | 'is_cleaned_path_exact'
+                                        | 'is_date_after'
+                                        | 'is_date_before'
+                                        | 'is_date_exact'
+                                        | 'is_not'
+                                        | 'is_not_set'
+                                        | 'is_set'
+                                        | 'lt'
+                                        | 'lte'
+                                        | 'max'
+                                        | 'min'
+                                        | 'not_between'
+                                        | 'not_icontains'
+                                        | 'not_icontains_multi'
+                                        | 'not_in'
+                                        | 'not_regex'
+                                        | 'regex'
+                                        | 'semver_caret'
+                                        | 'semver_eq'
+                                        | 'semver_gt'
+                                        | 'semver_gte'
+                                        | 'semver_lt'
+                                        | 'semver_lte'
+                                        | 'semver_neq'
+                                        | 'semver_tilde'
+                                        | 'semver_wildcard'
+                                    optionId: string
+                                    propertyName: string
+                                    value?: string | string[] | null | undefined
+                                }
+                            >
+                          | null
+                          | undefined
+                  }
+                  success: true
+              }
+        activeFieldErrors: (
+            validation:
+                | {
+                      config: {
+                          assignee?:
+                              | {
+                                    id: number | string
+                                    type: 'role' | 'user'
+                                }
+                              | null
+                              | undefined
+                          dateRange?:
+                              | {
+                                    date_from?:
+                                        | '-14d'
+                                        | '-1h'
+                                        | '-1M'
+                                        | '-24h'
+                                        | '-30d'
+                                        | '-30M'
+                                        | '-3h'
+                                        | '-7d'
+                                        | '-90d'
+                                        | null
+                                        | undefined
+                                }
+                              | null
+                              | undefined
+                          filterTestAccounts?: boolean | null | undefined
+                          limit: number
+                          orderBy: 'first_seen' | 'last_seen' | 'occurrences' | 'sessions' | 'users'
+                          orderDirection: 'ASC' | 'DESC'
+                          status: 'active' | 'all' | 'archived' | 'pending_release' | 'resolved' | 'suppressed'
+                          widgetFilters?:
+                              | Record<
+                                    string,
+                                    {
+                                        filterId: string
+                                        operator:
+                                            | 'between'
+                                            | 'exact'
+                                            | 'flag_evaluates_to'
+                                            | 'gt'
+                                            | 'gte'
+                                            | 'icontains'
+                                            | 'icontains_multi'
+                                            | 'in'
+                                            | 'is_cleaned_path_exact'
+                                            | 'is_date_after'
+                                            | 'is_date_before'
+                                            | 'is_date_exact'
+                                            | 'is_not'
+                                            | 'is_not_set'
+                                            | 'is_set'
+                                            | 'lt'
+                                            | 'lte'
+                                            | 'max'
+                                            | 'min'
+                                            | 'not_between'
+                                            | 'not_icontains'
+                                            | 'not_icontains_multi'
+                                            | 'not_in'
+                                            | 'not_regex'
+                                            | 'regex'
+                                            | 'semver_caret'
+                                            | 'semver_eq'
+                                            | 'semver_gt'
+                                            | 'semver_gte'
+                                            | 'semver_lt'
+                                            | 'semver_lte'
+                                            | 'semver_neq'
+                                            | 'semver_tilde'
+                                            | 'semver_wildcard'
+                                        optionId: string
+                                        propertyName: string
+                                        value?: string | string[] | null | undefined
+                                    }
+                                >
+                              | null
+                              | undefined
+                      }
+                      success: true
+                  }
+                | {
+                      fieldErrors: Partial<
+                          Record<
+                              'dateRange' | 'filterTestAccounts' | 'limit' | 'orderBy' | 'orderDirection' | 'status',
+                              string
+                          >
+                      >
+                      success: false
+                  },
+            fieldErrors: Partial<
+                Record<'dateRange' | 'filterTestAccounts' | 'limit' | 'orderBy' | 'orderDirection' | 'status', string>
+            >
+        ) => ErrorTrackingWidgetFieldErrors
+        saveDisabledReason: (
+            saving: boolean,
+            validation:
+                | {
+                      config: {
+                          assignee?:
+                              | {
+                                    id: number | string
+                                    type: 'role' | 'user'
+                                }
+                              | null
+                              | undefined
+                          dateRange?:
+                              | {
+                                    date_from?:
+                                        | '-14d'
+                                        | '-1h'
+                                        | '-1M'
+                                        | '-24h'
+                                        | '-30d'
+                                        | '-30M'
+                                        | '-3h'
+                                        | '-7d'
+                                        | '-90d'
+                                        | null
+                                        | undefined
+                                }
+                              | null
+                              | undefined
+                          filterTestAccounts?: boolean | null | undefined
+                          limit: number
+                          orderBy: 'first_seen' | 'last_seen' | 'occurrences' | 'sessions' | 'users'
+                          orderDirection: 'ASC' | 'DESC'
+                          status: 'active' | 'all' | 'archived' | 'pending_release' | 'resolved' | 'suppressed'
+                          widgetFilters?:
+                              | Record<
+                                    string,
+                                    {
+                                        filterId: string
+                                        operator:
+                                            | 'between'
+                                            | 'exact'
+                                            | 'flag_evaluates_to'
+                                            | 'gt'
+                                            | 'gte'
+                                            | 'icontains'
+                                            | 'icontains_multi'
+                                            | 'in'
+                                            | 'is_cleaned_path_exact'
+                                            | 'is_date_after'
+                                            | 'is_date_before'
+                                            | 'is_date_exact'
+                                            | 'is_not'
+                                            | 'is_not_set'
+                                            | 'is_set'
+                                            | 'lt'
+                                            | 'lte'
+                                            | 'max'
+                                            | 'min'
+                                            | 'not_between'
+                                            | 'not_icontains'
+                                            | 'not_icontains_multi'
+                                            | 'not_in'
+                                            | 'not_regex'
+                                            | 'regex'
+                                            | 'semver_caret'
+                                            | 'semver_eq'
+                                            | 'semver_gt'
+                                            | 'semver_gte'
+                                            | 'semver_lt'
+                                            | 'semver_lte'
+                                            | 'semver_neq'
+                                            | 'semver_tilde'
+                                            | 'semver_wildcard'
+                                        optionId: string
+                                        propertyName: string
+                                        value?: string | string[] | null | undefined
+                                    }
+                                >
+                              | null
+                              | undefined
+                      }
+                      success: true
+                  }
+                | {
+                      fieldErrors: Partial<
+                          Record<
+                              'dateRange' | 'filterTestAccounts' | 'limit' | 'orderBy' | 'orderDirection' | 'status',
+                              string
+                          >
+                      >
+                      success: false
+                  }
+        ) => string | undefined
+        showIssueSettings: (
+            currentTeam: TeamPublicType | TeamType | null,
+            hasSentExceptionEvent: boolean | undefined,
+            hasSentExceptionEventLoading: boolean
+        ) => boolean
+        widgetConfig: (config: Record<string, unknown>) => ErrorTrackingWidgetConfig
+    }
+}
+
+export type editErrorTrackingWidgetModalLogicType = MakeLogicType<
+    editErrorTrackingWidgetModalLogicValues,
+    editErrorTrackingWidgetModalLogicActions,
+    EditErrorTrackingWidgetModalLogicProps,
+    editErrorTrackingWidgetModalLogicMeta
+>
+
 export const editErrorTrackingWidgetModalLogic = kea<editErrorTrackingWidgetModalLogicType>([
     path(['products', 'dashboards', 'widgets', 'error_tracking', 'editErrorTrackingWidgetModalLogic']),
 
@@ -140,19 +676,29 @@ export const editErrorTrackingWidgetModalLogic = kea<editErrorTrackingWidgetModa
     selectors({
         showIssueSettings: [
             (s) => [s.currentTeam, s.hasSentExceptionEvent, s.hasSentExceptionEventLoading],
-            (currentTeam, hasSentExceptionEvent, hasSentExceptionEventLoading): boolean =>
+            (
+                currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType,
+                hasSentExceptionEvent: boolean | undefined,
+                hasSentExceptionEventLoading: boolean
+            ): boolean =>
                 canConfigureErrorTrackingWidgetIssues(currentTeam, hasSentExceptionEvent) &&
                 !hasSentExceptionEventLoading &&
                 !!currentTeam,
         ],
         widgetConfig: [
             (_, p) => [p.config],
-            (config): ErrorTrackingWidgetConfig => parseErrorTrackingWidgetConfig(config),
+            (config: Record<string, unknown>): ErrorTrackingWidgetConfig => parseErrorTrackingWidgetConfig(config),
         ],
         ...widgetEditModalPropSelectors,
         validation: [
             (s) => [s.limit, s.orderBy, s.orderDirection, s.filterTestAccounts, s.widgetConfig],
-            (limit, orderBy, orderDirection, filterTestAccounts, widgetConfig) =>
+            (
+                limit: number,
+                orderBy: 'first_seen' | 'last_seen' | 'occurrences' | 'sessions' | 'users',
+                orderDirection: 'ASC' | 'DESC',
+                filterTestAccounts: boolean,
+                widgetConfig: ErrorTrackingWidgetConfig
+            ) =>
                 validateErrorTrackingWidgetConfigInput({
                     limit,
                     orderBy,
@@ -163,7 +709,105 @@ export const editErrorTrackingWidgetModalLogic = kea<editErrorTrackingWidgetModa
         ],
         activeFieldErrors: [
             (s) => [s.validation, s.fieldErrors],
-            (validation, fieldErrors): ErrorTrackingWidgetFieldErrors => {
+            (
+                validation:
+                    | {
+                          config: {
+                              assignee?:
+                                  | {
+                                        id: number | string
+                                        type: 'role' | 'user'
+                                    }
+                                  | null
+                                  | undefined
+                              dateRange?:
+                                  | {
+                                        date_from?:
+                                            | '-14d'
+                                            | '-1h'
+                                            | '-1M'
+                                            | '-24h'
+                                            | '-30d'
+                                            | '-30M'
+                                            | '-3h'
+                                            | '-7d'
+                                            | '-90d'
+                                            | null
+                                            | undefined
+                                    }
+                                  | null
+                                  | undefined
+                              filterTestAccounts?: boolean | null | undefined
+                              limit: number
+                              orderBy: 'first_seen' | 'last_seen' | 'occurrences' | 'sessions' | 'users'
+                              orderDirection: 'ASC' | 'DESC'
+                              status: 'active' | 'all' | 'archived' | 'pending_release' | 'resolved' | 'suppressed'
+                              widgetFilters?:
+                                  | Record<
+                                        string,
+                                        {
+                                            filterId: string
+                                            operator:
+                                                | 'between'
+                                                | 'exact'
+                                                | 'flag_evaluates_to'
+                                                | 'gt'
+                                                | 'gte'
+                                                | 'icontains'
+                                                | 'icontains_multi'
+                                                | 'in'
+                                                | 'is_cleaned_path_exact'
+                                                | 'is_date_after'
+                                                | 'is_date_before'
+                                                | 'is_date_exact'
+                                                | 'is_not'
+                                                | 'is_not_set'
+                                                | 'is_set'
+                                                | 'lt'
+                                                | 'lte'
+                                                | 'max'
+                                                | 'min'
+                                                | 'not_between'
+                                                | 'not_icontains'
+                                                | 'not_icontains_multi'
+                                                | 'not_in'
+                                                | 'not_regex'
+                                                | 'regex'
+                                                | 'semver_caret'
+                                                | 'semver_eq'
+                                                | 'semver_gt'
+                                                | 'semver_gte'
+                                                | 'semver_lt'
+                                                | 'semver_lte'
+                                                | 'semver_neq'
+                                                | 'semver_tilde'
+                                                | 'semver_wildcard'
+                                            optionId: string
+                                            propertyName: string
+                                            value?: string | string[] | null | undefined
+                                        }
+                                    >
+                                  | null
+                                  | undefined
+                          }
+                          success: true
+                      }
+                    | {
+                          fieldErrors: Partial<
+                              Record<
+                                  | 'dateRange'
+                                  | 'filterTestAccounts'
+                                  | 'limit'
+                                  | 'orderBy'
+                                  | 'orderDirection'
+                                  | 'status',
+                                  string
+                              >
+                          >
+                          success: false
+                      },
+                fieldErrors: ErrorTrackingWidgetFieldErrors
+            ): ErrorTrackingWidgetFieldErrors => {
                 if (!validation.success) {
                     return { ...validation.fieldErrors, ...fieldErrors }
                 }
@@ -172,7 +816,105 @@ export const editErrorTrackingWidgetModalLogic = kea<editErrorTrackingWidgetModa
         ],
         saveDisabledReason: [
             (s) => [s.saving, s.validation],
-            (saving, validation): string | undefined => {
+            (
+                saving: boolean,
+                validation:
+                    | {
+                          config: {
+                              assignee?:
+                                  | {
+                                        id: number | string
+                                        type: 'role' | 'user'
+                                    }
+                                  | null
+                                  | undefined
+                              dateRange?:
+                                  | {
+                                        date_from?:
+                                            | '-14d'
+                                            | '-1h'
+                                            | '-1M'
+                                            | '-24h'
+                                            | '-30d'
+                                            | '-30M'
+                                            | '-3h'
+                                            | '-7d'
+                                            | '-90d'
+                                            | null
+                                            | undefined
+                                    }
+                                  | null
+                                  | undefined
+                              filterTestAccounts?: boolean | null | undefined
+                              limit: number
+                              orderBy: 'first_seen' | 'last_seen' | 'occurrences' | 'sessions' | 'users'
+                              orderDirection: 'ASC' | 'DESC'
+                              status: 'active' | 'all' | 'archived' | 'pending_release' | 'resolved' | 'suppressed'
+                              widgetFilters?:
+                                  | Record<
+                                        string,
+                                        {
+                                            filterId: string
+                                            operator:
+                                                | 'between'
+                                                | 'exact'
+                                                | 'flag_evaluates_to'
+                                                | 'gt'
+                                                | 'gte'
+                                                | 'icontains'
+                                                | 'icontains_multi'
+                                                | 'in'
+                                                | 'is_cleaned_path_exact'
+                                                | 'is_date_after'
+                                                | 'is_date_before'
+                                                | 'is_date_exact'
+                                                | 'is_not'
+                                                | 'is_not_set'
+                                                | 'is_set'
+                                                | 'lt'
+                                                | 'lte'
+                                                | 'max'
+                                                | 'min'
+                                                | 'not_between'
+                                                | 'not_icontains'
+                                                | 'not_icontains_multi'
+                                                | 'not_in'
+                                                | 'not_regex'
+                                                | 'regex'
+                                                | 'semver_caret'
+                                                | 'semver_eq'
+                                                | 'semver_gt'
+                                                | 'semver_gte'
+                                                | 'semver_lt'
+                                                | 'semver_lte'
+                                                | 'semver_neq'
+                                                | 'semver_tilde'
+                                                | 'semver_wildcard'
+                                            optionId: string
+                                            propertyName: string
+                                            value?: string | string[] | null | undefined
+                                        }
+                                    >
+                                  | null
+                                  | undefined
+                          }
+                          success: true
+                      }
+                    | {
+                          fieldErrors: Partial<
+                              Record<
+                                  | 'dateRange'
+                                  | 'filterTestAccounts'
+                                  | 'limit'
+                                  | 'orderBy'
+                                  | 'orderDirection'
+                                  | 'status',
+                                  string
+                              >
+                          >
+                          success: false
+                      }
+            ): string | undefined => {
                 if (saving) {
                     return 'Saving…'
                 }
diff --git a/products/dashboards/frontend/widgets/error_tracking/errorTrackingWidgetLogic.ts b/products/dashboards/frontend/widgets/error_tracking/errorTrackingWidgetLogic.ts
index 660bb5de5ad6..fe56f87b7c2f 100644
--- a/products/dashboards/frontend/widgets/error_tracking/errorTrackingWidgetLogic.ts
+++ b/products/dashboards/frontend/widgets/error_tracking/errorTrackingWidgetLogic.ts
@@ -1,9 +1,12 @@
-import { connect, kea, key, listeners, path, props } from 'kea'
+import { MakeLogicType, connect, kea, key, listeners, path, props } from 'kea'
 
 import { issueActionsLogic } from 'products/error_tracking/frontend/components/IssueActions/issueActionsLogic'
 
+import type {
+    ErrorTrackingIssueAssignee,
+    ErrorTrackingIssueStatus,
+} from '../../../../../frontend/src/queries/schema/schema-general'
 import type { WidgetIssueMetadataDelta } from './applyWidgetIssueMetadataChange'
-import type { errorTrackingWidgetLogicType } from './errorTrackingWidgetLogicType'
 
 export type ErrorTrackingWidgetLogicProps = {
     tileId: number
@@ -13,6 +16,43 @@ export type ErrorTrackingWidgetLogicProps = {
 
 const ISSUE_METADATA_MUTATIONS = new Set(['updateIssueStatus', 'updateIssueAssignee'])
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface errorTrackingWidgetLogicActions {
+    mutationFailure: (
+        mutationName: string,
+        error: unknown
+    ) => {
+        error: unknown
+        mutationName: string
+    } // issueActionsLogic
+    updateIssueAssignee: (
+        id: string,
+        assignee: ErrorTrackingIssueAssignee | null
+    ) => {
+        assignee: ErrorTrackingIssueAssignee | null
+        id: string
+    } // issueActionsLogic
+    updateIssueStatus: (
+        id: string,
+        status: ErrorTrackingIssueStatus
+    ) => {
+        id: string
+        status: ErrorTrackingIssueStatus
+    } // issueActionsLogic
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface errorTrackingWidgetLogicMeta {
+    key: string
+}
+
+export type errorTrackingWidgetLogicType = MakeLogicType<
+    {},
+    errorTrackingWidgetLogicActions,
+    ErrorTrackingWidgetLogicProps,
+    errorTrackingWidgetLogicMeta
+>
+
 export const errorTrackingWidgetLogic = kea<errorTrackingWidgetLogicType>([
     path(['products', 'dashboards', 'widgets', 'error_tracking', 'errorTrackingWidgetLogic']),
     key((props) => String(props.tileId)),
diff --git a/products/dashboards/frontend/widgets/experiments/editExperimentResultsWidgetModalLogic.ts b/products/dashboards/frontend/widgets/experiments/editExperimentResultsWidgetModalLogic.ts
index bbffc3eae82c..c71117bff0c3 100644
--- a/products/dashboards/frontend/widgets/experiments/editExperimentResultsWidgetModalLogic.ts
+++ b/products/dashboards/frontend/widgets/experiments/editExperimentResultsWidgetModalLogic.ts
@@ -1,4 +1,4 @@
-import { actions, defaults, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, defaults, kea, listeners, path, props, reducers, selectors } from 'kea'
 
 import { isWidgetConfigValidationError } from '../../utils'
 import {
@@ -8,7 +8,6 @@ import {
     getWidgetEditModalTileDefaults,
 } from '../editWidgetModalBuilders'
 import type { DashboardWidgetEditModalProps } from '../registry'
-import type { editExperimentResultsWidgetModalLogicType } from './editExperimentResultsWidgetModalLogicType'
 import {
     parseExperimentResultsWidgetConfig,
     validateExperimentResultsWidgetConfigInput,
@@ -17,6 +16,106 @@ import {
 
 export type EditExperimentResultsWidgetModalLogicProps = Omit<DashboardWidgetEditModalProps, 'isOpen'>
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface editExperimentResultsWidgetModalLogicValues {
+    activeFieldErrors: ExperimentResultsWidgetFieldErrors
+    defaultTitle: string
+    fieldErrors: ExperimentResultsWidgetFieldErrors
+    onClose: () => void
+    saveDisabledReason: string | undefined
+    saving: boolean
+    tileDescription: string
+    tileName: string
+    validation:
+        | {
+              fieldErrors: Partial<Record<'experimentId', string>>
+              success: false
+          }
+        | {
+              config: {
+                  experimentId?: number | null | undefined
+              }
+              success: true
+          }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface editExperimentResultsWidgetModalLogicActions {
+    clearFieldError: (field: keyof ExperimentResultsWidgetFieldErrors) => {
+        field: 'experimentId'
+    }
+    setFieldErrors: (fieldErrors: ExperimentResultsWidgetFieldErrors) => {
+        fieldErrors: Partial<Record<'experimentId', string>>
+    }
+    setTileDescription: (tileDescription: string) => {
+        tileDescription: string
+    }
+    setTileName: (tileName: string) => {
+        tileName: string
+    }
+    submit: () => {
+        value: true
+    }
+    submitFailure: () => {
+        value: true
+    }
+    submitSuccess: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface editExperimentResultsWidgetModalLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        validation: (arg: any) =>
+            | {
+                  fieldErrors: Partial<Record<'experimentId', string>>
+                  success: false
+              }
+            | {
+                  config: {
+                      experimentId?: number | null | undefined
+                  }
+                  success: true
+              }
+        activeFieldErrors: (
+            validation:
+                | {
+                      config: {
+                          experimentId?: number | null | undefined
+                      }
+                      success: true
+                  }
+                | {
+                      fieldErrors: Partial<Record<'experimentId', string>>
+                      success: false
+                  },
+            fieldErrors: Partial<Record<'experimentId', string>>
+        ) => ExperimentResultsWidgetFieldErrors
+        saveDisabledReason: (
+            saving: boolean,
+            validation:
+                | {
+                      config: {
+                          experimentId?: number | null | undefined
+                      }
+                      success: true
+                  }
+                | {
+                      fieldErrors: Partial<Record<'experimentId', string>>
+                      success: false
+                  }
+        ) => string | undefined
+    }
+}
+
+export type editExperimentResultsWidgetModalLogicType = MakeLogicType<
+    editExperimentResultsWidgetModalLogicValues,
+    editExperimentResultsWidgetModalLogicActions,
+    EditExperimentResultsWidgetModalLogicProps,
+    editExperimentResultsWidgetModalLogicMeta
+>
+
 export const editExperimentResultsWidgetModalLogic = kea<editExperimentResultsWidgetModalLogicType>([
     path(['products', 'dashboards', 'widgets', 'experiments', 'editExperimentResultsWidgetModalLogic']),
 
@@ -94,7 +193,20 @@ export const editExperimentResultsWidgetModalLogic = kea<editExperimentResultsWi
         ],
         activeFieldErrors: [
             (s) => [s.validation, s.fieldErrors],
-            (validation, fieldErrors): ExperimentResultsWidgetFieldErrors => {
+            (
+                validation:
+                    | {
+                          config: {
+                              experimentId?: number | null | undefined
+                          }
+                          success: true
+                      }
+                    | {
+                          fieldErrors: Partial<Record<'experimentId', string>>
+                          success: false
+                      },
+                fieldErrors: ExperimentResultsWidgetFieldErrors
+            ): ExperimentResultsWidgetFieldErrors => {
                 if (!validation.success) {
                     return { ...validation.fieldErrors, ...fieldErrors }
                 }
@@ -103,7 +215,20 @@ export const editExperimentResultsWidgetModalLogic = kea<editExperimentResultsWi
         ],
         saveDisabledReason: [
             (s) => [s.saving, s.validation],
-            (saving, validation): string | undefined => {
+            (
+                saving: boolean,
+                validation:
+                    | {
+                          config: {
+                              experimentId?: number | null | undefined
+                          }
+                          success: true
+                      }
+                    | {
+                          fieldErrors: Partial<Record<'experimentId', string>>
+                          success: false
+                      }
+            ): string | undefined => {
                 if (saving) {
                     return 'Saving…'
                 }
diff --git a/products/dashboards/frontend/widgets/experiments/editExperimentsListWidgetModalLogic.ts b/products/dashboards/frontend/widgets/experiments/editExperimentsListWidgetModalLogic.ts
index 6d9e94d7ece1..553c2719a036 100644
--- a/products/dashboards/frontend/widgets/experiments/editExperimentsListWidgetModalLogic.ts
+++ b/products/dashboards/frontend/widgets/experiments/editExperimentsListWidgetModalLogic.ts
@@ -1,4 +1,4 @@
-import { actions, defaults, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, defaults, kea, listeners, path, props, reducers, selectors } from 'kea'
 
 import { isWidgetConfigValidationError } from '../../utils'
 import {
@@ -8,7 +8,6 @@ import {
     getWidgetEditModalTileDefaults,
 } from '../editWidgetModalBuilders'
 import type { DashboardWidgetEditModalProps } from '../registry'
-import type { editExperimentsListWidgetModalLogicType } from './editExperimentsListWidgetModalLogicType'
 import {
     parseExperimentsListWidgetConfig,
     validateExperimentsListWidgetConfigInput,
@@ -19,6 +18,143 @@ import {
 
 export type EditExperimentsListWidgetModalLogicProps = Omit<DashboardWidgetEditModalProps, 'isOpen'>
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface editExperimentsListWidgetModalLogicValues {
+    activeFieldErrors: ExperimentsListWidgetFieldErrors
+    defaultTitle: string
+    fieldErrors: ExperimentsListWidgetFieldErrors
+    limit: number
+    onClose: () => void
+    orderBy: 'created_at' | 'name' | 'start_date'
+    orderDirection: 'ASC' | 'DESC'
+    saveDisabledReason: string | undefined
+    saving: boolean
+    tileDescription: string
+    tileName: string
+    validation:
+        | {
+              fieldErrors: Partial<Record<'createdBy' | 'limit' | 'orderBy' | 'orderDirection' | 'status', string>>
+              success: false
+          }
+        | {
+              config: {
+                  createdBy?: number | null | undefined
+                  limit: number
+                  orderBy: 'created_at' | 'name' | 'start_date'
+                  orderDirection: 'ASC' | 'DESC'
+                  status: 'all' | 'draft' | 'exposure_frozen' | 'paused' | 'running' | 'stopped'
+              }
+              success: true
+          }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface editExperimentsListWidgetModalLogicActions {
+    clearFieldError: (field: keyof ExperimentsListWidgetFieldErrors) => {
+        field: 'createdBy' | 'limit' | 'orderBy' | 'orderDirection' | 'status'
+    }
+    setFieldErrors: (fieldErrors: ExperimentsListWidgetFieldErrors) => {
+        fieldErrors: Partial<Record<'createdBy' | 'limit' | 'orderBy' | 'orderDirection' | 'status', string>>
+    }
+    setLimit: (limit: number) => {
+        limit: number
+    }
+    setOrderBy: (orderBy: ExperimentsListWidgetOrderBy) => {
+        orderBy: ExperimentsListWidgetOrderBy
+    }
+    setOrderDirection: (orderDirection: ExperimentsListWidgetOrderDirection) => {
+        orderDirection: ExperimentsListWidgetOrderDirection
+    }
+    setTileDescription: (tileDescription: string) => {
+        tileDescription: string
+    }
+    setTileName: (tileName: string) => {
+        tileName: string
+    }
+    submit: () => {
+        value: true
+    }
+    submitFailure: () => {
+        value: true
+    }
+    submitSuccess: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface editExperimentsListWidgetModalLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        validation: (
+            limit: number,
+            orderBy: 'created_at' | 'name' | 'start_date',
+            orderDirection: 'ASC' | 'DESC',
+            arg: any
+        ) =>
+            | {
+                  fieldErrors: Partial<Record<'createdBy' | 'limit' | 'orderBy' | 'orderDirection' | 'status', string>>
+                  success: false
+              }
+            | {
+                  config: {
+                      createdBy?: number | null | undefined
+                      limit: number
+                      orderBy: 'created_at' | 'name' | 'start_date'
+                      orderDirection: 'ASC' | 'DESC'
+                      status: 'all' | 'draft' | 'exposure_frozen' | 'paused' | 'running' | 'stopped'
+                  }
+                  success: true
+              }
+        activeFieldErrors: (
+            validation:
+                | {
+                      config: {
+                          createdBy?: number | null | undefined
+                          limit: number
+                          orderBy: 'created_at' | 'name' | 'start_date'
+                          orderDirection: 'ASC' | 'DESC'
+                          status: 'all' | 'draft' | 'exposure_frozen' | 'paused' | 'running' | 'stopped'
+                      }
+                      success: true
+                  }
+                | {
+                      fieldErrors: Partial<
+                          Record<'createdBy' | 'limit' | 'orderBy' | 'orderDirection' | 'status', string>
+                      >
+                      success: false
+                  },
+            fieldErrors: Partial<Record<'createdBy' | 'limit' | 'orderBy' | 'orderDirection' | 'status', string>>
+        ) => ExperimentsListWidgetFieldErrors
+        saveDisabledReason: (
+            saving: boolean,
+            validation:
+                | {
+                      config: {
+                          createdBy?: number | null | undefined
+                          limit: number
+                          orderBy: 'created_at' | 'name' | 'start_date'
+                          orderDirection: 'ASC' | 'DESC'
+                          status: 'all' | 'draft' | 'exposure_frozen' | 'paused' | 'running' | 'stopped'
+                      }
+                      success: true
+                  }
+                | {
+                      fieldErrors: Partial<
+                          Record<'createdBy' | 'limit' | 'orderBy' | 'orderDirection' | 'status', string>
+                      >
+                      success: false
+                  }
+        ) => string | undefined
+    }
+}
+
+export type editExperimentsListWidgetModalLogicType = MakeLogicType<
+    editExperimentsListWidgetModalLogicValues,
+    editExperimentsListWidgetModalLogicActions,
+    EditExperimentsListWidgetModalLogicProps,
+    editExperimentsListWidgetModalLogicMeta
+>
+
 export const editExperimentsListWidgetModalLogic = kea<editExperimentsListWidgetModalLogicType>([
     path(['products', 'dashboards', 'widgets', 'experiments', 'editExperimentsListWidgetModalLogic']),
 
@@ -114,7 +250,7 @@ export const editExperimentsListWidgetModalLogic = kea<editExperimentsListWidget
             // status + creator live on the tile filter bar; read them from the persisted config so saving
             // the limit/name here preserves the active filters.
             (s) => [s.limit, s.orderBy, s.orderDirection, (_, props) => props.config],
-            (limit, orderBy, orderDirection, config) => {
+            (limit: number, orderBy: 'created_at' | 'name' | 'start_date', orderDirection: 'ASC' | 'DESC', config) => {
                 const baseConfig = parseExperimentsListWidgetConfig(config)
                 return validateExperimentsListWidgetConfigInput({
                     limit,
@@ -127,7 +263,26 @@ export const editExperimentsListWidgetModalLogic = kea<editExperimentsListWidget
         ],
         activeFieldErrors: [
             (s) => [s.validation, s.fieldErrors],
-            (validation, fieldErrors): ExperimentsListWidgetFieldErrors => {
+            (
+                validation:
+                    | {
+                          config: {
+                              createdBy?: number | null | undefined
+                              limit: number
+                              orderBy: 'created_at' | 'name' | 'start_date'
+                              orderDirection: 'ASC' | 'DESC'
+                              status: 'all' | 'draft' | 'exposure_frozen' | 'paused' | 'running' | 'stopped'
+                          }
+                          success: true
+                      }
+                    | {
+                          fieldErrors: Partial<
+                              Record<'createdBy' | 'limit' | 'orderBy' | 'orderDirection' | 'status', string>
+                          >
+                          success: false
+                      },
+                fieldErrors: ExperimentsListWidgetFieldErrors
+            ): ExperimentsListWidgetFieldErrors => {
                 if (!validation.success) {
                     return { ...validation.fieldErrors, ...fieldErrors }
                 }
@@ -136,7 +291,26 @@ export const editExperimentsListWidgetModalLogic = kea<editExperimentsListWidget
         ],
         saveDisabledReason: [
             (s) => [s.saving, s.validation],
-            (saving, validation): string | undefined => {
+            (
+                saving: boolean,
+                validation:
+                    | {
+                          config: {
+                              createdBy?: number | null | undefined
+                              limit: number
+                              orderBy: 'created_at' | 'name' | 'start_date'
+                              orderDirection: 'ASC' | 'DESC'
+                              status: 'all' | 'draft' | 'exposure_frozen' | 'paused' | 'running' | 'stopped'
+                          }
+                          success: true
+                      }
+                    | {
+                          fieldErrors: Partial<
+                              Record<'createdBy' | 'limit' | 'orderBy' | 'orderDirection' | 'status', string>
+                          >
+                          success: false
+                      }
+            ): string | undefined => {
                 if (saving) {
                     return 'Saving…'
                 }
diff --git a/products/dashboards/frontend/widgets/experiments/experimentPickerLogic.ts b/products/dashboards/frontend/widgets/experiments/experimentPickerLogic.ts
index 5c6fade8a78c..4e5a5f184dca 100644
--- a/products/dashboards/frontend/widgets/experiments/experimentPickerLogic.ts
+++ b/products/dashboards/frontend/widgets/experiments/experimentPickerLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { teamLogic } from 'scenes/teamLogic'
@@ -6,14 +6,90 @@ import { teamLogic } from 'scenes/teamLogic'
 import { experimentsList, experimentsRetrieve } from 'products/experiments/frontend/generated/api'
 import type { ExperimentApi, ExperimentBasicApi } from 'products/experiments/frontend/generated/api.schemas'
 
-import type { experimentPickerLogicType } from './experimentPickerLogicType'
-
 /** One page is plenty — search narrows the rest server-side, so we never paginate the dropdown. */
 const EXPERIMENT_OPTIONS_LIMIT = 50
 const SEARCH_DEBOUNCE_MS = 300
 
 export type ExperimentPickerLogicProps = { pickerKey: string }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface experimentPickerLogicValues {
+    currentProjectId: number | string // teamLogic
+    experimentOptions: ExperimentBasicApi[]
+    experimentOptionsLoading: boolean
+    hasLoadedOptions: boolean
+    search: string
+    selectedExperiment: ExperimentApi | null
+    selectedExperimentLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface experimentPickerLogicActions {
+    ensureOptionsLoaded: () => {
+        value: true
+    }
+    ensureSelectedLoaded: (experimentId: number) => {
+        experimentId: number
+    }
+    loadOptions: ({ debounce }?: { debounce: boolean }) => {
+        debounce: boolean
+    }
+    loadOptionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadOptionsSuccess: (
+        experimentOptions: ExperimentBasicApi[],
+        payload?: {
+            debounce: boolean
+        }
+    ) => {
+        experimentOptions: ExperimentBasicApi[]
+        payload?: {
+            debounce: boolean
+        }
+    }
+    loadSelectedExperiment: ({ experimentId }: { experimentId: number }) => {
+        experimentId: number
+    }
+    loadSelectedExperimentFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSelectedExperimentSuccess: (
+        selectedExperiment: ExperimentApi,
+        payload?: {
+            experimentId: number
+        }
+    ) => {
+        selectedExperiment: ExperimentApi
+        payload?: {
+            experimentId: number
+        }
+    }
+    setSearch: (search: string) => {
+        search: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface experimentPickerLogicMeta {
+    key: string
+}
+
+export type experimentPickerLogicType = MakeLogicType<
+    experimentPickerLogicValues,
+    experimentPickerLogicActions,
+    ExperimentPickerLogicProps,
+    experimentPickerLogicMeta
+>
+
 export const experimentPickerLogic = kea<experimentPickerLogicType>([
     path((key) => ['products', 'dashboards', 'widgets', 'experiments', 'experimentPickerLogic', key]),
     props({} as ExperimentPickerLogicProps),
diff --git a/products/dashboards/frontend/widgets/logs/editLogsWidgetModalLogic.ts b/products/dashboards/frontend/widgets/logs/editLogsWidgetModalLogic.ts
index aeb9f57c3ff6..3e800ab0c4a4 100644
--- a/products/dashboards/frontend/widgets/logs/editLogsWidgetModalLogic.ts
+++ b/products/dashboards/frontend/widgets/logs/editLogsWidgetModalLogic.ts
@@ -1,4 +1,4 @@
-import { actions, defaults, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, defaults, kea, listeners, path, props, reducers, selectors } from 'kea'
 
 import type { LogsWidgetConfig } from '../../generated/widget-configs.zod'
 import { isWidgetConfigValidationError } from '../../utils'
@@ -11,7 +11,6 @@ import {
     getWidgetEditModalTileDefaults,
 } from '../editWidgetModalBuilders'
 import type { DashboardWidgetEditModalProps } from '../registry'
-import type { editLogsWidgetModalLogicType } from './editLogsWidgetModalLogicType'
 import {
     LOGS_DEFAULT_DATE_FROM,
     parseLogsWidgetConfig,
@@ -22,6 +21,247 @@ import {
 
 export type EditLogsWidgetModalLogicProps = Omit<DashboardWidgetEditModalProps, 'isOpen'>
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface editLogsWidgetModalLogicValues {
+    activeFieldErrors: LogsWidgetFieldErrors
+    dateFrom: WidgetDateFromValue
+    defaultTitle: string
+    fieldErrors: LogsWidgetFieldErrors
+    limit: number
+    onClose: () => void
+    saveDisabledReason: string | undefined
+    saving: boolean
+    tileDescription: string
+    tileName: string
+    timezone: LogsTimezone
+    validation:
+        | {
+              fieldErrors: Partial<Record<'dateRange' | 'limit' | 'timezone' | 'wrapLines', string>>
+              success: false
+          }
+        | {
+              config: {
+                  dateRange?:
+                      | {
+                            date_from?:
+                                | '-14d'
+                                | '-1h'
+                                | '-1M'
+                                | '-24h'
+                                | '-30d'
+                                | '-30M'
+                                | '-3h'
+                                | '-7d'
+                                | '-90d'
+                                | null
+                                | undefined
+                        }
+                      | null
+                      | undefined
+                  limit: number
+                  orderBy: 'earliest' | 'latest'
+                  savedViewId?: string | null | undefined
+                  serviceNames?: string[] | undefined
+                  severityLevels?: ('debug' | 'error' | 'fatal' | 'info' | 'trace' | 'warn')[] | undefined
+                  timezone: 'local' | 'UTC'
+                  wrapLines: boolean
+              }
+              success: true
+          }
+    widgetConfig: LogsWidgetConfig
+    wrapLines: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface editLogsWidgetModalLogicActions {
+    clearFieldError: (field: keyof LogsWidgetFieldErrors) => {
+        field: 'dateRange' | 'limit' | 'timezone' | 'wrapLines'
+    }
+    setDateFrom: (dateFrom: WidgetDateFromValue) => {
+        dateFrom: WidgetDateFromValue
+    }
+    setFieldErrors: (fieldErrors: LogsWidgetFieldErrors) => {
+        fieldErrors: Partial<Record<'dateRange' | 'limit' | 'timezone' | 'wrapLines', string>>
+    }
+    setLimit: (limit: number) => {
+        limit: number
+    }
+    setTileDescription: (tileDescription: string) => {
+        tileDescription: string
+    }
+    setTileName: (tileName: string) => {
+        tileName: string
+    }
+    setTimezone: (timezone: LogsTimezone) => {
+        timezone: LogsTimezone
+    }
+    setWrapLines: (wrapLines: boolean) => {
+        wrapLines: boolean
+    }
+    submit: () => {
+        value: true
+    }
+    submitFailure: () => {
+        value: true
+    }
+    submitSuccess: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface editLogsWidgetModalLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        validation: (
+            limit: number,
+            wrapLines: boolean,
+            timezone: LogsTimezone,
+            dateFrom: WidgetDateFromValue,
+            widgetConfig: {
+                dateRange?:
+                    | {
+                          date_from?:
+                              | '-14d'
+                              | '-1h'
+                              | '-1M'
+                              | '-24h'
+                              | '-30d'
+                              | '-30M'
+                              | '-3h'
+                              | '-7d'
+                              | '-90d'
+                              | null
+                              | undefined
+                      }
+                    | null
+                    | undefined
+                limit: number
+                orderBy: 'earliest' | 'latest'
+                savedViewId?: string | null | undefined
+                serviceNames?: string[] | undefined
+                severityLevels?: ('debug' | 'error' | 'fatal' | 'info' | 'trace' | 'warn')[] | undefined
+                timezone: 'local' | 'UTC'
+                wrapLines: boolean
+            }
+        ) =>
+            | {
+                  fieldErrors: Partial<Record<'dateRange' | 'limit' | 'timezone' | 'wrapLines', string>>
+                  success: false
+              }
+            | {
+                  config: {
+                      dateRange?:
+                          | {
+                                date_from?:
+                                    | '-14d'
+                                    | '-1h'
+                                    | '-1M'
+                                    | '-24h'
+                                    | '-30d'
+                                    | '-30M'
+                                    | '-3h'
+                                    | '-7d'
+                                    | '-90d'
+                                    | null
+                                    | undefined
+                            }
+                          | null
+                          | undefined
+                      limit: number
+                      orderBy: 'earliest' | 'latest'
+                      savedViewId?: string | null | undefined
+                      serviceNames?: string[] | undefined
+                      severityLevels?: ('debug' | 'error' | 'fatal' | 'info' | 'trace' | 'warn')[] | undefined
+                      timezone: 'local' | 'UTC'
+                      wrapLines: boolean
+                  }
+                  success: true
+              }
+        activeFieldErrors: (
+            validation:
+                | {
+                      config: {
+                          dateRange?:
+                              | {
+                                    date_from?:
+                                        | '-14d'
+                                        | '-1h'
+                                        | '-1M'
+                                        | '-24h'
+                                        | '-30d'
+                                        | '-30M'
+                                        | '-3h'
+                                        | '-7d'
+                                        | '-90d'
+                                        | null
+                                        | undefined
+                                }
+                              | null
+                              | undefined
+                          limit: number
+                          orderBy: 'earliest' | 'latest'
+                          savedViewId?: string | null | undefined
+                          serviceNames?: string[] | undefined
+                          severityLevels?: ('debug' | 'error' | 'fatal' | 'info' | 'trace' | 'warn')[] | undefined
+                          timezone: 'local' | 'UTC'
+                          wrapLines: boolean
+                      }
+                      success: true
+                  }
+                | {
+                      fieldErrors: Partial<Record<'dateRange' | 'limit' | 'timezone' | 'wrapLines', string>>
+                      success: false
+                  },
+            fieldErrors: Partial<Record<'dateRange' | 'limit' | 'timezone' | 'wrapLines', string>>
+        ) => LogsWidgetFieldErrors
+        saveDisabledReason: (
+            saving: boolean,
+            validation:
+                | {
+                      config: {
+                          dateRange?:
+                              | {
+                                    date_from?:
+                                        | '-14d'
+                                        | '-1h'
+                                        | '-1M'
+                                        | '-24h'
+                                        | '-30d'
+                                        | '-30M'
+                                        | '-3h'
+                                        | '-7d'
+                                        | '-90d'
+                                        | null
+                                        | undefined
+                                }
+                              | null
+                              | undefined
+                          limit: number
+                          orderBy: 'earliest' | 'latest'
+                          savedViewId?: string | null | undefined
+                          serviceNames?: string[] | undefined
+                          severityLevels?: ('debug' | 'error' | 'fatal' | 'info' | 'trace' | 'warn')[] | undefined
+                          timezone: 'local' | 'UTC'
+                          wrapLines: boolean
+                      }
+                      success: true
+                  }
+                | {
+                      fieldErrors: Partial<Record<'dateRange' | 'limit' | 'timezone' | 'wrapLines', string>>
+                      success: false
+                  }
+        ) => string | undefined
+        widgetConfig: (config: Record<string, unknown>) => LogsWidgetConfig
+    }
+}
+
+export type editLogsWidgetModalLogicType = MakeLogicType<
+    editLogsWidgetModalLogicValues,
+    editLogsWidgetModalLogicActions,
+    EditLogsWidgetModalLogicProps,
+    editLogsWidgetModalLogicMeta
+>
+
 export const editLogsWidgetModalLogic = kea<editLogsWidgetModalLogicType>([
     path(['products', 'dashboards', 'widgets', 'logs', 'editLogsWidgetModalLogic']),
 
@@ -109,11 +349,20 @@ export const editLogsWidgetModalLogic = kea<editLogsWidgetModalLogicType>([
     }),
 
     selectors({
-        widgetConfig: [(_, p) => [p.config], (config): LogsWidgetConfig => parseLogsWidgetConfig(config)],
+        widgetConfig: [
+            (_, p) => [p.config],
+            (config: Record<string, unknown>): LogsWidgetConfig => parseLogsWidgetConfig(config),
+        ],
         ...widgetEditModalPropSelectors,
         validation: [
             (s) => [s.limit, s.wrapLines, s.timezone, s.dateFrom, s.widgetConfig],
-            (limit, wrapLines, timezone, dateFrom, widgetConfig) =>
+            (
+                limit: number,
+                wrapLines: boolean,
+                timezone: LogsTimezone,
+                dateFrom: WidgetDateFromValue,
+                widgetConfig: LogsWidgetConfig
+            ) =>
                 validateLogsWidgetConfigInput({
                     limit,
                     wrapLines,
@@ -124,7 +373,43 @@ export const editLogsWidgetModalLogic = kea<editLogsWidgetModalLogicType>([
         ],
         activeFieldErrors: [
             (s) => [s.validation, s.fieldErrors],
-            (validation, fieldErrors): LogsWidgetFieldErrors => {
+            (
+                validation:
+                    | {
+                          config: {
+                              dateRange?:
+                                  | {
+                                        date_from?:
+                                            | '-14d'
+                                            | '-1h'
+                                            | '-1M'
+                                            | '-24h'
+                                            | '-30d'
+                                            | '-30M'
+                                            | '-3h'
+                                            | '-7d'
+                                            | '-90d'
+                                            | null
+                                            | undefined
+                                    }
+                                  | null
+                                  | undefined
+                              limit: number
+                              orderBy: 'earliest' | 'latest'
+                              savedViewId?: string | null | undefined
+                              serviceNames?: string[] | undefined
+                              severityLevels?: ('debug' | 'error' | 'fatal' | 'info' | 'trace' | 'warn')[] | undefined
+                              timezone: 'local' | 'UTC'
+                              wrapLines: boolean
+                          }
+                          success: true
+                      }
+                    | {
+                          fieldErrors: Partial<Record<'dateRange' | 'limit' | 'timezone' | 'wrapLines', string>>
+                          success: false
+                      },
+                fieldErrors: LogsWidgetFieldErrors
+            ): LogsWidgetFieldErrors => {
                 if (!validation.success) {
                     return { ...validation.fieldErrors, ...fieldErrors }
                 }
@@ -133,7 +418,43 @@ export const editLogsWidgetModalLogic = kea<editLogsWidgetModalLogicType>([
         ],
         saveDisabledReason: [
             (s) => [s.saving, s.validation],
-            (saving, validation): string | undefined => {
+            (
+                saving: boolean,
+                validation:
+                    | {
+                          config: {
+                              dateRange?:
+                                  | {
+                                        date_from?:
+                                            | '-14d'
+                                            | '-1h'
+                                            | '-1M'
+                                            | '-24h'
+                                            | '-30d'
+                                            | '-30M'
+                                            | '-3h'
+                                            | '-7d'
+                                            | '-90d'
+                                            | null
+                                            | undefined
+                                    }
+                                  | null
+                                  | undefined
+                              limit: number
+                              orderBy: 'earliest' | 'latest'
+                              savedViewId?: string | null | undefined
+                              serviceNames?: string[] | undefined
+                              severityLevels?: ('debug' | 'error' | 'fatal' | 'info' | 'trace' | 'warn')[] | undefined
+                              timezone: 'local' | 'UTC'
+                              wrapLines: boolean
+                          }
+                          success: true
+                      }
+                    | {
+                          fieldErrors: Partial<Record<'dateRange' | 'limit' | 'timezone' | 'wrapLines', string>>
+                          success: false
+                      }
+            ): string | undefined => {
                 if (saving) {
                     return 'Saving…'
                 }
diff --git a/products/dashboards/frontend/widgets/logs/logsWidgetSavedViewsLogic.ts b/products/dashboards/frontend/widgets/logs/logsWidgetSavedViewsLogic.ts
index 4417fe202958..7aeb40958903 100644
--- a/products/dashboards/frontend/widgets/logs/logsWidgetSavedViewsLogic.ts
+++ b/products/dashboards/frontend/widgets/logs/logsWidgetSavedViewsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { teamLogic } from 'scenes/teamLogic'
@@ -6,11 +6,67 @@ import { teamLogic } from 'scenes/teamLogic'
 import { logsViewsList } from 'products/logs/frontend/generated/api'
 import type { LogsViewApi } from 'products/logs/frontend/generated/api.schemas'
 
-import type { logsWidgetSavedViewsLogicType } from './logsWidgetSavedViewsLogicType'
-
 // One page is plenty — saved views are few, so we never paginate the dropdown.
 const SAVED_VIEWS_LIMIT = 100
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsWidgetSavedViewsLogicValues {
+    currentProjectId: number | string // teamLogic
+    hasLoadedSavedViews: boolean
+    savedViewLabelById: Record<string, string>
+    savedViewOptions: {
+        label: string
+        value: string
+    }[]
+    savedViews: LogsViewApi[]
+    savedViewsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsWidgetSavedViewsLogicActions {
+    ensureSavedViewsLoaded: () => {
+        value: true
+    }
+    loadSavedViews: () => any
+    loadSavedViewsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSavedViewsSuccess: (
+        savedViews: LogsViewApi[],
+        payload?: any
+    ) => {
+        savedViews: LogsViewApi[]
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsWidgetSavedViewsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        savedViewOptions: (savedViews: LogsViewApi[]) => {
+            label: string
+            value: string
+        }[]
+        savedViewLabelById: (
+            savedViewOptions: {
+                label: string
+                value: string
+            }[]
+        ) => Record<string, string>
+    }
+}
+
+export type logsWidgetSavedViewsLogicType = MakeLogicType<
+    logsWidgetSavedViewsLogicValues,
+    logsWidgetSavedViewsLogicActions,
+    Record<string, any>,
+    logsWidgetSavedViewsLogicMeta
+>
+
 // Saved logs filters are LogsView rows ("saved views" on the logs page). The fetch is lazy —
 // only tiles that actually surface the picker (feature flag on, or a saved view already persisted)
 // trigger it, so tiles without the feature never hit the API.
@@ -37,7 +93,7 @@ export const logsWidgetSavedViewsLogic = kea<logsWidgetSavedViewsLogicType>([
     selectors({
         savedViewOptions: [
             (s) => [s.savedViews],
-            (savedViews): { value: string; label: string }[] =>
+            (savedViews: LogsViewApi[]): { value: string; label: string }[] =>
                 savedViews.map((view) => ({
                     value: view.short_id,
                     label: view.name || 'Unnamed view',
@@ -47,7 +103,12 @@ export const logsWidgetSavedViewsLogic = kea<logsWidgetSavedViewsLogicType>([
         // tile filter bar and the read-only summary.
         savedViewLabelById: [
             (s) => [s.savedViewOptions],
-            (savedViewOptions): Record<string, string> =>
+            (
+                savedViewOptions: {
+                    label: string
+                    value: string
+                }[]
+            ): Record<string, string> =>
                 Object.fromEntries(savedViewOptions.map((option) => [option.value, option.label])),
         ],
     }),
diff --git a/products/dashboards/frontend/widgets/session_replay/editSessionReplayWidgetModalLogic.ts b/products/dashboards/frontend/widgets/session_replay/editSessionReplayWidgetModalLogic.ts
index d71d2c478291..41ff73f538a8 100644
--- a/products/dashboards/frontend/widgets/session_replay/editSessionReplayWidgetModalLogic.ts
+++ b/products/dashboards/frontend/widgets/session_replay/editSessionReplayWidgetModalLogic.ts
@@ -1,10 +1,11 @@
-import { actions, connect, defaults, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, defaults, kea, listeners, path, props, reducers, selectors } from 'kea'
 
 import { filterTestAccountsDefaultsLogic } from 'scenes/settings/environment/filterTestAccountDefaultsLogic'
 
 import type { SessionReplayWidgetConfig } from '../../generated/widget-configs.zod'
 import { isWidgetConfigValidationError } from '../../utils'
 import { resolveWidgetFilterTestAccounts } from '../../widget_types/widgetConfigShared'
+import type { WidgetDateFromValue } from '../../widget_types/widgetConfigShared'
 import {
     widgetEditModalFilterTestAccountsActions,
     widgetEditModalListFieldActions,
@@ -14,7 +15,6 @@ import {
     getWidgetEditModalTileDefaults,
 } from '../editWidgetModalBuilders'
 import type { DashboardWidgetEditModalProps } from '../registry'
-import type { editSessionReplayWidgetModalLogicType } from './editSessionReplayWidgetModalLogicType'
 import {
     parseSessionReplayWidgetConfig,
     validateSessionReplayWidgetConfigInput,
@@ -23,6 +23,529 @@ import {
 
 export type EditSessionReplayWidgetModalLogicProps = Omit<DashboardWidgetEditModalProps, 'isOpen'>
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface editSessionReplayWidgetModalLogicValues {
+    filterTestAccountsDefault: boolean // filterTestAccountsDefaultsLogic
+    activeFieldErrors: SessionReplayWidgetFieldErrors
+    defaultTitle: string
+    fieldErrors: SessionReplayWidgetFieldErrors
+    filterTestAccounts: boolean
+    limit: number
+    onClose: () => void
+    orderBy: 'activity_score' | 'click_count' | 'console_error_count' | 'duration' | 'recording_duration' | 'start_time'
+    orderDirection: 'ASC' | 'DESC'
+    saveDisabledReason: string | undefined
+    saving: boolean
+    tileDescription: string
+    tileName: string
+    validation:
+        | {
+              fieldErrors: Partial<
+                  Record<'dateRange' | 'filterTestAccounts' | 'limit' | 'orderBy' | 'orderDirection', string>
+              >
+              success: false
+          }
+        | {
+              config: {
+                  collectionId?: string | null | undefined
+                  dateRange?:
+                      | {
+                            date_from?:
+                                | '-14d'
+                                | '-1h'
+                                | '-1M'
+                                | '-24h'
+                                | '-30d'
+                                | '-30M'
+                                | '-3h'
+                                | '-7d'
+                                | '-90d'
+                                | null
+                                | undefined
+                        }
+                      | null
+                      | undefined
+                  filterTestAccounts?: boolean | null | undefined
+                  limit: number
+                  orderBy:
+                      | 'activity_score'
+                      | 'click_count'
+                      | 'console_error_count'
+                      | 'duration'
+                      | 'recording_duration'
+                      | 'start_time'
+                  orderDirection: 'ASC' | 'DESC'
+                  savedFilterId?: string | null | undefined
+                  widgetFilters?:
+                      | Record<
+                            string,
+                            {
+                                filterId: string
+                                operator:
+                                    | 'between'
+                                    | 'exact'
+                                    | 'flag_evaluates_to'
+                                    | 'gt'
+                                    | 'gte'
+                                    | 'icontains'
+                                    | 'icontains_multi'
+                                    | 'in'
+                                    | 'is_cleaned_path_exact'
+                                    | 'is_date_after'
+                                    | 'is_date_before'
+                                    | 'is_date_exact'
+                                    | 'is_not'
+                                    | 'is_not_set'
+                                    | 'is_set'
+                                    | 'lt'
+                                    | 'lte'
+                                    | 'max'
+                                    | 'min'
+                                    | 'not_between'
+                                    | 'not_icontains'
+                                    | 'not_icontains_multi'
+                                    | 'not_in'
+                                    | 'not_regex'
+                                    | 'regex'
+                                    | 'semver_caret'
+                                    | 'semver_eq'
+                                    | 'semver_gt'
+                                    | 'semver_gte'
+                                    | 'semver_lt'
+                                    | 'semver_lte'
+                                    | 'semver_neq'
+                                    | 'semver_tilde'
+                                    | 'semver_wildcard'
+                                optionId: string
+                                propertyName: string
+                                value?: string | string[] | null | undefined
+                            }
+                        >
+                      | null
+                      | undefined
+              }
+              success: true
+          }
+    widgetConfig: SessionReplayWidgetConfig
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface editSessionReplayWidgetModalLogicActions {
+    clearFieldError: (field: keyof SessionReplayWidgetFieldErrors) => {
+        field: 'dateRange' | 'filterTestAccounts' | 'limit' | 'orderBy' | 'orderDirection'
+    }
+    setDateFrom: (dateFrom: WidgetDateFromValue) => {
+        dateFrom: WidgetDateFromValue
+    }
+    setFieldErrors: (fieldErrors: SessionReplayWidgetFieldErrors) => {
+        fieldErrors: Partial<
+            Record<'dateRange' | 'filterTestAccounts' | 'limit' | 'orderBy' | 'orderDirection', string>
+        >
+    }
+    setFilterTestAccounts: (filterTestAccounts: boolean) => {
+        filterTestAccounts: boolean
+    }
+    setLimit: (limit: number) => {
+        limit: number
+    }
+    setOrderBy: (orderBy: string) => {
+        orderBy: string
+    }
+    setOrderDirection: (orderDirection: SessionReplayWidgetConfig['orderDirection']) => {
+        orderDirection: 'ASC' | 'DESC'
+    }
+    setTileDescription: (tileDescription: string) => {
+        tileDescription: string
+    }
+    setTileName: (tileName: string) => {
+        tileName: string
+    }
+    submit: () => {
+        value: true
+    }
+    submitFailure: () => {
+        value: true
+    }
+    submitSuccess: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface editSessionReplayWidgetModalLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        validation: (
+            limit: number,
+            orderBy:
+                | 'activity_score'
+                | 'click_count'
+                | 'console_error_count'
+                | 'duration'
+                | 'recording_duration'
+                | 'start_time',
+            orderDirection: 'ASC' | 'DESC',
+            filterTestAccounts: boolean,
+            widgetConfig: {
+                collectionId?: string | null | undefined
+                dateRange?:
+                    | {
+                          date_from?:
+                              | '-14d'
+                              | '-1h'
+                              | '-1M'
+                              | '-24h'
+                              | '-30d'
+                              | '-30M'
+                              | '-3h'
+                              | '-7d'
+                              | '-90d'
+                              | null
+                              | undefined
+                      }
+                    | null
+                    | undefined
+                filterTestAccounts?: boolean | null | undefined
+                limit: number
+                orderBy:
+                    | 'activity_score'
+                    | 'click_count'
+                    | 'console_error_count'
+                    | 'duration'
+                    | 'recording_duration'
+                    | 'start_time'
+                orderDirection: 'ASC' | 'DESC'
+                savedFilterId?: string | null | undefined
+                widgetFilters?:
+                    | Record<
+                          string,
+                          {
+                              filterId: string
+                              operator:
+                                  | 'between'
+                                  | 'exact'
+                                  | 'flag_evaluates_to'
+                                  | 'gt'
+                                  | 'gte'
+                                  | 'icontains'
+                                  | 'icontains_multi'
+                                  | 'in'
+                                  | 'is_cleaned_path_exact'
+                                  | 'is_date_after'
+                                  | 'is_date_before'
+                                  | 'is_date_exact'
+                                  | 'is_not'
+                                  | 'is_not_set'
+                                  | 'is_set'
+                                  | 'lt'
+                                  | 'lte'
+                                  | 'max'
+                                  | 'min'
+                                  | 'not_between'
+                                  | 'not_icontains'
+                                  | 'not_icontains_multi'
+                                  | 'not_in'
+                                  | 'not_regex'
+                                  | 'regex'
+                                  | 'semver_caret'
+                                  | 'semver_eq'
+                                  | 'semver_gt'
+                                  | 'semver_gte'
+                                  | 'semver_lt'
+                                  | 'semver_lte'
+                                  | 'semver_neq'
+                                  | 'semver_tilde'
+                                  | 'semver_wildcard'
+                              optionId: string
+                              propertyName: string
+                              value?: string | string[] | null | undefined
+                          }
+                      >
+                    | null
+                    | undefined
+            }
+        ) =>
+            | {
+                  fieldErrors: Partial<
+                      Record<'dateRange' | 'filterTestAccounts' | 'limit' | 'orderBy' | 'orderDirection', string>
+                  >
+                  success: false
+              }
+            | {
+                  config: {
+                      collectionId?: string | null | undefined
+                      dateRange?:
+                          | {
+                                date_from?:
+                                    | '-14d'
+                                    | '-1h'
+                                    | '-1M'
+                                    | '-24h'
+                                    | '-30d'
+                                    | '-30M'
+                                    | '-3h'
+                                    | '-7d'
+                                    | '-90d'
+                                    | null
+                                    | undefined
+                            }
+                          | null
+                          | undefined
+                      filterTestAccounts?: boolean | null | undefined
+                      limit: number
+                      orderBy:
+                          | 'activity_score'
+                          | 'click_count'
+                          | 'console_error_count'
+                          | 'duration'
+                          | 'recording_duration'
+                          | 'start_time'
+                      orderDirection: 'ASC' | 'DESC'
+                      savedFilterId?: string | null | undefined
+                      widgetFilters?:
+                          | Record<
+                                string,
+                                {
+                                    filterId: string
+                                    operator:
+                                        | 'between'
+                                        | 'exact'
+                                        | 'flag_evaluates_to'
+                                        | 'gt'
+                                        | 'gte'
+                                        | 'icontains'
+                                        | 'icontains_multi'
+                                        | 'in'
+                                        | 'is_cleaned_path_exact'
+                                        | 'is_date_after'
+                                        | 'is_date_before'
+                                        | 'is_date_exact'
+                                        | 'is_not'
+                                        | 'is_not_set'
+                                        | 'is_set'
+                                        | 'lt'
+                                        | 'lte'
+                                        | 'max'
+                                        | 'min'
+                                        | 'not_between'
+                                        | 'not_icontains'
+                                        | 'not_icontains_multi'
+                                        | 'not_in'
+                                        | 'not_regex'
+                                        | 'regex'
+                                        | 'semver_caret'
+                                        | 'semver_eq'
+                                        | 'semver_gt'
+                                        | 'semver_gte'
+                                        | 'semver_lt'
+                                        | 'semver_lte'
+                                        | 'semver_neq'
+                                        | 'semver_tilde'
+                                        | 'semver_wildcard'
+                                    optionId: string
+                                    propertyName: string
+                                    value?: string | string[] | null | undefined
+                                }
+                            >
+                          | null
+                          | undefined
+                  }
+                  success: true
+              }
+        activeFieldErrors: (
+            validation:
+                | {
+                      config: {
+                          collectionId?: string | null | undefined
+                          dateRange?:
+                              | {
+                                    date_from?:
+                                        | '-14d'
+                                        | '-1h'
+                                        | '-1M'
+                                        | '-24h'
+                                        | '-30d'
+                                        | '-30M'
+                                        | '-3h'
+                                        | '-7d'
+                                        | '-90d'
+                                        | null
+                                        | undefined
+                                }
+                              | null
+                              | undefined
+                          filterTestAccounts?: boolean | null | undefined
+                          limit: number
+                          orderBy:
+                              | 'activity_score'
+                              | 'click_count'
+                              | 'console_error_count'
+                              | 'duration'
+                              | 'recording_duration'
+                              | 'start_time'
+                          orderDirection: 'ASC' | 'DESC'
+                          savedFilterId?: string | null | undefined
+                          widgetFilters?:
+                              | Record<
+                                    string,
+                                    {
+                                        filterId: string
+                                        operator:
+                                            | 'between'
+                                            | 'exact'
+                                            | 'flag_evaluates_to'
+                                            | 'gt'
+                                            | 'gte'
+                                            | 'icontains'
+                                            | 'icontains_multi'
+                                            | 'in'
+                                            | 'is_cleaned_path_exact'
+                                            | 'is_date_after'
+                                            | 'is_date_before'
+                                            | 'is_date_exact'
+                                            | 'is_not'
+                                            | 'is_not_set'
+                                            | 'is_set'
+                                            | 'lt'
+                                            | 'lte'
+                                            | 'max'
+                                            | 'min'
+                                            | 'not_between'
+                                            | 'not_icontains'
+                                            | 'not_icontains_multi'
+                                            | 'not_in'
+                                            | 'not_regex'
+                                            | 'regex'
+                                            | 'semver_caret'
+                                            | 'semver_eq'
+                                            | 'semver_gt'
+                                            | 'semver_gte'
+                                            | 'semver_lt'
+                                            | 'semver_lte'
+                                            | 'semver_neq'
+                                            | 'semver_tilde'
+                                            | 'semver_wildcard'
+                                        optionId: string
+                                        propertyName: string
+                                        value?: string | string[] | null | undefined
+                                    }
+                                >
+                              | null
+                              | undefined
+                      }
+                      success: true
+                  }
+                | {
+                      fieldErrors: Partial<
+                          Record<'dateRange' | 'filterTestAccounts' | 'limit' | 'orderBy' | 'orderDirection', string>
+                      >
+                      success: false
+                  },
+            fieldErrors: Partial<
+                Record<'dateRange' | 'filterTestAccounts' | 'limit' | 'orderBy' | 'orderDirection', string>
+            >
+        ) => SessionReplayWidgetFieldErrors
+        saveDisabledReason: (
+            saving: boolean,
+            validation:
+                | {
+                      config: {
+                          collectionId?: string | null | undefined
+                          dateRange?:
+                              | {
+                                    date_from?:
+                                        | '-14d'
+                                        | '-1h'
+                                        | '-1M'
+                                        | '-24h'
+                                        | '-30d'
+                                        | '-30M'
+                                        | '-3h'
+                                        | '-7d'
+                                        | '-90d'
+                                        | null
+                                        | undefined
+                                }
+                              | null
+                              | undefined
+                          filterTestAccounts?: boolean | null | undefined
+                          limit: number
+                          orderBy:
+                              | 'activity_score'
+                              | 'click_count'
+                              | 'console_error_count'
+                              | 'duration'
+                              | 'recording_duration'
+                              | 'start_time'
+                          orderDirection: 'ASC' | 'DESC'
+                          savedFilterId?: string | null | undefined
+                          widgetFilters?:
+                              | Record<
+                                    string,
+                                    {
+                                        filterId: string
+                                        operator:
+                                            | 'between'
+                                            | 'exact'
+                                            | 'flag_evaluates_to'
+                                            | 'gt'
+                                            | 'gte'
+                                            | 'icontains'
+                                            | 'icontains_multi'
+                                            | 'in'
+                                            | 'is_cleaned_path_exact'
+                                            | 'is_date_after'
+                                            | 'is_date_before'
+                                            | 'is_date_exact'
+                                            | 'is_not'
+                                            | 'is_not_set'
+                                            | 'is_set'
+                                            | 'lt'
+                                            | 'lte'
+                                            | 'max'
+                                            | 'min'
+                                            | 'not_between'
+                                            | 'not_icontains'
+                                            | 'not_icontains_multi'
+                                            | 'not_in'
+                                            | 'not_regex'
+                                            | 'regex'
+                                            | 'semver_caret'
+                                            | 'semver_eq'
+                                            | 'semver_gt'
+                                            | 'semver_gte'
+                                            | 'semver_lt'
+                                            | 'semver_lte'
+                                            | 'semver_neq'
+                                            | 'semver_tilde'
+                                            | 'semver_wildcard'
+                                        optionId: string
+                                        propertyName: string
+                                        value?: string | string[] | null | undefined
+                                    }
+                                >
+                              | null
+                              | undefined
+                      }
+                      success: true
+                  }
+                | {
+                      fieldErrors: Partial<
+                          Record<'dateRange' | 'filterTestAccounts' | 'limit' | 'orderBy' | 'orderDirection', string>
+                      >
+                      success: false
+                  }
+        ) => string | undefined
+        widgetConfig: (config: Record<string, unknown>) => SessionReplayWidgetConfig
+    }
+}
+
+export type editSessionReplayWidgetModalLogicType = MakeLogicType<
+    editSessionReplayWidgetModalLogicValues,
+    editSessionReplayWidgetModalLogicActions,
+    EditSessionReplayWidgetModalLogicProps,
+    editSessionReplayWidgetModalLogicMeta
+>
+
 export const editSessionReplayWidgetModalLogic = kea<editSessionReplayWidgetModalLogicType>([
     path(['products', 'dashboards', 'widgets', 'session_replay', 'editSessionReplayWidgetModalLogic']),
 
@@ -129,12 +652,24 @@ export const editSessionReplayWidgetModalLogic = kea<editSessionReplayWidgetModa
     selectors({
         widgetConfig: [
             (_, p) => [p.config],
-            (config): SessionReplayWidgetConfig => parseSessionReplayWidgetConfig(config),
+            (config: Record<string, unknown>): SessionReplayWidgetConfig => parseSessionReplayWidgetConfig(config),
         ],
         ...widgetEditModalPropSelectors,
         validation: [
             (s) => [s.limit, s.orderBy, s.orderDirection, s.filterTestAccounts, s.widgetConfig],
-            (limit, orderBy, orderDirection, filterTestAccounts, widgetConfig) =>
+            (
+                limit: number,
+                orderBy:
+                    | 'activity_score'
+                    | 'click_count'
+                    | 'console_error_count'
+                    | 'duration'
+                    | 'recording_duration'
+                    | 'start_time',
+                orderDirection: 'ASC' | 'DESC',
+                filterTestAccounts: boolean,
+                widgetConfig: SessionReplayWidgetConfig
+            ) =>
                 validateSessionReplayWidgetConfigInput({
                     limit,
                     orderBy,
@@ -145,7 +680,100 @@ export const editSessionReplayWidgetModalLogic = kea<editSessionReplayWidgetModa
         ],
         activeFieldErrors: [
             (s) => [s.validation, s.fieldErrors],
-            (validation, fieldErrors): SessionReplayWidgetFieldErrors => {
+            (
+                validation:
+                    | {
+                          config: {
+                              collectionId?: string | null | undefined
+                              dateRange?:
+                                  | {
+                                        date_from?:
+                                            | '-14d'
+                                            | '-1h'
+                                            | '-1M'
+                                            | '-24h'
+                                            | '-30d'
+                                            | '-30M'
+                                            | '-3h'
+                                            | '-7d'
+                                            | '-90d'
+                                            | null
+                                            | undefined
+                                    }
+                                  | null
+                                  | undefined
+                              filterTestAccounts?: boolean | null | undefined
+                              limit: number
+                              orderBy:
+                                  | 'activity_score'
+                                  | 'click_count'
+                                  | 'console_error_count'
+                                  | 'duration'
+                                  | 'recording_duration'
+                                  | 'start_time'
+                              orderDirection: 'ASC' | 'DESC'
+                              savedFilterId?: string | null | undefined
+                              widgetFilters?:
+                                  | Record<
+                                        string,
+                                        {
+                                            filterId: string
+                                            operator:
+                                                | 'between'
+                                                | 'exact'
+                                                | 'flag_evaluates_to'
+                                                | 'gt'
+                                                | 'gte'
+                                                | 'icontains'
+                                                | 'icontains_multi'
+                                                | 'in'
+                                                | 'is_cleaned_path_exact'
+                                                | 'is_date_after'
+                                                | 'is_date_before'
+                                                | 'is_date_exact'
+                                                | 'is_not'
+                                                | 'is_not_set'
+                                                | 'is_set'
+                                                | 'lt'
+                                                | 'lte'
+                                                | 'max'
+                                                | 'min'
+                                                | 'not_between'
+                                                | 'not_icontains'
+                                                | 'not_icontains_multi'
+                                                | 'not_in'
+                                                | 'not_regex'
+                                                | 'regex'
+                                                | 'semver_caret'
+                                                | 'semver_eq'
+                                                | 'semver_gt'
+                                                | 'semver_gte'
+                                                | 'semver_lt'
+                                                | 'semver_lte'
+                                                | 'semver_neq'
+                                                | 'semver_tilde'
+                                                | 'semver_wildcard'
+                                            optionId: string
+                                            propertyName: string
+                                            value?: string | string[] | null | undefined
+                                        }
+                                    >
+                                  | null
+                                  | undefined
+                          }
+                          success: true
+                      }
+                    | {
+                          fieldErrors: Partial<
+                              Record<
+                                  'dateRange' | 'filterTestAccounts' | 'limit' | 'orderBy' | 'orderDirection',
+                                  string
+                              >
+                          >
+                          success: false
+                      },
+                fieldErrors: SessionReplayWidgetFieldErrors
+            ): SessionReplayWidgetFieldErrors => {
                 if (!validation.success) {
                     return { ...validation.fieldErrors, ...fieldErrors }
                 }
@@ -154,7 +782,100 @@ export const editSessionReplayWidgetModalLogic = kea<editSessionReplayWidgetModa
         ],
         saveDisabledReason: [
             (s) => [s.saving, s.validation],
-            (saving, validation): string | undefined => {
+            (
+                saving: boolean,
+                validation:
+                    | {
+                          config: {
+                              collectionId?: string | null | undefined
+                              dateRange?:
+                                  | {
+                                        date_from?:
+                                            | '-14d'
+                                            | '-1h'
+                                            | '-1M'
+                                            | '-24h'
+                                            | '-30d'
+                                            | '-30M'
+                                            | '-3h'
+                                            | '-7d'
+                                            | '-90d'
+                                            | null
+                                            | undefined
+                                    }
+                                  | null
+                                  | undefined
+                              filterTestAccounts?: boolean | null | undefined
+                              limit: number
+                              orderBy:
+                                  | 'activity_score'
+                                  | 'click_count'
+                                  | 'console_error_count'
+                                  | 'duration'
+                                  | 'recording_duration'
+                                  | 'start_time'
+                              orderDirection: 'ASC' | 'DESC'
+                              savedFilterId?: string | null | undefined
+                              widgetFilters?:
+                                  | Record<
+                                        string,
+                                        {
+                                            filterId: string
+                                            operator:
+                                                | 'between'
+                                                | 'exact'
+                                                | 'flag_evaluates_to'
+                                                | 'gt'
+                                                | 'gte'
+                                                | 'icontains'
+                                                | 'icontains_multi'
+                                                | 'in'
+                                                | 'is_cleaned_path_exact'
+                                                | 'is_date_after'
+                                                | 'is_date_before'
+                                                | 'is_date_exact'
+                                                | 'is_not'
+                                                | 'is_not_set'
+                                                | 'is_set'
+                                                | 'lt'
+                                                | 'lte'
+                                                | 'max'
+                                                | 'min'
+                                                | 'not_between'
+                                                | 'not_icontains'
+                                                | 'not_icontains_multi'
+                                                | 'not_in'
+                                                | 'not_regex'
+                                                | 'regex'
+                                                | 'semver_caret'
+                                                | 'semver_eq'
+                                                | 'semver_gt'
+                                                | 'semver_gte'
+                                                | 'semver_lt'
+                                                | 'semver_lte'
+                                                | 'semver_neq'
+                                                | 'semver_tilde'
+                                                | 'semver_wildcard'
+                                            optionId: string
+                                            propertyName: string
+                                            value?: string | string[] | null | undefined
+                                        }
+                                    >
+                                  | null
+                                  | undefined
+                          }
+                          success: true
+                      }
+                    | {
+                          fieldErrors: Partial<
+                              Record<
+                                  'dateRange' | 'filterTestAccounts' | 'limit' | 'orderBy' | 'orderDirection',
+                                  string
+                              >
+                          >
+                          success: false
+                      }
+            ): string | undefined => {
                 if (saving) {
                     return 'Saving…'
                 }
diff --git a/products/dashboards/frontend/widgets/session_replay/sessionReplayWidgetSavedFiltersLogic.ts b/products/dashboards/frontend/widgets/session_replay/sessionReplayWidgetSavedFiltersLogic.ts
index 0cc2c7c2358a..ad12abb36774 100644
--- a/products/dashboards/frontend/widgets/session_replay/sessionReplayWidgetSavedFiltersLogic.ts
+++ b/products/dashboards/frontend/widgets/session_replay/sessionReplayWidgetSavedFiltersLogic.ts
@@ -1,4 +1,4 @@
-import { afterMount, kea, path, selectors } from 'kea'
+import { MakeLogicType, afterMount, kea, path, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -6,8 +6,6 @@ import { toParams } from 'lib/utils/url'
 
 import type { SessionRecordingPlaylistType } from '~/types'
 
-import type { sessionReplayWidgetSavedFiltersLogicType } from './sessionReplayWidgetSavedFiltersLogicType'
-
 const toOptions = (
     playlists: SessionRecordingPlaylistType[],
     unnamedLabel: string
@@ -17,6 +15,91 @@ const toOptions = (
         label: playlist.name || playlist.derived_name || unnamedLabel,
     }))
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionReplayWidgetSavedFiltersLogicValues {
+    collectionLabelById: Record<string, string>
+    collectionOptions: {
+        label: string
+        value: string
+    }[]
+    collections: SessionRecordingPlaylistType[]
+    collectionsLoading: boolean
+    savedFilterLabelById: Record<string, string>
+    savedFilterOptions: {
+        label: string
+        value: string
+    }[]
+    savedFilters: SessionRecordingPlaylistType[]
+    savedFiltersLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionReplayWidgetSavedFiltersLogicActions {
+    loadCollections: () => any
+    loadCollectionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadCollectionsSuccess: (
+        collections: SessionRecordingPlaylistType[],
+        payload?: any
+    ) => {
+        collections: SessionRecordingPlaylistType[]
+        payload?: any
+    }
+    loadSavedFilters: () => any
+    loadSavedFiltersFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSavedFiltersSuccess: (
+        savedFilters: SessionRecordingPlaylistType[],
+        payload?: any
+    ) => {
+        savedFilters: SessionRecordingPlaylistType[]
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionReplayWidgetSavedFiltersLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        savedFilterOptions: (savedFilters: SessionRecordingPlaylistType[]) => {
+            label: string
+            value: string
+        }[]
+        collectionOptions: (collections: SessionRecordingPlaylistType[]) => {
+            label: string
+            value: string
+        }[]
+        savedFilterLabelById: (
+            savedFilterOptions: {
+                label: string
+                value: string
+            }[]
+        ) => Record<string, string>
+        collectionLabelById: (
+            collectionOptions: {
+                label: string
+                value: string
+            }[]
+        ) => Record<string, string>
+    }
+}
+
+export type sessionReplayWidgetSavedFiltersLogicType = MakeLogicType<
+    sessionReplayWidgetSavedFiltersLogicValues,
+    sessionReplayWidgetSavedFiltersLogicActions,
+    Record<string, any>,
+    sessionReplayWidgetSavedFiltersLogicMeta
+>
+
 // Saved session replay filters and collections are both SessionRecordingPlaylist rows, distinguished by
 // type ("filters" vs "collection"). The widget can source recordings from either, so we load both here.
 export const sessionReplayWidgetSavedFiltersLogic = kea<sessionReplayWidgetSavedFiltersLogicType>([
@@ -44,22 +127,34 @@ export const sessionReplayWidgetSavedFiltersLogic = kea<sessionReplayWidgetSaved
     selectors({
         savedFilterOptions: [
             (s) => [s.savedFilters],
-            (savedFilters): { value: string; label: string }[] => toOptions(savedFilters, 'Unnamed filter'),
+            (savedFilters: SessionRecordingPlaylistType[]): { value: string; label: string }[] =>
+                toOptions(savedFilters, 'Unnamed filter'),
         ],
         collectionOptions: [
             (s) => [s.collections],
-            (collections): { value: string; label: string }[] => toOptions(collections, 'Unnamed collection'),
+            (collections: SessionRecordingPlaylistType[]): { value: string; label: string }[] =>
+                toOptions(collections, 'Unnamed collection'),
         ],
         // Single source for resolving a saved-filter short_id to its display label, shared by the
         // tile filter bar and the card header top heading.
         savedFilterLabelById: [
             (s) => [s.savedFilterOptions],
-            (savedFilterOptions): Record<string, string> =>
+            (
+                savedFilterOptions: {
+                    label: string
+                    value: string
+                }[]
+            ): Record<string, string> =>
                 Object.fromEntries(savedFilterOptions.map((option) => [option.value, option.label])),
         ],
         collectionLabelById: [
             (s) => [s.collectionOptions],
-            (collectionOptions): Record<string, string> =>
+            (
+                collectionOptions: {
+                    label: string
+                    value: string
+                }[]
+            ): Record<string, string> =>
                 Object.fromEntries(collectionOptions.map((option) => [option.value, option.label])),
         ],
     }),
diff --git a/products/dashboards/frontend/widgets/surveys/editSurveyResultsWidgetModalLogic.ts b/products/dashboards/frontend/widgets/surveys/editSurveyResultsWidgetModalLogic.ts
index ebbf131fef0a..9f3ae0ba4ce9 100644
--- a/products/dashboards/frontend/widgets/surveys/editSurveyResultsWidgetModalLogic.ts
+++ b/products/dashboards/frontend/widgets/surveys/editSurveyResultsWidgetModalLogic.ts
@@ -1,4 +1,4 @@
-import { actions, defaults, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, defaults, kea, listeners, path, props, reducers, selectors } from 'kea'
 
 import type { SurveyResultsWidgetConfig } from '../../generated/widget-configs.zod'
 import { isWidgetConfigValidationError } from '../../utils'
@@ -9,7 +9,6 @@ import {
     getWidgetEditModalTileDefaults,
 } from '../editWidgetModalBuilders'
 import type { DashboardWidgetEditModalProps } from '../registry'
-import type { editSurveyResultsWidgetModalLogicType } from './editSurveyResultsWidgetModalLogicType'
 import {
     dateFromValueForConfig,
     parseSurveyResultsWidgetConfig,
@@ -21,6 +20,212 @@ import {
 
 export type EditSurveyResultsWidgetModalLogicProps = Omit<DashboardWidgetEditModalProps, 'isOpen'>
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface editSurveyResultsWidgetModalLogicValues {
+    activeFieldErrors: SurveyResultsWidgetFieldErrors
+    dateFrom: SurveyWidgetDateFrom
+    defaultTitle: string
+    fieldErrors: SurveyResultsWidgetFieldErrors
+    limit: number
+    onClose: () => void
+    saveDisabledReason: string | undefined
+    saving: boolean
+    tileDescription: string
+    tileName: string
+    validation:
+        | {
+              fieldErrors: Partial<Record<'dateRange' | 'limit' | 'surveyId', string>>
+              success: false
+          }
+        | {
+              config: {
+                  dateRange?:
+                      | {
+                            date_from?:
+                                | '-14d'
+                                | '-1h'
+                                | '-1M'
+                                | '-24h'
+                                | '-30d'
+                                | '-30M'
+                                | '-3h'
+                                | '-7d'
+                                | '-90d'
+                                | null
+                                | undefined
+                        }
+                      | null
+                      | undefined
+                  limit: number
+                  surveyId?: string | null | undefined
+              }
+              success: true
+          }
+    widgetConfig: SurveyResultsWidgetConfig
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface editSurveyResultsWidgetModalLogicActions {
+    clearFieldError: (field: keyof SurveyResultsWidgetFieldErrors) => {
+        field: 'dateRange' | 'limit' | 'surveyId'
+    }
+    setDateFrom: (dateFrom: SurveyWidgetDateFrom) => {
+        dateFrom: SurveyWidgetDateFrom
+    }
+    setFieldErrors: (fieldErrors: SurveyResultsWidgetFieldErrors) => {
+        fieldErrors: Partial<Record<'dateRange' | 'limit' | 'surveyId', string>>
+    }
+    setLimit: (limit: number) => {
+        limit: number
+    }
+    setTileDescription: (tileDescription: string) => {
+        tileDescription: string
+    }
+    setTileName: (tileName: string) => {
+        tileName: string
+    }
+    submit: () => {
+        value: true
+    }
+    submitFailure: () => {
+        value: true
+    }
+    submitSuccess: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface editSurveyResultsWidgetModalLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        validation: (
+            limit: number,
+            dateFrom: SurveyWidgetDateFrom,
+            widgetConfig: {
+                dateRange?:
+                    | {
+                          date_from?:
+                              | '-14d'
+                              | '-1h'
+                              | '-1M'
+                              | '-24h'
+                              | '-30d'
+                              | '-30M'
+                              | '-3h'
+                              | '-7d'
+                              | '-90d'
+                              | null
+                              | undefined
+                      }
+                    | null
+                    | undefined
+                limit: number
+                surveyId?: string | null | undefined
+            }
+        ) =>
+            | {
+                  fieldErrors: Partial<Record<'dateRange' | 'limit' | 'surveyId', string>>
+                  success: false
+              }
+            | {
+                  config: {
+                      dateRange?:
+                          | {
+                                date_from?:
+                                    | '-14d'
+                                    | '-1h'
+                                    | '-1M'
+                                    | '-24h'
+                                    | '-30d'
+                                    | '-30M'
+                                    | '-3h'
+                                    | '-7d'
+                                    | '-90d'
+                                    | null
+                                    | undefined
+                            }
+                          | null
+                          | undefined
+                      limit: number
+                      surveyId?: string | null | undefined
+                  }
+                  success: true
+              }
+        activeFieldErrors: (
+            validation:
+                | {
+                      config: {
+                          dateRange?:
+                              | {
+                                    date_from?:
+                                        | '-14d'
+                                        | '-1h'
+                                        | '-1M'
+                                        | '-24h'
+                                        | '-30d'
+                                        | '-30M'
+                                        | '-3h'
+                                        | '-7d'
+                                        | '-90d'
+                                        | null
+                                        | undefined
+                                }
+                              | null
+                              | undefined
+                          limit: number
+                          surveyId?: string | null | undefined
+                      }
+                      success: true
+                  }
+                | {
+                      fieldErrors: Partial<Record<'dateRange' | 'limit' | 'surveyId', string>>
+                      success: false
+                  },
+            fieldErrors: Partial<Record<'dateRange' | 'limit' | 'surveyId', string>>
+        ) => SurveyResultsWidgetFieldErrors
+        saveDisabledReason: (
+            saving: boolean,
+            validation:
+                | {
+                      config: {
+                          dateRange?:
+                              | {
+                                    date_from?:
+                                        | '-14d'
+                                        | '-1h'
+                                        | '-1M'
+                                        | '-24h'
+                                        | '-30d'
+                                        | '-30M'
+                                        | '-3h'
+                                        | '-7d'
+                                        | '-90d'
+                                        | null
+                                        | undefined
+                                }
+                              | null
+                              | undefined
+                          limit: number
+                          surveyId?: string | null | undefined
+                      }
+                      success: true
+                  }
+                | {
+                      fieldErrors: Partial<Record<'dateRange' | 'limit' | 'surveyId', string>>
+                      success: false
+                  }
+        ) => string | undefined
+        widgetConfig: (config: Record<string, unknown>) => SurveyResultsWidgetConfig
+    }
+}
+
+export type editSurveyResultsWidgetModalLogicType = MakeLogicType<
+    editSurveyResultsWidgetModalLogicValues,
+    editSurveyResultsWidgetModalLogicActions,
+    EditSurveyResultsWidgetModalLogicProps,
+    editSurveyResultsWidgetModalLogicMeta
+>
+
 export const editSurveyResultsWidgetModalLogic = kea<editSurveyResultsWidgetModalLogicType>([
     path(['products', 'dashboards', 'widgets', 'surveys', 'editSurveyResultsWidgetModalLogic']),
 
@@ -102,14 +307,14 @@ export const editSurveyResultsWidgetModalLogic = kea<editSurveyResultsWidgetModa
     selectors({
         widgetConfig: [
             (_, p) => [p.config],
-            (config): SurveyResultsWidgetConfig => parseSurveyResultsWidgetConfig(config),
+            (config: Record<string, unknown>): SurveyResultsWidgetConfig => parseSurveyResultsWidgetConfig(config),
         ],
         ...widgetEditModalPropSelectors,
         validation: [
             (s) => [s.limit, s.dateFrom, s.widgetConfig],
             // The survey is chosen on the tile filter bar; read it from the persisted config so saving
             // the date range / limit preserves the selection.
-            (limit, dateFrom, widgetConfig) =>
+            (limit: number, dateFrom: SurveyWidgetDateFrom, widgetConfig: SurveyResultsWidgetConfig) =>
                 validateSurveyResultsWidgetConfigInput({
                     surveyId: widgetConfig.surveyId ?? null,
                     limit,
@@ -119,7 +324,38 @@ export const editSurveyResultsWidgetModalLogic = kea<editSurveyResultsWidgetModa
         ],
         activeFieldErrors: [
             (s) => [s.validation, s.fieldErrors],
-            (validation, fieldErrors): SurveyResultsWidgetFieldErrors => {
+            (
+                validation:
+                    | {
+                          config: {
+                              dateRange?:
+                                  | {
+                                        date_from?:
+                                            | '-14d'
+                                            | '-1h'
+                                            | '-1M'
+                                            | '-24h'
+                                            | '-30d'
+                                            | '-30M'
+                                            | '-3h'
+                                            | '-7d'
+                                            | '-90d'
+                                            | null
+                                            | undefined
+                                    }
+                                  | null
+                                  | undefined
+                              limit: number
+                              surveyId?: string | null | undefined
+                          }
+                          success: true
+                      }
+                    | {
+                          fieldErrors: Partial<Record<'dateRange' | 'limit' | 'surveyId', string>>
+                          success: false
+                      },
+                fieldErrors: SurveyResultsWidgetFieldErrors
+            ): SurveyResultsWidgetFieldErrors => {
                 if (!validation.success) {
                     return { ...validation.fieldErrors, ...fieldErrors }
                 }
@@ -128,7 +364,38 @@ export const editSurveyResultsWidgetModalLogic = kea<editSurveyResultsWidgetModa
         ],
         saveDisabledReason: [
             (s) => [s.saving, s.validation],
-            (saving, validation): string | undefined => {
+            (
+                saving: boolean,
+                validation:
+                    | {
+                          config: {
+                              dateRange?:
+                                  | {
+                                        date_from?:
+                                            | '-14d'
+                                            | '-1h'
+                                            | '-1M'
+                                            | '-24h'
+                                            | '-30d'
+                                            | '-30M'
+                                            | '-3h'
+                                            | '-7d'
+                                            | '-90d'
+                                            | null
+                                            | undefined
+                                    }
+                                  | null
+                                  | undefined
+                              limit: number
+                              surveyId?: string | null | undefined
+                          }
+                          success: true
+                      }
+                    | {
+                          fieldErrors: Partial<Record<'dateRange' | 'limit' | 'surveyId', string>>
+                          success: false
+                      }
+            ): string | undefined => {
                 if (saving) {
                     return 'Saving…'
                 }
diff --git a/products/dashboards/frontend/widgets/surveys/surveyPickerLogic.ts b/products/dashboards/frontend/widgets/surveys/surveyPickerLogic.ts
index e3486d451b9a..a93570bf5f46 100644
--- a/products/dashboards/frontend/widgets/surveys/surveyPickerLogic.ts
+++ b/products/dashboards/frontend/widgets/surveys/surveyPickerLogic.ts
@@ -1,4 +1,16 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, propsChanged, reducers } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    afterMount,
+    connect,
+    kea,
+    key,
+    listeners,
+    path,
+    props,
+    propsChanged,
+    reducers,
+} from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { teamLogic } from 'scenes/teamLogic'
@@ -6,8 +18,6 @@ import { teamLogic } from 'scenes/teamLogic'
 import { surveysList, surveysRetrieve } from 'products/surveys/frontend/generated/api'
 import type { SurveyApi } from 'products/surveys/frontend/generated/api.schemas'
 
-import type { surveyPickerLogicType } from './surveyPickerLogicType'
-
 /** One page is plenty — search narrows the rest server-side, so we never paginate the dropdown. */
 const SURVEY_OPTIONS_LIMIT = 50
 const SEARCH_DEBOUNCE_MS = 300
@@ -18,6 +28,84 @@ export type SurveyPickerLogicProps = {
     ensureSurveyId?: string | null
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface surveyPickerLogicValues {
+    currentProjectId: number | string // teamLogic
+    hasLoadedOptions: boolean
+    search: string
+    selectedSurvey: SurveyApi | null
+    selectedSurveyLoading: boolean
+    surveyOptions: SurveyApi[]
+    surveyOptionsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface surveyPickerLogicActions {
+    ensureOptionsLoaded: () => {
+        value: true
+    }
+    ensureSelectedLoaded: (surveyId: string) => {
+        surveyId: string
+    }
+    loadOptions: ({ debounce }?: { debounce: boolean }) => {
+        debounce: boolean
+    }
+    loadOptionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadOptionsSuccess: (
+        surveyOptions: SurveyApi[],
+        payload?: {
+            debounce: boolean
+        }
+    ) => {
+        surveyOptions: SurveyApi[]
+        payload?: {
+            debounce: boolean
+        }
+    }
+    loadSelectedSurvey: ({ surveyId }: { surveyId: string }) => {
+        surveyId: string
+    }
+    loadSelectedSurveyFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSelectedSurveySuccess: (
+        selectedSurvey: SurveyApi,
+        payload?: {
+            surveyId: string
+        }
+    ) => {
+        selectedSurvey: SurveyApi
+        payload?: {
+            surveyId: string
+        }
+    }
+    setSearch: (search: string) => {
+        search: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface surveyPickerLogicMeta {
+    key: string
+}
+
+export type surveyPickerLogicType = MakeLogicType<
+    surveyPickerLogicValues,
+    surveyPickerLogicActions,
+    SurveyPickerLogicProps,
+    surveyPickerLogicMeta
+>
+
 export const surveyPickerLogic = kea<surveyPickerLogicType>([
     path((key) => ['products', 'dashboards', 'widgets', 'surveys', 'surveyPickerLogic', key]),
     props({} as SurveyPickerLogicProps),
diff --git a/products/data_modeling/frontend/lineage/lineageGraphLogic.ts b/products/data_modeling/frontend/lineage/lineageGraphLogic.ts
index 1a624948fdf9..b6308e4f7cf7 100644
--- a/products/data_modeling/frontend/lineage/lineageGraphLogic.ts
+++ b/products/data_modeling/frontend/lineage/lineageGraphLogic.ts
@@ -1,12 +1,11 @@
 import { MarkerType, Position, type Edge as ReactFlowEdge, type Node as ReactFlowNode } from '@xyflow/react'
-import { actions, afterMount, kea, key, listeners, path, props, propsChanged, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, key, listeners, path, props, propsChanged, reducers } from 'kea'
 
 import { getFormattedNodes } from 'scenes/data-warehouse/scene/modeling/autolayout'
 import { ElkDirection, NodeHandle } from 'scenes/data-warehouse/scene/modeling/types'
 
 import { DataModelingEdge, DataModelingNode } from '~/types'
 
-import type { lineageGraphLogicType } from './lineageGraphLogicType'
 import { LineageNodeData, LineageVariant } from './LineageNode'
 
 const NODE_SIZES: Record<LineageVariant, { width: number; height: number }> = {
@@ -73,6 +72,33 @@ async function layoutGraph(
     return { nodes: laidOut as unknown as ReactFlowNode<LineageNodeData>[], edges: rfEdges }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface lineageGraphLogicValues {
+    layout: LineageGraphLayout | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface lineageGraphLogicActions {
+    computeLayout: () => {
+        value: true
+    }
+    layoutComputed: (layout: LineageGraphLayout) => {
+        layout: LineageGraphLayout
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface lineageGraphLogicMeta {
+    key: string
+}
+
+export type lineageGraphLogicType = MakeLogicType<
+    lineageGraphLogicValues,
+    lineageGraphLogicActions,
+    LineageGraphLogicProps,
+    lineageGraphLogicMeta
+>
+
 export const lineageGraphLogic = kea<lineageGraphLogicType>([
     path(['products', 'data_modeling', 'frontend', 'lineage', 'lineageGraphLogic']),
     props({} as LineageGraphLogicProps),
diff --git a/products/data_warehouse/frontend/scenes/NewSourceScene/NewSourceScene.tsx b/products/data_warehouse/frontend/scenes/NewSourceScene/NewSourceScene.tsx
index a8c42c324f3c..8eb5ba4e465b 100644
--- a/products/data_warehouse/frontend/scenes/NewSourceScene/NewSourceScene.tsx
+++ b/products/data_warehouse/frontend/scenes/NewSourceScene/NewSourceScene.tsx
@@ -1,4 +1,4 @@
-import { BindLogic, connect, kea, path, selectors, useActions, useValues } from 'kea'
+import { MakeLogicType, BindLogic, connect, kea, path, selectors, useActions, useValues } from 'kea'
 import { useCallback, useEffect, useMemo, useState } from 'react'
 
 import { IconCopy, IconQuestion } from '@posthog/icons'
@@ -37,7 +37,6 @@ import { SourceIcon } from '../../shared/components/SourceIcon'
 import { availableSourcesLogic } from './availableSourcesLogic'
 import { BillingLimitNotice } from './components/BillingLimitNotice'
 import { SelfManagedSourceForm } from './components/SelfManagedSourceForm'
-import type { newSourceSceneLogicType } from './NewSourceSceneType'
 import { selfManagedSourceLogic } from './selfManagedSourceLogic'
 import { SourceCatalog } from './SourceCatalog'
 import { type SourceWizardLogicProps, sourceWizardLogic } from './sourceWizardLogic'
@@ -53,6 +52,15 @@ export const getEffectiveAccessMethod = (
     return persistedAccessMethod
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface newSourceSceneLogicValues {
+    availableSources: Record<string, SourceConfig> | null // availableSourcesLogic
+    availableSourcesLoading: boolean // availableSourcesLogic
+    breadcrumbs: Breadcrumb[]
+}
+
+export type newSourceSceneLogicType = MakeLogicType<newSourceSceneLogicValues, {}>
+
 export const newSourceSceneLogic = kea<newSourceSceneLogicType>([
     path(['products', 'dataWarehouse', 'newSourceSceneLogic']),
     connect(() => ({
diff --git a/products/data_warehouse/frontend/scenes/NewSourceScene/availableSourcesLogic.ts b/products/data_warehouse/frontend/scenes/NewSourceScene/availableSourcesLogic.ts
index 765ee4b74a6f..5151e3a98299 100644
--- a/products/data_warehouse/frontend/scenes/NewSourceScene/availableSourcesLogic.ts
+++ b/products/data_warehouse/frontend/scenes/NewSourceScene/availableSourcesLogic.ts
@@ -1,11 +1,36 @@
-import { afterMount, kea, path } from 'kea'
+import { MakeLogicType, afterMount, kea, path } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
 
 import { SourceConfig } from '~/queries/schema/schema-general'
 
-import type { availableSourcesLogicType } from './availableSourcesLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface availableSourcesLogicValues {
+    availableSources: Record<string, SourceConfig> | null
+    availableSourcesLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface availableSourcesLogicActions {
+    load: () => any
+    loadFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSuccess: (
+        availableSources: Record<string, SourceConfig> | null,
+        payload?: any
+    ) => {
+        availableSources: Record<string, SourceConfig> | null
+        payload?: any
+    }
+}
+
+export type availableSourcesLogicType = MakeLogicType<availableSourcesLogicValues, availableSourcesLogicActions>
 
 export const availableSourcesLogic = kea<availableSourcesLogicType>([
     path(['products', 'dataWarehouse', 'availableSourcesLogic']),
diff --git a/products/data_warehouse/frontend/scenes/NewSourceScene/selfManagedSourceLogic.tsx b/products/data_warehouse/frontend/scenes/NewSourceScene/selfManagedSourceLogic.tsx
index 59ea52205c11..bc38b7719a30 100644
--- a/products/data_warehouse/frontend/scenes/NewSourceScene/selfManagedSourceLogic.tsx
+++ b/products/data_warehouse/frontend/scenes/NewSourceScene/selfManagedSourceLogic.tsx
@@ -1,5 +1,6 @@
-import { actions, connect, events, kea, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, listeners, path, props, reducers } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 
@@ -13,7 +14,6 @@ import { DataTableNode } from '~/queries/schema/schema-general'
 import { AnyPropertyFilter, DataWarehouseTable } from '~/types'
 
 import { sourceSceneLogic } from '../SourceScene/SourceScene'
-import type { selfManagedSourceLogicType } from './selfManagedSourceLogicType'
 
 export interface TableLogicProps {
     /** A UUID or 'new'. */
@@ -32,6 +32,152 @@ const NEW_WAREHOUSE_TABLE: DataWarehouseTable = {
     },
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface selfManagedSourceLogicValues {
+    dataTableQuery: DataTableNode | null
+    isEditingTable: boolean
+    isTableSubmitting: boolean
+    isTableValid: boolean
+    showTableErrors: boolean
+    table: DataWarehouseTable
+    tableAllErrors: Record<string, any>
+    tableChanged: boolean
+    tableErrors: DeepPartialMap<DataWarehouseTable, ValidationErrorType>
+    tableHasErrors: boolean
+    tableLoading: boolean
+    tableManualErrors: Record<string, any>
+    tableTouched: boolean
+    tableTouches: Record<string, boolean>
+    tableValidationErrors: DeepPartialMap<DataWarehouseTable, ValidationErrorType>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface selfManagedSourceLogicActions {
+    loadDatabase: (
+        args_0?:
+            | {
+                  force?: boolean
+              }
+            | undefined
+    ) => {
+        force?: boolean
+    } // databaseTableListLogic
+    addConditionSet: () => {
+        value: true
+    }
+    archiveTable: () => {
+        value: true
+    }
+    createTable: (tablePayload: any) => any
+    createTableFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    createTableSuccess: (
+        table: DataWarehouseTable,
+        payload?: any
+    ) => {
+        table: DataWarehouseTable
+        payload?: any
+    }
+    editingTable: (editing: boolean) => {
+        editing: boolean
+    }
+    launchTable: () => {
+        value: true
+    }
+    loadTable: () => any
+    loadTableFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadTableSuccess: (
+        table: DataWarehouseTable,
+        payload?: any
+    ) => {
+        table: DataWarehouseTable
+        payload?: any
+    }
+    removeConditionSet: (index: number) => {
+        index: number
+    }
+    resetTable: (values?: DataWarehouseTable) => {
+        values?: DataWarehouseTable
+    }
+    setDataTableQuery: (query: DataTableNode) => {
+        query: DataTableNode
+    }
+    setTableManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setTableValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setTableValues: (values: DeepPartial<DataWarehouseTable>) => {
+        values: DeepPartial<DataWarehouseTable>
+    }
+    stopTable: () => {
+        value: true
+    }
+    submitTable: () => {
+        value: boolean
+    }
+    submitTableFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitTableRequest: (table: DataWarehouseTable) => {
+        table: DataWarehouseTable
+    }
+    submitTableSuccess: (table: DataWarehouseTable) => {
+        table: DataWarehouseTable
+    }
+    touchTableField: (key: string) => {
+        key: string
+    }
+    updateTable: (tablePayload: any) => any
+    updateTableFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateTableSuccess: (
+        table: DataWarehouseTable,
+        payload?: any
+    ) => {
+        table: DataWarehouseTable
+        payload?: any
+    }
+    updateTargetingFlagFilters: (
+        index: number,
+        properties: AnyPropertyFilter[]
+    ) => {
+        index: number
+        properties: AnyPropertyFilter[]
+    }
+}
+
+export type selfManagedSourceLogicType = MakeLogicType<
+    selfManagedSourceLogicValues,
+    selfManagedSourceLogicActions,
+    TableLogicProps
+>
+
 export const selfManagedSourceLogic = kea<selfManagedSourceLogicType>([
     path(['products', 'dataWarehouse', 'selfManagedSourceLogic']),
     props({} as TableLogicProps),
diff --git a/products/data_warehouse/frontend/scenes/NewSourceScene/sourceCatalogLogic.ts b/products/data_warehouse/frontend/scenes/NewSourceScene/sourceCatalogLogic.ts
index a1cac810c43f..e651aee8183e 100644
--- a/products/data_warehouse/frontend/scenes/NewSourceScene/sourceCatalogLogic.ts
+++ b/products/data_warehouse/frontend/scenes/NewSourceScene/sourceCatalogLogic.ts
@@ -1,5 +1,5 @@
 import FuseClass from 'fuse.js'
-import { actions, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
 import posthog from 'posthog-js'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -20,8 +20,9 @@ import {
 } from '~/queries/schema/schema-general'
 import { HogFunctionTemplateStatus } from '~/types'
 
+import type { FeatureFlagsSet } from '../../../../../frontend/src/lib/logic/featureFlagLogic'
+import type { ManualLinkSourceType, UserType } from '../../../../../frontend/src/types'
 import { availableSourcesLogic } from './availableSourcesLogic'
-import type { sourceCatalogLogicType } from './sourceCatalogLogicType'
 import { sourceWizardLogic } from './sourceWizardLogic'
 
 // Helps kea-typegen reference the Fuse type without a bad `import { Fuse } from 'fuse.js'`.
@@ -75,6 +76,847 @@ export interface CatalogCategory {
     count: number
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sourceCatalogLogicValues {
+    availableSources: Record<string, SourceConfig> | null // availableSourcesLogic
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    manualConnectors: {
+        name: string
+        type: ManualLinkSourceType
+    }[] // sourceWizardLogic
+    user: UserType | null // userLogic
+    catalogFuse: Fuse
+    catalogItems: CatalogItem[]
+    categoriesWithCounts: CatalogCategory[]
+    filteredItems: CatalogItem[]
+    search: string
+    selectedCategory: SourceCategoryFilter
+    sourceRequestModalOpen: boolean
+    sourceRequestText: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sourceCatalogLogicActions {
+    hideSourceRequest: () => {
+        value: true
+    }
+    registerInterest: (item: CatalogItem) => {
+        item: CatalogItem
+    }
+    selectSourceType: (item: CatalogItem) => {
+        item: CatalogItem
+    }
+    setSearch: (search: string) => {
+        search: string
+    }
+    setSelectedCategory: (category: SourceCategoryFilter) => {
+        category: SourceCategoryFilter
+    }
+    setSourceRequestText: (text: string) => {
+        text: string
+    }
+    showSourceRequest: () => {
+        value: true
+    }
+    submitSourceRequest: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sourceCatalogLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        catalogItems: (
+            availableSources: Record<string, SourceConfig> | null,
+            manualConnectors: {
+                name: string
+                type: ManualLinkSourceType
+            }[],
+            featureFlags: FeatureFlagsSet,
+            arg:
+                | (
+                      | 'ActiveCampaign'
+                      | 'AcuityScheduling'
+                      | 'Adapty'
+                      | 'Adjust'
+                      | 'AdobeAnalytics'
+                      | 'AdobeCommerce'
+                      | 'AdpWorkforceNow'
+                      | 'AdRoll'
+                      | 'Adyen'
+                      | 'AgileCRM'
+                      | 'Aha'
+                      | 'Ahrefs'
+                      | 'AikidoSecurity'
+                      | 'Airbyte'
+                      | 'Aircall'
+                      | 'AirOps'
+                      | 'Airtable'
+                      | 'Aiven'
+                      | 'Akeneo'
+                      | 'Algolia'
+                      | 'Alguna'
+                      | 'AlpacaBrokerAPI'
+                      | 'AlphaVantage'
+                      | 'AmazonAds'
+                      | 'AmazonCloudWatch'
+                      | 'AmazonEventBridge'
+                      | 'AmazonKinesis'
+                      | 'AmazonS3'
+                      | 'AmazonSellingPartner'
+                      | 'AmazonSNS'
+                      | 'AmazonSQS'
+                      | 'Amplitude'
+                      | 'Anthropic'
+                      | 'ApifyDataset'
+                      | 'Apollo'
+                      | 'Appcues'
+                      | 'Appfigures'
+                      | 'Appfollow'
+                      | 'AppleSearchAds'
+                      | 'AppLovin'
+                      | 'AppsFlyer'
+                      | 'Appstack'
+                      | 'Apptivo'
+                      | 'Appwrite'
+                      | 'Asana'
+                      | 'Ashby'
+                      | 'AssemblyAI'
+                      | 'Attentive'
+                      | 'Attio'
+                      | 'Auth0'
+                      | 'Aviationstack'
+                      | 'Aviator'
+                      | 'Awin'
+                      | 'AwsCloudTrail'
+                      | 'AzureBlob'
+                      | 'AzureDevOps'
+                      | 'AzureTableStorage'
+                      | 'Babelforce'
+                      | 'Backblaze'
+                      | 'BambooHR'
+                      | 'Basecamp'
+                      | 'Baserow'
+                      | 'Baseten'
+                      | 'Beamer'
+                      | 'BigCommerce'
+                      | 'BigMailer'
+                      | 'BigQuery'
+                      | 'BingAds'
+                      | 'Bitly'
+                      | 'BlandAI'
+                      | 'Blogger'
+                      | 'Bluetally'
+                      | 'BoldSign'
+                      | 'Box'
+                      | 'Braintree'
+                      | 'Braintrust'
+                      | 'Branch'
+                      | 'Braze'
+                      | 'Breezometer'
+                      | 'BreezyHR'
+                      | 'Brevo'
+                      | 'Brex'
+                      | 'BrowseAI'
+                      | 'Browserbase'
+                      | 'BrowserUse'
+                      | 'Bugsnag'
+                      | 'BuildBetter'
+                      | 'Buildkite'
+                      | 'Bunny'
+                      | 'Buzzsprout'
+                      | 'CalCom'
+                      | 'Calendly'
+                      | 'CallRail'
+                      | 'CampaignManager360'
+                      | 'CampaignMonitor'
+                      | 'Campayn'
+                      | 'Canny'
+                      | 'CapsuleCRM'
+                      | 'CaptainData'
+                      | 'CareQualityCommission'
+                      | 'CartCom'
+                      | 'CastorEDC'
+                      | 'Chameleon'
+                      | 'Chargebee'
+                      | 'Chargedesk'
+                      | 'Chargify'
+                      | 'ChartHop'
+                      | 'ChartMogul'
+                      | 'Chatwoot'
+                      | 'CheckoutCom'
+                      | 'Chift'
+                      | 'Chorus'
+                      | 'Churnkey'
+                      | 'Cimis'
+                      | 'Cin7'
+                      | 'CircleCI'
+                      | 'CiscoMeraki'
+                      | 'Clari'
+                      | 'Clarifai'
+                      | 'Clazar'
+                      | 'Clerk'
+                      | 'ClickHouse'
+                      | 'ClickUp'
+                      | 'Clockify'
+                      | 'Clockodo'
+                      | 'Close'
+                      | 'Cloudbeds'
+                      | 'Cloudflare'
+                      | 'Coassemble'
+                      | 'CockroachDB'
+                      | 'Coda'
+                      | 'Codefresh'
+                      | 'Cody'
+                      | 'Cohere'
+                      | 'CoinApi'
+                      | 'CoinGecko'
+                      | 'CoinMarketCap'
+                      | 'Commercetools'
+                      | 'Concord'
+                      | 'ConfigCat'
+                      | 'Confluence'
+                      | 'ConstantContact'
+                      | 'ConvertKit'
+                      | 'Convex'
+                      | 'Copper'
+                      | 'CosmosDB'
+                      | 'Couchbase'
+                      | 'Coupa'
+                      | 'Criteo'
+                      | 'Crunchbase'
+                      | 'CultureAmp'
+                      | 'Cursor'
+                      | 'Curve'
+                      | 'Custom'
+                      | 'CustomerIO'
+                      | 'Customerly'
+                      | 'Databricks'
+                      | 'Datadog'
+                      | 'Datascope'
+                      | 'Datorama'
+                      | 'Db2'
+                      | 'Dbt'
+                      | 'Decagon'
+                      | 'Deel'
+                      | 'Deepgram'
+                      | 'Delighted'
+                      | 'DenoDeploy'
+                      | 'Deputy'
+                      | 'DevinAI'
+                      | 'DigitalOcean'
+                      | 'DingConnect'
+                      | 'DisplayVideo360'
+                      | 'Dixa'
+                      | 'Dockerhub'
+                      | 'Docuseal'
+                      | 'Docusign'
+                      | 'DoIt'
+                      | 'Dolibarr'
+                      | 'Dremio'
+                      | 'Drip'
+                      | 'Dropbox'
+                      | 'DropboxSign'
+                      | 'Dub'
+                      | 'Dwolla'
+                      | 'Dynamics365'
+                      | 'DynamoDB'
+                      | 'E2B'
+                      | 'Easypost'
+                      | 'Easypromos'
+                      | 'Ebay'
+                      | 'EConomic'
+                      | 'Elasticemail'
+                      | 'Elasticsearch'
+                      | 'ElevenLabs'
+                      | 'Eloqua'
+                      | 'EmailOctopus'
+                      | 'EmploymentHero'
+                      | 'Encharge'
+                      | 'Eventbrite'
+                      | 'Eventee'
+                      | 'Eventzilla'
+                      | 'Everhour'
+                      | 'ExchangeRatesApi'
+                      | 'Expensify'
+                      | 'EZOfficeInventory'
+                      | 'FacebookPages'
+                      | 'Factorial'
+                      | 'Fastbill'
+                      | 'Fastly'
+                      | 'Fauna'
+                      | 'Feishu'
+                      | 'Fillout'
+                      | 'Finage'
+                      | 'FinancialModelling'
+                      | 'Finnhub'
+                      | 'Finnworlds'
+                      | 'Fintoc'
+                      | 'Firebase'
+                      | 'Firebolt'
+                      | 'Firecrawl'
+                      | 'FireHydrant'
+                      | 'FireworksAI'
+                      | 'Fleetio'
+                      | 'Flexmail'
+                      | 'Flexport'
+                      | 'FloatApp'
+                      | 'Flowlu'
+                      | 'FlyIo'
+                      | 'Formbricks'
+                      | 'FreeAgent'
+                      | 'Freightview'
+                      | 'FreshBooks'
+                      | 'Freshcaller'
+                      | 'Freshchat'
+                      | 'Freshdesk'
+                      | 'Freshsales'
+                      | 'Freshservice'
+                      | 'Front'
+                      | 'Fulcrum'
+                      | 'FullStory'
+                      | 'GainsightPx'
+                      | 'Giphy'
+                      | 'GitBook'
+                      | 'Github'
+                      | 'GitLab'
+                      | 'Gladly'
+                      | 'Glassfrog'
+                      | 'Gmail'
+                      | 'GNews'
+                      | 'GoCardless'
+                      | 'Gojiberry'
+                      | 'Goldcast'
+                      | 'GoLogin'
+                      | 'Gong'
+                      | 'GoogleAdManager'
+                      | 'GoogleAds'
+                      | 'GoogleAnalytics'
+                      | 'GoogleCalendar'
+                      | 'GoogleChat'
+                      | 'GoogleClassroom'
+                      | 'GoogleCloudStorage'
+                      | 'GoogleDirectory'
+                      | 'GoogleDrive'
+                      | 'GoogleForms'
+                      | 'GooglePageSpeedInsights'
+                      | 'GoogleSearchConsole'
+                      | 'GoogleSheets'
+                      | 'GoogleTasks'
+                      | 'GoogleWebfonts'
+                      | 'GoogleWorkspaceAdminReports'
+                      | 'Gorgias'
+                      | 'Grafana'
+                      | 'Granola'
+                      | 'Greenhouse'
+                      | 'GreytHr'
+                      | 'Gridly'
+                      | 'Groq'
+                      | 'GrowthBook'
+                      | 'Guardian'
+                      | 'Gumloop'
+                      | 'Guru'
+                      | 'Gusto'
+                      | 'Harness'
+                      | 'Harvey'
+                      | 'Hatchet'
+                      | 'Healthchecks'
+                      | 'Heap'
+                      | 'Height'
+                      | 'Helicone'
+                      | 'Hellobaton'
+                      | 'HelpScout'
+                      | 'Heroku'
+                      | 'Hetzner'
+                      | 'Hex'
+                      | 'HeyGen'
+                      | 'HiBob'
+                      | 'HighLevel'
+                      | 'Hightouch'
+                      | 'HoorayHR'
+                      | 'Hubplanner'
+                      | 'Hubspot'
+                      | 'HuggingFace'
+                      | 'Humanitix'
+                      | 'Huntr'
+                      | 'Hyperspell'
+                      | 'Ikas'
+                      | 'IlluminaBasespace'
+                      | 'Imagga'
+                      | 'Impact'
+                      | 'IncidentIo'
+                      | 'Infisical'
+                      | 'Inflowinventory'
+                      | 'InforNexus'
+                      | 'Inngest'
+                      | 'Insightful'
+                      | 'Insightly'
+                      | 'Instagram'
+                      | 'Instantly'
+                      | 'Instatus'
+                      | 'Intercom'
+                      | 'Interzoid'
+                      | 'Intruder'
+                      | 'Invoiced'
+                      | 'Invoiceninja'
+                      | 'IP2Whois'
+                      | 'Iterable'
+                      | 'JamfPro'
+                      | 'Jira'
+                      | 'Jobber'
+                      | 'JobNimbus'
+                      | 'Jotform'
+                      | 'JudgeMeReviews'
+                      | 'JustCall'
+                      | 'JustSift'
+                      | 'K6Cloud'
+                      | 'Kafka'
+                      | 'KapaAI'
+                      | 'Katana'
+                      | 'Keka'
+                      | 'Kernel'
+                      | 'Kickscale'
+                      | 'Kisi'
+                      | 'Kissmetrics'
+                      | 'Klarna'
+                      | 'Klaus'
+                      | 'Klaviyo'
+                      | 'Knock'
+                      | 'Koyeb'
+                      | 'Kustomer'
+                      | 'KYVE'
+                      | 'Lago'
+                      | 'LambdaLabs'
+                      | 'Langfuse'
+                      | 'LangSmith'
+                      | 'Lattice'
+                      | 'LaunchDarkly'
+                      | 'Leadfeeder'
+                      | 'Leexi'
+                      | 'Lemlist'
+                      | 'LemonSqueezy'
+                      | 'LessAnnoyingCRM'
+                      | 'Lever'
+                      | 'Liana'
+                      | 'Lightfield'
+                      | 'LightspeedRetail'
+                      | 'Linear'
+                      | 'LingoDev'
+                      | 'LinkedinAds'
+                      | 'LinkedinPages'
+                      | 'Linkrunner'
+                      | 'Linnworks'
+                      | 'Linode'
+                      | 'LlamaCloud'
+                      | 'Lob'
+                      | 'Lokalise'
+                      | 'Looker'
+                      | 'Loops'
+                      | 'Luma'
+                      | 'M3ter'
+                      | 'Mailchimp'
+                      | 'MailerLite'
+                      | 'MailerSend'
+                      | 'Mailgun'
+                      | 'Mailjet'
+                      | 'Mailosaur'
+                      | 'Mailtrap'
+                      | 'Mantle'
+                      | 'Marketo'
+                      | 'Marketstack'
+                      | 'Matomo'
+                      | 'Maxio'
+                      | 'Mem0'
+                      | 'Mendeley'
+                      | 'Mention'
+                      | 'MercadoAds'
+                      | 'Mercury'
+                      | 'Merge'
+                      | 'MetaAds'
+                      | 'Metabase'
+                      | 'Metorial'
+                      | 'Metricool'
+                      | 'Metriport'
+                      | 'Metronome'
+                      | 'MicrosoftDataverse'
+                      | 'MicrosoftEntraId'
+                      | 'MicrosoftLists'
+                      | 'MicrosoftTeams'
+                      | 'Mintlify'
+                      | 'Miro'
+                      | 'Missive'
+                      | 'MistralAI'
+                      | 'MixMax'
+                      | 'Mixpanel'
+                      | 'Mode'
+                      | 'Mollie'
+                      | 'Monday'
+                      | 'MongoDB'
+                      | 'Mono'
+                      | 'MSSQL'
+                      | 'Mux'
+                      | 'MyHours'
+                      | 'MySQL'
+                      | 'N8n'
+                      | 'Nasa'
+                      | 'Navan'
+                      | 'NebiusAI'
+                      | 'Neon'
+                      | 'Netlify'
+                      | 'NetSuite'
+                      | 'NewRelic'
+                      | 'NewsApi'
+                      | 'NewsData'
+                      | 'NewYorkTimes'
+                      | 'Nexiopay'
+                      | 'NextdoorAds'
+                      | 'NinjaOneRMM'
+                      | 'NoCRM'
+                      | 'Northflank'
+                      | 'NorthpassLMS'
+                      | 'Notion'
+                      | 'Nutshell'
+                      | 'Nylas'
+                      | 'Okta'
+                      | 'Omnisend'
+                      | 'Oncehub'
+                      | 'OneDrive'
+                      | 'OneHundredMs'
+                      | 'Onepagecrm'
+                      | 'OneSignal'
+                      | 'Onfleet'
+                      | 'OpenAI'
+                      | 'OpenAIAds'
+                      | 'OpenAQ'
+                      | 'OpenDataDc'
+                      | 'OpenExchangeRates'
+                      | 'OpenFDA'
+                      | 'OpenRouter'
+                      | 'OpenWeather'
+                      | 'OpinionStage'
+                      | 'Opsgenie'
+                      | 'Optimizely'
+                      | 'OPUSWatch'
+                      | 'Oracle'
+                      | 'OracleEbs'
+                      | 'OracleFusion'
+                      | 'Orb'
+                      | 'Orbit'
+                      | 'Ortto'
+                      | 'Oura'
+                      | 'Outbrain'
+                      | 'Outlook'
+                      | 'Outreach'
+                      | 'Oveit'
+                      | 'PabblySubscriptionsBilling'
+                      | 'Paddle'
+                      | 'PagerDuty'
+                      | 'PandaDoc'
+                      | 'Paperform'
+                      | 'Papersign'
+                      | 'Pardot'
+                      | 'Partnerize'
+                      | 'PartnerStack'
+                      | 'PayFit'
+                      | 'Paylocity'
+                      | 'PayPal'
+                      | 'Paystack'
+                      | 'PeecAI'
+                      | 'Pendo'
+                      | 'Pennylane'
+                      | 'Perigon'
+                      | 'Perk'
+                      | 'PersistIq'
+                      | 'Persona'
+                      | 'Personio'
+                      | 'Pexels'
+                      | 'PgAnalyze'
+                      | 'Phyllo'
+                      | 'Picqer'
+                      | 'Pinecone'
+                      | 'Pingdom'
+                      | 'PinterestAds'
+                      | 'Pipedrive'
+                      | 'Pipeliner'
+                      | 'PivotalTracker'
+                      | 'Piwik'
+                      | 'Plaid'
+                      | 'Plain'
+                      | 'PlanetScale'
+                      | 'Planhat'
+                      | 'PlatformSh'
+                      | 'Plausible'
+                      | 'Plunk'
+                      | 'Pocket'
+                      | 'Podium'
+                      | 'Polar'
+                      | 'Polygon'
+                      | 'Poplar'
+                      | 'Postgres'
+                      | 'Postmark'
+                      | 'PrestaShop'
+                      | 'Pretix'
+                      | 'Primetric'
+                      | 'Printify'
+                      | 'Productboard'
+                      | 'Productive'
+                      | 'PromptingCompany'
+                      | 'Pylon'
+                      | 'PyPI'
+                      | 'Qdrant'
+                      | 'Qonto'
+                      | 'Qualaroo'
+                      | 'Qualtrics'
+                      | 'QuickBooks'
+                      | 'Railz'
+                      | 'Ramp'
+                      | 'Razorpay'
+                      | 'RB2B'
+                      | 'RDStationMarketing'
+                      | 'Recharge'
+                      | 'Recreation'
+                      | 'Recruitee'
+                      | 'Recurly'
+                      | 'Reddit'
+                      | 'RedditAds'
+                      | 'Redis'
+                      | 'Redshift'
+                      | 'ReferralHero'
+                      | 'Render'
+                      | 'RentCast'
+                      | 'Repairshopr'
+                      | 'Replicate'
+                      | 'ReplyIo'
+                      | 'Resend'
+                      | 'RetailExpress'
+                      | 'RetellAI'
+                      | 'Retently'
+                      | 'RevenueCat'
+                      | 'RevolutMerchant'
+                      | 'RingCentral'
+                      | 'Rippling'
+                      | 'RKICovid'
+                      | 'Roark'
+                      | 'RocketChat'
+                      | 'Rocketlane'
+                      | 'Rollbar'
+                      | 'Rootly'
+                      | 'Rss'
+                      | 'RudderStack'
+                      | 'Ruddr'
+                      | 'RunPod'
+                      | 'SafetyCulture'
+                      | 'SageHR'
+                      | 'SageIntacct'
+                      | 'Sailthru'
+                      | 'Salesflare'
+                      | 'Salesforce'
+                      | 'SalesforceMarketingCloud'
+                      | 'SalesLoft'
+                      | 'Sanity'
+                      | 'SapConcur'
+                      | 'SapErp'
+                      | 'SAPFieldglass'
+                      | 'SapHana'
+                      | 'SapSuccessFactors'
+                      | 'SavvyCal'
+                      | 'ScaleAI'
+                      | 'Scaleway'
+                      | 'SearchAds360'
+                      | 'Secoda'
+                      | 'Segment'
+                      | 'SendGrid'
+                      | 'Sendowl'
+                      | 'SendPulse'
+                      | 'Senseforce'
+                      | 'Sentry'
+                      | 'Serpstat'
+                      | 'ServiceNow'
+                      | 'SevenShifts'
+                      | 'SFTP'
+                      | 'SharePoint'
+                      | 'Sharetribe'
+                      | 'Shippo'
+                      | 'ShipStation'
+                      | 'Shopify'
+                      | 'ShopWired'
+                      | 'Shortcut'
+                      | 'Shortio'
+                      | 'Shutterstock'
+                      | 'SigmaComputing'
+                      | 'SignNow'
+                      | 'SigNoz'
+                      | 'Sim'
+                      | 'SimFin'
+                      | 'SimpleCast'
+                      | 'Simplesat'
+                      | 'Singular'
+                      | 'Skyvern'
+                      | 'Slack'
+                      | 'Slash'
+                      | 'Smaily'
+                      | 'SmartEngage'
+                      | 'Smartreach'
+                      | 'Smartsheet'
+                      | 'Smartwaiver'
+                      | 'SnapchatAds'
+                      | 'Snowflake'
+                      | 'SolarwindsServiceDesk'
+                      | 'SonarCloud'
+                      | 'SparkPost'
+                      | 'SplitIo'
+                      | 'SpotifyAds'
+                      | 'SpotlerCRM'
+                      | 'Square'
+                      | 'Squarespace'
+                      | 'Statsig'
+                      | 'Statuspage'
+                      | 'Stigg'
+                      | 'StockData'
+                      | 'Strava'
+                      | 'StreamElements'
+                      | 'Streamlabs'
+                      | 'Stripe'
+                      | 'Sumsub'
+                      | 'Supabase'
+                      | 'Superwall'
+                      | 'SurveyMonkey'
+                      | 'SurveySparrow'
+                      | 'Survicate'
+                      | 'Svix'
+                      | 'Swonkie'
+                      | 'Synthesia'
+                      | 'Systeme'
+                      | 'Taboola'
+                      | 'Talkwalker'
+                      | 'Tavus'
+                      | 'TawkTo'
+                      | 'Teachable'
+                      | 'Teamtailor'
+                      | 'Teamwork'
+                      | 'Telli'
+                      | 'Tempo'
+                      | 'TemporalIO'
+                      | 'TerraApi'
+                      | 'Testrail'
+                      | 'Thinkific'
+                      | 'ThinkificCourses'
+                      | 'ThriveLearning'
+                      | 'Ticketmaster'
+                      | 'TicketTailor'
+                      | 'TickTick'
+                      | 'TikTokAds'
+                      | 'Tile38'
+                      | 'Timely'
+                      | 'Tinyemail'
+                      | 'TMDb'
+                      | 'Todoist'
+                      | 'TogetherAI'
+                      | 'Toggl'
+                      | 'TrackPMS'
+                      | 'Trello'
+                      | 'Tremendous'
+                      | 'TriggerDev'
+                      | 'TrustPilot'
+                      | 'Turso'
+                      | 'TVMaze'
+                      | 'TwelveData'
+                      | 'TwelveLabs'
+                      | 'Twenty'
+                      | 'Twilio'
+                      | 'Twitter'
+                      | 'TwitterAds'
+                      | 'TyntecSMS'
+                      | 'Typeform'
+                      | 'Ubidots'
+                      | 'Unleash'
+                      | 'Unstructured'
+                      | 'UpPromote'
+                      | 'Upstash'
+                      | 'Uptick'
+                      | 'USCensus'
+                      | 'Uservoice'
+                      | 'Vantage'
+                      | 'Vapi'
+                      | 'Veeqo'
+                      | 'Vellum'
+                      | 'Vercel'
+                      | 'Vespa'
+                      | 'VismaEconomic'
+                      | 'Vitally'
+                      | 'Vultr'
+                      | 'VWO'
+                      | 'Waiteraid'
+                      | 'Wasabi'
+                      | 'Watchmode'
+                      | 'Webflow'
+                      | 'WhenIWork'
+                      | 'WikipediaPageviews'
+                      | 'Windmill'
+                      | 'WooCommerce'
+                      | 'Wordpress'
+                      | 'Workable'
+                      | 'Workday'
+                      | 'Workflowmax'
+                      | 'WorkOS'
+                      | 'Workramp'
+                      | 'Wrike'
+                      | 'Writesonic'
+                      | 'Wufoo'
+                      | 'Xero'
+                      | 'Xsolla'
+                      | 'YahooFinance'
+                      | 'YandexMetrica'
+                      | 'Ynab'
+                      | 'Yotpo'
+                      | 'Younium'
+                      | 'YouSign'
+                      | 'YouTubeAnalytics'
+                      | 'YoutubeData'
+                      | 'ZapierSupportedStorage'
+                      | 'ZapSign'
+                      | 'Zellify'
+                      | 'Zendesk'
+                      | 'ZendeskSell'
+                      | 'ZendeskSunshine'
+                      | 'Zenefits'
+                      | 'Zenloop'
+                      | 'Zep'
+                      | 'ZohoAnalytics'
+                      | 'ZohoBigin'
+                      | 'ZohoBilling'
+                      | 'ZohoBooks'
+                      | 'ZohoCampaign'
+                      | 'ZohoCRM'
+                      | 'ZohoDesk'
+                      | 'ZohoExpense'
+                      | 'ZohoInventory'
+                      | 'ZohoInvoice'
+                      | 'ZonkaFeedback'
+                      | 'Zoom'
+                      | 'ZoomInfo'
+                      | 'Zuora'
+                  )[]
+                | undefined
+        ) => CatalogItem[]
+        categoriesWithCounts: (catalogItems: CatalogItem[]) => CatalogCategory[]
+        catalogFuse: (catalogItems: CatalogItem[]) => Fuse
+        filteredItems: (
+            catalogItems: CatalogItem[],
+            catalogFuse: Fuse,
+            search: string,
+            selectedCategory: SourceCategoryFilter
+        ) => CatalogItem[]
+    }
+}
+
+export type sourceCatalogLogicType = MakeLogicType<
+    sourceCatalogLogicValues,
+    sourceCatalogLogicActions,
+    SourceCatalogLogicProps,
+    sourceCatalogLogicMeta
+>
+
 export const sourceCatalogLogic = kea<sourceCatalogLogicType>([
     path(['products', 'dataWarehouse', 'sourceCatalogLogic']),
     props({} as SourceCatalogLogicProps),
@@ -136,7 +978,779 @@ export const sourceCatalogLogic = kea<sourceCatalogLogicType>([
                 s.featureFlags,
                 (_, p: SourceCatalogLogicProps) => p.allowedSources,
             ],
-            (availableSources, manualConnectors, featureFlags, allowedSources): CatalogItem[] => {
+            (
+                availableSources: Record<string, SourceConfig> | null,
+                manualConnectors: {
+                    name: string
+                    type: import('~/types').ManualLinkSourceType
+                }[],
+                featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet,
+                allowedSources:
+                    | (
+                          | 'ActiveCampaign'
+                          | 'AcuityScheduling'
+                          | 'Adapty'
+                          | 'Adjust'
+                          | 'AdobeAnalytics'
+                          | 'AdobeCommerce'
+                          | 'AdpWorkforceNow'
+                          | 'AdRoll'
+                          | 'Adyen'
+                          | 'AgileCRM'
+                          | 'Aha'
+                          | 'Ahrefs'
+                          | 'AikidoSecurity'
+                          | 'Airbyte'
+                          | 'Aircall'
+                          | 'AirOps'
+                          | 'Airtable'
+                          | 'Aiven'
+                          | 'Akeneo'
+                          | 'Algolia'
+                          | 'Alguna'
+                          | 'AlpacaBrokerAPI'
+                          | 'AlphaVantage'
+                          | 'AmazonAds'
+                          | 'AmazonCloudWatch'
+                          | 'AmazonEventBridge'
+                          | 'AmazonKinesis'
+                          | 'AmazonS3'
+                          | 'AmazonSellingPartner'
+                          | 'AmazonSNS'
+                          | 'AmazonSQS'
+                          | 'Amplitude'
+                          | 'Anthropic'
+                          | 'ApifyDataset'
+                          | 'Apollo'
+                          | 'Appcues'
+                          | 'Appfigures'
+                          | 'Appfollow'
+                          | 'AppleSearchAds'
+                          | 'AppLovin'
+                          | 'AppsFlyer'
+                          | 'Appstack'
+                          | 'Apptivo'
+                          | 'Appwrite'
+                          | 'Asana'
+                          | 'Ashby'
+                          | 'AssemblyAI'
+                          | 'Attentive'
+                          | 'Attio'
+                          | 'Auth0'
+                          | 'Aviationstack'
+                          | 'Aviator'
+                          | 'Awin'
+                          | 'AwsCloudTrail'
+                          | 'AzureBlob'
+                          | 'AzureDevOps'
+                          | 'AzureTableStorage'
+                          | 'Babelforce'
+                          | 'Backblaze'
+                          | 'BambooHR'
+                          | 'Basecamp'
+                          | 'Baserow'
+                          | 'Baseten'
+                          | 'Beamer'
+                          | 'BigCommerce'
+                          | 'BigMailer'
+                          | 'BigQuery'
+                          | 'BingAds'
+                          | 'Bitly'
+                          | 'BlandAI'
+                          | 'Blogger'
+                          | 'Bluetally'
+                          | 'BoldSign'
+                          | 'Box'
+                          | 'Braintree'
+                          | 'Braintrust'
+                          | 'Branch'
+                          | 'Braze'
+                          | 'Breezometer'
+                          | 'BreezyHR'
+                          | 'Brevo'
+                          | 'Brex'
+                          | 'BrowseAI'
+                          | 'Browserbase'
+                          | 'BrowserUse'
+                          | 'Bugsnag'
+                          | 'BuildBetter'
+                          | 'Buildkite'
+                          | 'Bunny'
+                          | 'Buzzsprout'
+                          | 'CalCom'
+                          | 'Calendly'
+                          | 'CallRail'
+                          | 'CampaignManager360'
+                          | 'CampaignMonitor'
+                          | 'Campayn'
+                          | 'Canny'
+                          | 'CapsuleCRM'
+                          | 'CaptainData'
+                          | 'CareQualityCommission'
+                          | 'CartCom'
+                          | 'CastorEDC'
+                          | 'Chameleon'
+                          | 'Chargebee'
+                          | 'Chargedesk'
+                          | 'Chargify'
+                          | 'ChartHop'
+                          | 'ChartMogul'
+                          | 'Chatwoot'
+                          | 'CheckoutCom'
+                          | 'Chift'
+                          | 'Chorus'
+                          | 'Churnkey'
+                          | 'Cimis'
+                          | 'Cin7'
+                          | 'CircleCI'
+                          | 'CiscoMeraki'
+                          | 'Clari'
+                          | 'Clarifai'
+                          | 'Clazar'
+                          | 'Clerk'
+                          | 'ClickHouse'
+                          | 'ClickUp'
+                          | 'Clockify'
+                          | 'Clockodo'
+                          | 'Close'
+                          | 'Cloudbeds'
+                          | 'Cloudflare'
+                          | 'Coassemble'
+                          | 'CockroachDB'
+                          | 'Coda'
+                          | 'Codefresh'
+                          | 'Cody'
+                          | 'Cohere'
+                          | 'CoinApi'
+                          | 'CoinGecko'
+                          | 'CoinMarketCap'
+                          | 'Commercetools'
+                          | 'Concord'
+                          | 'ConfigCat'
+                          | 'Confluence'
+                          | 'ConstantContact'
+                          | 'ConvertKit'
+                          | 'Convex'
+                          | 'Copper'
+                          | 'CosmosDB'
+                          | 'Couchbase'
+                          | 'Coupa'
+                          | 'Criteo'
+                          | 'Crunchbase'
+                          | 'CultureAmp'
+                          | 'Cursor'
+                          | 'Curve'
+                          | 'Custom'
+                          | 'CustomerIO'
+                          | 'Customerly'
+                          | 'Databricks'
+                          | 'Datadog'
+                          | 'Datascope'
+                          | 'Datorama'
+                          | 'Db2'
+                          | 'Dbt'
+                          | 'Decagon'
+                          | 'Deel'
+                          | 'Deepgram'
+                          | 'Delighted'
+                          | 'DenoDeploy'
+                          | 'Deputy'
+                          | 'DevinAI'
+                          | 'DigitalOcean'
+                          | 'DingConnect'
+                          | 'DisplayVideo360'
+                          | 'Dixa'
+                          | 'Dockerhub'
+                          | 'Docuseal'
+                          | 'Docusign'
+                          | 'DoIt'
+                          | 'Dolibarr'
+                          | 'Dremio'
+                          | 'Drip'
+                          | 'Dropbox'
+                          | 'DropboxSign'
+                          | 'Dub'
+                          | 'Dwolla'
+                          | 'Dynamics365'
+                          | 'DynamoDB'
+                          | 'E2B'
+                          | 'Easypost'
+                          | 'Easypromos'
+                          | 'Ebay'
+                          | 'EConomic'
+                          | 'Elasticemail'
+                          | 'Elasticsearch'
+                          | 'ElevenLabs'
+                          | 'Eloqua'
+                          | 'EmailOctopus'
+                          | 'EmploymentHero'
+                          | 'Encharge'
+                          | 'Eventbrite'
+                          | 'Eventee'
+                          | 'Eventzilla'
+                          | 'Everhour'
+                          | 'ExchangeRatesApi'
+                          | 'Expensify'
+                          | 'EZOfficeInventory'
+                          | 'FacebookPages'
+                          | 'Factorial'
+                          | 'Fastbill'
+                          | 'Fastly'
+                          | 'Fauna'
+                          | 'Feishu'
+                          | 'Fillout'
+                          | 'Finage'
+                          | 'FinancialModelling'
+                          | 'Finnhub'
+                          | 'Finnworlds'
+                          | 'Fintoc'
+                          | 'Firebase'
+                          | 'Firebolt'
+                          | 'Firecrawl'
+                          | 'FireHydrant'
+                          | 'FireworksAI'
+                          | 'Fleetio'
+                          | 'Flexmail'
+                          | 'Flexport'
+                          | 'FloatApp'
+                          | 'Flowlu'
+                          | 'FlyIo'
+                          | 'Formbricks'
+                          | 'FreeAgent'
+                          | 'Freightview'
+                          | 'FreshBooks'
+                          | 'Freshcaller'
+                          | 'Freshchat'
+                          | 'Freshdesk'
+                          | 'Freshsales'
+                          | 'Freshservice'
+                          | 'Front'
+                          | 'Fulcrum'
+                          | 'FullStory'
+                          | 'GainsightPx'
+                          | 'Giphy'
+                          | 'GitBook'
+                          | 'Github'
+                          | 'GitLab'
+                          | 'Gladly'
+                          | 'Glassfrog'
+                          | 'Gmail'
+                          | 'GNews'
+                          | 'GoCardless'
+                          | 'Gojiberry'
+                          | 'Goldcast'
+                          | 'GoLogin'
+                          | 'Gong'
+                          | 'GoogleAdManager'
+                          | 'GoogleAds'
+                          | 'GoogleAnalytics'
+                          | 'GoogleCalendar'
+                          | 'GoogleChat'
+                          | 'GoogleClassroom'
+                          | 'GoogleCloudStorage'
+                          | 'GoogleDirectory'
+                          | 'GoogleDrive'
+                          | 'GoogleForms'
+                          | 'GooglePageSpeedInsights'
+                          | 'GoogleSearchConsole'
+                          | 'GoogleSheets'
+                          | 'GoogleTasks'
+                          | 'GoogleWebfonts'
+                          | 'GoogleWorkspaceAdminReports'
+                          | 'Gorgias'
+                          | 'Grafana'
+                          | 'Granola'
+                          | 'Greenhouse'
+                          | 'GreytHr'
+                          | 'Gridly'
+                          | 'Groq'
+                          | 'GrowthBook'
+                          | 'Guardian'
+                          | 'Gumloop'
+                          | 'Guru'
+                          | 'Gusto'
+                          | 'Harness'
+                          | 'Harvey'
+                          | 'Hatchet'
+                          | 'Healthchecks'
+                          | 'Heap'
+                          | 'Height'
+                          | 'Helicone'
+                          | 'Hellobaton'
+                          | 'HelpScout'
+                          | 'Heroku'
+                          | 'Hetzner'
+                          | 'Hex'
+                          | 'HeyGen'
+                          | 'HiBob'
+                          | 'HighLevel'
+                          | 'Hightouch'
+                          | 'HoorayHR'
+                          | 'Hubplanner'
+                          | 'Hubspot'
+                          | 'HuggingFace'
+                          | 'Humanitix'
+                          | 'Huntr'
+                          | 'Hyperspell'
+                          | 'Ikas'
+                          | 'IlluminaBasespace'
+                          | 'Imagga'
+                          | 'Impact'
+                          | 'IncidentIo'
+                          | 'Infisical'
+                          | 'Inflowinventory'
+                          | 'InforNexus'
+                          | 'Inngest'
+                          | 'Insightful'
+                          | 'Insightly'
+                          | 'Instagram'
+                          | 'Instantly'
+                          | 'Instatus'
+                          | 'Intercom'
+                          | 'Interzoid'
+                          | 'Intruder'
+                          | 'Invoiced'
+                          | 'Invoiceninja'
+                          | 'IP2Whois'
+                          | 'Iterable'
+                          | 'JamfPro'
+                          | 'Jira'
+                          | 'Jobber'
+                          | 'JobNimbus'
+                          | 'Jotform'
+                          | 'JudgeMeReviews'
+                          | 'JustCall'
+                          | 'JustSift'
+                          | 'K6Cloud'
+                          | 'Kafka'
+                          | 'KapaAI'
+                          | 'Katana'
+                          | 'Keka'
+                          | 'Kernel'
+                          | 'Kickscale'
+                          | 'Kisi'
+                          | 'Kissmetrics'
+                          | 'Klarna'
+                          | 'Klaus'
+                          | 'Klaviyo'
+                          | 'Knock'
+                          | 'Koyeb'
+                          | 'Kustomer'
+                          | 'KYVE'
+                          | 'Lago'
+                          | 'LambdaLabs'
+                          | 'Langfuse'
+                          | 'LangSmith'
+                          | 'Lattice'
+                          | 'LaunchDarkly'
+                          | 'Leadfeeder'
+                          | 'Leexi'
+                          | 'Lemlist'
+                          | 'LemonSqueezy'
+                          | 'LessAnnoyingCRM'
+                          | 'Lever'
+                          | 'Liana'
+                          | 'Lightfield'
+                          | 'LightspeedRetail'
+                          | 'Linear'
+                          | 'LingoDev'
+                          | 'LinkedinAds'
+                          | 'LinkedinPages'
+                          | 'Linkrunner'
+                          | 'Linnworks'
+                          | 'Linode'
+                          | 'LlamaCloud'
+                          | 'Lob'
+                          | 'Lokalise'
+                          | 'Looker'
+                          | 'Loops'
+                          | 'Luma'
+                          | 'M3ter'
+                          | 'Mailchimp'
+                          | 'MailerLite'
+                          | 'MailerSend'
+                          | 'Mailgun'
+                          | 'Mailjet'
+                          | 'Mailosaur'
+                          | 'Mailtrap'
+                          | 'Mantle'
+                          | 'Marketo'
+                          | 'Marketstack'
+                          | 'Matomo'
+                          | 'Maxio'
+                          | 'Mem0'
+                          | 'Mendeley'
+                          | 'Mention'
+                          | 'MercadoAds'
+                          | 'Mercury'
+                          | 'Merge'
+                          | 'MetaAds'
+                          | 'Metabase'
+                          | 'Metorial'
+                          | 'Metricool'
+                          | 'Metriport'
+                          | 'Metronome'
+                          | 'MicrosoftDataverse'
+                          | 'MicrosoftEntraId'
+                          | 'MicrosoftLists'
+                          | 'MicrosoftTeams'
+                          | 'Mintlify'
+                          | 'Miro'
+                          | 'Missive'
+                          | 'MistralAI'
+                          | 'MixMax'
+                          | 'Mixpanel'
+                          | 'Mode'
+                          | 'Mollie'
+                          | 'Monday'
+                          | 'MongoDB'
+                          | 'Mono'
+                          | 'MSSQL'
+                          | 'Mux'
+                          | 'MyHours'
+                          | 'MySQL'
+                          | 'N8n'
+                          | 'Nasa'
+                          | 'Navan'
+                          | 'NebiusAI'
+                          | 'Neon'
+                          | 'Netlify'
+                          | 'NetSuite'
+                          | 'NewRelic'
+                          | 'NewsApi'
+                          | 'NewsData'
+                          | 'NewYorkTimes'
+                          | 'Nexiopay'
+                          | 'NextdoorAds'
+                          | 'NinjaOneRMM'
+                          | 'NoCRM'
+                          | 'Northflank'
+                          | 'NorthpassLMS'
+                          | 'Notion'
+                          | 'Nutshell'
+                          | 'Nylas'
+                          | 'Okta'
+                          | 'Omnisend'
+                          | 'Oncehub'
+                          | 'OneDrive'
+                          | 'OneHundredMs'
+                          | 'Onepagecrm'
+                          | 'OneSignal'
+                          | 'Onfleet'
+                          | 'OpenAI'
+                          | 'OpenAIAds'
+                          | 'OpenAQ'
+                          | 'OpenDataDc'
+                          | 'OpenExchangeRates'
+                          | 'OpenFDA'
+                          | 'OpenRouter'
+                          | 'OpenWeather'
+                          | 'OpinionStage'
+                          | 'Opsgenie'
+                          | 'Optimizely'
+                          | 'OPUSWatch'
+                          | 'Oracle'
+                          | 'OracleEbs'
+                          | 'OracleFusion'
+                          | 'Orb'
+                          | 'Orbit'
+                          | 'Ortto'
+                          | 'Oura'
+                          | 'Outbrain'
+                          | 'Outlook'
+                          | 'Outreach'
+                          | 'Oveit'
+                          | 'PabblySubscriptionsBilling'
+                          | 'Paddle'
+                          | 'PagerDuty'
+                          | 'PandaDoc'
+                          | 'Paperform'
+                          | 'Papersign'
+                          | 'Pardot'
+                          | 'Partnerize'
+                          | 'PartnerStack'
+                          | 'PayFit'
+                          | 'Paylocity'
+                          | 'PayPal'
+                          | 'Paystack'
+                          | 'PeecAI'
+                          | 'Pendo'
+                          | 'Pennylane'
+                          | 'Perigon'
+                          | 'Perk'
+                          | 'PersistIq'
+                          | 'Persona'
+                          | 'Personio'
+                          | 'Pexels'
+                          | 'PgAnalyze'
+                          | 'Phyllo'
+                          | 'Picqer'
+                          | 'Pinecone'
+                          | 'Pingdom'
+                          | 'PinterestAds'
+                          | 'Pipedrive'
+                          | 'Pipeliner'
+                          | 'PivotalTracker'
+                          | 'Piwik'
+                          | 'Plaid'
+                          | 'Plain'
+                          | 'PlanetScale'
+                          | 'Planhat'
+                          | 'PlatformSh'
+                          | 'Plausible'
+                          | 'Plunk'
+                          | 'Pocket'
+                          | 'Podium'
+                          | 'Polar'
+                          | 'Polygon'
+                          | 'Poplar'
+                          | 'Postgres'
+                          | 'Postmark'
+                          | 'PrestaShop'
+                          | 'Pretix'
+                          | 'Primetric'
+                          | 'Printify'
+                          | 'Productboard'
+                          | 'Productive'
+                          | 'PromptingCompany'
+                          | 'Pylon'
+                          | 'PyPI'
+                          | 'Qdrant'
+                          | 'Qonto'
+                          | 'Qualaroo'
+                          | 'Qualtrics'
+                          | 'QuickBooks'
+                          | 'Railz'
+                          | 'Ramp'
+                          | 'Razorpay'
+                          | 'RB2B'
+                          | 'RDStationMarketing'
+                          | 'Recharge'
+                          | 'Recreation'
+                          | 'Recruitee'
+                          | 'Recurly'
+                          | 'Reddit'
+                          | 'RedditAds'
+                          | 'Redis'
+                          | 'Redshift'
+                          | 'ReferralHero'
+                          | 'Render'
+                          | 'RentCast'
+                          | 'Repairshopr'
+                          | 'Replicate'
+                          | 'ReplyIo'
+                          | 'Resend'
+                          | 'RetailExpress'
+                          | 'RetellAI'
+                          | 'Retently'
+                          | 'RevenueCat'
+                          | 'RevolutMerchant'
+                          | 'RingCentral'
+                          | 'Rippling'
+                          | 'RKICovid'
+                          | 'Roark'
+                          | 'RocketChat'
+                          | 'Rocketlane'
+                          | 'Rollbar'
+                          | 'Rootly'
+                          | 'Rss'
+                          | 'RudderStack'
+                          | 'Ruddr'
+                          | 'RunPod'
+                          | 'SafetyCulture'
+                          | 'SageHR'
+                          | 'SageIntacct'
+                          | 'Sailthru'
+                          | 'Salesflare'
+                          | 'Salesforce'
+                          | 'SalesforceMarketingCloud'
+                          | 'SalesLoft'
+                          | 'Sanity'
+                          | 'SapConcur'
+                          | 'SapErp'
+                          | 'SAPFieldglass'
+                          | 'SapHana'
+                          | 'SapSuccessFactors'
+                          | 'SavvyCal'
+                          | 'ScaleAI'
+                          | 'Scaleway'
+                          | 'SearchAds360'
+                          | 'Secoda'
+                          | 'Segment'
+                          | 'SendGrid'
+                          | 'Sendowl'
+                          | 'SendPulse'
+                          | 'Senseforce'
+                          | 'Sentry'
+                          | 'Serpstat'
+                          | 'ServiceNow'
+                          | 'SevenShifts'
+                          | 'SFTP'
+                          | 'SharePoint'
+                          | 'Sharetribe'
+                          | 'Shippo'
+                          | 'ShipStation'
+                          | 'Shopify'
+                          | 'ShopWired'
+                          | 'Shortcut'
+                          | 'Shortio'
+                          | 'Shutterstock'
+                          | 'SigmaComputing'
+                          | 'SignNow'
+                          | 'SigNoz'
+                          | 'Sim'
+                          | 'SimFin'
+                          | 'SimpleCast'
+                          | 'Simplesat'
+                          | 'Singular'
+                          | 'Skyvern'
+                          | 'Slack'
+                          | 'Slash'
+                          | 'Smaily'
+                          | 'SmartEngage'
+                          | 'Smartreach'
+                          | 'Smartsheet'
+                          | 'Smartwaiver'
+                          | 'SnapchatAds'
+                          | 'Snowflake'
+                          | 'SolarwindsServiceDesk'
+                          | 'SonarCloud'
+                          | 'SparkPost'
+                          | 'SplitIo'
+                          | 'SpotifyAds'
+                          | 'SpotlerCRM'
+                          | 'Square'
+                          | 'Squarespace'
+                          | 'Statsig'
+                          | 'Statuspage'
+                          | 'Stigg'
+                          | 'StockData'
+                          | 'Strava'
+                          | 'StreamElements'
+                          | 'Streamlabs'
+                          | 'Stripe'
+                          | 'Sumsub'
+                          | 'Supabase'
+                          | 'Superwall'
+                          | 'SurveyMonkey'
+                          | 'SurveySparrow'
+                          | 'Survicate'
+                          | 'Svix'
+                          | 'Swonkie'
+                          | 'Synthesia'
+                          | 'Systeme'
+                          | 'Taboola'
+                          | 'Talkwalker'
+                          | 'Tavus'
+                          | 'TawkTo'
+                          | 'Teachable'
+                          | 'Teamtailor'
+                          | 'Teamwork'
+                          | 'Telli'
+                          | 'Tempo'
+                          | 'TemporalIO'
+                          | 'TerraApi'
+                          | 'Testrail'
+                          | 'Thinkific'
+                          | 'ThinkificCourses'
+                          | 'ThriveLearning'
+                          | 'Ticketmaster'
+                          | 'TicketTailor'
+                          | 'TickTick'
+                          | 'TikTokAds'
+                          | 'Tile38'
+                          | 'Timely'
+                          | 'Tinyemail'
+                          | 'TMDb'
+                          | 'Todoist'
+                          | 'TogetherAI'
+                          | 'Toggl'
+                          | 'TrackPMS'
+                          | 'Trello'
+                          | 'Tremendous'
+                          | 'TriggerDev'
+                          | 'TrustPilot'
+                          | 'Turso'
+                          | 'TVMaze'
+                          | 'TwelveData'
+                          | 'TwelveLabs'
+                          | 'Twenty'
+                          | 'Twilio'
+                          | 'Twitter'
+                          | 'TwitterAds'
+                          | 'TyntecSMS'
+                          | 'Typeform'
+                          | 'Ubidots'
+                          | 'Unleash'
+                          | 'Unstructured'
+                          | 'UpPromote'
+                          | 'Upstash'
+                          | 'Uptick'
+                          | 'USCensus'
+                          | 'Uservoice'
+                          | 'Vantage'
+                          | 'Vapi'
+                          | 'Veeqo'
+                          | 'Vellum'
+                          | 'Vercel'
+                          | 'Vespa'
+                          | 'VismaEconomic'
+                          | 'Vitally'
+                          | 'Vultr'
+                          | 'VWO'
+                          | 'Waiteraid'
+                          | 'Wasabi'
+                          | 'Watchmode'
+                          | 'Webflow'
+                          | 'WhenIWork'
+                          | 'WikipediaPageviews'
+                          | 'Windmill'
+                          | 'WooCommerce'
+                          | 'Wordpress'
+                          | 'Workable'
+                          | 'Workday'
+                          | 'Workflowmax'
+                          | 'WorkOS'
+                          | 'Workramp'
+                          | 'Wrike'
+                          | 'Writesonic'
+                          | 'Wufoo'
+                          | 'Xero'
+                          | 'Xsolla'
+                          | 'YahooFinance'
+                          | 'YandexMetrica'
+                          | 'Ynab'
+                          | 'Yotpo'
+                          | 'Younium'
+                          | 'YouSign'
+                          | 'YouTubeAnalytics'
+                          | 'YoutubeData'
+                          | 'ZapierSupportedStorage'
+                          | 'ZapSign'
+                          | 'Zellify'
+                          | 'Zendesk'
+                          | 'ZendeskSell'
+                          | 'ZendeskSunshine'
+                          | 'Zenefits'
+                          | 'Zenloop'
+                          | 'Zep'
+                          | 'ZohoAnalytics'
+                          | 'ZohoBigin'
+                          | 'ZohoBilling'
+                          | 'ZohoBooks'
+                          | 'ZohoCampaign'
+                          | 'ZohoCRM'
+                          | 'ZohoDesk'
+                          | 'ZohoExpense'
+                          | 'ZohoInventory'
+                          | 'ZohoInvoice'
+                          | 'ZonkaFeedback'
+                          | 'Zoom'
+                          | 'ZoomInfo'
+                          | 'Zuora'
+                      )[]
+                    | undefined
+            ): CatalogItem[] => {
                 const managed = Object.values(availableSources ?? {})
                     .filter((c) => !allowedSources || allowedSources.includes(c.name))
                     .map((connector: SourceConfig): CatalogItem => {
@@ -190,7 +1804,7 @@ export const sourceCatalogLogic = kea<sourceCatalogLogicType>([
 
         categoriesWithCounts: [
             (s) => [s.catalogItems],
-            (catalogItems): CatalogCategory[] => {
+            (catalogItems: CatalogItem[]): CatalogCategory[] => {
                 const counts = new Map<DataWarehouseSourceCategory, number>()
                 for (const item of catalogItems) {
                     counts.set(item.category, (counts.get(item.category) ?? 0) + 1)
@@ -215,7 +1829,7 @@ export const sourceCatalogLogic = kea<sourceCatalogLogicType>([
 
         catalogFuse: [
             (s) => [s.catalogItems],
-            (catalogItems): Fuse =>
+            (catalogItems: CatalogItem[]): Fuse =>
                 createFuse(catalogItems, {
                     keys: ['label', 'name', 'keywords', 'category'],
                 }),
@@ -223,7 +1837,12 @@ export const sourceCatalogLogic = kea<sourceCatalogLogicType>([
 
         filteredItems: [
             (s) => [s.catalogItems, s.catalogFuse, s.search, s.selectedCategory],
-            (catalogItems, catalogFuse, search, selectedCategory): CatalogItem[] => {
+            (
+                catalogItems: CatalogItem[],
+                catalogFuse: Fuse,
+                search: string,
+                selectedCategory: SourceCategoryFilter
+            ): CatalogItem[] => {
                 const trimmed = search.trim()
                 const base = trimmed ? catalogFuse.search(trimmed).map((r) => r.item) : catalogItems
                 const filtered =
diff --git a/products/data_warehouse/frontend/scenes/NewSourceScene/sourceWizardLogic.tsx b/products/data_warehouse/frontend/scenes/NewSourceScene/sourceWizardLogic.tsx
index 15057ead72b2..58c5e5d7f395 100644
--- a/products/data_warehouse/frontend/scenes/NewSourceScene/sourceWizardLogic.tsx
+++ b/products/data_warehouse/frontend/scenes/NewSourceScene/sourceWizardLogic.tsx
@@ -1,5 +1,6 @@
-import { actions, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { router, urlToAction } from 'kea-router'
 import posthog from 'posthog-js'
@@ -40,6 +41,11 @@ import {
     RowFilter,
 } from '~/types'
 
+import type { AvailableSetupTaskIdsEnumApi } from '../../../../../frontend/src/generated/core/api.schemas'
+import type { PaginatedResponse } from '../../../../../frontend/src/lib/api'
+import type { FeatureFlagsSet } from '../../../../../frontend/src/lib/logic/featureFlagLogic'
+import type { ProductIntentProperties } from '../../../../../frontend/src/lib/utils/product-intents'
+import type { DataWarehouseTable, ExternalDataSource, PreflightStatus } from '../../../../../frontend/src/types'
 import {
     getDefaultExpandedSchemaKeys,
     groupTablesBySchema,
@@ -49,7 +55,6 @@ import {
 import type { WebhookCreateResult } from '../../shared/components/forms/WebhookSetupForm'
 import { sourceManagementLogic } from '../../shared/logics/sourceManagementLogic'
 import { selfManagedSourceLogic } from './selfManagedSourceLogic'
-import type { sourceWizardLogicType } from './sourceWizardLogicType'
 import { restoreSourceFormState, saveSourceFormState } from './wizardFormStorage'
 
 export const SSH_FIELD: SourceFieldSwitchGroupConfig = {
@@ -299,6 +304,1322 @@ export interface SourceWizardLogicProps {
     autoConfigureTables?: boolean
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sourceWizardLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    preflight: PreflightStatus | null // preflightLogic
+    tableLoading: boolean // selfManagedSourceLogic
+    dataWarehouseSources: PaginatedResponse<ExternalDataSource> | null // sourceManagementLogic
+    currentTeamId: number | null // teamLogic
+    availableSources: any
+    breadcrumbs: Breadcrumb[]
+    canGoBack: boolean
+    canGoNext: boolean
+    cdcPrereqsCheckResult: {
+        errors: string[]
+        valid: boolean
+    } | null
+    cdcPrereqsCheckResultLoading: boolean
+    cdcSelfManagedSetupDialogOpen: boolean
+    cdcSelfManagedVerifyResult: {
+        errors: string[]
+        valid: boolean
+    } | null
+    cdcSelfManagedVerifyResultLoading: boolean
+    configuredSchemaName: string | null
+    connectors: SourceConfig[]
+    currentStep: number
+    currentSyncMethodModalSchema: ExternalDataSourceSyncSchema | null
+    databaseSchema: ExternalDataSourceSyncSchema[]
+    defaultSourceConnectionDetails: Record<string, unknown>
+    expandedSchemaGroupKeys: string[]
+    filteredDatabaseSchema: ExternalDataSourceSyncSchema[]
+    groupedDatabaseSchema: {
+        schemaName: string
+        tables: ExternalDataSourceSyncSchema[]
+    }[]
+    hasWebhookSchemas: boolean
+    isDirectQueryMode: boolean
+    isLoading: boolean
+    isManualLinkFormVisible: boolean
+    isManualLinkingSelected: boolean
+    isSelfManagedSource: boolean
+    isSourceConnectionDetailsSubmitting: boolean
+    isSourceConnectionDetailsValid: boolean
+    isWebhookFieldInputsSubmitting: boolean
+    isWebhookFieldInputsValid: boolean
+    isWrapped: boolean
+    manualConnectors: {
+        name: string
+        type: ManualLinkSourceType
+    }[]
+    manualLinkingProvider: ManualLinkSourceType | null
+    modalTitle:
+        | ''
+        | 'Importing your data...'
+        | 'Link your data source'
+        | 'Select tables to import'
+        | 'Select tables to query'
+        | 'Set up webhook'
+        | 'Tables ready to query'
+    nextButtonText: string
+    requiredTables: any
+    returnConfig: {
+        returnLabel: string
+        returnUrl: string
+    } | null
+    schemaGroupKeys: string[]
+    schemaGroupKeysFingerprint: string
+    schemaNameFilter: string
+    selectedConnector: SourceConfig | null
+    showFooter: boolean | SourceConfig
+    showSkipButton: boolean
+    showSourceConnectionDetailsErrors: boolean
+    showWebhookFieldInputsErrors: boolean
+    source: {
+        access_method: 'direct' | 'warehouse'
+        description: string
+        payload: Record<string, any>
+        prefix: string
+    }
+    sourceConnectionDetails: Record<string, any>
+    sourceConnectionDetailsAllErrors: Record<string, any>
+    sourceConnectionDetailsChanged: boolean
+    sourceConnectionDetailsErrors: DeepPartialMap<Record<string, any>, ValidationErrorType>
+    sourceConnectionDetailsHasErrors: boolean
+    sourceConnectionDetailsManualErrors: Record<string, any>
+    sourceConnectionDetailsTouched: boolean
+    sourceConnectionDetailsTouches: Record<string, boolean>
+    sourceConnectionDetailsValidationErrors: DeepPartialMap<Record<string, any>, ValidationErrorType>
+    sourceId: string | null
+    suggestedTablesMap: Record<string, string | null>
+    syncMethodModalOpen: boolean
+    tablesAllToggledOn: boolean | 'indeterminate'
+    webhookCreating: boolean
+    webhookFieldInputs: Record<string, any>
+    webhookFieldInputsAllErrors: Record<string, any>
+    webhookFieldInputsChanged: boolean
+    webhookFieldInputsErrors: DeepPartialMap<Record<string, any>, ValidationErrorType>
+    webhookFieldInputsHasErrors: boolean
+    webhookFieldInputsManualErrors: Record<string, any>
+    webhookFieldInputsTouched: boolean
+    webhookFieldInputsTouches: Record<string, boolean>
+    webhookFieldInputsValidationErrors: DeepPartialMap<Record<string, any>, ValidationErrorType>
+    webhookResult: WebhookCreateResult | null
+    webhookStepComplete: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sourceWizardLogicActions {
+    markTaskAsCompleted: (taskIdOrIds: SetupTaskId | SetupTaskId[]) => {
+        taskIdOrIds: AvailableSetupTaskIdsEnumApi | AvailableSetupTaskIdsEnumApi[]
+    } // globalSetupLogic
+    createTableSuccess: (
+        table: DataWarehouseTable,
+        payload?: any
+    ) => {
+        payload?: any
+        table: DataWarehouseTable
+    } // selfManagedSourceLogic
+    resetTable: (values?: DataWarehouseTable | undefined) => {
+        values?: DataWarehouseTable
+    } // selfManagedSourceLogic
+    loadSources: () => {
+        value: true
+    } // sourceManagementLogic
+    addProductIntent: (properties: ProductIntentProperties) => ProductIntentProperties // teamLogic
+    cancelSyncMethodModal: () => {
+        value: true
+    }
+    cancelWizard: () => {
+        value: true
+    }
+    checkCdcPrereqs: () => any
+    checkCdcPrereqsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    checkCdcPrereqsSuccess: (
+        cdcPrereqsCheckResult: {
+            errors: string[]
+            valid: boolean
+        } | null,
+        payload?: any
+    ) => {
+        cdcPrereqsCheckResult: {
+            errors: string[]
+            valid: boolean
+        } | null
+        payload?: any
+    }
+    clearCdcPrereqsCheckResult: () => {
+        value: true
+    }
+    clearCdcPrereqsCheckResultFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    clearCdcPrereqsCheckResultSuccess: (
+        cdcPrereqsCheckResult: null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        cdcPrereqsCheckResult: null
+        payload?: {
+            value: true
+        }
+    }
+    clearCdcSelfManagedVerifyResult: () => {
+        value: true
+    }
+    clearCdcSelfManagedVerifyResultFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    clearCdcSelfManagedVerifyResultSuccess: (
+        cdcSelfManagedVerifyResult: null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        cdcSelfManagedVerifyResult: null
+        payload?: {
+            value: true
+        }
+    }
+    clearReturnConfig: () => {
+        value: true
+    }
+    clearSource: () => {
+        value: true
+    }
+    closeCdcSelfManagedSetupDialog: () => {
+        value: true
+    }
+    closeWizard: () => {
+        value: true
+    }
+    createSource: () => {
+        value: true
+    }
+    createWebhook: () => {
+        value: true
+    }
+    getDatabaseSchemas: () => {
+        value: true
+    }
+    handleRedirect: (
+        source: ExternalDataSourceType,
+        searchParams?: any
+    ) => {
+        searchParams: any
+        source:
+            | 'ActiveCampaign'
+            | 'AcuityScheduling'
+            | 'Adapty'
+            | 'Adjust'
+            | 'AdobeAnalytics'
+            | 'AdobeCommerce'
+            | 'AdpWorkforceNow'
+            | 'AdRoll'
+            | 'Adyen'
+            | 'AgileCRM'
+            | 'Aha'
+            | 'Ahrefs'
+            | 'AikidoSecurity'
+            | 'Airbyte'
+            | 'Aircall'
+            | 'AirOps'
+            | 'Airtable'
+            | 'Aiven'
+            | 'Akeneo'
+            | 'Algolia'
+            | 'Alguna'
+            | 'AlpacaBrokerAPI'
+            | 'AlphaVantage'
+            | 'AmazonAds'
+            | 'AmazonCloudWatch'
+            | 'AmazonEventBridge'
+            | 'AmazonKinesis'
+            | 'AmazonS3'
+            | 'AmazonSellingPartner'
+            | 'AmazonSNS'
+            | 'AmazonSQS'
+            | 'Amplitude'
+            | 'Anthropic'
+            | 'ApifyDataset'
+            | 'Apollo'
+            | 'Appcues'
+            | 'Appfigures'
+            | 'Appfollow'
+            | 'AppleSearchAds'
+            | 'AppLovin'
+            | 'AppsFlyer'
+            | 'Appstack'
+            | 'Apptivo'
+            | 'Appwrite'
+            | 'Asana'
+            | 'Ashby'
+            | 'AssemblyAI'
+            | 'Attentive'
+            | 'Attio'
+            | 'Auth0'
+            | 'Aviationstack'
+            | 'Aviator'
+            | 'Awin'
+            | 'AwsCloudTrail'
+            | 'AzureBlob'
+            | 'AzureDevOps'
+            | 'AzureTableStorage'
+            | 'Babelforce'
+            | 'Backblaze'
+            | 'BambooHR'
+            | 'Basecamp'
+            | 'Baserow'
+            | 'Baseten'
+            | 'Beamer'
+            | 'BigCommerce'
+            | 'BigMailer'
+            | 'BigQuery'
+            | 'BingAds'
+            | 'Bitly'
+            | 'BlandAI'
+            | 'Blogger'
+            | 'Bluetally'
+            | 'BoldSign'
+            | 'Box'
+            | 'Braintree'
+            | 'Braintrust'
+            | 'Branch'
+            | 'Braze'
+            | 'Breezometer'
+            | 'BreezyHR'
+            | 'Brevo'
+            | 'Brex'
+            | 'BrowseAI'
+            | 'Browserbase'
+            | 'BrowserUse'
+            | 'Bugsnag'
+            | 'BuildBetter'
+            | 'Buildkite'
+            | 'Bunny'
+            | 'Buzzsprout'
+            | 'CalCom'
+            | 'Calendly'
+            | 'CallRail'
+            | 'CampaignManager360'
+            | 'CampaignMonitor'
+            | 'Campayn'
+            | 'Canny'
+            | 'CapsuleCRM'
+            | 'CaptainData'
+            | 'CareQualityCommission'
+            | 'CartCom'
+            | 'CastorEDC'
+            | 'Chameleon'
+            | 'Chargebee'
+            | 'Chargedesk'
+            | 'Chargify'
+            | 'ChartHop'
+            | 'ChartMogul'
+            | 'Chatwoot'
+            | 'CheckoutCom'
+            | 'Chift'
+            | 'Chorus'
+            | 'Churnkey'
+            | 'Cimis'
+            | 'Cin7'
+            | 'CircleCI'
+            | 'CiscoMeraki'
+            | 'Clari'
+            | 'Clarifai'
+            | 'Clazar'
+            | 'Clerk'
+            | 'ClickHouse'
+            | 'ClickUp'
+            | 'Clockify'
+            | 'Clockodo'
+            | 'Close'
+            | 'Cloudbeds'
+            | 'Cloudflare'
+            | 'Coassemble'
+            | 'CockroachDB'
+            | 'Coda'
+            | 'Codefresh'
+            | 'Cody'
+            | 'Cohere'
+            | 'CoinApi'
+            | 'CoinGecko'
+            | 'CoinMarketCap'
+            | 'Commercetools'
+            | 'Concord'
+            | 'ConfigCat'
+            | 'Confluence'
+            | 'ConstantContact'
+            | 'ConvertKit'
+            | 'Convex'
+            | 'Copper'
+            | 'CosmosDB'
+            | 'Couchbase'
+            | 'Coupa'
+            | 'Criteo'
+            | 'Crunchbase'
+            | 'CultureAmp'
+            | 'Cursor'
+            | 'Curve'
+            | 'Custom'
+            | 'CustomerIO'
+            | 'Customerly'
+            | 'Databricks'
+            | 'Datadog'
+            | 'Datascope'
+            | 'Datorama'
+            | 'Db2'
+            | 'Dbt'
+            | 'Decagon'
+            | 'Deel'
+            | 'Deepgram'
+            | 'Delighted'
+            | 'DenoDeploy'
+            | 'Deputy'
+            | 'DevinAI'
+            | 'DigitalOcean'
+            | 'DingConnect'
+            | 'DisplayVideo360'
+            | 'Dixa'
+            | 'Dockerhub'
+            | 'Docuseal'
+            | 'Docusign'
+            | 'DoIt'
+            | 'Dolibarr'
+            | 'Dremio'
+            | 'Drip'
+            | 'Dropbox'
+            | 'DropboxSign'
+            | 'Dub'
+            | 'Dwolla'
+            | 'Dynamics365'
+            | 'DynamoDB'
+            | 'E2B'
+            | 'Easypost'
+            | 'Easypromos'
+            | 'Ebay'
+            | 'EConomic'
+            | 'Elasticemail'
+            | 'Elasticsearch'
+            | 'ElevenLabs'
+            | 'Eloqua'
+            | 'EmailOctopus'
+            | 'EmploymentHero'
+            | 'Encharge'
+            | 'Eventbrite'
+            | 'Eventee'
+            | 'Eventzilla'
+            | 'Everhour'
+            | 'ExchangeRatesApi'
+            | 'Expensify'
+            | 'EZOfficeInventory'
+            | 'FacebookPages'
+            | 'Factorial'
+            | 'Fastbill'
+            | 'Fastly'
+            | 'Fauna'
+            | 'Feishu'
+            | 'Fillout'
+            | 'Finage'
+            | 'FinancialModelling'
+            | 'Finnhub'
+            | 'Finnworlds'
+            | 'Fintoc'
+            | 'Firebase'
+            | 'Firebolt'
+            | 'Firecrawl'
+            | 'FireHydrant'
+            | 'FireworksAI'
+            | 'Fleetio'
+            | 'Flexmail'
+            | 'Flexport'
+            | 'FloatApp'
+            | 'Flowlu'
+            | 'FlyIo'
+            | 'Formbricks'
+            | 'FreeAgent'
+            | 'Freightview'
+            | 'FreshBooks'
+            | 'Freshcaller'
+            | 'Freshchat'
+            | 'Freshdesk'
+            | 'Freshsales'
+            | 'Freshservice'
+            | 'Front'
+            | 'Fulcrum'
+            | 'FullStory'
+            | 'GainsightPx'
+            | 'Giphy'
+            | 'GitBook'
+            | 'Github'
+            | 'GitLab'
+            | 'Gladly'
+            | 'Glassfrog'
+            | 'Gmail'
+            | 'GNews'
+            | 'GoCardless'
+            | 'Gojiberry'
+            | 'Goldcast'
+            | 'GoLogin'
+            | 'Gong'
+            | 'GoogleAdManager'
+            | 'GoogleAds'
+            | 'GoogleAnalytics'
+            | 'GoogleCalendar'
+            | 'GoogleChat'
+            | 'GoogleClassroom'
+            | 'GoogleCloudStorage'
+            | 'GoogleDirectory'
+            | 'GoogleDrive'
+            | 'GoogleForms'
+            | 'GooglePageSpeedInsights'
+            | 'GoogleSearchConsole'
+            | 'GoogleSheets'
+            | 'GoogleTasks'
+            | 'GoogleWebfonts'
+            | 'GoogleWorkspaceAdminReports'
+            | 'Gorgias'
+            | 'Grafana'
+            | 'Granola'
+            | 'Greenhouse'
+            | 'GreytHr'
+            | 'Gridly'
+            | 'Groq'
+            | 'GrowthBook'
+            | 'Guardian'
+            | 'Gumloop'
+            | 'Guru'
+            | 'Gusto'
+            | 'Harness'
+            | 'Harvey'
+            | 'Hatchet'
+            | 'Healthchecks'
+            | 'Heap'
+            | 'Height'
+            | 'Helicone'
+            | 'Hellobaton'
+            | 'HelpScout'
+            | 'Heroku'
+            | 'Hetzner'
+            | 'Hex'
+            | 'HeyGen'
+            | 'HiBob'
+            | 'HighLevel'
+            | 'Hightouch'
+            | 'HoorayHR'
+            | 'Hubplanner'
+            | 'Hubspot'
+            | 'HuggingFace'
+            | 'Humanitix'
+            | 'Huntr'
+            | 'Hyperspell'
+            | 'Ikas'
+            | 'IlluminaBasespace'
+            | 'Imagga'
+            | 'Impact'
+            | 'IncidentIo'
+            | 'Infisical'
+            | 'Inflowinventory'
+            | 'InforNexus'
+            | 'Inngest'
+            | 'Insightful'
+            | 'Insightly'
+            | 'Instagram'
+            | 'Instantly'
+            | 'Instatus'
+            | 'Intercom'
+            | 'Interzoid'
+            | 'Intruder'
+            | 'Invoiced'
+            | 'Invoiceninja'
+            | 'IP2Whois'
+            | 'Iterable'
+            | 'JamfPro'
+            | 'Jira'
+            | 'Jobber'
+            | 'JobNimbus'
+            | 'Jotform'
+            | 'JudgeMeReviews'
+            | 'JustCall'
+            | 'JustSift'
+            | 'K6Cloud'
+            | 'Kafka'
+            | 'KapaAI'
+            | 'Katana'
+            | 'Keka'
+            | 'Kernel'
+            | 'Kickscale'
+            | 'Kisi'
+            | 'Kissmetrics'
+            | 'Klarna'
+            | 'Klaus'
+            | 'Klaviyo'
+            | 'Knock'
+            | 'Koyeb'
+            | 'Kustomer'
+            | 'KYVE'
+            | 'Lago'
+            | 'LambdaLabs'
+            | 'Langfuse'
+            | 'LangSmith'
+            | 'Lattice'
+            | 'LaunchDarkly'
+            | 'Leadfeeder'
+            | 'Leexi'
+            | 'Lemlist'
+            | 'LemonSqueezy'
+            | 'LessAnnoyingCRM'
+            | 'Lever'
+            | 'Liana'
+            | 'Lightfield'
+            | 'LightspeedRetail'
+            | 'Linear'
+            | 'LingoDev'
+            | 'LinkedinAds'
+            | 'LinkedinPages'
+            | 'Linkrunner'
+            | 'Linnworks'
+            | 'Linode'
+            | 'LlamaCloud'
+            | 'Lob'
+            | 'Lokalise'
+            | 'Looker'
+            | 'Loops'
+            | 'Luma'
+            | 'M3ter'
+            | 'Mailchimp'
+            | 'MailerLite'
+            | 'MailerSend'
+            | 'Mailgun'
+            | 'Mailjet'
+            | 'Mailosaur'
+            | 'Mailtrap'
+            | 'Mantle'
+            | 'Marketo'
+            | 'Marketstack'
+            | 'Matomo'
+            | 'Maxio'
+            | 'Mem0'
+            | 'Mendeley'
+            | 'Mention'
+            | 'MercadoAds'
+            | 'Mercury'
+            | 'Merge'
+            | 'MetaAds'
+            | 'Metabase'
+            | 'Metorial'
+            | 'Metricool'
+            | 'Metriport'
+            | 'Metronome'
+            | 'MicrosoftDataverse'
+            | 'MicrosoftEntraId'
+            | 'MicrosoftLists'
+            | 'MicrosoftTeams'
+            | 'Mintlify'
+            | 'Miro'
+            | 'Missive'
+            | 'MistralAI'
+            | 'MixMax'
+            | 'Mixpanel'
+            | 'Mode'
+            | 'Mollie'
+            | 'Monday'
+            | 'MongoDB'
+            | 'Mono'
+            | 'MSSQL'
+            | 'Mux'
+            | 'MyHours'
+            | 'MySQL'
+            | 'N8n'
+            | 'Nasa'
+            | 'Navan'
+            | 'NebiusAI'
+            | 'Neon'
+            | 'Netlify'
+            | 'NetSuite'
+            | 'NewRelic'
+            | 'NewsApi'
+            | 'NewsData'
+            | 'NewYorkTimes'
+            | 'Nexiopay'
+            | 'NextdoorAds'
+            | 'NinjaOneRMM'
+            | 'NoCRM'
+            | 'Northflank'
+            | 'NorthpassLMS'
+            | 'Notion'
+            | 'Nutshell'
+            | 'Nylas'
+            | 'Okta'
+            | 'Omnisend'
+            | 'Oncehub'
+            | 'OneDrive'
+            | 'OneHundredMs'
+            | 'Onepagecrm'
+            | 'OneSignal'
+            | 'Onfleet'
+            | 'OpenAI'
+            | 'OpenAIAds'
+            | 'OpenAQ'
+            | 'OpenDataDc'
+            | 'OpenExchangeRates'
+            | 'OpenFDA'
+            | 'OpenRouter'
+            | 'OpenWeather'
+            | 'OpinionStage'
+            | 'Opsgenie'
+            | 'Optimizely'
+            | 'OPUSWatch'
+            | 'Oracle'
+            | 'OracleEbs'
+            | 'OracleFusion'
+            | 'Orb'
+            | 'Orbit'
+            | 'Ortto'
+            | 'Oura'
+            | 'Outbrain'
+            | 'Outlook'
+            | 'Outreach'
+            | 'Oveit'
+            | 'PabblySubscriptionsBilling'
+            | 'Paddle'
+            | 'PagerDuty'
+            | 'PandaDoc'
+            | 'Paperform'
+            | 'Papersign'
+            | 'Pardot'
+            | 'Partnerize'
+            | 'PartnerStack'
+            | 'PayFit'
+            | 'Paylocity'
+            | 'PayPal'
+            | 'Paystack'
+            | 'PeecAI'
+            | 'Pendo'
+            | 'Pennylane'
+            | 'Perigon'
+            | 'Perk'
+            | 'PersistIq'
+            | 'Persona'
+            | 'Personio'
+            | 'Pexels'
+            | 'PgAnalyze'
+            | 'Phyllo'
+            | 'Picqer'
+            | 'Pinecone'
+            | 'Pingdom'
+            | 'PinterestAds'
+            | 'Pipedrive'
+            | 'Pipeliner'
+            | 'PivotalTracker'
+            | 'Piwik'
+            | 'Plaid'
+            | 'Plain'
+            | 'PlanetScale'
+            | 'Planhat'
+            | 'PlatformSh'
+            | 'Plausible'
+            | 'Plunk'
+            | 'Pocket'
+            | 'Podium'
+            | 'Polar'
+            | 'Polygon'
+            | 'Poplar'
+            | 'Postgres'
+            | 'Postmark'
+            | 'PrestaShop'
+            | 'Pretix'
+            | 'Primetric'
+            | 'Printify'
+            | 'Productboard'
+            | 'Productive'
+            | 'PromptingCompany'
+            | 'Pylon'
+            | 'PyPI'
+            | 'Qdrant'
+            | 'Qonto'
+            | 'Qualaroo'
+            | 'Qualtrics'
+            | 'QuickBooks'
+            | 'Railz'
+            | 'Ramp'
+            | 'Razorpay'
+            | 'RB2B'
+            | 'RDStationMarketing'
+            | 'Recharge'
+            | 'Recreation'
+            | 'Recruitee'
+            | 'Recurly'
+            | 'Reddit'
+            | 'RedditAds'
+            | 'Redis'
+            | 'Redshift'
+            | 'ReferralHero'
+            | 'Render'
+            | 'RentCast'
+            | 'Repairshopr'
+            | 'Replicate'
+            | 'ReplyIo'
+            | 'Resend'
+            | 'RetailExpress'
+            | 'RetellAI'
+            | 'Retently'
+            | 'RevenueCat'
+            | 'RevolutMerchant'
+            | 'RingCentral'
+            | 'Rippling'
+            | 'RKICovid'
+            | 'Roark'
+            | 'RocketChat'
+            | 'Rocketlane'
+            | 'Rollbar'
+            | 'Rootly'
+            | 'Rss'
+            | 'RudderStack'
+            | 'Ruddr'
+            | 'RunPod'
+            | 'SafetyCulture'
+            | 'SageHR'
+            | 'SageIntacct'
+            | 'Sailthru'
+            | 'Salesflare'
+            | 'Salesforce'
+            | 'SalesforceMarketingCloud'
+            | 'SalesLoft'
+            | 'Sanity'
+            | 'SapConcur'
+            | 'SapErp'
+            | 'SAPFieldglass'
+            | 'SapHana'
+            | 'SapSuccessFactors'
+            | 'SavvyCal'
+            | 'ScaleAI'
+            | 'Scaleway'
+            | 'SearchAds360'
+            | 'Secoda'
+            | 'Segment'
+            | 'SendGrid'
+            | 'Sendowl'
+            | 'SendPulse'
+            | 'Senseforce'
+            | 'Sentry'
+            | 'Serpstat'
+            | 'ServiceNow'
+            | 'SevenShifts'
+            | 'SFTP'
+            | 'SharePoint'
+            | 'Sharetribe'
+            | 'Shippo'
+            | 'ShipStation'
+            | 'Shopify'
+            | 'ShopWired'
+            | 'Shortcut'
+            | 'Shortio'
+            | 'Shutterstock'
+            | 'SigmaComputing'
+            | 'SignNow'
+            | 'SigNoz'
+            | 'Sim'
+            | 'SimFin'
+            | 'SimpleCast'
+            | 'Simplesat'
+            | 'Singular'
+            | 'Skyvern'
+            | 'Slack'
+            | 'Slash'
+            | 'Smaily'
+            | 'SmartEngage'
+            | 'Smartreach'
+            | 'Smartsheet'
+            | 'Smartwaiver'
+            | 'SnapchatAds'
+            | 'Snowflake'
+            | 'SolarwindsServiceDesk'
+            | 'SonarCloud'
+            | 'SparkPost'
+            | 'SplitIo'
+            | 'SpotifyAds'
+            | 'SpotlerCRM'
+            | 'Square'
+            | 'Squarespace'
+            | 'Statsig'
+            | 'Statuspage'
+            | 'Stigg'
+            | 'StockData'
+            | 'Strava'
+            | 'StreamElements'
+            | 'Streamlabs'
+            | 'Stripe'
+            | 'Sumsub'
+            | 'Supabase'
+            | 'Superwall'
+            | 'SurveyMonkey'
+            | 'SurveySparrow'
+            | 'Survicate'
+            | 'Svix'
+            | 'Swonkie'
+            | 'Synthesia'
+            | 'Systeme'
+            | 'Taboola'
+            | 'Talkwalker'
+            | 'Tavus'
+            | 'TawkTo'
+            | 'Teachable'
+            | 'Teamtailor'
+            | 'Teamwork'
+            | 'Telli'
+            | 'Tempo'
+            | 'TemporalIO'
+            | 'TerraApi'
+            | 'Testrail'
+            | 'Thinkific'
+            | 'ThinkificCourses'
+            | 'ThriveLearning'
+            | 'Ticketmaster'
+            | 'TicketTailor'
+            | 'TickTick'
+            | 'TikTokAds'
+            | 'Tile38'
+            | 'Timely'
+            | 'Tinyemail'
+            | 'TMDb'
+            | 'Todoist'
+            | 'TogetherAI'
+            | 'Toggl'
+            | 'TrackPMS'
+            | 'Trello'
+            | 'Tremendous'
+            | 'TriggerDev'
+            | 'TrustPilot'
+            | 'Turso'
+            | 'TVMaze'
+            | 'TwelveData'
+            | 'TwelveLabs'
+            | 'Twenty'
+            | 'Twilio'
+            | 'Twitter'
+            | 'TwitterAds'
+            | 'TyntecSMS'
+            | 'Typeform'
+            | 'Ubidots'
+            | 'Unleash'
+            | 'Unstructured'
+            | 'UpPromote'
+            | 'Upstash'
+            | 'Uptick'
+            | 'USCensus'
+            | 'Uservoice'
+            | 'Vantage'
+            | 'Vapi'
+            | 'Veeqo'
+            | 'Vellum'
+            | 'Vercel'
+            | 'Vespa'
+            | 'VismaEconomic'
+            | 'Vitally'
+            | 'Vultr'
+            | 'VWO'
+            | 'Waiteraid'
+            | 'Wasabi'
+            | 'Watchmode'
+            | 'Webflow'
+            | 'WhenIWork'
+            | 'WikipediaPageviews'
+            | 'Windmill'
+            | 'WooCommerce'
+            | 'Wordpress'
+            | 'Workable'
+            | 'Workday'
+            | 'Workflowmax'
+            | 'WorkOS'
+            | 'Workramp'
+            | 'Wrike'
+            | 'Writesonic'
+            | 'Wufoo'
+            | 'Xero'
+            | 'Xsolla'
+            | 'YahooFinance'
+            | 'YandexMetrica'
+            | 'Ynab'
+            | 'Yotpo'
+            | 'Younium'
+            | 'YouSign'
+            | 'YouTubeAnalytics'
+            | 'YoutubeData'
+            | 'ZapierSupportedStorage'
+            | 'ZapSign'
+            | 'Zellify'
+            | 'Zendesk'
+            | 'ZendeskSell'
+            | 'ZendeskSunshine'
+            | 'Zenefits'
+            | 'Zenloop'
+            | 'Zep'
+            | 'ZohoAnalytics'
+            | 'ZohoBigin'
+            | 'ZohoBilling'
+            | 'ZohoBooks'
+            | 'ZohoCampaign'
+            | 'ZohoCRM'
+            | 'ZohoDesk'
+            | 'ZohoExpense'
+            | 'ZohoInventory'
+            | 'ZohoInvoice'
+            | 'ZonkaFeedback'
+            | 'Zoom'
+            | 'ZoomInfo'
+            | 'Zuora'
+    }
+    onBack: () => {
+        value: true
+    }
+    onClear: () => {
+        value: true
+    }
+    onNext: () => {
+        value: true
+    }
+    onSubmit: () => {
+        value: true
+    }
+    openCdcSelfManagedSetupDialog: () => {
+        value: true
+    }
+    openSyncMethodModal: (schema: ExternalDataSourceSyncSchema) => {
+        schema: ExternalDataSourceSyncSchema
+    }
+    resetSourceConnectionDetails: (values?: Record<string, any>) => {
+        values?: Record<string, any>
+    }
+    resetSourceForm: (accessMethod?: 'direct' | 'warehouse') => {
+        accessMethod: 'direct' | 'warehouse' | undefined
+    }
+    resetWebhookFieldInputs: (values?: Record<string, any>) => {
+        values?: Record<string, any>
+    }
+    saveFormStateBeforeRedirect: () => {
+        value: true
+    }
+    selectConnector: (
+        connector: SourceConfig | null,
+        accessMethod?: 'direct' | 'warehouse'
+    ) => {
+        accessMethod: 'direct' | 'warehouse' | undefined
+        connector: SourceConfig | null
+    }
+    setDatabaseSchemas: (schemas: ExternalDataSourceSyncSchema[]) => {
+        schemas: ExternalDataSourceSyncSchema[]
+    }
+    setExpandedSchemaGroupKeys: (expandedSchemaKeys: string[]) => {
+        expandedSchemaKeys: string[]
+    }
+    setInitialConnector: (connector: SourceConfig | null) => {
+        connector: SourceConfig | null
+    }
+    setIsLoading: (isLoading: boolean) => {
+        isLoading: boolean
+    }
+    setManualLinkingProvider: (provider: ManualLinkSourceType) => {
+        provider: 'aws' | 'azure' | 'cloudflare-r2' | 'google-cloud'
+    }
+    setReturnConfig: (
+        returnUrl: string,
+        returnLabel: string
+    ) => {
+        returnLabel: string
+        returnUrl: string
+    }
+    setSchemaNameFilter: (schemaNameFilter: string) => {
+        schemaNameFilter: string
+    }
+    setSchemaRowFilters: (
+        schema: ExternalDataSourceSyncSchema,
+        rowFilters: RowFilter[] | null
+    ) => {
+        rowFilters: RowFilter[] | null
+        schema: ExternalDataSourceSyncSchema
+    }
+    setSchemaSyncedColumns: (
+        schema: ExternalDataSourceSyncSchema,
+        enabledColumns: string[] | null
+    ) => {
+        enabledColumns: string[] | null
+        schema: ExternalDataSourceSyncSchema
+    }
+    setSourceConnectionDetailsManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setSourceConnectionDetailsValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setSourceConnectionDetailsValues: (values: DeepPartial<Record<string, any>>) => {
+        values: DeepPartial<Record<string, any>>
+    }
+    setSourceId: (id: string) => {
+        sourceId: string
+    }
+    setStep: (step: number) => {
+        step: number
+    }
+    setWebhookFieldInputsManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setWebhookFieldInputsValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setWebhookFieldInputsValues: (values: DeepPartial<Record<string, any>>) => {
+        values: DeepPartial<Record<string, any>>
+    }
+    setWebhookResult: (result: WebhookCreateResult | null) => {
+        result: WebhookCreateResult | null
+    }
+    submitSourceConnectionDetails: () => {
+        value: boolean
+    }
+    submitSourceConnectionDetailsFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitSourceConnectionDetailsRequest: (sourceConnectionDetails: Record<string, any>) => {
+        sourceConnectionDetails: Record<string, any>
+    }
+    submitSourceConnectionDetailsSuccess: (sourceConnectionDetails: Record<string, any>) => {
+        sourceConnectionDetails: Record<string, any>
+    }
+    submitWebhookFieldInputs: () => {
+        value: boolean
+    }
+    submitWebhookFieldInputsFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitWebhookFieldInputsRequest: (webhookFieldInputs: Record<string, any>) => {
+        webhookFieldInputs: Record<string, any>
+    }
+    submitWebhookFieldInputsSuccess: (webhookFieldInputs: Record<string, any>) => {
+        webhookFieldInputs: Record<string, any>
+    }
+    submitWebhookFields: () => {
+        value: true
+    }
+    syncExpandedSchemaGroupKeys: (
+        groupedSchemaKeys: string[],
+        fingerprint: string
+    ) => {
+        fingerprint: string
+        groupedSchemaKeys: string[]
+    }
+    toggleAllTables: (
+        selectAll: boolean,
+        tableNames?: string[]
+    ) => {
+        selectAll: boolean
+        tableNames: string[] | undefined
+    }
+    toggleManualLinkFormVisible: (visible: boolean) => {
+        visible: boolean
+    }
+    toggleSchemaGroup: (
+        schemaName: string,
+        shouldSync: boolean
+    ) => {
+        schemaName: string
+        shouldSync: boolean
+    }
+    toggleSchemaShouldSync: (
+        schema: ExternalDataSourceSyncSchema,
+        shouldSync: boolean
+    ) => {
+        schema: ExternalDataSourceSyncSchema
+        shouldSync: boolean
+    }
+    touchAllSourceConnectionDetailsFields: () => {
+        value: true
+    }
+    touchSourceConnectionDetailsField: (key: string) => {
+        key: string
+    }
+    touchWebhookFieldInputsField: (key: string) => {
+        key: string
+    }
+    updateSchemaSyncType: (
+        schema: ExternalDataSourceSyncSchema,
+        syncType: ExternalDataSourceSyncSchema['sync_type'],
+        incrementalField: string | null,
+        incrementalFieldType: string | null,
+        primaryKeyColumns: string[] | null,
+        cdcTableMode?: 'both' | 'cdc_only' | 'consolidated',
+        incrementalFieldLookbackSeconds?: number | null
+    ) => {
+        cdcTableMode: 'both' | 'cdc_only' | 'consolidated' | undefined
+        incrementalField: string | null
+        incrementalFieldLookbackSeconds: number | null | undefined
+        incrementalFieldType: string | null
+        primaryKeyColumns: string[] | null
+        schema: ExternalDataSourceSyncSchema
+        syncType: 'append' | 'cdc' | 'full_refresh' | 'incremental' | 'webhook' | 'xmin' | null
+    }
+    updateSource: (source: Partial<ExternalDataSourceCreatePayload>) => {
+        source: Partial<ExternalDataSourceCreatePayload>
+    }
+    verifyCdcSelfManagedSetup: () => any
+    verifyCdcSelfManagedSetupFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    verifyCdcSelfManagedSetupSuccess: (
+        cdcSelfManagedVerifyResult: {
+            errors: string[]
+            valid: boolean
+        } | null,
+        payload?: any
+    ) => {
+        cdcSelfManagedVerifyResult: {
+            errors: string[]
+            valid: boolean
+        } | null
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sourceWizardLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        availableSources: (arg: any) => any
+        requiredTables: (arg: any) => any
+        defaultSourceConnectionDetails: (selectedConnector: SourceConfig | null) => Record<string, unknown>
+        suggestedTablesMap: (selectedConnector: SourceConfig | null) => Record<string, string | null>
+        breadcrumbs: (
+            selectedConnector: SourceConfig | null,
+            manualLinkingProvider: 'aws' | 'azure' | 'cloudflare-r2' | 'google-cloud' | null,
+            manualConnectors: {
+                name: string
+                type: ManualLinkSourceType
+            }[]
+        ) => Breadcrumb[]
+        hasWebhookSchemas: (databaseSchema: ExternalDataSourceSyncSchema[]) => boolean
+        webhookStepComplete: (
+            webhookResult: WebhookCreateResult | null,
+            selectedConnector: SourceConfig | null
+        ) => boolean
+        isManualLinkingSelected: (selectedConnector: SourceConfig | null) => boolean
+        isDirectQueryMode: (
+            source: {
+                access_method: 'direct' | 'warehouse'
+                description: string
+                payload: Record<string, any>
+                prefix: string
+            },
+            selectedConnector: SourceConfig | null
+        ) => boolean
+        canGoBack: (currentStep: number) => boolean
+        canGoNext: (
+            currentStep: number,
+            isManualLinkingSelected: boolean,
+            databaseSchema: ExternalDataSourceSyncSchema[],
+            isDirectQueryMode: boolean,
+            webhookStepComplete: boolean
+        ) => boolean
+        showSkipButton: (currentStep: number) => boolean
+        nextButtonText: (
+            currentStep: number,
+            isManualLinkingSelected: boolean,
+            isDirectQueryMode: boolean,
+            hasWebhookSchemas: boolean,
+            arg: any,
+            returnConfig: {
+                returnLabel: string
+                returnUrl: string
+            } | null,
+            sourceId: string | null
+        ) => string
+        showFooter: (selectedConnector: SourceConfig | null, isManualLinkFormVisible: boolean) => boolean | SourceConfig
+        connectors: (
+            dataWarehouseSources: PaginatedResponse<ExternalDataSource> | null,
+            availableSources: any
+        ) => SourceConfig[]
+        isSelfManagedSource: (
+            manualLinkingProvider: 'aws' | 'azure' | 'cloudflare-r2' | 'google-cloud' | null
+        ) => boolean
+        filteredDatabaseSchema: (
+            databaseSchema: ExternalDataSourceSyncSchema[],
+            schemaNameFilter: string
+        ) => ExternalDataSourceSyncSchema[]
+        tablesAllToggledOn: (filteredDatabaseSchema: ExternalDataSourceSyncSchema[]) => boolean | 'indeterminate'
+        configuredSchemaName: (source: {
+            access_method: 'direct' | 'warehouse'
+            description: string
+            payload: Record<string, any>
+            prefix: string
+        }) => string | null
+        groupedDatabaseSchema: (
+            filteredDatabaseSchema: ExternalDataSourceSyncSchema[],
+            configuredSchemaName: string | null
+        ) => {
+            schemaName: string
+            tables: ExternalDataSourceSyncSchema[]
+        }[]
+        schemaGroupKeys: (
+            groupedDatabaseSchema: {
+                schemaName: string
+                tables: ExternalDataSourceSyncSchema[]
+            }[]
+        ) => string[]
+        modalTitle: (
+            currentStep: number,
+            isDirectQueryMode: boolean
+        ) =>
+            | ''
+            | 'Importing your data...'
+            | 'Link your data source'
+            | 'Select tables to import'
+            | 'Select tables to query'
+            | 'Set up webhook'
+            | 'Tables ready to query'
+        isWrapped: (arg: any) => boolean
+    }
+}
+
+export type sourceWizardLogicType = MakeLogicType<
+    sourceWizardLogicValues,
+    sourceWizardLogicActions,
+    SourceWizardLogicProps,
+    sourceWizardLogicMeta
+>
+
 export const sourceWizardLogic = kea<sourceWizardLogicType>([
     path(['products', 'dataWarehouse', 'sourceWizardLogic']),
     props({} as SourceWizardLogicProps),
@@ -752,7 +2073,14 @@ export const sourceWizardLogic = kea<sourceWizardLogicType>([
         ],
         breadcrumbs: [
             (s) => [s.selectedConnector, s.manualLinkingProvider, s.manualConnectors],
-            (selectedConnector, manualLinkingProvider, manualConnectors): Breadcrumb[] => {
+            (
+                selectedConnector: SourceConfig | null,
+                manualLinkingProvider: ManualLinkSourceType | null,
+                manualConnectors: {
+                    name: string
+                    type: ManualLinkSourceType
+                }[]
+            ): Breadcrumb[] => {
                 return [
                     {
                         key: Scene.Sources,
@@ -793,15 +2121,25 @@ export const sourceWizardLogic = kea<sourceWizardLogicType>([
                 return requiredFields.length === 0
             },
         ],
-        isManualLinkingSelected: [(s) => [s.selectedConnector], (selectedConnector): boolean => !selectedConnector],
+        isManualLinkingSelected: [
+            (s) => [s.selectedConnector],
+            (selectedConnector: SourceConfig | null): boolean => !selectedConnector,
+        ],
         isDirectQueryMode: [
             (s) => [s.source, s.selectedConnector],
-            (source, selectedConnector): boolean =>
-                source.access_method === 'direct' && supportsDirectQuery(selectedConnector?.name),
+            (
+                source: {
+                    access_method: 'direct' | 'warehouse'
+                    description: string
+                    payload: Record<string, any>
+                    prefix: string
+                },
+                selectedConnector: SourceConfig | null
+            ): boolean => source.access_method === 'direct' && supportsDirectQuery(selectedConnector?.name),
         ],
         canGoBack: [
             (s) => [s.currentStep],
-            (currentStep): boolean => {
+            (currentStep: number): boolean => {
                 return currentStep !== 4 && currentStep !== 5
             },
         ],
@@ -813,7 +2151,13 @@ export const sourceWizardLogic = kea<sourceWizardLogicType>([
                 s.isDirectQueryMode,
                 s.webhookStepComplete,
             ],
-            (currentStep, isManualLinkingSelected, databaseSchema, isDirectQueryMode, webhookStepComplete): boolean => {
+            (
+                currentStep: number,
+                isManualLinkingSelected: boolean,
+                databaseSchema: ExternalDataSourceSyncSchema[],
+                isDirectQueryMode: boolean,
+                webhookStepComplete: boolean
+            ): boolean => {
                 if (isManualLinkingSelected && currentStep === 1) {
                     return false
                 }
@@ -839,7 +2183,7 @@ export const sourceWizardLogic = kea<sourceWizardLogicType>([
         ],
         showSkipButton: [
             (s) => [s.currentStep],
-            (currentStep): boolean => {
+            (currentStep: number): boolean => {
                 return currentStep === 5
             },
         ],
@@ -854,13 +2198,16 @@ export const sourceWizardLogic = kea<sourceWizardLogicType>([
                 s.sourceId,
             ],
             (
-                currentStep,
-                isManualLinkingSelected,
-                isDirectQueryMode,
-                hasWebhookSchemas,
+                currentStep: number,
+                isManualLinkingSelected: boolean,
+                isDirectQueryMode: boolean,
+                hasWebhookSchemas: boolean,
                 onComplete,
-                returnConfig,
-                sourceId
+                returnConfig: {
+                    returnLabel: string
+                    returnUrl: string
+                } | null,
+                sourceId: string | null
             ): string => {
                 if (currentStep === 3 && isManualLinkingSelected) {
                     return 'Link'
@@ -900,11 +2247,15 @@ export const sourceWizardLogic = kea<sourceWizardLogicType>([
         ],
         showFooter: [
             (s) => [s.selectedConnector, s.isManualLinkFormVisible],
-            (selectedConnector, isManualLinkFormVisible) => selectedConnector || isManualLinkFormVisible,
+            (selectedConnector: SourceConfig | null, isManualLinkFormVisible: boolean) =>
+                selectedConnector || isManualLinkFormVisible,
         ],
         connectors: [
             (s) => [s.dataWarehouseSources, s.availableSources],
-            (sources, availableSources: Record<string, SourceConfig>): SourceConfig[] => {
+            (
+                sources: null | import('lib/api').PaginatedResponse<import('~/types').ExternalDataSource>,
+                availableSources: Record<string, SourceConfig>
+            ): SourceConfig[] => {
                 if (!availableSources) {
                     return []
                 }
@@ -959,20 +2310,30 @@ export const sourceWizardLogic = kea<sourceWizardLogicType>([
         ],
         configuredSchemaName: [
             (s) => [s.source],
-            (source): string | null => (typeof source.payload.schema === 'string' ? source.payload.schema : null),
+            (source: {
+                access_method: 'direct' | 'warehouse'
+                description: string
+                payload: Record<string, any>
+                prefix: string
+            }): string | null => (typeof source.payload.schema === 'string' ? source.payload.schema : null),
         ],
         groupedDatabaseSchema: [
             (s) => [s.filteredDatabaseSchema, s.configuredSchemaName],
-            (filteredDatabaseSchema, configuredSchemaName) =>
+            (filteredDatabaseSchema: ExternalDataSourceSyncSchema[], configuredSchemaName: string | null) =>
                 groupTablesBySchema(filteredDatabaseSchema, (schema) => schema.table, configuredSchemaName),
         ],
         schemaGroupKeys: [
             (s) => [s.groupedDatabaseSchema],
-            (groupedDatabaseSchema) => getDefaultExpandedSchemaKeys(groupedDatabaseSchema),
+            (
+                groupedDatabaseSchema: {
+                    schemaName: string
+                    tables: ExternalDataSourceSyncSchema[]
+                }[]
+            ) => getDefaultExpandedSchemaKeys(groupedDatabaseSchema),
         ],
         modalTitle: [
             (s) => [s.currentStep, s.isDirectQueryMode],
-            (currentStep, isDirectQueryMode) => {
+            (currentStep: number, isDirectQueryMode: boolean) => {
                 if (currentStep === 1) {
                     return ''
                 }
diff --git a/products/data_warehouse/frontend/scenes/SchemaScene/columnAnnotationsLogic.ts b/products/data_warehouse/frontend/scenes/SchemaScene/columnAnnotationsLogic.ts
index fa4f4e003f26..c07845ddbe8d 100644
--- a/products/data_warehouse/frontend/scenes/SchemaScene/columnAnnotationsLogic.ts
+++ b/products/data_warehouse/frontend/scenes/SchemaScene/columnAnnotationsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -12,12 +12,64 @@ import {
 } from 'products/data_warehouse/frontend/generated/api'
 import { WarehouseColumnAnnotationApi } from 'products/data_warehouse/frontend/generated/api.schemas'
 
-import type { columnAnnotationsLogicType } from './columnAnnotationsLogicType'
-
 export interface ColumnAnnotationsLogicProps {
     tableId: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface columnAnnotationsLogicValues {
+    annotationByColumn: Record<string, WarehouseColumnAnnotationApi>
+    annotations: WarehouseColumnAnnotationApi[]
+    annotationsLoading: boolean
+    savingColumn: string | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface columnAnnotationsLogicActions {
+    loadAnnotations: () => any
+    loadAnnotationsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAnnotationsSuccess: (
+        annotations: WarehouseColumnAnnotationApi[],
+        payload?: any
+    ) => {
+        annotations: WarehouseColumnAnnotationApi[]
+        payload?: any
+    }
+    saveDescription: (
+        columnName: string,
+        description: string
+    ) => {
+        columnName: string
+        description: string
+    }
+    setSavingColumn: (columnName: string | null) => {
+        columnName: string | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface columnAnnotationsLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        annotationByColumn: (
+            annotations: WarehouseColumnAnnotationApi[]
+        ) => Record<string, WarehouseColumnAnnotationApi>
+    }
+}
+
+export type columnAnnotationsLogicType = MakeLogicType<
+    columnAnnotationsLogicValues,
+    columnAnnotationsLogicActions,
+    ColumnAnnotationsLogicProps,
+    columnAnnotationsLogicMeta
+>
+
 export const columnAnnotationsLogic = kea<columnAnnotationsLogicType>([
     props({} as ColumnAnnotationsLogicProps),
     key(({ tableId }) => tableId),
@@ -54,7 +106,7 @@ export const columnAnnotationsLogic = kea<columnAnnotationsLogicType>([
     selectors({
         annotationByColumn: [
             (s) => [s.annotations],
-            (annotations): Record<string, WarehouseColumnAnnotationApi> =>
+            (annotations: WarehouseColumnAnnotationApi[]): Record<string, WarehouseColumnAnnotationApi> =>
                 Object.fromEntries(annotations.map((annotation) => [annotation.column_name, annotation])),
         ],
     }),
diff --git a/products/data_warehouse/frontend/scenes/SchemaScene/schemaSceneLogic.ts b/products/data_warehouse/frontend/scenes/SchemaScene/schemaSceneLogic.ts
index f727ab2233d1..62c8606a48d3 100644
--- a/products/data_warehouse/frontend/scenes/SchemaScene/schemaSceneLogic.ts
+++ b/products/data_warehouse/frontend/scenes/SchemaScene/schemaSceneLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, urlToAction } from 'kea-router'
 import posthog from 'posthog-js'
@@ -22,8 +22,6 @@ import {
 
 import { cleanSourceId } from 'products/data_warehouse/frontend/utils'
 
-import type { schemaSceneLogicType } from './schemaSceneLogicType'
-
 export const SCHEMA_SCENE_TABS = ['configuration', 'metrics', 'history'] as const
 export type SchemaSceneTab = (typeof SCHEMA_SCENE_TABS)[number]
 
@@ -60,6 +58,118 @@ function buildSchemaUpdatePayload(schema: ExternalDataSourceSchema): Partial<Ext
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface schemaSceneLogicValues {
+    breadcrumbs: Breadcrumb[]
+    currentSection: SchemaConfigurationSection
+    currentTab: SchemaSceneTab
+    isProjectTime: boolean
+    refreshingSchemas: boolean
+    resyncingSchema: boolean
+    schema: ExternalDataSourceSchema | null
+    schemaData: ExternalDataSchemaWithSource | null
+    schemaDataLoading: boolean
+    schemaIncrementalFields: SchemaIncrementalFieldsResponse | null
+    schemaIncrementalFieldsLoading: boolean
+    sidePanelContext: SidePanelSceneContext | null
+    source: ExternalDataSource | null
+    supportsColumnSelection: boolean
+    supportsRowFilters: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface schemaSceneLogicActions {
+    _setCurrentSection: (section: SchemaConfigurationSection) => {
+        section: 'columns' | 'danger-zone' | 'descriptions' | 'details' | 'schedule' | 'sync-method'
+    }
+    _setCurrentTab: (tab: SchemaSceneTab) => {
+        tab: 'configuration' | 'history' | 'metrics'
+    }
+    cancelSchema: (schema: ExternalDataSourceSchema) => {
+        schema: ExternalDataSourceSchema
+    }
+    deleteTable: (schema: ExternalDataSourceSchema) => {
+        schema: ExternalDataSourceSchema
+    }
+    loadSchema: () => any
+    loadSchemaFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSchemaIncrementalFields: (schemaId: string) => string
+    loadSchemaIncrementalFieldsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSchemaIncrementalFieldsSuccess: (
+        schemaIncrementalFields: SchemaIncrementalFieldsResponse,
+        payload?: string
+    ) => {
+        schemaIncrementalFields: SchemaIncrementalFieldsResponse
+        payload?: string
+    }
+    loadSchemaSuccess: (
+        schemaData: ExternalDataSchemaWithSource | null,
+        payload?: any
+    ) => {
+        schemaData: ExternalDataSchemaWithSource | null
+        payload?: any
+    }
+    refreshSchemas: () => {
+        value: true
+    }
+    reloadSchema: (schema: ExternalDataSourceSchema) => {
+        schema: ExternalDataSourceSchema
+    }
+    resyncSchema: (schema: ExternalDataSourceSchema) => {
+        schema: ExternalDataSourceSchema
+    }
+    setCurrentSection: (section: SchemaConfigurationSection) => {
+        section: 'columns' | 'danger-zone' | 'descriptions' | 'details' | 'schedule' | 'sync-method'
+    }
+    setCurrentTab: (tab: SchemaSceneTab) => {
+        tab: 'configuration' | 'history' | 'metrics'
+    }
+    setIsProjectTime: (isProjectTime: boolean) => {
+        isProjectTime: boolean
+    }
+    setRefreshingSchemas: (refreshing: boolean) => {
+        refreshing: boolean
+    }
+    setResyncingSchema: (resyncing: boolean) => {
+        resyncing: boolean
+    }
+    updateSchema: (schema: ExternalDataSourceSchema) => {
+        schema: ExternalDataSourceSchema
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface schemaSceneLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        schema: (schemaData: ExternalDataSchemaWithSource | null) => ExternalDataSourceSchema | null
+        source: (schemaData: ExternalDataSchemaWithSource | null) => ExternalDataSource | null
+        supportsColumnSelection: (schemaData: ExternalDataSchemaWithSource | null) => boolean
+        supportsRowFilters: (schemaData: ExternalDataSchemaWithSource | null) => boolean
+        breadcrumbs: (schemaData: ExternalDataSchemaWithSource | null, arg: any) => Breadcrumb[]
+        sidePanelContext: (arg: any, schema: ExternalDataSourceSchema | null) => SidePanelSceneContext | null
+    }
+}
+
+export type schemaSceneLogicType = MakeLogicType<
+    schemaSceneLogicValues,
+    schemaSceneLogicActions,
+    SchemaSceneProps,
+    schemaSceneLogicMeta
+>
+
 export const schemaSceneLogic = kea<schemaSceneLogicType>([
     props({} as SchemaSceneProps),
     // Schema ids are globally unique, so keying on schemaId alone lets the scene and ConfigurationTab
@@ -151,25 +261,29 @@ export const schemaSceneLogic = kea<schemaSceneLogicType>([
         ],
     })),
     selectors({
-        schema: [(s) => [s.schemaData], (schemaData): ExternalDataSourceSchema | null => schemaData],
+        schema: [
+            (s) => [s.schemaData],
+            (schemaData: ExternalDataSchemaWithSource | null): ExternalDataSourceSchema | null => schemaData,
+        ],
         source: [
             (s) => [s.schemaData],
             // The summary carries exactly the fields the page reads (source_type, user_access_level,
             // supports_column_selection); cast to the full type so existing prop signatures are unchanged.
-            (schemaData): ExternalDataSource | null =>
+            (schemaData: ExternalDataSchemaWithSource | null): ExternalDataSource | null =>
                 (schemaData?.source ?? null) as unknown as ExternalDataSource | null,
         ],
         supportsColumnSelection: [
             (s) => [s.schemaData],
-            (schemaData): boolean => !!schemaData?.source?.supports_column_selection,
+            (schemaData: ExternalDataSchemaWithSource | null): boolean =>
+                !!schemaData?.source?.supports_column_selection,
         ],
         supportsRowFilters: [
             (s) => [s.schemaData],
-            (schemaData): boolean => !!schemaData?.source?.supports_row_filters,
+            (schemaData: ExternalDataSchemaWithSource | null): boolean => !!schemaData?.source?.supports_row_filters,
         ],
         breadcrumbs: [
             (s) => [s.schemaData, (_, props) => props.sourceId],
-            (schemaData, sourceId): Breadcrumb[] => {
+            (schemaData: ExternalDataSchemaWithSource | null, sourceId): Breadcrumb[] => {
                 return [
                     {
                         key: Scene.Sources,
@@ -193,7 +307,7 @@ export const schemaSceneLogic = kea<schemaSceneLogicType>([
         ],
         [SIDE_PANEL_CONTEXT_KEY]: [
             (s) => [(_, props) => props, s.schema],
-            (props, schema): SidePanelSceneContext | null => {
+            (props, schema: ExternalDataSourceSchema | null): SidePanelSceneContext | null => {
                 const id = cleanSourceId(props.sourceId)
                 if (!id || !schema) {
                     return null
diff --git a/products/data_warehouse/frontend/scenes/SourceConnectScene/sourceConnectSceneLogic.tsx b/products/data_warehouse/frontend/scenes/SourceConnectScene/sourceConnectSceneLogic.tsx
index d43610406555..a983b5648d0b 100644
--- a/products/data_warehouse/frontend/scenes/SourceConnectScene/sourceConnectSceneLogic.tsx
+++ b/products/data_warehouse/frontend/scenes/SourceConnectScene/sourceConnectSceneLogic.tsx
@@ -1,5 +1,6 @@
-import { actions, connect, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, path, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { urlToAction } from 'kea-router'
 import posthog from 'posthog-js'
 
@@ -16,7 +17,6 @@ import type { SourceCredentialApi } from 'products/warehouse_sources/frontend/ge
 
 import { availableSourcesLogic } from '../NewSourceScene/availableSourcesLogic'
 import { getErrorsForFields } from '../NewSourceScene/sourceWizardLogic'
-import type { sourceConnectSceneLogicType } from './sourceConnectSceneLogicType'
 
 // Carries the field whose file failed to read/parse so the submit handler can name it in the toast.
 class FileUploadParseError extends Error {
@@ -58,6 +58,91 @@ const buildCredentialsPayload = async (
     return payload
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sourceConnectSceneLogicValues {
+    availableSources: Record<string, SourceConfig> | null // availableSourcesLogic
+    availableSourcesLoading: boolean // availableSourcesLogic
+    breadcrumbs: Breadcrumb[]
+    credentialsForm: Record<string, any>
+    credentialsFormAllErrors: Record<string, any>
+    credentialsFormChanged: boolean
+    credentialsFormErrors: DeepPartialMap<Record<string, any>, ValidationErrorType>
+    credentialsFormHasErrors: boolean
+    credentialsFormManualErrors: Record<string, any>
+    credentialsFormTouched: boolean
+    credentialsFormTouches: Record<string, boolean>
+    credentialsFormValidationErrors: DeepPartialMap<Record<string, any>, ValidationErrorType>
+    isCredentialsFormSubmitting: boolean
+    isCredentialsFormValid: boolean
+    kind: string | null
+    showCredentialsFormErrors: boolean
+    sourceConfig: SourceConfig | null
+    storedCredential: SourceCredentialApi | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sourceConnectSceneLogicActions {
+    resetCredentialsForm: (values?: Record<string, any>) => {
+        values?: Record<string, any>
+    }
+    setCredentialsFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setCredentialsFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setCredentialsFormValues: (values: DeepPartial<Record<string, any>>) => {
+        values: DeepPartial<Record<string, any>>
+    }
+    setKind: (kind: string | null) => {
+        kind: string | null
+    }
+    setStoredCredential: (credential: SourceCredentialApi) => {
+        credential: SourceCredentialApi
+    }
+    submitCredentialsForm: () => {
+        value: boolean
+    }
+    submitCredentialsFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitCredentialsFormRequest: (credentialsForm: Record<string, any>) => {
+        credentialsForm: Record<string, any>
+    }
+    submitCredentialsFormSuccess: (credentialsForm: Record<string, any>) => {
+        credentialsForm: Record<string, any>
+    }
+    touchCredentialsFormField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sourceConnectSceneLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        sourceConfig: (
+            availableSources: Record<string, SourceConfig> | null,
+            kind: string | null
+        ) => SourceConfig | null
+        breadcrumbs: (sourceConfig: SourceConfig | null) => Breadcrumb[]
+    }
+}
+
+export type sourceConnectSceneLogicType = MakeLogicType<
+    sourceConnectSceneLogicValues,
+    sourceConnectSceneLogicActions,
+    Record<string, any>,
+    sourceConnectSceneLogicMeta
+>
+
 export const sourceConnectSceneLogic = kea<sourceConnectSceneLogicType>([
     path(['products', 'dataWarehouse', 'sourceConnectSceneLogic']),
     connect(() => ({
@@ -84,7 +169,7 @@ export const sourceConnectSceneLogic = kea<sourceConnectSceneLogicType>([
     selectors({
         sourceConfig: [
             (s) => [s.availableSources, s.kind],
-            (availableSources, kind): SourceConfig | null => {
+            (availableSources: Record<string, SourceConfig> | null, kind: string | null): SourceConfig | null => {
                 if (!availableSources || !kind) {
                     return null
                 }
@@ -97,7 +182,7 @@ export const sourceConnectSceneLogic = kea<sourceConnectSceneLogicType>([
         ],
         breadcrumbs: [
             (s) => [s.sourceConfig],
-            (sourceConfig): Breadcrumb[] => [
+            (sourceConfig: SourceConfig | null): Breadcrumb[] => [
                 {
                     key: Scene.Sources,
                     name: 'Sources',
diff --git a/products/data_warehouse/frontend/scenes/SourceScene/SourceScene.tsx b/products/data_warehouse/frontend/scenes/SourceScene/SourceScene.tsx
index 04d16b8e8376..c32dcbf48042 100644
--- a/products/data_warehouse/frontend/scenes/SourceScene/SourceScene.tsx
+++ b/products/data_warehouse/frontend/scenes/SourceScene/SourceScene.tsx
@@ -1,4 +1,5 @@
 import {
+    MakeLogicType,
     actions,
     BuiltLogic,
     kea,
@@ -34,7 +35,6 @@ import { ActivityScope, Breadcrumb, ExternalDataSource } from '~/types'
 
 import { cleanSourceId, isSelfManagedSourceId } from 'products/data_warehouse/frontend/utils'
 
-import type { sourceSceneLogicType } from './SourceSceneType'
 import { ConfigurationTab } from './tabs/ConfigurationTab'
 import { MetricsTab } from './tabs/MetricsTab'
 import { SchemasTab } from './tabs/SchemasTab'
@@ -63,6 +63,45 @@ export function shouldShowManagedSourceSyncsTab(
     return !!source && source.access_method !== 'direct'
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sourceSceneLogicValues {
+    breadcrumbName: string
+    breadcrumbs: Breadcrumb[]
+    currentTab: SourceSceneTab
+    logicProps: any
+    sidePanelContext: SidePanelSceneContext | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sourceSceneLogicActions {
+    _setCurrentTab: (tab: SourceSceneTab) => {
+        tab: 'configuration' | 'history' | 'metrics' | 'schemas' | 'syncs' | 'webhook'
+    }
+    setBreadcrumbName: (name: string) => {
+        name: string
+    }
+    setCurrentTab: (tab: SourceSceneTab) => {
+        tab: 'configuration' | 'history' | 'metrics' | 'schemas' | 'syncs' | 'webhook'
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sourceSceneLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        logicProps: (arg: any) => any
+        breadcrumbs: (breadcrumbName: string) => Breadcrumb[]
+        sidePanelContext: (arg: any) => SidePanelSceneContext | null
+    }
+}
+
+export type sourceSceneLogicType = MakeLogicType<
+    sourceSceneLogicValues,
+    sourceSceneLogicActions,
+    SourceSceneProps,
+    sourceSceneLogicMeta
+>
+
 export const sourceSceneLogic = kea<sourceSceneLogicType>([
     props({} as SourceSceneProps),
     key(({ id }: SourceSceneProps) => id),
@@ -92,7 +131,7 @@ export const sourceSceneLogic = kea<sourceSceneLogicType>([
         logicProps: [() => [(_, props) => props], (props) => props],
         breadcrumbs: [
             (s) => [s.breadcrumbName],
-            (breadcrumbName): Breadcrumb[] => {
+            (breadcrumbName: string): Breadcrumb[] => {
                 return [
                     {
                         key: Scene.Sources,
diff --git a/products/data_warehouse/frontend/scenes/SourceScene/syncMethodModalLogic.ts b/products/data_warehouse/frontend/scenes/SourceScene/syncMethodModalLogic.ts
index f6e8a58a48df..fc10c3261485 100644
--- a/products/data_warehouse/frontend/scenes/SourceScene/syncMethodModalLogic.ts
+++ b/products/data_warehouse/frontend/scenes/SourceScene/syncMethodModalLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -8,12 +8,90 @@ import api from 'lib/api'
 import { ExternalDataSourceSchema, SchemaIncrementalFieldsResponse } from '~/types'
 
 import { sourceManagementLogic } from '../../shared/logics/sourceManagementLogic'
-import type { syncMethodModalLogicType } from './syncMethodModalLogicType'
 
 export interface SyncMethodModalLogicProps {
     schema: ExternalDataSourceSchema
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface syncMethodModalLogicValues {
+    currentSyncMethodModalSchema: ExternalDataSourceSchema | null
+    saveButtonIsLoading: boolean
+    schemaIncrementalFields: SchemaIncrementalFieldsResponse | null
+    schemaIncrementalFieldsLoading: boolean
+    syncMethodModalIsOpen: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface syncMethodModalLogicActions {
+    loadSources: () => {
+        value: true
+    } // sourceManagementLogic
+    updateSchema: (schema: ExternalDataSourceSchema) => ExternalDataSourceSchema // sourceManagementLogic
+    updateSchemaFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    } // sourceManagementLogic
+    updateSchemaSuccess: (
+        schemas: null,
+        payload?: ExternalDataSourceSchema | undefined
+    ) => {
+        payload?: ExternalDataSourceSchema
+        schemas: null
+    } // sourceManagementLogic
+    closeSyncMethodModal: () => {
+        value: true
+    }
+    loadSchemaIncrementalFields: (schemaId: string) => string
+    loadSchemaIncrementalFieldsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSchemaIncrementalFieldsSuccess: (
+        schemaIncrementalFields: SchemaIncrementalFieldsResponse,
+        payload?: string
+    ) => {
+        schemaIncrementalFields: SchemaIncrementalFieldsResponse
+        payload?: string
+    }
+    openSyncMethodModal: (schema: ExternalDataSourceSchema) => {
+        schema: ExternalDataSourceSchema
+    }
+    resetSchemaIncrementalFields: () => any
+    resetSchemaIncrementalFieldsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    resetSchemaIncrementalFieldsSuccess: (
+        schemaIncrementalFields: null,
+        payload?: any
+    ) => {
+        schemaIncrementalFields: null
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface syncMethodModalLogicMeta {
+    key: string
+}
+
+export type syncMethodModalLogicType = MakeLogicType<
+    syncMethodModalLogicValues,
+    syncMethodModalLogicActions,
+    SyncMethodModalLogicProps,
+    syncMethodModalLogicMeta
+>
+
 export const syncMethodModalLogic = kea<syncMethodModalLogicType>([
     path(['products', 'dataWarehouse', 'syncMethodModalLogic']),
     props({ schema: {} } as SyncMethodModalLogicProps),
diff --git a/products/data_warehouse/frontend/scenes/SourceScene/tabs/sourceSettingsLogic.ts b/products/data_warehouse/frontend/scenes/SourceScene/tabs/sourceSettingsLogic.ts
index e6bbed80d023..1e6eeb24d026 100644
--- a/products/data_warehouse/frontend/scenes/SourceScene/tabs/sourceSettingsLogic.ts
+++ b/products/data_warehouse/frontend/scenes/SourceScene/tabs/sourceSettingsLogic.ts
@@ -1,5 +1,19 @@
-import { actions, afterMount, beforeUnmount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    afterMount,
+    beforeUnmount,
+    connect,
+    kea,
+    key,
+    listeners,
+    path,
+    props,
+    reducers,
+    selectors,
+} from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 import posthog from 'posthog-js'
@@ -29,7 +43,6 @@ import { sourcesDataLogic } from '../../../shared/logics/sourcesDataLogic'
 import { availableSourcesLogic } from '../../NewSourceScene/availableSourcesLogic'
 import { SSH_FIELD, getErrorsForFields } from '../../NewSourceScene/sourceWizardLogic'
 import { sourceSceneLogic } from '../SourceScene'
-import type { sourceSettingsLogicType } from './sourceSettingsLogicType'
 
 export interface SourceSettingsLogicProps {
     id: string
@@ -336,6 +349,307 @@ function reportBulkResult(verb: string, total: number, failed: number, skipped:
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sourceSettingsLogicValues {
+    availableSources: Record<string, SourceConfig> | null // availableSourcesLogic
+    canLoadMoreJobs: boolean
+    cdcStatus: CdcStatus | null
+    cdcStatusError: string | null
+    cdcStatusLoading: boolean
+    filteredSchemas: ExternalDataSourceSchema[]
+    frequencyFilter: DataWarehouseSyncInterval | null
+    groupedFilteredSchemas: {
+        schemaName: string
+        tables: ExternalDataSourceSchema[]
+    }[]
+    inProgressRowsBySchema: Record<string, number>
+    isProjectTime: boolean
+    isSourceConfigSubmitting: boolean
+    isSourceConfigValid: boolean
+    jobs: ExternalDataJob[]
+    jobsLoading: boolean
+    pollPauseCount: number
+    refreshingSchemas: boolean
+    schemaFilterOptions: {
+        frequencies: DataWarehouseSyncInterval[]
+        statuses: string[]
+        syncMethods: (Exclude<ExternalDataSourceSchema['sync_type'], null> | 'none')[]
+    }
+    schemaNameFilter: string
+    selectedSchemas: string[]
+    showEnabledSchemasOnly: boolean
+    showSourceConfigErrors: boolean
+    source: ExternalDataSource | null
+    sourceConfig: Record<string, any>
+    sourceConfigAllErrors: Record<string, any>
+    sourceConfigChanged: boolean
+    sourceConfigErrors: DeepPartialMap<Record<string, any>, ValidationErrorType>
+    sourceConfigHasErrors: boolean
+    sourceConfigLoading: boolean
+    sourceConfigManualErrors: Record<string, any>
+    sourceConfigTouched: boolean
+    sourceConfigTouches: Record<string, boolean>
+    sourceConfigValidationErrors: DeepPartialMap<Record<string, any>, ValidationErrorType>
+    sourceFieldConfig: SourceConfig | null
+    sourceId: string
+    sourceLoading: boolean
+    statusFilter: string | null
+    syncMethodFilter: string | null
+    syncingNow: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sourceSettingsLogicActions {
+    updateSource: (source: ExternalDataSource) => ExternalDataSource // sourcesDataLogic
+    bulkDeleteData: (schemas: ExternalDataSourceSchema[]) => {
+        schemas: ExternalDataSourceSchema[]
+    }
+    bulkDisable: (schemas: ExternalDataSourceSchema[]) => {
+        schemas: ExternalDataSourceSchema[]
+    }
+    bulkResync: (schemas: ExternalDataSourceSchema[]) => {
+        schemas: ExternalDataSourceSchema[]
+    }
+    bulkSetFrequency: (
+        schemas: ExternalDataSourceSchema[],
+        frequency: DataWarehouseSyncInterval
+    ) => {
+        frequency: DataWarehouseSyncInterval
+        schemas: ExternalDataSourceSchema[]
+    }
+    bulkSyncNow: (schemas: ExternalDataSourceSchema[]) => {
+        schemas: ExternalDataSourceSchema[]
+    }
+    cancelSchema: (schema: ExternalDataSourceSchema) => {
+        schema: ExternalDataSourceSchema
+    }
+    deleteTable: (schema: ExternalDataSourceSchema) => {
+        schema: ExternalDataSourceSchema
+    }
+    loadCdcStatus: () => any
+    loadCdcStatusFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadCdcStatusSuccess: (
+        cdcStatus: {
+            enabled: boolean
+            lag_bytes?: number | null | undefined
+            lag_critical_threshold_mb?: number | undefined
+            lag_warning_threshold_mb?: number | undefined
+            management_mode?: 'posthog' | 'self_managed' | undefined
+            publication_exists?: boolean | undefined
+            publication_name?: string | undefined
+            published_tables?: string[] | undefined
+            slot_exists?: boolean | undefined
+            slot_name?: string | undefined
+        },
+        payload?: any
+    ) => {
+        cdcStatus: {
+            enabled: boolean
+            lag_bytes?: number | null | undefined
+            lag_critical_threshold_mb?: number | undefined
+            lag_warning_threshold_mb?: number | undefined
+            management_mode?: 'posthog' | 'self_managed' | undefined
+            publication_exists?: boolean | undefined
+            publication_name?: string | undefined
+            published_tables?: string[] | undefined
+            slot_exists?: boolean | undefined
+            slot_name?: string | undefined
+        }
+        payload?: any
+    }
+    loadJobs: () => any
+    loadJobsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadJobsSuccess: (
+        jobs: ExternalDataJob[],
+        payload?: any
+    ) => {
+        jobs: ExternalDataJob[]
+        payload?: any
+    }
+    loadMoreJobs: () => any
+    loadMoreJobsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadMoreJobsSuccess: (
+        jobs: ExternalDataJob[],
+        payload?: any
+    ) => {
+        jobs: ExternalDataJob[]
+        payload?: any
+    }
+    loadSource: () => any
+    loadSourceFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSourceSuccess: (
+        source: ExternalDataSource | null,
+        payload?: any
+    ) => {
+        source: ExternalDataSource | null
+        payload?: any
+    }
+    pausePolling: () => {
+        value: true
+    }
+    refreshSchemas: () => {
+        value: true
+    }
+    reloadSchema: (schema: ExternalDataSourceSchema) => {
+        schema: ExternalDataSourceSchema
+    }
+    resetSourceConfig: (values?: Record<string, any>) => {
+        values?: Record<string, any>
+    }
+    resumePolling: () => {
+        value: true
+    }
+    resyncSchema: (schema: ExternalDataSourceSchema) => {
+        schema: ExternalDataSourceSchema
+    }
+    setCanLoadMoreJobs: (canLoadMoreJobs: boolean) => {
+        canLoadMoreJobs: boolean
+    }
+    setFrequencyFilter: (frequency: DataWarehouseSyncInterval | null) => {
+        frequency: DataWarehouseSyncInterval | null
+    }
+    setIsProjectTime: (isProjectTime: boolean) => {
+        isProjectTime: boolean
+    }
+    setRefreshingSchemas: (refreshing: boolean) => {
+        refreshing: boolean
+    }
+    setSchemaNameFilter: (schemaNameFilter: string) => {
+        schemaNameFilter: string
+    }
+    setSelectedSchemas: (schemaNames: string[]) => {
+        schemaNames: string[]
+    }
+    setShowEnabledSchemasOnly: (showEnabledSchemasOnly: boolean) => {
+        showEnabledSchemasOnly: boolean
+    }
+    setSourceConfigManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setSourceConfigValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setSourceConfigValues: (values: DeepPartial<Record<string, any>>) => {
+        values: DeepPartial<Record<string, any>>
+    }
+    setSourceId: (id: string) => {
+        id: string
+    }
+    setStatusFilter: (status: string | null) => {
+        status: string | null
+    }
+    setSyncMethodFilter: (syncMethod: string | null) => {
+        syncMethod: string | null
+    }
+    setSyncingNow: (syncing: boolean) => {
+        syncing: boolean
+    }
+    submitSourceConfig: () => {
+        value: boolean
+    }
+    submitSourceConfigFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitSourceConfigRequest: (sourceConfig: Record<string, any>) => {
+        sourceConfig: Record<string, any>
+    }
+    submitSourceConfigSuccess: (sourceConfig: Record<string, any>) => {
+        sourceConfig: Record<string, any>
+    }
+    syncNow: () => {
+        value: true
+    }
+    touchSourceConfigField: (key: string) => {
+        key: string
+    }
+    updateSchema: (schema: ExternalDataSourceSchema) => ExternalDataSourceSchema
+    updateSchemaFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject: any
+    }
+    updateSchemaSuccess: (
+        source: ExternalDataSource | null,
+        payload?: ExternalDataSourceSchema
+    ) => {
+        payload: ExternalDataSourceSchema | undefined
+        source: ExternalDataSource | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sourceSettingsLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        sourceFieldConfig: (
+            source: ExternalDataSource | null,
+            availableSources: Record<string, SourceConfig> | null
+        ) => SourceConfig | null
+        inProgressRowsBySchema: (jobs: ExternalDataJob[]) => Record<string, number>
+        filteredSchemas: (
+            source: ExternalDataSource | null,
+            showEnabledSchemasOnly: boolean,
+            schemaNameFilter: string,
+            statusFilter: string | null,
+            syncMethodFilter: string | null,
+            frequencyFilter: DataWarehouseSyncInterval | null
+        ) => ExternalDataSourceSchema[]
+        groupedFilteredSchemas: (
+            filteredSchemas: ExternalDataSourceSchema[],
+            source: ExternalDataSource | null
+        ) => {
+            schemaName: string
+            tables: ExternalDataSourceSchema[]
+        }[]
+        schemaFilterOptions: (source: ExternalDataSource | null) => {
+            frequencies: DataWarehouseSyncInterval[]
+            statuses: string[]
+            syncMethods: (Exclude<ExternalDataSourceSchema['sync_type'], null> | 'none')[]
+        }
+    }
+}
+
+export type sourceSettingsLogicType = MakeLogicType<
+    sourceSettingsLogicValues,
+    sourceSettingsLogicActions,
+    SourceSettingsLogicProps,
+    sourceSettingsLogicMeta
+>
+
 export const sourceSettingsLogic = kea<sourceSettingsLogicType>([
     path(['products', 'dataWarehouse', 'sourceSettingsLogic']),
     props({} as SourceSettingsLogicProps),
@@ -572,7 +886,7 @@ export const sourceSettingsLogic = kea<sourceSettingsLogicType>([
     selectors({
         sourceFieldConfig: [
             (s) => [s.source, s.availableSources],
-            (source, availableSources) => {
+            (source: ExternalDataSource | null, availableSources: Record<string, SourceConfig> | null) => {
                 if (!source || !availableSources) {
                     return null
                 }
@@ -585,7 +899,7 @@ export const sourceSettingsLogic = kea<sourceSettingsLogicType>([
         // the table column has nothing to render, so we fall back to the running job's rows_synced.
         inProgressRowsBySchema: [
             (s) => [s.jobs],
-            (jobs): Record<string, number> => {
+            (jobs: ExternalDataJob[]): Record<string, number> => {
                 const map: Record<string, number> = {}
                 // jobs arrive newest-first; keep the first (latest) running job per schema.
                 for (const job of jobs) {
@@ -606,12 +920,12 @@ export const sourceSettingsLogic = kea<sourceSettingsLogicType>([
                 s.frequencyFilter,
             ],
             (
-                source,
-                showEnabledSchemasOnly,
-                schemaNameFilter,
-                statusFilter,
-                syncMethodFilter,
-                frequencyFilter
+                source: ExternalDataSource | null,
+                showEnabledSchemasOnly: boolean,
+                schemaNameFilter: string,
+                statusFilter: string | null,
+                syncMethodFilter: string | null,
+                frequencyFilter: DataWarehouseSyncInterval | null
             ): ExternalDataSourceSchema[] => {
                 if (!source?.schemas) {
                     return []
@@ -643,7 +957,10 @@ export const sourceSettingsLogic = kea<sourceSettingsLogicType>([
         // produce one group and render as a flat table.
         groupedFilteredSchemas: [
             (s) => [s.filteredSchemas, s.source],
-            (filteredSchemas, source): { schemaName: string; tables: ExternalDataSourceSchema[] }[] =>
+            (
+                filteredSchemas: ExternalDataSourceSchema[],
+                source: ExternalDataSource | null
+            ): { schemaName: string; tables: ExternalDataSourceSchema[] }[] =>
                 groupTablesBySchema(
                     filteredSchemas,
                     (schema) => schema.name,
@@ -654,7 +971,7 @@ export const sourceSettingsLogic = kea<sourceSettingsLogicType>([
         schemaFilterOptions: [
             (s) => [s.source],
             (
-                source
+                source: ExternalDataSource | null
             ): {
                 statuses: string[]
                 syncMethods: (Exclude<ExternalDataSourceSchema['sync_type'], null> | 'none')[]
diff --git a/products/data_warehouse/frontend/scenes/SourceScene/tabs/webhookTabLogic.ts b/products/data_warehouse/frontend/scenes/SourceScene/tabs/webhookTabLogic.ts
index f286c6b44dc2..819365372962 100644
--- a/products/data_warehouse/frontend/scenes/SourceScene/tabs/webhookTabLogic.ts
+++ b/products/data_warehouse/frontend/scenes/SourceScene/tabs/webhookTabLogic.ts
@@ -1,5 +1,6 @@
-import { actions, afterMount, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 
@@ -13,7 +14,6 @@ import { ExternalDataSource, WebhookInfo } from '~/types'
 import type { WebhookCreateResult } from '../../../shared/components/forms/WebhookSetupForm'
 import { getErrorsForFields } from '../../NewSourceScene/sourceWizardLogic'
 import { sourceSettingsLogic } from './sourceSettingsLogic'
-import type { webhookTabLogicType } from './webhookTabLogicType'
 
 export interface WebhookTabLogicProps {
     id: string
@@ -23,6 +23,155 @@ export const WEBHOOK_SECTIONS = ['overview', 'configuration', 'activity'] as con
 export type WebhookSection = (typeof WEBHOOK_SECTIONS)[number]
 export const DEFAULT_WEBHOOK_SECTION: WebhookSection = 'overview'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface webhookTabLogicValues {
+    canDeleteWebhook: boolean
+    createWebhookResult: WebhookCreateResult | null
+    currentSection: WebhookSection
+    externalStateLabel: {
+        label: string
+        tagType: 'danger' | 'default' | 'success' | 'warning'
+    }
+    hasWebhookSchemas: boolean
+    internalStateLabel: {
+        label: string
+        tagType: 'danger' | 'default' | 'success' | 'warning'
+    }
+    isWebhookFieldInputsSubmitting: boolean
+    isWebhookFieldInputsValid: boolean
+    mappedTables: {
+        objectType: string
+        tableName: string
+    }[]
+    showWebhookFieldInputsErrors: boolean
+    source: ExternalDataSource | null
+    sourceConfig: SourceConfig | null
+    webhookCreating: boolean
+    webhookDeleting: boolean
+    webhookFieldInputs: Record<string, any>
+    webhookFieldInputsAllErrors: Record<string, any>
+    webhookFieldInputsChanged: boolean
+    webhookFieldInputsErrors: DeepPartialMap<Record<string, any>, ValidationErrorType>
+    webhookFieldInputsHasErrors: boolean
+    webhookFieldInputsManualErrors: Record<string, any>
+    webhookFieldInputsTouched: boolean
+    webhookFieldInputsTouches: Record<string, boolean>
+    webhookFieldInputsValidationErrors: DeepPartialMap<Record<string, any>, ValidationErrorType>
+    webhookInfo: WebhookInfo | null
+    webhookInfoLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface webhookTabLogicActions {
+    _setCurrentSection: (section: WebhookSection) => {
+        section: 'activity' | 'configuration' | 'overview'
+    }
+    createWebhook: () => {
+        value: true
+    }
+    deleteWebhook: () => {
+        value: true
+    }
+    loadWebhookInfo: () => any
+    loadWebhookInfoFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadWebhookInfoSuccess: (
+        webhookInfo: WebhookInfo,
+        payload?: any
+    ) => {
+        webhookInfo: WebhookInfo
+        payload?: any
+    }
+    resetWebhookFieldInputs: (values?: Record<string, any>) => {
+        values?: Record<string, any>
+    }
+    setCreateWebhookResult: (result: WebhookCreateResult | null) => {
+        result: WebhookCreateResult | null
+    }
+    setCurrentSection: (section: WebhookSection) => {
+        section: 'activity' | 'configuration' | 'overview'
+    }
+    setWebhookCreating: (creating: boolean) => {
+        creating: boolean
+    }
+    setWebhookDeleting: (deleting: boolean) => {
+        deleting: boolean
+    }
+    setWebhookFieldInputsManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setWebhookFieldInputsValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setWebhookFieldInputsValues: (values: DeepPartial<Record<string, any>>) => {
+        values: DeepPartial<Record<string, any>>
+    }
+    submitWebhookFieldInputs: () => {
+        value: boolean
+    }
+    submitWebhookFieldInputsFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitWebhookFieldInputsRequest: (webhookFieldInputs: Record<string, any>) => {
+        webhookFieldInputs: Record<string, any>
+    }
+    submitWebhookFieldInputsSuccess: (webhookFieldInputs: Record<string, any>) => {
+        webhookFieldInputs: Record<string, any>
+    }
+    submitWebhookFields: () => {
+        value: true
+    }
+    touchWebhookFieldInputsField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface webhookTabLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        source: (arg: ExternalDataSource | null) => ExternalDataSource | null
+        sourceConfig: (arg: SourceConfig | null) => SourceConfig | null
+        internalStateLabel: (webhookInfo: WebhookInfo | null) => {
+            label: string
+            tagType: 'danger' | 'default' | 'success' | 'warning'
+        }
+        externalStateLabel: (webhookInfo: WebhookInfo | null) => {
+            label: string
+            tagType: 'danger' | 'default' | 'success' | 'warning'
+        }
+        hasWebhookSchemas: (source: ExternalDataSource | null) => boolean
+        canDeleteWebhook: (webhookInfo: WebhookInfo | null, hasWebhookSchemas: boolean) => boolean
+        mappedTables: (
+            webhookInfo: WebhookInfo | null,
+            source: ExternalDataSource | null
+        ) => {
+            objectType: string
+            tableName: string
+        }[]
+    }
+}
+
+export type webhookTabLogicType = MakeLogicType<
+    webhookTabLogicValues,
+    webhookTabLogicActions,
+    WebhookTabLogicProps,
+    webhookTabLogicMeta
+>
+
 export const webhookTabLogic = kea<webhookTabLogicType>([
     props({} as WebhookTabLogicProps),
     key(({ id }: WebhookTabLogicProps) => id),
diff --git a/products/data_warehouse/frontend/scenes/SourcesScene/sourcesSceneLogic.ts b/products/data_warehouse/frontend/scenes/SourcesScene/sourcesSceneLogic.ts
index 221897ba159b..733a1a183459 100644
--- a/products/data_warehouse/frontend/scenes/SourcesScene/sourcesSceneLogic.ts
+++ b/products/data_warehouse/frontend/scenes/SourcesScene/sourcesSceneLogic.ts
@@ -1,8 +1,9 @@
-import { kea, path } from 'kea'
+import { MakeLogicType, kea, path } from 'kea'
 
 import { Breadcrumb } from '~/types'
 
-import type { sourcesSceneLogicType } from './sourcesSceneLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export type sourcesSceneLogicType = MakeLogicType<{}, {}>
 
 export const sourcesSceneLogic = kea<sourcesSceneLogicType>([
     path(['products', 'dataWarehouse', 'sourcesSceneLogic']),
diff --git a/products/data_warehouse/frontend/shared/components/forms/customSourceManifestBuilderLogic.ts b/products/data_warehouse/frontend/shared/components/forms/customSourceManifestBuilderLogic.ts
index b385087b4b85..96d5e8374fc0 100644
--- a/products/data_warehouse/frontend/shared/components/forms/customSourceManifestBuilderLogic.ts
+++ b/products/data_warehouse/frontend/shared/components/forms/customSourceManifestBuilderLogic.ts
@@ -1,4 +1,5 @@
 import {
+    MakeLogicType,
     actions,
     afterMount,
     kea,
@@ -10,6 +11,7 @@ import {
     selectors,
     sharedListeners,
 } from 'kea'
+import type { BreakPointFunction } from 'kea'
 import type { FieldName } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 
@@ -33,7 +35,7 @@ import {
     type TableForm,
     updateTableInList,
 } from './customSourceManifest'
-import type { customSourceManifestBuilderLogicType } from './customSourceManifestBuilderLogicType'
+import type { AuthSecrets } from './customSourceManifest'
 
 export interface CustomSourceManifestBuilderLogicProps {
     /** Saved manifest JSON, supplied on the configuration page; undefined in the wizard. */
@@ -47,6 +49,120 @@ export interface CustomSourceManifestBuilderLogicProps {
     setValue: (path: FieldName, value: unknown) => void
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface customSourceManifestBuilderLogicValues {
+    authSecrets: AuthSecrets
+    docsUrl: string
+    draftResult: DraftCustomManifestResponseApi | null
+    draftResultLoading: boolean
+    hasContent: boolean
+    manifestJson: string
+    manifestPreviewOpen: boolean
+    manifestState: ManifestState
+    showBuilder: boolean
+    sourceName: string
+    userHasEdited: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface customSourceManifestBuilderLogicActions {
+    addHeader: () => {
+        value: true
+    }
+    addTable: () => {
+        value: true
+    }
+    generateFromDocs: () => any
+    generateFromDocsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    generateFromDocsSuccess: (
+        draftResult: DraftCustomManifestResponseApi | null,
+        payload?: any
+    ) => {
+        draftResult: DraftCustomManifestResponseApi | null
+        payload?: any
+    }
+    removeHeader: (index: number) => {
+        index: number
+    }
+    removeTable: (index: number) => {
+        index: number
+    }
+    setDocsUrl: (docsUrl: string) => {
+        docsUrl: string
+    }
+    setManifestPreviewOpen: (open: boolean) => {
+        open: boolean
+    }
+    setManifestState: (state: ManifestState) => {
+        state: ManifestState
+    }
+    setShowBuilder: (showBuilder: boolean) => {
+        showBuilder: boolean
+    }
+    setSourceName: (sourceName: string) => {
+        sourceName: string
+    }
+    syncToOuterForm: () => {
+        value: true
+    }
+    updateHeader: (
+        index: number,
+        patch: Partial<HeaderEntry>
+    ) => {
+        index: number
+        patch: Partial<HeaderEntry>
+    }
+    updatePaginator: (
+        index: number,
+        paginator: Paginator
+    ) => {
+        index: number
+        paginator: Paginator
+    }
+    updateState: (patch: Partial<ManifestState>) => {
+        patch: Partial<ManifestState>
+    }
+    updateTable: (
+        index: number,
+        patch: Partial<TableForm>
+    ) => {
+        index: number
+        patch: Partial<TableForm>
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface customSourceManifestBuilderLogicMeta {
+    sharedListeners: {
+        pushManifestToOuterForm: (
+            payload: any,
+            breakpoint: BreakPointFunction,
+            action: {
+                type: string
+                payload: any
+            },
+            previousState: any
+        ) => void | Promise<void>
+    }
+    __keaTypeGenInternalSelectorTypes: {
+        manifestJson: (manifestState: ManifestState) => string
+        authSecrets: (manifestState: ManifestState) => AuthSecrets
+    }
+}
+
+export type customSourceManifestBuilderLogicType = MakeLogicType<
+    customSourceManifestBuilderLogicValues,
+    customSourceManifestBuilderLogicActions,
+    CustomSourceManifestBuilderLogicProps,
+    customSourceManifestBuilderLogicMeta
+>
+
 /**
  * Owns the Custom REST source's manifest-builder form state (base URL, auth,
  * headers, tables) and mirrors it into the outer source form as
@@ -204,8 +320,11 @@ export const customSourceManifestBuilderLogic = kea<customSourceManifestBuilderL
         ],
     })),
     selectors({
-        manifestJson: [(s) => [s.manifestState], (state): string => JSON.stringify(buildManifest(state), null, 2)],
-        authSecrets: [(s) => [s.manifestState], (state) => extractAuthSecrets(state)],
+        manifestJson: [
+            (s) => [s.manifestState],
+            (state: ManifestState): string => JSON.stringify(buildManifest(state), null, 2),
+        ],
+        authSecrets: [(s) => [s.manifestState], (state: ManifestState) => extractAuthSecrets(state)],
     }),
     sharedListeners(({ values, props }) => ({
         pushManifestToOuterForm: () => {
diff --git a/products/data_warehouse/frontend/shared/logics/joinsLogic.ts b/products/data_warehouse/frontend/shared/logics/joinsLogic.ts
index c0c97f7b4542..711183d1f5d7 100644
--- a/products/data_warehouse/frontend/shared/logics/joinsLogic.ts
+++ b/products/data_warehouse/frontend/shared/logics/joinsLogic.ts
@@ -1,4 +1,4 @@
-import { afterMount, connect, kea, path, selectors } from 'kea'
+import { MakeLogicType, afterMount, connect, kea, path, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -7,7 +7,7 @@ import { databaseTableListLogic } from 'scenes/data-management/database/database
 import { DatabaseSerializedFieldType } from '~/queries/schema/schema-general'
 import { DataWarehouseViewLink, PropertyDefinition, PropertyType } from '~/types'
 
-import type { joinsLogicType } from './joinsLogicType'
+import type { DatabaseSchemaTable } from '../../../../../frontend/src/queries/schema/schema-general'
 
 const TYPE_MAPPING: Partial<Record<DatabaseSerializedFieldType, PropertyType>> = {
     datetime: PropertyType.DateTime,
@@ -19,6 +19,60 @@ const TYPE_MAPPING: Partial<Record<DatabaseSerializedFieldType, PropertyType>> =
     array: PropertyType.StringArray,
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface joinsLogicValues {
+    allTablesMap: Record<string, DatabaseSchemaTable> // databaseTableListLogic
+    columnsJoinedToPersons: PropertyDefinition[]
+    joins: DataWarehouseViewLink[]
+    joinsLoading: boolean
+    personTableJoins: DataWarehouseViewLink[]
+    tablesJoinedToPersons: {
+        join: DataWarehouseViewLink
+        table: DatabaseSchemaTable
+    }[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface joinsLogicActions {
+    loadJoins: () => any
+    loadJoinsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadJoinsSuccess: (
+        joins: DataWarehouseViewLink[],
+        payload?: any
+    ) => {
+        joins: DataWarehouseViewLink[]
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface joinsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        personTableJoins: (joins: DataWarehouseViewLink[]) => DataWarehouseViewLink[]
+        tablesJoinedToPersons: (
+            allTablesMap: Record<string, DatabaseSchemaTable>,
+            personTableJoins: DataWarehouseViewLink[]
+        ) => {
+            join: DataWarehouseViewLink
+            table: DatabaseSchemaTable
+        }[]
+        columnsJoinedToPersons: (
+            tablesJoinedToPersons: {
+                join: DataWarehouseViewLink
+                table: DatabaseSchemaTable
+            }[]
+        ) => PropertyDefinition[]
+    }
+}
+
+export type joinsLogicType = MakeLogicType<joinsLogicValues, joinsLogicActions, Record<string, any>, joinsLogicMeta>
+
 export const joinsLogic = kea<joinsLogicType>([
     path(['products', 'dataWarehouse', 'joinsLogic']),
     loaders({
@@ -36,10 +90,16 @@ export const joinsLogic = kea<joinsLogicType>([
         values: [databaseTableListLogic, ['allTablesMap']],
     })),
     selectors({
-        personTableJoins: [(s) => [s.joins], (joins) => joins.filter((join) => join.source_table_name === 'persons')],
+        personTableJoins: [
+            (s) => [s.joins],
+            (joins: DataWarehouseViewLink[]) => joins.filter((join) => join.source_table_name === 'persons'),
+        ],
         tablesJoinedToPersons: [
             (s) => [s.allTablesMap, s.personTableJoins],
-            (allTablesMap, personTableJoins) => {
+            (
+                allTablesMap: Record<string, import('~/queries/schema').DatabaseSchemaTable>,
+                personTableJoins: DataWarehouseViewLink[]
+            ) => {
                 return personTableJoins.map((join: DataWarehouseViewLink) => {
                     // valid join should have a joining table name
                     const table = allTablesMap[join.joining_table_name as string]
@@ -53,7 +113,12 @@ export const joinsLogic = kea<joinsLogicType>([
         ],
         columnsJoinedToPersons: [
             (s) => [s.tablesJoinedToPersons],
-            (tablesJoinedToPersons) => {
+            (
+                tablesJoinedToPersons: {
+                    join: DataWarehouseViewLink
+                    table: import('~/queries/schema').DatabaseSchemaTable
+                }[]
+            ) => {
                 return tablesJoinedToPersons.reduce((acc, { table, join }) => {
                     if (table) {
                         acc.push(
diff --git a/products/data_warehouse/frontend/shared/logics/sourceManagementLogic.ts b/products/data_warehouse/frontend/shared/logics/sourceManagementLogic.ts
index 3e041fa4856a..4d9ecd12e338 100644
--- a/products/data_warehouse/frontend/shared/logics/sourceManagementLogic.ts
+++ b/products/data_warehouse/frontend/shared/logics/sourceManagementLogic.ts
@@ -1,4 +1,15 @@
-import { actions, afterMount, beforeUnmount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    afterMount,
+    beforeUnmount,
+    connect,
+    kea,
+    listeners,
+    path,
+    reducers,
+    selectors,
+} from 'kea'
 import { loaders } from 'kea-loaders'
 import { router, urlToAction } from 'kea-router'
 import posthog from 'posthog-js'
@@ -18,13 +29,171 @@ import {
     ExternalDataSourceSchema,
 } from '~/types'
 
+import type { PaginatedResponse } from '../../../../../frontend/src/lib/api'
+import type {
+    DatabaseSchemaQueryResponse,
+    SourceConfig,
+} from '../../../../../frontend/src/queries/schema/schema-general'
+import type { ExternalDataSourceRevenueAnalyticsConfig } from '../../../../../frontend/src/types'
 import { availableSourcesLogic } from '../../scenes/NewSourceScene/availableSourcesLogic'
 import { joinsLogic } from './joinsLogic'
-import type { sourceManagementLogicType } from './sourceManagementLogicType'
 import { sourcesDataLogic } from './sourcesDataLogic'
 
 const REFRESH_INTERVAL = 10000
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sourceManagementLogicValues {
+    availableSources: Record<string, SourceConfig> | null // availableSourcesLogic
+    dataWarehouseTables: DatabaseSchemaDataWarehouseTable[] // databaseTableListLogic
+    database: Required<DatabaseSchemaQueryResponse> | null // databaseTableListLogic
+    dataWarehouseSources: PaginatedResponse<ExternalDataSource> | null // sourcesDataLogic
+    dataWarehouseSourcesLoading: boolean // sourcesDataLogic
+    filteredManagedSources: ExternalDataSource[]
+    filteredSelfManagedTables: DatabaseSchemaDataWarehouseTable[]
+    hasZendeskSource: boolean
+    managedSearchTerm: string
+    managedSources: ExternalDataSource[]
+    managedSourcesFuse: Fuse<ExternalDataSource>
+    schemaReloadingById: Record<string, boolean>
+    schemas: null
+    schemasLoading: boolean
+    searchTerm: string
+    selfManagedTables: DatabaseSchemaDataWarehouseTable[]
+    sourceReloadingById: Record<string, boolean>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sourceManagementLogicActions {
+    loadDatabase: (
+        args_0?:
+            | {
+                  force?: boolean
+              }
+            | undefined
+    ) => {
+        force?: boolean
+    } // databaseTableListLogic
+    loadJoins: () => any // joinsLogic
+    loadSources: () => {
+        value: true
+    } // sourcesDataLogic
+    loadSourcesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    } // sourcesDataLogic
+    loadSourcesSuccess: (
+        dataWarehouseSources:
+            | PaginatedResponse<ExternalDataSource>
+            | {
+                  count: number
+                  next: null
+                  previous: null
+                  results: never[]
+              },
+        payload?:
+            | {
+                  value: true
+              }
+            | undefined
+    ) => {
+        dataWarehouseSources:
+            | PaginatedResponse<ExternalDataSource>
+            | {
+                  count: number
+                  next: null
+                  previous: null
+                  results: never[]
+              }
+        payload?: {
+            value: true
+        }
+    } // sourcesDataLogic
+    updateSource: (source: ExternalDataSource) => ExternalDataSource // sourcesDataLogic
+    updateSourceRevenueAnalyticsConfig: (args_0: {
+        config: Partial<ExternalDataSourceRevenueAnalyticsConfig>
+        source: ExternalDataSource
+    }) => {
+        config: Partial<ExternalDataSourceRevenueAnalyticsConfig>
+        source: ExternalDataSource
+    } // sourcesDataLogic
+    deleteJoin: (join: DataWarehouseViewLink) => {
+        join: DataWarehouseViewLink
+    }
+    deleteSelfManagedTable: (tableId: string) => {
+        tableId: string
+    }
+    deleteSource: (source: ExternalDataSource) => {
+        source: ExternalDataSource
+    }
+    refreshSelfManagedTableSchema: (tableId: string) => {
+        tableId: string
+    }
+    reloadSource: (source: ExternalDataSource) => {
+        source: ExternalDataSource
+    }
+    schemaLoadingFinished: (schema: ExternalDataSourceSchema) => {
+        schema: ExternalDataSourceSchema
+    }
+    setManagedSearchTerm: (managedSearchTerm: string) => {
+        managedSearchTerm: string
+    }
+    setSearchTerm: (searchTerm: string) => {
+        searchTerm: string
+    }
+    sourceLoadingFinished: (source: ExternalDataSource) => {
+        source: ExternalDataSource
+    }
+    updateSchema: (schema: ExternalDataSourceSchema) => ExternalDataSourceSchema
+    updateSchemaFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateSchemaSuccess: (
+        schemas: null,
+        payload?: ExternalDataSourceSchema
+    ) => {
+        schemas: null
+        payload?: ExternalDataSourceSchema
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sourceManagementLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        selfManagedTables: (
+            dataWarehouseTables: DatabaseSchemaDataWarehouseTable[]
+        ) => DatabaseSchemaDataWarehouseTable[]
+        filteredSelfManagedTables: (
+            selfManagedTables: DatabaseSchemaDataWarehouseTable[],
+            searchTerm: string
+        ) => DatabaseSchemaDataWarehouseTable[]
+        managedSources: (dataWarehouseSources: PaginatedResponse<ExternalDataSource> | null) => ExternalDataSource[]
+        managedSourcesFuse: (
+            managedSources: ExternalDataSource[],
+            availableSources: Record<string, SourceConfig> | null
+        ) => Fuse<ExternalDataSource>
+        filteredManagedSources: (
+            managedSources: ExternalDataSource[],
+            managedSourcesFuse: Fuse<ExternalDataSource>,
+            managedSearchTerm: string
+        ) => ExternalDataSource[]
+        hasZendeskSource: (dataWarehouseSources: PaginatedResponse<ExternalDataSource> | null) => boolean
+    }
+}
+
+export type sourceManagementLogicType = MakeLogicType<
+    sourceManagementLogicValues,
+    sourceManagementLogicActions,
+    Record<string, any>,
+    sourceManagementLogicMeta
+>
+
 export const sourceManagementLogic = kea<sourceManagementLogicType>([
     path(['products', 'dataWarehouse', 'sourceManagementLogic']),
     connect(() => ({
@@ -133,7 +302,7 @@ export const sourceManagementLogic = kea<sourceManagementLogicType>([
     selectors({
         selfManagedTables: [
             (s) => [s.dataWarehouseTables],
-            (dataWarehouseTables): DatabaseSchemaDataWarehouseTable[] => {
+            (dataWarehouseTables: DatabaseSchemaDataWarehouseTable[]): DatabaseSchemaDataWarehouseTable[] => {
                 return dataWarehouseTables.filter((table) => !table.source)
             },
         ],
@@ -152,7 +321,9 @@ export const sourceManagementLogic = kea<sourceManagementLogicType>([
         ],
         managedSources: [
             (s) => [s.dataWarehouseSources],
-            (dataWarehouseSources): ExternalDataSource[] =>
+            (
+                dataWarehouseSources: null | import('lib/api').PaginatedResponse<ExternalDataSource>
+            ): ExternalDataSource[] =>
                 (dataWarehouseSources?.results ?? []).filter(
                     (source) => source.access_method?.toLowerCase() !== 'direct'
                 ),
@@ -160,7 +331,10 @@ export const sourceManagementLogic = kea<sourceManagementLogicType>([
         // Search the display label as well as the internal source_type. Fuzzy, like the source catalog.
         managedSourcesFuse: [
             (s) => [s.managedSources, s.availableSources],
-            (managedSources, availableSources): Fuse<ExternalDataSource> =>
+            (
+                managedSources: ExternalDataSource[],
+                availableSources: Record<string, import('~/queries/schema').SourceConfig> | null
+            ): Fuse<ExternalDataSource> =>
                 createFuse(managedSources, {
                     keys: [
                         {
@@ -175,7 +349,11 @@ export const sourceManagementLogic = kea<sourceManagementLogicType>([
         ],
         filteredManagedSources: [
             (s) => [s.managedSources, s.managedSourcesFuse, s.managedSearchTerm],
-            (managedSources, managedSourcesFuse, managedSearchTerm): ExternalDataSource[] => {
+            (
+                managedSources: ExternalDataSource[],
+                managedSourcesFuse: Fuse<ExternalDataSource>,
+                managedSearchTerm: string
+            ): ExternalDataSource[] => {
                 const trimmed = managedSearchTerm?.trim()
                 if (!trimmed) {
                     return managedSources
@@ -185,7 +363,7 @@ export const sourceManagementLogic = kea<sourceManagementLogicType>([
         ],
         hasZendeskSource: [
             (s) => [s.dataWarehouseSources],
-            (dataWarehouseSources): boolean => {
+            (dataWarehouseSources: null | import('lib/api').PaginatedResponse<ExternalDataSource>): boolean => {
                 const sources = dataWarehouseSources?.results
                 if (!sources) {
                     return false
diff --git a/products/data_warehouse/frontend/shared/logics/sourcesDataLogic.ts b/products/data_warehouse/frontend/shared/logics/sourcesDataLogic.ts
index 8af51e03df7f..6d12977b9872 100644
--- a/products/data_warehouse/frontend/shared/logics/sourcesDataLogic.ts
+++ b/products/data_warehouse/frontend/shared/logics/sourcesDataLogic.ts
@@ -1,11 +1,120 @@
-import { actions, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api, { ApiError, ApiMethodOptions, PaginatedResponse } from 'lib/api'
 
 import { ExternalDataSource, ExternalDataSourceRevenueAnalyticsConfig } from '~/types'
 
-import type { sourcesDataLogicType } from './sourcesDataLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sourcesDataLogicValues {
+    dataWarehouseSources: PaginatedResponse<ExternalDataSource> | null
+    dataWarehouseSourcesLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sourcesDataLogicActions {
+    abortAnyRunningQuery: () => {
+        value: true
+    }
+    loadSources: () => {
+        value: true
+    }
+    loadSourcesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSourcesSuccess: (
+        dataWarehouseSources:
+            | PaginatedResponse<ExternalDataSource>
+            | {
+                  count: number
+                  next: null
+                  previous: null
+                  results: never[]
+              },
+        payload?: {
+            value: true
+        }
+    ) => {
+        dataWarehouseSources:
+            | PaginatedResponse<ExternalDataSource>
+            | {
+                  count: number
+                  next: null
+                  previous: null
+                  results: never[]
+              }
+        payload?: {
+            value: true
+        }
+    }
+    updateSource: (source: ExternalDataSource) => ExternalDataSource
+    updateSourceFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateSourceRevenueAnalyticsConfig: ({
+        source,
+        config,
+    }: {
+        config: Partial<ExternalDataSourceRevenueAnalyticsConfig>
+        source: ExternalDataSource
+    }) => {
+        source: ExternalDataSource
+        config: Partial<ExternalDataSourceRevenueAnalyticsConfig>
+    }
+    updateSourceRevenueAnalyticsConfigFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateSourceRevenueAnalyticsConfigSuccess: (
+        dataWarehouseSources: {
+            next?: string | null | undefined
+            previous?: string | null | undefined
+            results: ExternalDataSource[]
+        },
+        payload?: {
+            source: ExternalDataSource
+            config: Partial<ExternalDataSourceRevenueAnalyticsConfig>
+        }
+    ) => {
+        dataWarehouseSources: {
+            next?: string | null | undefined
+            previous?: string | null | undefined
+            results: ExternalDataSource[]
+        }
+        payload?: {
+            source: ExternalDataSource
+            config: Partial<ExternalDataSourceRevenueAnalyticsConfig>
+        }
+    }
+    updateSourceSuccess: (
+        dataWarehouseSources: {
+            next?: string | null | undefined
+            previous?: string | null | undefined
+            results: ExternalDataSource[]
+        },
+        payload?: ExternalDataSource
+    ) => {
+        dataWarehouseSources: {
+            next?: string | null | undefined
+            previous?: string | null | undefined
+            results: ExternalDataSource[]
+        }
+        payload?: ExternalDataSource
+    }
+}
+
+export type sourcesDataLogicType = MakeLogicType<sourcesDataLogicValues, sourcesDataLogicActions>
 
 export const sourcesDataLogic = kea<sourcesDataLogicType>([
     path(['products', 'dataWarehouse', 'sourcesDataLogic']),
diff --git a/products/early_access_features/frontend/earlyAccessFeatureLogic.ts b/products/early_access_features/frontend/earlyAccessFeatureLogic.ts
index 27945669d208..1552dc13ec06 100644
--- a/products/early_access_features/frontend/earlyAccessFeatureLogic.ts
+++ b/products/early_access_features/frontend/earlyAccessFeatureLogic.ts
@@ -1,5 +1,6 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { router, urlToAction } from 'kea-router'
 import React from 'react'
@@ -31,7 +32,6 @@ import {
     PropertyOperator,
 } from '~/types'
 
-import type { earlyAccessFeatureLogicType } from './earlyAccessFeatureLogicType'
 import { earlyAccessFeaturesLogic } from './earlyAccessFeaturesLogic'
 import { GAPromotionDialogContent } from './GAPromotionDialogContent'
 
@@ -49,6 +49,181 @@ export interface EarlyAccessFeatureLogicProps {
     id: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface earlyAccessFeatureLogicValues {
+    earlyAccessFeatures: EarlyAccessFeatureType[] // earlyAccessFeaturesLogic
+    currentTeamId: number | null // teamLogic
+    activeTab: EarlyAccessFeatureTabs
+    breadcrumbs: Breadcrumb[]
+    earlyAccessFeature: EarlyAccessFeatureType | NewEarlyAccessFeatureType
+    earlyAccessFeatureAllErrors: Record<string, any>
+    earlyAccessFeatureChanged: boolean
+    earlyAccessFeatureErrors: DeepPartialMap<EarlyAccessFeatureType | NewEarlyAccessFeatureType, ValidationErrorType>
+    earlyAccessFeatureHasErrors: boolean
+    earlyAccessFeatureLoading: boolean
+    earlyAccessFeatureManualErrors: Record<string, any>
+    earlyAccessFeatureMissing: boolean
+    earlyAccessFeatureTouched: boolean
+    earlyAccessFeatureTouches: Record<string, boolean>
+    earlyAccessFeatureValidationErrors: DeepPartialMap<
+        EarlyAccessFeatureType | NewEarlyAccessFeatureType,
+        ValidationErrorType
+    >
+    featureEnrollmentKey: string
+    implementOptInInstructionsModal: boolean
+    isEarlyAccessFeatureSubmitting: boolean
+    isEarlyAccessFeatureValid: boolean
+    isEditingFeature: boolean
+    optedInCount: number | null
+    optedOutCount: number | null
+    originalEarlyAccessFeatureStage: EarlyAccessFeatureStage | null
+    personsCount: [number, number] | null
+    personsCountLoading: boolean
+    projectTreeRef: ProjectTreeRef
+    showEarlyAccessFeatureErrors: boolean
+    sidePanelContext: SidePanelSceneContext | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface earlyAccessFeatureLogicActions {
+    deleteEarlyAccessFeature: (earlyAccessFeatureId: EarlyAccessFeatureType['id']) => {
+        earlyAccessFeatureId: string
+    }
+    editFeature: (editing: boolean) => {
+        editing: boolean
+    }
+    loadEarlyAccessFeature: () => any
+    loadEarlyAccessFeatureFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadEarlyAccessFeatureSuccess: (
+        earlyAccessFeature: EarlyAccessFeatureType | NewEarlyAccessFeatureType,
+        payload?: any
+    ) => {
+        earlyAccessFeature: EarlyAccessFeatureType | NewEarlyAccessFeatureType
+        payload?: any
+    }
+    loadEarlyAccessFeatureSuccessFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadEarlyAccessFeatureSuccessSuccess: (
+        personsCount: [number, number] | null,
+        payload?: {
+            earlyAccessFeature: EarlyAccessFeatureType | NewEarlyAccessFeatureType
+            payload?: any
+        }
+    ) => {
+        personsCount: [number, number] | null
+        payload?: {
+            earlyAccessFeature: EarlyAccessFeatureType | NewEarlyAccessFeatureType
+            payload?: any
+        }
+    }
+    resetEarlyAccessFeature: (values?: EarlyAccessFeatureType | NewEarlyAccessFeatureType) => {
+        values?: EarlyAccessFeatureType | NewEarlyAccessFeatureType
+    }
+    saveEarlyAccessFeature: (
+        updatedEarlyAccessFeature: Partial<EarlyAccessFeatureType | NewEarlyAccessFeatureType>
+    ) => Partial<EarlyAccessFeatureType | NewEarlyAccessFeatureType>
+    saveEarlyAccessFeatureFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    saveEarlyAccessFeatureSuccess: (
+        earlyAccessFeature: EarlyAccessFeatureType,
+        payload?: Partial<EarlyAccessFeatureType | NewEarlyAccessFeatureType>
+    ) => {
+        earlyAccessFeature: EarlyAccessFeatureType
+        payload?: Partial<EarlyAccessFeatureType | NewEarlyAccessFeatureType>
+    }
+    setActiveTab: (activeTab: EarlyAccessFeatureTabs) => {
+        activeTab: EarlyAccessFeatureTabs
+    }
+    setEarlyAccessFeatureManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setEarlyAccessFeatureMissing: () => {
+        value: true
+    }
+    setEarlyAccessFeatureValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setEarlyAccessFeatureValues: (values: DeepPartial<EarlyAccessFeatureType | NewEarlyAccessFeatureType>) => {
+        values: DeepPartial<EarlyAccessFeatureType | NewEarlyAccessFeatureType>
+    }
+    setOriginalStage: (stage: EarlyAccessFeatureStage) => {
+        stage: EarlyAccessFeatureStage
+    }
+    showGAPromotionConfirmation: (onConfirm: (rolloutToAll: boolean) => void) => {
+        onConfirm: (rolloutToAll: boolean) => void
+    }
+    submitEarlyAccessFeature: () => {
+        value: boolean
+    }
+    submitEarlyAccessFeatureFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitEarlyAccessFeatureRequest: (earlyAccessFeature: EarlyAccessFeatureType | NewEarlyAccessFeatureType) => {
+        earlyAccessFeature: EarlyAccessFeatureType | NewEarlyAccessFeatureType
+    }
+    submitEarlyAccessFeatureSuccess: (earlyAccessFeature: EarlyAccessFeatureType | NewEarlyAccessFeatureType) => {
+        earlyAccessFeature: EarlyAccessFeatureType | NewEarlyAccessFeatureType
+    }
+    toggleImplementOptInInstructionsModal: () => {
+        value: true
+    }
+    touchEarlyAccessFeatureField: (key: string) => {
+        key: string
+    }
+    updateStage: (stage: EarlyAccessFeatureStage) => {
+        stage: EarlyAccessFeatureStage
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface earlyAccessFeatureLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        breadcrumbs: (
+            earlyAccessFeature: EarlyAccessFeatureType | NewEarlyAccessFeatureType,
+            isEditingFeature: boolean
+        ) => Breadcrumb[]
+        projectTreeRef: (arg: string) => ProjectTreeRef
+        sidePanelContext: (
+            earlyAccessFeature: EarlyAccessFeatureType | NewEarlyAccessFeatureType
+        ) => SidePanelSceneContext | null
+        optedInCount: (personsCount: [number, number] | null) => number | null
+        optedOutCount: (personsCount: [number, number] | null) => number | null
+        featureEnrollmentKey: (earlyAccessFeature: EarlyAccessFeatureType | NewEarlyAccessFeatureType) => string
+    }
+}
+
+export type earlyAccessFeatureLogicType = MakeLogicType<
+    earlyAccessFeatureLogicValues,
+    earlyAccessFeatureLogicActions,
+    EarlyAccessFeatureLogicProps,
+    earlyAccessFeatureLogicMeta
+>
+
 export const earlyAccessFeatureLogic = kea<earlyAccessFeatureLogicType>([
     path(['products', 'earlyAccessFeatures', 'frontend', 'earlyAccessFeatureLogic']),
     props({} as EarlyAccessFeatureLogicProps),
@@ -276,11 +451,11 @@ export const earlyAccessFeatureLogic = kea<earlyAccessFeatureLogicType>([
         ],
         projectTreeRef: [
             () => [(_, props: EarlyAccessFeatureLogicProps) => props.id],
-            (id): ProjectTreeRef => ({ type: 'early_access_feature', ref: id === 'new' ? null : String(id) }),
+            (id: string): ProjectTreeRef => ({ type: 'early_access_feature', ref: id === 'new' ? null : String(id) }),
         ],
         [SIDE_PANEL_CONTEXT_KEY]: [
             (s) => [s.earlyAccessFeature],
-            (earlyAccessFeature): SidePanelSceneContext | null => {
+            (earlyAccessFeature: EarlyAccessFeatureType | NewEarlyAccessFeatureType): SidePanelSceneContext | null => {
                 return 'id' in earlyAccessFeature && earlyAccessFeature.id
                     ? {
                           activity_scope: ActivityScope.EARLY_ACCESS_FEATURE,
diff --git a/products/early_access_features/frontend/earlyAccessFeaturesLogic.ts b/products/early_access_features/frontend/earlyAccessFeaturesLogic.ts
index 0b1107d30125..407366a4f377 100644
--- a/products/early_access_features/frontend/earlyAccessFeaturesLogic.ts
+++ b/products/early_access_features/frontend/earlyAccessFeaturesLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -7,10 +7,56 @@ import { urls } from 'scenes/urls'
 
 import { Breadcrumb, EarlyAccessFeatureType } from '~/types'
 
-import type { earlyAccessFeaturesLogicType } from './earlyAccessFeaturesLogicType'
-
 const search = createFeaturePreviewSearch<EarlyAccessFeatureType>()
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface earlyAccessFeaturesLogicValues {
+    breadcrumbs: Breadcrumb[]
+    earlyAccessFeatures: EarlyAccessFeatureType[]
+    earlyAccessFeaturesLoading: boolean
+    filteredEarlyAccessFeatures: EarlyAccessFeatureType[]
+    searchTerm: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface earlyAccessFeaturesLogicActions {
+    loadEarlyAccessFeatures: () => any
+    loadEarlyAccessFeaturesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadEarlyAccessFeaturesSuccess: (
+        earlyAccessFeatures: EarlyAccessFeatureType[],
+        payload?: any
+    ) => {
+        earlyAccessFeatures: EarlyAccessFeatureType[]
+        payload?: any
+    }
+    setSearchTerm: (searchTerm: string) => {
+        searchTerm: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface earlyAccessFeaturesLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        filteredEarlyAccessFeatures: (
+            earlyAccessFeatures: EarlyAccessFeatureType[],
+            searchTerm: string
+        ) => EarlyAccessFeatureType[]
+    }
+}
+
+export type earlyAccessFeaturesLogicType = MakeLogicType<
+    earlyAccessFeaturesLogicValues,
+    earlyAccessFeaturesLogicActions,
+    Record<string, any>,
+    earlyAccessFeaturesLogicMeta
+>
+
 export const earlyAccessFeaturesLogic = kea<earlyAccessFeaturesLogicType>([
     path(['products', 'earlyAccessFeatures', 'frontend', 'earlyAccessFeaturesLogic']),
 
diff --git a/products/endpoints/frontend/endpointLogic.tsx b/products/endpoints/frontend/endpointLogic.tsx
index 853997031379..50bbd934aef8 100644
--- a/products/endpoints/frontend/endpointLogic.tsx
+++ b/products/endpoints/frontend/endpointLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 
@@ -16,12 +16,186 @@ import { sceneLayoutLogic } from '~/layout/scenes/sceneLayoutLogic'
 import { EndpointRequest, ProductIntentContext, ProductKey } from '~/queries/schema/schema-general'
 import { EndpointType, EndpointVersionType } from '~/types'
 
-import type { endpointLogicType } from './endpointLogicType'
+import type { ProductIntentProperties } from '../../../frontend/src/lib/utils/product-intents'
+import type { EndpointVersionMaterializationType } from '../../../frontend/src/types'
 import { endpointsLogic } from './endpointsLogic'
 import { insightPickerEndpointModalLogic } from './insightPickerEndpointModalLogic'
 
 export type CodeExampleTab = 'terminal' | 'python' | 'nodejs'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface endpointLogicValues {
+    activeCodeExampleTab: CodeExampleTab
+    createFromInsightModalOpen: boolean
+    duplicateEndpoint: EndpointType | null
+    endpoint: EndpointVersionType | null
+    endpointDescription: string | null
+    endpointLoading: boolean
+    endpointName: string | null
+    isUpdateMode: boolean
+    materializationStatus: EndpointType['materialization'] | null
+    materializationStatusLoading: boolean
+    selectedCodeExampleVersion: number | null
+    selectedEndpointName: string | null
+    updatingEndpoint: boolean
+    versions: EndpointVersionType[]
+    versionsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface endpointLogicActions {
+    loadEndpoints: () => any // endpointsLogic
+    setScenePanelOpen: (open: boolean) => {
+        open: boolean
+    } // sceneLayoutLogic
+    addProductIntent: (properties: ProductIntentProperties) => ProductIntentProperties // teamLogic
+    clearMaterializationStatus: () => {
+        value: true
+    }
+    closeCreateFromInsightModal: () => {
+        value: true
+    }
+    confirmToggleActive: (endpoint: EndpointType) => {
+        endpoint: EndpointType
+    }
+    createEndpoint: (request: EndpointRequest) => {
+        request: EndpointRequest
+    }
+    createEndpointFailure: (queryError?: string | null) => {
+        queryError: string | null | undefined
+    }
+    createEndpointSuccess: (response: any) => {
+        response: any
+    }
+    deleteEndpoint: (name: string) => {
+        name: string
+    }
+    deleteEndpointFailure: () => {}
+    deleteEndpointSuccess: (response: any) => {
+        response: any
+    }
+    loadEndpoint: (name: string) => string
+    loadEndpointFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadEndpointSuccess: (
+        endpoint: EndpointVersionType | null,
+        payload?: string
+    ) => {
+        endpoint: EndpointVersionType | null
+        payload?: string
+    }
+    loadMaterializationStatus: ({ name, version }: { name: string; version?: number }) => {
+        name: string
+        version?: number
+    }
+    loadMaterializationStatusFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadMaterializationStatusSuccess: (
+        materializationStatus: EndpointVersionMaterializationType | null | undefined,
+        payload?: {
+            name: string
+            version?: number
+        }
+    ) => {
+        materializationStatus: EndpointVersionMaterializationType | null | undefined
+        payload?: {
+            name: string
+            version?: number
+        }
+    }
+    loadVersions: (name: string) => string
+    loadVersionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadVersionsSuccess: (
+        versions: EndpointVersionType[],
+        payload?: string
+    ) => {
+        versions: EndpointVersionType[]
+        payload?: string
+    }
+    openCreateFromInsightModal: () => {
+        value: true
+    }
+    saveTagsInline: (tags: string[]) => {
+        tags: string[]
+    }
+    setActiveCodeExampleTab: (tab: CodeExampleTab) => {
+        tab: CodeExampleTab
+    }
+    setDuplicateEndpoint: (endpoint: EndpointType | null) => {
+        endpoint: EndpointType | null
+    }
+    setEndpointDescription: (endpointDescription: string | null) => {
+        endpointDescription: string | null
+    }
+    setEndpointName: (endpointName: string) => {
+        endpointName: string
+    }
+    setIsUpdateMode: (isUpdateMode: boolean) => {
+        isUpdateMode: boolean
+    }
+    setSelectedCodeExampleVersion: (version: number | null) => {
+        version: number | null
+    }
+    setSelectedEndpointName: (selectedEndpointName: string | null) => {
+        selectedEndpointName: string | null
+    }
+    updateEndpoint: (
+        name: string,
+        request: Partial<EndpointRequest>,
+        options?: {
+            showViewButton?: boolean
+            version?: number
+        }
+    ) => {
+        name: string
+        options:
+            | {
+                  showViewButton?: boolean | undefined
+                  version?: number | undefined
+              }
+            | undefined
+        request: Partial<EndpointRequest>
+    }
+    updateEndpointFailure: (queryError?: string | null) => {
+        queryError: string | null | undefined
+    }
+    updateEndpointSuccess: (
+        response: any,
+        endpointName: string,
+        options?: {
+            showViewButton?: boolean
+            version?: number
+        }
+    ) => {
+        endpointName: string
+        options:
+            | {
+                  showViewButton?: boolean | undefined
+                  version?: number | undefined
+              }
+            | undefined
+        response: any
+    }
+}
+
+export type endpointLogicType = MakeLogicType<endpointLogicValues, endpointLogicActions>
+
 export const endpointLogic = kea<endpointLogicType>([
     path(['products', 'endpoints', 'frontend', 'endpointLogic']),
     connect(() => ({
diff --git a/products/endpoints/frontend/endpointSceneLogic.tsx b/products/endpoints/frontend/endpointSceneLogic.tsx
index 69b1808d4775..b12d66d3bc5e 100644
--- a/products/endpoints/frontend/endpointSceneLogic.tsx
+++ b/products/endpoints/frontend/endpointSceneLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router, urlToAction } from 'kea-router'
 
@@ -22,7 +22,6 @@ import { isHogQLQuery, isInsightQueryNode } from '~/queries/utils'
 import { Breadcrumb, ChartDisplayType, EndpointType, EndpointVersionType } from '~/types'
 
 import { endpointLogic } from './endpointLogic'
-import type { endpointSceneLogicType } from './endpointSceneLogicType'
 import { endpointsMaterializationSuggestionCreate } from './generated/api'
 import type { EndpointMaterializationSuggestionApi } from './generated/api.schemas'
 
@@ -134,6 +133,247 @@ export interface MaterializationPreview {
     aggregates: { expression: string; reaggregate_fn: string | null }[]
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface endpointSceneLogicValues {
+    endpoint: EndpointVersionType | null // endpointLogic
+    endpointLoading: boolean // endpointLogic
+    activeTab: EndpointTab
+    breadcrumbs: Breadcrumb[]
+    bucketOverrides: Record<string, string>
+    currentQuery: Node | null
+    dataFreshness: number
+    debugInfoExpanded: boolean
+    debugMode: boolean
+    endpointName: string | null
+    endpointResult: string | null
+    endpointResultLoading: boolean
+    isMaterialized: boolean | null
+    localQuery: Node | null
+    materializationPreview: MaterializationPreview | null
+    materializationPreviewLoading: boolean
+    materializationSuggestion: EndpointMaterializationSuggestionApi | null
+    materializationSuggestionLoading: boolean
+    materializationSuggestionModalOpen: boolean
+    optionalBreakdownProperties: string[]
+    payloadJson: string
+    payloadJsonError: string | null
+    queryToRender: Node | null
+    suggestionMatchesCurrentQuery: boolean
+    viewingVersion: EndpointVersionType | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface endpointSceneLogicActions {
+    clearMaterializationStatus: () => {
+        value: true
+    } // endpointLogic
+    loadEndpoint: (name: string) => string // endpointLogic
+    loadEndpointSuccess: (
+        endpoint: EndpointVersionType | null,
+        payload?: string | undefined
+    ) => {
+        endpoint: EndpointVersionType | null
+        payload?: string
+    } // endpointLogic
+    loadVersions: (name: string) => string // endpointLogic
+    setEndpointDescription: (endpointDescription: string | null) => {
+        endpointDescription: string | null
+    } // endpointLogic
+    updateEndpointSuccess: (
+        response: any,
+        endpointName: string,
+        options?:
+            | {
+                  showViewButton?: boolean
+                  version?: number
+              }
+            | undefined
+    ) => {
+        endpointName: string
+        options:
+            | {
+                  showViewButton?: boolean | undefined
+                  version?: number | undefined
+              }
+            | undefined
+        response: any
+    } // endpointLogic
+    applyMaterializationSuggestion: () => {
+        value: true
+    }
+    closeMaterializationSuggestionModal: () => {
+        value: true
+    }
+    keepSqlEditorMounted: (editorTabId: string) => {
+        editorTabId: string
+    }
+    loadEndpointResult: ({ name, data }: { data: EndpointRunRequest; name: string }) => {
+        name: string
+        data: EndpointRunRequest
+    }
+    loadEndpointResultFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadEndpointResultSuccess: (
+        endpointResult: string,
+        payload?: {
+            name: string
+            data: EndpointRunRequest
+        }
+    ) => {
+        endpointResult: string
+        payload?: {
+            name: string
+            data: EndpointRunRequest
+        }
+    }
+    loadMaterializationPreview: () => {
+        value: true
+    }
+    loadMaterializationPreviewFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadMaterializationPreviewSuccess: (
+        materializationPreview: {
+            aggregates: {
+                expression: string
+                reaggregate_fn: string | null
+            }[]
+            can_materialize: boolean
+            range_pairs: {
+                bucket_fn: string
+                column: string
+                variables: string[]
+            }[]
+            reason: string | null
+            transformed_query: string | null
+        } | null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        materializationPreview: {
+            aggregates: {
+                expression: string
+                reaggregate_fn: string | null
+            }[]
+            can_materialize: boolean
+            range_pairs: {
+                bucket_fn: string
+                column: string
+                variables: string[]
+            }[]
+            reason: string | null
+            transformed_query: string | null
+        } | null
+        payload?: {
+            value: true
+        }
+    }
+    loadMaterializationSuggestion: () => any
+    loadMaterializationSuggestionFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadMaterializationSuggestionSuccess: (
+        materializationSuggestion: EndpointMaterializationSuggestionApi | null,
+        payload?: any
+    ) => {
+        materializationSuggestion: EndpointMaterializationSuggestionApi | null
+        payload?: any
+    }
+    openMaterializationSuggestionModal: () => {
+        value: true
+    }
+    regenerateMaterializationSuggestion: () => {
+        value: true
+    }
+    resetBucketOverrides: (overrides: Record<string, string>) => {
+        overrides: Record<string, string>
+    }
+    resetOptionalBreakdownProperties: (props: string[]) => {
+        props: string[]
+    }
+    setActiveTab: (tab: EndpointTab) => {
+        tab: EndpointTab
+    }
+    setBucketOverride: (
+        column: string,
+        bucketFn: string
+    ) => {
+        bucketFn: string
+        column: string
+    }
+    setDataFreshness: (dataFreshness: number) => {
+        dataFreshness: number
+    }
+    setDebugInfoExpanded: (debugInfoExpanded: boolean) => {
+        debugInfoExpanded: boolean
+    }
+    setDebugMode: (debugMode: boolean) => {
+        debugMode: boolean
+    }
+    setEndpointName: (name: string | null) => {
+        name: string | null
+    }
+    setIsMaterialized: (isMaterialized: boolean | null) => {
+        isMaterialized: boolean | null
+    }
+    setLocalQuery: (query: Node | null) => {
+        query: Node<Record<string, any>> | null
+    }
+    setPayloadJson: (value: string) => {
+        value: string
+    }
+    setPayloadJsonError: (error: string | null) => {
+        error: string | null
+    }
+    setViewingVersion: (version: EndpointVersionType | null) => {
+        version: EndpointVersionType | null
+    }
+    toggleBreakdownOptional: (property: string) => {
+        property: string
+    }
+    toggleMaterializationFromMenu: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface endpointSceneLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        currentQuery: (
+            localQuery: Node<Record<string, any>> | null,
+            endpoint: EndpointVersionType | null,
+            viewingVersion: EndpointVersionType | null
+        ) => Node | null
+        suggestionMatchesCurrentQuery: (
+            materializationSuggestion: EndpointMaterializationSuggestionApi | null,
+            currentQuery: Node<Record<string, any>> | null
+        ) => boolean
+        queryToRender: (currentQuery: Node<Record<string, any>> | null) => Node | null
+        breadcrumbs: (endpoint: EndpointVersionType | null) => Breadcrumb[]
+    }
+}
+
+export type endpointSceneLogicType = MakeLogicType<
+    endpointSceneLogicValues,
+    endpointSceneLogicActions,
+    Record<string, any>,
+    endpointSceneLogicMeta
+>
+
 export const endpointSceneLogic = kea<endpointSceneLogicType>([
     path(['products', 'endpoints', 'frontend', 'endpointSceneLogic']),
     connect(() => ({
diff --git a/products/endpoints/frontend/endpointsLogic.tsx b/products/endpoints/frontend/endpointsLogic.tsx
index ad3259b9770a..56c855ce30d9 100644
--- a/products/endpoints/frontend/endpointsLogic.tsx
+++ b/products/endpoints/frontend/endpointsLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { urlToAction } from 'kea-router'
 
@@ -10,7 +10,7 @@ import { urls } from 'scenes/urls'
 import { ProductIntentContext, ProductKey } from '~/queries/schema/schema-general'
 import { EndpointType } from '~/types'
 
-import type { endpointsLogicType } from './endpointsLogicType'
+import type { ProductIntentProperties } from '../../../frontend/src/lib/utils/product-intents'
 
 export type EndpointsTab = 'endpoints' | 'usage'
 
@@ -24,6 +24,55 @@ export const DEFAULT_FILTERS: EndpointsFilters = {
     tags: [],
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface endpointsLogicValues {
+    activeTab: EndpointsTab
+    allEndpoints: EndpointType[]
+    allEndpointsLoading: boolean
+    endpoints: EndpointType[]
+    filters: EndpointsFilters
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface endpointsLogicActions {
+    addProductIntent: (properties: ProductIntentProperties) => ProductIntentProperties // teamLogic
+    loadEndpoints: () => any
+    loadEndpointsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadEndpointsSuccess: (
+        allEndpoints: EndpointType[],
+        payload?: any
+    ) => {
+        allEndpoints: EndpointType[]
+        payload?: any
+    }
+    setActiveTab: (activeTab: EndpointsTab) => {
+        activeTab: EndpointsTab
+    }
+    setFilters: (filters: Partial<EndpointsFilters>) => {
+        filters: Partial<EndpointsFilters>
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface endpointsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        endpoints: (allEndpoints: EndpointType[], filters: EndpointsFilters) => EndpointType[]
+    }
+}
+
+export type endpointsLogicType = MakeLogicType<
+    endpointsLogicValues,
+    endpointsLogicActions,
+    Record<string, any>,
+    endpointsLogicMeta
+>
+
 export const endpointsLogic = kea<endpointsLogicType>([
     path(['products', 'endpoints', 'frontend', 'endpointsLogic']),
     connect(() => ({
@@ -61,7 +110,7 @@ export const endpointsLogic = kea<endpointsLogicType>([
     selectors({
         endpoints: [
             (s) => [s.allEndpoints, s.filters],
-            (allEndpoints, filters) => {
+            (allEndpoints: EndpointType[], filters: EndpointsFilters) => {
                 let results = allEndpoints
 
                 if (filters.tags.length > 0) {
diff --git a/products/endpoints/frontend/endpointsUsageLogic.tsx b/products/endpoints/frontend/endpointsUsageLogic.tsx
index dd195f94159c..e2f4273a909c 100644
--- a/products/endpoints/frontend/endpointsUsageLogic.tsx
+++ b/products/endpoints/frontend/endpointsUsageLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { router, urlToAction } from 'kea-router'
 
 import { dayjs } from 'lib/dayjs'
@@ -16,12 +16,158 @@ import {
 import { EndpointType, IntervalType } from '~/types'
 
 import { endpointsLogic } from './endpointsLogic'
-import type { endpointsUsageLogicType } from './endpointsUsageLogicType'
 
 export const INITIAL_DATE_FROM = '-7d'
 export const INITIAL_DATE_TO = null as string | null
 export const INITIAL_INTERVAL: IntervalType = 'day'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface endpointsUsageLogicValues {
+    allEndpoints: EndpointType[] // endpointsLogic
+    allEndpointsLoading: boolean // endpointsLogic
+    activeEndpointNames: Set<string>
+    breakdownBy: EndpointsUsageBreakdown | null
+    bytesReadTrendsQuery: EndpointsUsageTrendsQuery
+    canRefresh: boolean
+    cooldownActive: boolean
+    cpuSecondsTrendsQuery: EndpointsUsageTrendsQuery
+    dateFilter: {
+        dateFrom: string | null
+        dateTo: string | null
+    }
+    dateRange: {
+        date_from: string | null
+        date_to: string | null
+    }
+    endpointFilter: string[]
+    endpointNames: string[]
+    endpointNamesLoading: boolean
+    endpointTableQuery: EndpointsUsageTableQuery
+    errorRateTrendsQuery: EndpointsUsageTrendsQuery
+    interval: IntervalType
+    materializationType: 'inline' | 'materialized' | null
+    overviewQuery: EndpointsUsageOverviewQuery
+    queryDurationTrendsQuery: EndpointsUsageTrendsQuery
+    refreshKey: number
+    requestsTrendsQuery: EndpointsUsageTrendsQuery
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface endpointsUsageLogicActions {
+    clearCooldown: () => {
+        value: true
+    }
+    refresh: () => {
+        value: true
+    }
+    setBreakdownBy: (breakdownBy: EndpointsUsageBreakdown | null) => {
+        breakdownBy: EndpointsUsageBreakdown | null
+    }
+    setDates: (
+        dateFrom: string | null,
+        dateTo: string | null
+    ) => {
+        dateFrom: string | null
+        dateTo: string | null
+    }
+    setEndpointFilter: (endpointFilter: string[]) => {
+        endpointFilter: string[]
+    }
+    setInterval: (interval: IntervalType) => {
+        interval: IntervalType
+    }
+    setMaterializationType: (materializationType: 'inline' | 'materialized' | null) => {
+        materializationType: 'inline' | 'materialized' | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface endpointsUsageLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        endpointNames: (allEndpoints: EndpointType[]) => string[]
+        activeEndpointNames: (endpointNames: string[]) => Set<string>
+        endpointNamesLoading: (allEndpointsLoading: boolean) => boolean
+        canRefresh: (cooldownActive: boolean) => boolean
+        dateRange: (dateFilter: { dateFrom: string | null; dateTo: string | null }) => {
+            date_from: string | null
+            date_to: string | null
+        }
+        overviewQuery: (
+            dateRange: {
+                date_from: string | null
+                date_to: string | null
+            },
+            endpointFilter: string[],
+            materializationType: 'inline' | 'materialized' | null
+        ) => EndpointsUsageOverviewQuery
+        requestsTrendsQuery: (
+            dateRange: {
+                date_from: string | null
+                date_to: string | null
+            },
+            endpointFilter: string[],
+            materializationType: 'inline' | 'materialized' | null,
+            interval: IntervalType,
+            breakdownBy: EndpointsUsageBreakdown | null
+        ) => EndpointsUsageTrendsQuery
+        bytesReadTrendsQuery: (
+            dateRange: {
+                date_from: string | null
+                date_to: string | null
+            },
+            endpointFilter: string[],
+            materializationType: 'inline' | 'materialized' | null,
+            interval: IntervalType,
+            breakdownBy: EndpointsUsageBreakdown | null
+        ) => EndpointsUsageTrendsQuery
+        cpuSecondsTrendsQuery: (
+            dateRange: {
+                date_from: string | null
+                date_to: string | null
+            },
+            endpointFilter: string[],
+            materializationType: 'inline' | 'materialized' | null,
+            interval: IntervalType,
+            breakdownBy: EndpointsUsageBreakdown | null
+        ) => EndpointsUsageTrendsQuery
+        queryDurationTrendsQuery: (
+            dateRange: {
+                date_from: string | null
+                date_to: string | null
+            },
+            endpointFilter: string[],
+            materializationType: 'inline' | 'materialized' | null,
+            interval: IntervalType,
+            breakdownBy: EndpointsUsageBreakdown | null
+        ) => EndpointsUsageTrendsQuery
+        errorRateTrendsQuery: (
+            dateRange: {
+                date_from: string | null
+                date_to: string | null
+            },
+            endpointFilter: string[],
+            materializationType: 'inline' | 'materialized' | null,
+            interval: IntervalType,
+            breakdownBy: EndpointsUsageBreakdown | null
+        ) => EndpointsUsageTrendsQuery
+        endpointTableQuery: (
+            dateRange: {
+                date_from: string | null
+                date_to: string | null
+            },
+            endpointFilter: string[],
+            materializationType: 'inline' | 'materialized' | null
+        ) => EndpointsUsageTableQuery
+    }
+}
+
+export type endpointsUsageLogicType = MakeLogicType<
+    endpointsUsageLogicValues,
+    endpointsUsageLogicActions,
+    Record<string, any>,
+    endpointsUsageLogicMeta
+>
+
 export const endpointsUsageLogic = kea<endpointsUsageLogicType>([
     path(['products', 'endpoints', 'frontend', 'endpointsUsageLogic']),
     connect(() => ({
@@ -100,7 +246,10 @@ export const endpointsUsageLogic = kea<endpointsUsageLogicType>([
         canRefresh: [(s) => [s.cooldownActive], (cooldownActive: boolean): boolean => !cooldownActive],
         dateRange: [
             (s) => [s.dateFilter],
-            (dateFilter): { date_from: string | null; date_to: string | null } => {
+            (dateFilter: {
+                dateFrom: string | null
+                dateTo: string | null
+            }): { date_from: string | null; date_to: string | null } => {
                 const dateFromDayjs = dateStringToDayJs(dateFilter.dateFrom)
                 const dateToDayjs = dateFilter.dateTo ? dateStringToDayJs(dateFilter.dateTo) : null
 
@@ -113,7 +262,14 @@ export const endpointsUsageLogic = kea<endpointsUsageLogicType>([
 
         overviewQuery: [
             (s) => [s.dateRange, s.endpointFilter, s.materializationType],
-            (dateRange, endpointFilter, materializationType): EndpointsUsageOverviewQuery => ({
+            (
+                dateRange: {
+                    date_from: string | null
+                    date_to: string | null
+                },
+                endpointFilter: string[],
+                materializationType: 'inline' | 'materialized' | null
+            ): EndpointsUsageOverviewQuery => ({
                 kind: NodeKind.EndpointsUsageOverviewQuery,
                 dateRange,
                 endpointNames: endpointFilter.length > 0 ? endpointFilter : undefined,
@@ -124,7 +280,16 @@ export const endpointsUsageLogic = kea<endpointsUsageLogicType>([
 
         requestsTrendsQuery: [
             (s) => [s.dateRange, s.endpointFilter, s.materializationType, s.interval, s.breakdownBy],
-            (dateRange, endpointFilter, materializationType, interval, breakdownBy): EndpointsUsageTrendsQuery => ({
+            (
+                dateRange: {
+                    date_from: string | null
+                    date_to: string | null
+                },
+                endpointFilter: string[],
+                materializationType: 'inline' | 'materialized' | null,
+                interval: IntervalType,
+                breakdownBy: EndpointsUsageBreakdown | null
+            ): EndpointsUsageTrendsQuery => ({
                 kind: NodeKind.EndpointsUsageTrendsQuery,
                 dateRange,
                 endpointNames: endpointFilter.length > 0 ? endpointFilter : undefined,
@@ -137,7 +302,16 @@ export const endpointsUsageLogic = kea<endpointsUsageLogicType>([
 
         bytesReadTrendsQuery: [
             (s) => [s.dateRange, s.endpointFilter, s.materializationType, s.interval, s.breakdownBy],
-            (dateRange, endpointFilter, materializationType, interval, breakdownBy): EndpointsUsageTrendsQuery => ({
+            (
+                dateRange: {
+                    date_from: string | null
+                    date_to: string | null
+                },
+                endpointFilter: string[],
+                materializationType: 'inline' | 'materialized' | null,
+                interval: IntervalType,
+                breakdownBy: EndpointsUsageBreakdown | null
+            ): EndpointsUsageTrendsQuery => ({
                 kind: NodeKind.EndpointsUsageTrendsQuery,
                 dateRange,
                 endpointNames: endpointFilter.length > 0 ? endpointFilter : undefined,
@@ -150,7 +324,16 @@ export const endpointsUsageLogic = kea<endpointsUsageLogicType>([
 
         cpuSecondsTrendsQuery: [
             (s) => [s.dateRange, s.endpointFilter, s.materializationType, s.interval, s.breakdownBy],
-            (dateRange, endpointFilter, materializationType, interval, breakdownBy): EndpointsUsageTrendsQuery => ({
+            (
+                dateRange: {
+                    date_from: string | null
+                    date_to: string | null
+                },
+                endpointFilter: string[],
+                materializationType: 'inline' | 'materialized' | null,
+                interval: IntervalType,
+                breakdownBy: EndpointsUsageBreakdown | null
+            ): EndpointsUsageTrendsQuery => ({
                 kind: NodeKind.EndpointsUsageTrendsQuery,
                 dateRange,
                 endpointNames: endpointFilter.length > 0 ? endpointFilter : undefined,
@@ -163,7 +346,16 @@ export const endpointsUsageLogic = kea<endpointsUsageLogicType>([
 
         queryDurationTrendsQuery: [
             (s) => [s.dateRange, s.endpointFilter, s.materializationType, s.interval, s.breakdownBy],
-            (dateRange, endpointFilter, materializationType, interval, breakdownBy): EndpointsUsageTrendsQuery => ({
+            (
+                dateRange: {
+                    date_from: string | null
+                    date_to: string | null
+                },
+                endpointFilter: string[],
+                materializationType: 'inline' | 'materialized' | null,
+                interval: IntervalType,
+                breakdownBy: EndpointsUsageBreakdown | null
+            ): EndpointsUsageTrendsQuery => ({
                 kind: NodeKind.EndpointsUsageTrendsQuery,
                 dateRange,
                 endpointNames: endpointFilter.length > 0 ? endpointFilter : undefined,
@@ -176,7 +368,16 @@ export const endpointsUsageLogic = kea<endpointsUsageLogicType>([
 
         errorRateTrendsQuery: [
             (s) => [s.dateRange, s.endpointFilter, s.materializationType, s.interval, s.breakdownBy],
-            (dateRange, endpointFilter, materializationType, interval, breakdownBy): EndpointsUsageTrendsQuery => ({
+            (
+                dateRange: {
+                    date_from: string | null
+                    date_to: string | null
+                },
+                endpointFilter: string[],
+                materializationType: 'inline' | 'materialized' | null,
+                interval: IntervalType,
+                breakdownBy: EndpointsUsageBreakdown | null
+            ): EndpointsUsageTrendsQuery => ({
                 kind: NodeKind.EndpointsUsageTrendsQuery,
                 dateRange,
                 endpointNames: endpointFilter.length > 0 ? endpointFilter : undefined,
@@ -189,7 +390,14 @@ export const endpointsUsageLogic = kea<endpointsUsageLogicType>([
 
         endpointTableQuery: [
             (s) => [s.dateRange, s.endpointFilter, s.materializationType],
-            (dateRange, endpointFilter, materializationType): EndpointsUsageTableQuery => ({
+            (
+                dateRange: {
+                    date_from: string | null
+                    date_to: string | null
+                },
+                endpointFilter: string[],
+                materializationType: 'inline' | 'materialized' | null
+            ): EndpointsUsageTableQuery => ({
                 kind: NodeKind.EndpointsUsageTableQuery,
                 dateRange,
                 endpointNames: endpointFilter.length > 0 ? endpointFilter : undefined,
diff --git a/products/endpoints/frontend/insightPickerEndpointModalLogic.ts b/products/endpoints/frontend/insightPickerEndpointModalLogic.ts
index c5b7f36e6a3c..55656686191a 100644
--- a/products/endpoints/frontend/insightPickerEndpointModalLogic.ts
+++ b/products/endpoints/frontend/insightPickerEndpointModalLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers } from 'kea'
 import { actionToUrl, urlToAction } from 'kea-router'
 
 import { addSavedInsightsModalLogic } from 'scenes/saved-insights/addSavedInsightsModalLogic'
@@ -6,7 +6,38 @@ import { urls } from 'scenes/urls'
 
 import { QueryBasedInsightModel } from '~/types'
 
-import type { insightPickerEndpointModalLogicType } from './insightPickerEndpointModalLogicType'
+import type { Node } from '../../../frontend/src/queries/schema/schema-general'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightPickerEndpointModalLogicValues {
+    isOpen: boolean
+    selectedInsight: QueryBasedInsightModel | null
+    showMoreInsightTypes: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightPickerEndpointModalLogicActions {
+    clearSelectedInsight: () => {
+        value: true
+    }
+    closeModal: () => {
+        value: true
+    }
+    openModal: () => {
+        value: true
+    }
+    selectInsight: (insight: QueryBasedInsightModel) => {
+        insight: QueryBasedInsightModel<Node<Record<string, any>>>
+    }
+    toggleShowMoreInsightTypes: () => {
+        value: true
+    }
+}
+
+export type insightPickerEndpointModalLogicType = MakeLogicType<
+    insightPickerEndpointModalLogicValues,
+    insightPickerEndpointModalLogicActions
+>
 
 export const insightPickerEndpointModalLogic = kea<insightPickerEndpointModalLogicType>([
     path(['products', 'endpoints', 'frontend', 'insightPickerEndpointModalLogic']),
diff --git a/products/engineering_analytics/frontend/scenes/authorLogic.ts b/products/engineering_analytics/frontend/scenes/authorLogic.ts
index f68372acf38b..69d1973630f7 100644
--- a/products/engineering_analytics/frontend/scenes/authorLogic.ts
+++ b/products/engineering_analytics/frontend/scenes/authorLogic.ts
@@ -1,4 +1,4 @@
-import { afterMount, connect, kea, key, listeners, path, props, selectors } from 'kea'
+import { MakeLogicType, afterMount, connect, kea, key, listeners, path, props, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { ApiConfig } from 'lib/api'
@@ -10,7 +10,6 @@ import { Breadcrumb } from '~/types'
 
 import { engineeringAnalyticsAuthorWorkflowCosts, engineeringAnalyticsPullRequests } from '../generated/api'
 import type { WorkflowCostApi } from '../generated/api.schemas'
-import type { authorLogicType } from './authorLogicType'
 import { engineeringAnalyticsFiltersLogic } from './engineeringAnalyticsFiltersLogic'
 import { PullRequestRow, toPullRequestRow } from './engineeringAnalyticsLogic'
 
@@ -28,6 +27,75 @@ export interface AuthorLogicProps {
     sourceId: string | null
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface authorLogicValues {
+    dateFrom: string | null // engineeringAnalyticsFiltersLogic
+    dateTo: string | null // engineeringAnalyticsFiltersLogic
+    breadcrumbs: Breadcrumb[]
+    handle: string
+    openPrCount: number
+    prs: PullRequestRow[]
+    prsLoading: boolean
+    sourceId: string | null
+    totalBillableMinutes: number | null
+    totalCostUsd: number | null
+    totalLoops: number
+    windowedRows: PullRequestRow[]
+    workflowCosts: WorkflowCostApi[]
+    workflowCostsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface authorLogicActions {
+    loadPrs: () => any
+    loadPrsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPrsSuccess: (
+        prs: PullRequestRow[],
+        payload?: any
+    ) => {
+        prs: PullRequestRow[]
+        payload?: any
+    }
+    loadWorkflowCosts: () => any
+    loadWorkflowCostsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadWorkflowCostsSuccess: (
+        workflowCosts: WorkflowCostApi[],
+        payload?: any
+    ) => {
+        workflowCosts: WorkflowCostApi[]
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface authorLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        sourceId: (arg: string | null) => string | null
+        handle: (arg: string) => string
+        windowedRows: (prs: PullRequestRow[], dateFrom: string | null, dateTo: string | null) => PullRequestRow[]
+        totalCostUsd: (windowedRows: PullRequestRow[]) => number | null
+        totalBillableMinutes: (windowedRows: PullRequestRow[]) => number | null
+        totalLoops: (windowedRows: PullRequestRow[]) => number
+        openPrCount: (prs: PullRequestRow[]) => number
+        breadcrumbs: (handle: string) => Breadcrumb[]
+    }
+}
+
+export type authorLogicType = MakeLogicType<authorLogicValues, authorLogicActions, AuthorLogicProps, authorLogicMeta>
+
 export const authorLogic = kea<authorLogicType>([
     path(['products', 'engineering_analytics', 'frontend', 'scenes', 'authorLogic']),
     props({} as AuthorLogicProps),
@@ -79,8 +147,11 @@ export const authorLogic = kea<authorLogicType>([
     })),
 
     selectors({
-        sourceId: [() => [(_, p: AuthorLogicProps) => p.sourceId], (sourceId): string | null => sourceId],
-        handle: [() => [(_, p: AuthorLogicProps) => p.handle], (handle): string => handle],
+        sourceId: [
+            () => [(_, p: AuthorLogicProps) => p.sourceId],
+            (sourceId: string | null): string | null => sourceId,
+        ],
+        handle: [() => [(_, p: AuthorLogicProps) => p.handle], (handle: string): string => handle],
         // The cost-tile scope: PRs opened within the selected window. The list shows every loaded PR; only
         // the cost KPIs narrow to this subset, so the date picker reads as "CI cost of PRs opened in window".
         windowedRows: [
@@ -121,7 +192,7 @@ export const authorLogic = kea<authorLogicType>([
         ],
         breadcrumbs: [
             (_, p) => [p.handle],
-            (handle): Breadcrumb[] => [
+            (handle: string): Breadcrumb[] => [
                 {
                     key: 'EngineeringAnalytics',
                     name: 'Engineering analytics',
diff --git a/products/engineering_analytics/frontend/scenes/engineeringAnalyticsFiltersLogic.ts b/products/engineering_analytics/frontend/scenes/engineeringAnalyticsFiltersLogic.ts
index d48269b7454a..144216b94eb4 100644
--- a/products/engineering_analytics/frontend/scenes/engineeringAnalyticsFiltersLogic.ts
+++ b/products/engineering_analytics/frontend/scenes/engineeringAnalyticsFiltersLogic.ts
@@ -1,8 +1,7 @@
-import { actions, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers, selectors } from 'kea'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 
 import { EngineeringAnalyticsWorkflowHealthRunScope } from '../generated/api.schemas'
-import type { engineeringAnalyticsFiltersLogicType } from './engineeringAnalyticsFiltersLogicType'
 
 // One window shared by every time-scoped CI-analytics surface, so a window picked on one page carries
 // to the others. 7 days: long enough to read a week of spend, short enough that health reads as recent.
@@ -19,6 +18,53 @@ export interface BranchHealthParams {
     run_scope?: typeof PR_SCOPE
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface engineeringAnalyticsFiltersLogicValues {
+    appliedBranch: string
+    branchHealthParams: BranchHealthParams
+    branchInput: string
+    dateFrom: string | null
+    dateTo: string | null
+    pullRequestScope: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface engineeringAnalyticsFiltersLogicActions {
+    applyBranchFilter: () => {
+        value: true
+    }
+    scopeToPullRequests: () => {
+        value: true
+    }
+    setAppliedBranch: (branch: string) => {
+        branch: string
+    }
+    setBranchFilter: (branch: string) => {
+        branch: string
+    }
+    setDateRange: (
+        dateFrom: string | null,
+        dateTo: string | null
+    ) => {
+        dateFrom: string | null
+        dateTo: string | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface engineeringAnalyticsFiltersLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        branchHealthParams: (appliedBranch: string, pullRequestScope: boolean) => BranchHealthParams
+    }
+}
+
+export type engineeringAnalyticsFiltersLogicType = MakeLogicType<
+    engineeringAnalyticsFiltersLogicValues,
+    engineeringAnalyticsFiltersLogicActions,
+    Record<string, any>,
+    engineeringAnalyticsFiltersLogicMeta
+>
+
 // The branch scope is shared like the window. An exact branch is a server-side head_branch filter; the PR
 // lens is a run_scope. The two are mutually exclusive — the reducers keep an invalid "branch + lens" state
 // from ever existing — so a page only ever sees one of them.
@@ -66,7 +112,7 @@ export const engineeringAnalyticsFiltersLogic = kea<engineeringAnalyticsFiltersL
     selectors({
         branchHealthParams: [
             (s) => [s.appliedBranch, s.pullRequestScope],
-            (appliedBranch, pullRequestScope): BranchHealthParams =>
+            (appliedBranch: string, pullRequestScope: boolean): BranchHealthParams =>
                 pullRequestScope ? { run_scope: PR_SCOPE } : appliedBranch ? { branch: appliedBranch } : {},
         ],
     }),
diff --git a/products/engineering_analytics/frontend/scenes/engineeringAnalyticsLogic.ts b/products/engineering_analytics/frontend/scenes/engineeringAnalyticsLogic.ts
index a7468ba70889..20d9869ab9b0 100644
--- a/products/engineering_analytics/frontend/scenes/engineeringAnalyticsLogic.ts
+++ b/products/engineering_analytics/frontend/scenes/engineeringAnalyticsLogic.ts
@@ -1,4 +1,15 @@
-import { LogicWrapper, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    LogicWrapper,
+    actions,
+    afterMount,
+    connect,
+    kea,
+    listeners,
+    path,
+    reducers,
+    selectors,
+} from 'kea'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 
@@ -29,7 +40,7 @@ import type {
 import { CIStatus, ciStatusOf } from '../lib/ci'
 import { type FleetSummary, computeFleetSummary } from '../lib/runHealth'
 import { engineeringAnalyticsFiltersLogic } from './engineeringAnalyticsFiltersLogic'
-import type { engineeringAnalyticsLogicType } from './engineeringAnalyticsLogicType'
+import type { BranchHealthParams } from './engineeringAnalyticsFiltersLogic'
 
 // Mirrors the endpoint's server-side limit.
 export const PR_TABLE_LIMIT = 1000
@@ -541,6 +552,345 @@ export function loaderStatusFromError(errorObject: unknown): LoaderStatus {
     return errorObject instanceof ApiError && errorObject.status === 400 ? 'notConnected' : 'error'
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface engineeringAnalyticsLogicValues {
+    branchHealthParams: BranchHealthParams // engineeringAnalyticsFiltersLogic
+    dateFrom: string | null // engineeringAnalyticsFiltersLogic
+    dateTo: string | null // engineeringAnalyticsFiltersLogic
+    activeCard: CardFilter | null
+    activeQuarantineCard: QuarantineCard | null
+    activeSource: GitHubSourceApi | null
+    anyLoading: boolean
+    author: string | null
+    cards: CardsData | null
+    cardsLoading: boolean
+    cardsStatus: LoaderStatus
+    ciStatusFilter: CIStatusFilter
+    filteredPullRequests: PullRequestRow[]
+    filteredQuarantineEntries: QuarantineEntryRow[]
+    filteredWorkflowHealth: WorkflowHealthRow[]
+    filters: PullRequestFilters
+    flakyTestWindow: FlakyTestWindow
+    flakyTests: FlakyTestsData | null
+    flakyTestsLoading: boolean
+    flakyTestsStatus: LoaderStatus
+    fleetSummary: FleetSummary
+    fleetTruncated: boolean
+    githubSources: GitHubSourceApi[]
+    githubSourcesLoading: boolean
+    hasActiveFilters: boolean
+    hasActiveQuarantineFilters: boolean
+    hasActiveWorkflowFilters: boolean
+    hasMultipleSources: boolean
+    notConnected: boolean
+    pullRequests: PullRequestRow[]
+    pullRequestsLoadError: boolean
+    pullRequestsLoading: boolean
+    pullRequestsStatus: LoaderStatus
+    quarantine: QuarantineData | null
+    quarantineCounts: QuarantineCounts
+    quarantineFilters: QuarantineFilters
+    quarantineLifecycleFilter: QuarantineLifecycleFilter
+    quarantineLoadFailed: boolean
+    quarantineLoading: boolean
+    quarantineModal: QuarantineModalState | null
+    quarantineModeFilter: QuarantineModeFilter
+    quarantineOwner: string | null
+    quarantineOwnerOptions: string[]
+    quarantineSearch: string
+    quarantineSubmit: QuarantineRequestResultApi | null
+    quarantineSubmitLoading: boolean
+    readyCount: number
+    readyOnly: boolean
+    repo: string | null
+    search: string
+    sourceId: string | null
+    sourceOptions: {
+        label: string
+        value: string
+    }[]
+    stateFilter: PRStateFilter
+    stuckOnly: boolean
+    tableTruncated: boolean
+    thrashCount: number
+    thrashOnly: boolean
+    workflowCostAvailable: boolean
+    workflowFilters: WorkflowFilters
+    workflowHealth: WorkflowHealthRow[]
+    workflowHealthLoadError: boolean
+    workflowHealthLoading: boolean
+    workflowHealthStatus: LoaderStatus
+    workflowSearch: string
+    workflowStatusFilter: WorkflowStatusFilter
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface engineeringAnalyticsLogicActions {
+    applyCardFilter: (card: CardFilter) => {
+        card: CardFilter
+    }
+    applyQuarantineCard: (card: QuarantineCard) => {
+        card: QuarantineCard
+    }
+    closeQuarantineModal: () => {
+        value: true
+    }
+    loadCards: () => any
+    loadCardsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadCardsSuccess: (
+        cards: CardsData,
+        payload?: any
+    ) => {
+        cards: CardsData
+        payload?: any
+    }
+    loadFlakyTests: () => any
+    loadFlakyTestsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadFlakyTestsSuccess: (
+        flakyTests: FlakyTestsData,
+        payload?: any
+    ) => {
+        flakyTests: FlakyTestsData
+        payload?: any
+    }
+    loadGithubSources: () => any
+    loadGithubSourcesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadGithubSourcesSuccess: (
+        githubSources: GitHubSourceApi[],
+        payload?: any
+    ) => {
+        githubSources: GitHubSourceApi[]
+        payload?: any
+    }
+    loadPullRequests: () => any
+    loadPullRequestsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPullRequestsSuccess: (
+        pullRequests: PullRequestRow[],
+        payload?: any
+    ) => {
+        pullRequests: PullRequestRow[]
+        payload?: any
+    }
+    loadQuarantine: () => any
+    loadQuarantineFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadQuarantineSuccess: (
+        quarantine: QuarantineData,
+        payload?: any
+    ) => {
+        quarantine: QuarantineData
+        payload?: any
+    }
+    loadWorkflowHealth: () => any
+    loadWorkflowHealthFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadWorkflowHealthSuccess: (
+        workflowHealth: WorkflowHealthRow[],
+        payload?: any
+    ) => {
+        workflowHealth: WorkflowHealthRow[]
+        payload?: any
+    }
+    openQuarantineModal: (state: QuarantineModalState) => {
+        state: QuarantineModalState
+    }
+    refresh: () => {
+        value: true
+    }
+    resetFilters: () => {
+        value: true
+    }
+    resetQuarantineFilters: () => {
+        value: true
+    }
+    resetWorkflowFilters: () => {
+        value: true
+    }
+    setAuthor: (author: string | null) => {
+        author: string | null
+    }
+    setCiStatusFilter: (ciStatus: CIStatusFilter) => {
+        ciStatus: CIStatusFilter
+    }
+    setFlakyTestWindow: (window: FlakyTestWindow) => {
+        window: FlakyTestWindow
+    }
+    setQuarantineLifecycleFilter: (lifecycle: QuarantineLifecycleFilter) => {
+        lifecycle: QuarantineLifecycleFilter
+    }
+    setQuarantineModeFilter: (mode: QuarantineModeFilter) => {
+        mode: QuarantineModeFilter
+    }
+    setQuarantineOwner: (owner: string | null) => {
+        owner: string | null
+    }
+    setQuarantineSearch: (search: string) => {
+        search: string
+    }
+    setReadyOnly: (ready: boolean) => {
+        ready: boolean
+    }
+    setRepo: (repo: string | null) => {
+        repo: string | null
+    }
+    setSearch: (search: string) => {
+        search: string
+    }
+    setSourceId: (sourceId: string | null) => {
+        sourceId: string | null
+    }
+    setStateFilter: (state: PRStateFilter) => {
+        state: PRStateFilter
+    }
+    setStuckOnly: (stuckOnly: boolean) => {
+        stuckOnly: boolean
+    }
+    setThrashOnly: (thrash: boolean) => {
+        thrash: boolean
+    }
+    setWorkflowSearch: (search: string) => {
+        search: string
+    }
+    setWorkflowStatusFilter: (status: WorkflowStatusFilter) => {
+        status: WorkflowStatusFilter
+    }
+    submitQuarantine: ({ input }: { input: QuarantineSubmitInput }) => {
+        input: QuarantineSubmitInput
+    }
+    submitQuarantineFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    submitQuarantineSuccess: (
+        quarantineSubmit: QuarantineRequestResultApi,
+        payload?: {
+            input: QuarantineSubmitInput
+        }
+    ) => {
+        quarantineSubmit: QuarantineRequestResultApi
+        payload?: {
+            input: QuarantineSubmitInput
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface engineeringAnalyticsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        fleetSummary: (workflowHealth: WorkflowHealthRow[]) => FleetSummary
+        fleetTruncated: (workflowHealth: WorkflowHealthRow[]) => boolean
+        workflowFilters: (workflowSearch: string, workflowStatusFilter: WorkflowStatusFilter) => WorkflowFilters
+        filteredWorkflowHealth: (
+            workflowHealth: WorkflowHealthRow[],
+            workflowFilters: WorkflowFilters
+        ) => WorkflowHealthRow[]
+        hasActiveWorkflowFilters: (workflowFilters: WorkflowFilters) => boolean
+        workflowCostAvailable: (workflowHealth: WorkflowHealthRow[]) => boolean
+        filters: (
+            stateFilter: PRStateFilter,
+            author: string | null,
+            repo: string | null,
+            ciStatusFilter: CIStatusFilter,
+            search: string,
+            stuckOnly: boolean,
+            readyOnly: boolean,
+            thrashOnly: boolean
+        ) => PullRequestFilters
+        activeCard: (
+            stateFilter: PRStateFilter,
+            ciStatusFilter: CIStatusFilter,
+            stuckOnly: boolean,
+            readyOnly: boolean,
+            thrashOnly: boolean
+        ) => CardFilter | null
+        filteredPullRequests: (pullRequests: PullRequestRow[], filters: PullRequestFilters) => PullRequestRow[]
+        hasActiveFilters: (filters: PullRequestFilters) => boolean
+        readyCount: (pullRequests: PullRequestRow[]) => number
+        thrashCount: (pullRequests: PullRequestRow[]) => number
+        anyLoading: (
+            cardsLoading: boolean,
+            pullRequestsLoading: boolean,
+            workflowHealthLoading: boolean,
+            quarantineLoading: boolean
+        ) => boolean
+        notConnected: (
+            cardsStatus: LoaderStatus,
+            pullRequestsStatus: LoaderStatus,
+            workflowHealthStatus: LoaderStatus
+        ) => boolean
+        pullRequestsLoadError: (cardsStatus: LoaderStatus, pullRequestsStatus: LoaderStatus) => boolean
+        workflowHealthLoadError: (workflowHealthStatus: LoaderStatus) => boolean
+        tableTruncated: (pullRequests: PullRequestRow[]) => boolean
+        quarantineFilters: (
+            quarantineSearch: string,
+            quarantineLifecycleFilter: QuarantineLifecycleFilter,
+            quarantineModeFilter: QuarantineModeFilter,
+            quarantineOwner: string | null
+        ) => QuarantineFilters
+        filteredQuarantineEntries: (
+            quarantine: QuarantineData | null,
+            quarantineFilters: QuarantineFilters
+        ) => QuarantineEntryRow[]
+        quarantineCounts: (quarantine: QuarantineData | null) => QuarantineCounts
+        quarantineOwnerOptions: (quarantine: QuarantineData | null) => string[]
+        activeQuarantineCard: (
+            quarantineLifecycleFilter: QuarantineLifecycleFilter,
+            quarantineModeFilter: QuarantineModeFilter
+        ) => QuarantineCard | null
+        hasActiveQuarantineFilters: (quarantineFilters: QuarantineFilters) => boolean
+        hasMultipleSources: (githubSources: GitHubSourceApi[]) => boolean
+        activeSource: (githubSources: GitHubSourceApi[], sourceId: string | null) => GitHubSourceApi | null
+        sourceOptions: (githubSources: GitHubSourceApi[]) => {
+            label: string
+            value: string
+        }[]
+    }
+}
+
+export type engineeringAnalyticsLogicType = MakeLogicType<
+    engineeringAnalyticsLogicValues,
+    engineeringAnalyticsLogicActions,
+    Record<string, any>,
+    engineeringAnalyticsLogicMeta
+>
+
 export const engineeringAnalyticsLogic: LogicWrapper<engineeringAnalyticsLogicType> =
     kea<engineeringAnalyticsLogicType>([
         path(['products', 'engineering_analytics', 'frontend', 'scenes', 'engineeringAnalyticsLogic']),
@@ -875,24 +1225,24 @@ export const engineeringAnalyticsLogic: LogicWrapper<engineeringAnalyticsLogicTy
         selectors({
             fleetSummary: [
                 (s) => [s.workflowHealth],
-                (workflowHealth): FleetSummary => computeFleetSummary(workflowHealth),
+                (workflowHealth: WorkflowHealthRow[]): FleetSummary => computeFleetSummary(workflowHealth),
             ],
             fleetTruncated: [
                 (s) => [s.workflowHealth],
-                (workflowHealth): boolean => workflowHealth.length >= WORKFLOW_HEALTH_LIMIT,
+                (workflowHealth: WorkflowHealthRow[]): boolean => workflowHealth.length >= WORKFLOW_HEALTH_LIMIT,
             ],
             workflowFilters: [
                 (s) => [s.workflowSearch, s.workflowStatusFilter],
-                (search, status): WorkflowFilters => ({ search, status }),
+                (search: string, status: WorkflowStatusFilter): WorkflowFilters => ({ search, status }),
             ],
             filteredWorkflowHealth: [
                 (s) => [s.workflowHealth, s.workflowFilters],
-                (workflowHealth, workflowFilters): WorkflowHealthRow[] =>
+                (workflowHealth: WorkflowHealthRow[], workflowFilters: WorkflowFilters): WorkflowHealthRow[] =>
                     filterWorkflowHealth(workflowHealth, workflowFilters),
             ],
             hasActiveWorkflowFilters: [
                 (s) => [s.workflowFilters],
-                (workflowFilters): boolean =>
+                (workflowFilters: WorkflowFilters): boolean =>
                     !objectsEqual(
                         { ...workflowFilters, search: workflowFilters.search.trim() },
                         DEFAULT_WORKFLOW_FILTERS
@@ -901,7 +1251,7 @@ export const engineeringAnalyticsLogic: LogicWrapper<engineeringAnalyticsLogicTy
             // Until the job-level source syncs every cost field is null — scenes hide the column instead.
             workflowCostAvailable: [
                 (s) => [s.workflowHealth],
-                (workflowHealth): boolean =>
+                (workflowHealth: WorkflowHealthRow[]): boolean =>
                     workflowHealth.some((row) => row.billableMinutes != null || row.estimatedCostUsd != null),
             ],
             filters: [
@@ -916,14 +1266,14 @@ export const engineeringAnalyticsLogic: LogicWrapper<engineeringAnalyticsLogicTy
                     s.thrashOnly,
                 ],
                 (
-                    stateFilter,
-                    author,
-                    repo,
-                    ciStatus,
-                    search,
-                    stuckOnly,
-                    readyOnly,
-                    thrashOnly
+                    stateFilter: PRStateFilter,
+                    author: string | null,
+                    repo: string | null,
+                    ciStatus: CIStatusFilter,
+                    search: string,
+                    stuckOnly: boolean,
+                    readyOnly: boolean,
+                    thrashOnly: boolean
                 ): PullRequestFilters => ({
                     state: stateFilter,
                     author,
@@ -937,7 +1287,13 @@ export const engineeringAnalyticsLogic: LogicWrapper<engineeringAnalyticsLogicTy
             ],
             activeCard: [
                 (s) => [s.stateFilter, s.ciStatusFilter, s.stuckOnly, s.readyOnly, s.thrashOnly],
-                (stateFilter, ciStatus, stuckOnly, readyOnly, thrashOnly): CardFilter | null => {
+                (
+                    stateFilter: PRStateFilter,
+                    ciStatus: CIStatusFilter,
+                    stuckOnly: boolean,
+                    readyOnly: boolean,
+                    thrashOnly: boolean
+                ): CardFilter | null => {
                     if (stateFilter !== 'open') {
                         return null
                     }
@@ -958,57 +1314,81 @@ export const engineeringAnalyticsLogic: LogicWrapper<engineeringAnalyticsLogicTy
             ],
             filteredPullRequests: [
                 (s) => [s.pullRequests, s.filters],
-                (pullRequests, filters): PullRequestRow[] => filterPullRequests(pullRequests, filters),
+                (pullRequests: PullRequestRow[], filters: PullRequestFilters): PullRequestRow[] =>
+                    filterPullRequests(pullRequests, filters),
             ],
             hasActiveFilters: [
                 (s) => [s.filters],
-                (filters): boolean => !objectsEqual({ ...filters, search: filters.search.trim() }, DEFAULT_FILTERS),
+                (filters: PullRequestFilters): boolean =>
+                    !objectsEqual({ ...filters, search: filters.search.trim() }, DEFAULT_FILTERS),
             ],
             // Counted over the loaded list (the "most recent 1000" cap applies), not a separate backend
             // aggregate like the ci_cards counts — fine while a repo's open backlog fits in that window.
-            readyCount: [(s) => [s.pullRequests], (pullRequests): number => pullRequests.filter(isReady).length],
-            thrashCount: [(s) => [s.pullRequests], (pullRequests): number => pullRequests.filter(isThrashing).length],
+            readyCount: [
+                (s) => [s.pullRequests],
+                (pullRequests: PullRequestRow[]): number => pullRequests.filter(isReady).length,
+            ],
+            thrashCount: [
+                (s) => [s.pullRequests],
+                (pullRequests: PullRequestRow[]): number => pullRequests.filter(isThrashing).length,
+            ],
             anyLoading: [
                 (s) => [s.cardsLoading, s.pullRequestsLoading, s.workflowHealthLoading, s.quarantineLoading],
-                (cardsLoading, pullRequestsLoading, workflowHealthLoading, quarantineLoading): boolean =>
-                    cardsLoading || pullRequestsLoading || workflowHealthLoading || quarantineLoading,
+                (
+                    cardsLoading: boolean,
+                    pullRequestsLoading: boolean,
+                    workflowHealthLoading: boolean,
+                    quarantineLoading: boolean
+                ): boolean => cardsLoading || pullRequestsLoading || workflowHealthLoading || quarantineLoading,
             ],
             notConnected: [
                 (s) => [s.cardsStatus, s.pullRequestsStatus, s.workflowHealthStatus],
-                (cardsStatus, pullRequestsStatus, workflowHealthStatus): boolean =>
-                    [cardsStatus, pullRequestsStatus, workflowHealthStatus].includes('notConnected'),
+                (
+                    cardsStatus: LoaderStatus,
+                    pullRequestsStatus: LoaderStatus,
+                    workflowHealthStatus: LoaderStatus
+                ): boolean => [cardsStatus, pullRequestsStatus, workflowHealthStatus].includes('notConnected'),
             ],
             // Each scene's error state reacts only to the loaders it renders (see LoaderStatus).
             pullRequestsLoadError: [
                 (s) => [s.cardsStatus, s.pullRequestsStatus],
-                (cardsStatus, pullRequestsStatus): boolean => cardsStatus === 'error' || pullRequestsStatus === 'error',
+                (cardsStatus: LoaderStatus, pullRequestsStatus: LoaderStatus): boolean =>
+                    cardsStatus === 'error' || pullRequestsStatus === 'error',
             ],
             workflowHealthLoadError: [
                 (s) => [s.workflowHealthStatus],
-                (workflowHealthStatus): boolean => workflowHealthStatus === 'error',
+                (workflowHealthStatus: LoaderStatus): boolean => workflowHealthStatus === 'error',
+            ],
+            tableTruncated: [
+                (s) => [s.pullRequests],
+                (pullRequests: PullRequestRow[]): boolean => pullRequests.length >= PR_TABLE_LIMIT,
             ],
-            tableTruncated: [(s) => [s.pullRequests], (pullRequests): boolean => pullRequests.length >= PR_TABLE_LIMIT],
             quarantineFilters: [
                 (s) => [s.quarantineSearch, s.quarantineLifecycleFilter, s.quarantineModeFilter, s.quarantineOwner],
-                (search, lifecycle, mode, owner): QuarantineFilters => ({ search, lifecycle, mode, owner }),
+                (
+                    search: string,
+                    lifecycle: QuarantineLifecycleFilter,
+                    mode: QuarantineModeFilter,
+                    owner: string | null
+                ): QuarantineFilters => ({ search, lifecycle, mode, owner }),
             ],
             filteredQuarantineEntries: [
                 (s) => [s.quarantine, s.quarantineFilters],
-                (quarantine, filters): QuarantineEntryRow[] =>
+                (quarantine: QuarantineData | null, filters: QuarantineFilters): QuarantineEntryRow[] =>
                     quarantine ? filterQuarantineEntries(quarantine.entries, filters) : [],
             ],
             quarantineCounts: [
                 (s) => [s.quarantine],
-                (quarantine): QuarantineCounts => quarantineCountsOf(quarantine?.entries ?? []),
+                (quarantine: QuarantineData | null): QuarantineCounts => quarantineCountsOf(quarantine?.entries ?? []),
             ],
             quarantineOwnerOptions: [
                 (s) => [s.quarantine],
-                (quarantine): string[] =>
+                (quarantine: QuarantineData | null): string[] =>
                     Array.from(new Set((quarantine?.entries ?? []).map((entry) => entry.owner).filter(Boolean))).sort(),
             ],
             activeQuarantineCard: [
                 (s) => [s.quarantineLifecycleFilter, s.quarantineModeFilter],
-                (lifecycle, mode): QuarantineCard | null => {
+                (lifecycle: QuarantineLifecycleFilter, mode: QuarantineModeFilter): QuarantineCard | null => {
                     if (mode === 'skip' && lifecycle === 'all') {
                         return 'skipped'
                     }
@@ -1023,19 +1403,22 @@ export const engineeringAnalyticsLogic: LogicWrapper<engineeringAnalyticsLogicTy
             ],
             hasActiveQuarantineFilters: [
                 (s) => [s.quarantineFilters],
-                (filters): boolean =>
+                (filters: QuarantineFilters): boolean =>
                     !objectsEqual({ ...filters, search: filters.search.trim() }, DEFAULT_QUARANTINE_FILTERS),
             ],
-            hasMultipleSources: [(s) => [s.githubSources], (githubSources): boolean => githubSources.length > 1],
+            hasMultipleSources: [
+                (s) => [s.githubSources],
+                (githubSources: GitHubSourceApi[]): boolean => githubSources.length > 1,
+            ],
             // The source reads resolve to: the picked one, else the backend default (oldest connected = first).
             activeSource: [
                 (s) => [s.githubSources, s.sourceId],
-                (githubSources, sourceId): GitHubSourceApi | null =>
+                (githubSources: GitHubSourceApi[], sourceId: string | null): GitHubSourceApi | null =>
                     (sourceId ? githubSources.find((source) => source.id === sourceId) : githubSources[0]) ?? null,
             ],
             sourceOptions: [
                 (s) => [s.githubSources],
-                (githubSources): { value: string; label: string }[] =>
+                (githubSources: GitHubSourceApi[]): { value: string; label: string }[] =>
                     githubSources.map((source) => ({
                         value: source.id,
                         label: source.repo || source.prefix || `source ${source.id.slice(0, 8)}`,
diff --git a/products/engineering_analytics/frontend/scenes/engineeringAnalyticsSceneLogic.ts b/products/engineering_analytics/frontend/scenes/engineeringAnalyticsSceneLogic.ts
index b9791a22e2b0..96935281ba75 100644
--- a/products/engineering_analytics/frontend/scenes/engineeringAnalyticsSceneLogic.ts
+++ b/products/engineering_analytics/frontend/scenes/engineeringAnalyticsSceneLogic.ts
@@ -1,9 +1,7 @@
-import { connect, kea, path, selectors } from 'kea'
+import { MakeLogicType, connect, kea, path, selectors } from 'kea'
 
 import { sceneLogic } from '~/scenes/sceneLogic'
 
-import type { engineeringAnalyticsSceneLogicType } from './engineeringAnalyticsSceneLogicType'
-
 /** The root scene's views: the repo hub landing, the PR list page, the workflow list page, and test health. */
 export type EngineeringAnalyticsView = 'hub' | 'pull-requests' | 'workflows' | 'test-health'
 
@@ -21,6 +19,21 @@ const SCENE_KEY_TO_VIEW: Record<string, EngineeringAnalyticsView> = {
     engineeringAnalyticsTestHealth: 'test-health',
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface engineeringAnalyticsSceneLogicValues {
+    sceneKey: string | null; // sceneLogic
+    activeView: EngineeringAnalyticsView;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface engineeringAnalyticsSceneLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        activeView: (sceneKey: string | null) => EngineeringAnalyticsView;
+    };
+}
+
+export type engineeringAnalyticsSceneLogicType = MakeLogicType<engineeringAnalyticsSceneLogicValues, {}, Record<string, any>, engineeringAnalyticsSceneLogicMeta>;
+
 export const engineeringAnalyticsSceneLogic = kea<engineeringAnalyticsSceneLogicType>([
     path(['products', 'engineering_analytics', 'frontend', 'scenes', 'engineeringAnalyticsSceneLogic']),
     connect(() => ({
diff --git a/products/engineering_analytics/frontend/scenes/pullRequestDetailLogic.ts b/products/engineering_analytics/frontend/scenes/pullRequestDetailLogic.ts
index e0818aec6f35..f90c82dee844 100644
--- a/products/engineering_analytics/frontend/scenes/pullRequestDetailLogic.ts
+++ b/products/engineering_analytics/frontend/scenes/pullRequestDetailLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { ApiConfig } from 'lib/api'
@@ -29,7 +29,6 @@ import {
     isPassingConclusion,
     summarizeLifecycle,
 } from '../lib/lifecycle'
-import type { pullRequestDetailLogicType } from './pullRequestDetailLogicType'
 
 const projectId = (): string => String(ApiConfig.getCurrentProjectId())
 
@@ -163,6 +162,187 @@ export function groupRunsByCommit(prRuns: WorkflowRunDetailApi[]): PrCommitRuns[
     return groups
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface pullRequestDetailLogicValues {
+    breadcrumbs: Breadcrumb[]
+    commitGroups: PrCommitRuns[]
+    expandedRunKeys: string[]
+    failingJobLabelByWorkflow: Record<string, string>
+    failureLogs: CIFailureLogsApi | 'unavailable' | null
+    failureLogsLoading: boolean
+    filteredCommitGroups: PrCommitRuns[]
+    filteredPrWorkflowRows: PrWorkflowRow[]
+    filteredRuns: PrRunRow[]
+    latestPushStats: LatestPushStats | null
+    lifecycle: PRLifecycleApi | null
+    lifecycleLoading: boolean
+    loadFailed: boolean
+    prCost: PRCostSummaryApi | null
+    prCostLoading: boolean
+    prRuns: WorkflowRunDetailApi[]
+    prRunsFailed: boolean
+    prRunsLoading: boolean
+    prWorkflowRows: PrWorkflowRow[]
+    pushes: number
+    repoName: string
+    repoOwner: string
+    rerunCycles: number
+    runCostByKey: Record<
+        string,
+        {
+            cost: number | null
+            minutes: number | null
+        }
+    >
+    runJobs: Record<string, WorkflowJobApi[]>
+    runJobsLoading: boolean
+    runs: WorkflowRun[]
+    sourceId: string | null
+    summary: LifecycleSummary | null
+    workflowFilter: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface pullRequestDetailLogicActions {
+    loadFailureLogs: () => any
+    loadFailureLogsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadFailureLogsSuccess: (
+        failureLogs: CIFailureLogsApi | 'unavailable',
+        payload?: any
+    ) => {
+        failureLogs: CIFailureLogsApi | 'unavailable'
+        payload?: any
+    }
+    loadJobs: ({ runId, runAttempt }: { runAttempt: number | null; runId: number }) => {
+        runId: number
+        runAttempt: number | null
+    }
+    loadJobsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadJobsSuccess: (
+        runJobs: Record<string, WorkflowJobApi[]>,
+        payload?: {
+            runId: number
+            runAttempt: number | null
+        }
+    ) => {
+        runJobs: Record<string, WorkflowJobApi[]>
+        payload?: {
+            runId: number
+            runAttempt: number | null
+        }
+    }
+    loadLifecycle: () => any
+    loadLifecycleFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadLifecycleSuccess: (
+        lifecycle: PRLifecycleApi | null,
+        payload?: any
+    ) => {
+        lifecycle: PRLifecycleApi | null
+        payload?: any
+    }
+    loadPrCost: () => any
+    loadPrCostFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPrCostSuccess: (
+        prCost: PRCostSummaryApi | null,
+        payload?: any
+    ) => {
+        prCost: PRCostSummaryApi | null
+        payload?: any
+    }
+    loadPrRuns: () => any
+    loadPrRunsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPrRunsSuccess: (
+        prRuns: WorkflowRunDetailApi[],
+        payload?: any
+    ) => {
+        prRuns: WorkflowRunDetailApi[]
+        payload?: any
+    }
+    setRunExpanded: (
+        rowKey: string,
+        expanded: boolean,
+        runId: number | null,
+        runAttempt: number | null
+    ) => {
+        expanded: boolean
+        rowKey: string
+        runAttempt: number | null
+        runId: number | null
+    }
+    setWorkflowFilter: (filter: string) => {
+        filter: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface pullRequestDetailLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        sourceId: (arg: string | null) => string | null
+        repoOwner: (arg: string) => string
+        repoName: (arg: string) => string
+        summary: (lifecycle: PRLifecycleApi | null) => LifecycleSummary | null
+        runs: (prRuns: WorkflowRunDetailApi[]) => WorkflowRun[]
+        commitGroups: (prRuns: WorkflowRunDetailApi[]) => PrCommitRuns[]
+        filteredCommitGroups: (commitGroups: PrCommitRuns[], workflowFilter: string) => PrCommitRuns[]
+        filteredRuns: (filteredCommitGroups: PrCommitRuns[]) => PrRunRow[]
+        prWorkflowRows: (commitGroups: PrCommitRuns[], prCost: PRCostSummaryApi | null) => PrWorkflowRow[]
+        runCostByKey: (prCost: PRCostSummaryApi | null) => Record<
+            string,
+            {
+                cost: number | null
+                minutes: number | null
+            }
+        >
+        filteredPrWorkflowRows: (prWorkflowRows: PrWorkflowRow[], workflowFilter: string) => PrWorkflowRow[]
+        latestPushStats: (commitGroups: PrCommitRuns[]) => LatestPushStats | null
+        failingJobLabelByWorkflow: (
+            filteredRuns: PrRunRow[],
+            runJobs: Record<string, WorkflowJobApi[]>
+        ) => Record<string, string>
+        pushes: (prRuns: WorkflowRunDetailApi[]) => number
+        rerunCycles: (prRuns: WorkflowRunDetailApi[]) => number
+        breadcrumbs: (repoOwner: string, repoName: string, number: number) => Breadcrumb[]
+    }
+}
+
+export type pullRequestDetailLogicType = MakeLogicType<
+    pullRequestDetailLogicValues,
+    pullRequestDetailLogicActions,
+    PullRequestDetailLogicProps,
+    pullRequestDetailLogicMeta
+>
+
 export const pullRequestDetailLogic = kea<pullRequestDetailLogicType>([
     path(['products', 'engineering_analytics', 'frontend', 'scenes', 'pullRequestDetailLogic']),
     props({} as PullRequestDetailLogicProps),
@@ -306,19 +486,29 @@ export const pullRequestDetailLogic = kea<pullRequestDetailLogicType>([
     })),
 
     selectors({
-        sourceId: [() => [(_, p: PullRequestDetailLogicProps) => p.sourceId], (sourceId): string | null => sourceId],
-        repoOwner: [() => [(_, p: PullRequestDetailLogicProps) => p.repoOwner], (repoOwner): string => repoOwner],
-        repoName: [() => [(_, p: PullRequestDetailLogicProps) => p.repoName], (repoName): string => repoName],
+        sourceId: [
+            () => [(_, p: PullRequestDetailLogicProps) => p.sourceId],
+            (sourceId: string | null): string | null => sourceId,
+        ],
+        repoOwner: [
+            () => [(_, p: PullRequestDetailLogicProps) => p.repoOwner],
+            (repoOwner: string): string => repoOwner,
+        ],
+        repoName: [() => [(_, p: PullRequestDetailLogicProps) => p.repoName], (repoName: string): string => repoName],
         summary: [
             (s) => [s.lifecycle],
-            (lifecycle): LifecycleSummary | null => (lifecycle ? summarizeLifecycle(lifecycle.events) : null),
+            (lifecycle: PRLifecycleApi | null): LifecycleSummary | null =>
+                lifecycle ? summarizeLifecycle(lifecycle.events) : null,
+        ],
+        runs: [(s) => [s.prRuns], (prRuns: WorkflowRunDetailApi[]): WorkflowRun[] => prRuns.map(toWorkflowRun)],
+        commitGroups: [
+            (s) => [s.prRuns],
+            (prRuns: WorkflowRunDetailApi[]): PrCommitRuns[] => groupRunsByCommit(prRuns),
         ],
-        runs: [(s) => [s.prRuns], (prRuns): WorkflowRun[] => prRuns.map(toWorkflowRun)],
-        commitGroups: [(s) => [s.prRuns], (prRuns): PrCommitRuns[] => groupRunsByCommit(prRuns)],
         // Groups with their runs narrowed to the workflow filter; groups with no match drop out.
         filteredCommitGroups: [
             (s) => [s.commitGroups, s.workflowFilter],
-            (commitGroups, workflowFilter): PrCommitRuns[] => {
+            (commitGroups: PrCommitRuns[], workflowFilter: string): PrCommitRuns[] => {
                 const query = workflowFilter.trim().toLowerCase()
                 if (!query) {
                     return commitGroups
@@ -334,7 +524,7 @@ export const pullRequestDetailLogic = kea<pullRequestDetailLogicType>([
         // Flat run list (newest push first), each run tagged with its commit.
         filteredRuns: [
             (s) => [s.filteredCommitGroups],
-            (groups): PrRunRow[] =>
+            (groups: PrCommitRuns[]): PrRunRow[] =>
                 groups.flatMap((group) =>
                     group.runs.map((run) => ({ ...run, headSha: group.headSha, headBranch: group.headBranch }))
                 ),
@@ -343,7 +533,7 @@ export const pullRequestDetailLogic = kea<pullRequestDetailLogicType>([
         // the verdict column derives from latestRunPerWorkflow separately.
         prWorkflowRows: [
             (s) => [s.commitGroups, s.prCost],
-            (commitGroups, prCost): PrWorkflowRow[] => {
+            (commitGroups: PrCommitRuns[], prCost: PRCostSummaryApi | null): PrWorkflowRow[] => {
                 const costByWorkflow = new Map((prCost?.by_workflow ?? []).map((cost) => [cost.workflow_name, cost]))
                 const workflowNames: string[] = []
                 const seen = new Set<string>()
@@ -375,7 +565,7 @@ export const pullRequestDetailLogic = kea<pullRequestDetailLogicType>([
         // Per-run cost keyed by jobCacheKey(run_id, run_attempt); empty when the job source isn't synced.
         runCostByKey: [
             (s) => [s.prCost],
-            (prCost): Record<string, { minutes: number | null; cost: number | null }> => {
+            (prCost: PRCostSummaryApi | null): Record<string, { minutes: number | null; cost: number | null }> => {
                 const map: Record<string, { minutes: number | null; cost: number | null }> = {}
                 for (const rc of prCost?.by_run ?? []) {
                     map[jobCacheKey(rc.run_id, rc.run_attempt)] = {
@@ -395,12 +585,12 @@ export const pullRequestDetailLogic = kea<pullRequestDetailLogicType>([
         ],
         latestPushStats: [
             (s) => [s.commitGroups],
-            (commitGroups): LatestPushStats | null => computeLatestPushStats(commitGroups[0]),
+            (commitGroups: PrCommitRuns[]): LatestPushStats | null => computeLatestPushStats(commitGroups[0]),
         ],
         // workflow → "what failed" label (de-sharded failing job names); missing = jobs not loaded yet.
         failingJobLabelByWorkflow: [
             (s) => [s.filteredRuns, s.runJobs],
-            (filteredRuns, runJobs): Record<string, string> => {
+            (filteredRuns: PrRunRow[], runJobs: Record<string, WorkflowJobApi[]>): Record<string, string> => {
                 const labels: Record<string, string> = {}
                 for (const [workflow, run] of latestRunPerWorkflow(filteredRuns)) {
                     if (run.conclusion == null || isPassingConclusion(run.conclusion) || run.runId == null) {
@@ -423,11 +613,17 @@ export const pullRequestDetailLogic = kea<pullRequestDetailLogicType>([
             },
         ],
         // Both match the backend definitions (`pushes`, `rerun_cycles`).
-        pushes: [(s) => [s.prRuns], (prRuns): number => new Set(prRuns.map((run) => run.head_sha)).size],
-        rerunCycles: [(s) => [s.prRuns], (prRuns): number => prRuns.filter((run) => (run.run_attempt ?? 1) > 1).length],
+        pushes: [
+            (s) => [s.prRuns],
+            (prRuns: WorkflowRunDetailApi[]): number => new Set(prRuns.map((run) => run.head_sha)).size,
+        ],
+        rerunCycles: [
+            (s) => [s.prRuns],
+            (prRuns: WorkflowRunDetailApi[]): number => prRuns.filter((run) => (run.run_attempt ?? 1) > 1).length,
+        ],
         breadcrumbs: [
             (_, p) => [p.repoOwner, p.repoName, p.number],
-            (repoOwner, repoName, number): Breadcrumb[] => [
+            (repoOwner: string, repoName: string, number: number): Breadcrumb[] => [
                 {
                     key: 'EngineeringAnalytics',
                     name: 'Engineering analytics',
diff --git a/products/engineering_analytics/frontend/scenes/repoOverviewLogic.ts b/products/engineering_analytics/frontend/scenes/repoOverviewLogic.ts
index 3d1a0accc228..7f86a6f4447e 100644
--- a/products/engineering_analytics/frontend/scenes/repoOverviewLogic.ts
+++ b/products/engineering_analytics/frontend/scenes/repoOverviewLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { ApiConfig } from 'lib/api'
@@ -23,7 +23,7 @@ import { ciStatusOf } from '../lib/ci'
 import { HUB_PREVIEW_MAX, HUB_PREVIEW_ROWS, HUB_PREVIEW_STEP } from '../lib/preview'
 import { engineeringAnalyticsFiltersLogic } from './engineeringAnalyticsFiltersLogic'
 import { PullRequestRow, STUCK_AFTER_DAYS, engineeringAnalyticsLogic, isStuck } from './engineeringAnalyticsLogic'
-import type { repoOverviewLogicType } from './repoOverviewLogicType'
+import type { CardsData, WorkflowHealthRow } from './engineeringAnalyticsLogic'
 
 const projectId = (): string => String(ApiConfig.getCurrentProjectId())
 
@@ -44,6 +44,198 @@ export interface CurrentHealthSummary {
     failingWorkflowNames: string[]
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface repoOverviewLogicValues {
+    dateFrom: string | null // engineeringAnalyticsFiltersLogic
+    dateTo: string | null // engineeringAnalyticsFiltersLogic
+    cards: CardsData | null // engineeringAnalyticsLogic
+    notConnected: boolean // engineeringAnalyticsLogic
+    pullRequests: PullRequestRow[] // engineeringAnalyticsLogic
+    pullRequestsLoading: boolean // engineeringAnalyticsLogic
+    sourceId: string | null // engineeringAnalyticsLogic
+    workflowHealth: WorkflowHealthRow[] // engineeringAnalyticsLogic
+    workflowHealthLoading: boolean // engineeringAnalyticsLogic
+    activityRuns: ActivityRun[]
+    activityTruncated: boolean
+    attentionPrs: PullRequestRow[]
+    costByWorkflow: CostShareRow[]
+    costPerMergeSeries: {
+        interval: 'day' | 'hour' | 'week'
+        labels: string[]
+        values: number[]
+    } | null
+    currentBranchHealth: CurrentBranchHealthApi | null
+    currentBranchHealthFailed: boolean
+    currentBranchHealthLoading: boolean
+    currentDefaultBranch: string
+    currentHealthSummary: CurrentHealthSummary
+    draftCount: number
+    failureLogs: Record<number, RunFailureLogsApi | 'unavailable'>
+    failureLogsLoading: boolean
+    jobsAvailable: boolean
+    masterFailures: MasterFailureGroupApi[]
+    masterFailuresLoading: boolean
+    openToMergeSeries: {
+        labels: string[]
+        values: number[]
+    } | null
+    otherCostWorkflowCount: number
+    overview: RepoOverviewApi | null
+    overviewDefaultBranch: string
+    overviewFailed: boolean
+    overviewLoading: boolean
+    passRateSeries: {
+        labels: string[]
+        values: number[]
+    } | null
+    prPreviewCount: number
+    repoActivity: WorkflowRunActivityApi
+    repoActivityFailed: boolean
+    repoActivityLoading: boolean
+    timeToGreenSeries: {
+        labels: string[]
+        values: number[]
+    } | null
+    workflowPreviewCount: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface repoOverviewLogicActions {
+    loadCurrentBranchHealth: (_: void) => void
+    loadCurrentBranchHealthFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadCurrentBranchHealthSuccess: (
+        currentBranchHealth: CurrentBranchHealthApi,
+        payload?: void
+    ) => {
+        currentBranchHealth: CurrentBranchHealthApi
+        payload?: void
+    }
+    loadFailureLogs: ({ runId }: { runId: number }) => {
+        runId: number
+    }
+    loadFailureLogsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadFailureLogsSuccess: (
+        failureLogs: Record<number, RunFailureLogsApi | 'unavailable'>,
+        payload?: {
+            runId: number
+        }
+    ) => {
+        failureLogs: Record<number, RunFailureLogsApi | 'unavailable'>
+        payload?: {
+            runId: number
+        }
+    }
+    loadLogsForRun: (runId: number) => {
+        runId: number
+    }
+    loadMasterFailures: () => any
+    loadMasterFailuresFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadMasterFailuresSuccess: (
+        masterFailures: MasterFailureGroupApi[],
+        payload?: any
+    ) => {
+        masterFailures: MasterFailureGroupApi[]
+        payload?: any
+    }
+    loadOverview: () => any
+    loadOverviewFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadOverviewSuccess: (
+        overview: RepoOverviewApi,
+        payload?: any
+    ) => {
+        overview: RepoOverviewApi
+        payload?: any
+    }
+    loadRepoActivity: () => any
+    loadRepoActivityFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRepoActivitySuccess: (
+        repoActivity: WorkflowRunActivityApi,
+        payload?: any
+    ) => {
+        repoActivity: WorkflowRunActivityApi
+        payload?: any
+    }
+    showMorePrs: () => {
+        value: true
+    }
+    showMoreWorkflows: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface repoOverviewLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        jobsAvailable: (overview: RepoOverviewApi | null) => boolean
+        overviewDefaultBranch: (overview: RepoOverviewApi | null) => string
+        currentDefaultBranch: (
+            currentBranchHealth: CurrentBranchHealthApi | null,
+            overviewDefaultBranch: string
+        ) => string
+        currentHealthSummary: (currentBranchHealth: CurrentBranchHealthApi | null) => CurrentHealthSummary
+        activityRuns: (repoActivity: WorkflowRunActivityApi) => ActivityRun[]
+        activityTruncated: (repoActivity: WorkflowRunActivityApi) => boolean
+        attentionPrs: (pullRequests: PullRequestRow[]) => PullRequestRow[]
+        draftCount: (pullRequests: PullRequestRow[]) => number
+        costByWorkflow: (workflowHealth: WorkflowHealthRow[]) => CostShareRow[]
+        otherCostWorkflowCount: (workflowHealth: WorkflowHealthRow[]) => number
+        costPerMergeSeries: (overview: RepoOverviewApi | null) => {
+            interval: 'day' | 'hour' | 'week'
+            labels: string[]
+            values: number[]
+        } | null
+        timeToGreenSeries: (overview: RepoOverviewApi | null) => {
+            labels: string[]
+            values: number[]
+        } | null
+        passRateSeries: (overview: RepoOverviewApi | null) => {
+            labels: string[]
+            values: number[]
+        } | null
+        openToMergeSeries: (overview: RepoOverviewApi | null) => {
+            labels: string[]
+            values: number[]
+        } | null
+    }
+}
+
+export type repoOverviewLogicType = MakeLogicType<
+    repoOverviewLogicValues,
+    repoOverviewLogicActions,
+    Record<string, any>,
+    repoOverviewLogicMeta
+>
+
 export const repoOverviewLogic = kea<repoOverviewLogicType>([
     path(['products', 'engineering_analytics', 'frontend', 'scenes', 'repoOverviewLogic']),
 
@@ -183,16 +375,22 @@ export const repoOverviewLogic = kea<repoOverviewLogicType>([
     }),
 
     selectors({
-        jobsAvailable: [(s) => [s.overview], (overview): boolean => overview?.jobs_available ?? false],
-        overviewDefaultBranch: [(s) => [s.overview], (overview): string => overview?.default_branch ?? 'master'],
+        jobsAvailable: [
+            (s) => [s.overview],
+            (overview: RepoOverviewApi | null): boolean => overview?.jobs_available ?? false,
+        ],
+        overviewDefaultBranch: [
+            (s) => [s.overview],
+            (overview: RepoOverviewApi | null): string => overview?.default_branch ?? 'master',
+        ],
         currentDefaultBranch: [
             (s) => [s.currentBranchHealth, s.overviewDefaultBranch],
-            (currentBranchHealth, overviewDefaultBranch): string =>
+            (currentBranchHealth: CurrentBranchHealthApi | null, overviewDefaultBranch: string): string =>
                 currentBranchHealth?.default_branch ?? overviewDefaultBranch,
         ],
         currentHealthSummary: [
             (s) => [s.currentBranchHealth],
-            (currentBranchHealth): CurrentHealthSummary => ({
+            (currentBranchHealth: CurrentBranchHealthApi | null): CurrentHealthSummary => ({
                 settledWorkflows: currentBranchHealth?.settled_workflows ?? 0,
                 failingNow: currentBranchHealth?.failing_workflows ?? 0,
                 failingWorkflowNames: currentBranchHealth?.failing_workflow_names ?? [],
@@ -202,7 +400,7 @@ export const repoOverviewLogic = kea<repoOverviewLogicType>([
         // commit: start time, wall-clock CI duration, overall verdict).
         activityRuns: [
             (s) => [s.repoActivity],
-            (repoActivity): ActivityRun[] =>
+            (repoActivity: WorkflowRunActivityApi): ActivityRun[] =>
                 repoActivity.points.map((point) => ({
                     runId: point.run_id,
                     conclusion: point.conclusion,
@@ -213,11 +411,14 @@ export const repoOverviewLogic = kea<repoOverviewLogicType>([
                     headSha: point.head_sha,
                 })),
         ],
-        activityTruncated: [(s) => [s.repoActivity], (repoActivity): boolean => repoActivity.truncated],
+        activityTruncated: [
+            (s) => [s.repoActivity],
+            (repoActivity: WorkflowRunActivityApi): boolean => repoActivity.truncated,
+        ],
         // Open PRs with failing CI or stuck (open >7d, non-draft, non-bot) — not the full open list.
         attentionPrs: [
             (s) => [s.pullRequests],
-            (pullRequests): PullRequestRow[] => {
+            (pullRequests: PullRequestRow[]): PullRequestRow[] => {
                 const stuckCutoffMs = dayjs().subtract(STUCK_AFTER_DAYS, 'day').valueOf()
                 return pullRequests
                     .filter(
@@ -228,11 +429,12 @@ export const repoOverviewLogic = kea<repoOverviewLogicType>([
         ],
         draftCount: [
             (s) => [s.pullRequests],
-            (pullRequests): number => pullRequests.filter((row) => row.state === 'open' && row.isDraft).length,
+            (pullRequests: PullRequestRow[]): number =>
+                pullRequests.filter((row) => row.state === 'open' && row.isDraft).length,
         ],
         costByWorkflow: [
             (s) => [s.workflowHealth],
-            (workflowHealth): CostShareRow[] => {
+            (workflowHealth: import('./engineeringAnalyticsLogic').WorkflowHealthRow[]): CostShareRow[] => {
                 const costed = workflowHealth.filter((row) => (row.estimatedCostUsd ?? 0) > 0)
                 if (!costed.length) {
                     return []
@@ -255,7 +457,7 @@ export const repoOverviewLogic = kea<repoOverviewLogicType>([
         ],
         otherCostWorkflowCount: [
             (s) => [s.workflowHealth],
-            (workflowHealth): number =>
+            (workflowHealth: import('./engineeringAnalyticsLogic').WorkflowHealthRow[]): number =>
                 Math.max(
                     0,
                     workflowHealth.filter((row) => (row.estimatedCostUsd ?? 0) > 0).length - TOP_COST_WORKFLOWS
@@ -268,7 +470,9 @@ export const repoOverviewLogic = kea<repoOverviewLogicType>([
         // Labels stay ISO — the quill time-series chart owns tick/tooltip date formatting.
         costPerMergeSeries: [
             (s) => [s.overview],
-            (overview): { values: number[]; labels: string[]; interval: 'hour' | 'day' | 'week' } | null => {
+            (
+                overview: RepoOverviewApi | null
+            ): { values: number[]; labels: string[]; interval: 'hour' | 'day' | 'week' } | null => {
                 const series = overview?.cost_series ?? []
                 const firstData = series.findIndex((bucket) => bucket.cost_per_merge_usd != null)
                 if (firstData === -1) {
@@ -288,7 +492,7 @@ export const repoOverviewLogic = kea<repoOverviewLogicType>([
         // Null when no bucket has a successful PR run, so the card shows its own empty state.
         timeToGreenSeries: [
             (s) => [s.overview],
-            (overview): { values: number[]; labels: string[] } | null => {
+            (overview: RepoOverviewApi | null): { values: number[]; labels: string[] } | null => {
                 const series = overview?.time_to_green_series ?? []
                 const firstData = series.findIndex((bucket) => bucket.p50_seconds != null)
                 if (firstData === -1) {
@@ -311,7 +515,7 @@ export const repoOverviewLogic = kea<repoOverviewLogicType>([
         // bucket has a completed run, so the card shows its own empty state.
         passRateSeries: [
             (s) => [s.overview],
-            (overview): { values: number[]; labels: string[] } | null => {
+            (overview: RepoOverviewApi | null): { values: number[]; labels: string[] } | null => {
                 const series = overview?.success_rate_series ?? []
                 const firstData = series.findIndex((bucket) => bucket.success_rate != null)
                 if (firstData === -1) {
@@ -334,7 +538,7 @@ export const repoOverviewLogic = kea<repoOverviewLogicType>([
         // draw a false dip. Null when no bucket had a qualifying merge.
         openToMergeSeries: [
             (s) => [s.overview],
-            (overview): { values: number[]; labels: string[] } | null => {
+            (overview: RepoOverviewApi | null): { values: number[]; labels: string[] } | null => {
                 const series = overview?.open_to_merge_series ?? []
                 const firstData = series.findIndex((bucket) => bucket.p50_seconds != null)
                 if (firstData === -1) {
diff --git a/products/engineering_analytics/frontend/scenes/workflowRunDetailLogic.ts b/products/engineering_analytics/frontend/scenes/workflowRunDetailLogic.ts
index 681578985dc0..73dff77c2a49 100644
--- a/products/engineering_analytics/frontend/scenes/workflowRunDetailLogic.ts
+++ b/products/engineering_analytics/frontend/scenes/workflowRunDetailLogic.ts
@@ -1,4 +1,4 @@
-import { afterMount, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, afterMount, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { ApiConfig } from 'lib/api'
@@ -14,7 +14,6 @@ import {
 import type { RunFailureLogsApi, WorkflowJobApi, WorkflowRunDetailApi } from '../generated/api.schemas'
 import { isDecisiveFailure } from '../lib/lifecycle'
 import { RunCostSummary, summarizeRunCost } from '../lib/runHealth'
-import type { workflowRunDetailLogicType } from './workflowRunDetailLogicType'
 
 const projectId = (): string => String(ApiConfig.getCurrentProjectId())
 
@@ -26,6 +25,88 @@ export interface WorkflowRunDetailLogicProps {
     sourceId: string | null
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface workflowRunDetailLogicValues {
+    breadcrumbs: Breadcrumb[]
+    failureLogs: RunFailureLogsApi | 'unavailable' | null
+    failureLogsLoading: boolean
+    isValidRunId: boolean
+    jobs: WorkflowJobApi[] | null
+    jobsLoading: boolean
+    loadFailed: boolean
+    run: WorkflowRunDetailApi | null
+    runCost: RunCostSummary | null
+    runLoading: boolean
+    sourceId: string | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface workflowRunDetailLogicActions {
+    loadFailureLogs: () => any
+    loadFailureLogsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadFailureLogsSuccess: (
+        failureLogs: RunFailureLogsApi | 'unavailable',
+        payload?: any
+    ) => {
+        failureLogs: RunFailureLogsApi | 'unavailable'
+        payload?: any
+    }
+    loadJobs: () => any
+    loadJobsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadJobsSuccess: (
+        jobs: WorkflowJobApi[],
+        payload?: any
+    ) => {
+        jobs: WorkflowJobApi[]
+        payload?: any
+    }
+    loadRun: () => any
+    loadRunFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRunSuccess: (
+        run: WorkflowRunDetailApi | null,
+        payload?: any
+    ) => {
+        run: WorkflowRunDetailApi | null
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface workflowRunDetailLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        sourceId: (arg: string | null) => string | null
+        runCost: (jobs: WorkflowJobApi[] | null) => RunCostSummary | null
+        isValidRunId: (arg: number) => boolean
+        breadcrumbs: (repoOwner: string, repoName: string, runId: number) => Breadcrumb[]
+    }
+}
+
+export type workflowRunDetailLogicType = MakeLogicType<
+    workflowRunDetailLogicValues,
+    workflowRunDetailLogicActions,
+    WorkflowRunDetailLogicProps,
+    workflowRunDetailLogicMeta
+>
+
 export const workflowRunDetailLogic = kea<workflowRunDetailLogicType>([
     path(['products', 'engineering_analytics', 'frontend', 'scenes', 'workflowRunDetailLogic']),
     props({} as WorkflowRunDetailLogicProps),
@@ -86,17 +167,23 @@ export const workflowRunDetailLogic = kea<workflowRunDetailLogicType>([
     }),
 
     selectors({
-        sourceId: [() => [(_, p: WorkflowRunDetailLogicProps) => p.sourceId], (sourceId): string | null => sourceId],
+        sourceId: [
+            () => [(_, p: WorkflowRunDetailLogicProps) => p.sourceId],
+            (sourceId: string | null): string | null => sourceId,
+        ],
         // Summed from the already-loaded jobs — no extra query.
-        runCost: [(s) => [s.jobs], (jobs): RunCostSummary | null => (jobs ? summarizeRunCost(jobs) : null)],
+        runCost: [
+            (s) => [s.jobs],
+            (jobs: WorkflowJobApi[] | null): RunCostSummary | null => (jobs ? summarizeRunCost(jobs) : null),
+        ],
         // A non-numeric path segment yields NaN — the scene shows a clean "not found" instead of a load error.
         isValidRunId: [
             () => [(_, p: WorkflowRunDetailLogicProps) => p.runId],
-            (runId): boolean => Number.isFinite(runId),
+            (runId: number): boolean => Number.isFinite(runId),
         ],
         breadcrumbs: [
             (_, p) => [p.repoOwner, p.repoName, p.runId],
-            (repoOwner, repoName, runId): Breadcrumb[] => [
+            (repoOwner: string, repoName: string, runId: number): Breadcrumb[] => [
                 {
                     key: 'EngineeringAnalytics',
                     name: 'Engineering analytics',
diff --git a/products/engineering_analytics/frontend/scenes/workflowRunsLogic.ts b/products/engineering_analytics/frontend/scenes/workflowRunsLogic.ts
index 48d04c71206a..629ad8255d27 100644
--- a/products/engineering_analytics/frontend/scenes/workflowRunsLogic.ts
+++ b/products/engineering_analytics/frontend/scenes/workflowRunsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { ApiConfig } from 'lib/api'
@@ -24,7 +24,6 @@ import type {
 import { jobCacheKey } from '../lib/jobs'
 import { type CostSummary, type HealthSummary, computeHealthSummary } from '../lib/runHealth'
 import { engineeringAnalyticsFiltersLogic } from './engineeringAnalyticsFiltersLogic'
-import type { workflowRunsLogicType } from './workflowRunsLogicType'
 
 const projectId = (): string => String(ApiConfig.getCurrentProjectId())
 
@@ -54,6 +53,164 @@ export interface WorkflowRunsLogicProps {
     sourceId: string | null
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface workflowRunsLogicValues {
+    appliedBranch: string // engineeringAnalyticsFiltersLogic
+    dateFrom: string | null // engineeringAnalyticsFiltersLogic
+    dateTo: string | null // engineeringAnalyticsFiltersLogic
+    activityRuns: ActivityRun[]
+    activityTruncated: boolean
+    breadcrumbs: Breadcrumb[]
+    costSummary: CostSummary | null
+    expandedRunKeys: string[]
+    healthSummary: HealthSummary
+    jobAggregates: WorkflowJobAggregateApi[]
+    jobAggregatesLoading: boolean
+    loadFailed: boolean
+    masterConclusion: string | null
+    queueP50Seconds: number | null
+    repoName: string
+    repoOwner: string
+    runActivity: WorkflowRunActivityApi
+    runActivityLoading: boolean
+    runJobs: Record<string, WorkflowJobApi[]>
+    runJobsLoading: boolean
+    runRows: WorkflowRunRow[]
+    runnerCosts: WorkflowRunnerCostApi[]
+    runnerCostsLoading: boolean
+    runs: WorkflowRunDetailApi[]
+    runsLoading: boolean
+    runsTruncated: boolean
+    sourceId: string | null
+    workflowName: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface workflowRunsLogicActions {
+    loadJobAggregates: () => any
+    loadJobAggregatesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadJobAggregatesSuccess: (
+        jobAggregates: WorkflowJobAggregateApi[],
+        payload?: any
+    ) => {
+        jobAggregates: WorkflowJobAggregateApi[]
+        payload?: any
+    }
+    loadJobs: ({ runId, runAttempt }: { runAttempt: number | null; runId: number }) => {
+        runId: number
+        runAttempt: number | null
+    }
+    loadJobsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadJobsSuccess: (
+        runJobs: Record<string, WorkflowJobApi[]>,
+        payload?: {
+            runId: number
+            runAttempt: number | null
+        }
+    ) => {
+        runJobs: Record<string, WorkflowJobApi[]>
+        payload?: {
+            runId: number
+            runAttempt: number | null
+        }
+    }
+    loadRunActivity: () => any
+    loadRunActivityFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRunActivitySuccess: (
+        runActivity: WorkflowRunActivityApi,
+        payload?: any
+    ) => {
+        runActivity: WorkflowRunActivityApi
+        payload?: any
+    }
+    loadRunnerCosts: () => any
+    loadRunnerCostsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRunnerCostsSuccess: (
+        runnerCosts: WorkflowRunnerCostApi[],
+        payload?: any
+    ) => {
+        runnerCosts: WorkflowRunnerCostApi[]
+        payload?: any
+    }
+    loadRuns: () => any
+    loadRunsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRunsSuccess: (
+        runs: WorkflowRunDetailApi[],
+        payload?: any
+    ) => {
+        runs: WorkflowRunDetailApi[]
+        payload?: any
+    }
+    setRunExpanded: (
+        rowKey: string,
+        expanded: boolean,
+        runId: number | null,
+        runAttempt: number | null
+    ) => {
+        expanded: boolean
+        rowKey: string
+        runAttempt: number | null
+        runId: number | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface workflowRunsLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        sourceId: (arg: string | null) => string | null
+        repoOwner: (arg: string) => string
+        repoName: (arg: string) => string
+        workflowName: (arg: string) => string
+        runRows: (runs: WorkflowRunDetailApi[]) => WorkflowRunRow[]
+        activityRuns: (runActivity: WorkflowRunActivityApi) => ActivityRun[]
+        activityTruncated: (runActivity: WorkflowRunActivityApi) => boolean
+        healthSummary: (runRows: WorkflowRunRow[]) => HealthSummary
+        masterConclusion: (runRows: WorkflowRunRow[]) => string | null
+        queueP50Seconds: (jobAggregates: WorkflowJobAggregateApi[]) => number | null
+        runsTruncated: (runRows: WorkflowRunRow[]) => boolean
+        costSummary: (runnerCosts: WorkflowRunnerCostApi[]) => CostSummary | null
+        breadcrumbs: (repoOwner: string, repoName: string, workflowName: string) => Breadcrumb[]
+    }
+}
+
+export type workflowRunsLogicType = MakeLogicType<
+    workflowRunsLogicValues,
+    workflowRunsLogicActions,
+    WorkflowRunsLogicProps,
+    workflowRunsLogicMeta
+>
+
 export const workflowRunsLogic = kea<workflowRunsLogicType>([
     path(['products', 'engineering_analytics', 'frontend', 'scenes', 'workflowRunsLogic']),
     props({} as WorkflowRunsLogicProps),
@@ -176,12 +333,15 @@ export const workflowRunsLogic = kea<workflowRunsLogicType>([
     }),
 
     selectors({
-        sourceId: [() => [(_, p: WorkflowRunsLogicProps) => p.sourceId], (sourceId): string | null => sourceId],
-        repoOwner: [() => [(_, p: WorkflowRunsLogicProps) => p.repoOwner], (repoOwner): string => repoOwner],
-        repoName: [() => [(_, p: WorkflowRunsLogicProps) => p.repoName], (repoName): string => repoName],
+        sourceId: [
+            () => [(_, p: WorkflowRunsLogicProps) => p.sourceId],
+            (sourceId: string | null): string | null => sourceId,
+        ],
+        repoOwner: [() => [(_, p: WorkflowRunsLogicProps) => p.repoOwner], (repoOwner: string): string => repoOwner],
+        repoName: [() => [(_, p: WorkflowRunsLogicProps) => p.repoName], (repoName: string): string => repoName],
         workflowName: [
             () => [(_, p: WorkflowRunsLogicProps) => p.workflowName],
-            (workflowName): string => workflowName,
+            (workflowName: string): string => workflowName,
         ],
         runRows: [
             (s) => [s.runs],
@@ -218,11 +378,14 @@ export const workflowRunsLogic = kea<workflowRunsLogicType>([
             (s) => [s.runActivity],
             (runActivity: WorkflowRunActivityApi): boolean => runActivity.truncated,
         ],
-        healthSummary: [(s) => [s.runRows], (runRows): HealthSummary => computeHealthSummary(runRows)],
+        healthSummary: [
+            (s) => [s.runRows],
+            (runRows: WorkflowRunRow[]): HealthSummary => computeHealthSummary(runRows),
+        ],
         // Latest completed master/main run's conclusion; null when the window has none (PR-only workflow).
         masterConclusion: [
             (s) => [s.runRows],
-            (runRows): string | null => {
+            (runRows: WorkflowRunRow[]): string | null => {
                 const masterRuns = runRows
                     .filter(
                         (run) =>
@@ -237,7 +400,7 @@ export const workflowRunsLogic = kea<workflowRunsLogicType>([
         // Median queue wait across jobs, weighted by how often each job runs. Null until jobs are synced.
         queueP50Seconds: [
             (s) => [s.jobAggregates],
-            (jobAggregates): number | null => {
+            (jobAggregates: WorkflowJobAggregateApi[]): number | null => {
                 const weighted: { value: number; weight: number }[] = jobAggregates
                     .filter((row) => row.queue_p50_seconds != null)
                     .map((row) => ({ value: row.queue_p50_seconds as number, weight: row.job_count }))
@@ -256,10 +419,10 @@ export const workflowRunsLogic = kea<workflowRunsLogicType>([
                 return weighted[weighted.length - 1].value
             },
         ],
-        runsTruncated: [(s) => [s.runRows], (runRows): boolean => runRows.length >= RUN_LIST_LIMIT],
+        runsTruncated: [(s) => [s.runRows], (runRows: WorkflowRunRow[]): boolean => runRows.length >= RUN_LIST_LIMIT],
         costSummary: [
             (s) => [s.runnerCosts],
-            (runnerCosts): CostSummary | null => {
+            (runnerCosts: WorkflowRunnerCostApi[]): CostSummary | null => {
                 if (runnerCosts.length === 0) {
                     return null
                 }
@@ -278,7 +441,7 @@ export const workflowRunsLogic = kea<workflowRunsLogicType>([
         ],
         breadcrumbs: [
             (_, p) => [p.repoOwner, p.repoName, p.workflowName],
-            (repoOwner, repoName, workflowName): Breadcrumb[] => [
+            (repoOwner: string, repoName: string, workflowName: string): Breadcrumb[] => [
                 {
                     key: 'EngineeringAnalytics',
                     name: 'Engineering analytics',
diff --git a/products/engineering_analytics/frontend/scenes/workflowSwitcherLogic.ts b/products/engineering_analytics/frontend/scenes/workflowSwitcherLogic.ts
index a93147cb4231..14fa756852fc 100644
--- a/products/engineering_analytics/frontend/scenes/workflowSwitcherLogic.ts
+++ b/products/engineering_analytics/frontend/scenes/workflowSwitcherLogic.ts
@@ -1,14 +1,13 @@
 // Backs the workflow chip's switcher dropdown: the repo's workflow names, loaded lazily on first open
 // so detail pages don't pay for the list until the user reaches for it.
 
-import { actions, connect, kea, key, listeners, path, props } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { ApiConfig } from 'lib/api'
 
 import { engineeringAnalyticsWorkflowHealth } from '../generated/api'
 import { engineeringAnalyticsFiltersLogic } from './engineeringAnalyticsFiltersLogic'
-import type { workflowSwitcherLogicType } from './workflowSwitcherLogicType'
 
 export interface WorkflowSwitcherLogicProps {
     repoOwner: string
@@ -16,6 +15,49 @@ export interface WorkflowSwitcherLogicProps {
     sourceId: string | null
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface workflowSwitcherLogicValues {
+    appliedBranch: string // engineeringAnalyticsFiltersLogic
+    dateFrom: string | null // engineeringAnalyticsFiltersLogic
+    dateTo: string | null // engineeringAnalyticsFiltersLogic
+    workflowNames: string[] | null
+    workflowNamesLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface workflowSwitcherLogicActions {
+    ensureWorkflowsLoaded: () => {
+        value: true
+    }
+    loadWorkflowNames: () => any
+    loadWorkflowNamesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadWorkflowNamesSuccess: (
+        workflowNames: string[],
+        payload?: any
+    ) => {
+        workflowNames: string[]
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface workflowSwitcherLogicMeta {
+    key: string
+}
+
+export type workflowSwitcherLogicType = MakeLogicType<
+    workflowSwitcherLogicValues,
+    workflowSwitcherLogicActions,
+    WorkflowSwitcherLogicProps,
+    workflowSwitcherLogicMeta
+>
+
 export const workflowSwitcherLogic = kea<workflowSwitcherLogicType>([
     path(['products', 'engineering_analytics', 'frontend', 'scenes', 'workflowSwitcherLogic']),
     props({} as WorkflowSwitcherLogicProps),
diff --git a/products/error_tracking/frontend/components/Assignee/assigneeSelectLogic.tsx b/products/error_tracking/frontend/components/Assignee/assigneeSelectLogic.tsx
index f2d5745304ea..832ef462b27e 100644
--- a/products/error_tracking/frontend/components/Assignee/assigneeSelectLogic.tsx
+++ b/products/error_tracking/frontend/components/Assignee/assigneeSelectLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
 
 import { createFuse, Fuse } from 'lib/utils/fuseSearch'
 import { membersLogic } from 'scenes/organization/membersLogic'
@@ -7,8 +7,6 @@ import { rolesLogic } from 'scenes/settings/organization/Permissions/Roles/roles
 import { ErrorTrackingIssue } from '~/queries/schema/schema-general'
 import type { OrganizationMemberType, RoleType } from '~/types'
 
-import type { assigneeSelectLogicType } from './assigneeSelectLogicType'
-
 export type ErrorTrackingAssigneeSelectProps = {
     assignee: ErrorTrackingIssue['assignee']
 }
@@ -27,6 +25,56 @@ export type RoleAssignee = {
 
 export type Assignee = UserAssignee | RoleAssignee | null
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface assigneeSelectLogicValues {
+    filteredMembers: OrganizationMemberType[] // membersLogic
+    meFirstMembers: OrganizationMemberType[] // membersLogic
+    membersLoading: boolean // membersLogic
+    roles: RoleType[] // rolesLogic
+    rolesLoading: boolean // rolesLogic
+    filteredRoles: RoleType[]
+    loading: boolean
+    resolveAssignee: (assignee: ErrorTrackingIssue['assignee']) => Assignee
+    rolesFuse: Fuse<RoleType>
+    search: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface assigneeSelectLogicActions {
+    ensureAllMembersLoaded: () => {
+        value: true
+    } // membersLogic
+    setMembersSearch: (search: any) => {
+        search: any
+    } // membersLogic
+    ensureAssigneeTypesLoaded: () => {
+        value: true
+    }
+    setSearch: (search: any) => {
+        search: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface assigneeSelectLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        loading: (membersLoading: boolean, rolesLoading: boolean) => boolean
+        rolesFuse: (roles: RoleType[]) => Fuse<RoleType>
+        filteredRoles: (roles: RoleType[], rolesFuse: Fuse<RoleType>, search: string) => RoleType[]
+        resolveAssignee: (
+            roles: RoleType[],
+            meFirstMembers: OrganizationMemberType[]
+        ) => (assignee: ErrorTrackingIssue['assignee']) => Assignee
+    }
+}
+
+export type assigneeSelectLogicType = MakeLogicType<
+    assigneeSelectLogicValues,
+    assigneeSelectLogicActions,
+    ErrorTrackingAssigneeSelectProps,
+    assigneeSelectLogicMeta
+>
+
 export const assigneeSelectLogic = kea<assigneeSelectLogicType>([
     path(['products', 'error_tracking', 'components', 'Assignee', 'assigneeSelectLogic']),
     props({} as ErrorTrackingAssigneeSelectProps),
@@ -62,19 +110,25 @@ export const assigneeSelectLogic = kea<assigneeSelectLogicType>([
     selectors({
         loading: [
             (s) => [s.membersLoading, s.rolesLoading],
-            (membersLoading, rolesLoading): boolean => membersLoading || rolesLoading,
+            (membersLoading: boolean, rolesLoading: boolean): boolean => membersLoading || rolesLoading,
         ],
 
-        rolesFuse: [(s) => [s.roles], (roles): Fuse<RoleType> => createFuse(roles, { keys: ['name'], threshold: 0.3 })],
+        rolesFuse: [
+            (s) => [s.roles],
+            (roles: RoleType[]): Fuse<RoleType> => createFuse(roles, { keys: ['name'], threshold: 0.3 }),
+        ],
         filteredRoles: [
             (s) => [s.roles, s.rolesFuse, s.search],
-            (roles, rolesFuse, search): RoleType[] =>
+            (roles: RoleType[], rolesFuse: Fuse<RoleType>, search: string): RoleType[] =>
                 search ? rolesFuse.search(search).map((result) => result.item) : (roles ?? []),
         ],
 
         resolveAssignee: [
             (s) => [s.roles, s.meFirstMembers],
-            (roles, members): ((assignee: ErrorTrackingIssue['assignee']) => Assignee) => {
+            (
+                roles: RoleType[],
+                members: OrganizationMemberType[]
+            ): ((assignee: ErrorTrackingIssue['assignee']) => Assignee) => {
                 return (assignee: ErrorTrackingIssue['assignee']) => {
                     if (assignee) {
                         if (assignee.type === 'role') {
diff --git a/products/error_tracking/frontend/components/Breakdowns/breakdownFiltersLogic.ts b/products/error_tracking/frontend/components/Breakdowns/breakdownFiltersLogic.ts
index 5796f51f1681..7eaa25ddd079 100644
--- a/products/error_tracking/frontend/components/Breakdowns/breakdownFiltersLogic.ts
+++ b/products/error_tracking/frontend/components/Breakdowns/breakdownFiltersLogic.ts
@@ -1,5 +1,5 @@
 import { deepEqual as equal } from 'fast-equals'
-import { actions, kea, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers } from 'kea'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 
 import { Params } from 'scenes/sceneTypes'
@@ -7,9 +7,34 @@ import { Params } from 'scenes/sceneTypes'
 import { DateRange } from '~/queries/schema/schema-general'
 
 import { syncSearchParams, updateSearchParams } from '../../utils'
-import type { breakdownFiltersLogicType } from './breakdownFiltersLogicType'
 import { DEFAULT_DATE_RANGE, DEFAULT_TEST_ACCOUNT } from './consts'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface breakdownFiltersLogicValues {
+    breakdownProperty: string;
+    dateRange: DateRange;
+    filterOpen: boolean;
+    filterTestAccounts: boolean;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface breakdownFiltersLogicActions {
+    setBreakdownProperty: (breakdownProperty: string) => {
+        breakdownProperty: string;
+    };
+    setDateRange: (dateRange: DateRange) => {
+        dateRange: DateRange;
+    };
+    setFilterOpen: (filterOpen: boolean) => {
+        filterOpen: boolean;
+    };
+    setFilterTestAccounts: (filterTestAccounts: boolean) => {
+        filterTestAccounts: boolean;
+    };
+}
+
+export type breakdownFiltersLogicType = MakeLogicType<breakdownFiltersLogicValues, breakdownFiltersLogicActions>;
+
 export const breakdownFiltersLogic = kea<breakdownFiltersLogicType>([
     path(['products', 'error_tracking', 'components', 'Breakdowns', 'breakdownFiltersLogic']),
 
diff --git a/products/error_tracking/frontend/components/Breakdowns/miniBreakdownsLogic.ts b/products/error_tracking/frontend/components/Breakdowns/miniBreakdownsLogic.ts
index 4e0f8804afee..ef7aed1290a3 100644
--- a/products/error_tracking/frontend/components/Breakdowns/miniBreakdownsLogic.ts
+++ b/products/error_tracking/frontend/components/Breakdowns/miniBreakdownsLogic.ts
@@ -1,4 +1,4 @@
-import { connect, events, kea, key, path, props, selectors } from 'kea'
+import { MakeLogicType, connect, events, kea, key, path, props, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { subscriptions } from 'kea-subscriptions'
 import posthog from 'posthog-js'
@@ -11,10 +11,10 @@ import {
     ErrorTrackingBreakdownsQueryResponse,
 } from '~/queries/schema/schema-general'
 
+import type { DateRange } from '../../../../../frontend/src/queries/schema/schema-general'
 import { errorTrackingBreakdownsQuery } from '../../queries'
 import { breakdownFiltersLogic } from './breakdownFiltersLogic'
 import { BREAKDOWN_PRESETS, BreakdownsEvents, LIMIT_ITEMS } from './consts'
-import type { miniBreakdownsLogicType } from './miniBreakdownsLogicType'
 
 export interface MiniBreakdownsLogicProps {
     issueId: string
@@ -25,6 +25,44 @@ export interface BreakdownSinglePropertyStat {
     count: number
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface miniBreakdownsLogicValues {
+    dateRange: DateRange; // breakdownFiltersLogic
+    filterTestAccounts: boolean; // breakdownFiltersLogic
+    getBreakdownForProperty: (property: string) => {
+        properties: BreakdownSinglePropertyStat[];
+        totalCount: number;
+    };
+    response: ErrorTrackingBreakdownsQueryResponse | null;
+    responseLoading: boolean;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface miniBreakdownsLogicActions {
+    loadResponse: () => any;
+    loadResponseFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadResponseSuccess: (response: ErrorTrackingBreakdownsQueryResponse, payload?: any) => {
+        response: ErrorTrackingBreakdownsQueryResponse;
+        payload?: any;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface miniBreakdownsLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        getBreakdownForProperty: (response: ErrorTrackingBreakdownsQueryResponse | null) => (property: string) => {
+            properties: BreakdownSinglePropertyStat[];
+            totalCount: number;
+        };
+    };
+}
+
+export type miniBreakdownsLogicType = MakeLogicType<miniBreakdownsLogicValues, miniBreakdownsLogicActions, MiniBreakdownsLogicProps, miniBreakdownsLogicMeta>;
+
 export const miniBreakdownsLogic = kea<miniBreakdownsLogicType>([
     path(['products', 'error_tracking', 'components', 'Breakdowns', 'miniBreakdownsLogic']),
     props({} as MiniBreakdownsLogicProps),
diff --git a/products/error_tracking/frontend/components/ExceptionAttributesPreview/ReleasesPreview/releasePreviewLogic.ts b/products/error_tracking/frontend/components/ExceptionAttributesPreview/ReleasesPreview/releasePreviewLogic.ts
index 80449b03fb53..a6291fec14e4 100644
--- a/products/error_tracking/frontend/components/ExceptionAttributesPreview/ReleasesPreview/releasePreviewLogic.ts
+++ b/products/error_tracking/frontend/components/ExceptionAttributesPreview/ReleasesPreview/releasePreviewLogic.ts
@@ -1,10 +1,35 @@
-import { connect, kea, path, props, selectors } from 'kea'
+import { MakeLogicType, connect, kea, path, props, selectors } from 'kea'
 
 import { ErrorPropertiesLogicProps, errorPropertiesLogic } from 'lib/components/Errors/errorPropertiesLogic'
 import { ErrorTrackingRelease } from 'lib/components/Errors/types'
 import { dayjs } from 'lib/dayjs'
 
-import type { releasePreviewLogicType } from './releasePreviewLogicType'
+import type { KeyedStackFrameRecords } from '../../../../../../frontend/src/lib/components/Errors/Frame/stackFrameLogic'
+import type { ErrorTrackingStackFrame } from '../../../../../../frontend/src/lib/components/Errors/types'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface releasePreviewLogicValues {
+    frames: ErrorTrackingStackFrame[] // errorPropertiesLogic
+    stackFrameRecords: KeyedStackFrameRecords // errorPropertiesLogic
+    release: ErrorTrackingRelease | null | undefined
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface releasePreviewLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        release: (
+            frames: ErrorTrackingStackFrame[],
+            stackFrameRecords: KeyedStackFrameRecords
+        ) => ErrorTrackingRelease | null | undefined
+    }
+}
+
+export type releasePreviewLogicType = MakeLogicType<
+    releasePreviewLogicValues,
+    {},
+    ErrorPropertiesLogicProps,
+    releasePreviewLogicMeta
+>
 
 export const releasePreviewLogic = kea<releasePreviewLogicType>([
     path([
@@ -26,7 +51,10 @@ export const releasePreviewLogic = kea<releasePreviewLogicType>([
     selectors(() => ({
         release: [
             (s) => [s.frames, s.stackFrameRecords],
-            (frames, stackFrameRecords) => {
+            (
+                frames: import('lib/components/Errors/types').ErrorTrackingStackFrame[],
+                stackFrameRecords: import('lib/components/Errors/Frame/stackFrameLogic').KeyedStackFrameRecords
+            ) => {
                 if (!frames.length || Object.keys(stackFrameRecords).length === 0) {
                     return undefined
                 }
diff --git a/products/error_tracking/frontend/components/ExceptionCard/Tabs/SessionTab/sessionTabLogic.ts b/products/error_tracking/frontend/components/ExceptionCard/Tabs/SessionTab/sessionTabLogic.ts
index 38ab5e9caf3e..10fb784684a7 100644
--- a/products/error_tracking/frontend/components/ExceptionCard/Tabs/SessionTab/sessionTabLogic.ts
+++ b/products/error_tracking/frontend/components/ExceptionCard/Tabs/SessionTab/sessionTabLogic.ts
@@ -1,4 +1,17 @@
-import { actions, connect, defaults, events, kea, key, path, props, propsChanged, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    connect,
+    defaults,
+    events,
+    kea,
+    key,
+    path,
+    props,
+    propsChanged,
+    reducers,
+    selectors,
+} from 'kea'
 
 import { Dayjs, dayjs } from 'lib/dayjs'
 import { sessionRecordingDataCoordinatorLogic } from 'scenes/session-recordings/player/sessionRecordingDataCoordinatorLogic'
@@ -7,8 +20,6 @@ import { sessionRecordingPlayerLogic } from 'scenes/session-recordings/player/se
 
 import { SessionPlayerData } from '~/types'
 
-import type { sessionTabLogicType } from './sessionTabLogicType'
-
 export type SessionTabLogicProps = {
     sessionId: string
     timestamp: string
@@ -33,6 +44,50 @@ function getRecordingProps(sessionId: string): SessionRecordingPlayerProps {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionTabLogicValues {
+    isNotFound: boolean; // sessionRecordingDataCoordinatorLogic
+    sessionPlayerData: SessionPlayerData; // sessionRecordingDataCoordinatorLogic
+    sessionPlayerMetaDataLoading: boolean; // sessionRecordingDataCoordinatorLogic
+    exceptionTimestamp: number | null;
+    isTimestampOutsideRecording: boolean;
+    recordingProps: SessionRecordingPlayerProps;
+    recordingTimestamp: number | null;
+    sessionId: string;
+    timestamp: string;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionTabLogicActions {
+    seekToTimestamp: (timestamp: number, forcePlay?: boolean | undefined) => {
+        forcePlay: boolean;
+        timestamp: number;
+    }; // sessionRecordingPlayerLogic
+    setPause: () => {
+        value: true;
+    }; // sessionRecordingPlayerLogic
+    setPlay: () => {
+        value: true;
+    }; // sessionRecordingPlayerLogic
+    setRecordingTimestamp: (timestamp: Dayjs, offset: number) => {
+        offset: number;
+        timestamp: Dayjs;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionTabLogicMeta {
+    key: KeyType;
+    __keaTypeGenInternalSelectorTypes: {
+        sessionId: (sessionId: string) => string;
+        timestamp: (timestamp: string) => string;
+        recordingProps: (sessionId: string) => SessionRecordingPlayerProps;
+        isTimestampOutsideRecording: (exceptionTimestamp: number | null, sessionPlayerData: SessionPlayerData, sessionPlayerMetaDataLoading: boolean) => boolean;
+    };
+}
+
+export type sessionTabLogicType = MakeLogicType<sessionTabLogicValues, sessionTabLogicActions, SessionTabLogicProps, sessionTabLogicMeta>;
+
 export const sessionTabLogic = kea<sessionTabLogicType>([
     path((key) => ['scenes', 'error-tracking', 'exceptionCard', 'sessionTab', key]),
     props({} as SessionTabLogicProps),
@@ -73,11 +128,11 @@ export const sessionTabLogic = kea<sessionTabLogicType>([
         },
     }),
     selectors({
-        sessionId: [(_, p) => [p.sessionId], (sessionId) => sessionId],
-        timestamp: [(_, p) => [p.timestamp], (timestamp) => timestamp],
+        sessionId: [(_, p) => [p.sessionId], (sessionId: string) => sessionId],
+        timestamp: [(_, p) => [p.timestamp], (timestamp: string) => timestamp],
         recordingProps: [
             (_, p) => [p.sessionId],
-            (sessionId) => {
+            (sessionId: string) => {
                 return getRecordingProps(sessionId)
             },
         ],
diff --git a/products/error_tracking/frontend/components/ExceptionCard/exceptionCardLogic.ts b/products/error_tracking/frontend/components/ExceptionCard/exceptionCardLogic.ts
index 587ac1da55ca..750d84d46a97 100644
--- a/products/error_tracking/frontend/components/ExceptionCard/exceptionCardLogic.ts
+++ b/products/error_tracking/frontend/components/ExceptionCard/exceptionCardLogic.ts
@@ -1,13 +1,63 @@
-import { actions, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 
 import posthog from 'lib/posthog-typed'
 
-import type { exceptionCardLogicType } from './exceptionCardLogicType'
-
 export type ExceptionCardLogicProps = {
     issueId: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface exceptionCardLogicValues {
+    currentSessionTab: string
+    currentTab: string
+    expandedFrameRawIds: Set<string>
+    issueId: string
+    loading: boolean
+    showAdditionalProperties: boolean
+    showJSONProperties: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface exceptionCardLogicActions {
+    setCurrentSessionTab: (tab: string) => {
+        tab: string
+    }
+    setCurrentTab: (tab: string) => {
+        tab: string
+    }
+    setFrameExpanded: (
+        rawId: string,
+        expanded: boolean
+    ) => {
+        expanded: boolean
+        rawId: string
+    }
+    setLoading: (loading: boolean) => {
+        loading: boolean
+    }
+    setShowAdditionalProperties: (showProperties: boolean) => {
+        showProperties: boolean
+    }
+    setShowJSONProperties: (showJSON: boolean) => {
+        showJSON: boolean
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface exceptionCardLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        issueId: (issueId: string) => string
+    }
+}
+
+export type exceptionCardLogicType = MakeLogicType<
+    exceptionCardLogicValues,
+    exceptionCardLogicActions,
+    ExceptionCardLogicProps,
+    exceptionCardLogicMeta
+>
+
 export const exceptionCardLogic = kea<exceptionCardLogicType>([
     path((key) => ['products', 'error_tracking', 'ExceptionCard', key]),
     key((props) => props.issueId),
@@ -74,7 +124,7 @@ export const exceptionCardLogic = kea<exceptionCardLogicType>([
     }),
 
     selectors({
-        issueId: [(_, p) => [p.issueId], (issueId) => issueId],
+        issueId: [(_, p) => [p.issueId], (issueId: string) => issueId],
     }),
 
     listeners(({ props }) => ({
diff --git a/products/error_tracking/frontend/components/IssueActions/issueActionsLogic.tsx b/products/error_tracking/frontend/components/IssueActions/issueActionsLogic.tsx
index 27dcbeee08bc..e78c1c7f3946 100644
--- a/products/error_tracking/frontend/components/IssueActions/issueActionsLogic.tsx
+++ b/products/error_tracking/frontend/components/IssueActions/issueActionsLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers } from 'kea'
 import posthog from 'posthog-js'
 
 import api from 'lib/api'
@@ -11,13 +11,114 @@ import { createCohortFormData } from 'scenes/cohorts/cohortUtils'
 import { ErrorTrackingIssue } from '~/queries/schema/schema-general'
 import { BehavioralEventType, CohortType, FilterLogicalOperator, PropertyFilterType, PropertyOperator } from '~/types'
 
+import type {
+    ErrorTrackingIssueAssignee,
+    ErrorTrackingIssueStatus,
+} from '../../../../../frontend/src/queries/schema/schema-general'
 import { pendingFingerprintIssueStateUpdateLogic } from '../../logics/pendingFingerprintIssueStateUpdateLogic'
-import type { issueActionsLogicType } from './issueActionsLogicType'
 
 const pendingUpdateActions = ():
     | NonNullable<ReturnType<typeof pendingFingerprintIssueStateUpdateLogic.findMounted>>['asyncActions']
     | undefined => pendingFingerprintIssueStateUpdateLogic.findMounted()?.asyncActions
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface issueActionsLogicValues {
+    needsReload: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface issueActionsLogicActions {
+    activateIssues: (ids: string[]) => {
+        ids: string[]
+    }
+    assignIssues: (
+        ids: string[],
+        assignee: ErrorTrackingIssue['assignee']
+    ) => {
+        assignee: ErrorTrackingIssueAssignee | null
+        ids: string[]
+    }
+    clearNeedsReload: () => {
+        value: true
+    }
+    createIssueCohort: (
+        id: string,
+        name: string,
+        description: string
+    ) => {
+        description: string
+        id: string
+        name: string
+    }
+    mergeIssues: (ids: string[]) => {
+        ids: string[]
+    }
+    mutationFailure: (
+        mutationName: string,
+        error: unknown
+    ) => {
+        error: unknown
+        mutationName: string
+    }
+    mutationSuccess: (mutationName: string) => {
+        mutationName: string
+    }
+    resolveIssues: (ids: string[]) => {
+        ids: string[]
+    }
+    splitIssue: (
+        id: ErrorTrackingIssue['id'],
+        fingerprints: {
+            description?: string
+            fingerprint: string
+            name?: string
+        }[]
+    ) => {
+        fingerprints: {
+            description?: string | undefined
+            fingerprint: string
+            name?: string | undefined
+        }[]
+        id: string
+    }
+    splitIssueSuccess: (newIssueIds: string[]) => {
+        newIssueIds: string[]
+    }
+    suppressIssues: (ids: string[]) => {
+        ids: string[]
+    }
+    updateIssueAssignee: (
+        id: string,
+        assignee: ErrorTrackingIssue['assignee']
+    ) => {
+        assignee: ErrorTrackingIssueAssignee | null
+        id: string
+    }
+    updateIssueDescription: (
+        id: string,
+        description: string
+    ) => {
+        description: string
+        id: string
+    }
+    updateIssueName: (
+        id: string,
+        name: string
+    ) => {
+        id: string
+        name: string
+    }
+    updateIssueStatus: (
+        id: string,
+        status: ErrorTrackingIssue['status']
+    ) => {
+        id: string
+        status: ErrorTrackingIssueStatus
+    }
+}
+
+export type issueActionsLogicType = MakeLogicType<issueActionsLogicValues, issueActionsLogicActions>
+
 export const issueActionsLogic = kea<issueActionsLogicType>([
     path(['products', 'error_tracking', 'components', 'IssueActions', 'issueActionsLogic']),
 
diff --git a/products/error_tracking/frontend/components/IssueFilters/issueFiltersLogic.ts b/products/error_tracking/frontend/components/IssueFilters/issueFiltersLogic.ts
index a2bd5acb05b3..ddd74581c804 100644
--- a/products/error_tracking/frontend/components/IssueFilters/issueFiltersLogic.ts
+++ b/products/error_tracking/frontend/components/IssueFilters/issueFiltersLogic.ts
@@ -1,5 +1,5 @@
 import { deepEqual as equal } from 'fast-equals'
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 
 import { SelectedQuickFilter, quickFiltersSectionLogic } from 'lib/components/QuickFilters'
 import { taxonomicFilterLogic } from 'lib/components/TaxonomicFilter/taxonomicFilterLogic'
@@ -11,7 +11,6 @@ import { FilterLogicalOperator, PropertyFilterType, UniversalFiltersGroup } from
 
 import { updateSearchParams } from '../../utils'
 import { TAXONOMIC_FILTER_LOGIC_KEY, TAXONOMIC_GROUP_TYPES } from './consts'
-import type { issueFiltersLogicType } from './issueFiltersLogicType'
 
 export const DEFAULT_DATE_RANGE = { date_from: '-7d', date_to: null }
 export const DEFAULT_FILTER_GROUP = {
@@ -25,6 +24,45 @@ export interface IssueFiltersLogicProps {
     logicKey: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface issueFiltersLogicValues {
+    selectedQuickFilters: Record<string, SelectedQuickFilter>; // quickFiltersSectionLogic
+    dateRange: DateRange;
+    filterGroup: UniversalFiltersGroup;
+    filterTestAccounts: boolean;
+    mergedFilterGroup: UniversalFiltersGroup;
+    searchQuery: string;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface issueFiltersLogicActions {
+    setTaxonomicSearchQuery: (searchQuery: string) => {
+        searchQuery: string;
+    }; // taxonomicFilterLogic
+    setDateRange: (dateRange: DateRange) => {
+        dateRange: DateRange;
+    };
+    setFilterGroup: (filterGroup: UniversalFiltersGroup) => {
+        filterGroup: UniversalFiltersGroup;
+    };
+    setFilterTestAccounts: (filterTestAccounts: boolean) => {
+        filterTestAccounts: boolean;
+    };
+    setSearchQuery: (searchQuery: string) => {
+        searchQuery: string;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface issueFiltersLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        mergedFilterGroup: (filterGroup: UniversalFiltersGroup, selectedQuickFilters: Record<string, SelectedQuickFilter>) => UniversalFiltersGroup;
+    };
+}
+
+export type issueFiltersLogicType = MakeLogicType<issueFiltersLogicValues, issueFiltersLogicActions, IssueFiltersLogicProps, issueFiltersLogicMeta>;
+
 export const issueFiltersLogic = kea<issueFiltersLogicType>([
     path(['products', 'error_tracking', 'components', 'IssueFilters', 'issueFiltersLogic']),
     props({} as IssueFiltersLogicProps),
diff --git a/products/error_tracking/frontend/components/IssueQueryOptions/issueQueryOptionsLogic.ts b/products/error_tracking/frontend/components/IssueQueryOptions/issueQueryOptionsLogic.ts
index 02972f6f7cfc..c3c53caffbc9 100644
--- a/products/error_tracking/frontend/components/IssueQueryOptions/issueQueryOptionsLogic.ts
+++ b/products/error_tracking/frontend/components/IssueQueryOptions/issueQueryOptionsLogic.ts
@@ -1,5 +1,5 @@
 import { deepEqual as equal } from 'fast-equals'
-import { actions, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, kea, key, listeners, path, props, reducers } from 'kea'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 import posthog from 'posthog-js'
 
@@ -8,7 +8,7 @@ import { Params } from 'scenes/sceneTypes'
 import { ErrorTrackingIssue, ErrorTrackingQuery } from '~/queries/schema/schema-general'
 
 import { syncSearchParams, updateSearchParams } from '../../utils'
-import type { issueQueryOptionsLogicType } from './issueQueryOptionsLogicType'
+import type { ErrorTrackingIssueAssignee, ErrorTrackingOrderBy } from '../../../../../frontend/src/queries/schema/schema-general'
 
 export type ErrorTrackingQueryOrderBy = ErrorTrackingQuery['orderBy']
 export type ErrorTrackingQueryOrderDirection = ErrorTrackingQuery['orderDirection']
@@ -31,6 +31,37 @@ export interface IssueQueryOptionsLogicProps {
     logicKey: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface issueQueryOptionsLogicValues {
+    assignee: ErrorTrackingQueryAssignee | null;
+    orderBy: ErrorTrackingQueryOrderBy;
+    orderDirection: ErrorTrackingQueryOrderDirection;
+    status: ErrorTrackingQueryStatus;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface issueQueryOptionsLogicActions {
+    setAssignee: (assignee: ErrorTrackingIssue["assignee"]) => {
+        assignee: ErrorTrackingIssueAssignee | null;
+    };
+    setOrderBy: (orderBy: ErrorTrackingQueryOrderBy) => {
+        orderBy: ErrorTrackingOrderBy;
+    };
+    setOrderDirection: (orderDirection: ErrorTrackingQueryOrderDirection) => {
+        orderDirection: "ASC" | "DESC" | undefined;
+    };
+    setStatus: (status: ErrorTrackingQueryStatus) => {
+        status: ErrorTrackingQueryStatus | undefined;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface issueQueryOptionsLogicMeta {
+    key: string;
+}
+
+export type issueQueryOptionsLogicType = MakeLogicType<issueQueryOptionsLogicValues, issueQueryOptionsLogicActions, IssueQueryOptionsLogicProps, issueQueryOptionsLogicMeta>;
+
 export const issueQueryOptionsLogic = kea<issueQueryOptionsLogicType>([
     path(['products', 'error_tracking', 'components', 'IssueQueryOptions', 'issueQueryOptionsLogic']),
     props({} as IssueQueryOptionsLogicProps),
diff --git a/products/error_tracking/frontend/components/SetupPrompt/exceptionIngestionLogic.tsx b/products/error_tracking/frontend/components/SetupPrompt/exceptionIngestionLogic.tsx
index fc7f8813c3ae..7b0f7a06b2ed 100644
--- a/products/error_tracking/frontend/components/SetupPrompt/exceptionIngestionLogic.tsx
+++ b/products/error_tracking/frontend/components/SetupPrompt/exceptionIngestionLogic.tsx
@@ -1,9 +1,34 @@
-import { afterMount, kea, path } from 'kea'
+import { MakeLogicType, afterMount, kea, path } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { ApiRequest } from 'lib/api'
 
-import type { exceptionIngestionLogicType } from './exceptionIngestionLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface exceptionIngestionLogicValues {
+    hasSentExceptionEvent: boolean | undefined
+    hasSentExceptionEventLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface exceptionIngestionLogicActions {
+    loadExceptionIngestionState: () => any
+    loadExceptionIngestionStateFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadExceptionIngestionStateSuccess: (
+        hasSentExceptionEvent: boolean,
+        payload?: any
+    ) => {
+        hasSentExceptionEvent: boolean
+        payload?: any
+    }
+}
+
+export type exceptionIngestionLogicType = MakeLogicType<exceptionIngestionLogicValues, exceptionIngestionLogicActions>
 
 export const exceptionIngestionLogic = kea<exceptionIngestionLogicType>([
     path(['products', 'error_tracking', 'components', 'SetupPrompt', 'exceptionIngestionLogic']),
diff --git a/products/error_tracking/frontend/components/VolumeSparkline/errorTrackingVolumeSparklineLogic.ts b/products/error_tracking/frontend/components/VolumeSparkline/errorTrackingVolumeSparklineLogic.ts
index 78ee465e90ec..eca7ec22f5b6 100644
--- a/products/error_tracking/frontend/components/VolumeSparkline/errorTrackingVolumeSparklineLogic.ts
+++ b/products/error_tracking/frontend/components/VolumeSparkline/errorTrackingVolumeSparklineLogic.ts
@@ -1,12 +1,72 @@
-import { actions, kea, key, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, key, path, props, reducers, selectors } from 'kea'
 
-import type { errorTrackingVolumeSparklineLogicType } from './errorTrackingVolumeSparklineLogicType'
 import type { SparklineDatum, SparklineEvent, VolumeSparklineHoverSelection } from './types'
 
 export interface ErrorTrackingVolumeSparklineLogicProps {
     sparklineKey: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface errorTrackingVolumeSparklineLogicValues {
+    clickedSpike: {
+        clientX: number
+        clientY: number
+        datum: SparklineDatum
+    } | null
+    hoverSelection: VolumeSparklineHoverSelection | null
+    hoveredDatum: SparklineDatum | null
+    hoveredIndex: number | null
+    isBarHighlighted: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface errorTrackingVolumeSparklineLogicActions {
+    setClickedSpike: (
+        payload: {
+            clientX: number
+            clientY: number
+            datum: SparklineDatum
+        } | null
+    ) => {
+        payload: {
+            clientX: number
+            clientY: number
+            datum: SparklineDatum
+        } | null
+    }
+    setHoveredBin: (
+        payload: {
+            datum: SparklineDatum
+            index: number
+        } | null
+    ) => {
+        payload: {
+            datum: SparklineDatum
+            index: number
+        } | null
+    }
+    setHoveredEvent: (payload: SparklineEvent<string> | null) => {
+        payload: SparklineEvent<string> | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface errorTrackingVolumeSparklineLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        hoveredIndex: (hoverSelection: VolumeSparklineHoverSelection | null) => number | null
+        hoveredDatum: (hoverSelection: VolumeSparklineHoverSelection | null) => SparklineDatum | null
+        isBarHighlighted: (hoverSelection: VolumeSparklineHoverSelection | null) => boolean
+    }
+}
+
+export type errorTrackingVolumeSparklineLogicType = MakeLogicType<
+    errorTrackingVolumeSparklineLogicValues,
+    errorTrackingVolumeSparklineLogicActions,
+    ErrorTrackingVolumeSparklineLogicProps,
+    errorTrackingVolumeSparklineLogicMeta
+>
+
 export const errorTrackingVolumeSparklineLogic = kea<errorTrackingVolumeSparklineLogicType>([
     path((key) => [
         'products',
diff --git a/products/error_tracking/frontend/logics/batchSpikeEventsLogic.ts b/products/error_tracking/frontend/logics/batchSpikeEventsLogic.ts
index fa968568579c..42ee7fad3a88 100644
--- a/products/error_tracking/frontend/logics/batchSpikeEventsLogic.ts
+++ b/products/error_tracking/frontend/logics/batchSpikeEventsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -7,7 +7,46 @@ import { ErrorTrackingSpikeEvent } from 'lib/components/Errors/types'
 import { DateRange } from '~/queries/schema/schema-general'
 
 import { dateRangeToIsoBounds } from '../utils'
-import type { batchSpikeEventsLogicType } from './batchSpikeEventsLogicType'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface batchSpikeEventsLogicValues {
+    rawSpikeEvents: ErrorTrackingSpikeEvent[]
+    rawSpikeEventsLoading: boolean
+    spikeEventsByIssueId: Record<string, ErrorTrackingSpikeEvent[]>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface batchSpikeEventsLogicActions {
+    loadSpikeEventsForIssues: (
+        issueIds: string[],
+        dateRange?: DateRange
+    ) => {
+        dateRange: DateRange | undefined
+        issueIds: string[]
+    }
+    loadSpikeEventsForIssuesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSpikeEventsForIssuesSuccess: (
+        rawSpikeEvents: ErrorTrackingSpikeEvent[],
+        payload?: {
+            dateRange: DateRange | undefined
+            issueIds: string[]
+        }
+    ) => {
+        rawSpikeEvents: ErrorTrackingSpikeEvent[]
+        payload?: {
+            dateRange: DateRange | undefined
+            issueIds: string[]
+        }
+    }
+}
+
+export type batchSpikeEventsLogicType = MakeLogicType<batchSpikeEventsLogicValues, batchSpikeEventsLogicActions>
 
 export const batchSpikeEventsLogic = kea<batchSpikeEventsLogicType>([
     path(['products', 'error_tracking', 'logics', 'batchSpikeEventsLogic']),
diff --git a/products/error_tracking/frontend/logics/bulkSelectLogic.ts b/products/error_tracking/frontend/logics/bulkSelectLogic.ts
index b11a8e8f8e30..57af3a3a2d4a 100644
--- a/products/error_tracking/frontend/logics/bulkSelectLogic.ts
+++ b/products/error_tracking/frontend/logics/bulkSelectLogic.ts
@@ -1,7 +1,38 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers } from 'kea'
 
 import { issueActionsLogic } from '../components/IssueActions/issueActionsLogic'
-import type { bulkSelectLogicType } from './bulkSelectLogicType'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface bulkSelectLogicValues {
+    previouslyCheckedRecordIndex: number | null
+    selectedIssueIds: string[]
+    shiftKeyHeld: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface bulkSelectLogicActions {
+    mutationFailure: (
+        mutationName: string,
+        error: unknown
+    ) => {
+        error: unknown
+        mutationName: string
+    } // issueActionsLogic
+    mutationSuccess: (mutationName: string) => {
+        mutationName: string
+    } // issueActionsLogic
+    setPreviouslyCheckedRecordIndex: (index: number) => {
+        index: number
+    }
+    setSelectedIssueIds: (ids: string[]) => {
+        ids: string[]
+    }
+    setShiftKeyHeld: (shiftKeyHeld: boolean) => {
+        shiftKeyHeld: boolean
+    }
+}
+
+export type bulkSelectLogicType = MakeLogicType<bulkSelectLogicValues, bulkSelectLogicActions>
 
 export const bulkSelectLogic = kea<bulkSelectLogicType>([
     path(['products', 'error_tracking', 'logics', 'bulkSelectLogic']),
diff --git a/products/error_tracking/frontend/logics/issuesDataNodeLogic.tsx b/products/error_tracking/frontend/logics/issuesDataNodeLogic.tsx
index efd8f7286e4c..13a7e136dc93 100644
--- a/products/error_tracking/frontend/logics/issuesDataNodeLogic.tsx
+++ b/products/error_tracking/frontend/logics/issuesDataNodeLogic.tsx
@@ -1,19 +1,251 @@
-import { actions, afterMount, connect, kea, listeners, path, props, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, props, selectors } from 'kea'
 import posthog from 'posthog-js'
 
 import { DataNodeLogicProps, dataNodeLogic } from '~/queries/nodes/DataNode/dataNodeLogic'
 import { ErrorTrackingIssue, ErrorTrackingQuery } from '~/queries/schema/schema-general'
 
+import type {
+    DataNode,
+    DateRange,
+    ErrorTrackingIssueAssignee,
+    ErrorTrackingIssueStatus,
+    ErrorTrackingQueryResponse,
+    EventsQueryResponse,
+    HogQLAutocompleteResponse,
+    HogQLMetadataResponse,
+    HogQLQueryResponse,
+    HogQueryResponse,
+    LogAttributesQueryResponse,
+    LogValuesQueryResponse,
+    LogsQueryResponse,
+    MetricsQueryResponse,
+    RefreshType,
+    SessionsQueryResponse,
+    TraceSpansAggregationQueryResponse,
+    TraceSpansAttributeBreakdownQueryResponse,
+    TraceSpansQueryResponse,
+    TraceSpansTreeQueryResponse,
+} from '../../../../frontend/src/queries/schema/schema-general'
 import { issueActionsLogic } from '../components/IssueActions/issueActionsLogic'
 import { mergeIssues } from '../utils'
 import { batchSpikeEventsLogic } from './batchSpikeEventsLogic'
-import type { issuesDataNodeLogicType } from './issuesDataNodeLogicType'
 
 export interface IssuesDataNodeLogicProps {
     query: DataNodeLogicProps['query']
     key: DataNodeLogicProps['key']
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface issuesDataNodeLogicValues {
+    needsReload: boolean // issueActionsLogic
+    response:
+        | ErrorTrackingQueryResponse
+        | HogQLAutocompleteResponse
+        | HogQLMetadataResponse
+        | HogQLQueryResponse<any[]>
+        | HogQueryResponse
+        | LogAttributesQueryResponse
+        | LogValuesQueryResponse
+        | MetricsQueryResponse
+        | Record<string, any>
+        | SessionsQueryResponse
+        | TraceSpansAggregationQueryResponse
+        | TraceSpansAttributeBreakdownQueryResponse
+        | TraceSpansQueryResponse
+        | null // nodeLogic
+    responseLoading: boolean // nodeLogic
+    results: ErrorTrackingIssue[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface issuesDataNodeLogicActions {
+    loadSpikeEventsForIssues: (
+        issueIds: string[],
+        dateRange?: DateRange | undefined
+    ) => {
+        dateRange: DateRange | undefined
+        issueIds: string[]
+    } // batchSpikeEventsLogic
+    activateIssues: (ids: string[]) => {
+        ids: string[]
+    } // issueActionsLogic
+    assignIssues: (
+        ids: string[],
+        assignee: ErrorTrackingIssueAssignee | null
+    ) => {
+        assignee: ErrorTrackingIssueAssignee | null
+        ids: string[]
+    } // issueActionsLogic
+    clearNeedsReload: () => {
+        value: true
+    } // issueActionsLogic
+    mergeIssues: (ids: string[]) => {
+        ids: string[]
+    } // issueActionsLogic
+    mutationFailure: (
+        mutationName: string,
+        error: unknown
+    ) => {
+        error: unknown
+        mutationName: string
+    } // issueActionsLogic
+    resolveIssues: (ids: string[]) => {
+        ids: string[]
+    } // issueActionsLogic
+    suppressIssues: (ids: string[]) => {
+        ids: string[]
+    } // issueActionsLogic
+    updateIssueAssignee: (
+        id: string,
+        assignee: ErrorTrackingIssueAssignee | null
+    ) => {
+        assignee: ErrorTrackingIssueAssignee | null
+        id: string
+    } // issueActionsLogic
+    updateIssueStatus: (
+        id: string,
+        status: ErrorTrackingIssueStatus
+    ) => {
+        id: string
+        status: ErrorTrackingIssueStatus
+    } // issueActionsLogic
+    cancelQuery: () => {
+        value: true
+    } // nodeLogic
+    loadData: (
+        refresh?: RefreshType | undefined,
+        alreadyRunningQueryId?: string | undefined,
+        overrideQuery?: DataNode<Record<string, any>> | undefined
+    ) => {
+        overrideQuery: DataNode<Record<string, any>> | undefined
+        pollOnly: boolean
+        queryId: string
+        refresh: RefreshType | undefined
+    } // nodeLogic
+    loadDataFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    } // nodeLogic
+    loadDataSuccess: (
+        response:
+            | ErrorTrackingQueryResponse
+            | HogQLAutocompleteResponse
+            | HogQLMetadataResponse
+            | HogQLQueryResponse<any[]>
+            | HogQueryResponse
+            | LogAttributesQueryResponse
+            | LogValuesQueryResponse
+            | MetricsQueryResponse
+            | Record<string, any>
+            | SessionsQueryResponse
+            | TraceSpansAggregationQueryResponse
+            | TraceSpansAttributeBreakdownQueryResponse
+            | TraceSpansQueryResponse
+            | null
+            | undefined,
+        payload?:
+            | {
+                  overrideQuery: DataNode<Record<string, any>> | undefined
+                  pollOnly: boolean
+                  queryId: string
+                  refresh: RefreshType | undefined
+              }
+            | undefined
+    ) => {
+        payload?: {
+            overrideQuery: DataNode<Record<string, any>> | undefined
+            pollOnly: boolean
+            queryId: string
+            refresh: RefreshType | undefined
+        }
+        response:
+            | ErrorTrackingQueryResponse
+            | HogQLAutocompleteResponse
+            | HogQLMetadataResponse
+            | HogQLQueryResponse<any[]>
+            | HogQueryResponse
+            | LogAttributesQueryResponse
+            | LogValuesQueryResponse
+            | MetricsQueryResponse
+            | Record<string, any>
+            | SessionsQueryResponse
+            | TraceSpansAggregationQueryResponse
+            | TraceSpansAttributeBreakdownQueryResponse
+            | TraceSpansQueryResponse
+            | null
+            | undefined
+    } // nodeLogic
+    setResponse: (
+        response:
+            | ErrorTrackingQueryResponse
+            | EventsQueryResponse
+            | HogQLAutocompleteResponse
+            | HogQLMetadataResponse
+            | HogQLQueryResponse<any[]>
+            | HogQueryResponse
+            | LogAttributesQueryResponse
+            | LogsQueryResponse
+            | LogValuesQueryResponse
+            | MetricsQueryResponse
+            | Record<string, any>
+            | SessionsQueryResponse
+            | TraceSpansAggregationQueryResponse
+            | TraceSpansAttributeBreakdownQueryResponse
+            | TraceSpansQueryResponse
+            | TraceSpansTreeQueryResponse
+    ) =>
+        | ErrorTrackingQueryResponse
+        | EventsQueryResponse
+        | HogQLAutocompleteResponse
+        | HogQLMetadataResponse
+        | HogQLQueryResponse<any[]>
+        | HogQueryResponse
+        | LogAttributesQueryResponse
+        | LogsQueryResponse
+        | LogValuesQueryResponse
+        | MetricsQueryResponse
+        | Record<string, any>
+        | SessionsQueryResponse
+        | TraceSpansAggregationQueryResponse
+        | TraceSpansAttributeBreakdownQueryResponse
+        | TraceSpansQueryResponse
+        | TraceSpansTreeQueryResponse // nodeLogic
+    reloadData: () => {}
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface issuesDataNodeLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        results: (
+            response:
+                | ErrorTrackingQueryResponse
+                | HogQLAutocompleteResponse
+                | HogQLMetadataResponse
+                | HogQLQueryResponse<any[]>
+                | HogQueryResponse
+                | LogAttributesQueryResponse
+                | LogValuesQueryResponse
+                | MetricsQueryResponse
+                | Record<string, any>
+                | SessionsQueryResponse
+                | TraceSpansAggregationQueryResponse
+                | TraceSpansAttributeBreakdownQueryResponse
+                | TraceSpansQueryResponse
+                | null
+        ) => ErrorTrackingIssue[]
+    }
+}
+
+export type issuesDataNodeLogicType = MakeLogicType<
+    issuesDataNodeLogicValues,
+    issuesDataNodeLogicActions,
+    IssuesDataNodeLogicProps,
+    issuesDataNodeLogicMeta
+>
+
 export const issuesDataNodeLogic = kea<issuesDataNodeLogicType>([
     path(['products', 'error_tracking', 'logics', 'issuesDataNodeLogic']),
     props({} as IssuesDataNodeLogicProps),
@@ -50,7 +282,23 @@ export const issuesDataNodeLogic = kea<issuesDataNodeLogicType>([
     selectors({
         results: [
             (s) => [s.response],
-            (response): ErrorTrackingIssue[] => (response && 'results' in response ? response.results : []),
+            (
+                response:
+                    | Record<string, any>
+                    | null
+                    | import('~/queries/schema').ErrorTrackingQueryResponse
+                    | import('~/queries/schema').HogQLAutocompleteResponse
+                    | import('~/queries/schema').HogQLMetadataResponse
+                    | import('~/queries/schema').HogQLQueryResponse<any[]>
+                    | import('~/queries/schema').HogQueryResponse
+                    | import('~/queries/schema').LogAttributesQueryResponse
+                    | import('~/queries/schema').LogValuesQueryResponse
+                    | import('~/queries/schema').MetricsQueryResponse
+                    | import('~/queries/schema').SessionsQueryResponse
+                    | import('~/queries/schema').TraceSpansAggregationQueryResponse
+                    | import('~/queries/schema').TraceSpansAttributeBreakdownQueryResponse
+                    | import('~/queries/schema').TraceSpansQueryResponse
+            ): ErrorTrackingIssue[] => (response && 'results' in response ? response.results : []),
         ],
     }),
 
diff --git a/products/error_tracking/frontend/logics/pendingFingerprintIssueStateUpdateLogic.ts b/products/error_tracking/frontend/logics/pendingFingerprintIssueStateUpdateLogic.ts
index 7cfe49e1da45..14898da39e04 100644
--- a/products/error_tracking/frontend/logics/pendingFingerprintIssueStateUpdateLogic.ts
+++ b/products/error_tracking/frontend/logics/pendingFingerprintIssueStateUpdateLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers, selectors } from 'kea'
 
 import api from 'lib/api'
 import { ErrorTrackingFingerprint } from 'lib/components/Errors/types'
@@ -11,7 +11,6 @@ import {
 
 import { errorTrackingIssueSceneLogic } from '../scenes/ErrorTrackingIssueScene/errorTrackingIssueSceneLogic'
 import { issuesDataNodeLogic } from './issuesDataNodeLogic'
-import type { pendingFingerprintIssueStateUpdateLogicType } from './pendingFingerprintIssueStateUpdateLogicType'
 import { applyDelta, buildPendingUpdate, CurrentIssueState, IssueStateDelta } from './pendingUpdateHelpers'
 
 // CH sync typically lands in seconds; 60s is generous.
@@ -19,6 +18,52 @@ export const PENDING_UPDATE_TTL_MS = 60_000
 
 export type StoredPendingUpdate = ErrorTrackingPendingFingerprintIssueStateUpdate & { expiresAt: number }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface pendingFingerprintIssueStateUpdateLogicValues {
+    currentPendingUpdates: ErrorTrackingPendingFingerprintIssueStateUpdate[]
+    pendingUpdates: Record<string, StoredPendingUpdate>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface pendingFingerprintIssueStateUpdateLogicActions {
+    addPendingUpdates: (rows: ErrorTrackingPendingFingerprintIssueStateUpdate[]) => {
+        rows: ErrorTrackingPendingFingerprintIssueStateUpdate[]
+    }
+    captureMergePendingUpdates: (
+        primaryId: string,
+        sourceIds: string[]
+    ) => {
+        primaryId: string
+        sourceIds: string[]
+    }
+    capturePendingUpdatesForIssues: (
+        issueIds: string[],
+        delta: IssueStateDelta
+    ) => {
+        delta: IssueStateDelta
+        issueIds: string[]
+    }
+    clearAll: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface pendingFingerprintIssueStateUpdateLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        currentPendingUpdates: (
+            pendingUpdates: Record<string, StoredPendingUpdate>
+        ) => ErrorTrackingPendingFingerprintIssueStateUpdate[]
+    }
+}
+
+export type pendingFingerprintIssueStateUpdateLogicType = MakeLogicType<
+    pendingFingerprintIssueStateUpdateLogicValues,
+    pendingFingerprintIssueStateUpdateLogicActions,
+    Record<string, any>,
+    pendingFingerprintIssueStateUpdateLogicMeta
+>
+
 export const pendingFingerprintIssueStateUpdateLogic = kea<pendingFingerprintIssueStateUpdateLogicType>([
     path(['products', 'error_tracking', 'logics', 'pendingFingerprintIssueStateUpdateLogic']),
 
@@ -62,7 +107,9 @@ export const pendingFingerprintIssueStateUpdateLogic = kea<pendingFingerprintIss
     selectors({
         currentPendingUpdates: [
             (s) => [s.pendingUpdates],
-            (pendingUpdates): ErrorTrackingPendingFingerprintIssueStateUpdate[] => {
+            (
+                pendingUpdates: Record<string, StoredPendingUpdate>
+            ): ErrorTrackingPendingFingerprintIssueStateUpdate[] => {
                 const now = Date.now()
                 const rows: ErrorTrackingPendingFingerprintIssueStateUpdate[] = []
                 for (const row of Object.values(pendingUpdates)) {
diff --git a/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/assignment_rules/assignmentRuleModalLogic.ts b/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/assignment_rules/assignmentRuleModalLogic.ts
index 3913727fa11d..25b66b474eb6 100644
--- a/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/assignment_rules/assignmentRuleModalLogic.ts
+++ b/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/assignment_rules/assignmentRuleModalLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -8,7 +8,6 @@ import { AnyPropertyFilter, FilterLogicalOperator, UniversalFiltersGroup } from
 
 import { rulesLogic } from '../rules/rulesLogic'
 import { ErrorTrackingAssignmentRule, ErrorTrackingRuleType } from '../rules/types'
-import type { assignmentRuleModalLogicType } from './assignmentRuleModalLogicType'
 
 function emptyRule(orderKey: number = 0): ErrorTrackingAssignmentRule {
     return {
@@ -20,6 +19,121 @@ function emptyRule(orderKey: number = 0): ErrorTrackingAssignmentRule {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface assignmentRuleModalLogicValues {
+    dateRange: string
+    deleting: boolean
+    deletingLoading: boolean
+    hasAssignee: boolean
+    hasFilters: boolean
+    isOpen: boolean
+    matchResult: {
+        exceptionCount: number
+        issueCount: number
+    } | null
+    matchResultLoading: boolean
+    rule: ErrorTrackingAssignmentRule
+    saving: boolean
+    savingLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface assignmentRuleModalLogicActions {
+    closeModal: () => {
+        value: true
+    }
+    deleteRule: () => any
+    deleteRuleFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteRuleSuccess: (
+        deleting: boolean,
+        payload?: any
+    ) => {
+        deleting: boolean
+        payload?: any
+    }
+    increaseDateRange: () => {
+        value: true
+    }
+    loadMatchCount: () => any
+    loadMatchCountFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadMatchCountSuccess: (
+        matchResult: {
+            exceptionCount: any
+            issueCount: any
+        } | null,
+        payload?: any
+    ) => {
+        matchResult: {
+            exceptionCount: any
+            issueCount: any
+        } | null
+        payload?: any
+    }
+    openModal: (rule?: ErrorTrackingAssignmentRule) => {
+        rule: ErrorTrackingAssignmentRule | null
+    }
+    resetMatchCount: () => any
+    resetMatchCountFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    resetMatchCountSuccess: (
+        matchResult: null,
+        payload?: any
+    ) => {
+        matchResult: null
+        payload?: any
+    }
+    saveRule: () => any
+    saveRuleFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    saveRuleSuccess: (
+        saving: boolean,
+        payload?: any
+    ) => {
+        saving: boolean
+        payload?: any
+    }
+    updateRule: (rule: ErrorTrackingAssignmentRule) => {
+        rule: ErrorTrackingAssignmentRule
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface assignmentRuleModalLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        hasFilters: (rule: ErrorTrackingAssignmentRule) => boolean
+        hasAssignee: (rule: ErrorTrackingAssignmentRule) => boolean
+    }
+}
+
+export type assignmentRuleModalLogicType = MakeLogicType<
+    assignmentRuleModalLogicValues,
+    assignmentRuleModalLogicActions,
+    Record<string, any>,
+    assignmentRuleModalLogicMeta
+>
+
 export const assignmentRuleModalLogic = kea<assignmentRuleModalLogicType>([
     path([
         'products',
diff --git a/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/assignment_rules/codeOwnersModalLogic.ts b/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/assignment_rules/codeOwnersModalLogic.ts
index 83c30ed90d16..9c4d1f73c8c8 100644
--- a/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/assignment_rules/codeOwnersModalLogic.ts
+++ b/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/assignment_rules/codeOwnersModalLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -10,6 +10,7 @@ import { rolesLogic } from 'scenes/settings/organization/Permissions/Roles/roles
 import { ErrorTrackingIssueAssignee, NodeKind, ProductKey } from '~/queries/schema/schema-general'
 import { AnyPropertyFilter, OrganizationMemberType, RoleType } from '~/types'
 
+import type { OrganizationType } from '../../../../../../frontend/src/types'
 import { assigneeSelectLogic } from '../../../components/Assignee/assigneeSelectLogic'
 import { rulesLogic } from '../rules/rulesLogic'
 import { ErrorTrackingAssignmentRule, ErrorTrackingRuleType } from '../rules/types'
@@ -22,13 +23,150 @@ import {
     buildOwnerRows,
     buildSavableRows,
 } from './codeownersImport'
-import type { codeOwnersModalLogicType } from './codeOwnersModalLogicType'
 
 export type MatchCount = { exceptionCount: number; issueCount: number }
 export type SaveAllResult = { createdCount: number; failedCount: number; totalCount: number }
 export type CodeOwnerEntryRow = CodeOwnerRuleCandidate
 export type CodeOwnerMappingRow = CodeOwnerOwnerMapping
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface codeOwnersModalLogicValues {
+    meFirstMembers: OrganizationMemberType[] // assigneeSelectLogic
+    currentOrganization: OrganizationType | null // organizationLogic
+    roles: RoleType[] // rolesLogic
+    assigneeOverrides: Record<string, ErrorTrackingIssueAssignee | null>
+    dateRange: string
+    hasParsedOwners: boolean
+    isOpen: boolean
+    mappingRows: CodeOwnerOwnerMapping[]
+    mappingUnresolvedCount: number
+    matchResults: Record<string, MatchCount | null>
+    matchResultsLoading: boolean
+    ownerRows: CodeOwnerRuleCandidate[]
+    ownersToMap: string[]
+    parseErrors: CodeownersError[]
+    parsedOwners: OwnerGroup[]
+    rawText: string
+    savableRows: CodeOwnerRuleCandidate[]
+    saving: SaveAllResult
+    savingLoading: boolean
+    step: 'configure' | 'impact' | 'paste'
+    unmatchedCount: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface codeOwnersModalLogicActions {
+    ensureAssigneeTypesLoaded: () => {
+        value: true
+    } // assigneeSelectLogic
+    loadRoles: () => any // rolesLogic
+    backToMapping: () => {
+        value: true
+    }
+    backToPaste: () => {
+        value: true
+    }
+    closeModal: () => {
+        value: true
+    }
+    goToConfigure: () => {
+        value: true
+    }
+    goToImpact: () => {
+        value: true
+    }
+    openModal: () => {
+        value: true
+    }
+    resetMatchResults: () => any
+    resetMatchResultsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    resetMatchResultsSuccess: (
+        matchResults: Record<string, MatchCount | null>,
+        payload?: any
+    ) => {
+        matchResults: Record<string, MatchCount | null>
+        payload?: any
+    }
+    saveAll: () => any
+    saveAllFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    saveAllSuccess: (
+        saving: SaveAllResult,
+        payload?: any
+    ) => {
+        saving: SaveAllResult
+        payload?: any
+    }
+    setDateRange: (dateRange: string) => {
+        dateRange: string
+    }
+    setOwnerAssignee: (
+        owner: string,
+        assignee: ErrorTrackingIssueAssignee | null
+    ) => {
+        assignee: ErrorTrackingIssueAssignee | null
+        owner: string
+    }
+    setOwnersToMap: (owners: string[]) => {
+        owners: string[]
+    }
+    setRawText: (rawText: string) => {
+        rawText: string
+    }
+    testMatches: () => any
+    testMatchesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    testMatchesSuccess: (
+        matchResults: Record<string, MatchCount | null>,
+        payload?: any
+    ) => {
+        matchResults: Record<string, MatchCount | null>
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface codeOwnersModalLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        parsedOwners: (rawText: string) => OwnerGroup[]
+        ownerRows: (
+            parsedOwners: OwnerGroup[],
+            roles: RoleType[],
+            meFirstMembers: OrganizationMemberType[],
+            assigneeOverrides: Record<string, ErrorTrackingIssueAssignee | null>
+        ) => CodeOwnerRuleCandidate[]
+        savableRows: (ownerRows: CodeOwnerRuleCandidate[]) => CodeOwnerRuleCandidate[]
+        mappingRows: (ownerRows: CodeOwnerRuleCandidate[], ownersToMap: string[]) => CodeOwnerOwnerMapping[]
+        hasParsedOwners: (parsedOwners: OwnerGroup[]) => boolean
+        parseErrors: (rawText: string) => CodeownersError[]
+        unmatchedCount: (ownerRows: CodeOwnerRuleCandidate[]) => number
+        mappingUnresolvedCount: (mappingRows: CodeOwnerOwnerMapping[]) => number
+    }
+}
+
+export type codeOwnersModalLogicType = MakeLogicType<
+    codeOwnersModalLogicValues,
+    codeOwnersModalLogicActions,
+    Record<string, any>,
+    codeOwnersModalLogicMeta
+>
+
 export const codeOwnersModalLogic = kea<codeOwnersModalLogicType>([
     path([
         'products',
diff --git a/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/bypass_rules/bypassRuleModalLogic.ts b/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/bypass_rules/bypassRuleModalLogic.ts
index 5810940ca330..28b01e688e5c 100644
--- a/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/bypass_rules/bypassRuleModalLogic.ts
+++ b/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/bypass_rules/bypassRuleModalLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -7,7 +7,7 @@ import { FilterLogicalOperator, UniversalFiltersGroup } from '~/types'
 
 import { rulesLogic } from '../rules/rulesLogic'
 import { ErrorTrackingBypassRule, ErrorTrackingRuleType } from '../rules/types'
-import type { bypassRuleModalLogicType } from './bypassRuleModalLogicType'
+import type { ErrorTrackingBaseRule } from '../rules/types'
 
 function emptyRule(orderKey: number = 0): ErrorTrackingBypassRule {
     return {
@@ -18,6 +18,74 @@ function emptyRule(orderKey: number = 0): ErrorTrackingBypassRule {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface bypassRuleModalLogicValues {
+    deleting: boolean
+    deletingLoading: boolean
+    hasFilters: boolean
+    isOpen: boolean
+    rule: ErrorTrackingBypassRule
+    saving: boolean
+    savingLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface bypassRuleModalLogicActions {
+    closeModal: () => {
+        value: true
+    }
+    deleteRule: () => any
+    deleteRuleFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteRuleSuccess: (
+        deleting: boolean,
+        payload?: any
+    ) => {
+        deleting: boolean
+        payload?: any
+    }
+    openModal: (rule?: ErrorTrackingBypassRule) => {
+        rule: ErrorTrackingBaseRule | null
+    }
+    saveRule: () => any
+    saveRuleFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    saveRuleSuccess: (
+        saving: boolean,
+        payload?: any
+    ) => {
+        saving: boolean
+        payload?: any
+    }
+    updateRule: (rule: ErrorTrackingBypassRule) => {
+        rule: ErrorTrackingBaseRule
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface bypassRuleModalLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        hasFilters: (rule: ErrorTrackingBaseRule) => boolean
+    }
+}
+
+export type bypassRuleModalLogicType = MakeLogicType<
+    bypassRuleModalLogicValues,
+    bypassRuleModalLogicActions,
+    Record<string, any>,
+    bypassRuleModalLogicMeta
+>
+
 export const bypassRuleModalLogic = kea<bypassRuleModalLogicType>([
     path([
         'products',
diff --git a/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/exception_autocapture/disableSurveyLogic.ts b/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/exception_autocapture/disableSurveyLogic.ts
index 8c14fa7698d8..b9f7fec5fba2 100644
--- a/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/exception_autocapture/disableSurveyLogic.ts
+++ b/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/exception_autocapture/disableSurveyLogic.ts
@@ -1,12 +1,43 @@
-import { actions, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers } from 'kea'
 import posthog from 'posthog-js'
 
 import { SurveyQuestion } from '~/types'
 
-import type { disableSurveyLogicType } from './disableSurveyLogicType'
-
 const SURVEY_ID = '019c89a0-1469-0000-a31c-35883eb31be4'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface disableSurveyLogicValues {
+    openResponse: string
+    selectedChoice: string | null
+    submitted: boolean
+    surveyQuestions: SurveyQuestion[]
+    visible: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface disableSurveyLogicActions {
+    hideSurvey: () => {
+        value: true
+    }
+    setOpenResponse: (response: string) => {
+        response: string
+    }
+    setSelectedChoice: (choice: string) => {
+        choice: string
+    }
+    setSurveyQuestions: (questions: SurveyQuestion[]) => {
+        questions: SurveyQuestion[]
+    }
+    showSurvey: () => {
+        value: true
+    }
+    submitResponse: () => {
+        value: true
+    }
+}
+
+export type disableSurveyLogicType = MakeLogicType<disableSurveyLogicValues, disableSurveyLogicActions>
+
 export const disableSurveyLogic = kea<disableSurveyLogicType>([
     path(['scenes', 'error-tracking', 'configuration', 'disableSurveyLogic']),
 
diff --git a/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/grouping_rules/groupingRuleModalLogic.ts b/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/grouping_rules/groupingRuleModalLogic.ts
index 21e8135cf2a4..04b8319753ef 100644
--- a/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/grouping_rules/groupingRuleModalLogic.ts
+++ b/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/grouping_rules/groupingRuleModalLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -8,7 +8,6 @@ import { AnyPropertyFilter, FilterLogicalOperator, UniversalFiltersGroup } from
 
 import { rulesLogic } from '../rules/rulesLogic'
 import { ErrorTrackingGroupingRule, ErrorTrackingRuleType } from '../rules/types'
-import type { groupingRuleModalLogicType } from './groupingRuleModalLogicType'
 
 function emptyRule(orderKey: number = 0): ErrorTrackingGroupingRule {
     return {
@@ -20,6 +19,119 @@ function emptyRule(orderKey: number = 0): ErrorTrackingGroupingRule {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface groupingRuleModalLogicValues {
+    dateRange: string
+    deleting: boolean
+    deletingLoading: boolean
+    hasFilters: boolean
+    isOpen: boolean
+    matchResult: {
+        exceptionCount: number
+        issueCount: number
+    } | null
+    matchResultLoading: boolean
+    rule: ErrorTrackingGroupingRule
+    saving: boolean
+    savingLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface groupingRuleModalLogicActions {
+    closeModal: () => {
+        value: true
+    }
+    deleteRule: () => any
+    deleteRuleFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteRuleSuccess: (
+        deleting: boolean,
+        payload?: any
+    ) => {
+        deleting: boolean
+        payload?: any
+    }
+    increaseDateRange: () => {
+        value: true
+    }
+    loadMatchCount: () => any
+    loadMatchCountFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadMatchCountSuccess: (
+        matchResult: {
+            exceptionCount: any
+            issueCount: any
+        } | null,
+        payload?: any
+    ) => {
+        matchResult: {
+            exceptionCount: any
+            issueCount: any
+        } | null
+        payload?: any
+    }
+    openModal: (rule?: ErrorTrackingGroupingRule) => {
+        rule: ErrorTrackingGroupingRule | null
+    }
+    resetMatchCount: () => any
+    resetMatchCountFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    resetMatchCountSuccess: (
+        matchResult: null,
+        payload?: any
+    ) => {
+        matchResult: null
+        payload?: any
+    }
+    saveRule: () => any
+    saveRuleFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    saveRuleSuccess: (
+        saving: boolean,
+        payload?: any
+    ) => {
+        saving: boolean
+        payload?: any
+    }
+    updateRule: (rule: ErrorTrackingGroupingRule) => {
+        rule: ErrorTrackingGroupingRule
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface groupingRuleModalLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        hasFilters: (rule: ErrorTrackingGroupingRule) => boolean
+    }
+}
+
+export type groupingRuleModalLogicType = MakeLogicType<
+    groupingRuleModalLogicValues,
+    groupingRuleModalLogicActions,
+    Record<string, any>,
+    groupingRuleModalLogicMeta
+>
+
 export const groupingRuleModalLogic = kea<groupingRuleModalLogicType>([
     path([
         'products',
diff --git a/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/rate_limit/issueRateLimitConfigLogic.ts b/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/rate_limit/issueRateLimitConfigLogic.ts
index a294dc1c7f6a..bb651812e24f 100644
--- a/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/rate_limit/issueRateLimitConfigLogic.ts
+++ b/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/rate_limit/issueRateLimitConfigLogic.ts
@@ -1,5 +1,6 @@
-import { actions, afterMount, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, listeners, path, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
@@ -9,7 +10,6 @@ import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
 
 import { HogQLQueryResponse, NodeKind, ProductKey } from '~/queries/schema/schema-general'
 
-import type { issueRateLimitConfigLogicType } from './issueRateLimitConfigLogicType'
 import {
     DEFAULT_BUCKET_MINUTES,
     BYPASSED_METRIC_NAME,
@@ -39,6 +39,218 @@ const DEFAULT_CONFIG: IssueRateLimitConfigForm = {
     per_issue_rate_limit_bucket_size_minutes: DEFAULT_BUCKET_MINUTES,
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface issueRateLimitConfigLogicValues {
+    chartMode: RateLimitChartMode
+    config: ErrorTrackingSettings | null
+    configForm: IssueRateLimitConfigForm
+    configFormAllErrors: Record<string, any>
+    configFormChanged: boolean
+    configFormErrors: DeepPartialMap<IssueRateLimitConfigForm, ValidationErrorType>
+    configFormHasErrors: boolean
+    configFormManualErrors: Record<string, any>
+    configFormTouched: boolean
+    configFormTouches: Record<string, boolean>
+    configFormValidationErrors: DeepPartialMap<IssueRateLimitConfigForm, ValidationErrorType>
+    configLoading: boolean
+    hasLoadedConfig: boolean
+    isConfigFormSubmitting: boolean
+    isConfigFormValid: boolean
+    selectedIssue: TopIssue | null
+    selectedIssueHistory: RateLimitHistoryBucket[]
+    selectedIssueHistoryLoading: boolean
+    selectedIssueId: string | null
+    selectedIssueVolume: ExceptionVolumeBucket[]
+    selectedIssueVolumeLoading: boolean
+    showConfigFormErrors: boolean
+    topIssues: TopIssue[]
+    topIssuesLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface issueRateLimitConfigLogicActions {
+    loadConfig: () => any
+    loadConfigFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadConfigSuccess: (
+        config: ErrorTrackingSettings,
+        payload?: any
+    ) => {
+        config: ErrorTrackingSettings
+        payload?: any
+    }
+    loadSelectedIssueHistory: ({
+        issueId,
+        bucketMinutes,
+        force,
+    }: {
+        bucketMinutes: number
+        force?: boolean
+        issueId: string
+    }) => {
+        issueId: string
+        bucketMinutes: number
+        force?: boolean
+    }
+    loadSelectedIssueHistoryFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSelectedIssueHistorySuccess: (
+        selectedIssueHistory: RateLimitHistoryBucket[],
+        payload?: {
+            issueId: string
+            bucketMinutes: number
+            force?: boolean
+        }
+    ) => {
+        selectedIssueHistory: RateLimitHistoryBucket[]
+        payload?: {
+            issueId: string
+            bucketMinutes: number
+            force?: boolean
+        }
+    }
+    loadSelectedIssueVolume: ({
+        issueId,
+        bucketMinutes,
+        force,
+    }: {
+        bucketMinutes: number
+        force?: boolean
+        issueId: string
+    }) => {
+        issueId: string
+        bucketMinutes: number
+        force?: boolean
+    }
+    loadSelectedIssueVolumeFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSelectedIssueVolumeSuccess: (
+        selectedIssueVolume: {
+            bucket: string
+            count: number
+        }[],
+        payload?: {
+            issueId: string
+            bucketMinutes: number
+            force?: boolean
+        }
+    ) => {
+        selectedIssueVolume: {
+            bucket: string
+            count: number
+        }[]
+        payload?: {
+            issueId: string
+            bucketMinutes: number
+            force?: boolean
+        }
+    }
+    loadTopIssues: ({ bucketMinutes }: { bucketMinutes: number }) => {
+        bucketMinutes: number
+    }
+    loadTopIssuesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadTopIssuesSuccess: (
+        topIssues: {
+            description: string | null
+            issue_id: string
+            name: string | null
+            occurrences: number
+        }[],
+        payload?: {
+            bucketMinutes: number
+        }
+    ) => {
+        topIssues: {
+            description: string | null
+            issue_id: string
+            name: string | null
+            occurrences: number
+        }[]
+        payload?: {
+            bucketMinutes: number
+        }
+    }
+    refreshChart: () => {
+        value: true
+    }
+    resetConfigForm: (values?: IssueRateLimitConfigForm) => {
+        values?: IssueRateLimitConfigForm
+    }
+    selectIssue: (issueId: string | null) => {
+        issueId: string | null
+    }
+    setChartMode: (mode: RateLimitChartMode) => {
+        mode: RateLimitChartMode
+    }
+    setConfigFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setConfigFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setConfigFormValues: (values: DeepPartial<IssueRateLimitConfigForm>) => {
+        values: DeepPartial<IssueRateLimitConfigForm>
+    }
+    submitConfigForm: () => {
+        value: boolean
+    }
+    submitConfigFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitConfigFormRequest: (configForm: IssueRateLimitConfigForm) => {
+        configForm: IssueRateLimitConfigForm
+    }
+    submitConfigFormSuccess: (configForm: IssueRateLimitConfigForm) => {
+        configForm: IssueRateLimitConfigForm
+    }
+    touchConfigFormField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface issueRateLimitConfigLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        selectedIssue: (topIssues: TopIssue[], selectedIssueId: string | null) => TopIssue | null
+    }
+}
+
+export type issueRateLimitConfigLogicType = MakeLogicType<
+    issueRateLimitConfigLogicValues,
+    issueRateLimitConfigLogicActions,
+    Record<string, any>,
+    issueRateLimitConfigLogicMeta
+>
+
 export const issueRateLimitConfigLogic = kea<issueRateLimitConfigLogicType>([
     path([
         'products',
@@ -254,7 +466,7 @@ export const issueRateLimitConfigLogic = kea<issueRateLimitConfigLogicType>([
     selectors({
         selectedIssue: [
             (s) => [s.topIssues, s.selectedIssueId],
-            (issues, selectedId) => issues.find((i) => i.issue_id === selectedId) ?? null,
+            (issues: TopIssue[], selectedId: string | null) => issues.find((i) => i.issue_id === selectedId) ?? null,
         ],
     }),
 
diff --git a/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/rate_limit/rateLimitConfigLogic.ts b/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/rate_limit/rateLimitConfigLogic.ts
index fe2bec69eaac..a5f46815f12c 100644
--- a/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/rate_limit/rateLimitConfigLogic.ts
+++ b/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/rate_limit/rateLimitConfigLogic.ts
@@ -1,5 +1,6 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
@@ -10,8 +11,6 @@ import { teamLogic } from 'scenes/teamLogic'
 
 import { HogQLQueryResponse, NodeKind, ProductKey } from '~/queries/schema/schema-general'
 
-import type { rateLimitConfigLogicType } from './rateLimitConfigLogicType'
-
 export interface RateLimitConfigForm {
     project_rate_limit_value: number | null
     project_rate_limit_bucket_size_minutes: number
@@ -69,6 +68,130 @@ export const RECORDED_METRIC_NAME = 'allowed'
 export const DROPPED_METRIC_NAME = 'rate_limited'
 export const BYPASSED_METRIC_NAME = 'bypassed'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface rateLimitConfigLogicValues {
+    currentTeamId: number | null // teamLogic
+    chartMode: RateLimitChartMode
+    config: ErrorTrackingSettings | null
+    configForm: RateLimitConfigForm
+    configFormAllErrors: Record<string, any>
+    configFormChanged: boolean
+    configFormErrors: DeepPartialMap<RateLimitConfigForm, ValidationErrorType>
+    configFormHasErrors: boolean
+    configFormManualErrors: Record<string, any>
+    configFormTouched: boolean
+    configFormTouches: Record<string, boolean>
+    configFormValidationErrors: DeepPartialMap<RateLimitConfigForm, ValidationErrorType>
+    configLoading: boolean
+    hasLoadedConfig: boolean
+    history: RateLimitHistoryBucket[]
+    historyLoading: boolean
+    isConfigFormSubmitting: boolean
+    isConfigFormValid: boolean
+    showConfigFormErrors: boolean
+    volume: ExceptionVolumeBucket[]
+    volumeBucketMinutes: number
+    volumeLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface rateLimitConfigLogicActions {
+    loadConfig: () => any
+    loadConfigFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadConfigSuccess: (
+        config: ErrorTrackingSettings,
+        payload?: any
+    ) => {
+        config: ErrorTrackingSettings
+        payload?: any
+    }
+    loadHistory: ({ bucketMinutes, force }: ChartLoadParams) => ChartLoadParams
+    loadHistoryFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadHistorySuccess: (
+        history: RateLimitHistoryBucket[],
+        payload?: ChartLoadParams
+    ) => {
+        history: RateLimitHistoryBucket[]
+        payload?: ChartLoadParams
+    }
+    loadVolume: ({ bucketMinutes, force }: ChartLoadParams) => ChartLoadParams
+    loadVolumeFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadVolumeSuccess: (
+        volume: {
+            bucket: string
+            count: number
+        }[],
+        payload?: ChartLoadParams
+    ) => {
+        volume: {
+            bucket: string
+            count: number
+        }[]
+        payload?: ChartLoadParams
+    }
+    refreshChart: () => {
+        value: true
+    }
+    resetConfigForm: (values?: RateLimitConfigForm) => {
+        values?: RateLimitConfigForm
+    }
+    setChartMode: (mode: RateLimitChartMode) => {
+        mode: RateLimitChartMode
+    }
+    setConfigFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setConfigFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setConfigFormValues: (values: DeepPartial<RateLimitConfigForm>) => {
+        values: DeepPartial<RateLimitConfigForm>
+    }
+    submitConfigForm: () => {
+        value: boolean
+    }
+    submitConfigFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitConfigFormRequest: (configForm: RateLimitConfigForm) => {
+        configForm: RateLimitConfigForm
+    }
+    submitConfigFormSuccess: (configForm: RateLimitConfigForm) => {
+        configForm: RateLimitConfigForm
+    }
+    touchConfigFormField: (key: string) => {
+        key: string
+    }
+}
+
+export type rateLimitConfigLogicType = MakeLogicType<rateLimitConfigLogicValues, rateLimitConfigLogicActions>
+
 export const rateLimitConfigLogic = kea<rateLimitConfigLogicType>([
     path([
         'products',
diff --git a/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/releases/releasesLogic.tsx b/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/releases/releasesLogic.tsx
index 21984884e139..45068bce18c6 100644
--- a/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/releases/releasesLogic.tsx
+++ b/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/releases/releasesLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, defaults, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, defaults, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api, { CountedPaginatedResponse } from 'lib/api'
@@ -8,12 +8,74 @@ import { urls } from 'scenes/urls'
 
 import { Breadcrumb } from '~/types'
 
-import type { releasesLogicType } from './releasesLogicType'
-
 export const RESULTS_PER_PAGE = 20
 
 export type ErrorTrackingReleaseResponse = CountedPaginatedResponse<ErrorTrackingRelease>
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface releasesLogicValues {
+    breadcrumbs: Breadcrumb[]
+    page: number
+    pagination: {
+        controlled: true
+        currentPage: number
+        entryCount: number
+        onBackward: () => void
+        onForward: () => void
+        pageSize: number
+    }
+    releaseResponse: ErrorTrackingReleaseResponse | null
+    releaseResponseLoading: boolean
+    releases: ErrorTrackingRelease[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface releasesLogicActions {
+    loadReleases: () => void
+    loadReleasesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadReleasesSuccess: (
+        releaseResponse: CountedPaginatedResponse<ErrorTrackingRelease>,
+        payload?: void
+    ) => {
+        releaseResponse: CountedPaginatedResponse<ErrorTrackingRelease>
+        payload?: void
+    }
+    setPage: (page: number) => {
+        page: number
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface releasesLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        releases: (releaseResponse: ErrorTrackingReleaseResponse | null) => ErrorTrackingRelease[]
+        pagination: (
+            page: number,
+            releaseResponse: ErrorTrackingReleaseResponse | null
+        ) => {
+            controlled: true
+            currentPage: number
+            entryCount: number
+            onBackward: () => void
+            onForward: () => void
+            pageSize: number
+        }
+    }
+}
+
+export type releasesLogicType = MakeLogicType<
+    releasesLogicValues,
+    releasesLogicActions,
+    Record<string, any>,
+    releasesLogicMeta
+>
+
 export const releasesLogic = kea<releasesLogicType>([
     path(['products', 'error_tracking', 'scenes', 'ErrorTrackingConfigurationScene', 'releases', 'releasesLogic']),
 
diff --git a/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/rules/rulesLogic.tsx b/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/rules/rulesLogic.tsx
index 7793151978be..09461306d0bf 100644
--- a/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/rules/rulesLogic.tsx
+++ b/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/rules/rulesLogic.tsx
@@ -1,11 +1,10 @@
-import { actions, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
 
 import { FilterLogicalOperator } from '~/types'
 
-import type { rulesLogicType } from './rulesLogicType'
 import { ErrorTrackingRule, ErrorTrackingRuleNew, ErrorTrackingRuleType, ErrorTrackingRulesLogicProps } from './types'
 
 function createNewRule(ruleType: ErrorTrackingRuleType, order_key: number): ErrorTrackingRuleNew {
@@ -47,6 +46,150 @@ function createNewRule(ruleType: ErrorTrackingRuleType, order_key: number): Erro
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface rulesLogicValues {
+    allRules: ErrorTrackingRule[]
+    hasNewRule: boolean
+    initialLoadComplete: boolean
+    isReorderingRules: boolean
+    isSelectingRules: boolean
+    localRules: ErrorTrackingRule[]
+    rules: ErrorTrackingRule[]
+    rulesLoading: boolean
+    selectedRuleIds: ErrorTrackingRule['id'][]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface rulesLogicActions {
+    _setLocalRules: (rules: ErrorTrackingRule[]) => {
+        rules: ErrorTrackingRule[]
+    }
+    addRule: () => {
+        value: true
+    }
+    cancelReorderingRules: () => {
+        value: true
+    }
+    cancelSelectingRules: () => {
+        value: true
+    }
+    deleteRule: (id: any) => any
+    deleteRuleFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteRuleSuccess: (
+        rules: ErrorTrackingRule[],
+        payload?: any
+    ) => {
+        rules: ErrorTrackingRule[]
+        payload?: any
+    }
+    deleteSelectedRules: () => any
+    deleteSelectedRulesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteSelectedRulesSuccess: (
+        rules: ErrorTrackingRule[],
+        payload?: any
+    ) => {
+        rules: ErrorTrackingRule[]
+        payload?: any
+    }
+    finishReorderingRules: () => any
+    finishReorderingRulesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    finishReorderingRulesSuccess: (
+        rules: ErrorTrackingRule[],
+        payload?: any
+    ) => {
+        rules: ErrorTrackingRule[]
+        payload?: any
+    }
+    loadRules: () => any
+    loadRulesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRulesSuccess: (
+        rules: ErrorTrackingRule[],
+        payload?: any
+    ) => {
+        rules: ErrorTrackingRule[]
+        payload?: any
+    }
+    reorderLocalRules: (rules: ErrorTrackingRule[]) => {
+        rules: ErrorTrackingRule[]
+    }
+    saveRule: (id: any) => any
+    saveRuleFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    saveRuleSuccess: (
+        rules: ErrorTrackingRule[],
+        payload?: any
+    ) => {
+        rules: ErrorTrackingRule[]
+        payload?: any
+    }
+    setRuleEditable: (id: ErrorTrackingRule['id']) => {
+        id: string
+    }
+    setSelectedRuleIds: (ids: ErrorTrackingRule['id'][]) => {
+        ids: string[]
+    }
+    startReorderingRules: () => {
+        value: true
+    }
+    startSelectingRules: () => {
+        value: true
+    }
+    toggleSelectedRule: (id: ErrorTrackingRule['id']) => {
+        id: string
+    }
+    unsetRuleEditable: (id: ErrorTrackingRule['id']) => {
+        id: string
+    }
+    updateLocalRule: (rule: ErrorTrackingRule) => {
+        rule: ErrorTrackingRule
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface rulesLogicMeta {
+    key: ErrorTrackingRuleType
+    __keaTypeGenInternalSelectorTypes: {
+        allRules: (localRules: ErrorTrackingRule[], rules: ErrorTrackingRule[]) => ErrorTrackingRule[]
+        hasNewRule: (allRules: ErrorTrackingRule[]) => boolean
+    }
+}
+
+export type rulesLogicType = MakeLogicType<
+    rulesLogicValues,
+    rulesLogicActions,
+    ErrorTrackingRulesLogicProps,
+    rulesLogicMeta
+>
+
 export const rulesLogic = kea<rulesLogicType>([
     props({} as ErrorTrackingRulesLogicProps),
     key(({ ruleType }) => ruleType),
@@ -208,11 +351,14 @@ export const rulesLogic = kea<rulesLogicType>([
     selectors({
         allRules: [
             (s) => [s.localRules, s.rules],
-            (localRules, rules): ErrorTrackingRule[] => {
+            (localRules: ErrorTrackingRule[], rules: ErrorTrackingRule[]): ErrorTrackingRule[] => {
                 const uniqueRules = new Map([...rules, ...localRules].map((item) => [item.id, item]))
                 return Array.from(uniqueRules.values()).sort((a, b) => a.order_key - b.order_key)
             },
         ],
-        hasNewRule: [(s) => [s.allRules], (allRules): boolean => allRules.some((r) => r.id === 'new')],
+        hasNewRule: [
+            (s) => [s.allRules],
+            (allRules: ErrorTrackingRule[]): boolean => allRules.some((r) => r.id === 'new'),
+        ],
     }),
 ])
diff --git a/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/spike_detection/recentSpikesLogic.ts b/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/spike_detection/recentSpikesLogic.ts
index 6e44e96c0d27..2d4605c003a5 100644
--- a/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/spike_detection/recentSpikesLogic.ts
+++ b/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/spike_detection/recentSpikesLogic.ts
@@ -1,11 +1,9 @@
-import { actions, afterMount, defaults, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, defaults, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api, { CountedPaginatedResponse } from 'lib/api'
 import { ErrorTrackingSpikeEvent } from 'lib/components/Errors/types'
 
-import type { recentSpikesLogicType } from './recentSpikesLogicType'
-
 const RESULTS_PER_PAGE = 10
 
 export type SpikeEventOrder =
@@ -18,6 +16,79 @@ export type SpikeEventOrder =
 
 export type RecentSpikesResponse = CountedPaginatedResponse<ErrorTrackingSpikeEvent>
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface recentSpikesLogicValues {
+    order: SpikeEventOrder
+    page: number
+    pagination: {
+        controlled: true
+        currentPage: number
+        entryCount: number
+        onBackward: () => void
+        onForward: () => void
+        pageSize: number
+    }
+    recentSpikes: ErrorTrackingSpikeEvent[]
+    spikesResponse: RecentSpikesResponse | null
+    spikesResponseLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface recentSpikesLogicActions {
+    loadRecentSpikes: () => {
+        value: true
+    }
+    loadRecentSpikesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRecentSpikesSuccess: (
+        spikesResponse: CountedPaginatedResponse<ErrorTrackingSpikeEvent>,
+        payload?: {
+            value: true
+        }
+    ) => {
+        spikesResponse: CountedPaginatedResponse<ErrorTrackingSpikeEvent>
+        payload?: {
+            value: true
+        }
+    }
+    setOrder: (order: SpikeEventOrder) => {
+        order: SpikeEventOrder
+    }
+    setPage: (page: number) => {
+        page: number
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface recentSpikesLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        recentSpikes: (spikesResponse: RecentSpikesResponse | null) => ErrorTrackingSpikeEvent[]
+        pagination: (
+            page: number,
+            spikesResponse: RecentSpikesResponse | null
+        ) => {
+            controlled: true
+            currentPage: number
+            entryCount: number
+            onBackward: () => void
+            onForward: () => void
+            pageSize: number
+        }
+    }
+}
+
+export type recentSpikesLogicType = MakeLogicType<
+    recentSpikesLogicValues,
+    recentSpikesLogicActions,
+    Record<string, any>,
+    recentSpikesLogicMeta
+>
+
 export const recentSpikesLogic = kea<recentSpikesLogicType>([
     path([
         'products',
diff --git a/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/spike_detection/spikeDetectionConfigLogic.ts b/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/spike_detection/spikeDetectionConfigLogic.ts
index 82d30fea27a6..f67f0bbd83bf 100644
--- a/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/spike_detection/spikeDetectionConfigLogic.ts
+++ b/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/spike_detection/spikeDetectionConfigLogic.ts
@@ -1,5 +1,6 @@
-import { afterMount, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, afterMount, kea, listeners, path, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
@@ -9,8 +10,6 @@ import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
 
 import { HogFunctionType } from '~/types'
 
-import type { spikeDetectionConfigLogicType } from './spikeDetectionConfigLogicType'
-
 export interface SpikeDetectionConfigForm {
     snooze_duration_minutes: number
     multiplier: number
@@ -23,6 +22,111 @@ const DEFAULT_CONFIG: SpikeDetectionConfigForm = {
     threshold: 500,
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface spikeDetectionConfigLogicValues {
+    config: ErrorTrackingSpikeDetectionConfig | null
+    configForm: SpikeDetectionConfigForm
+    configFormAllErrors: Record<string, any>
+    configFormChanged: boolean
+    configFormErrors: DeepPartialMap<SpikeDetectionConfigForm, ValidationErrorType>
+    configFormHasErrors: boolean
+    configFormManualErrors: Record<string, any>
+    configFormTouched: boolean
+    configFormTouches: Record<string, boolean>
+    configFormValidationErrors: DeepPartialMap<SpikeDetectionConfigForm, ValidationErrorType>
+    configLoading: boolean
+    hasLoadedConfig: boolean
+    hasSpikeAlerts: boolean
+    isConfigFormSubmitting: boolean
+    isConfigFormValid: boolean
+    showConfigFormErrors: boolean
+    spikeAlerts: HogFunctionType[]
+    spikeAlertsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface spikeDetectionConfigLogicActions {
+    loadConfig: () => any
+    loadConfigFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadConfigSuccess: (
+        config: ErrorTrackingSpikeDetectionConfig,
+        payload?: any
+    ) => {
+        config: ErrorTrackingSpikeDetectionConfig
+        payload?: any
+    }
+    loadSpikeAlerts: () => any
+    loadSpikeAlertsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSpikeAlertsSuccess: (
+        spikeAlerts: HogFunctionType[],
+        payload?: any
+    ) => {
+        spikeAlerts: HogFunctionType[]
+        payload?: any
+    }
+    resetConfigForm: (values?: SpikeDetectionConfigForm) => {
+        values?: SpikeDetectionConfigForm
+    }
+    setConfigFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setConfigFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setConfigFormValues: (values: DeepPartial<SpikeDetectionConfigForm>) => {
+        values: DeepPartial<SpikeDetectionConfigForm>
+    }
+    submitConfigForm: () => {
+        value: boolean
+    }
+    submitConfigFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitConfigFormRequest: (configForm: SpikeDetectionConfigForm) => {
+        configForm: SpikeDetectionConfigForm
+    }
+    submitConfigFormSuccess: (configForm: SpikeDetectionConfigForm) => {
+        configForm: SpikeDetectionConfigForm
+    }
+    touchConfigFormField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface spikeDetectionConfigLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        hasSpikeAlerts: (spikeAlerts: HogFunctionType[]) => boolean
+    }
+}
+
+export type spikeDetectionConfigLogicType = MakeLogicType<
+    spikeDetectionConfigLogicValues,
+    spikeDetectionConfigLogicActions,
+    Record<string, any>,
+    spikeDetectionConfigLogicMeta
+>
+
 export const spikeDetectionConfigLogic = kea<spikeDetectionConfigLogicType>([
     path([
         'products',
diff --git a/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/suppression_rules/suppressionRuleModalLogic.ts b/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/suppression_rules/suppressionRuleModalLogic.ts
index f790d5152d9d..82cb2532abb3 100644
--- a/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/suppression_rules/suppressionRuleModalLogic.ts
+++ b/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/suppression_rules/suppressionRuleModalLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -8,7 +8,6 @@ import { AnyPropertyFilter, FilterLogicalOperator, UniversalFiltersGroup } from
 
 import { rulesLogic } from '../rules/rulesLogic'
 import { ErrorTrackingRuleType, ErrorTrackingSuppressionRule } from '../rules/types'
-import type { suppressionRuleModalLogicType } from './suppressionRuleModalLogicType'
 
 function emptyRule(orderKey: number = 0): ErrorTrackingSuppressionRule {
     return {
@@ -20,6 +19,122 @@ function emptyRule(orderKey: number = 0): ErrorTrackingSuppressionRule {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface suppressionRuleModalLogicValues {
+    dateRange: string
+    deleting: boolean
+    deletingLoading: boolean
+    hasFilters: boolean
+    isOpen: boolean
+    matchResult: {
+        exceptionCount: number
+        issueCount: number
+    } | null
+    matchResultLoading: boolean
+    rule: ErrorTrackingSuppressionRule
+    saving: boolean
+    savingLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface suppressionRuleModalLogicActions {
+    closeModal: () => {
+        value: true
+    }
+    deleteRule: () => any
+    deleteRuleFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteRuleSuccess: (
+        deleting: boolean,
+        payload?: any
+    ) => {
+        deleting: boolean
+        payload?: any
+    }
+    increaseDateRange: () => {
+        value: true
+    }
+    loadMatchCount: () => any
+    loadMatchCountFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadMatchCountSuccess: (
+        matchResult: {
+            exceptionCount: any
+            issueCount: any
+        },
+        payload?: any
+    ) => {
+        matchResult: {
+            exceptionCount: any
+            issueCount: any
+        }
+        payload?: any
+    }
+    openModal: (rule?: ErrorTrackingSuppressionRule) => {
+        rule: ErrorTrackingSuppressionRule | null
+    }
+    resetMatchCount: () => any
+    resetMatchCountFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    resetMatchCountSuccess: (
+        matchResult: null,
+        payload?: any
+    ) => {
+        matchResult: null
+        payload?: any
+    }
+    saveRule: () => any
+    saveRuleFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    saveRuleSuccess: (
+        saving: boolean,
+        payload?: any
+    ) => {
+        saving: boolean
+        payload?: any
+    }
+    updateRule: (rule: ErrorTrackingSuppressionRule) => {
+        rule: ErrorTrackingSuppressionRule
+    }
+    updateSamplingRate: (sampling_rate: number) => {
+        sampling_rate: number
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface suppressionRuleModalLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        hasFilters: (rule: ErrorTrackingSuppressionRule) => boolean
+    }
+}
+
+export type suppressionRuleModalLogicType = MakeLogicType<
+    suppressionRuleModalLogicValues,
+    suppressionRuleModalLogicActions,
+    Record<string, any>,
+    suppressionRuleModalLogicMeta
+>
+
 export const suppressionRuleModalLogic = kea<suppressionRuleModalLogicType>([
     path([
         'products',
diff --git a/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/symbol_sets/symbolSetLogic.tsx b/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/symbol_sets/symbolSetLogic.tsx
index 82960f8bbae9..e2d17a3dc9ca 100644
--- a/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/symbol_sets/symbolSetLogic.tsx
+++ b/products/error_tracking/frontend/scenes/ErrorTrackingConfigurationScene/symbol_sets/symbolSetLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, afterMount, defaults, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, defaults, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -11,13 +11,102 @@ import { urls } from 'scenes/urls'
 
 import { Breadcrumb } from '~/types'
 
-import type { symbolSetLogicType } from './symbolSetLogicType'
-
 export const RESULTS_PER_PAGE = 20
 
 export type ErrorTrackingSymbolSetResponse = CountedPaginatedResponse<ErrorTrackingSymbolSet>
 export type SymbolSetOrder = 'created_at' | '-created_at' | 'last_used' | '-last_used'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface symbolSetLogicValues {
+    breadcrumbs: Breadcrumb[]
+    deleteSymbolSetResponse: null
+    deleteSymbolSetResponseLoading: boolean
+    page: number
+    previouslyCheckedIndex: number | null
+    searchQuery: string
+    selectedSymbolSetIds: string[]
+    shiftKeyHeld: boolean
+    symbolSetOrder: SymbolSetOrder
+    symbolSetResponse: ErrorTrackingSymbolSetResponse | null
+    symbolSetResponseLoading: boolean
+    symbolSetStatusFilter: SymbolSetStatusFilter
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface symbolSetLogicActions {
+    bulkDeleteSymbolSets: () => any
+    bulkDeleteSymbolSetsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    bulkDeleteSymbolSetsSuccess: (
+        deleteSymbolSetResponse: null,
+        payload?: any
+    ) => {
+        deleteSymbolSetResponse: null
+        payload?: any
+    }
+    deleteSymbolSet: (id: string) => string
+    deleteSymbolSetFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteSymbolSetSuccess: (
+        deleteSymbolSetResponse: null,
+        payload?: string
+    ) => {
+        deleteSymbolSetResponse: null
+        payload?: string
+    }
+    downloadSymbolSet: (id: string) => {
+        id: string
+    }
+    loadSymbolSets: () => void
+    loadSymbolSetsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSymbolSetsSuccess: (
+        symbolSetResponse: CountedPaginatedResponse<ErrorTrackingSymbolSet>,
+        payload?: void
+    ) => {
+        symbolSetResponse: CountedPaginatedResponse<ErrorTrackingSymbolSet>
+        payload?: void
+    }
+    setPage: (page: number) => {
+        page: number
+    }
+    setPreviouslyCheckedIndex: (index: number) => {
+        index: number
+    }
+    setSearchQuery: (search: string) => {
+        search: string
+    }
+    setSelectedSymbolSetIds: (ids: string[]) => {
+        ids: string[]
+    }
+    setShiftKeyHeld: (shiftKeyHeld: boolean) => {
+        shiftKeyHeld: boolean
+    }
+    setSymbolSetOrder: (order: SymbolSetOrder) => {
+        order: SymbolSetOrder
+    }
+    setSymbolSetStatusFilter: (status: SymbolSetStatusFilter) => {
+        status: SymbolSetStatusFilter
+    }
+}
+
+export type symbolSetLogicType = MakeLogicType<symbolSetLogicValues, symbolSetLogicActions>
+
 export const symbolSetLogic = kea<symbolSetLogicType>([
     path(['products', 'error_tracking', 'scenes', 'ErrorTrackingConfigurationScene', 'symbol_sets', 'symbolSetLogic']),
 
diff --git a/products/error_tracking/frontend/scenes/ErrorTrackingFingerprintsScene/errorTrackingIssueFingerprintsSceneLogic.tsx b/products/error_tracking/frontend/scenes/ErrorTrackingFingerprintsScene/errorTrackingIssueFingerprintsSceneLogic.tsx
index f316fbc12160..666a00889063 100644
--- a/products/error_tracking/frontend/scenes/ErrorTrackingFingerprintsScene/errorTrackingIssueFingerprintsSceneLogic.tsx
+++ b/products/error_tracking/frontend/scenes/ErrorTrackingFingerprintsScene/errorTrackingIssueFingerprintsSceneLogic.tsx
@@ -1,4 +1,17 @@
-import { actions, connect, defaults, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    connect,
+    defaults,
+    events,
+    kea,
+    key,
+    listeners,
+    path,
+    props,
+    reducers,
+    selectors,
+} from 'kea'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 
@@ -18,7 +31,160 @@ import {
     ErrorTrackingFingerprintSamples,
     ErrorTrackingIssueFingerprintsSceneProps,
 } from './ErrorTrackingIssueFingerprintsScene'
-import type { errorTrackingIssueFingerprintsSceneLogicType } from './errorTrackingIssueFingerprintsSceneLogicType'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface errorTrackingIssueFingerprintsSceneLogicValues {
+    breadcrumbs: Breadcrumb[]
+    fingerprintSamples: ErrorTrackingFingerprintSamples[]
+    fingerprintSamplesLoading: boolean
+    isLoading: boolean
+    issue: ErrorTrackingRelationalIssue | null
+    issueFingerprints: ErrorTrackingFingerprint[] | null
+    issueFingerprintsLoading: boolean
+    issueLoading: boolean
+    unmergingFingerprints: Set<string>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface errorTrackingIssueFingerprintsSceneLogicActions {
+    mutationFailure: (
+        mutationName: string,
+        error: unknown
+    ) => {
+        error: unknown
+        mutationName: string
+    } // issueActionsLogic
+    splitIssue: (
+        id: string,
+        fingerprints: {
+            description?: string
+            fingerprint: string
+            name?: string
+        }[]
+    ) => {
+        fingerprints: {
+            description?: string | undefined
+            fingerprint: string
+            name?: string | undefined
+        }[]
+        id: string
+    } // issueActionsLogic
+    splitIssueSuccess: (newIssueIds: string[]) => {
+        newIssueIds: string[]
+    } // issueActionsLogic
+    loadFingerprintSamples: (
+        issue: ErrorTrackingRelationalIssue,
+        fingerprints: ErrorTrackingFingerprint[]
+    ) => {
+        fingerprints: ErrorTrackingFingerprint[]
+        issue: ErrorTrackingRelationalIssue
+    }
+    loadFingerprintSamplesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadFingerprintSamplesSuccess: (
+        fingerprintSamples: {
+            count: any
+            fingerprint: any
+            samples: any
+        }[],
+        payload?: {
+            fingerprints: ErrorTrackingFingerprint[]
+            issue: ErrorTrackingRelationalIssue
+        }
+    ) => {
+        fingerprintSamples: {
+            count: any
+            fingerprint: any
+            samples: any
+        }[]
+        payload?: {
+            fingerprints: ErrorTrackingFingerprint[]
+            issue: ErrorTrackingRelationalIssue
+        }
+    }
+    loadIssue: () => {
+        value: true
+    }
+    loadIssueFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadIssueFingerprints: () => any
+    loadIssueFingerprintsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadIssueFingerprintsSuccess: (
+        issueFingerprints: ErrorTrackingFingerprint[],
+        payload?: any
+    ) => {
+        issueFingerprints: ErrorTrackingFingerprint[]
+        payload?: any
+    }
+    loadIssueSuccess: (
+        issue: ErrorTrackingRelationalIssue,
+        payload?: {
+            value: true
+        }
+    ) => {
+        issue: ErrorTrackingRelationalIssue
+        payload?: {
+            value: true
+        }
+    }
+    unmerge: (fingerprint: string) => {
+        fingerprint: string
+    }
+    unmergeFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    unmergeSuccess: (
+        issueFingerprints: ErrorTrackingFingerprint[],
+        payload?: {
+            fingerprint: string
+        }
+    ) => {
+        issueFingerprints: ErrorTrackingFingerprint[]
+        payload?: {
+            fingerprint: string
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface errorTrackingIssueFingerprintsSceneLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        isLoading: (
+            fingerprintSamplesLoading: boolean,
+            issueLoading: boolean,
+            issueFingerprintsLoading: boolean
+        ) => boolean
+        breadcrumbs: (issue: ErrorTrackingRelationalIssue | null) => Breadcrumb[]
+    }
+}
+
+export type errorTrackingIssueFingerprintsSceneLogicType = MakeLogicType<
+    errorTrackingIssueFingerprintsSceneLogicValues,
+    errorTrackingIssueFingerprintsSceneLogicActions,
+    ErrorTrackingIssueFingerprintsSceneProps,
+    errorTrackingIssueFingerprintsSceneLogicMeta
+>
 
 export const errorTrackingIssueFingerprintsSceneLogic = kea<errorTrackingIssueFingerprintsSceneLogicType>([
     path((key) => [
@@ -100,13 +266,13 @@ export const errorTrackingIssueFingerprintsSceneLogic = kea<errorTrackingIssueFi
     selectors({
         isLoading: [
             (s) => [s.fingerprintSamplesLoading, s.issueLoading, s.issueFingerprintsLoading],
-            (fingerprintSamplesLoading, issueLoading, issueFingerprintsLoading) => {
+            (fingerprintSamplesLoading: boolean, issueLoading: boolean, issueFingerprintsLoading: boolean) => {
                 return fingerprintSamplesLoading || issueLoading || issueFingerprintsLoading
             },
         ],
         breadcrumbs: [
             (s) => [s.issue],
-            (issue): Breadcrumb[] => {
+            (issue: ErrorTrackingRelationalIssue | null): Breadcrumb[] => {
                 const breadcrumbs: Breadcrumb[] = [
                     {
                         key: Scene.ErrorTracking,
diff --git a/products/error_tracking/frontend/scenes/ErrorTrackingIssueScene/errorTrackingIssueSceneConfigurationLogic.ts b/products/error_tracking/frontend/scenes/ErrorTrackingIssueScene/errorTrackingIssueSceneConfigurationLogic.ts
index d80a68ded8c4..7e496d3383e9 100644
--- a/products/error_tracking/frontend/scenes/ErrorTrackingIssueScene/errorTrackingIssueSceneConfigurationLogic.ts
+++ b/products/error_tracking/frontend/scenes/ErrorTrackingIssueScene/errorTrackingIssueSceneConfigurationLogic.ts
@@ -1,6 +1,4 @@
-import { actions, defaults, kea, path, reducers } from 'kea'
-
-import type { errorTrackingIssueSceneConfigurationLogicType } from './errorTrackingIssueSceneConfigurationLogicType'
+import { MakeLogicType, actions, defaults, kea, path, reducers } from 'kea'
 
 export type ErrorTrackingIssueSceneCategory = 'exceptions' | 'breakdowns' | 'autofix' | 'similar_issues'
 
@@ -12,6 +10,23 @@ export const VALID_CATEGORIES: ErrorTrackingIssueSceneCategory[] = [
 ]
 export const DEFAULT_CATEGORY: ErrorTrackingIssueSceneCategory = 'exceptions'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface errorTrackingIssueSceneConfigurationLogicValues {
+    category: ErrorTrackingIssueSceneCategory
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface errorTrackingIssueSceneConfigurationLogicActions {
+    setCategory: (category: ErrorTrackingIssueSceneCategory) => {
+        category: ErrorTrackingIssueSceneCategory
+    }
+}
+
+export type errorTrackingIssueSceneConfigurationLogicType = MakeLogicType<
+    errorTrackingIssueSceneConfigurationLogicValues,
+    errorTrackingIssueSceneConfigurationLogicActions
+>
+
 export const errorTrackingIssueSceneConfigurationLogic = kea<errorTrackingIssueSceneConfigurationLogicType>([
     path([
         'products',
diff --git a/products/error_tracking/frontend/scenes/ErrorTrackingIssueScene/errorTrackingIssueSceneLogic.ts b/products/error_tracking/frontend/scenes/ErrorTrackingIssueScene/errorTrackingIssueSceneLogic.ts
index ca96b2b3274c..e48cd2299243 100644
--- a/products/error_tracking/frontend/scenes/ErrorTrackingIssueScene/errorTrackingIssueSceneLogic.ts
+++ b/products/error_tracking/frontend/scenes/ErrorTrackingIssueScene/errorTrackingIssueSceneLogic.ts
@@ -1,4 +1,17 @@
-import { actions, connect, defaults, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    connect,
+    defaults,
+    events,
+    kea,
+    key,
+    listeners,
+    path,
+    props,
+    reducers,
+    selectors,
+} from 'kea'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 import { subscriptions } from 'kea-subscriptions'
@@ -29,6 +42,12 @@ import {
 } from '~/queries/schema/schema-general'
 import { ActivityScope, Breadcrumb, IntegrationType, UniversalFiltersGroup } from '~/types'
 
+import type {
+    ErrorTrackingExternalReference,
+    ErrorTrackingIssueAssignee,
+    ErrorTrackingIssueCohort,
+    EventsQuery,
+} from '../../../../../frontend/src/queries/schema/schema-general'
 import { issueActionsLogic } from '../../components/IssueActions/issueActionsLogic'
 import {
     DEFAULT_DATE_RANGE,
@@ -45,7 +64,6 @@ import {
     VALID_CATEGORIES,
     errorTrackingIssueSceneConfigurationLogic,
 } from './errorTrackingIssueSceneConfigurationLogic'
-import type { errorTrackingIssueSceneLogicType } from './errorTrackingIssueSceneLogicType'
 
 export interface ErrorTrackingIssueSceneLogicProps {
     id: ErrorTrackingIssue['id']
@@ -57,6 +75,376 @@ export type ErrorTrackingIssueStatus = ErrorTrackingIssue['status']
 
 export const ERROR_TRACKING_ISSUE_SCENE_LOGIC_KEY = 'ErrorTrackingIssueScene'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface errorTrackingIssueSceneLogicValues {
+    category: ErrorTrackingIssueSceneCategory; // errorTrackingIssueSceneConfigurationLogic
+    dateRange: DateRange; // issueFiltersLogic
+    filterGroup: UniversalFiltersGroup; // issueFiltersLogic
+    filterTestAccounts: boolean; // issueFiltersLogic
+    searchQuery: string; // issueFiltersLogic
+    aggregations: ErrorTrackingIssueAggregations | undefined;
+    breadcrumbs: Breadcrumb[];
+    eventsQuery: EventsQuery;
+    eventsQueryKey: string;
+    firstSeen: Dayjs | null;
+    initialEvent: ErrorEventType | null;
+    initialEventLoading: boolean;
+    initialEventTimestamp: string | null;
+    issue: ErrorTrackingRelationalIssue | null;
+    issueFingerprints: ErrorTrackingFingerprint[];
+    issueFingerprintsLoading: boolean;
+    issueId: string;
+    issueLoading: boolean;
+    lastSeen: Dayjs | null;
+    listDateRange: DateRange | null;
+    maxContext: MaxContextInput[];
+    mobileDetailOpen: boolean;
+    properties: ErrorEventProperties | null;
+    selectedEvent: ErrorEventType | null;
+    sidePanelContext: SidePanelSceneContext;
+    similarIssues: SimilarIssue[];
+    similarIssuesError: string | null;
+    similarIssuesLoading: boolean;
+    similarIssuesMaxDistance: number;
+    spikeEvents: ErrorTrackingSpikeEvent[];
+    spikeEventsLoading: boolean;
+    summary: ErrorTrackingIssueSummary | null;
+    summaryLoading: boolean;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface errorTrackingIssueSceneLogicActions {
+    setCategory: (category: ErrorTrackingIssueSceneCategory) => {
+        category: ErrorTrackingIssueSceneCategory;
+    }; // errorTrackingIssueSceneConfigurationLogic
+    updateIssueAssignee: (id: string, assignee: ErrorTrackingIssueAssignee | null) => {
+        assignee: ErrorTrackingIssueAssignee | null;
+        id: string;
+    }; // issueActionsLogic
+    updateIssueDescription: (id: string, description: string) => {
+        description: string;
+        id: string;
+    }; // issueActionsLogic
+    updateIssueName: (id: string, name: string) => {
+        id: string;
+        name: string;
+    }; // issueActionsLogic
+    updateIssueStatus: (id: string, status: import("~/queries/schema").ErrorTrackingIssueStatus) => {
+        id: string;
+        status: import("~/queries/schema").ErrorTrackingIssueStatus;
+    }; // issueActionsLogic
+    setDateRange: (dateRange: DateRange) => {
+        dateRange: DateRange;
+    }; // issueFiltersLogic
+    setFilterGroup: (filterGroup: UniversalFiltersGroup) => {
+        filterGroup: UniversalFiltersGroup;
+    }; // issueFiltersLogic
+    setFilterTestAccounts: (filterTestAccounts: boolean) => {
+        filterTestAccounts: boolean;
+    }; // issueFiltersLogic
+    setSearchQuery: (searchQuery: string) => {
+        searchQuery: string;
+    }; // issueFiltersLogic
+    createExternalReference: (integrationId: IntegrationType["id"], config: Record<string, string>) => {
+        config: Record<string, string>;
+        integrationId: number;
+    };
+    createExternalReferenceFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    createExternalReferenceSuccess: (issue: {
+        assignee: ErrorTrackingIssueAssignee | null;
+        cohort?: ErrorTrackingIssueCohort | undefined;
+        description: string | null;
+        external_issues: ErrorTrackingExternalReference[];
+        first_seen: string;
+        id: string;
+        name: string | null;
+        status: ErrorTrackingIssueStatus;
+    } | null, payload?: {
+        config: Record<string, string>;
+        integrationId: number;
+    }) => {
+        issue: {
+            assignee: ErrorTrackingIssueAssignee | null;
+            cohort?: ErrorTrackingIssueCohort | undefined;
+            description: string | null;
+            external_issues: ErrorTrackingExternalReference[];
+            first_seen: string;
+            id: string;
+            name: string | null;
+            status: ErrorTrackingIssueStatus;
+        } | null;
+        payload?: {
+            config: Record<string, string>;
+            integrationId: number;
+        };
+    };
+    loadInitialEvent: (timestamp: string) => {
+        timestamp: string;
+    };
+    loadInitialEventFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadInitialEventSuccess: (initialEvent: ErrorEventType | null, payload?: {
+        timestamp: string;
+    }) => {
+        initialEvent: ErrorEventType | null;
+        payload?: {
+            timestamp: string;
+        };
+    };
+    loadIssue: () => {
+        value: true;
+    };
+    loadIssueFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadIssueFingerprints: () => any;
+    loadIssueFingerprintsFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadIssueFingerprintsSuccess: (issueFingerprints: ErrorTrackingFingerprint[], payload?: any) => {
+        issueFingerprints: ErrorTrackingFingerprint[];
+        payload?: any;
+    };
+    loadIssueSuccess: (issue: ErrorTrackingRelationalIssue, payload?: {
+        value: true;
+    }) => {
+        issue: ErrorTrackingRelationalIssue;
+        payload?: {
+            value: true;
+        };
+    };
+    loadSimilarIssues: (refresh?: boolean) => boolean;
+    loadSimilarIssuesFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadSimilarIssuesSuccess: (similarIssues: SimilarIssue[], payload?: boolean) => {
+        similarIssues: SimilarIssue[];
+        payload?: boolean;
+    };
+    loadSpikeEvents: () => any;
+    loadSpikeEventsFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadSpikeEventsSuccess: (spikeEvents: ErrorTrackingSpikeEvent[], payload?: any) => {
+        spikeEvents: ErrorTrackingSpikeEvent[];
+        payload?: any;
+    };
+    loadSummary: () => {
+        value: true;
+    };
+    loadSummaryFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadSummarySuccess: (summary: {
+        aggregations: ErrorTrackingIssueAggregations;
+        first_seen: string;
+        last_seen: string;
+    } | null, payload?: {
+        value: true;
+    }) => {
+        summary: {
+            aggregations: ErrorTrackingIssueAggregations;
+            first_seen: string;
+            last_seen: string;
+        } | null;
+        payload?: {
+            value: true;
+        };
+    };
+    selectEvent: (event: ErrorEventType | null) => {
+        event: ErrorEventType | null;
+    };
+    setInitialEventTimestamp: (timestamp: string | null) => {
+        timestamp: string | null;
+    };
+    setIssue: (issue: ErrorTrackingRelationalIssue) => {
+        issue: ErrorTrackingRelationalIssue;
+    };
+    setIssueFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    setIssueSuccess: (issue: ErrorTrackingRelationalIssue, payload?: {
+        issue: ErrorTrackingRelationalIssue;
+    }) => {
+        issue: ErrorTrackingRelationalIssue;
+        payload?: {
+            issue: ErrorTrackingRelationalIssue;
+        };
+    };
+    setLastSeen: (lastSeen: string) => {
+        lastSeen: string;
+    };
+    setListDateRange: (dateRange: DateRange) => {
+        dateRange: DateRange;
+    };
+    setMobileDetailOpen: (mobileDetailOpen: boolean) => {
+        mobileDetailOpen: boolean;
+    };
+    setSimilarIssuesMaxDistance: (distance: number) => {
+        distance: number;
+    };
+    updateAssignee: (assignee: ErrorTrackingIssue["assignee"]) => {
+        assignee: ErrorTrackingIssueAssignee | null;
+    };
+    updateAssigneeFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    updateAssigneeSuccess: (issue: {
+        assignee: ErrorTrackingIssueAssignee | null;
+        cohort?: ErrorTrackingIssueCohort | undefined;
+        description: string | null;
+        external_issues?: ErrorTrackingExternalReference[] | undefined;
+        first_seen: string;
+        id: string;
+        name: string | null;
+        status: ErrorTrackingIssueStatus;
+    } | null, payload?: {
+        assignee: ErrorTrackingIssueAssignee | null;
+    }) => {
+        issue: {
+            assignee: ErrorTrackingIssueAssignee | null;
+            cohort?: ErrorTrackingIssueCohort | undefined;
+            description: string | null;
+            external_issues?: ErrorTrackingExternalReference[] | undefined;
+            first_seen: string;
+            id: string;
+            name: string | null;
+            status: ErrorTrackingIssueStatus;
+        } | null;
+        payload?: {
+            assignee: ErrorTrackingIssueAssignee | null;
+        };
+    };
+    updateDescription: (description: string) => {
+        description: string;
+    };
+    updateDescriptionFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    updateDescriptionSuccess: (issue: {
+        assignee: ErrorTrackingIssueAssignee | null;
+        cohort?: ErrorTrackingIssueCohort | undefined;
+        description: string;
+        external_issues?: ErrorTrackingExternalReference[] | undefined;
+        first_seen: string;
+        id: string;
+        name: string | null;
+        status: ErrorTrackingIssueStatus;
+    } | null, payload?: {
+        description: string;
+    }) => {
+        issue: {
+            assignee: ErrorTrackingIssueAssignee | null;
+            cohort?: ErrorTrackingIssueCohort | undefined;
+            description: string;
+            external_issues?: ErrorTrackingExternalReference[] | undefined;
+            first_seen: string;
+            id: string;
+            name: string | null;
+            status: ErrorTrackingIssueStatus;
+        } | null;
+        payload?: {
+            description: string;
+        };
+    };
+    updateName: (name: string) => {
+        name: string;
+    };
+    updateNameFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    updateNameSuccess: (issue: {
+        assignee: ErrorTrackingIssueAssignee | null;
+        cohort?: ErrorTrackingIssueCohort | undefined;
+        description: string | null;
+        external_issues?: ErrorTrackingExternalReference[] | undefined;
+        first_seen: string;
+        id: string;
+        name: string;
+        status: ErrorTrackingIssueStatus;
+    } | null, payload?: {
+        name: string;
+    }) => {
+        issue: {
+            assignee: ErrorTrackingIssueAssignee | null;
+            cohort?: ErrorTrackingIssueCohort | undefined;
+            description: string | null;
+            external_issues?: ErrorTrackingExternalReference[] | undefined;
+            first_seen: string;
+            id: string;
+            name: string;
+            status: ErrorTrackingIssueStatus;
+        } | null;
+        payload?: {
+            name: string;
+        };
+    };
+    updateStatus: (status: ErrorTrackingIssue["status"]) => {
+        status: ErrorTrackingIssueStatus;
+    };
+    updateStatusFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    updateStatusSuccess: (issue: {
+        assignee: ErrorTrackingIssueAssignee | null;
+        cohort?: ErrorTrackingIssueCohort | undefined;
+        description: string | null;
+        external_issues?: ErrorTrackingExternalReference[] | undefined;
+        first_seen: string;
+        id: string;
+        name: string | null;
+        status: ErrorTrackingIssueStatus;
+    } | null, payload?: {
+        status: ErrorTrackingIssueStatus;
+    }) => {
+        issue: {
+            assignee: ErrorTrackingIssueAssignee | null;
+            cohort?: ErrorTrackingIssueCohort | undefined;
+            description: string | null;
+            external_issues?: ErrorTrackingExternalReference[] | undefined;
+            first_seen: string;
+            id: string;
+            name: string | null;
+            status: ErrorTrackingIssueStatus;
+        } | null;
+        payload?: {
+            status: ErrorTrackingIssueStatus;
+        };
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface errorTrackingIssueSceneLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        breadcrumbs: (issue: ErrorTrackingRelationalIssue | null, listDateRange: DateRange | null, filterTestAccounts: boolean, filterGroup: UniversalFiltersGroup, searchQuery: string) => Breadcrumb[];
+        sidePanelContext: (id: string) => SidePanelSceneContext;
+        issueId: (id: string) => string;
+        firstSeen: (issue: ErrorTrackingRelationalIssue | null) => Dayjs | null;
+        aggregations: (summary: ErrorTrackingIssueSummary | null) => ErrorTrackingIssueAggregations | undefined;
+        eventsQuery: (issueFingerprints: ErrorTrackingFingerprint[], filterTestAccounts: boolean, searchQuery: string, filterGroup: UniversalFiltersGroup, dateRange: DateRange) => EventsQuery;
+        eventsQueryKey: (eventsQuery: EventsQuery) => string;
+        maxContext: (issue: ErrorTrackingRelationalIssue | null, issueId: string) => MaxContextInput[];
+    };
+}
+
+export type errorTrackingIssueSceneLogicType = MakeLogicType<errorTrackingIssueSceneLogicValues, errorTrackingIssueSceneLogicActions, ErrorTrackingIssueSceneLogicProps, errorTrackingIssueSceneLogicMeta>;
+
 export const errorTrackingIssueSceneLogic = kea<errorTrackingIssueSceneLogicType>([
     path((key) => [
         'products',
@@ -351,7 +739,7 @@ export const errorTrackingIssueSceneLogic = kea<errorTrackingIssueSceneLogicType
 
         [SIDE_PANEL_CONTEXT_KEY]: [
             (_, p) => [p.id],
-            (issueId): SidePanelSceneContext => {
+            (issueId: string): SidePanelSceneContext => {
                 return {
                     activity_scope: ActivityScope.ERROR_TRACKING_ISSUE,
                     activity_item_id: issueId,
@@ -369,7 +757,13 @@ export const errorTrackingIssueSceneLogic = kea<errorTrackingIssueSceneLogicType
 
         eventsQuery: [
             (s) => [s.issueFingerprints, s.filterTestAccounts, s.searchQuery, s.filterGroup, s.dateRange],
-            (issueFingerprints, filterTestAccounts, searchQuery, filterGroup, dateRange) =>
+            (
+                issueFingerprints: ErrorTrackingFingerprint[],
+                filterTestAccounts: boolean,
+                searchQuery: string,
+                filterGroup: UniversalFiltersGroup,
+                dateRange: DateRange
+            ) =>
                 errorTrackingIssueEventsQuery({
                     fingerprints: issueFingerprints.map((f: ErrorTrackingFingerprint) => f.fingerprint),
                     filterTestAccounts,
@@ -387,7 +781,10 @@ export const errorTrackingIssueSceneLogic = kea<errorTrackingIssueSceneLogicType
         // once per key: it MUST change when the query content changes (that's how a new query
         // reaches the data layer) and must NOT change otherwise — every key change unmounts and
         // remounts the entire events table tree.
-        eventsQueryKey: [(s) => [s.eventsQuery], (eventsQuery): string => JSON.stringify(eventsQuery)],
+        eventsQueryKey: [
+            (s) => [s.eventsQuery],
+            (eventsQuery: import('~/queries/schema').EventsQuery): string => JSON.stringify(eventsQuery),
+        ],
 
         maxContext: [
             (s) => [s.issue, s.issueId],
diff --git a/products/error_tracking/frontend/scenes/ErrorTrackingScene/errorTrackingSceneLogic.ts b/products/error_tracking/frontend/scenes/ErrorTrackingScene/errorTrackingSceneLogic.ts
index e81deadacc01..f9f1ab84abc8 100644
--- a/products/error_tracking/frontend/scenes/ErrorTrackingScene/errorTrackingSceneLogic.ts
+++ b/products/error_tracking/frontend/scenes/ErrorTrackingScene/errorTrackingSceneLogic.ts
@@ -1,5 +1,5 @@
 import { deepEqual as equal } from 'fast-equals'
-import { actions, connect, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, path, reducers, selectors } from 'kea'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 import { subscriptions } from 'kea-subscriptions'
 import posthog from 'posthog-js'
@@ -27,7 +27,10 @@ import {
     syncSearchParams,
     updateSearchParams,
 } from '../../utils'
-import type { errorTrackingSceneLogicType } from './errorTrackingSceneLogicType'
+import type { SettingId } from '../../../../../frontend/src/scenes/settings/types'
+import type { ErrorTrackingPendingFingerprintIssueStateUpdate } from '../../../../../frontend/src/queries/schema/schema-general'
+import type { DateRange } from '../../../../../frontend/src/queries/schema/schema-general'
+import type { ErrorTrackingQueryAssignee, ErrorTrackingQueryOrderBy, ErrorTrackingQueryOrderDirection, ErrorTrackingQueryStatus } from '../../components/IssueQueryOptions/issueQueryOptionsLogic'
 
 export const ERROR_TRACKING_SCENE_LOGIC_KEY = 'ErrorTrackingScene'
 
@@ -35,6 +38,66 @@ const DEFAULT_ACTIVE_TAB = 'issues'
 
 export type ErrorTrackingSceneActiveTab = 'issues' | 'insights' | 'recommendations' | 'configuration'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface errorTrackingSceneLogicValues {
+    dateRange: DateRange; // issueFiltersLogic
+    filterGroup: UniversalFiltersGroup; // issueFiltersLogic
+    filterTestAccounts: boolean; // issueFiltersLogic
+    mergedFilterGroup: UniversalFiltersGroup; // issueFiltersLogic
+    searchQuery: string; // issueFiltersLogic
+    assignee: ErrorTrackingQueryAssignee | null; // issueQueryOptionsLogic
+    orderBy: ErrorTrackingQueryOrderBy; // issueQueryOptionsLogic
+    orderDirection: ErrorTrackingQueryOrderDirection; // issueQueryOptionsLogic
+    status: ErrorTrackingQueryStatus; // issueQueryOptionsLogic
+    currentPendingUpdates: ErrorTrackingPendingFingerprintIssueStateUpdate[]; // pendingFingerprintIssueStateUpdateLogic
+    selectedSettingId: SettingId | null; // settingsLogic
+    activeTab: ErrorTrackingSceneActiveTab;
+    breadcrumbs: Breadcrumb[];
+    query: DataTableNode;
+    sidePanelContext: SidePanelSceneContext;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface errorTrackingSceneLogicActions {
+    setSelectedIssueIds: (ids: string[]) => {
+        ids: string[];
+    }; // bulkSelectLogic
+    mutationFailure: (mutationName: string, error: unknown) => {
+        error: unknown;
+        mutationName: string;
+    }; // issueActionsLogic
+    mutationSuccess: (mutationName: string) => {
+        mutationName: string;
+    }; // issueActionsLogic
+    setDateRange: (dateRange: DateRange) => {
+        dateRange: DateRange;
+    }; // issueFiltersLogic
+    setFilterGroup: (filterGroup: UniversalFiltersGroup) => {
+        filterGroup: UniversalFiltersGroup;
+    }; // issueFiltersLogic
+    setFilterTestAccounts: (filterTestAccounts: boolean) => {
+        filterTestAccounts: boolean;
+    }; // issueFiltersLogic
+    setSearchQuery: (searchQuery: string) => {
+        searchQuery: string;
+    }; // issueFiltersLogic
+    selectSetting: (setting: SettingId) => {
+        setting: SettingId;
+    }; // settingsLogic
+    setActiveTab: (activeTab: ErrorTrackingSceneActiveTab) => {
+        activeTab: ErrorTrackingSceneActiveTab;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface errorTrackingSceneLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        query: (orderBy: import("~/queries/schema").ErrorTrackingOrderBy, status: import("~/queries/schema").ErrorTrackingQueryStatus | undefined, dateRange: DateRange, assignee: null | import("~/queries/schema").ErrorTrackingIssueAssignee | undefined, filterTestAccounts: boolean, mergedFilterGroup: UniversalFiltersGroup, searchQuery: string, orderDirection: "ASC" | "DESC" | undefined, currentPendingUpdates: ErrorTrackingPendingFingerprintIssueStateUpdate[]) => DataTableNode;
+    };
+}
+
+export type errorTrackingSceneLogicType = MakeLogicType<errorTrackingSceneLogicValues, errorTrackingSceneLogicActions, Record<string, any>, errorTrackingSceneLogicMeta>;
+
 export const errorTrackingSceneLogic = kea<errorTrackingSceneLogicType>([
     path(['products', 'error_tracking', 'scenes', 'ErrorTrackingScene', 'errorTrackingSceneLogic']),
 
@@ -96,15 +159,15 @@ export const errorTrackingSceneLogic = kea<errorTrackingSceneLogicType>([
                 s.currentPendingUpdates,
             ],
             (
-                orderBy,
-                status,
-                dateRange,
-                assignee,
-                filterTestAccounts,
-                mergedFilterGroup,
-                searchQuery,
-                orderDirection,
-                currentPendingUpdates
+                orderBy: import("~/queries/schema").ErrorTrackingOrderBy,
+                status: import("~/queries/schema").ErrorTrackingQueryStatus | undefined,
+                dateRange: DateRange,
+                assignee: null | import("~/queries/schema").ErrorTrackingIssueAssignee | undefined,
+                filterTestAccounts: boolean,
+                mergedFilterGroup: UniversalFiltersGroup,
+                searchQuery: string,
+                orderDirection: "ASC" | "DESC" | undefined,
+                currentPendingUpdates: ErrorTrackingPendingFingerprintIssueStateUpdate[]
             ): DataTableNode => {
                 return errorTrackingQuery({
                     orderBy,
diff --git a/products/error_tracking/frontend/scenes/ErrorTrackingScene/tabs/insights/errorTrackingInsightsLogic.ts b/products/error_tracking/frontend/scenes/ErrorTrackingScene/tabs/insights/errorTrackingInsightsLogic.ts
index ca0aac927867..649b869e79fe 100644
--- a/products/error_tracking/frontend/scenes/ErrorTrackingScene/tabs/insights/errorTrackingInsightsLogic.ts
+++ b/products/error_tracking/frontend/scenes/ErrorTrackingScene/tabs/insights/errorTrackingInsightsLogic.ts
@@ -1,4 +1,4 @@
-import { afterMount, connect, kea, listeners, path, selectors } from 'kea'
+import { MakeLogicType, afterMount, connect, kea, listeners, path, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { subscriptions } from 'kea-subscriptions'
 import posthog from 'posthog-js'
@@ -24,7 +24,6 @@ import {
 
 import { issueFiltersLogic } from '../../../../components/IssueFilters/issueFiltersLogic'
 import { ERROR_TRACKING_SCENE_LOGIC_KEY } from '../../errorTrackingSceneLogic'
-import type { errorTrackingInsightsLogicType } from './errorTrackingInsightsLogicType'
 import {
     buildAffectedUsersQuery,
     buildCrashFreeSessionsQuery,
@@ -59,6 +58,72 @@ function stripIssueFiltersFromGroup(group: UniversalFiltersGroup): UniversalFilt
     return { ...group, values }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface errorTrackingInsightsLogicValues {
+    dateRange: DateRange; // issueFiltersLogic
+    filterGroup: UniversalFiltersGroup; // issueFiltersLogic
+    filterTestAccounts: boolean; // issueFiltersLogic
+    mergedFilterGroup: UniversalFiltersGroup; // issueFiltersLogic
+    affectedUsersQuery: InsightVizNode<TrendsQuery>;
+    crashFreeSessionsQuery: InsightVizNode<TrendsQuery>;
+    effectiveDateRange: DateRange;
+    effectiveProperties: AnyPropertyFilter[];
+    exceptionVolumeQuery: InsightVizNode<TrendsQuery>;
+    insightQueryFilters: InsightQueryFilters;
+    insightsFilterGroup: UniversalFiltersGroup;
+    summaryStats: InsightsSummaryStats | null;
+    summaryStatsLoading: boolean;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface errorTrackingInsightsLogicActions {
+    setDateRange: (dateRange: DateRange) => {
+        dateRange: DateRange;
+    }; // issueFiltersLogic
+    setFilterGroup: (filterGroup: UniversalFiltersGroup) => {
+        filterGroup: UniversalFiltersGroup;
+    }; // issueFiltersLogic
+    setFilterTestAccounts: (filterTestAccounts: boolean) => {
+        filterTestAccounts: boolean;
+    }; // issueFiltersLogic
+    loadSummaryStats: (_: any) => any;
+    loadSummaryStatsFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadSummaryStatsSuccess: (summaryStats: {
+        affectedUsers: number;
+        crashFreeRate: number;
+        crashSessions: number;
+        totalExceptions: number;
+        totalSessions: number;
+    } | null, payload?: any) => {
+        summaryStats: {
+            affectedUsers: number;
+            crashFreeRate: number;
+            crashSessions: number;
+            totalExceptions: number;
+            totalSessions: number;
+        } | null;
+        payload?: any;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface errorTrackingInsightsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        insightsFilterGroup: (mergedFilterGroup: UniversalFiltersGroup) => UniversalFiltersGroup;
+        effectiveProperties: (insightsFilterGroup: UniversalFiltersGroup) => AnyPropertyFilter[];
+        effectiveDateRange: (dateRange: DateRange) => DateRange;
+        insightQueryFilters: (effectiveProperties: AnyPropertyFilter[], filterTestAccounts: boolean) => InsightQueryFilters;
+        exceptionVolumeQuery: (effectiveDateRange: DateRange, insightQueryFilters: InsightQueryFilters) => InsightVizNode<TrendsQuery>;
+        affectedUsersQuery: (effectiveDateRange: DateRange, insightQueryFilters: InsightQueryFilters) => InsightVizNode<TrendsQuery>;
+        crashFreeSessionsQuery: (effectiveDateRange: DateRange, insightQueryFilters: InsightQueryFilters) => InsightVizNode<TrendsQuery>;
+    };
+}
+
+export type errorTrackingInsightsLogicType = MakeLogicType<errorTrackingInsightsLogicValues, errorTrackingInsightsLogicActions, Record<string, any>, errorTrackingInsightsLogicMeta>;
+
 export const errorTrackingInsightsLogic = kea<errorTrackingInsightsLogicType>([
     path([
         'products',
@@ -84,7 +149,7 @@ export const errorTrackingInsightsLogic = kea<errorTrackingInsightsLogicType>([
     selectors({
         insightsFilterGroup: [
             (s) => [s.mergedFilterGroup],
-            (mergedFilterGroup): UniversalFiltersGroup => {
+            (mergedFilterGroup: UniversalFiltersGroup): UniversalFiltersGroup => {
                 const inner = mergedFilterGroup.values[0] as UniversalFiltersGroup
                 return {
                     type: FilterLogicalOperator.And,
@@ -97,7 +162,7 @@ export const errorTrackingInsightsLogic = kea<errorTrackingInsightsLogicType>([
         // to the other can cause the summary stats and charts to disagree on which events match.
         effectiveProperties: [
             (s) => [s.insightsFilterGroup],
-            (insightsFilterGroup): AnyPropertyFilter[] => {
+            (insightsFilterGroup: UniversalFiltersGroup): AnyPropertyFilter[] => {
                 const inner = insightsFilterGroup.values[0] as UniversalFiltersGroup | undefined
                 return (inner?.values ?? []) as AnyPropertyFilter[]
             },
@@ -105,29 +170,32 @@ export const errorTrackingInsightsLogic = kea<errorTrackingInsightsLogicType>([
         // Single source of truth for the date range used by both the summary stats query and the charts.
         effectiveDateRange: [
             (s) => [s.dateRange],
-            (dateRange): DateRange => ({
+            (dateRange: DateRange): DateRange => ({
                 date_from: dateRange.date_from ?? '-7d',
                 date_to: dateRange.date_to ?? null,
             }),
         ],
         insightQueryFilters: [
             (s) => [s.effectiveProperties, s.filterTestAccounts],
-            (properties, filterTestAccounts): InsightQueryFilters => ({
+            (properties: AnyPropertyFilter[], filterTestAccounts: boolean): InsightQueryFilters => ({
                 properties,
                 filterTestAccounts,
             }),
         ],
         exceptionVolumeQuery: [
             (s) => [s.effectiveDateRange, s.insightQueryFilters],
-            (dateRange, filters): InsightVizNode<TrendsQuery> => buildExceptionVolumeQuery(dateRange, filters),
+            (dateRange: DateRange, filters: InsightQueryFilters): InsightVizNode<TrendsQuery> =>
+                buildExceptionVolumeQuery(dateRange, filters),
         ],
         affectedUsersQuery: [
             (s) => [s.effectiveDateRange, s.insightQueryFilters],
-            (dateRange, filters): InsightVizNode<TrendsQuery> => buildAffectedUsersQuery(dateRange, filters),
+            (dateRange: DateRange, filters: InsightQueryFilters): InsightVizNode<TrendsQuery> =>
+                buildAffectedUsersQuery(dateRange, filters),
         ],
         crashFreeSessionsQuery: [
             (s) => [s.effectiveDateRange, s.insightQueryFilters],
-            (dateRange, filters): InsightVizNode<TrendsQuery> => buildCrashFreeSessionsQuery(dateRange, filters),
+            (dateRange: DateRange, filters: InsightQueryFilters): InsightVizNode<TrendsQuery> =>
+                buildCrashFreeSessionsQuery(dateRange, filters),
         ],
     }),
 
diff --git a/products/error_tracking/frontend/scenes/ErrorTrackingScene/tabs/recommendations/recommendationsTabLogic.ts b/products/error_tracking/frontend/scenes/ErrorTrackingScene/tabs/recommendations/recommendationsTabLogic.ts
index 9c2713f9aac1..5b5e436680ef 100644
--- a/products/error_tracking/frontend/scenes/ErrorTrackingScene/tabs/recommendations/recommendationsTabLogic.ts
+++ b/products/error_tracking/frontend/scenes/ErrorTrackingScene/tabs/recommendations/recommendationsTabLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, beforeUnmount, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, beforeUnmount, kea, listeners, path, reducers, selectors } from 'kea'
 
 import { lemonToast } from '@posthog/lemon-ui'
 
@@ -6,7 +6,6 @@ import api from 'lib/api'
 
 import { HogFunctionSubTemplateIdType } from '~/types'
 
-import type { recommendationsTabLogicType } from './recommendationsTabLogicType'
 import type {
     AlertsRecommendation,
     ErrorTrackingRecommendation,
@@ -33,6 +32,94 @@ export const isSourceMapsRecommendation = (
 
 const POLL_INTERVAL_MS = 500
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface recommendationsTabLogicValues {
+    activeRecommendations: ErrorTrackingRecommendation[]
+    completedExpanded: boolean
+    completedRecommendations: ErrorTrackingRecommendation[]
+    computingIds: Set<string>
+    dismissedExpanded: boolean
+    ignoredRecommendations: ErrorTrackingRecommendation[]
+    openAlertTriggerKey: HogFunctionSubTemplateIdType | null
+    recommendations: ErrorTrackingRecommendation[]
+    recommendationsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface recommendationsTabLogicActions {
+    activateIssue: (issueId: string) => {
+        issueId: string
+    }
+    clearPolling: () => {
+        value: true
+    }
+    dismissRecommendation: (id: string) => {
+        id: string
+    }
+    ensurePollingScheduled: () => {
+        value: true
+    }
+    loadRecommendations: () => {
+        value: true
+    }
+    markRecommendationComputing: (id: string) => {
+        id: string
+    }
+    pollRecommendations: () => {
+        value: true
+    }
+    refreshRecommendation: (id: string) => {
+        id: string
+    }
+    restoreRecommendation: (id: string) => {
+        id: string
+    }
+    setOpenAlertTriggerKey: (triggerKey: HogFunctionSubTemplateIdType | null) => {
+        triggerKey: HogFunctionSubTemplateIdType | null
+    }
+    setRecommendations: (recommendations: ErrorTrackingRecommendation[]) => {
+        recommendations: ErrorTrackingRecommendation<Record<string, unknown>>[]
+    }
+    setRecommendationsLoading: (loading: boolean) => {
+        loading: boolean
+    }
+    suppressIssue: (issueId: string) => {
+        issueId: string
+    }
+    toggleCompletedExpanded: () => {
+        value: true
+    }
+    toggleDismissedExpanded: () => {
+        value: true
+    }
+    upsertRecommendation: (recommendation: ErrorTrackingRecommendation) => {
+        recommendation: ErrorTrackingRecommendation<Record<string, unknown>>
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface recommendationsTabLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        activeRecommendations: (
+            recommendations: ErrorTrackingRecommendation<Record<string, unknown>>[]
+        ) => ErrorTrackingRecommendation[]
+        completedRecommendations: (
+            recommendations: ErrorTrackingRecommendation<Record<string, unknown>>[]
+        ) => ErrorTrackingRecommendation[]
+        ignoredRecommendations: (
+            recommendations: ErrorTrackingRecommendation<Record<string, unknown>>[]
+        ) => ErrorTrackingRecommendation[]
+        computingIds: (recommendations: ErrorTrackingRecommendation<Record<string, unknown>>[]) => Set<string>
+    }
+}
+
+export type recommendationsTabLogicType = MakeLogicType<
+    recommendationsTabLogicValues,
+    recommendationsTabLogicActions,
+    Record<string, any>,
+    recommendationsTabLogicMeta
+>
+
 // The backend `status` field is the single source of truth for "is this recommendation
 // being computed". The frontend shows a spinner whenever status === 'computing', and
 // optimistically flips status to 'computing' before issuing a refresh HTTP call so the
@@ -188,25 +275,25 @@ export const recommendationsTabLogic = kea<recommendationsTabLogicType>([
     selectors({
         activeRecommendations: [
             (s) => [s.recommendations],
-            (recommendations): ErrorTrackingRecommendation[] => {
+            (recommendations: ErrorTrackingRecommendation[]): ErrorTrackingRecommendation[] => {
                 return recommendations.filter((r) => !r.dismissed_at && !r.completed)
             },
         ],
         completedRecommendations: [
             (s) => [s.recommendations],
-            (recommendations): ErrorTrackingRecommendation[] => {
+            (recommendations: ErrorTrackingRecommendation[]): ErrorTrackingRecommendation[] => {
                 return recommendations.filter((r) => !r.dismissed_at && r.completed)
             },
         ],
         ignoredRecommendations: [
             (s) => [s.recommendations],
-            (recommendations): ErrorTrackingRecommendation[] => {
+            (recommendations: ErrorTrackingRecommendation[]): ErrorTrackingRecommendation[] => {
                 return recommendations.filter((r) => !!r.dismissed_at)
             },
         ],
         computingIds: [
             (s) => [s.recommendations],
-            (recommendations): Set<string> =>
+            (recommendations: ErrorTrackingRecommendation[]): Set<string> =>
                 new Set(recommendations.filter((r) => r.status === 'computing').map((r) => r.id)),
         ],
     }),
diff --git a/products/error_tracking/frontend/scenes/ErrorTrackingScene/tabs/recommendations/sourceMapsFixWizardLogic.ts b/products/error_tracking/frontend/scenes/ErrorTrackingScene/tabs/recommendations/sourceMapsFixWizardLogic.ts
index 40238ac862b0..7ef9176caac9 100644
--- a/products/error_tracking/frontend/scenes/ErrorTrackingScene/tabs/recommendations/sourceMapsFixWizardLogic.ts
+++ b/products/error_tracking/frontend/scenes/ErrorTrackingScene/tabs/recommendations/sourceMapsFixWizardLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers, selectors } from 'kea'
 import posthog from 'posthog-js'
 
 import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
@@ -6,8 +6,6 @@ import { getSurveyIdBasedResponseKey, getSurveyResponseKey } from 'scenes/survey
 
 import { Region, SurveyEventName, SurveyEventProperties } from '~/types'
 
-import type { sourceMapsFixWizardLogicType } from './sourceMapsFixWizardLogicType'
-
 export type WizardRating = 'good' | 'bad'
 export type WizardOpenSource = 'issues_list' | 'recommendations'
 
@@ -27,6 +25,59 @@ const SURVEY_ID = '019e7335-af36-0000-42a8-ad5add623630'
 const RATING_QUESTION_ID = '030dde7d-0dee-4d79-b568-ed16e85b431c'
 const FEEDBACK_QUESTION_ID = '03e1255c-6daf-46a2-9629-2354bcd230ff'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sourceMapsFixWizardLogicValues {
+    feedbackRevealed: boolean
+    feedbackSubmitted: boolean
+    feedbackText: string
+    isModalOpen: boolean
+    rating: WizardRating | null
+    ratingScore: number | null
+    wizardCommand: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sourceMapsFixWizardLogicActions {
+    closeModal: () => {
+        value: true
+    }
+    dismissFeedback: () => {
+        value: true
+    }
+    openModal: (source: WizardOpenSource) => {
+        source: WizardOpenSource
+    }
+    rateWizard: (rating: WizardRating) => {
+        rating: WizardRating
+    }
+    revealFeedback: () => {
+        value: true
+    }
+    setFeedbackText: (feedbackText: string) => {
+        feedbackText: string
+    }
+    setRatingScore: (ratingScore: number) => {
+        ratingScore: number
+    }
+    submitFeedback: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sourceMapsFixWizardLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        wizardCommand: (preflight: null | import('~/types').PreflightStatus) => string
+    }
+}
+
+export type sourceMapsFixWizardLogicType = MakeLogicType<
+    sourceMapsFixWizardLogicValues,
+    sourceMapsFixWizardLogicActions,
+    Record<string, any>,
+    sourceMapsFixWizardLogicMeta
+>
+
 export const sourceMapsFixWizardLogic = kea<sourceMapsFixWizardLogicType>([
     path([
         'products',
@@ -109,7 +160,7 @@ export const sourceMapsFixWizardLogic = kea<sourceMapsFixWizardLogicType>([
     selectors({
         wizardCommand: [
             () => [preflightLogic.selectors.preflight],
-            (preflight): string =>
+            (preflight: null | import('~/types').PreflightStatus): string =>
                 `npx -y @posthog/wizard@latest upload-source-maps${preflight?.region === Region.EU ? ' --region eu' : ''}`,
         ],
     }),
diff --git a/products/feature_flags/frontend/featureFlagTemplatesSceneLogic.ts b/products/feature_flags/frontend/featureFlagTemplatesSceneLogic.ts
index ae0dcb46b5bd..e724cf1cb940 100644
--- a/products/feature_flags/frontend/featureFlagTemplatesSceneLogic.ts
+++ b/products/feature_flags/frontend/featureFlagTemplatesSceneLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { combineUrl, router } from 'kea-router'
 import posthog from 'posthog-js'
 
@@ -7,8 +7,8 @@ import { featureFlagLogic as enabledFeaturesLogic } from 'lib/logic/featureFlagL
 import { FlagIntent } from 'scenes/feature-flags/featureFlagIntentWarningLogic'
 import { urls } from 'scenes/urls'
 
+import type { FeatureFlagsSet } from '../../../frontend/src/lib/logic/featureFlagLogic'
 import { TemplateKey } from './featureFlagTemplateConstants'
-import type { featureFlagTemplatesSceneLogicType } from './featureFlagTemplatesSceneLogicType'
 
 export type SelectedTemplate = TemplateKey | 'blank'
 
@@ -30,6 +30,37 @@ export function navigateToNewFlag(
     router.actions.push(combineUrl(urls.featureFlag('new'), params).url)
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface featureFlagTemplatesSceneLogicValues {
+    featureFlags: FeatureFlagsSet // enabledFeaturesLogic
+    intentsEnabled: boolean
+    selectedTemplate: SelectedTemplate | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface featureFlagTemplatesSceneLogicActions {
+    selectTemplate: (template: SelectedTemplate) => {
+        template: SelectedTemplate
+    }
+    setSelectedTemplate: (template: SelectedTemplate | null) => {
+        template: SelectedTemplate | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface featureFlagTemplatesSceneLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        intentsEnabled: (featureFlags: FeatureFlagsSet) => boolean
+    }
+}
+
+export type featureFlagTemplatesSceneLogicType = MakeLogicType<
+    featureFlagTemplatesSceneLogicValues,
+    featureFlagTemplatesSceneLogicActions,
+    Record<string, any>,
+    featureFlagTemplatesSceneLogicMeta
+>
+
 export const featureFlagTemplatesSceneLogic = kea<featureFlagTemplatesSceneLogicType>([
     path(['products', 'feature_flags', 'frontend', 'featureFlagTemplatesSceneLogic']),
     connect({
@@ -50,7 +81,8 @@ export const featureFlagTemplatesSceneLogic = kea<featureFlagTemplatesSceneLogic
     selectors({
         intentsEnabled: [
             (s) => [s.featureFlags],
-            (featureFlags) => !!featureFlags[FEATURE_FLAGS.FEATURE_FLAG_CREATION_INTENTS],
+            (featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet) =>
+                !!featureFlags[FEATURE_FLAGS.FEATURE_FLAG_CREATION_INTENTS],
         ],
     }),
     listeners(({ actions, values }) => ({
diff --git a/products/feature_flags/frontend/staff/featureFlagsStaffToolsLogic.ts b/products/feature_flags/frontend/staff/featureFlagsStaffToolsLogic.ts
index be756831aed2..11959a183d11 100644
--- a/products/feature_flags/frontend/staff/featureFlagsStaffToolsLogic.ts
+++ b/products/feature_flags/frontend/staff/featureFlagsStaffToolsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { urlToAction } from 'kea-router'
 
@@ -26,7 +26,6 @@ import type {
     StaffWarmRunApi,
     StaffWarmRunCancelResponseApi,
 } from '../generated/api.schemas'
-import type { featureFlagsStaffToolsLogicType } from './featureFlagsStaffToolsLogicType'
 
 // What rebuild/clear can act on. Mirrors the backend's CACHE_CHOICES.
 export type StaffCacheKind = StaffCacheKindEnumApi
@@ -55,6 +54,226 @@ export type StaffCacheEntry = StaffCacheEntryResponseApi
 export type StaffTeamConfig = StaffTeamConfigApi
 export type StaffWarmRun = StaffWarmRunApi
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface featureFlagsStaffToolsLogicValues {
+    cacheEntry: StaffCacheEntry | null
+    cacheEntryLoading: boolean
+    cacheStatus: StaffCacheTeamStatus[]
+    cacheStatusByTeamId: Record<number, StaffCacheTeamStatus>
+    cacheStatusLoading: boolean
+    clearResult: StaffCacheMutationResponse | null
+    clearResultLoading: boolean
+    hasSeededFromDeepLink: boolean
+    knownTeams: Record<number, StaffTeamResult>
+    pendingTeamConfigTeamIds: number[]
+    rebuildResult: StaffCacheMutationResponse | null
+    rebuildResultLoading: boolean
+    selectedTeamIds: number[]
+    selectedTeams: StaffTeamResult[]
+    teamConfig: StaffTeamConfig[]
+    teamConfigByTeamId: Record<number, StaffTeamConfig>
+    teamConfigLoading: boolean
+    teamSearchResults: StaffTeamResult[]
+    teamSearchResultsLoading: boolean
+    viewingCacheEntry: {
+        cache: StaffReadableCacheKind
+        teamId: number
+    } | null
+    warmRun: StaffWarmRun | null
+    warmRunCancelResult: StaffWarmRunCancelResponseApi | null
+    warmRunCancelResultLoading: boolean
+    warmRunLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface featureFlagsStaffToolsLogicActions {
+    cancelWarmRun: () => any
+    cancelWarmRunFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    cancelWarmRunSuccess: (
+        warmRunCancelResult: StaffWarmRunCancelResponseApi,
+        payload?: any
+    ) => {
+        warmRunCancelResult: StaffWarmRunCancelResponseApi
+        payload?: any
+    }
+    clearCache: ({ caches }: { caches: StaffCacheKind[] }) => {
+        caches: StaffCacheKind[]
+    }
+    clearCacheFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    clearCacheSuccess: (
+        clearResult: StaffCacheMutationResponseApi,
+        payload?: {
+            caches: StaffCacheKind[]
+        }
+    ) => {
+        clearResult: StaffCacheMutationResponseApi
+        payload?: {
+            caches: StaffCacheKind[]
+        }
+    }
+    closeCacheEntryModal: () => {
+        value: true
+    }
+    loadCacheStatus: (_: void) => void
+    loadCacheStatusFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadCacheStatusSuccess: (
+        cacheStatus: StaffCacheTeamStatusApi[],
+        payload?: void
+    ) => {
+        cacheStatus: StaffCacheTeamStatusApi[]
+        payload?: void
+    }
+    loadTeamConfig: (_: void) => void
+    loadTeamConfigFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadTeamConfigSuccess: (
+        teamConfig: StaffTeamConfigApi[],
+        payload?: void
+    ) => {
+        teamConfig: StaffTeamConfigApi[]
+        payload?: void
+    }
+    loadWarmRun: () => any
+    loadWarmRunFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadWarmRunSuccess: (
+        warmRun: StaffWarmRunApi | null,
+        payload?: any
+    ) => {
+        warmRun: StaffWarmRunApi | null
+        payload?: any
+    }
+    rebuildCache: ({ caches }: { caches: StaffCacheKind[] }) => {
+        caches: StaffCacheKind[]
+    }
+    rebuildCacheFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    rebuildCacheSuccess: (
+        rebuildResult: StaffCacheMutationResponseApi,
+        payload?: {
+            caches: StaffCacheKind[]
+        }
+    ) => {
+        rebuildResult: StaffCacheMutationResponseApi
+        payload?: {
+            caches: StaffCacheKind[]
+        }
+    }
+    searchTeams: ({ query }: { query: string }) => {
+        query: string
+    }
+    searchTeamsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    searchTeamsSuccess: (
+        teamSearchResults: StaffTeamResultApi[],
+        payload?: {
+            query: string
+        }
+    ) => {
+        teamSearchResults: StaffTeamResultApi[]
+        payload?: {
+            query: string
+        }
+    }
+    seedTeamFromDeepLink: (teamId: number) => {
+        teamId: number
+    }
+    setMinimalFlagCalledEvents: (
+        teamId: number,
+        minimalFlagCalledEvents: boolean
+    ) => {
+        minimalFlagCalledEvents: boolean
+        teamId: number
+    }
+    setSelectedTeamIds: (teamIds: number[]) => {
+        teamIds: number[]
+    }
+    teamConfigMutationSettled: (teamId: number) => {
+        teamId: number
+    }
+    teamConfigMutationSucceeded: (teamConfig: StaffTeamConfig) => {
+        teamConfig: StaffTeamConfigApi
+    }
+    viewCacheEntry: ({ teamId, cache }: { cache: StaffReadableCacheKind; teamId: number }) => {
+        teamId: number
+        cache: StaffReadableCacheKind
+    }
+    viewCacheEntryFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    viewCacheEntrySuccess: (
+        cacheEntry: StaffCacheEntryResponseApi,
+        payload?: {
+            teamId: number
+            cache: StaffReadableCacheKind
+        }
+    ) => {
+        cacheEntry: StaffCacheEntryResponseApi
+        payload?: {
+            teamId: number
+            cache: StaffReadableCacheKind
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface featureFlagsStaffToolsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        selectedTeams: (selectedTeamIds: number[], knownTeams: Record<number, StaffTeamResultApi>) => StaffTeamResult[]
+        cacheStatusByTeamId: (cacheStatus: StaffCacheTeamStatusApi[]) => Record<number, StaffCacheTeamStatus>
+        teamConfigByTeamId: (teamConfig: StaffTeamConfigApi[]) => Record<number, StaffTeamConfig>
+    }
+}
+
+export type featureFlagsStaffToolsLogicType = MakeLogicType<
+    featureFlagsStaffToolsLogicValues,
+    featureFlagsStaffToolsLogicActions,
+    Record<string, any>,
+    featureFlagsStaffToolsLogicMeta
+>
+
 export const featureFlagsStaffToolsLogic = kea<featureFlagsStaffToolsLogicType>([
     path(['products', 'feature_flags', 'frontend', 'staff', 'featureFlagsStaffToolsLogic']),
     actions({
diff --git a/products/growth/frontend/identityMatchingLogic.ts b/products/growth/frontend/identityMatchingLogic.ts
index 0dac9048aa16..9e238c80be64 100644
--- a/products/growth/frontend/identityMatchingLogic.ts
+++ b/products/growth/frontend/identityMatchingLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { teamLogic } from 'scenes/teamLogic'
@@ -15,7 +15,6 @@ import type {
     IdentityMatchingRunApi,
     IdentityMatchingRunsResponseApi,
 } from './generated/api.schemas'
-import type { identityMatchingLogicType } from './identityMatchingLogicType'
 
 export interface IdentityMatchingFilters {
     jobId: string | null
@@ -37,6 +36,82 @@ export const LINKS_PAGE_SIZE = 50
 
 export type IdentityMatchingTab = 'links' | 'paid_attribution' | 'runs'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface identityMatchingLogicValues {
+    activeTab: IdentityMatchingTab
+    breadcrumbs: Breadcrumb[]
+    filters: IdentityMatchingFilters
+    links: IdentityMatchingLinkApi[]
+    linksCount: number
+    linksResponse: IdentityMatchingLinksResponseApi | null
+    linksResponseLoading: boolean
+    modelVersions: string[]
+    page: number
+    runs: IdentityMatchingRunApi[]
+    runsResponse: IdentityMatchingRunsResponseApi | null
+    runsResponseLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface identityMatchingLogicActions {
+    loadLinks: (_: unknown) => unknown
+    loadLinksFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadLinksSuccess: (
+        linksResponse: IdentityMatchingLinksResponseApi | null,
+        payload?: unknown
+    ) => {
+        linksResponse: IdentityMatchingLinksResponseApi | null
+        payload?: unknown
+    }
+    loadRuns: () => any
+    loadRunsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRunsSuccess: (
+        runsResponse: IdentityMatchingRunsResponseApi,
+        payload?: any
+    ) => {
+        runsResponse: IdentityMatchingRunsResponseApi
+        payload?: any
+    }
+    setActiveTab: (tab: IdentityMatchingTab) => {
+        tab: IdentityMatchingTab
+    }
+    setFilters: (filters: Partial<IdentityMatchingFilters>) => {
+        filters: Partial<IdentityMatchingFilters>
+    }
+    setPage: (page: number) => {
+        page: number
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface identityMatchingLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        links: (linksResponse: IdentityMatchingLinksResponseApi | null) => IdentityMatchingLinkApi[]
+        linksCount: (linksResponse: IdentityMatchingLinksResponseApi | null) => number
+        runs: (runsResponse: IdentityMatchingRunsResponseApi | null) => IdentityMatchingRunApi[]
+        modelVersions: (runs: IdentityMatchingRunApi[]) => string[]
+    }
+}
+
+export type identityMatchingLogicType = MakeLogicType<
+    identityMatchingLogicValues,
+    identityMatchingLogicActions,
+    Record<string, any>,
+    identityMatchingLogicMeta
+>
+
 export const identityMatchingLogic = kea<identityMatchingLogicType>([
     path(['products', 'growth', 'frontend', 'identityMatchingLogic']),
     actions({
@@ -107,12 +182,23 @@ export const identityMatchingLogic = kea<identityMatchingLogicType>([
         ],
     }),
     selectors({
-        links: [(s) => [s.linksResponse], (linksResponse): IdentityMatchingLinkApi[] => linksResponse?.results ?? []],
-        linksCount: [(s) => [s.linksResponse], (linksResponse): number => linksResponse?.count ?? 0],
-        runs: [(s) => [s.runsResponse], (runsResponse): IdentityMatchingRunApi[] => runsResponse?.results ?? []],
+        links: [
+            (s) => [s.linksResponse],
+            (linksResponse: IdentityMatchingLinksResponseApi | null): IdentityMatchingLinkApi[] =>
+                linksResponse?.results ?? [],
+        ],
+        linksCount: [
+            (s) => [s.linksResponse],
+            (linksResponse: IdentityMatchingLinksResponseApi | null): number => linksResponse?.count ?? 0,
+        ],
+        runs: [
+            (s) => [s.runsResponse],
+            (runsResponse: IdentityMatchingRunsResponseApi | null): IdentityMatchingRunApi[] =>
+                runsResponse?.results ?? [],
+        ],
         modelVersions: [
             (s) => [s.runs],
-            (runs): string[] => {
+            (runs: IdentityMatchingRunApi[]): string[] => {
                 const versions = new Set<string>()
                 for (const run of runs) {
                     for (const model of run.models) {
diff --git a/products/legal_documents/frontend/scenes/legalDocumentsLogic.ts b/products/legal_documents/frontend/scenes/legalDocumentsLogic.ts
index 4c63073152c3..2cb3528a71dc 100644
--- a/products/legal_documents/frontend/scenes/legalDocumentsLogic.ts
+++ b/products/legal_documents/frontend/scenes/legalDocumentsLogic.ts
@@ -1,5 +1,6 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { router, urlToAction } from 'kea-router'
 
@@ -11,8 +12,8 @@ import { urls } from 'scenes/urls'
 
 import { BillingType } from '~/types'
 
+import type { OrganizationType } from '../../../../frontend/src/types'
 import * as api from '../generated/api'
-import type { legalDocumentsLogicType } from './legalDocumentsLogicType'
 
 export type LegalDocumentType = 'BAA' | 'DPA'
 export type DPAMode = 'pretty' | 'lawyer' | 'fairytale' | 'tswift'
@@ -55,6 +56,134 @@ function defaultsFor(documentType: LegalDocumentType): LegalDocumentFormValues {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface legalDocumentsLogicValues {
+    billing: BillingType | null // billingLogic
+    currentOrganization: OrganizationType | null // organizationLogic
+    currentOrganizationId: string // organizationLogic
+    isAdminOrOwner: boolean | null // organizationLogic
+    deletingId: string | null
+    existingDocumentOfCurrentType: LegalDocument | null
+    existingDocumentTypes: Set<LegalDocumentType>
+    hasQualifyingBaaAddon: boolean
+    isDpaModeSubmittable: boolean
+    isLegalDocumentSubmitting: boolean
+    isLegalDocumentValid: boolean
+    isOnEnterpriseStandardTrial: boolean
+    isOnQualifyingAddonTrial: boolean
+    legalDocument: LegalDocumentFormValues
+    legalDocumentAllErrors: Record<string, any>
+    legalDocumentChanged: boolean
+    legalDocumentErrors: DeepPartialMap<LegalDocumentFormValues, ValidationErrorType>
+    legalDocumentHasErrors: boolean
+    legalDocumentManualErrors: Record<string, any>
+    legalDocumentTouched: boolean
+    legalDocumentTouches: Record<string, boolean>
+    legalDocumentValidationErrors: DeepPartialMap<LegalDocumentFormValues, ValidationErrorType>
+    legalDocuments: LegalDocument[]
+    legalDocumentsLoading: boolean
+    showLegalDocumentErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface legalDocumentsLogicActions {
+    loadCurrentOrganizationSuccess: (
+        currentOrganization: OrganizationType | null,
+        payload?: any
+    ) => {
+        currentOrganization: OrganizationType | null
+        payload?: any
+    } // organizationLogic
+    deleteLegalDocument: (
+        id: string,
+        documentType: LegalDocumentType
+    ) => {
+        documentType: LegalDocumentType
+        id: string
+    }
+    loadLegalDocuments: () => any
+    loadLegalDocumentsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadLegalDocumentsSuccess: (
+        legalDocuments: LegalDocument[],
+        payload?: any
+    ) => {
+        legalDocuments: LegalDocument[]
+        payload?: any
+    }
+    resetLegalDocument: (values?: LegalDocumentFormValues) => {
+        values?: LegalDocumentFormValues
+    }
+    setDeletingId: (id: string | null) => {
+        id: string | null
+    }
+    setDocumentType: (documentType: LegalDocumentType) => {
+        documentType: LegalDocumentType
+    }
+    setDpaMode: (dpaMode: DPAMode) => {
+        dpaMode: DPAMode
+    }
+    setLegalDocumentManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setLegalDocumentValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setLegalDocumentValues: (values: DeepPartial<LegalDocumentFormValues>) => {
+        values: DeepPartial<LegalDocumentFormValues>
+    }
+    submitLegalDocument: () => {
+        value: boolean
+    }
+    submitLegalDocumentFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitLegalDocumentRequest: (legalDocument: LegalDocumentFormValues) => {
+        legalDocument: LegalDocumentFormValues
+    }
+    submitLegalDocumentSuccess: (legalDocument: LegalDocumentFormValues) => {
+        legalDocument: LegalDocumentFormValues
+    }
+    touchLegalDocumentField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface legalDocumentsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        hasQualifyingBaaAddon: (billing: BillingType | null) => boolean
+        isOnQualifyingAddonTrial: (billing: BillingType | null) => boolean
+        isOnEnterpriseStandardTrial: (billing: BillingType | null) => boolean
+        isDpaModeSubmittable: (legalDocument: LegalDocumentFormValues) => boolean
+        existingDocumentTypes: (legalDocuments: LegalDocument[]) => Set<LegalDocumentType>
+        existingDocumentOfCurrentType: (
+            legalDocument: LegalDocumentFormValues,
+            legalDocuments: LegalDocument[]
+        ) => LegalDocument | null
+    }
+}
+
+export type legalDocumentsLogicType = MakeLogicType<
+    legalDocumentsLogicValues,
+    legalDocumentsLogicActions,
+    Record<string, any>,
+    legalDocumentsLogicMeta
+>
+
 export const legalDocumentsLogic = kea<legalDocumentsLogicType>([
     path(['products', 'legal_documents', 'legalDocumentsLogic']),
     connect(() => ({
diff --git a/products/links/frontend/linkLogic.ts b/products/links/frontend/linkLogic.ts
index 0acb53bb19bb..46ebb5a23948 100644
--- a/products/links/frontend/linkLogic.ts
+++ b/products/links/frontend/linkLogic.ts
@@ -1,5 +1,6 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { router, urlToAction } from 'kea-router'
 
@@ -13,7 +14,6 @@ import { deleteFromTree } from '~/layout/panel-layout/ProjectTree/projectTreeLog
 import type { LinkType } from '~/types'
 import { Breadcrumb, ProjectTreeRef } from '~/types'
 
-import type { linkLogicType } from './linkLogicType'
 import { linksLogic } from './linksLogic'
 
 export type AvailableDomain = 'phog.gg' | 'postho.gg' | 'hog.gg' | 'custom'
@@ -45,6 +45,128 @@ export interface LinkLogicProps {
     id: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface linkLogicValues {
+    links: LinkType[] // linksLogic
+    currentTeamId: number | null // teamLogic
+    breadcrumbs: Breadcrumb[]
+    isEditingLink: boolean
+    isLinkSubmitting: boolean
+    isLinkValid: boolean
+    link: LinkType
+    linkAllErrors: Record<string, any>
+    linkChanged: boolean
+    linkErrors: DeepPartialMap<LinkType, ValidationErrorType>
+    linkHasErrors: boolean
+    linkLoading: boolean
+    linkManualErrors: Record<string, any>
+    linkMissing: boolean
+    linkTouched: boolean
+    linkTouches: Record<string, boolean>
+    linkValidationErrors: DeepPartialMap<LinkType, ValidationErrorType>
+    mode: 'edit' | 'view'
+    projectTreeRef: ProjectTreeRef
+    showLinkErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface linkLogicActions {
+    loadLinks: () => any // linksLogic
+    loadLinksSuccess: (
+        links: LinkType[],
+        payload?: any
+    ) => {
+        links: LinkType[]
+        payload?: any
+    } // linksLogic
+    deleteLink: (linkId: LinkType['id']) => {
+        linkId: string
+    }
+    editLink: (editing: boolean) => {
+        editing: boolean
+    }
+    loadLink: () => any
+    loadLinkFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadLinkSuccess: (
+        link: LinkType,
+        payload?: any
+    ) => {
+        link: LinkType
+        payload?: any
+    }
+    resetLink: (values?: LinkType) => {
+        values?: LinkType
+    }
+    saveLink: (updatedLink: Partial<LinkType>) => Partial<LinkType>
+    saveLinkFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    saveLinkSuccess: (
+        link: LinkType,
+        payload?: Partial<LinkType>
+    ) => {
+        link: LinkType
+        payload?: Partial<LinkType>
+    }
+    setLinkManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setLinkMissing: () => {
+        value: true
+    }
+    setLinkValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setLinkValues: (values: DeepPartial<LinkType>) => {
+        values: DeepPartial<LinkType>
+    }
+    submitLink: () => {
+        value: boolean
+    }
+    submitLinkFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitLinkRequest: (link: LinkType) => {
+        link: LinkType
+    }
+    submitLinkSuccess: (link: LinkType) => {
+        link: LinkType
+    }
+    touchLinkField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface linkLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        mode: (id: string) => 'edit' | 'view'
+        breadcrumbs: (link: LinkType) => Breadcrumb[]
+        projectTreeRef: (arg: string) => ProjectTreeRef
+    }
+}
+
+export type linkLogicType = MakeLogicType<linkLogicValues, linkLogicActions, LinkLogicProps, linkLogicMeta>
+
 export const linkLogic = kea<linkLogicType>([
     path(['products', 'links', 'frontend', 'linkLogic']),
     props({} as LinkLogicProps),
@@ -106,7 +228,7 @@ export const linkLogic = kea<linkLogicType>([
         isEditingLink: [false, { editLink: (_, { editing }) => editing }],
     }),
     selectors({
-        mode: [(_, p) => [p.id], (id): 'view' | 'edit' => (id === 'new' ? 'edit' : 'view')],
+        mode: [(_, p) => [p.id], (id: string): 'view' | 'edit' => (id === 'new' ? 'edit' : 'view')],
         breadcrumbs: [
             (s) => [s.link],
             (link: LinkType): Breadcrumb[] => [
@@ -125,7 +247,7 @@ export const linkLogic = kea<linkLogicType>([
         ],
         projectTreeRef: [
             () => [(_, props: LinkLogicProps) => props.id],
-            (id): ProjectTreeRef => ({ type: 'link', ref: id === 'new' ? null : String(id) }),
+            (id: string): ProjectTreeRef => ({ type: 'link', ref: id === 'new' ? null : String(id) }),
         ],
     }),
     listeners(({ actions, values }) => ({
diff --git a/products/links/frontend/linkMetricSparklineLogic.ts b/products/links/frontend/linkMetricSparklineLogic.ts
index ad2b69dad1f1..477a19e06687 100644
--- a/products/links/frontend/linkMetricSparklineLogic.ts
+++ b/products/links/frontend/linkMetricSparklineLogic.ts
@@ -1,4 +1,4 @@
-import { afterMount, kea, key, path, props } from 'kea'
+import { MakeLogicType, afterMount, kea, key, path, props } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -7,8 +7,6 @@ import { NodeKind, TrendsQuery } from '~/queries/schema/schema-general'
 import { setLatestVersionsOnQuery } from '~/queries/utils'
 import { ChartDisplayType } from '~/types'
 
-import type { linkMetricSparklineLogicType } from './linkMetricSparklineLogicType'
-
 export type Props = {
     id: string
 }
@@ -18,6 +16,43 @@ export type SparklineDataResponse = {
     labels: string[]
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface linkMetricSparklineLogicValues {
+    sparklineData: SparklineDataResponse | null
+    sparklineDataLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface linkMetricSparklineLogicActions {
+    loadSparklineData: () => any
+    loadSparklineDataFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSparklineDataSuccess: (
+        sparklineData: SparklineDataResponse,
+        payload?: any
+    ) => {
+        sparklineData: SparklineDataResponse
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface linkMetricSparklineLogicMeta {
+    key: string
+}
+
+export type linkMetricSparklineLogicType = MakeLogicType<
+    linkMetricSparklineLogicValues,
+    linkMetricSparklineLogicActions,
+    Props,
+    linkMetricSparklineLogicMeta
+>
+
 export const linkMetricSparklineLogic = kea<linkMetricSparklineLogicType>([
     props({} as Props),
     key(({ id }: Props) => id),
diff --git a/products/links/frontend/linksLogic.ts b/products/links/frontend/linksLogic.ts
index a612ee13c60c..b2914ad36aae 100644
--- a/products/links/frontend/linksLogic.ts
+++ b/products/links/frontend/linksLogic.ts
@@ -1,11 +1,36 @@
-import { afterMount, kea, path } from 'kea'
+import { MakeLogicType, afterMount, kea, path } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
 
 import { LinkType } from '~/types'
 
-import type { linksLogicType } from './linksLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface linksLogicValues {
+    links: LinkType[]
+    linksLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface linksLogicActions {
+    loadLinks: () => any
+    loadLinksFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadLinksSuccess: (
+        links: LinkType[],
+        payload?: any
+    ) => {
+        links: LinkType[]
+        payload?: any
+    }
+}
+
+export type linksLogicType = MakeLogicType<linksLogicValues, linksLogicActions>
 
 export const linksLogic = kea<linksLogicType>([
     path(() => ['scenes', 'links', 'linksLogic']),
diff --git a/products/live_debugger/frontend/liveDebuggerLogic.ts b/products/live_debugger/frontend/liveDebuggerLogic.ts
index 77887fe95fbe..e0fc18359d59 100644
--- a/products/live_debugger/frontend/liveDebuggerLogic.ts
+++ b/products/live_debugger/frontend/liveDebuggerLogic.ts
@@ -1,11 +1,9 @@
-import { actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
 import { teamLogic } from 'scenes/teamLogic'
 
-import type { liveDebuggerLogicType } from './liveDebuggerLogicType'
-
 export interface Breakpoint {
     id: string
     repository: string | null
@@ -28,6 +26,144 @@ export interface BreakpointInstance {
     filename: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface liveDebuggerLogicValues {
+    currentProjectId: number | string // teamLogic
+    breakpointInstances: BreakpointInstance[]
+    breakpointInstancesLoading: boolean
+    breakpointLines: number[]
+    breakpoints: Breakpoint[]
+    breakpointsByLine: Record<number, Breakpoint>
+    breakpointsLoading: boolean
+    currentRepository: string
+    hitCountsByLine: Record<number, number>
+    hitsForSelectedLine: BreakpointInstance[]
+    instancesByLine: Record<number, BreakpointInstance[]>
+    newHitsByLine: Set<number>
+    newInstanceIds: Set<string>
+    previousInstanceIds: Set<string>
+    seenInstanceIds: Set<string>
+    selectedFilePath: string
+    selectedInstance: BreakpointInstance | null
+    selectedInstanceId: string | null
+    selectedLineForHits: number | null
+    visibleBreakpointIds: string[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface liveDebuggerLogicActions {
+    clearAllBreakpoints: () => {
+        value: true
+    }
+    loadBreakpointInstances: () => any
+    loadBreakpointInstancesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadBreakpointInstancesSuccess: (
+        breakpointInstances: BreakpointInstance[],
+        payload?: any
+    ) => {
+        breakpointInstances: BreakpointInstance[]
+        payload?: any
+    }
+    loadBreakpoints: () => any
+    loadBreakpointsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadBreakpointsSuccess: (
+        breakpoints: Breakpoint[],
+        payload?: any
+    ) => {
+        breakpoints: Breakpoint[]
+        payload?: any
+    }
+    markInstanceAsOld: (instanceId: string) => {
+        instanceId: string
+    }
+    selectInstance: (instanceId: string | null) => {
+        instanceId: string | null
+    }
+    setCurrentRepository: (repository: string) => {
+        repository: string
+    }
+    setHoveredLine: (lineNumber: number | null) => {
+        lineNumber: number | null
+    }
+    setSelectedFilePath: (filePath: string) => {
+        filePath: string
+    }
+    showHitsForLine: (lineNumber: number | null) => {
+        lineNumber: number | null
+    }
+    startPollingBreakpoints: () => {
+        value: true
+    }
+    stopPollingBreakpoints: () => {
+        value: true
+    }
+    toggleBreakpoint: (
+        filename: string,
+        lineNumber: number,
+        repository: string
+    ) => {
+        filename: string
+        lineNumber: number
+        repository: string
+    }
+    toggleBreakpointForFile: (
+        filename: string,
+        lineNumber: number,
+        repository: string
+    ) => {
+        filename: string
+        lineNumber: number
+        repository: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface liveDebuggerLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        selectedInstance: (
+            selectedInstanceId: string | null,
+            breakpointInstances: BreakpointInstance[]
+        ) => BreakpointInstance | null
+        visibleBreakpointIds: (breakpoints: Breakpoint[]) => string[]
+        breakpointLines: (breakpoints: Breakpoint[], selectedFilePath: string) => number[]
+        breakpointsByLine: (breakpoints: Breakpoint[], selectedFilePath: string) => Record<number, Breakpoint>
+        instancesByLine: (
+            breakpointInstances: BreakpointInstance[],
+            selectedFilePath: string
+        ) => Record<number, BreakpointInstance[]>
+        newInstanceIds: (breakpointInstances: BreakpointInstance[], seenInstanceIds: Set<string>) => Set<string>
+        hitCountsByLine: (breakpointInstances: BreakpointInstance[], selectedFilePath: string) => Record<number, number>
+        newHitsByLine: (
+            breakpointInstances: BreakpointInstance[],
+            seenInstanceIds: Set<string>,
+            selectedFilePath: string
+        ) => Set<number>
+        hitsForSelectedLine: (
+            selectedLineForHits: number | null,
+            instancesByLine: Record<number, BreakpointInstance[]>
+        ) => BreakpointInstance[]
+    }
+}
+
+export type liveDebuggerLogicType = MakeLogicType<
+    liveDebuggerLogicValues,
+    liveDebuggerLogicActions,
+    Record<string, any>,
+    liveDebuggerLogicMeta
+>
+
 export const liveDebuggerLogic = kea<liveDebuggerLogicType>([
     path(['products', 'live_debugger', 'frontend', 'liveDebuggerLogic']),
     connect(() => ({ values: [teamLogic, ['currentProjectId']] })),
@@ -254,7 +390,8 @@ export const liveDebuggerLogic = kea<liveDebuggerLogicType>([
     selectors({
         selectedInstance: [
             (s) => [s.selectedInstanceId, s.breakpointInstances],
-            (selectedId, instances): BreakpointInstance | null => instances.find((i) => i.id === selectedId) || null,
+            (selectedId: string | null, instances: BreakpointInstance[]): BreakpointInstance | null =>
+                instances.find((i) => i.id === selectedId) || null,
         ],
         visibleBreakpointIds: [
             (s) => [s.breakpoints],
@@ -262,7 +399,7 @@ export const liveDebuggerLogic = kea<liveDebuggerLogicType>([
         ],
         breakpointLines: [
             (s) => [s.breakpoints, s.selectedFilePath],
-            (breakpoints, selectedFilePath): number[] => {
+            (breakpoints: Breakpoint[], selectedFilePath: string): number[] => {
                 if (!Array.isArray(breakpoints) || !selectedFilePath) {
                     return []
                 }
@@ -274,7 +411,7 @@ export const liveDebuggerLogic = kea<liveDebuggerLogicType>([
         ],
         breakpointsByLine: [
             (s) => [s.breakpoints, s.selectedFilePath],
-            (breakpoints, selectedFilePath): Record<number, Breakpoint> => {
+            (breakpoints: Breakpoint[], selectedFilePath: string): Record<number, Breakpoint> => {
                 const byLine: Record<number, Breakpoint> = {}
                 if (Array.isArray(breakpoints) && selectedFilePath) {
                     breakpoints
@@ -288,7 +425,7 @@ export const liveDebuggerLogic = kea<liveDebuggerLogicType>([
         ],
         instancesByLine: [
             (s) => [s.breakpointInstances, s.selectedFilePath],
-            (instances, selectedFilePath): Record<number, BreakpointInstance[]> => {
+            (instances: BreakpointInstance[], selectedFilePath: string): Record<number, BreakpointInstance[]> => {
                 const grouped: Record<number, BreakpointInstance[]> = {}
                 instances
                     .filter((instance) => !selectedFilePath || instance.filename === selectedFilePath)
@@ -303,13 +440,13 @@ export const liveDebuggerLogic = kea<liveDebuggerLogicType>([
         ],
         newInstanceIds: [
             (s) => [s.breakpointInstances, s.seenInstanceIds],
-            (instances, seenIds): Set<string> => {
+            (instances: BreakpointInstance[], seenIds: Set<string>): Set<string> => {
                 return new Set(instances.filter((instance) => !seenIds.has(instance.id)).map((instance) => instance.id))
             },
         ],
         hitCountsByLine: [
             (s) => [s.breakpointInstances, s.selectedFilePath],
-            (instances, selectedFilePath): Record<number, number> => {
+            (instances: BreakpointInstance[], selectedFilePath: string): Record<number, number> => {
                 const counts: Record<number, number> = {}
                 instances
                     .filter((instance) => !selectedFilePath || instance.filename === selectedFilePath)
@@ -321,7 +458,7 @@ export const liveDebuggerLogic = kea<liveDebuggerLogicType>([
         ],
         newHitsByLine: [
             (s) => [s.breakpointInstances, s.seenInstanceIds, s.selectedFilePath],
-            (instances, seenIds, selectedFilePath): Set<number> => {
+            (instances: BreakpointInstance[], seenIds: Set<string>, selectedFilePath: string): Set<number> => {
                 const newInstances = instances
                     .filter((instance) => !seenIds.has(instance.id))
                     .filter((instance) => !selectedFilePath || instance.filename === selectedFilePath)
@@ -330,7 +467,10 @@ export const liveDebuggerLogic = kea<liveDebuggerLogicType>([
         ],
         hitsForSelectedLine: [
             (s) => [s.selectedLineForHits, s.instancesByLine],
-            (selectedLine, instancesByLine): BreakpointInstance[] => {
+            (
+                selectedLine: number | null,
+                instancesByLine: Record<number, BreakpointInstance[]>
+            ): BreakpointInstance[] => {
                 if (!selectedLine) {
                     return []
                 }
diff --git a/products/live_debugger/frontend/repo_browser/repoBrowserLogic.ts b/products/live_debugger/frontend/repo_browser/repoBrowserLogic.ts
index 5163d3e25c9c..09da4963e95b 100644
--- a/products/live_debugger/frontend/repo_browser/repoBrowserLogic.ts
+++ b/products/live_debugger/frontend/repo_browser/repoBrowserLogic.ts
@@ -1,5 +1,5 @@
 import _Fuse from 'fuse.js'
-import { actions, events, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, events, kea, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import type { TreeDataItem } from 'lib/lemon-ui/LemonTree/LemonTree'
@@ -12,11 +12,93 @@ import {
     loadFileContent,
     loadRepositoryTree,
 } from './githubClient'
-import type { repoBrowserLogicType } from './repoBrowserLogicType'
 
 // Hack so kea-typegen picks up the type
 export type Fuse<T> = _Fuse<T>
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface repoBrowserLogicValues {
+    codeLines: string[]
+    fileContent: GitHubFileContent | null
+    fileContentLoading: boolean
+    fileSearchQuery: string
+    fuzzyIndex: Fuse<GitHubTreeItem>
+    relevantFiles: GitHubTreeItem[]
+    repositoryTree: GitHubTreeResponse | null
+    repositoryTreeLoading: boolean
+    selectedFilePath: string | null
+    treeData: TreeDataItem[]
+    visibleFilesAndFolders: GitHubTreeItem[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface repoBrowserLogicActions {
+    loadFileContent: (filePath: string) => {
+        filePath: string
+    }
+    loadFileContentFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadFileContentSuccess: (
+        fileContent: GitHubFileContent,
+        payload?: {
+            filePath: string
+        }
+    ) => {
+        fileContent: GitHubFileContent
+        payload?: {
+            filePath: string
+        }
+    }
+    loadRepositoryTree: () => any
+    loadRepositoryTreeFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRepositoryTreeSuccess: (
+        repositoryTree: GitHubTreeResponse,
+        payload?: any
+    ) => {
+        repositoryTree: GitHubTreeResponse
+        payload?: any
+    }
+    setExpandedFolderPaths: (paths: string[]) => {
+        paths: string[]
+    }
+    setFileSearchQuery: (query: string) => {
+        query: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface repoBrowserLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        codeLines: (fileContent: GitHubFileContent | null) => string[]
+        relevantFiles: (repositoryTree: GitHubTreeResponse | null) => GitHubTreeItem[]
+        fuzzyIndex: (relevantFiles: GitHubTreeItem[]) => Fuse<GitHubTreeItem>
+        visibleFilesAndFolders: (
+            fileSearchQuery: string,
+            relevantFiles: GitHubTreeItem[],
+            fuzzyIndex: Fuse<GitHubTreeItem>
+        ) => GitHubTreeItem[]
+        treeData: (visibleFilesAndFolders: GitHubTreeItem[]) => TreeDataItem[]
+    }
+}
+
+export type repoBrowserLogicType = MakeLogicType<
+    repoBrowserLogicValues,
+    repoBrowserLogicActions,
+    Record<string, any>,
+    repoBrowserLogicMeta
+>
+
 export const repoBrowserLogic = kea<repoBrowserLogicType>([
     path(['products', 'live_debugger', 'frontend', 'repo_browser', 'repoBrowserLogic']),
 
diff --git a/products/logs/frontend/attributeBreakdownLogic.tsx b/products/logs/frontend/attributeBreakdownLogic.tsx
index 127e689389ba..351d6dd294ea 100644
--- a/products/logs/frontend/attributeBreakdownLogic.tsx
+++ b/products/logs/frontend/attributeBreakdownLogic.tsx
@@ -1,9 +1,9 @@
-import { connect, kea, key, path, props, selectors } from 'kea'
+import { MakeLogicType, connect, kea, key, path, props, selectors } from 'kea'
 
 import { PropertyFilterType } from '~/types'
 
-import type { attributeBreakdownLogicType } from './attributeBreakdownLogicType'
 import { logsViewerDataLogic } from './components/LogsViewer/data/logsViewerDataLogic'
+import type { ParsedLogMessage } from './types'
 
 export interface AttributeBreakdownLogicProps {
     attribute: string
@@ -11,6 +11,30 @@ export interface AttributeBreakdownLogicProps {
     id: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface attributeBreakdownLogicValues {
+    logs: ParsedLogMessage[]; // logsViewerDataLogic
+    attributeValues: string[];
+    breakdowns: {
+        [key: string]: number;
+    };
+    logCount: number;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface attributeBreakdownLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        logCount: (logs: ParsedLogMessage[]) => number;
+        attributeValues: (logs: ParsedLogMessage[]) => string[];
+        breakdowns: (attributeValues: string[]) => {
+            [key: string]: number;
+        };
+    };
+}
+
+export type attributeBreakdownLogicType = MakeLogicType<attributeBreakdownLogicValues, {}, AttributeBreakdownLogicProps, attributeBreakdownLogicMeta>;
+
 export const attributeBreakdownLogic = kea<attributeBreakdownLogicType>([
     props({} as AttributeBreakdownLogicProps),
     key((props) => `${props.id}-${props.type}-${props.attribute}`),
@@ -21,10 +45,10 @@ export const attributeBreakdownLogic = kea<attributeBreakdownLogicType>([
     })),
 
     selectors(({ props }) => ({
-        logCount: [(s) => [s.logs], (logs): number => logs.length],
+        logCount: [(s) => [s.logs], (logs: import('./types').ParsedLogMessage[]): number => logs.length],
         attributeValues: [
             (s) => [s.logs],
-            (logs): string[] => {
+            (logs: import('./types').ParsedLogMessage[]): string[] => {
                 let attributesKey: 'attributes' | 'resource_attributes' = 'attributes'
                 if (props.type === PropertyFilterType.LogResourceAttribute) {
                     attributesKey = 'resource_attributes'
diff --git a/products/logs/frontend/components/LogsAlerting/logsAlertEventHistoryLogic.ts b/products/logs/frontend/components/LogsAlerting/logsAlertEventHistoryLogic.ts
index 97570ff0e686..f695dcc4eed6 100644
--- a/products/logs/frontend/components/LogsAlerting/logsAlertEventHistoryLogic.ts
+++ b/products/logs/frontend/components/LogsAlerting/logsAlertEventHistoryLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, path, props } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, path, props } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { teamLogic } from 'scenes/teamLogic'
@@ -6,8 +6,6 @@ import { teamLogic } from 'scenes/teamLogic'
 import { logsAlertsEventsList } from 'products/logs/frontend/generated/api'
 import { LogsAlertEventApi } from 'products/logs/frontend/generated/api.schemas'
 
-import type { logsAlertEventHistoryLogicType } from './logsAlertEventHistoryLogicType'
-
 export interface LogsAlertEventHistoryLogicProps {
     alertId: string
 }
@@ -18,6 +16,73 @@ export interface EventsPage {
     count: number
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsAlertEventHistoryLogicValues {
+    currentTeamId: number | null // teamLogic
+    eventsPage: EventsPage
+    eventsPageLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsAlertEventHistoryLogicActions {
+    loadEvents: () => any
+    loadEventsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadEventsSuccess: (
+        eventsPage: {
+            count: number
+            next: string | null
+            results: LogsAlertEventApi[]
+        },
+        payload?: any
+    ) => {
+        eventsPage: {
+            count: number
+            next: string | null
+            results: LogsAlertEventApi[]
+        }
+        payload?: any
+    }
+    loadMore: () => {
+        value: true
+    }
+    loadMoreFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadMoreSuccess: (
+        eventsPage: EventsPage,
+        payload?: {
+            value: true
+        }
+    ) => {
+        eventsPage: EventsPage
+        payload?: {
+            value: true
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsAlertEventHistoryLogicMeta {
+    key: string
+}
+
+export type logsAlertEventHistoryLogicType = MakeLogicType<
+    logsAlertEventHistoryLogicValues,
+    logsAlertEventHistoryLogicActions,
+    LogsAlertEventHistoryLogicProps,
+    logsAlertEventHistoryLogicMeta
+>
+
 export const logsAlertEventHistoryLogic = kea<logsAlertEventHistoryLogicType>([
     path((key) => ['products', 'logs', 'frontend', 'components', 'LogsAlerting', 'logsAlertEventHistoryLogic', key]),
     props({} as LogsAlertEventHistoryLogicProps),
diff --git a/products/logs/frontend/components/LogsAlerting/logsAlertFormLogic.ts b/products/logs/frontend/components/LogsAlerting/logsAlertFormLogic.ts
index 0bcc0086cecd..f28f2101fdc5 100644
--- a/products/logs/frontend/components/LogsAlerting/logsAlertFormLogic.ts
+++ b/products/logs/frontend/components/LogsAlerting/logsAlertFormLogic.ts
@@ -1,5 +1,6 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -21,10 +22,10 @@ import {
     LogsAlertThresholdOperatorEnumApi,
 } from 'products/logs/frontend/generated/api.schemas'
 
-import type { logsAlertFormLogicType } from './logsAlertFormLogicType'
 import { logsAlertingLogic } from './logsAlertingLogic'
 import { logsAlertNotificationLogic } from './logsAlertNotificationLogic'
 import { buildAlertFilters, hasAnyFilter } from './logsAlertUtils'
+import type { PendingLogsAlertNotification } from './logsAlertUtils'
 
 const EMPTY_FILTER_GROUP: UniversalFiltersGroup = {
     type: FilterLogicalOperator.And,
@@ -76,6 +77,144 @@ export function buildFormDefaults(alert: LogsAlertConfigurationApi | null): Logs
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsAlertFormLogicValues {
+    pendingNotifications: PendingLogsAlertNotification[] // logsAlertNotificationLogic
+    currentTeamId: number | null // teamLogic
+    alertForm: LogsAlertFormType
+    alertFormAllErrors: Record<string, any>
+    alertFormChanged: boolean
+    alertFormErrors: DeepPartialMap<LogsAlertFormType, ValidationErrorType>
+    alertFormHasErrors: boolean
+    alertFormManualErrors: Record<string, any>
+    alertFormTouched: boolean
+    alertFormTouches: Record<string, boolean>
+    alertFormValidationErrors: DeepPartialMap<LogsAlertFormType, ValidationErrorType>
+    isAlertFormSubmitting: boolean
+    isAlertFormValid: boolean
+    isEditing: boolean
+    isSimulationPanelOpen: boolean
+    showAlertFormErrors: boolean
+    simulationDateFrom: string
+    simulationResult: LogsAlertSimulateResponseApi | null
+    simulationResultLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsAlertFormLogicActions {
+    createPendingHogFunctions: (alertId: string) => {
+        alertId: string
+    } // logsAlertNotificationLogic
+    loadAlerts: () => any // logsAlertingLogic
+    setEditingAlert: (alert: LogsAlertConfigurationApi | null) => {
+        alert: LogsAlertConfigurationApi | null
+    } // logsAlertingLogic
+    setIsCreating: (isCreating: boolean) => {
+        isCreating: boolean
+    } // logsAlertingLogic
+    clearSimulation: () => {
+        value: true
+    }
+    clearSimulationFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    clearSimulationSuccess: (
+        simulationResult: null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        simulationResult: null
+        payload?: {
+            value: true
+        }
+    }
+    closeSimulationPanel: () => {
+        value: true
+    }
+    openSimulationPanel: () => {
+        value: true
+    }
+    resetAlertForm: (values?: LogsAlertFormType) => {
+        values?: LogsAlertFormType
+    }
+    setAlertFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setAlertFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setAlertFormValues: (values: DeepPartial<LogsAlertFormType>) => {
+        values: DeepPartial<LogsAlertFormType>
+    }
+    setSimulationDateFrom: (dateFrom: string) => {
+        dateFrom: string
+    }
+    simulateAlert: () => {
+        value: true
+    }
+    simulateAlertFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    simulateAlertSuccess: (
+        simulationResult: LogsAlertSimulateResponseApi | null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        simulationResult: LogsAlertSimulateResponseApi | null
+        payload?: {
+            value: true
+        }
+    }
+    submitAlertForm: () => {
+        value: boolean
+    }
+    submitAlertFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitAlertFormRequest: (alertForm: LogsAlertFormType) => {
+        alertForm: LogsAlertFormType
+    }
+    submitAlertFormSuccess: (alertForm: LogsAlertFormType) => {
+        alertForm: LogsAlertFormType
+    }
+    touchAlertFormField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsAlertFormLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        isEditing: (arg: any) => boolean
+    }
+}
+
+export type logsAlertFormLogicType = MakeLogicType<
+    logsAlertFormLogicValues,
+    logsAlertFormLogicActions,
+    LogsAlertFormLogicProps,
+    logsAlertFormLogicMeta
+>
+
 export const logsAlertFormLogic = kea<logsAlertFormLogicType>([
     path(['products', 'logs', 'frontend', 'components', 'LogsAlerting', 'logsAlertFormLogic']),
     props({} as LogsAlertFormLogicProps),
diff --git a/products/logs/frontend/components/LogsAlerting/logsAlertNotificationLogic.ts b/products/logs/frontend/components/LogsAlerting/logsAlertNotificationLogic.ts
index d2211028261c..5d6cfab9b399 100644
--- a/products/logs/frontend/components/LogsAlerting/logsAlertNotificationLogic.ts
+++ b/products/logs/frontend/components/LogsAlerting/logsAlertNotificationLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -10,7 +10,7 @@ import { HogFunctionType, IntegrationType } from '~/types'
 
 import { logsAlertsDestinationsCreate, logsAlertsDestinationsDeleteCreate } from 'products/logs/frontend/generated/api'
 
-import type { logsAlertNotificationLogicType } from './logsAlertNotificationLogicType'
+import type { UserBasicType } from '../../../../../frontend/src/types'
 import {
     buildLogsAlertFilterConfig,
     groupLogsAlertDestinations,
@@ -32,6 +32,184 @@ export interface LogsAlertNotificationLogicProps {
     alertId?: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsAlertNotificationLogicValues {
+    slackIntegrations: IntegrationType[] | undefined // integrationsLogic
+    currentProjectId: number | null // projectLogic
+    destinationGroups: LogsAlertDestinationGroup[]
+    existingHogFunctions: HogFunctionType[]
+    existingHogFunctionsLoading: boolean
+    firstSlackIntegration: IntegrationType | undefined
+    pendingNotifications: PendingLogsAlertNotification[]
+    selectedType: LogsAlertNotificationType
+    slackChannelValue: string | null
+    webhookUrl: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsAlertNotificationLogicActions {
+    loadIntegrationsSuccess: (
+        integrations: {
+            config: any
+            created_at: string
+            created_by?: UserBasicType | null | undefined
+            display_name: string
+            errors?: string | undefined
+            icon_url: any
+            id: number
+            kind:
+                | 'apns'
+                | 'aws-s3'
+                | 'azure-blob'
+                | 'bing-ads'
+                | 'clickup'
+                | 'customerio-app'
+                | 'customerio-track'
+                | 'customerio-webhook'
+                | 'databricks'
+                | 'email'
+                | 'firebase'
+                | 'github'
+                | 'gitlab'
+                | 'google-ads'
+                | 'google-analytics'
+                | 'google-cloud-service-account'
+                | 'google-cloud-storage'
+                | 'google-pubsub'
+                | 'google-search-console'
+                | 'google-sheets'
+                | 'hubspot'
+                | 'intercom'
+                | 'jira'
+                | 'linear'
+                | 'linkedin-ads'
+                | 'meta-ads'
+                | 'pinterest-ads'
+                | 'postgresql'
+                | 'reddit-ads'
+                | 's3-compatible'
+                | 'salesforce'
+                | 'slack'
+                | 'snapchat'
+                | 'stripe'
+                | 'tiktok-ads'
+                | 'twilio'
+                | 'vercel'
+        }[],
+        payload?: any
+    ) => {
+        integrations: {
+            config: any
+            created_at: string
+            created_by?: UserBasicType | null | undefined
+            display_name: string
+            errors?: string | undefined
+            icon_url: any
+            id: number
+            kind:
+                | 'apns'
+                | 'aws-s3'
+                | 'azure-blob'
+                | 'bing-ads'
+                | 'clickup'
+                | 'customerio-app'
+                | 'customerio-track'
+                | 'customerio-webhook'
+                | 'databricks'
+                | 'email'
+                | 'firebase'
+                | 'github'
+                | 'gitlab'
+                | 'google-ads'
+                | 'google-analytics'
+                | 'google-cloud-service-account'
+                | 'google-cloud-storage'
+                | 'google-pubsub'
+                | 'google-search-console'
+                | 'google-sheets'
+                | 'hubspot'
+                | 'intercom'
+                | 'jira'
+                | 'linear'
+                | 'linkedin-ads'
+                | 'meta-ads'
+                | 'pinterest-ads'
+                | 'postgresql'
+                | 'reddit-ads'
+                | 's3-compatible'
+                | 'salesforce'
+                | 'slack'
+                | 'snapchat'
+                | 'stripe'
+                | 'tiktok-ads'
+                | 'twilio'
+                | 'vercel'
+        }[]
+        payload?: any
+    } // integrationsLogic
+    addPendingNotification: (notification: PendingLogsAlertNotification) => {
+        notification: PendingLogsAlertNotification
+    }
+    clearPendingNotifications: () => {
+        value: true
+    }
+    createPendingHogFunctions: (alertId: string) => {
+        alertId: string
+    }
+    deleteExistingDestination: (group: LogsAlertDestinationGroup) => {
+        group: LogsAlertDestinationGroup
+    }
+    destinationsChanged: () => {
+        value: true
+    }
+    loadExistingHogFunctions: (alertId?: string) => string
+    loadExistingHogFunctionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadExistingHogFunctionsSuccess: (
+        existingHogFunctions: HogFunctionType[],
+        payload?: string
+    ) => {
+        existingHogFunctions: HogFunctionType[]
+        payload?: string
+    }
+    removePendingNotification: (index: number) => {
+        index: number
+    }
+    setPendingNotifications: (notifications: PendingLogsAlertNotification[]) => {
+        notifications: PendingLogsAlertNotification[]
+    }
+    setSelectedType: (selectedType: LogsAlertNotificationType) => {
+        selectedType: LogsAlertNotificationType
+    }
+    setSlackChannelValue: (slackChannelValue: string | null) => {
+        slackChannelValue: string | null
+    }
+    setWebhookUrl: (webhookUrl: string) => {
+        webhookUrl: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsAlertNotificationLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        firstSlackIntegration: (slackIntegrations: IntegrationType[] | undefined) => IntegrationType | undefined
+        destinationGroups: (existingHogFunctions: HogFunctionType[]) => LogsAlertDestinationGroup[]
+    }
+}
+
+export type logsAlertNotificationLogicType = MakeLogicType<
+    logsAlertNotificationLogicValues,
+    logsAlertNotificationLogicActions,
+    LogsAlertNotificationLogicProps,
+    logsAlertNotificationLogicMeta
+>
+
 export const logsAlertNotificationLogic = kea<logsAlertNotificationLogicType>([
     path(['products', 'logs', 'frontend', 'components', 'LogsAlerting', 'logsAlertNotificationLogic']),
     props({} as LogsAlertNotificationLogicProps),
diff --git a/products/logs/frontend/components/LogsAlerting/logsAlertingLogic.ts b/products/logs/frontend/components/LogsAlerting/logsAlertingLogic.ts
index c2cc37c13f4b..0800ede1d0d1 100644
--- a/products/logs/frontend/components/LogsAlerting/logsAlertingLogic.ts
+++ b/products/logs/frontend/components/LogsAlerting/logsAlertingLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 
@@ -17,11 +17,84 @@ import {
 } from 'products/logs/frontend/generated/api'
 import { LogsAlertConfigurationApi } from 'products/logs/frontend/generated/api.schemas'
 
-import type { logsAlertingLogicType } from './logsAlertingLogicType'
 import { alertFiltersForPreEnableCheck, dispatchPreEnableCheck, runPreEnableChecks } from './logsAlertUtils'
 
 const ALERT_POLL_INTERVAL_MS = 30_000
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsAlertingLogicValues {
+    currentTeamId: number | null // teamLogic
+    alerts: LogsAlertConfigurationApi[]
+    alertsLoading: boolean
+    creatingAlert: boolean
+    editingAlert: LogsAlertConfigurationApi | null
+    isCreating: boolean
+    resettingAlertIds: Set<string>
+    viewingHistoryAlert: LogsAlertConfigurationApi | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsAlertingLogicActions {
+    createAlertAndOpen: () => {
+        value: true
+    }
+    deleteAlert: (id: string) => {
+        id: string
+    }
+    loadAlerts: () => any
+    loadAlertsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAlertsSuccess: (
+        alerts: LogsAlertConfigurationApi[],
+        payload?: any
+    ) => {
+        alerts: LogsAlertConfigurationApi[]
+        payload?: any
+    }
+    resetAlert: (id: string) => {
+        id: string
+    }
+    setCreatingAlert: (creating: boolean) => {
+        creating: boolean
+    }
+    setEditingAlert: (alert: LogsAlertConfigurationApi | null) => {
+        alert: LogsAlertConfigurationApi | null
+    }
+    setIsCreating: (isCreating: boolean) => {
+        isCreating: boolean
+    }
+    setResettingAlertId: (
+        id: string,
+        resetting: boolean
+    ) => {
+        id: string
+        resetting: boolean
+    }
+    setViewingHistoryAlert: (alert: LogsAlertConfigurationApi | null) => {
+        alert: LogsAlertConfigurationApi | null
+    }
+    snoozeAlert: (
+        alertId: string,
+        durationMinutes: number
+    ) => {
+        alertId: string
+        durationMinutes: number
+    }
+    toggleAlertEnabled: (alert: LogsAlertConfigurationApi) => {
+        alert: LogsAlertConfigurationApi
+    }
+    unsnoozeAlert: (alertId: string) => {
+        alertId: string
+    }
+}
+
+export type logsAlertingLogicType = MakeLogicType<logsAlertingLogicValues, logsAlertingLogicActions>
+
 export const logsAlertingLogic = kea<logsAlertingLogicType>([
     path(['products', 'logs', 'frontend', 'components', 'LogsAlerting', 'logsAlertingLogic']),
 
diff --git a/products/logs/frontend/components/LogsGroupBy/logsGroupByLogic.ts b/products/logs/frontend/components/LogsGroupBy/logsGroupByLogic.ts
index 934739802b69..c64c75c3833f 100644
--- a/products/logs/frontend/components/LogsGroupBy/logsGroupByLogic.ts
+++ b/products/logs/frontend/components/LogsGroupBy/logsGroupByLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { teamLogic } from 'scenes/teamLogic'
@@ -13,7 +13,10 @@ import type {
     OrderGroupsByEnumApi,
 } from 'products/logs/frontend/generated/api.schemas'
 
-import type { logsGroupByLogicType } from './logsGroupByLogicType'
+import type { DateRange, LogSeverityLevel } from '../../../../../frontend/src/queries/schema/schema-general'
+import type { UniversalFiltersGroup } from '../../../../../frontend/src/types'
+import type { LogsViewerGroupBy } from '../LogsViewer/config/logsViewerConfigLogic'
+import type { LogsViewerFilters } from '../LogsViewer/config/types'
 
 export interface LogsGroupByLogicProps {
     id: string
@@ -26,6 +29,79 @@ const EMPTY_RESPONSE: _LogsGroupByResponseApi = {
     truncated: false,
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsGroupByLogicValues {
+    groupBy: LogsViewerGroupBy | null; // logsViewerConfigLogic
+    filters: LogsViewerFilters; // logsViewerFiltersLogic
+    queryFilterGroup: UniversalFiltersGroup; // logsViewerFiltersLogic
+    utcDateRange: {
+        date_from: string | null | undefined;
+        date_to: string | null | undefined;
+        explicitDate: boolean | null | undefined;
+    }; // logsViewerFiltersLogic
+    currentTeamId: number | null; // teamLogic
+    groupByError: string | null;
+    groupByResponse: _LogsGroupByResponseApi;
+    groupByResponseLoading: boolean;
+    groups: _LogsGroupByGroupApi[];
+    orderGroupsBy: OrderGroupsByEnumApi;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsGroupByLogicActions {
+    setGroupBy: (groupBy: LogsViewerGroupBy | null) => {
+        groupBy: LogsViewerGroupBy | null;
+    }; // logsViewerConfigLogic
+    setDateRange: (dateRange: DateRange) => {
+        dateRange: DateRange;
+    }; // logsViewerFiltersLogic
+    setFilterGroup: (filterGroup: UniversalFiltersGroup, openFilterOnInsert?: boolean | undefined) => {
+        filterGroup: UniversalFiltersGroup;
+        openFilterOnInsert: boolean;
+    }; // logsViewerFiltersLogic
+    setFilters: (filters: Partial<LogsViewerFilters>, pushToHistory?: boolean | undefined) => {
+        filters: Partial<LogsViewerFilters>;
+        pushToHistory: boolean;
+    }; // logsViewerFiltersLogic
+    setPinnedFilters: (pinnedFilters: UniversalFiltersGroup | undefined) => {
+        pinnedFilters: UniversalFiltersGroup | undefined;
+    }; // logsViewerFiltersLogic
+    setSearchTerm: (searchTerm: string | undefined) => {
+        searchTerm: string | undefined;
+    }; // logsViewerFiltersLogic
+    setServiceNames: (serviceNames: string[]) => {
+        serviceNames: string[];
+    }; // logsViewerFiltersLogic
+    setSeverityLevels: (severityLevels: LogSeverityLevel[]) => {
+        severityLevels: LogSeverityLevel[];
+    }; // logsViewerFiltersLogic
+    zoomDateRange: (multiplier: number) => {
+        multiplier: number;
+    }; // logsViewerFiltersLogic
+    loadGroups: (debounceMs?: number) => number;
+    loadGroupsFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadGroupsSuccess: (groupByResponse: _LogsGroupByResponseApi, payload?: number) => {
+        groupByResponse: _LogsGroupByResponseApi;
+        payload?: number;
+    };
+    setOrderGroupsBy: (orderGroupsBy: OrderGroupsByEnumApi) => {
+        orderGroupsBy: OrderGroupsByEnumApi;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsGroupByLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        groups: (groupByResponse: _LogsGroupByResponseApi, groupByError: string | null) => _LogsGroupByGroupApi[];
+    };
+}
+
+export type logsGroupByLogicType = MakeLogicType<logsGroupByLogicValues, logsGroupByLogicActions, LogsGroupByLogicProps, logsGroupByLogicMeta>;
+
 // Keyed by the Viewer's `id`: the logic mounts only while a grouping key is active (the
 // Viewer conditionally renders <LogsGroupByResults/>), so loading on mount + reloading on
 // the shared filter actions never runs the aggregation while the user is in plain Logs mode.
diff --git a/products/logs/frontend/components/LogsPatterns/logsPatternsLogic.ts b/products/logs/frontend/components/LogsPatterns/logsPatternsLogic.ts
index 40f5caca0e40..fbd519150a8e 100644
--- a/products/logs/frontend/components/LogsPatterns/logsPatternsLogic.ts
+++ b/products/logs/frontend/components/LogsPatterns/logsPatternsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { dayjs } from 'lib/dayjs'
@@ -24,7 +24,9 @@ import type {
     _LogsPatternsResponseApi,
 } from 'products/logs/frontend/generated/api.schemas'
 
-import type { logsPatternsLogicType } from './logsPatternsLogicType'
+import type { DateRange, LogSeverityLevel } from '../../../../../frontend/src/queries/schema/schema-general'
+import type { LogsViewerViewMode, PatternsBaselineMode } from '../LogsViewer/config/logsViewerConfigLogic'
+import type { LogsViewerFilters } from '../LogsViewer/config/types'
 
 export interface LogsPatternsLogicProps {
     id: string
@@ -66,6 +68,128 @@ const EMPTY_RESPONSE: _LogsPatternsResponseApi = {
     sparkline_buckets: [],
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsPatternsLogicValues {
+    baselineMode: PatternsBaselineMode; // logsViewerConfigLogic
+    compareEnabled: boolean; // logsViewerConfigLogic
+    viewMode: LogsViewerViewMode; // logsViewerConfigLogic
+    filters: LogsViewerFilters; // logsViewerFiltersLogic
+    queryFilterGroup: UniversalFiltersGroup; // logsViewerFiltersLogic
+    utcDateRange: {
+        date_from: string | null | undefined;
+        date_to: string | null | undefined;
+        explicitDate: boolean | null | undefined;
+    }; // logsViewerFiltersLogic
+    currentTeamId: number | null; // teamLogic
+    diffError: string | null;
+    diffResponse: _LogsPatternsDiffResponseApi | null;
+    diffResponseLoading: boolean;
+    mineError: string | null;
+    patterns: _LogPatternApi[];
+    patternsError: string | null;
+    patternsQueryBody: {
+        dateRange: {
+            date_from: string | null | undefined;
+            date_to: string | null | undefined;
+            explicitDate: boolean | null | undefined;
+        };
+        filterGroup: _LogPropertyFilterApi[];
+        searchTerm: string | undefined;
+        serviceNames: string[];
+        severityLevels: LogSeverityLevel[];
+    };
+    patternsResponse: _LogsPatternsResponseApi;
+    patternsResponseLoading: boolean;
+    sparklineLabels: string[];
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsPatternsLogicActions {
+    setBaselineMode: (mode: PatternsBaselineMode) => {
+        mode: PatternsBaselineMode;
+    }; // logsViewerConfigLogic
+    setCompareEnabled: (enabled: boolean) => {
+        enabled: boolean;
+    }; // logsViewerConfigLogic
+    setViewMode: (viewMode: LogsViewerViewMode) => {
+        viewMode: LogsViewerViewMode;
+    }; // logsViewerConfigLogic
+    setDateRange: (dateRange: DateRange) => {
+        dateRange: DateRange;
+    }; // logsViewerFiltersLogic
+    setFilterGroup: (filterGroup: UniversalFiltersGroup, openFilterOnInsert?: boolean | undefined) => {
+        filterGroup: UniversalFiltersGroup;
+        openFilterOnInsert: boolean;
+    }; // logsViewerFiltersLogic
+    setFilters: (filters: Partial<LogsViewerFilters>, pushToHistory?: boolean | undefined) => {
+        filters: Partial<LogsViewerFilters>;
+        pushToHistory: boolean;
+    }; // logsViewerFiltersLogic
+    setPinnedFilters: (pinnedFilters: UniversalFiltersGroup | undefined) => {
+        pinnedFilters: UniversalFiltersGroup | undefined;
+    }; // logsViewerFiltersLogic
+    setSearchTerm: (searchTerm: string | undefined) => {
+        searchTerm: string | undefined;
+    }; // logsViewerFiltersLogic
+    setServiceNames: (serviceNames: string[]) => {
+        serviceNames: string[];
+    }; // logsViewerFiltersLogic
+    setSeverityLevels: (severityLevels: LogSeverityLevel[]) => {
+        severityLevels: LogSeverityLevel[];
+    }; // logsViewerFiltersLogic
+    zoomDateRange: (multiplier: number) => {
+        multiplier: number;
+    }; // logsViewerFiltersLogic
+    loadDiff: (debounceMs?: number) => number;
+    loadDiffFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadDiffSuccess: (diffResponse: _LogsPatternsDiffResponseApi, payload?: number) => {
+        diffResponse: _LogsPatternsDiffResponseApi;
+        payload?: number;
+    };
+    loadPatterns: (debounceMs?: number) => number;
+    loadPatternsFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadPatternsSuccess: (patternsResponse: _LogsPatternsResponseApi, payload?: number) => {
+        patternsResponse: _LogsPatternsResponseApi;
+        payload?: number;
+    };
+    viewMatchingLogs: (pattern: _LogPatternApi) => {
+        pattern: _LogPatternApi;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsPatternsLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        patternsError: (compareEnabled: boolean, mineError: string | null, diffError: string | null) => string | null;
+        patternsQueryBody: (filters: LogsViewerFilters, utcDateRange: {
+            date_from: string | null | undefined;
+            date_to: string | null | undefined;
+            explicitDate: boolean | null | undefined;
+        }, queryFilterGroup: UniversalFiltersGroup) => {
+            dateRange: {
+                date_from: string | null | undefined;
+                date_to: string | null | undefined;
+                explicitDate: boolean | null | undefined;
+            };
+            filterGroup: _LogPropertyFilterApi[];
+            searchTerm: string | undefined;
+            serviceNames: string[];
+            severityLevels: LogSeverityLevel[];
+        };
+        patterns: (patternsResponse: _LogsPatternsResponseApi) => _LogPatternApi[];
+        sparklineLabels: (patternsResponse: _LogsPatternsResponseApi) => string[];
+    };
+}
+
+export type logsPatternsLogicType = MakeLogicType<logsPatternsLogicValues, logsPatternsLogicActions, LogsPatternsLogicProps, logsPatternsLogicMeta>;
+
 // Keyed by the Viewer's `id`: the logic mounts only while the Patterns mode is active (the
 // Viewer conditionally renders <LogsPatterns/>), so loading on mount + reloading on the
 // shared filter actions never runs the heavier patterns query while the user is in Logs mode.
@@ -174,7 +298,15 @@ export const logsPatternsLogic = kea<logsPatternsLogicType>([
         // silently answer a different question than the table next to it.
         patternsQueryBody: [
             (s) => [s.filters, s.utcDateRange, s.queryFilterGroup],
-            (filters, utcDateRange, queryFilterGroup) => ({
+            (
+                filters: import('../LogsViewer/config/types').LogsViewerFilters,
+                utcDateRange: {
+                    date_from: string | null | undefined
+                    date_to: string | null | undefined
+                    explicitDate: boolean | null | undefined
+                },
+                queryFilterGroup: UniversalFiltersGroup
+            ) => ({
                 dateRange: utcDateRange,
                 severityLevels: filters.severityLevels,
                 serviceNames: filters.serviceNames,
diff --git a/products/logs/frontend/components/LogsSampling/logsSamplingFormLogic.ts b/products/logs/frontend/components/LogsSampling/logsSamplingFormLogic.ts
index 7c623cf0e195..45acb7bea27d 100644
--- a/products/logs/frontend/components/LogsSampling/logsSamplingFormLogic.ts
+++ b/products/logs/frontend/components/LogsSampling/logsSamplingFormLogic.ts
@@ -1,5 +1,6 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 
@@ -18,8 +19,6 @@ import {
 } from 'products/logs/frontend/generated/api.schemas'
 import { logsDropRulesSettingsUrl } from 'products/logs/frontend/logsDropRulesSettingsUrl'
 
-import type { logsSamplingFormLogicType } from './logsSamplingFormLogicType'
-
 const EMPTY_FILTER_GROUP: UniversalFiltersGroup = {
     type: FilterLogicalOperator.And,
     values: [],
@@ -165,6 +164,115 @@ export interface LogsSamplingFormLogicProps {
     rule: LogsSamplingRuleApi | null
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsSamplingFormLogicValues {
+    currentTeamId: number | null // teamLogic
+    filterPreview:
+        | {
+              bytes_uncompressed?: number
+              count: number
+              service: string
+              time: string
+          }[]
+        | null
+    filterPreviewLoading: boolean
+    isSamplingFormSubmitting: boolean
+    isSamplingFormValid: boolean
+    samplingForm: LogsSamplingFormType
+    samplingFormAllErrors: Record<string, any>
+    samplingFormChanged: boolean
+    samplingFormErrors: DeepPartialMap<LogsSamplingFormType, ValidationErrorType>
+    samplingFormHasErrors: boolean
+    samplingFormManualErrors: Record<string, any>
+    samplingFormTouched: boolean
+    samplingFormTouches: Record<string, boolean>
+    samplingFormValidationErrors: DeepPartialMap<LogsSamplingFormType, ValidationErrorType>
+    showSamplingFormErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsSamplingFormLogicActions {
+    loadFilterPreview: (_: any) => any
+    loadFilterPreviewFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadFilterPreviewSuccess: (
+        filterPreview:
+            | {
+                  bytes_uncompressed?: number | undefined
+                  count: number
+                  service: string
+                  time: string
+              }[]
+            | null,
+        payload?: any
+    ) => {
+        filterPreview:
+            | {
+                  bytes_uncompressed?: number | undefined
+                  count: number
+                  service: string
+                  time: string
+              }[]
+            | null
+        payload?: any
+    }
+    refreshFilterPreview: () => {
+        value: true
+    }
+    resetSamplingForm: (values?: LogsSamplingFormType) => {
+        values?: LogsSamplingFormType
+    }
+    setSamplingFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setSamplingFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setSamplingFormValues: (values: DeepPartial<LogsSamplingFormType>) => {
+        values: DeepPartial<LogsSamplingFormType>
+    }
+    submitSamplingForm: () => {
+        value: boolean
+    }
+    submitSamplingFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitSamplingFormRequest: (samplingForm: LogsSamplingFormType) => {
+        samplingForm: LogsSamplingFormType
+    }
+    submitSamplingFormSuccess: (samplingForm: LogsSamplingFormType) => {
+        samplingForm: LogsSamplingFormType
+    }
+    touchSamplingFormField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsSamplingFormLogicMeta {
+    key: string
+}
+
+export type logsSamplingFormLogicType = MakeLogicType<
+    logsSamplingFormLogicValues,
+    logsSamplingFormLogicActions,
+    LogsSamplingFormLogicProps,
+    logsSamplingFormLogicMeta
+>
+
 export const logsSamplingFormLogic = kea<logsSamplingFormLogicType>([
     path(['products', 'logs', 'frontend', 'components', 'LogsSampling', 'logsSamplingFormLogic']),
     props({} as LogsSamplingFormLogicProps),
diff --git a/products/logs/frontend/components/LogsSampling/logsSamplingSectionLogic.ts b/products/logs/frontend/components/LogsSampling/logsSamplingSectionLogic.ts
index 464bfc362c25..b2454f4dcbba 100644
--- a/products/logs/frontend/components/LogsSampling/logsSamplingSectionLogic.ts
+++ b/products/logs/frontend/components/LogsSampling/logsSamplingSectionLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -12,7 +12,6 @@ import {
 } from 'products/logs/frontend/generated/api'
 import { LogsSamplingRuleApi } from 'products/logs/frontend/generated/api.schemas'
 
-import type { logsSamplingSectionLogicType } from './logsSamplingSectionLogicType'
 import { type SamplingRuleDropTotals, fetchSamplingRuleDropTotalsLast24h } from './samplingRuleDropImpact'
 
 // Background refresh cadence for the per-rule 24h drop counts. The underlying
@@ -21,6 +20,87 @@ import { type SamplingRuleDropTotals, fetchSamplingRuleDropTotalsLast24h } from
 // HogQL. The disposables plugin pauses the timer while the tab is hidden.
 const IMPACT_POLL_INTERVAL_MS = 30_000
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsSamplingSectionLogicValues {
+    currentTeamId: number | null // teamLogic
+    ruleDropImpact: Record<string, SamplingRuleDropTotals>
+    ruleDropImpactCellState: 'error' | 'loading' | 'ok' | 'unknown'
+    ruleDropImpactLoading: boolean
+    ruleDropImpactStatus: 'error' | 'idle' | 'loading' | 'ok'
+    ruleEnabledTogglePendingId: string | null
+    rules: LogsSamplingRuleApi[]
+    rulesLoading: boolean
+    saveRulesOrderPending: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsSamplingSectionLogicActions {
+    loadRuleDropImpact: (_: any) => any
+    loadRuleDropImpactFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRuleDropImpactSuccess: (
+        ruleDropImpact: Record<string, SamplingRuleDropTotals>,
+        payload?: any
+    ) => {
+        ruleDropImpact: Record<string, SamplingRuleDropTotals>
+        payload?: any
+    }
+    loadRules: () => any
+    loadRulesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRulesSuccess: (
+        rules: LogsSamplingRuleApi[],
+        payload?: any
+    ) => {
+        rules: LogsSamplingRuleApi[]
+        payload?: any
+    }
+    saveRulesOrder: (orderedIds: string[]) => {
+        orderedIds: string[]
+    }
+    saveRulesOrderFinished: () => {
+        value: true
+    }
+    setRuleEnabled: (
+        ruleId: string,
+        enabled: boolean
+    ) => {
+        enabled: boolean
+        ruleId: string
+    }
+    setRuleEnabledFinished: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsSamplingSectionLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        ruleDropImpactCellState: (
+            ruleDropImpactStatus: 'error' | 'idle' | 'loading' | 'ok',
+            ruleDropImpactLoading: boolean,
+            rules: LogsSamplingRuleApi[]
+        ) => 'error' | 'loading' | 'ok' | 'unknown'
+    }
+}
+
+export type logsSamplingSectionLogicType = MakeLogicType<
+    logsSamplingSectionLogicValues,
+    logsSamplingSectionLogicActions,
+    Record<string, any>,
+    logsSamplingSectionLogicMeta
+>
+
 export const logsSamplingSectionLogic = kea<logsSamplingSectionLogicType>([
     path(['products', 'logs', 'frontend', 'components', 'LogsSampling', 'logsSamplingSectionLogic']),
 
diff --git a/products/logs/frontend/components/LogsServices/logsServicesLogic.ts b/products/logs/frontend/components/LogsServices/logsServicesLogic.ts
index 8c54a5c796dc..835a15fa68cc 100644
--- a/products/logs/frontend/components/LogsServices/logsServicesLogic.ts
+++ b/products/logs/frontend/components/LogsServices/logsServicesLogic.ts
@@ -1,12 +1,10 @@
-import { actions, afterMount, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
 
 import { FilterLogicalOperator } from '~/types'
 
-import type { logsServicesLogicType } from './logsServicesLogicType'
-
 export interface ServiceRow {
     service_name: string
     log_count: number
@@ -37,6 +35,144 @@ export interface ServicesResponse {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsServicesLogicValues {
+    dateFrom: string
+    services: ServiceRow[]
+    servicesData: ServicesResponse
+    servicesDataLoading: boolean
+    servicesSummary:
+        | {
+              top_services_count: number
+              top_services_volume_share_pct: number
+          }
+        | undefined
+    sparklineByService: Record<
+        string,
+        {
+            labels: string[]
+            values: number[]
+        }
+    >
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsServicesLogicActions {
+    loadServicesData: () => any
+    loadServicesDataFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadServicesDataSuccess: (
+        servicesData: {
+            services: {
+                active_rules?:
+                    | {
+                          rule_id: string
+                          rule_name: string
+                          summary_string: string
+                      }[]
+                    | undefined
+                error_count: number
+                error_rate: number
+                log_count: number
+                service_name: string
+                severity_breakdown?:
+                    | {
+                          debug: number
+                          error: number
+                          info: number
+                          warn: number
+                      }
+                    | undefined
+                volume_share_pct?: number | undefined
+            }[]
+            sparkline: {
+                count: number
+                service_name: string
+                time: string
+            }[]
+            summary?:
+                | {
+                      top_services_count: number
+                      top_services_volume_share_pct: number
+                  }
+                | undefined
+        },
+        payload?: any
+    ) => {
+        servicesData: {
+            services: {
+                active_rules?:
+                    | {
+                          rule_id: string
+                          rule_name: string
+                          summary_string: string
+                      }[]
+                    | undefined
+                error_count: number
+                error_rate: number
+                log_count: number
+                service_name: string
+                severity_breakdown?:
+                    | {
+                          debug: number
+                          error: number
+                          info: number
+                          warn: number
+                      }
+                    | undefined
+                volume_share_pct?: number | undefined
+            }[]
+            sparkline: {
+                count: number
+                service_name: string
+                time: string
+            }[]
+            summary?:
+                | {
+                      top_services_count: number
+                      top_services_volume_share_pct: number
+                  }
+                | undefined
+        }
+        payload?: any
+    }
+    setDateFrom: (dateFrom: string) => {
+        dateFrom: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsServicesLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        services: (servicesData: ServicesResponse) => ServiceRow[]
+        servicesSummary: (servicesData: ServicesResponse) =>
+            | {
+                  top_services_count: number
+                  top_services_volume_share_pct: number
+              }
+            | undefined
+        sparklineByService: (servicesData: ServicesResponse) => Record<
+            string,
+            {
+                labels: string[]
+                values: number[]
+            }
+        >
+    }
+}
+
+export type logsServicesLogicType = MakeLogicType<
+    logsServicesLogicValues,
+    logsServicesLogicActions,
+    Record<string, any>,
+    logsServicesLogicMeta
+>
+
 export const logsServicesLogic = kea<logsServicesLogicType>([
     path(['products', 'logs', 'frontend', 'components', 'LogsServices', 'logsServicesLogic']),
 
diff --git a/products/logs/frontend/components/LogsSqlEditor/logsSqlEditorTrackingLogic.ts b/products/logs/frontend/components/LogsSqlEditor/logsSqlEditorTrackingLogic.ts
index 212a3861ec17..78613dbcdb6c 100644
--- a/products/logs/frontend/components/LogsSqlEditor/logsSqlEditorTrackingLogic.ts
+++ b/products/logs/frontend/components/LogsSqlEditor/logsSqlEditorTrackingLogic.ts
@@ -1,12 +1,10 @@
-import { connect, kea, key, listeners, path, props } from 'kea'
+import { MakeLogicType, connect, kea, key, listeners, path, props } from 'kea'
 import posthog from 'posthog-js'
 
 import { SaveAsMenuItem } from 'scenes/data-warehouse/editor/editorSceneLogic'
 import { sqlEditorLogic } from 'scenes/data-warehouse/editor/sqlEditorLogic'
 import { SQLEditorMode } from 'scenes/data-warehouse/editor/sqlEditorModes'
 
-import type { logsSqlEditorTrackingLogicType } from './logsSqlEditorTrackingLogicType'
-
 export interface LogsSqlEditorTrackingLogicProps {
     sqlEditorTabId: string
 }
@@ -15,6 +13,64 @@ const captureSaved = (target: SaveAsMenuItem['action']): void => {
     posthog.capture('logs sql query saved', { target })
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsSqlEditorTrackingLogicActions {
+    sqlEditorRunQuery: (
+        queryOverride?: string | undefined,
+        switchTab?: boolean | undefined
+    ) => {
+        queryOverride: string | undefined
+        switchTab: boolean | undefined
+    } // sqlEditorLogic
+    sqlEditorSaveAsEndpointSubmit: (
+        name: string,
+        description?: string | undefined,
+        queryOverride?: string | undefined,
+        dagId?: string | undefined
+    ) => {
+        dagId: string | undefined
+        description: string | undefined
+        name: string
+        queryOverride: string | undefined
+    } // sqlEditorLogic
+    sqlEditorSaveAsInsightSubmit: (
+        name: string,
+        queryOverride?: string | undefined
+    ) => {
+        name: string
+        queryOverride: string | undefined
+    } // sqlEditorLogic
+    sqlEditorSaveAsViewSubmit: (
+        name: string,
+        materializeAfterSave?: any,
+        fromDraft?: string | undefined,
+        dagId?: string | undefined,
+        folderId?: string | null | undefined,
+        isTest?: any,
+        queryOverride?: string | undefined
+    ) => {
+        dagId: string | undefined
+        folderId: string | null | undefined
+        fromDraft: string | undefined
+        isTest: any
+        materializeAfterSave: any
+        name: string
+        queryOverride: string | undefined
+    } // sqlEditorLogic
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsSqlEditorTrackingLogicMeta {
+    key: string
+}
+
+export type logsSqlEditorTrackingLogicType = MakeLogicType<
+    {},
+    logsSqlEditorTrackingLogicActions,
+    LogsSqlEditorTrackingLogicProps,
+    logsSqlEditorTrackingLogicMeta
+>
+
 export const logsSqlEditorTrackingLogic = kea<logsSqlEditorTrackingLogicType>([
     path(['products', 'logs', 'frontend', 'components', 'LogsSqlEditor', 'logsSqlEditorTrackingLogic']),
     props({} as LogsSqlEditorTrackingLogicProps),
diff --git a/products/logs/frontend/components/LogsViewer/FacetRail/facetCountsLogic.ts b/products/logs/frontend/components/LogsViewer/FacetRail/facetCountsLogic.ts
index b1e397bcb28f..271e21eb6a9b 100644
--- a/products/logs/frontend/components/LogsViewer/FacetRail/facetCountsLogic.ts
+++ b/products/logs/frontend/components/LogsViewer/FacetRail/facetCountsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { subscriptions } from 'kea-subscriptions'
 
@@ -10,7 +10,7 @@ import { logsViewerFiltersLogic } from 'products/logs/frontend/components/LogsVi
 
 import { logsAttributesRetrieve, logsFacetValuesCreate } from '../../../generated/api'
 import { _LogFacetValueApi, _LogPropertyFilterApi, _LogsFacetValuesBodyApi } from '../../../generated/api.schemas'
-import type { facetCountsLogicType } from './facetCountsLogicType'
+import type { LogsViewerFilters } from '../config/types'
 import { FACETS, FacetConfig } from './facets'
 
 // Broad, filter-independent window for the "which resource attributes does this tenant emit" probe.
@@ -21,6 +21,74 @@ export interface FacetCountsLogicProps {
     id: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface facetCountsLogicValues {
+    filters: LogsViewerFilters; // logsViewerFiltersLogic
+    queryFilterGroup: UniversalFiltersGroup; // logsViewerFiltersLogic
+    utcDateRange: {
+        date_from: string | null | undefined;
+        date_to: string | null | undefined;
+        explicitDate: boolean | null | undefined;
+    }; // logsViewerFiltersLogic
+    currentTeamId: number | null; // teamLogic
+    facetSearch: Record<string, string>;
+    facetValues: Record<string, _LogFacetValueApi[]>;
+    facetValuesLoading: boolean;
+    loadingFacetKeys: string[];
+    loadingReloadKeys: string[];
+    loadingSearchKey: string | null;
+    presenceLoaded: boolean;
+    presentResourceKeys: string[];
+    presentResourceKeysLoading: boolean;
+    visibleFacets: FacetConfig[];
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface facetCountsLogicActions {
+    loadFacetValues: (facetKeys: string[] | null) => string[] | null;
+    loadFacetValuesFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadFacetValuesForKey: (facetKey: string) => string;
+    loadFacetValuesForKeyFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadFacetValuesForKeySuccess: (facetValues: Record<string, _LogFacetValueApi[]>, payload?: string) => {
+        facetValues: Record<string, _LogFacetValueApi[]>;
+        payload?: string;
+    };
+    loadFacetValuesSuccess: (facetValues: Record<string, _LogFacetValueApi[]>, payload?: string[] | null) => {
+        facetValues: Record<string, _LogFacetValueApi[]>;
+        payload?: string[] | null;
+    };
+    loadPresentResourceKeys: () => any;
+    loadPresentResourceKeysFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadPresentResourceKeysSuccess: (presentResourceKeys: string[], payload?: any) => {
+        presentResourceKeys: string[];
+        payload?: any;
+    };
+    setFacetSearch: (facetKey: string, search: string) => {
+        facetKey: string;
+        search: string;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface facetCountsLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        visibleFacets: (presentResourceKeys: string[]) => FacetConfig[];
+        loadingFacetKeys: (loadingReloadKeys: string[], loadingSearchKey: string | null) => string[];
+    };
+}
+
+export type facetCountsLogicType = MakeLogicType<facetCountsLogicValues, facetCountsLogicActions, FacetCountsLogicProps, facetCountsLogicMeta>;
+
 /**
  * Per-facet values + counts, cross-filtered server-side: each facet's results reflect every active
  * filter except its own selection (the backend excludes the facet's own column or resource-attribute
@@ -174,7 +242,7 @@ export const facetCountsLogic = kea<facetCountsLogicType>([
         // Column facets always render; resource-attribute facets only when the tenant emits the key.
         visibleFacets: [
             (s) => [s.presentResourceKeys],
-            (presentResourceKeys): FacetConfig[] =>
+            (presentResourceKeys: string[]): FacetConfig[] =>
                 FACETS.filter((f) => f.source.type === 'column' || presentResourceKeys.includes(f.source.key)),
         ],
         // Per-facet loading state. A filter-change reload and a per-facet search have independent
diff --git a/products/logs/frontend/components/LogsViewer/FacetRail/facetRailLogic.ts b/products/logs/frontend/components/LogsViewer/FacetRail/facetRailLogic.ts
index 49c0af06a3a3..0634c1d5e867 100644
--- a/products/logs/frontend/components/LogsViewer/FacetRail/facetRailLogic.ts
+++ b/products/logs/frontend/components/LogsViewer/FacetRail/facetRailLogic.ts
@@ -1,10 +1,10 @@
-import { actions, connect, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers } from 'kea'
 
 import { LogSeverityLevel } from '~/queries/schema/schema-general'
 
 import { logsViewerFiltersLogic } from 'products/logs/frontend/components/LogsViewer/Filters/logsViewerFiltersLogic'
 
-import type { facetRailLogicType } from './facetRailLogicType'
+import type { UniversalFiltersGroup } from '../../../../../../frontend/src/types'
 import { FacetSource, toggleResourceAttributeFilter } from './facets'
 
 export interface FacetRailLogicProps {
@@ -16,6 +16,43 @@ function toggleMembership<T>(values: readonly T[] | undefined | null, value: T):
     return current.includes(value) ? current.filter((v) => v !== value) : [...current, value]
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface facetRailLogicValues {
+    collapsedFacets: string[];
+    facetNameSearch: string;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface facetRailLogicActions {
+    setFilterGroup: (filterGroup: UniversalFiltersGroup, openFilterOnInsert?: boolean | undefined) => {
+        filterGroup: UniversalFiltersGroup;
+        openFilterOnInsert: boolean;
+    }; // logsViewerFiltersLogic
+    setServiceNames: (serviceNames: string[]) => {
+        serviceNames: string[];
+    }; // logsViewerFiltersLogic
+    setSeverityLevels: (severityLevels: LogSeverityLevel[]) => {
+        severityLevels: LogSeverityLevel[];
+    }; // logsViewerFiltersLogic
+    setFacetNameSearch: (search: string) => {
+        search: string;
+    };
+    toggleFacetCollapsed: (facetKey: string) => {
+        facetKey: string;
+    };
+    toggleFacetValue: (source: FacetSource, value: string) => {
+        source: FacetSource;
+        value: string;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface facetRailLogicMeta {
+    key: string;
+}
+
+export type facetRailLogicType = MakeLogicType<facetRailLogicValues, facetRailLogicActions, FacetRailLogicProps, facetRailLogicMeta>;
+
 // The rail is a lens over the existing filter model — facet toggles write straight back to
 // logsViewerFiltersLogic's reducers, so URL sync, saved views, and the chips bar stay in step.
 export const facetRailLogic = kea<facetRailLogicType>([
diff --git a/products/logs/frontend/components/LogsViewer/Filters/logsFilterHistoryLogic.ts b/products/logs/frontend/components/LogsViewer/Filters/logsFilterHistoryLogic.ts
index 44e9f18493b9..3a9b5d67357e 100644
--- a/products/logs/frontend/components/LogsViewer/Filters/logsFilterHistoryLogic.ts
+++ b/products/logs/frontend/components/LogsViewer/Filters/logsFilterHistoryLogic.ts
@@ -1,17 +1,49 @@
 import { deepEqual as equal } from 'fast-equals'
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import posthog from 'posthog-js'
 
 import { LogsViewerFilters } from 'products/logs/frontend/components/LogsViewer/config/types'
 import { logsViewerFiltersLogic } from 'products/logs/frontend/components/LogsViewer/Filters/logsViewerFiltersLogic'
 
 import { LogsFiltersHistoryEntry } from '../../../types'
-import type { logsFilterHistoryLogicType } from './logsFilterHistoryLogicType'
 
 export interface LogsFilterHistoryLogicProps {
     id: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsFilterHistoryLogicValues {
+    filterHistory: LogsFiltersHistoryEntry[];
+    hasFilterHistory: boolean;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsFilterHistoryLogicActions {
+    setFilters: (filters: Partial<LogsViewerFilters>, pushToHistory?: boolean | undefined) => {
+        filters: Partial<LogsViewerFilters>;
+        pushToHistory: boolean;
+    }; // logsViewerFiltersLogic
+    clearFilterHistory: () => {
+        value: true;
+    };
+    pushToFilterHistory: (filters: LogsViewerFilters) => {
+        filters: LogsViewerFilters;
+    };
+    restoreFiltersFromHistory: (index: number) => {
+        index: number;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsFilterHistoryLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        hasFilterHistory: (filterHistory: LogsFiltersHistoryEntry[]) => boolean;
+    };
+}
+
+export type logsFilterHistoryLogicType = MakeLogicType<logsFilterHistoryLogicValues, logsFilterHistoryLogicActions, LogsFilterHistoryLogicProps, logsFilterHistoryLogicMeta>;
+
 export const logsFilterHistoryLogic = kea<logsFilterHistoryLogicType>([
     path(['products', 'logs', 'frontend', 'components', 'LogsViewer', 'Filters', 'logsFilterHistoryLogic']),
     props({} as LogsFilterHistoryLogicProps),
diff --git a/products/logs/frontend/components/LogsViewer/Filters/logsViewerFiltersLogic.ts b/products/logs/frontend/components/LogsViewer/Filters/logsViewerFiltersLogic.ts
index 8ce7f1fede41..4defa9b7e375 100644
--- a/products/logs/frontend/components/LogsViewer/Filters/logsViewerFiltersLogic.ts
+++ b/products/logs/frontend/components/LogsViewer/Filters/logsViewerFiltersLogic.ts
@@ -1,5 +1,5 @@
 import { deepEqual as equal } from 'fast-equals'
-import { actions, afterMount, kea, key, listeners, path, propsChanged, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, key, listeners, path, propsChanged, props, reducers, selectors } from 'kea'
 import posthog from 'posthog-js'
 
 import { zoomDateRange } from 'lib/components/DateFilter/DateRangePicker'
@@ -17,7 +17,6 @@ import {
 
 import { LogsViewerFilters } from 'products/logs/frontend/components/LogsViewer/config/types'
 
-import type { logsViewerFiltersLogicType } from './logsViewerFiltersLogicType'
 
 export const DEFAULT_DATE_RANGE = { date_from: '-1h', date_to: null }
 const VALID_SEVERITY_LEVELS: readonly LogSeverityLevel[] = ['trace', 'debug', 'info', 'warn', 'error', 'fatal']
@@ -64,6 +63,78 @@ export function combineWithPinnedFilters(
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsViewerFiltersLogicValues {
+    dateRange: DateRange;
+    filterGroup: UniversalFiltersGroup;
+    filters: LogsViewerFilters;
+    id: string;
+    openFilterOnInsert: boolean;
+    pinnedFilters: UniversalFiltersGroup | undefined;
+    queryFilterGroup: UniversalFiltersGroup;
+    searchTerm: LogsQuery["searchTerm"];
+    serviceNames: LogsQuery["serviceNames"];
+    severityLevels: LogsQuery["severityLevels"];
+    utcDateRange: {
+        date_from: string | null | undefined;
+        date_to: string | null | undefined;
+        explicitDate: boolean | null | undefined;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsViewerFiltersLogicActions {
+    addFilter: (key: string, value: string, operator?: PropertyOperator, propertyType?: PropertyFilterType) => {
+        key: string;
+        operator: PropertyOperator;
+        propertyType: PropertyFilterType;
+        value: string;
+    };
+    setDateRange: (dateRange: DateRange) => {
+        dateRange: DateRange;
+    };
+    setFilterGroup: (filterGroup: UniversalFiltersGroup, openFilterOnInsert?: boolean) => {
+        filterGroup: UniversalFiltersGroup;
+        openFilterOnInsert: boolean;
+    };
+    setFilters: (filters: Partial<LogsViewerFilters>, pushToHistory?: boolean) => {
+        filters: Partial<LogsViewerFilters>;
+        pushToHistory: boolean;
+    };
+    setPinnedFilters: (pinnedFilters: UniversalFiltersGroup | undefined) => {
+        pinnedFilters: UniversalFiltersGroup | undefined;
+    };
+    setSearchTerm: (searchTerm: LogsQuery["searchTerm"]) => {
+        searchTerm: string | undefined;
+    };
+    setServiceNames: (serviceNames: LogsQuery["serviceNames"]) => {
+        serviceNames: string[];
+    };
+    setSeverityLevels: (severityLevels: LogsQuery["severityLevels"]) => {
+        severityLevels: LogSeverityLevel[];
+    };
+    zoomDateRange: (multiplier: number) => {
+        multiplier: number;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsViewerFiltersLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        id: (id: string) => string;
+        filters: (dateRange: DateRange, searchTerm: string | undefined, severityLevels: LogSeverityLevel[], serviceNames: string[], filterGroup: UniversalFiltersGroup) => LogsViewerFilters;
+        queryFilterGroup: (filterGroup: UniversalFiltersGroup, pinnedFilters: UniversalFiltersGroup | undefined) => UniversalFiltersGroup;
+        utcDateRange: (dateRange: DateRange) => {
+            date_from: string | null | undefined;
+            date_to: string | null | undefined;
+            explicitDate: boolean | null | undefined;
+        };
+    };
+}
+
+export type logsViewerFiltersLogicType = MakeLogicType<logsViewerFiltersLogicValues, logsViewerFiltersLogicActions, LogsViewerFiltersLogicProps, logsViewerFiltersLogicMeta>;
+
 export const logsViewerFiltersLogic = kea<logsViewerFiltersLogicType>([
     path(['products', 'logs', 'frontend', 'components', 'LogsViewer', 'Filters', 'logsViewerFiltersLogic']),
     props({ id: 'default' } as LogsViewerFiltersLogicProps),
diff --git a/products/logs/frontend/components/LogsViewer/Filters/serviceFilterLogic.ts b/products/logs/frontend/components/LogsViewer/Filters/serviceFilterLogic.ts
index d4629afe9a04..ee7253950887 100644
--- a/products/logs/frontend/components/LogsViewer/Filters/serviceFilterLogic.ts
+++ b/products/logs/frontend/components/LogsViewer/Filters/serviceFilterLogic.ts
@@ -1,4 +1,17 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, propsChanged, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    afterMount,
+    connect,
+    kea,
+    key,
+    listeners,
+    path,
+    props,
+    propsChanged,
+    reducers,
+    selectors,
+} from 'kea'
 import { loaders } from 'kea-loaders'
 import { combineUrl } from 'kea-router'
 
@@ -7,12 +20,56 @@ import { teamLogic } from 'scenes/teamLogic'
 
 import { DateRange } from '~/queries/schema/schema-general'
 
-import type { serviceFilterLogicType } from './serviceFilterLogicType'
-
 export interface ServiceFilterLogicProps {
     dateRange?: DateRange
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface serviceFilterLogicValues {
+    currentTeamId: number | null // teamLogic
+    allServiceNames: string[]
+    allServiceNamesLoading: boolean
+    search: string
+    serviceNames: string[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface serviceFilterLogicActions {
+    loadServiceNames: () => any
+    loadServiceNamesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadServiceNamesSuccess: (
+        allServiceNames: string[],
+        payload?: any
+    ) => {
+        allServiceNames: string[]
+        payload?: any
+    }
+    setSearch: (search: string) => {
+        search: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface serviceFilterLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        serviceNames: (allServiceNames: string[]) => string[]
+    }
+}
+
+export type serviceFilterLogicType = MakeLogicType<
+    serviceFilterLogicValues,
+    serviceFilterLogicActions,
+    ServiceFilterLogicProps,
+    serviceFilterLogicMeta
+>
+
 export const serviceFilterLogic = kea<serviceFilterLogicType>([
     path(['products', 'logs', 'frontend', 'components', 'LogsViewer', 'Filters', 'serviceFilterLogic']),
     props({} as ServiceFilterLogicProps),
@@ -51,7 +108,7 @@ export const serviceFilterLogic = kea<serviceFilterLogicType>([
     })),
 
     selectors({
-        serviceNames: [(s) => [s.allServiceNames], (allServiceNames): string[] => allServiceNames],
+        serviceNames: [(s) => [s.allServiceNames], (allServiceNames: string[]): string[] => allServiceNames],
     }),
 
     listeners(({ actions }) => ({
diff --git a/products/logs/frontend/components/LogsViewer/LogDetailsModal/Tabs/ExploreWithAI/logExploreAILogic.ts b/products/logs/frontend/components/LogsViewer/LogDetailsModal/Tabs/ExploreWithAI/logExploreAILogic.ts
index 45f82fb8e576..5a3288ab1d06 100644
--- a/products/logs/frontend/components/LogsViewer/LogDetailsModal/Tabs/ExploreWithAI/logExploreAILogic.ts
+++ b/products/logs/frontend/components/LogsViewer/LogDetailsModal/Tabs/ExploreWithAI/logExploreAILogic.ts
@@ -1,11 +1,10 @@
-import { kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
 import api from 'lib/api'
 import { organizationLogic } from 'scenes/organizationLogic'
 
-import type { logExploreAILogicType } from './logExploreAILogicType'
 import { LogExplanation } from './types'
 
 export interface LogExploreAILogicProps {
@@ -13,6 +12,48 @@ export interface LogExploreAILogicProps {
     logTimestamp: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logExploreAILogicValues {
+    dataProcessingAccepted: boolean
+    explanation: LogExplanation | null
+    explanationError: string | null
+    explanationLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logExploreAILogicActions {
+    loadExplanation: () => any
+    loadExplanationFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadExplanationSuccess: (
+        explanation: LogExplanation,
+        payload?: any
+    ) => {
+        explanation: LogExplanation
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logExploreAILogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        dataProcessingAccepted: (currentOrganization: null | import('~/types').OrganizationType) => boolean
+    }
+}
+
+export type logExploreAILogicType = MakeLogicType<
+    logExploreAILogicValues,
+    logExploreAILogicActions,
+    LogExploreAILogicProps,
+    logExploreAILogicMeta
+>
+
 export const logExploreAILogic = kea<logExploreAILogicType>([
     props({} as LogExploreAILogicProps),
     key((props) => props.logUuid),
@@ -30,7 +71,8 @@ export const logExploreAILogic = kea<logExploreAILogicType>([
     selectors({
         dataProcessingAccepted: [
             () => [organizationLogic.selectors.currentOrganization],
-            (currentOrganization): boolean => !!currentOrganization?.is_ai_data_processing_approved,
+            (currentOrganization: null | import('~/types').OrganizationType): boolean =>
+                !!currentOrganization?.is_ai_data_processing_approved,
         ],
     }),
 
diff --git a/products/logs/frontend/components/LogsViewer/LogDetailsModal/Tabs/RelatedErrors/relatedErrorsLogic.ts b/products/logs/frontend/components/LogsViewer/LogDetailsModal/Tabs/RelatedErrors/relatedErrorsLogic.ts
index 36537be2fab4..83f741868b22 100644
--- a/products/logs/frontend/components/LogsViewer/LogDetailsModal/Tabs/RelatedErrors/relatedErrorsLogic.ts
+++ b/products/logs/frontend/components/LogsViewer/LogDetailsModal/Tabs/RelatedErrors/relatedErrorsLogic.ts
@@ -1,4 +1,4 @@
-import { afterMount, kea, key, path, props, reducers } from 'kea'
+import { MakeLogicType, afterMount, kea, key, path, props, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -8,14 +8,50 @@ import { MaxErrorTrackingIssuePreview } from '~/queries/schema/schema-assistant-
 import { ErrorTrackingIssue, ErrorTrackingQuery, NodeKind } from '~/queries/schema/schema-general'
 import { FilterLogicalOperator, PropertyFilterType, PropertyOperator } from '~/types'
 
-import type { relatedErrorsLogicType } from './relatedErrorsLogicType'
-
 export interface RelatedErrorsLogicProps {
     logUuid: string
     logTimestamp: string
     sessionId: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface relatedErrorsLogicValues {
+    relatedIssues: MaxErrorTrackingIssuePreview[]
+    relatedIssuesError: string | null
+    relatedIssuesLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface relatedErrorsLogicActions {
+    loadRelatedIssues: () => any
+    loadRelatedIssuesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRelatedIssuesSuccess: (
+        relatedIssues: MaxErrorTrackingIssuePreview[],
+        payload?: any
+    ) => {
+        relatedIssues: MaxErrorTrackingIssuePreview[]
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface relatedErrorsLogicMeta {
+    key: string
+}
+
+export type relatedErrorsLogicType = MakeLogicType<
+    relatedErrorsLogicValues,
+    relatedErrorsLogicActions,
+    RelatedErrorsLogicProps,
+    relatedErrorsLogicMeta
+>
+
 export const relatedErrorsLogic = kea<relatedErrorsLogicType>([
     props({} as RelatedErrorsLogicProps),
     key((props) => props.logUuid),
diff --git a/products/logs/frontend/components/LogsViewer/LogDetailsModal/logDetailsModalLogic.ts b/products/logs/frontend/components/LogsViewer/LogDetailsModal/logDetailsModalLogic.ts
index 188a1d0409f6..0e8df45f4450 100644
--- a/products/logs/frontend/components/LogsViewer/LogDetailsModal/logDetailsModalLogic.ts
+++ b/products/logs/frontend/components/LogsViewer/LogDetailsModal/logDetailsModalLogic.ts
@@ -1,18 +1,58 @@
-import { actions, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { subscriptions } from 'kea-subscriptions'
 import posthog from 'posthog-js'
 
 import { ParsedLogMessage } from 'products/logs/frontend/types'
 import { getSessionIdFromLogAttributes } from 'products/logs/frontend/utils'
 
-import type { logDetailsModalLogicType } from './logDetailsModalLogicType'
-
 export type LogDetailsTab = 'details' | 'raw' | 'explore-ai' | 'comments' | 'related-errors'
 
 export interface LogDetailsModalProps {
     id: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logDetailsModalLogicValues {
+    activeTab: LogDetailsTab
+    hasSessionId: boolean
+    isLogDetailsOpen: boolean
+    jsonParseAllFields: boolean
+    selectedLog: ParsedLogMessage | null
+    sessionId: string | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logDetailsModalLogicActions {
+    closeLogDetails: () => {
+        value: true
+    }
+    openLogDetails: (log: ParsedLogMessage) => {
+        log: ParsedLogMessage
+    }
+    setActiveTab: (tab: LogDetailsTab) => {
+        tab: LogDetailsTab
+    }
+    setJsonParseAllFields: (enabled: boolean) => {
+        enabled: boolean
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logDetailsModalLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        sessionId: (selectedLog: ParsedLogMessage | null) => string | null
+        hasSessionId: (sessionId: string | null) => boolean
+    }
+}
+
+export type logDetailsModalLogicType = MakeLogicType<
+    logDetailsModalLogicValues,
+    logDetailsModalLogicActions,
+    LogDetailsModalProps,
+    logDetailsModalLogicMeta
+>
+
 export const logDetailsModalLogic = kea<logDetailsModalLogicType>([
     path(['products', 'logs', 'frontend', 'components', 'LogsViewer', 'LogDetailsModal', 'logDetailsModalLogic']),
     props({} as LogDetailsModalProps),
@@ -73,11 +113,11 @@ export const logDetailsModalLogic = kea<logDetailsModalLogicType>([
     selectors({
         sessionId: [
             (s) => [s.selectedLog],
-            (selectedLog): string | null =>
+            (selectedLog: ParsedLogMessage | null): string | null =>
                 selectedLog
                     ? getSessionIdFromLogAttributes(selectedLog.attributes, selectedLog.resource_attributes)
                     : null,
         ],
-        hasSessionId: [(s) => [s.sessionId], (sessionId): boolean => sessionId !== null],
+        hasSessionId: [(s) => [s.sessionId], (sessionId: string | null): boolean => sessionId !== null],
     }),
 ])
diff --git a/products/logs/frontend/components/LogsViewer/LogsViewerModal/logsViewerModalLogic.ts b/products/logs/frontend/components/LogsViewer/LogsViewerModal/logsViewerModalLogic.ts
index 4fca6c7ddc38..496938e5e495 100644
--- a/products/logs/frontend/components/LogsViewer/LogsViewerModal/logsViewerModalLogic.ts
+++ b/products/logs/frontend/components/LogsViewer/LogsViewerModal/logsViewerModalLogic.ts
@@ -1,16 +1,58 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers } from 'kea'
 import { router } from 'kea-router'
+import type { LocationChangedPayload } from 'kea-router/lib/types'
 
 import { LogsViewerFilters } from 'products/logs/frontend/components/LogsViewer/config/types'
 
-import type { logsViewerModalLogicType } from './logsViewerModalLogicType'
-
 export interface OpenLogsViewerModalOptions {
     id?: string
     fullScreen?: boolean
     initialFilters?: Partial<LogsViewerFilters>
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsViewerModalLogicValues {
+    fullScreen: boolean
+    initialFilters: Partial<LogsViewerFilters> | null
+    isOpen: boolean
+    viewerId: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsViewerModalLogicActions {
+    locationChanged: ({
+        method,
+        pathname,
+        search,
+        searchParams,
+        hash,
+        hashParams,
+        initial,
+        url,
+        routerState,
+    }: LocationChangedPayload) => {
+        hash: string
+        hashParams: Record<string, any>
+        initial: boolean
+        method: 'POP' | 'PUSH' | 'REPLACE'
+        pathname: string
+        routerState: Record<string, any>
+        search: string
+        searchParams: Record<string, any>
+        url: string
+    } // router
+    closeLogsViewerModal: () => {
+        value: true
+    }
+    openLogsViewerModal: (options?: OpenLogsViewerModalOptions) => {
+        fullScreen: boolean
+        id: string
+        initialFilters: Partial<LogsViewerFilters> | null
+    }
+}
+
+export type logsViewerModalLogicType = MakeLogicType<logsViewerModalLogicValues, logsViewerModalLogicActions>
+
 export const logsViewerModalLogic = kea<logsViewerModalLogicType>([
     path(['products', 'logs', 'frontend', 'components', 'LogsViewer', 'LogsViewerModal', 'logsViewerModalLogic']),
     connect(() => ({
diff --git a/products/logs/frontend/components/LogsViewer/config/logsColumnConfiguratorLogic.ts b/products/logs/frontend/components/LogsViewer/config/logsColumnConfiguratorLogic.ts
index 2624ce613d42..54f9697d28c5 100644
--- a/products/logs/frontend/components/LogsViewer/config/logsColumnConfiguratorLogic.ts
+++ b/products/logs/frontend/components/LogsViewer/config/logsColumnConfiguratorLogic.ts
@@ -1,16 +1,103 @@
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 
 import { uuid } from 'lib/utils/dom'
 
 import { logsViewerConfigLogic } from 'products/logs/frontend/components/LogsViewer/config/logsViewerConfigLogic'
 
 import { customColumnExpressionError, LogsColumnConfig, LogsColumnType, normalizeColumns } from './columns'
-import type { logsColumnConfiguratorLogicType } from './logsColumnConfiguratorLogicType'
 
 export interface LogsColumnConfiguratorLogicProps {
     id: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsColumnConfiguratorLogicValues {
+    columns: LogsColumnConfig[] // logsViewerConfigLogic
+    draft: LogsColumnConfig[]
+    draftErrors: string | null
+    editingColumnId: string | null
+    isOpen: boolean
+    newColumn: {
+        expression: string
+        name: string
+        type: LogsColumnType
+    }
+    newColumnError: string | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsColumnConfiguratorLogicActions {
+    setColumns: (columns: LogsColumnConfig[]) => {
+        columns: LogsColumnConfig[]
+    } // logsViewerConfigLogic
+    addDraftColumn: (column: Omit<LogsColumnConfig, 'id'>) => {
+        column: Omit<LogsColumnConfig, 'id'>
+    }
+    applyDraft: () => {
+        value: true
+    }
+    closeConfigurator: () => {
+        value: true
+    }
+    moveDraftColumn: (
+        fromIndex: number,
+        toIndex: number
+    ) => {
+        fromIndex: number
+        toIndex: number
+    }
+    openConfigurator: () => {
+        value: true
+    }
+    removeDraftColumn: (id: string) => {
+        id: string
+    }
+    resetNewColumn: () => {
+        value: true
+    }
+    setDraft: (draft: LogsColumnConfig[]) => {
+        draft: LogsColumnConfig[]
+    }
+    setEditingColumnId: (id: string | null) => {
+        id: string | null
+    }
+    setNewColumnExpression: (expression: string) => {
+        expression: string
+    }
+    setNewColumnName: (name: string) => {
+        name: string
+    }
+    setNewColumnType: (columnType: LogsColumnType) => {
+        columnType: LogsColumnType
+    }
+    submitNewColumn: () => {
+        value: true
+    }
+    updateDraftColumn: (
+        id: string,
+        patch: Partial<Omit<LogsColumnConfig, 'id'>>
+    ) => {
+        id: string
+        patch: Partial<Omit<LogsColumnConfig, 'id'>>
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsColumnConfiguratorLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        newColumnError: (newColumn: { expression: string; name: string; type: LogsColumnType }) => string | null
+        draftErrors: (draft: LogsColumnConfig[]) => string | null
+    }
+}
+
+export type logsColumnConfiguratorLogicType = MakeLogicType<
+    logsColumnConfiguratorLogicValues,
+    logsColumnConfiguratorLogicActions,
+    LogsColumnConfiguratorLogicProps,
+    logsColumnConfiguratorLogicMeta
+>
+
 /**
  * Draft-based editor state for the column configurator modal. Edits accumulate in a local
  * draft and only hit logsViewerConfigLogic (and thus the query) on an explicit apply — typing
diff --git a/products/logs/frontend/components/LogsViewer/config/logsViewerConfigLogic.ts b/products/logs/frontend/components/LogsViewer/config/logsViewerConfigLogic.ts
index 07295a581e01..1d81ffe591ec 100644
--- a/products/logs/frontend/components/LogsViewer/config/logsViewerConfigLogic.ts
+++ b/products/logs/frontend/components/LogsViewer/config/logsViewerConfigLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, key, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, key, path, props, reducers, selectors } from 'kea'
 
 import { LogsSparklineBreakdownBy } from '~/queries/schema/schema-general'
 import { FilterLogicalOperator } from '~/types'
@@ -14,7 +14,8 @@ import { LogsViewerConfig, LogsViewerFilters } from 'products/logs/frontend/comp
 import type { GroupBySourceEnumApi } from 'products/logs/frontend/generated/api.schemas'
 import { AttributeColumnConfig, LogsOrderBy } from 'products/logs/frontend/types'
 
-import type { logsViewerConfigLogicType } from './logsViewerConfigLogicType'
+import type { DateRange, LogSeverityLevel } from '../../../../../../frontend/src/queries/schema/schema-general'
+import type { UniversalFiltersGroup } from '../../../../../../frontend/src/types'
 
 export const DEFAULT_LOGS_VIEWER_CONFIG: LogsViewerConfig = {
     filters: {
@@ -49,6 +50,103 @@ export interface LogsViewerConfigProps {
     id: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsViewerConfigLogicValues {
+    baselineMode: PatternsBaselineMode
+    columns: LogsColumnConfig[]
+    compareEnabled: boolean
+    config: LogsViewerConfig
+    customColumns: string[] | undefined
+    facetRailCollapsed: boolean
+    filters: LogsViewerFilters
+    groupBy: LogsViewerGroupBy | null
+    orderBy: LogsOrderBy
+    sparklineBreakdownBy: LogsSparklineBreakdownBy
+    sparklineCollapsed: boolean
+    viewMode: LogsViewerViewMode
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsViewerConfigLogicActions {
+    addColumn: (column: LogsColumnConfig) => {
+        column: LogsColumnConfig
+    }
+    moveColumn: (
+        id: string,
+        direction: 'left' | 'right'
+    ) => {
+        direction: 'left' | 'right'
+        id: string
+    }
+    removeColumn: (id: string) => {
+        id: string
+    }
+    setBaselineMode: (mode: PatternsBaselineMode) => {
+        mode: PatternsBaselineMode
+    }
+    setColumnWidth: (
+        id: string,
+        width: number
+    ) => {
+        id: string
+        width: number
+    }
+    setColumns: (columns: LogsColumnConfig[]) => {
+        columns: LogsColumnConfig[]
+    }
+    setCompareEnabled: (enabled: boolean) => {
+        enabled: boolean
+    }
+    setFacetRailCollapsed: (facetRailCollapsed: boolean) => {
+        facetRailCollapsed: boolean
+    }
+    setFilter: (
+        filter: keyof LogsViewerFilters,
+        value: LogsViewerFilters[keyof LogsViewerFilters]
+    ) => {
+        filter: keyof LogsViewerFilters
+        value: string | DateRange | UniversalFiltersGroup | string[] | LogSeverityLevel[] | undefined
+    }
+    setFilters: (filters: LogsViewerFilters) => {
+        filters: LogsViewerFilters
+    }
+    setGroupBy: (groupBy: LogsViewerGroupBy | null) => {
+        groupBy: LogsViewerGroupBy | null
+    }
+    setOrderBy: (
+        orderBy: LogsOrderBy,
+        source?: 'header' | 'toolbar'
+    ) => {
+        orderBy: LogsOrderBy
+        source: 'header' | 'toolbar'
+    }
+    setSparklineBreakdownBy: (sparklineBreakdownBy: LogsSparklineBreakdownBy) => {
+        sparklineBreakdownBy: LogsSparklineBreakdownBy
+    }
+    setViewMode: (viewMode: LogsViewerViewMode) => {
+        viewMode: LogsViewerViewMode
+    }
+    toggleSparklineCollapsed: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsViewerConfigLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        config: (filters: LogsViewerFilters) => LogsViewerConfig
+        customColumns: (columns: LogsColumnConfig[]) => string[] | undefined
+    }
+}
+
+export type logsViewerConfigLogicType = MakeLogicType<
+    logsViewerConfigLogicValues,
+    logsViewerConfigLogicActions,
+    LogsViewerConfigProps,
+    logsViewerConfigLogicMeta
+>
+
 export const logsViewerConfigLogic = kea<logsViewerConfigLogicType>([
     path(['products', 'logs', 'frontend', 'components', 'LogsViewer', 'config', 'logsViewerConfigLogic']),
     props({ id: 'default' } as LogsViewerConfigProps),
diff --git a/products/logs/frontend/components/LogsViewer/data/logsViewerDataLogic.ts b/products/logs/frontend/components/LogsViewer/data/logsViewerDataLogic.ts
index 41ccacf05ef8..714c9037178e 100644
--- a/products/logs/frontend/components/LogsViewer/data/logsViewerDataLogic.ts
+++ b/products/logs/frontend/components/LogsViewer/data/logsViewerDataLogic.ts
@@ -1,6 +1,6 @@
 import colors from 'ansi-colors'
 import { deepEqual as equal } from 'fast-equals'
-import { actions, afterMount, connect, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { subscriptions } from 'kea-subscriptions'
 import posthog from 'posthog-js'
@@ -30,7 +30,7 @@ import { logsViewerFiltersLogic } from 'products/logs/frontend/components/LogsVi
 
 // TODO: Move to ./types.ts
 import { ParsedLogMessage } from '../../../types'
-import type { logsViewerDataLogicType } from './logsViewerDataLogicType'
+import type { LogsOrderBy } from '../../../types'
 
 const DEFAULT_LIVE_TAIL_POLL_INTERVAL_MS = 1000
 const DEFAULT_LOGS_PAGE_SIZE: number = 250
@@ -121,6 +121,278 @@ export function shouldSkipFilterGroupChange(
     return lastFilter ? hasIncompleteValue(lastFilter) : false
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsViewerDataLogicValues {
+    customColumns: string[] | undefined; // logsViewerConfigLogic
+    orderBy: LogsOrderBy; // logsViewerConfigLogic
+    sparklineBreakdownBy: LogsSparklineBreakdownBy; // logsViewerConfigLogic
+    filterGroup: UniversalFiltersGroup; // logsViewerFiltersLogic
+    filters: LogsViewerFilters; // logsViewerFiltersLogic
+    queryFilterGroup: UniversalFiltersGroup; // logsViewerFiltersLogic
+    utcDateRange: {
+        date_from: string | null | undefined;
+        date_to: string | null | undefined;
+        explicitDate: boolean | null | undefined;
+    }; // logsViewerFiltersLogic
+    customColumnAliases: Record<string, string> | null;
+    hasMoreLogsToLoad: boolean;
+    hasRunQuery: boolean;
+    initialLogsLimit: number | null;
+    liveLogsCheckpoint: string | null;
+    liveTailAbortController: AbortController | null;
+    liveTailDisabledReason: string | undefined;
+    liveTailExpired: boolean;
+    liveTailPollInterval: number;
+    liveTailRunning: boolean;
+    logs: LogMessage[];
+    logsAbortController: AbortController | null;
+    logsLoading: boolean;
+    logsRemainingToLoad: number;
+    maxExportableLogs: number;
+    newLogUuids: Set<string>;
+    nextCursor: string | null;
+    parsedLogs: ParsedLogMessage[];
+    sparkline: any[];
+    sparklineAbortController: AbortController | null;
+    sparklineData: {
+        data: {
+            color: string | undefined;
+            name: string;
+            values: number[];
+        }[];
+        dates: string[];
+        labels: string[];
+    };
+    sparklineIncompleteBarIndices: number[];
+    sparklineLoading: boolean;
+    totalLogsMatchingFilters: number;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsViewerDataLogicActions {
+    addColumn: (column: import("../config/columns").LogsColumnConfig) => {
+        column: import("../config/columns").LogsColumnConfig;
+    }; // logsViewerConfigLogic
+    removeColumn: (id: string) => {
+        id: string;
+    }; // logsViewerConfigLogic
+    setColumns: (columns: import("../config/columns").LogsColumnConfig[]) => {
+        columns: import("../config/columns").LogsColumnConfig[];
+    }; // logsViewerConfigLogic
+    setOrderBy: (orderBy: LogsOrderBy, source?: "header" | "toolbar" | undefined) => {
+        orderBy: LogsOrderBy;
+        source: "header" | "toolbar";
+    }; // logsViewerConfigLogic
+    setSparklineBreakdownBy: (sparklineBreakdownBy: LogsSparklineBreakdownBy) => {
+        sparklineBreakdownBy: LogsSparklineBreakdownBy;
+    }; // logsViewerConfigLogic
+    setDateRange: (dateRange: import("~/queries/schema").DateRange) => {
+        dateRange: import("~/queries/schema").DateRange;
+    }; // logsViewerFiltersLogic
+    setFilterGroup: (filterGroup: UniversalFiltersGroup, openFilterOnInsert?: boolean | undefined) => {
+        filterGroup: UniversalFiltersGroup;
+        openFilterOnInsert: boolean;
+    }; // logsViewerFiltersLogic
+    setFilters: (filters: Partial<LogsViewerFilters>, pushToHistory?: boolean | undefined) => {
+        filters: Partial<LogsViewerFilters>;
+        pushToHistory: boolean;
+    }; // logsViewerFiltersLogic
+    setSearchTerm: (searchTerm: string | undefined) => {
+        searchTerm: string | undefined;
+    }; // logsViewerFiltersLogic
+    setServiceNames: (serviceNames: string[]) => {
+        serviceNames: string[];
+    }; // logsViewerFiltersLogic
+    setSeverityLevels: (severityLevels: import("~/queries/schema").LogSeverityLevel[]) => {
+        severityLevels: import("~/queries/schema").LogSeverityLevel[];
+    }; // logsViewerFiltersLogic
+    addProductIntent: (properties: import("lib/utils/product-intents").ProductIntentProperties) => import("lib/utils/product-intents").ProductIntentProperties; // teamLogic
+    addLogsToSparkline: (logs: LogMessage[]) => LogMessage[];
+    cancelInProgressLiveTail: (liveTailAbortController: AbortController | null) => {
+        liveTailAbortController: AbortController | null;
+    };
+    cancelInProgressLogs: (logsAbortController: AbortController | null) => {
+        logsAbortController: AbortController | null;
+    };
+    cancelInProgressSparkline: (sparklineAbortController: AbortController | null) => {
+        sparklineAbortController: AbortController | null;
+    };
+    clearLogs: () => {
+        value: true;
+    };
+    clearLogsFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    clearLogsSuccess: (logs: never[], payload?: {
+        value: true;
+    }) => {
+        logs: never[];
+        payload?: {
+            value: true;
+        };
+    };
+    expireLiveTail: () => boolean;
+    fetchLogs: () => any;
+    fetchLogsFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    fetchLogsSuccess: (logs: LogMessage[], payload?: any) => {
+        logs: LogMessage[];
+        payload?: any;
+    };
+    fetchNextLogsPage: (limit?: number) => {
+        limit: number | undefined;
+    };
+    fetchNextLogsPageFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    fetchNextLogsPageSuccess: (logs: LogMessage[], payload?: {
+        limit: number | undefined;
+    }) => {
+        logs: LogMessage[];
+        payload?: {
+            limit: number | undefined;
+        };
+    };
+    fetchSparkline: () => any;
+    fetchSparklineFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    fetchSparklineSuccess: (sparkline: any[], payload?: any) => {
+        sparkline: any[];
+        payload?: any;
+    };
+    handleQueryChange: (filterType: string, extraProps?: Record<string, unknown>) => {
+        extraProps: Record<string, unknown> | undefined;
+        filterType: string;
+    };
+    pollForNewLogs: () => {
+        value: true;
+    };
+    runQuery: (debounce?: integer) => {
+        debounce: number | undefined;
+    };
+    setCustomColumnAliases: (customColumnAliases: Record<string, string> | null) => {
+        customColumnAliases: Record<string, string> | null;
+    };
+    setHasMoreLogsToLoad: (hasMoreLogsToLoad: boolean) => {
+        hasMoreLogsToLoad: boolean;
+    };
+    setInitialLogsLimit: (initialLogsLimit: number | null) => {
+        initialLogsLimit: number | null;
+    };
+    setLiveLogsCheckpoint: (liveLogsCheckpoint: string | null) => {
+        liveLogsCheckpoint: string | null;
+    };
+    setLiveTailAbortController: (liveTailAbortController: AbortController | null) => {
+        liveTailAbortController: AbortController | null;
+    };
+    setLiveTailExpired: (liveTailExpired: boolean) => {
+        liveTailExpired: boolean;
+    };
+    setLiveTailInterval: (interval: number) => {
+        interval: number;
+    };
+    setLiveTailRunning: (enabled: boolean) => {
+        enabled: boolean;
+    };
+    setLogs: (logs: LogMessage[]) => {
+        logs: LogMessage[];
+    };
+    setLogsAbortController: (logsAbortController: AbortController | null) => {
+        logsAbortController: AbortController | null;
+    };
+    setLogsFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    setLogsSuccess: (logs: LogMessage[], payload?: {
+        logs: LogMessage[];
+    }) => {
+        logs: LogMessage[];
+        payload?: {
+            logs: LogMessage[];
+        };
+    };
+    setMaxExportableLogs: (maxExportableLogs: number) => {
+        maxExportableLogs: number;
+    };
+    setNewLogUuids: (newLogUuids: string[]) => {
+        newLogUuids: string[];
+    };
+    setNextCursor: (nextCursor: string | null) => {
+        nextCursor: string | null;
+    };
+    setSparkline: (sparkline: any[] | null) => {
+        sparkline: any[] | null;
+    };
+    setSparklineAbortController: (sparklineAbortController: AbortController | null) => {
+        sparklineAbortController: AbortController | null;
+    };
+    setSparklineFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    setSparklineSuccess: (sparkline: any[], payload?: {
+        sparkline: any[] | null;
+    }) => {
+        sparkline: any[];
+        payload?: {
+            sparkline: any[] | null;
+        };
+    };
+    truncateLogs: (limit: number) => {
+        limit: number;
+    };
+    truncateLogsFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    truncateLogsSuccess: (logs: LogMessage[], payload?: {
+        limit: number;
+    }) => {
+        logs: LogMessage[];
+        payload?: {
+            limit: number;
+        };
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsViewerDataLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        liveTailDisabledReason: (orderBy: LogsOrderBy, filters: LogsViewerFilters, logsLoading: boolean, liveTailExpired: boolean) => string | undefined;
+        parsedLogs: (logs: LogMessage[]) => ParsedLogMessage[];
+        sparklineData: (sparkline: any[], sparklineBreakdownBy: LogsSparklineBreakdownBy) => {
+            data: {
+                color: string | undefined;
+                name: string;
+                values: number[];
+            }[];
+            dates: string[];
+            labels: string[];
+        };
+        sparklineIncompleteBarIndices: (sparklineData: {
+            data: {
+                color: string | undefined;
+                name: string;
+                values: number[];
+            }[];
+            dates: string[];
+            labels: string[];
+        }, liveLogsCheckpoint: string | null, sparklineLoading: boolean) => number[];
+        totalLogsMatchingFilters: (sparkline: any[]) => number;
+        logsRemainingToLoad: (totalLogsMatchingFilters: number, logs: LogMessage[]) => number;
+    };
+}
+
+export type logsViewerDataLogicType = MakeLogicType<logsViewerDataLogicValues, logsViewerDataLogicActions, LogsViewerDataLogicProps, logsViewerDataLogicMeta>;
+
 export const logsViewerDataLogic = kea<logsViewerDataLogicType>([
     props({ id: 'default', autoLoad: true } as LogsViewerDataLogicProps),
     path(['products', 'logs', 'frontend', 'components', 'LogsViewer', 'data', 'logsViewerDataLogic']),
@@ -591,11 +863,11 @@ export const logsViewerDataLogic = kea<logsViewerDataLogicType>([
         ],
         totalLogsMatchingFilters: [
             (s) => [s.sparkline],
-            (sparkline): number => sparkline?.reduce((sum: number, item: any) => sum + item.count, 0) ?? 0,
+            (sparkline: any[]): number => sparkline?.reduce((sum: number, item: any) => sum + item.count, 0) ?? 0,
         ],
         logsRemainingToLoad: [
             (s) => [s.totalLogsMatchingFilters, s.logs],
-            (totalLogsMatchingFilters, logs): number => totalLogsMatchingFilters - logs.length,
+            (totalLogsMatchingFilters: number, logs: LogMessage[]): number => totalLogsMatchingFilters - logs.length,
         ],
     }),
 
diff --git a/products/logs/frontend/components/LogsViewer/logsExportLogic.ts b/products/logs/frontend/components/LogsViewer/logsExportLogic.ts
index 2c85cebaf242..624524ff5dbb 100644
--- a/products/logs/frontend/components/LogsViewer/logsExportLogic.ts
+++ b/products/logs/frontend/components/LogsViewer/logsExportLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props } from 'kea'
 import Papa from 'papaparse'
 import posthog from 'posthog-js'
 
@@ -12,9 +12,10 @@ import { PropertyGroupFilter, SidePanelTab } from '~/types'
 import { logsViewerConfigLogic } from 'products/logs/frontend/components/LogsViewer/config/logsViewerConfigLogic'
 
 import { ParsedLogMessage } from '../../types'
+import type { LogsOrderBy } from '../../types'
+import type { LogsViewerFilters } from './config/types'
 import { logsViewerDataLogic } from './data/logsViewerDataLogic'
 import { logsViewerFiltersLogic } from './Filters/logsViewerFiltersLogic'
-import type { logsExportLogicType } from './logsExportLogicType'
 import { logsViewerLogic } from './logsViewerLogic'
 
 function triggerBlobDownload(blob: Blob, filename: string): void {
@@ -45,6 +46,44 @@ export interface LogsExportLogicProps {
     id: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsExportLogicValues {
+    orderBy: LogsOrderBy; // logsViewerConfigLogic
+    maxExportableLogs: number; // logsViewerDataLogic
+    filters: LogsViewerFilters; // logsViewerFiltersLogic
+    utcDateRange: {
+        date_from: string | null | undefined;
+        date_to: string | null | undefined;
+        explicitDate: boolean | null | undefined;
+    }; // logsViewerFiltersLogic
+    attributeColumns: string[]; // logsViewerLogic
+    selectedLogsArray: ParsedLogMessage[]; // logsViewerLogic
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsExportLogicActions {
+    openSidePanel: (tab: SidePanelTab, options?: string | undefined) => {
+        options: string | undefined;
+        tab: SidePanelTab;
+    }; // sidePanelStateLogic
+    copySelectedLogs: () => {
+        value: true;
+    };
+    exportSelectedAsCsv: () => {
+        value: true;
+    };
+    exportServerSide: (totalLogsCount?: number) => {
+        totalLogsCount: number | undefined;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsExportLogicMeta {
+    key: string;
+}
+
+export type logsExportLogicType = MakeLogicType<logsExportLogicValues, logsExportLogicActions, LogsExportLogicProps, logsExportLogicMeta>;
+
 export const logsExportLogic = kea<logsExportLogicType>([
     path((id) => ['products', 'logs', 'frontend', 'components', 'LogsViewer', 'logsExportLogic', id]),
     props({} as LogsExportLogicProps),
diff --git a/products/logs/frontend/components/LogsViewer/logsViewerLogic.ts b/products/logs/frontend/components/LogsViewer/logsViewerLogic.ts
index eecf61e0c4ce..1bebd01af822 100644
--- a/products/logs/frontend/components/LogsViewer/logsViewerLogic.ts
+++ b/products/logs/frontend/components/LogsViewer/logsViewerLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { subscriptions } from 'kea-subscriptions'
 import posthog from 'posthog-js'
 
@@ -12,10 +12,11 @@ import { logsViewerConfigLogic } from 'products/logs/frontend/components/LogsVie
 import { logsViewerDataLogic } from 'products/logs/frontend/components/LogsViewer/data/logsViewerDataLogic'
 import { logsViewerFiltersLogic } from 'products/logs/frontend/components/LogsViewer/Filters/logsViewerFiltersLogic'
 
+import type { LogMessage } from '../../../../../frontend/src/queries/schema/schema-general'
+import type { PropertyFilterType, PropertyOperator } from '../../../../../frontend/src/types'
 import { LogsOrderBy, ParsedLogMessage } from '../../types'
 import { attributeLookupExpression, LogsColumnConfig } from './config/columns'
 import { logDetailsModalLogic } from './LogDetailsModal/logDetailsModalLogic'
-import type { logsViewerLogicType } from './logsViewerLogicType'
 import { logsViewerSettingsLogic } from './logsViewerSettingsLogic'
 
 export interface VisibleLogsTimeRange {
@@ -61,6 +62,188 @@ function tryOpenLinkedLog(
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsViewerLogicValues {
+    isLogDetailsOpen: boolean; // logDetailsModalLogic
+    columns: LogsColumnConfig[]; // logsViewerConfigLogic
+    customColumns: string[] | undefined; // logsViewerConfigLogic
+    orderBy: LogsOrderBy; // logsViewerConfigLogic
+    logs: ParsedLogMessage[]; // logsViewerDataLogic
+    logsLoading: boolean; // logsViewerDataLogic
+    prettifyJson: boolean; // logsViewerSettingsLogic
+    timezone: string; // logsViewerSettingsLogic
+    wrapBody: boolean; // logsViewerSettingsLogic
+    attributeColumns: string[];
+    cursor: LogCursor;
+    cursorIndex: number | null;
+    cursorLogId: string | null;
+    expandedAttributeBreakdowns: Record<string, string[]>;
+    expandedLogIds: Record<string, boolean>;
+    id: string;
+    isAttributeColumn: (attributeKey: string) => boolean;
+    isFocused: boolean;
+    isSelectionActive: boolean;
+    keyboardNavEnabled: boolean;
+    linkToLogId: string | null;
+    logsCount: number;
+    pinnedLogs: Record<string, ParsedLogMessage>;
+    pinnedLogsArray: ParsedLogMessage[];
+    prettifiedLogIds: Set<string>;
+    recomputeRowHeightsRequest: {
+        logIds?: string[];
+        timestamp: number;
+    } | null;
+    scrollToCursorRequest: number;
+    selectedCount: number;
+    selectedLogIds: Record<string, boolean>;
+    selectedLogsArray: ParsedLogMessage[];
+    visibleLogsTimeRange: VisibleLogsTimeRange | null;
+    visibleRowDateRange: VisibleLogsTimeRange | null;
+    visibleRowRange: VisibleRowRange | null;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsViewerLogicActions {
+    closeLogDetails: () => {
+        value: true;
+    }; // logDetailsModalLogic
+    openLogDetails: (log: ParsedLogMessage) => {
+        log: ParsedLogMessage;
+    }; // logDetailsModalLogic
+    addColumn: (column: LogsColumnConfig) => {
+        column: LogsColumnConfig;
+    }; // logsViewerConfigLogic
+    moveColumn: (id: string, direction: "left" | "right") => {
+        direction: "left" | "right";
+        id: string;
+    }; // logsViewerConfigLogic
+    removeColumn: (id: string) => {
+        id: string;
+    }; // logsViewerConfigLogic
+    setColumnWidth: (id: string, width: number) => {
+        id: string;
+        width: number;
+    }; // logsViewerConfigLogic
+    setColumns: (columns: LogsColumnConfig[]) => {
+        columns: LogsColumnConfig[];
+    }; // logsViewerConfigLogic
+    clearLogs: () => {
+        value: true;
+    }; // logsViewerDataLogic
+    setLogs: (logs: LogMessage[]) => {
+        logs: LogMessage[];
+    }; // logsViewerDataLogic
+    addFilter: (key: string, value: string, operator?: PropertyOperator | undefined, propertyType?: PropertyFilterType | undefined) => {
+        key: string;
+        operator: PropertyOperator;
+        propertyType: PropertyFilterType;
+        value: string;
+    }; // logsViewerFiltersLogic
+    setPrettifyJson: (prettifyJson: boolean) => {
+        prettifyJson: boolean;
+    }; // logsViewerSettingsLogic
+    setTimezone: (timezone: string) => {
+        timezone: string;
+    }; // logsViewerSettingsLogic
+    setWrapBody: (wrapBody: boolean) => {
+        wrapBody: boolean;
+    }; // logsViewerSettingsLogic
+    clearLinkToLogId: () => {
+        value: true;
+    };
+    clearSelection: () => {
+        value: true;
+    };
+    copyLinkToLog: (logId: string) => {
+        logId: string;
+    };
+    moveCursorDown: (shiftSelect?: boolean) => {
+        shiftSelect: boolean;
+    };
+    moveCursorUp: (shiftSelect?: boolean) => {
+        shiftSelect: boolean;
+    };
+    recomputeRowHeights: (logIds?: string[]) => {
+        logIds: string[] | undefined;
+    };
+    requestScrollToCursor: () => {
+        value: true;
+    };
+    resetCursor: () => {
+        value: true;
+    };
+    selectAll: (logsToSelect?: ParsedLogMessage[]) => {
+        logsToSelect: ParsedLogMessage[] | undefined;
+    };
+    selectLogRange: (fromIndex: number, toIndex: number) => {
+        fromIndex: number;
+        toIndex: number;
+    };
+    setCursor: (cursor: LogCursor) => {
+        cursor: LogCursor;
+    };
+    setCursorIndex: (index: number | null) => {
+        index: number | null;
+    };
+    setFocused: (isFocused: boolean) => {
+        isFocused: boolean;
+    };
+    setLinkToLogId: (linkToLogId: string | null) => {
+        linkToLogId: string | null;
+    };
+    setSelectedLogIds: (selectedLogIds: Record<string, boolean>) => {
+        selectedLogIds: Record<string, boolean>;
+    };
+    setVisibleRowRange: (startIndex: number, stopIndex: number) => {
+        startIndex: number;
+        stopIndex: number;
+    };
+    toggleAttributeBreakdown: (logId: string, attributeKey: string) => {
+        attributeKey: string;
+        logId: string;
+    };
+    toggleAttributeColumn: (attributeKey: string) => {
+        attributeKey: string;
+    };
+    toggleExpandLog: (logId: string) => {
+        logId: string;
+    };
+    togglePinLog: (log: ParsedLogMessage) => {
+        log: ParsedLogMessage;
+    };
+    togglePrettifyLog: (logId: string) => {
+        logId: string;
+    };
+    toggleSelectLog: (logId: string) => {
+        logId: string;
+    };
+    userSetCursorIndex: (index: number | null) => {
+        index: number | null;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsViewerLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        id: (id: string) => string;
+        pinnedLogsArray: (pinnedLogs: Record<string, ParsedLogMessage>) => ParsedLogMessage[];
+        cursorIndex: (cursor: LogCursor) => number | null;
+        cursorLogId: (cursor: LogCursor, logs: ParsedLogMessage[]) => string | null;
+        keyboardNavEnabled: (isFocused: boolean, isLogDetailsOpen: boolean) => boolean;
+        visibleLogsTimeRange: (logs: ParsedLogMessage[], orderBy: LogsOrderBy) => VisibleLogsTimeRange | null;
+        visibleRowDateRange: (visibleRowRange: VisibleRowRange | null, logs: ParsedLogMessage[]) => VisibleLogsTimeRange | null;
+        logsCount: (logs: ParsedLogMessage[]) => number;
+        attributeColumns: (columns: LogsColumnConfig[]) => string[];
+        isAttributeColumn: (columns: LogsColumnConfig[]) => (attributeKey: string) => boolean;
+        isSelectionActive: (selectedLogIds: Record<string, boolean>) => boolean;
+        selectedCount: (selectedLogIds: Record<string, boolean>) => number;
+        selectedLogsArray: (selectedLogIds: Record<string, boolean>, logs: ParsedLogMessage[]) => ParsedLogMessage[];
+    };
+}
+
+export type logsViewerLogicType = MakeLogicType<logsViewerLogicValues, logsViewerLogicActions, LogsViewerLogicProps, logsViewerLogicMeta>;
+
 export const logsViewerLogic = kea<logsViewerLogicType>([
     path((id) => ['products', 'logs', 'frontend', 'components', 'LogsViewer', 'logsViewerLogic', id]),
     props({} as LogsViewerLogicProps),
@@ -282,10 +465,13 @@ export const logsViewerLogic = kea<logsViewerLogicType>([
     selectors({
         id: [(_, p) => [p.id], (id: string): string => id],
 
-        pinnedLogsArray: [(s) => [s.pinnedLogs], (pinnedLogs): ParsedLogMessage[] => Object.values(pinnedLogs)],
+        pinnedLogsArray: [
+            (s) => [s.pinnedLogs],
+            (pinnedLogs: Record<string, ParsedLogMessage>): ParsedLogMessage[] => Object.values(pinnedLogs),
+        ],
 
         // Convenience selectors for cursor components
-        cursorIndex: [(s) => [s.cursor], (cursor): number | null => cursor],
+        cursorIndex: [(s) => [s.cursor], (cursor: LogCursor): number | null => cursor],
 
         cursorLogId: [
             (s) => [s.cursor, s.logs],
@@ -370,12 +556,16 @@ export const logsViewerLogic = kea<logsViewerLogicType>([
         // Selection selectors
         isSelectionActive: [
             (s) => [s.selectedLogIds],
-            (selectedLogIds): boolean => Object.keys(selectedLogIds).length > 0,
+            (selectedLogIds: Record<string, boolean>): boolean => Object.keys(selectedLogIds).length > 0,
+        ],
+        selectedCount: [
+            (s) => [s.selectedLogIds],
+            (selectedLogIds: Record<string, boolean>): number => Object.keys(selectedLogIds).length,
         ],
-        selectedCount: [(s) => [s.selectedLogIds], (selectedLogIds): number => Object.keys(selectedLogIds).length],
         selectedLogsArray: [
             (s) => [s.selectedLogIds, s.logs],
-            (selectedLogIds, logs): ParsedLogMessage[] => logs.filter((log) => selectedLogIds[log.uuid]),
+            (selectedLogIds: Record<string, boolean>, logs: ParsedLogMessage[]): ParsedLogMessage[] =>
+                logs.filter((log) => selectedLogIds[log.uuid]),
         ],
     }),
 
diff --git a/products/logs/frontend/components/LogsViewer/logsViewerSettingsLogic.ts b/products/logs/frontend/components/LogsViewer/logsViewerSettingsLogic.ts
index f38c069eceba..7a86d7317fac 100644
--- a/products/logs/frontend/components/LogsViewer/logsViewerSettingsLogic.ts
+++ b/products/logs/frontend/components/LogsViewer/logsViewerSettingsLogic.ts
@@ -1,7 +1,27 @@
-import { actions, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers } from 'kea'
 import posthog from 'posthog-js'
 
-import type { logsViewerSettingsLogicType } from './logsViewerSettingsLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsViewerSettingsLogicValues {
+    prettifyJson: boolean
+    timezone: string
+    wrapBody: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsViewerSettingsLogicActions {
+    setPrettifyJson: (prettifyJson: boolean) => {
+        prettifyJson: boolean
+    }
+    setTimezone: (timezone: string) => {
+        timezone: string
+    }
+    setWrapBody: (wrapBody: boolean) => {
+        wrapBody: boolean
+    }
+}
+
+export type logsViewerSettingsLogicType = MakeLogicType<logsViewerSettingsLogicValues, logsViewerSettingsLogicActions>
 
 // Shared logic for user preferences which should be used across all tabs+windows
 export const logsViewerSettingsLogic = kea<logsViewerSettingsLogicType>([
diff --git a/products/logs/frontend/components/LogsViews/logsViewsListLogic.ts b/products/logs/frontend/components/LogsViews/logsViewsListLogic.ts
index 7c2f1e6efe80..80c62eb3f44a 100644
--- a/products/logs/frontend/components/LogsViews/logsViewsListLogic.ts
+++ b/products/logs/frontend/components/LogsViews/logsViewsListLogic.ts
@@ -1,10 +1,69 @@
-import { actions, connect, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers } from 'kea'
 
 import { logsViewerFiltersLogic } from 'products/logs/frontend/components/LogsViewer/Filters/logsViewerFiltersLogic'
 
-import type { logsViewsListLogicType } from './logsViewsListLogicType'
+import type { LogsViewApi, LogsViewApiFilters } from '../../generated/api.schemas'
+import type { LogsViewerFilters } from '../LogsViewer/config/types'
 import { LogsViewsLogicProps, logsViewsLogic } from './logsViewsLogic'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsViewsListLogicValues {
+    filters: LogsViewerFilters; // logsViewerFiltersLogic
+    isModalOpen: boolean;
+    isSaveModalOpen: boolean;
+    viewName: string;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsViewsListLogicActions {
+    createView: (args_0: {
+        filters: LogsViewApiFilters;
+        name: string;
+    }) => {
+        filters: LogsViewApiFilters;
+        name: string;
+    }; // logsViewsLogic
+    createViewSuccess: (views: LogsViewApi[], payload?: {
+        filters: LogsViewApiFilters;
+        name: string;
+    } | undefined) => {
+        payload?: {
+            filters: LogsViewApiFilters;
+            name: string;
+        };
+        views: LogsViewApi[];
+    }; // logsViewsLogic
+    loadView: (view: LogsViewApi) => {
+        view: LogsViewApi;
+    }; // logsViewsLogic
+    loadViews: () => any; // logsViewsLogic
+    closeModal: () => {
+        value: true;
+    };
+    closeSaveModal: () => {
+        value: true;
+    };
+    openModal: () => {
+        value: true;
+    };
+    openSaveModal: () => {
+        value: true;
+    };
+    saveView: () => {
+        value: true;
+    };
+    setViewName: (viewName: string) => {
+        viewName: string;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsViewsListLogicMeta {
+    key: string;
+}
+
+export type logsViewsListLogicType = MakeLogicType<logsViewsListLogicValues, logsViewsListLogicActions, LogsViewsLogicProps, logsViewsListLogicMeta>;
+
 export const logsViewsListLogic = kea<logsViewsListLogicType>([
     props({} as LogsViewsLogicProps),
     key((props) => props.id),
diff --git a/products/logs/frontend/components/LogsViews/logsViewsLogic.ts b/products/logs/frontend/components/LogsViews/logsViewsLogic.ts
index 4cfc85a7b1a4..7612ac090be2 100644
--- a/products/logs/frontend/components/LogsViews/logsViewsLogic.ts
+++ b/products/logs/frontend/components/LogsViews/logsViewsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -10,7 +10,8 @@ import { logsViewerFiltersLogic } from 'products/logs/frontend/components/LogsVi
 import { LogsViewApi, LogsViewApiFilters } from 'products/logs/frontend/generated/api.schemas'
 import { DEFAULT_ACTIVE_TAB, logsSceneLogic } from 'products/logs/frontend/logsSceneLogic'
 
-import type { logsViewsLogicType } from './logsViewsLogicType'
+import type { LogsSceneActiveTab } from '../../logsSceneLogic'
+import type { LogsViewerFilters } from '../LogsViewer/config/types'
 
 export type LogsView = LogsViewApi
 
@@ -20,6 +21,67 @@ export interface LogsViewsLogicProps {
 
 const logsViewsUrl = (teamId: number | null): string => `api/environments/${teamId}/logs/views`
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsViewsLogicValues {
+    currentTeamId: number | null; // teamLogic
+    views: LogsView[];
+    viewsLoading: boolean;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsViewsLogicActions {
+    setActiveTab: (activeTab: LogsSceneActiveTab) => {
+        activeTab: LogsSceneActiveTab;
+    }; // logsSceneLogic
+    setFilters: (filters: Partial<LogsViewerFilters>, pushToHistory?: boolean | undefined) => {
+        filters: Partial<LogsViewerFilters>;
+        pushToHistory: boolean;
+    }; // logsViewerFiltersLogic
+    createView: ({ name, filters }: {
+        filters: LogsViewApiFilters;
+        name: string;
+    }) => {
+        name: string;
+        filters: LogsViewApiFilters;
+    };
+    createViewFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    createViewSuccess: (views: LogsViewApi[], payload?: {
+        name: string;
+        filters: LogsViewApiFilters;
+    }) => {
+        views: LogsViewApi[];
+        payload?: {
+            name: string;
+            filters: LogsViewApiFilters;
+        };
+    };
+    deleteView: (shortId: string) => {
+        shortId: string;
+    };
+    loadView: (view: LogsView) => {
+        view: LogsViewApi;
+    };
+    loadViews: () => any;
+    loadViewsFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadViewsSuccess: (views: LogsView[], payload?: any) => {
+        views: LogsView[];
+        payload?: any;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsViewsLogicMeta {
+    key: string;
+}
+
+export type logsViewsLogicType = MakeLogicType<logsViewsLogicValues, logsViewsLogicActions, LogsViewsLogicProps, logsViewsLogicMeta>;
+
 export const logsViewsLogic = kea<logsViewsLogicType>([
     props({} as LogsViewsLogicProps),
     key((props) => props.id),
diff --git a/products/logs/frontend/components/SetupPrompt/logsIngestionLogic.tsx b/products/logs/frontend/components/SetupPrompt/logsIngestionLogic.tsx
index 90da7a24859d..e6e47bcee381 100644
--- a/products/logs/frontend/components/SetupPrompt/logsIngestionLogic.tsx
+++ b/products/logs/frontend/components/SetupPrompt/logsIngestionLogic.tsx
@@ -1,13 +1,53 @@
-import { afterMount, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, afterMount, kea, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
 import { retryWithBackoff } from 'lib/utils/async'
 
-import type { logsIngestionLogicType } from './logsIngestionLogicType'
-
 const teamId = window.POSTHOG_APP_CONTEXT?.current_team?.id
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsIngestionLogicValues {
+    cachedTeamHasLogs: boolean | null
+    hasLogs: boolean | undefined
+    teamHasLogs: boolean | undefined
+    teamHasLogsCheckFailed: boolean
+    teamHasLogsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsIngestionLogicActions {
+    loadTeamHasLogs: () => any
+    loadTeamHasLogsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadTeamHasLogsSuccess: (
+        teamHasLogs: boolean,
+        payload?: any
+    ) => {
+        teamHasLogs: boolean
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsIngestionLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        hasLogs: (teamHasLogs: boolean | undefined, cachedTeamHasLogs: boolean | null) => boolean | undefined
+    }
+}
+
+export type logsIngestionLogicType = MakeLogicType<
+    logsIngestionLogicValues,
+    logsIngestionLogicActions,
+    Record<string, any>,
+    logsIngestionLogicMeta
+>
+
 export const logsIngestionLogic = kea<logsIngestionLogicType>([
     path(['products', 'logs', 'components', 'SetupPrompt', 'logsIngestionLogic']),
     loaders({
@@ -41,7 +81,8 @@ export const logsIngestionLogic = kea<logsIngestionLogicType>([
     selectors({
         hasLogs: [
             (s) => [s.teamHasLogs, s.cachedTeamHasLogs],
-            (teamHasLogs, cachedTeamHasLogs): boolean | undefined => teamHasLogs ?? cachedTeamHasLogs ?? undefined,
+            (teamHasLogs: boolean | undefined, cachedTeamHasLogs: boolean | null): boolean | undefined =>
+                teamHasLogs ?? cachedTeamHasLogs ?? undefined,
         ],
     }),
 
diff --git a/products/logs/frontend/components/VirtualizedLogsList/virtualizedLogsListLogic.ts b/products/logs/frontend/components/VirtualizedLogsList/virtualizedLogsListLogic.ts
index a799b4e7295e..f60902ccb9c5 100644
--- a/products/logs/frontend/components/VirtualizedLogsList/virtualizedLogsListLogic.ts
+++ b/products/logs/frontend/components/VirtualizedLogsList/virtualizedLogsListLogic.ts
@@ -1,6 +1,4 @@
-import { actions, kea, key, path, props, reducers, selectors } from 'kea'
-
-import type { virtualizedLogsListLogicType } from './virtualizedLogsListLogicType'
+import { MakeLogicType, actions, kea, key, path, props, reducers, selectors } from 'kea'
 
 export interface VirtualizedLogsListLogicProps {
     id: string
@@ -9,6 +7,44 @@ export interface VirtualizedLogsListLogicProps {
 
 const DEFAULT_SCROLL_THRESHOLD = 100
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface virtualizedLogsListLogicValues {
+    cellScrollLefts: Record<string, number>
+    containerWidth: number
+    shouldLoadMore: (stopIndex: number, dataSourceLength: number, hasMore: boolean, isLoading: boolean) => boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface virtualizedLogsListLogicActions {
+    setCellScrollLeft: (
+        cellKey: string,
+        scrollLeft: number
+    ) => {
+        cellKey: string
+        scrollLeft: number
+    }
+    setContainerWidth: (width: number) => {
+        width: number
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface virtualizedLogsListLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        shouldLoadMore: (
+            arg: any
+        ) => (stopIndex: number, dataSourceLength: number, hasMore: boolean, isLoading: boolean) => boolean
+    }
+}
+
+export type virtualizedLogsListLogicType = MakeLogicType<
+    virtualizedLogsListLogicValues,
+    virtualizedLogsListLogicActions,
+    VirtualizedLogsListLogicProps,
+    virtualizedLogsListLogicMeta
+>
+
 export const virtualizedLogsListLogic = kea<virtualizedLogsListLogicType>([
     props({ scrollThreshold: DEFAULT_SCROLL_THRESHOLD } as VirtualizedLogsListLogicProps),
     key((props) => props.id),
diff --git a/products/logs/frontend/logsConfigLogic.ts b/products/logs/frontend/logsConfigLogic.ts
index 88f3fd9c321f..5a4cbcb3e7bc 100644
--- a/products/logs/frontend/logsConfigLogic.ts
+++ b/products/logs/frontend/logsConfigLogic.ts
@@ -1,11 +1,9 @@
-import { afterMount, connect, kea, path } from 'kea'
+import { MakeLogicType, afterMount, connect, kea, path } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
 import { teamLogic } from 'scenes/teamLogic'
 
-import type { logsConfigLogicType } from './logsConfigLogicType'
-
 // Mirrors the backend default in products/logs/backend/models.py — the convention
 // documented at https://posthog.com/docs/logs/link-session-replay. Used as the
 // pre-load fallback in `PersonLogsTab` so the initial pinned filter matches the
@@ -21,6 +19,49 @@ export interface LogsConfig {
     logs_session_id_attribute_keys: string[]
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsConfigLogicValues {
+    currentTeamId: number | null // teamLogic
+    logsConfig: LogsConfig | null
+    logsConfigLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsConfigLogicActions {
+    loadLogsConfig: () => any
+    loadLogsConfigFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadLogsConfigSuccess: (
+        logsConfig: LogsConfig,
+        payload?: any
+    ) => {
+        logsConfig: LogsConfig
+        payload?: any
+    }
+    updateLogsConfig: (patch: Partial<LogsConfig>) => Partial<LogsConfig>
+    updateLogsConfigFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateLogsConfigSuccess: (
+        logsConfig: LogsConfig,
+        payload?: Partial<LogsConfig>
+    ) => {
+        logsConfig: LogsConfig
+        payload?: Partial<LogsConfig>
+    }
+}
+
+export type logsConfigLogicType = MakeLogicType<logsConfigLogicValues, logsConfigLogicActions>
+
 export const logsConfigLogic = kea<logsConfigLogicType>([
     path(['products', 'logs', 'frontend', 'logsConfigLogic']),
     connect({ values: [teamLogic, ['currentTeamId']] }),
diff --git a/products/logs/frontend/logsSceneLogic.tsx b/products/logs/frontend/logsSceneLogic.tsx
index 9ed6c3d86a49..d962a9941daa 100644
--- a/products/logs/frontend/logsSceneLogic.tsx
+++ b/products/logs/frontend/logsSceneLogic.tsx
@@ -1,5 +1,5 @@
 import { deepEqual as equal } from 'fast-equals'
-import { actions, connect, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers } from 'kea'
 import { router, urlToAction } from 'kea-router'
 
 import { syncSearchParams, updateSearchParams } from '@posthog/products-error-tracking/frontend/utils'
@@ -32,7 +32,7 @@ import {
 import { logDetailsModalLogic } from 'products/logs/frontend/components/LogsViewer/LogDetailsModal/logDetailsModalLogic'
 import { logsViewerLogic } from 'products/logs/frontend/components/LogsViewer/logsViewerLogic'
 
-import type { logsSceneLogicType } from './logsSceneLogicType'
+import type { LogsOrderBy } from './types'
 
 export const getLogsSqlEditorTabId = (id: string): string => `logs-sql-editor-${id}`
 
@@ -54,6 +54,77 @@ const resolveActiveTabFromParams = (params: Params): LogsSceneActiveTab | null =
     return null
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsSceneLogicValues {
+    facetNameSearch: string; // facetRailLogic
+    orderBy: LogsOrderBy; // logsViewerConfigLogic
+    initialLogsLimit: number | null; // logsViewerDataLogic
+    filters: LogsViewerFilters; // logsViewerFiltersLogic
+    utcDateRange: {
+        date_from: string | null | undefined;
+        date_to: string | null | undefined;
+        explicitDate: boolean | null | undefined;
+    }; // logsViewerFiltersLogic
+    linkToLogId: string | null; // logsViewerLogic
+    activeTab: LogsSceneActiveTab;
+    expandedAttributeBreaksdowns: string[];
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsSceneLogicActions {
+    setFacetNameSearch: (search: string) => {
+        search: string;
+    }; // facetRailLogic
+    closeLogDetails: () => {
+        value: true;
+    }; // logDetailsModalLogic
+    pushToFilterHistory: (filters: LogsViewerFilters) => {
+        filters: LogsViewerFilters;
+    }; // logsFilterHistoryLogic
+    setOrderBy: (orderBy: LogsOrderBy, source?: "header" | "toolbar" | undefined) => {
+        orderBy: LogsOrderBy;
+        source: "header" | "toolbar";
+    }; // logsViewerConfigLogic
+    fetchLogsSuccess: (logs: import("~/queries/schema").LogMessage[], payload?: any) => {
+        logs: import("~/queries/schema").LogMessage[];
+        payload?: any;
+    }; // logsViewerDataLogic
+    handleQueryChange: (filterType: string, extraProps?: Record<string, unknown> | undefined) => {
+        extraProps: Record<string, unknown> | undefined;
+        filterType: string;
+    }; // logsViewerDataLogic
+    setInitialLogsLimit: (initialLogsLimit: number | null) => {
+        initialLogsLimit: number | null;
+    }; // logsViewerDataLogic
+    setFilters: (filters: Partial<LogsViewerFilters>, pushToHistory?: boolean | undefined) => {
+        filters: Partial<LogsViewerFilters>;
+        pushToHistory: boolean;
+    }; // logsViewerFiltersLogic
+    clearLinkToLogId: () => {
+        value: true;
+    }; // logsViewerLogic
+    setLinkToLogId: (linkToLogId: string | null) => {
+        linkToLogId: string | null;
+    }; // logsViewerLogic
+    keepSqlEditorMounted: (editorTabId: string) => {
+        editorTabId: string;
+    };
+    setActiveTab: (activeTab: LogsSceneActiveTab) => {
+        activeTab: LogsSceneActiveTab;
+    };
+    setExpandedAttributeBreaksdowns: (expandedAttributeBreaksdowns: string[]) => {
+        expandedAttributeBreaksdowns: string[];
+    };
+    syncUrl: () => {
+        value: true;
+    };
+    toggleAttributeBreakdown: (key: string) => {
+        key: string;
+    };
+}
+
+export type logsSceneLogicType = MakeLogicType<logsSceneLogicValues, logsSceneLogicActions>;
+
 export const logsSceneLogic = kea<logsSceneLogicType>([
     path(['products', 'logs', 'frontend', 'logsSceneLogic']),
     connect(() => ({
diff --git a/products/logs/frontend/scenes/LogsAlertDetailScene/logsAlertDetailSceneLogic.ts b/products/logs/frontend/scenes/LogsAlertDetailScene/logsAlertDetailSceneLogic.ts
index 6e8d45f1a4b8..472ab022908b 100644
--- a/products/logs/frontend/scenes/LogsAlertDetailScene/logsAlertDetailSceneLogic.ts
+++ b/products/logs/frontend/scenes/LogsAlertDetailScene/logsAlertDetailSceneLogic.ts
@@ -1,4 +1,5 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import type { FieldName } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 
@@ -34,7 +35,7 @@ import {
 } from 'products/logs/frontend/generated/api'
 import { LogsAlertConfigurationApi } from 'products/logs/frontend/generated/api.schemas'
 
-import type { logsAlertDetailSceneLogicType } from './logsAlertDetailSceneLogicType'
+import type { LogsAlertFormType } from '../../components/LogsAlerting/logsAlertFormLogic'
 
 export type LogsAlertDetailTab = 'configuration' | 'notifications' | 'history' | 'logs'
 const VALID_TABS: LogsAlertDetailTab[] = ['configuration', 'notifications', 'history', 'logs']
@@ -46,6 +47,142 @@ export interface LogsAlertDetailSceneLogicProps {
     id: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsAlertDetailSceneLogicValues {
+    alertForm: LogsAlertFormType // logsAlertFormLogic
+    alertFormChanged: boolean // logsAlertFormLogic
+    currentTeamId: number | null // teamLogic
+    activeTab: LogsAlertDetailTab
+    alert: LogsAlertConfigurationApi | null
+    alertId: string
+    alertLoading: boolean
+    breadcrumbs: Breadcrumb[]
+    isDraft: boolean
+    logsViewerUrl: string
+    pendingEnableAfterSave: boolean
+    sparkline7d: any[]
+    sparkline7dFetched: boolean
+    sparkline7dLoading: boolean
+    sparkline7dSeries: {
+        labels: string[]
+        series: SparklineTimeSeries[]
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsAlertDetailSceneLogicActions {
+    loadEvents: () => any // logsAlertEventHistoryLogic
+    resetAlertForm: (values?: LogsAlertFormType | undefined) => {
+        values?: LogsAlertFormType
+    } // logsAlertFormLogic
+    setAlertFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    } // logsAlertFormLogic
+    submitAlertForm: () => {
+        value: boolean
+    } // logsAlertFormLogic
+    submitAlertFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    } // logsAlertFormLogic
+    submitAlertFormSuccess: (alertForm: LogsAlertFormType) => {
+        alertForm: LogsAlertFormType
+    } // logsAlertFormLogic
+    destinationsChanged: () => {
+        value: true
+    } // logsAlertNotificationLogic
+    loadAlerts: () => any // logsAlertingLogic
+    applyEnabledChange: (enabled: boolean) => {
+        enabled: boolean
+    }
+    deleteAlert: () => {
+        value: true
+    }
+    enableAlert: () => {
+        value: true
+    }
+    loadAlert: () => any
+    loadAlertFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAlertSuccess: (
+        alert: LogsAlertConfigurationApi,
+        payload?: any
+    ) => {
+        alert: LogsAlertConfigurationApi
+        payload?: any
+    }
+    loadSparkline7d: () => any
+    loadSparkline7dFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSparkline7dSuccess: (
+        sparkline7d: any[],
+        payload?: any
+    ) => {
+        sparkline7d: any[]
+        payload?: any
+    }
+    markPendingEnable: () => {
+        value: true
+    }
+    patchAlertLocally: (patch: Partial<LogsAlertConfigurationApi>) => {
+        patch: Partial<LogsAlertConfigurationApi>
+    }
+    resetAlert: () => {
+        value: true
+    }
+    setActiveTab: (tab: LogsAlertDetailTab) => {
+        tab: LogsAlertDetailTab
+    }
+    snoozeAlert: (durationMinutes: number) => {
+        durationMinutes: number
+    }
+    toggleEnabled: () => {
+        value: true
+    }
+    unsnoozeAlert: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsAlertDetailSceneLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        alertId: (arg: any) => string
+        isDraft: (alert: LogsAlertConfigurationApi | null) => boolean
+        breadcrumbs: (alert: LogsAlertConfigurationApi | null) => Breadcrumb[]
+        sparkline7dSeries: (sparkline7d: any[]) => {
+            labels: string[]
+            series: SparklineTimeSeries[]
+        }
+        logsViewerUrl: (alert: LogsAlertConfigurationApi | null) => string
+    }
+}
+
+export type logsAlertDetailSceneLogicType = MakeLogicType<
+    logsAlertDetailSceneLogicValues,
+    logsAlertDetailSceneLogicActions,
+    LogsAlertDetailSceneLogicProps,
+    logsAlertDetailSceneLogicMeta
+>
+
 export const logsAlertDetailSceneLogic = kea<logsAlertDetailSceneLogicType>([
     path((key) => ['products', 'logs', 'frontend', 'scenes', 'LogsAlertDetailScene', 'logsAlertDetailSceneLogic', key]),
     props({} as LogsAlertDetailSceneLogicProps),
diff --git a/products/logs/frontend/scenes/LogsAlertNotificationDetailScene/logsAlertNotificationDetailSceneLogic.ts b/products/logs/frontend/scenes/LogsAlertNotificationDetailScene/logsAlertNotificationDetailSceneLogic.ts
index d16c4e11fba4..aacfd5026fa0 100644
--- a/products/logs/frontend/scenes/LogsAlertNotificationDetailScene/logsAlertNotificationDetailSceneLogic.ts
+++ b/products/logs/frontend/scenes/LogsAlertNotificationDetailScene/logsAlertNotificationDetailSceneLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 import { subscriptions } from 'kea-subscriptions'
@@ -22,13 +22,100 @@ import {
 import { logsAlertsDestinationsDeleteCreate, logsAlertsRetrieve } from 'products/logs/frontend/generated/api'
 import { LogsAlertConfigurationApi } from 'products/logs/frontend/generated/api.schemas'
 
-import type { logsAlertNotificationDetailSceneLogicType } from './logsAlertNotificationDetailSceneLogicType'
-
 export interface LogsAlertNotificationDetailSceneLogicProps {
     alertId: string
     hogFunctionId: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsAlertNotificationDetailSceneLogicValues {
+    slackIntegrations: IntegrationType[] | undefined // integrationsLogic
+    currentTeamId: number | null // teamLogic
+    alert: LogsAlertConfigurationApi | null
+    alertId: string
+    alertLoading: boolean
+    breadcrumbs: Breadcrumb[]
+    destinationGroup: LogsAlertDestinationGroup | null
+    firstSlackIntegration: IntegrationType | undefined
+    hasLoaded: boolean
+    hogFunctionId: string
+    hogFunctions: HogFunctionType[]
+    hogFunctionsError: string | null
+    hogFunctionsLoading: boolean
+    isDeleting: boolean
+    togglingHogFunctionIds: string[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsAlertNotificationDetailSceneLogicActions {
+    deleteDestination: (displayLabel: string) => {
+        displayLabel: string
+    }
+    deleteDestinationDone: () => {
+        value: true
+    }
+    loadAlert: () => any
+    loadAlertFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAlertSuccess: (
+        alert: LogsAlertConfigurationApi | null,
+        payload?: any
+    ) => {
+        alert: LogsAlertConfigurationApi | null
+        payload?: any
+    }
+    loadHogFunctions: () => any
+    loadHogFunctionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadHogFunctionsSuccess: (
+        hogFunctions: HogFunctionType[],
+        payload?: any
+    ) => {
+        hogFunctions: HogFunctionType[]
+        payload?: any
+    }
+    setHogFunctionEnabled: (
+        hogFunctionId: string,
+        enabled: boolean
+    ) => {
+        enabled: boolean
+        hogFunctionId: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsAlertNotificationDetailSceneLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        alertId: (arg: any) => string
+        hogFunctionId: (arg: any) => string
+        firstSlackIntegration: (slackIntegrations: IntegrationType[] | undefined) => IntegrationType | undefined
+        destinationGroup: (hogFunctions: HogFunctionType[], hogFunctionId: string) => LogsAlertDestinationGroup | null
+        breadcrumbs: (
+            alert: LogsAlertConfigurationApi | null,
+            destinationGroup: LogsAlertDestinationGroup | null,
+            alertId: string
+        ) => Breadcrumb[]
+    }
+}
+
+export type logsAlertNotificationDetailSceneLogicType = MakeLogicType<
+    logsAlertNotificationDetailSceneLogicValues,
+    logsAlertNotificationDetailSceneLogicActions,
+    LogsAlertNotificationDetailSceneLogicProps,
+    logsAlertNotificationDetailSceneLogicMeta
+>
+
 export const logsAlertNotificationDetailSceneLogic = kea<logsAlertNotificationDetailSceneLogicType>([
     path((key) => [
         'products',
diff --git a/products/logs/frontend/scenes/LogsSamplingDetailScene/logsSamplingDetailSceneLogic.ts b/products/logs/frontend/scenes/LogsSamplingDetailScene/logsSamplingDetailSceneLogic.ts
index 4d06da9eee8e..49458a41e61d 100644
--- a/products/logs/frontend/scenes/LogsSamplingDetailScene/logsSamplingDetailSceneLogic.ts
+++ b/products/logs/frontend/scenes/LogsSamplingDetailScene/logsSamplingDetailSceneLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 
@@ -21,12 +21,74 @@ import { logsSamplingRulesDestroy, logsSamplingRulesRetrieve } from 'products/lo
 import { LogsSamplingRuleApi } from 'products/logs/frontend/generated/api.schemas'
 import { logsDropRulesSettingsUrl } from 'products/logs/frontend/logsDropRulesSettingsUrl'
 
-import type { logsSamplingDetailSceneLogicType } from './logsSamplingDetailSceneLogicType'
+import type { LogsSamplingFormType } from '../../components/LogsSampling/logsSamplingFormLogic'
 
 export interface LogsSamplingDetailSceneLogicProps {
     id: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsSamplingDetailSceneLogicValues {
+    currentTeamId: number | null // teamLogic
+    breadcrumbs: Breadcrumb[]
+    rule: LogsSamplingRuleApi | null
+    ruleDropImpact24h: SamplingRuleDropTotals | null
+    ruleDropImpact24hLoading: boolean
+    ruleLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsSamplingDetailSceneLogicActions {
+    resetSamplingForm: (values?: LogsSamplingFormType | undefined) => {
+        values?: LogsSamplingFormType
+    } // logsSamplingFormLogic
+    deleteRule: () => {
+        value: true
+    }
+    loadRule: () => any
+    loadRuleDropImpact24h: (_: any) => any
+    loadRuleDropImpact24hFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRuleDropImpact24hSuccess: (
+        ruleDropImpact24h: SamplingRuleDropTotals,
+        payload?: any
+    ) => {
+        ruleDropImpact24h: SamplingRuleDropTotals
+        payload?: any
+    }
+    loadRuleFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRuleSuccess: (
+        rule: LogsSamplingRuleApi,
+        payload?: any
+    ) => {
+        rule: LogsSamplingRuleApi
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsSamplingDetailSceneLogicMeta {
+    key: string
+}
+
+export type logsSamplingDetailSceneLogicType = MakeLogicType<
+    logsSamplingDetailSceneLogicValues,
+    logsSamplingDetailSceneLogicActions,
+    LogsSamplingDetailSceneLogicProps,
+    logsSamplingDetailSceneLogicMeta
+>
+
 export const logsSamplingDetailSceneLogic = kea<logsSamplingDetailSceneLogicType>([
     path((key) => [
         'products',
diff --git a/products/logs/frontend/scenes/LogsSamplingNewScene/logsSamplingNewSceneLogic.ts b/products/logs/frontend/scenes/LogsSamplingNewScene/logsSamplingNewSceneLogic.ts
index e40a9fa634c4..2534208851e4 100644
--- a/products/logs/frontend/scenes/LogsSamplingNewScene/logsSamplingNewSceneLogic.ts
+++ b/products/logs/frontend/scenes/LogsSamplingNewScene/logsSamplingNewSceneLogic.ts
@@ -1,4 +1,4 @@
-import { kea, path, selectors } from 'kea'
+import { MakeLogicType, kea, path, selectors } from 'kea'
 
 import { Scene } from 'scenes/sceneTypes'
 
@@ -6,7 +6,12 @@ import { Breadcrumb } from '~/types'
 
 import { logsDropRulesSettingsUrl } from 'products/logs/frontend/logsDropRulesSettingsUrl'
 
-import type { logsSamplingNewSceneLogicType } from './logsSamplingNewSceneLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface logsSamplingNewSceneLogicValues {
+    breadcrumbs: Breadcrumb[]
+}
+
+export type logsSamplingNewSceneLogicType = MakeLogicType<logsSamplingNewSceneLogicValues, {}>
 
 export const logsSamplingNewSceneLogic = kea<logsSamplingNewSceneLogicType>([
     path(['products', 'logs', 'frontend', 'scenes', 'LogsSamplingNewScene', 'logsSamplingNewSceneLogic']),
diff --git a/products/managed_migrations/frontend/managedMigrationLogic.ts b/products/managed_migrations/frontend/managedMigrationLogic.ts
index 7126579ef27e..deddb86cf8f4 100644
--- a/products/managed_migrations/frontend/managedMigrationLogic.ts
+++ b/products/managed_migrations/frontend/managedMigrationLogic.ts
@@ -1,5 +1,17 @@
-import { actions, afterMount, beforeUnmount, kea, listeners, path, props, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    afterMount,
+    beforeUnmount,
+    kea,
+    listeners,
+    path,
+    props,
+    reducers,
+    selectors,
+} from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { router, urlToAction } from 'kea-router'
 
@@ -11,7 +23,6 @@ import { urls } from 'scenes/urls'
 import { FileSystemIconType } from '~/queries/schema/schema-general'
 import { Breadcrumb, ProjectTreeRef } from '~/types'
 
-import type { managedMigrationLogicType } from './managedMigrationLogicType'
 import { ManagedMigration } from './types'
 
 export interface ManagedMigrationForm {
@@ -52,6 +63,117 @@ const NEW_MANAGED_MIGRATION: ManagedMigrationForm = {
     generate_group_identify_events: true,
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface managedMigrationLogicValues {
+    breadcrumbs: Breadcrumb[]
+    isManagedMigrationSubmitting: boolean
+    isManagedMigrationValid: boolean
+    isPolling: boolean
+    managedMigration: ManagedMigrationForm
+    managedMigrationAllErrors: Record<string, any>
+    managedMigrationChanged: boolean
+    managedMigrationErrors: DeepPartialMap<ManagedMigrationForm, ValidationErrorType>
+    managedMigrationHasErrors: boolean
+    managedMigrationId: string | null
+    managedMigrationManualErrors: Record<string, any>
+    managedMigrationTouched: boolean
+    managedMigrationTouches: Record<string, boolean>
+    managedMigrationValidationErrors: DeepPartialMap<ManagedMigrationForm, ValidationErrorType>
+    migrations: ManagedMigration[]
+    migrationsLoading: boolean
+    projectTreeRef: ProjectTreeRef
+    showManagedMigrationErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface managedMigrationLogicActions {
+    editManagedMigration: (id: string | null) => {
+        id: string | null
+    }
+    loadMigrations: () => any
+    loadMigrationsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadMigrationsSuccess: (
+        migrations: ManagedMigration[],
+        payload?: any
+    ) => {
+        migrations: ManagedMigration[]
+        payload?: any
+    }
+    pauseMigration: (id: string) => {
+        id: string
+    }
+    resetManagedMigration: (values?: ManagedMigrationForm) => {
+        values?: ManagedMigrationForm
+    }
+    resumeMigration: (id: string) => {
+        id: string
+    }
+    setManagedMigrationManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setManagedMigrationValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setManagedMigrationValues: (values: DeepPartial<ManagedMigrationForm>) => {
+        values: DeepPartial<ManagedMigrationForm>
+    }
+    startPolling: () => {
+        value: true
+    }
+    stopPolling: () => {
+        value: true
+    }
+    submitManagedMigration: () => {
+        value: boolean
+    }
+    submitManagedMigrationFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitManagedMigrationRequest: (managedMigration: ManagedMigrationForm) => {
+        managedMigration: ManagedMigrationForm
+    }
+    submitManagedMigrationSuccess: (managedMigration: ManagedMigrationForm) => {
+        managedMigration: ManagedMigrationForm
+    }
+    touchManagedMigrationField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface managedMigrationLogicProps {
+    managedMigrationId: null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface managedMigrationLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        breadcrumbs: (managedMigrationId: null) => Breadcrumb[]
+        projectTreeRef: (managedMigrationId: null) => ProjectTreeRef
+    }
+}
+
+export type managedMigrationLogicType = MakeLogicType<
+    managedMigrationLogicValues,
+    managedMigrationLogicActions,
+    managedMigrationLogicProps,
+    managedMigrationLogicMeta
+>
+
 export const managedMigrationLogic = kea<managedMigrationLogicType>([
     path(['products', 'managed_migrations', 'frontend', 'managedMigrationLogic']),
     props({
diff --git a/products/mcp_analytics/frontend/clustering/mcpClusteringLogic.ts b/products/mcp_analytics/frontend/clustering/mcpClusteringLogic.ts
index c16ac74631f0..4279f1dbdf6d 100644
--- a/products/mcp_analytics/frontend/clustering/mcpClusteringLogic.ts
+++ b/products/mcp_analytics/frontend/clustering/mcpClusteringLogic.ts
@@ -1,4 +1,15 @@
-import { actions, afterMount, beforeUnmount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    afterMount,
+    beforeUnmount,
+    connect,
+    kea,
+    listeners,
+    path,
+    reducers,
+    selectors,
+} from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -7,7 +18,6 @@ import { teamLogic } from 'scenes/teamLogic'
 
 import { mcpAnalyticsIntentClustersRecompute, mcpAnalyticsIntentClustersRetrieve } from '../generated/api'
 import type { MCPIntentClusterApi, MCPIntentClusterSnapshotApi } from '../generated/api.schemas'
-import type { mcpClusteringLogicType } from './mcpClusteringLogicType'
 
 const EMPTY_SNAPSHOT: MCPIntentClusterSnapshotApi = {
     status: 'idle',
@@ -36,6 +46,107 @@ function normalizeSnapshot(
 
 export type ClusterSortKey = 'calls' | 'errors' | 'entropy' | 'concentration'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface mcpClusteringLogicValues {
+    currentProjectId: number | string // teamLogic
+    clusters: readonly MCPIntentClusterApi[]
+    concentratedRoutes: {
+        focused: number
+        total: number
+    }
+    hasSnapshot: boolean
+    isComputing: boolean
+    selectedCluster: MCPIntentClusterApi | null
+    selectedClusterId: number | null
+    snapshot: MCPIntentClusterSnapshotApi
+    snapshotLoading: boolean
+    sortKey: ClusterSortKey
+    sortedClusters: MCPIntentClusterApi[]
+    spreadRoutes: number
+    toolColumns: string[]
+    topErrorRoute: MCPIntentClusterApi | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface mcpClusteringLogicActions {
+    loadSnapshot: () => any
+    loadSnapshotFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSnapshotSuccess: (
+        snapshot: MCPIntentClusterSnapshotApi,
+        payload?: any
+    ) => {
+        snapshot: MCPIntentClusterSnapshotApi
+        payload?: any
+    }
+    pollSnapshot: () => {
+        value: true
+    }
+    recompute: () => {
+        value: true
+    }
+    selectCluster: (clusterId: number | null) => {
+        clusterId: number | null
+    }
+    setSortKey: (sortKey: ClusterSortKey) => {
+        sortKey: ClusterSortKey
+    }
+    startPolling: () => {
+        value: true
+    }
+    stopPolling: () => {
+        value: true
+    }
+    triggerRecompute: () => any
+    triggerRecomputeFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    triggerRecomputeSuccess: (
+        snapshot: MCPIntentClusterSnapshotApi,
+        payload?: any
+    ) => {
+        snapshot: MCPIntentClusterSnapshotApi
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface mcpClusteringLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        clusters: (snapshot: MCPIntentClusterSnapshotApi) => readonly MCPIntentClusterApi[]
+        sortedClusters: (clusters: readonly MCPIntentClusterApi[], sortKey: ClusterSortKey) => MCPIntentClusterApi[]
+        toolColumns: (clusters: readonly MCPIntentClusterApi[]) => string[]
+        selectedCluster: (
+            clusters: readonly MCPIntentClusterApi[],
+            selectedClusterId: number | null
+        ) => MCPIntentClusterApi | null
+        concentratedRoutes: (clusters: readonly MCPIntentClusterApi[]) => {
+            focused: number
+            total: number
+        }
+        spreadRoutes: (clusters: readonly MCPIntentClusterApi[]) => number
+        topErrorRoute: (clusters: readonly MCPIntentClusterApi[]) => MCPIntentClusterApi | null
+        isComputing: (snapshot: MCPIntentClusterSnapshotApi) => boolean
+        hasSnapshot: (snapshot: MCPIntentClusterSnapshotApi) => boolean
+    }
+}
+
+export type mcpClusteringLogicType = MakeLogicType<
+    mcpClusteringLogicValues,
+    mcpClusteringLogicActions,
+    Record<string, any>,
+    mcpClusteringLogicMeta
+>
+
 export const mcpClusteringLogic = kea<mcpClusteringLogicType>([
     path(['products', 'mcp_analytics', 'frontend', 'clustering', 'mcpClusteringLogic']),
     connect(() => ({
@@ -85,10 +196,13 @@ export const mcpClusteringLogic = kea<mcpClusteringLogicType>([
         ],
     }),
     selectors({
-        clusters: [(s) => [s.snapshot], (snapshot): readonly MCPIntentClusterApi[] => snapshot.clusters],
+        clusters: [
+            (s) => [s.snapshot],
+            (snapshot: MCPIntentClusterSnapshotApi): readonly MCPIntentClusterApi[] => snapshot.clusters,
+        ],
         sortedClusters: [
             (s) => [s.clusters, s.sortKey],
-            (clusters, sortKey): MCPIntentClusterApi[] => {
+            (clusters: readonly MCPIntentClusterApi[], sortKey: ClusterSortKey): MCPIntentClusterApi[] => {
                 const arr = [...clusters]
                 switch (sortKey) {
                     case 'errors':
@@ -108,7 +222,7 @@ export const mcpClusteringLogic = kea<mcpClusteringLogicType>([
         // Tools across the whole snapshot, ordered by total calls desc — these are the heatmap columns.
         toolColumns: [
             (s) => [s.clusters],
-            (clusters): string[] => {
+            (clusters: readonly MCPIntentClusterApi[]): string[] => {
                 const totals = new Map<string, number>()
                 for (const cluster of clusters) {
                     for (const entry of cluster.tool_distribution) {
@@ -120,7 +234,10 @@ export const mcpClusteringLogic = kea<mcpClusteringLogicType>([
         ],
         selectedCluster: [
             (s) => [s.clusters, s.selectedClusterId],
-            (clusters, selectedClusterId): MCPIntentClusterApi | null => {
+            (
+                clusters: readonly MCPIntentClusterApi[],
+                selectedClusterId: number | null
+            ): MCPIntentClusterApi | null => {
                 if (selectedClusterId === null) {
                     return null
                 }
@@ -130,14 +247,14 @@ export const mcpClusteringLogic = kea<mcpClusteringLogicType>([
         // Scorecard derivations — all from existing aggregate fields.
         concentratedRoutes: [
             (s) => [s.clusters],
-            (clusters): { focused: number; total: number } => ({
+            (clusters: readonly MCPIntentClusterApi[]): { focused: number; total: number } => ({
                 focused: clusters.filter((c) => (c.tool_distribution[0]?.pct ?? 0) >= 80).length,
                 total: clusters.length,
             }),
         ],
         spreadRoutes: [
             (s) => [s.clusters],
-            (clusters): number =>
+            (clusters: readonly MCPIntentClusterApi[]): number =>
                 clusters.filter((c) => {
                     const top = c.tool_distribution[0]?.pct ?? 100
                     return c.tool_distribution.length >= 2 && top < 50
@@ -145,7 +262,7 @@ export const mcpClusteringLogic = kea<mcpClusteringLogicType>([
         ],
         topErrorRoute: [
             (s) => [s.clusters],
-            (clusters): MCPIntentClusterApi | null => {
+            (clusters: readonly MCPIntentClusterApi[]): MCPIntentClusterApi | null => {
                 if (clusters.length === 0) {
                     return null
                 }
@@ -155,10 +272,14 @@ export const mcpClusteringLogic = kea<mcpClusteringLogicType>([
                 )[0]
             },
         ],
-        isComputing: [(s) => [s.snapshot], (snapshot): boolean => snapshot.status === 'computing'],
+        isComputing: [
+            (s) => [s.snapshot],
+            (snapshot: MCPIntentClusterSnapshotApi): boolean => snapshot.status === 'computing',
+        ],
         hasSnapshot: [
             (s) => [s.snapshot],
-            (snapshot): boolean => snapshot.last_computed_at !== null || snapshot.clusters.length > 0,
+            (snapshot: MCPIntentClusterSnapshotApi): boolean =>
+                snapshot.last_computed_at !== null || snapshot.clusters.length > 0,
         ],
     }),
     listeners(({ actions, values, cache }) => ({
diff --git a/products/mcp_analytics/frontend/earlyData/mcpEarlyDataLogic.ts b/products/mcp_analytics/frontend/earlyData/mcpEarlyDataLogic.ts
index e54bd3366e2f..7eccc815308e 100644
--- a/products/mcp_analytics/frontend/earlyData/mcpEarlyDataLogic.ts
+++ b/products/mcp_analytics/frontend/earlyData/mcpEarlyDataLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { teamLogic } from 'scenes/teamLogic'
@@ -6,9 +6,9 @@ import { teamLogic } from 'scenes/teamLogic'
 import { mcpAnalyticsSessionsActivityOverview, mcpAnalyticsSessionsIntentDigest } from '../generated/api'
 import type { MCPActivityOverviewApi } from '../generated/api.schemas'
 import { mcpAnalyticsOnboardingLogic } from '../mcpAnalyticsOnboardingLogic'
+import type { MCPOnboardingSignals } from '../mcpAnalyticsOnboardingLogic'
 import { buildActivitySummary } from './activitySummary'
 import { ChecklistItem, EarlyStats, buildChecklist } from './earlyDataChecklist'
-import type { mcpEarlyDataLogicType } from './mcpEarlyDataLogicType'
 
 export type { ChecklistItem, EarlyStats } from './earlyDataChecklist'
 
@@ -59,6 +59,85 @@ const EMPTY_STATS: EarlyStats = {
 // a minute" is live enough.
 const REFRESH_INTERVAL_MS = 60000
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface mcpEarlyDataLogicValues {
+    signals: MCPOnboardingSignals | null // mcpAnalyticsOnboardingLogic
+    currentProjectId: number | string // teamLogic
+    checklist: ChecklistItem[]
+    clients: EarlyClientRow[]
+    intentDigest: IntentDigest | null
+    intentDigestLoading: boolean
+    intentThemes: IntentTheme[]
+    isRefreshing: boolean
+    overview: MCPActivityOverviewApi | null
+    overviewLoading: boolean
+    recentCalls: EarlyRecentCall[]
+    stats: EarlyStats
+    summary: string
+    topTools: EarlyToolRow[]
+    totalCalls: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface mcpEarlyDataLogicActions {
+    loadSignals: (_?: void | undefined) => void // mcpAnalyticsOnboardingLogic
+    loadIntentDigest: (_: void) => void
+    loadIntentDigestFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadIntentDigestSuccess: (
+        intentDigest: IntentDigest | null,
+        payload?: void
+    ) => {
+        intentDigest: IntentDigest | null
+        payload?: void
+    }
+    loadOverview: (_: void) => void
+    loadOverviewFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadOverviewSuccess: (
+        overview: MCPActivityOverviewApi | null,
+        payload?: void
+    ) => {
+        overview: MCPActivityOverviewApi | null
+        payload?: void
+    }
+    refreshAll: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface mcpEarlyDataLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        stats: (overview: MCPActivityOverviewApi | null) => EarlyStats
+        topTools: (overview: MCPActivityOverviewApi | null) => EarlyToolRow[]
+        clients: (overview: MCPActivityOverviewApi | null) => EarlyClientRow[]
+        recentCalls: (overview: MCPActivityOverviewApi | null) => EarlyRecentCall[]
+        totalCalls: (signals: MCPOnboardingSignals | null, stats: EarlyStats) => number
+        summary: (totalCalls: number, stats: EarlyStats, topTools: EarlyToolRow[]) => string
+        intentThemes: (recentCalls: EarlyRecentCall[]) => IntentTheme[]
+        checklist: (stats: EarlyStats) => ChecklistItem[]
+        isRefreshing: (overviewLoading: boolean, intentDigestLoading: boolean) => boolean
+    }
+}
+
+export type mcpEarlyDataLogicType = MakeLogicType<
+    mcpEarlyDataLogicValues,
+    mcpEarlyDataLogicActions,
+    Record<string, any>,
+    mcpEarlyDataLogicMeta
+>
+
 export const mcpEarlyDataLogic = kea<mcpEarlyDataLogicType>([
     path(['products', 'mcp_analytics', 'frontend', 'earlyData', 'mcpEarlyDataLogic']),
     connect(() => ({
@@ -103,7 +182,7 @@ export const mcpEarlyDataLogic = kea<mcpEarlyDataLogicType>([
     selectors({
         stats: [
             (s) => [s.overview],
-            (overview): EarlyStats =>
+            (overview: MCPActivityOverviewApi | null): EarlyStats =>
                 overview
                     ? {
                           totalCalls: overview.stats.total_calls,
@@ -118,17 +197,17 @@ export const mcpEarlyDataLogic = kea<mcpEarlyDataLogicType>([
         ],
         topTools: [
             (s) => [s.overview],
-            (overview): EarlyToolRow[] =>
+            (overview: MCPActivityOverviewApi | null): EarlyToolRow[] =>
                 (overview?.top_tools ?? []).map((row) => ({ tool: row.tool, calls: row.calls, errors: row.errors })),
         ],
         clients: [
             (s) => [s.overview],
-            (overview): EarlyClientRow[] =>
+            (overview: MCPActivityOverviewApi | null): EarlyClientRow[] =>
                 (overview?.clients ?? []).map((row) => ({ client: row.client || 'Unknown client', calls: row.calls })),
         ],
         recentCalls: [
             (s) => [s.overview],
-            (overview): EarlyRecentCall[] =>
+            (overview: MCPActivityOverviewApi | null): EarlyRecentCall[] =>
                 (overview?.recent_calls ?? []).map((row) => ({
                     timestamp: row.timestamp,
                     tool: row.tool,
@@ -144,11 +223,14 @@ export const mcpEarlyDataLogic = kea<mcpEarlyDataLogicType>([
         // the summary so the view never contradicts itself.
         totalCalls: [
             (s) => [s.signals, s.stats],
-            (signals, stats): number => Math.max(stats.totalCalls, signals?.toolCallsTotal ?? 0),
+            (
+                signals: null | import('../mcpAnalyticsOnboardingLogic').MCPOnboardingSignals,
+                stats: EarlyStats
+            ): number => Math.max(stats.totalCalls, signals?.toolCallsTotal ?? 0),
         ],
         summary: [
             (s) => [s.totalCalls, s.stats, s.topTools],
-            (totalCalls, stats, topTools): string =>
+            (totalCalls: number, stats: EarlyStats, topTools: EarlyToolRow[]): string =>
                 buildActivitySummary({
                     totalCalls,
                     distinctClients: stats.distinctClients,
@@ -161,7 +243,7 @@ export const mcpEarlyDataLogic = kea<mcpEarlyDataLogicType>([
         // beats any lossy aggregation of it.
         intentThemes: [
             (s) => [s.recentCalls],
-            (recentCalls): IntentTheme[] => {
+            (recentCalls: EarlyRecentCall[]): IntentTheme[] => {
                 const counts = new Map<string, number>()
                 for (const call of recentCalls) {
                     if (call.intent) {
@@ -174,10 +256,10 @@ export const mcpEarlyDataLogic = kea<mcpEarlyDataLogicType>([
                     .slice(0, 6)
             },
         ],
-        checklist: [(s) => [s.stats], (stats): ChecklistItem[] => buildChecklist(stats)],
+        checklist: [(s) => [s.stats], (stats: EarlyStats): ChecklistItem[] => buildChecklist(stats)],
         isRefreshing: [
             (s) => [s.overviewLoading, s.intentDigestLoading],
-            (overviewLoading, intentDigestLoading): boolean => overviewLoading || intentDigestLoading,
+            (overviewLoading: boolean, intentDigestLoading: boolean): boolean => overviewLoading || intentDigestLoading,
         ],
     }),
     listeners(({ actions }) => ({
diff --git a/products/mcp_analytics/frontend/firstLook/mcpFirstLookLogic.ts b/products/mcp_analytics/frontend/firstLook/mcpFirstLookLogic.ts
index a2a92f5cdb09..71e30e6125c8 100644
--- a/products/mcp_analytics/frontend/firstLook/mcpFirstLookLogic.ts
+++ b/products/mcp_analytics/frontend/firstLook/mcpFirstLookLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 
 import posthog from 'lib/posthog-typed'
 import { organizationLogic } from 'scenes/organizationLogic'
@@ -9,11 +9,104 @@ import { sidePanelStateLogic } from '~/layout/navigation-3000/sidepanel/sidePane
 import { ProductKey } from '~/queries/schema/schema-general'
 import { SidePanelTab } from '~/types'
 
+import type { OrganizationType, TeamPublicType, TeamType, UserType } from '../../../../frontend/src/types'
 import { mcpAnalyticsOnboardingLogic } from '../mcpAnalyticsOnboardingLogic'
 import type { HarnessRow, KPIData, ToolRow } from '../mcpDashboardOverviewLogic'
 import { mcpDashboardOverviewLogic } from '../mcpDashboardOverviewLogic'
 import { buildChips, buildEditorPrompt, buildHeadline, buildMaxPrompt, type FirstLookChip } from './firstLookCopy'
-import type { mcpFirstLookLogicType } from './mcpFirstLookLogicType'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface mcpFirstLookLogicValues {
+    isOnboarded: boolean // mcpAnalyticsOnboardingLogic
+    harnessRows: HarnessRow[] // mcpDashboardOverviewLogic
+    kpis: KPIData // mcpDashboardOverviewLogic
+    toolRows: ToolRow[] // mcpDashboardOverviewLogic
+    currentOrganization: OrganizationType | null // organizationLogic
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    user: UserType | null // userLogic
+    chips: FirstLookChip[]
+    dominantClient: string | null
+    editorExpanded: boolean
+    editorPrompt: {
+        label: string
+        prompt: string
+    }
+    eventProperties: Record<string, unknown>
+    headline: string
+    maxPrompt: string
+    shouldShow: boolean
+    topTool: ToolRow | null
+    worstErrorTool: ToolRow | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface mcpFirstLookLogicActions {
+    updateHasSeenProductIntroFor: (
+        productKey: ProductKey,
+        value?: boolean | undefined
+    ) => {
+        productKey: ProductKey
+        value: boolean
+    } // userLogic
+    askMax: () => {
+        value: true
+    }
+    dismiss: () => {
+        value: true
+    }
+    dismissAndAskMax: () => {
+        value: true
+    }
+    toggleEditor: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface mcpFirstLookLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        shouldShow: (
+            isOnboarded: boolean,
+            user: UserType | null,
+            currentTeam: TeamPublicType | TeamType | null,
+            kpis: KPIData,
+            toolRows: ToolRow[]
+        ) => boolean
+        topTool: (toolRows: ToolRow[]) => ToolRow | null
+        worstErrorTool: (toolRows: ToolRow[]) => ToolRow | null
+        dominantClient: (harnessRows: HarnessRow[]) => string | null
+        headline: (
+            currentOrganization: OrganizationType | null,
+            currentTeam: TeamPublicType | TeamType | null,
+            topTool: ToolRow | null,
+            dominantClient: string | null,
+            kpis: KPIData
+        ) => string
+        maxPrompt: (worstErrorTool: ToolRow | null, topTool: ToolRow | null) => string
+        editorPrompt: (dominantClient: string | null) => {
+            label: string
+            prompt: string
+        }
+        chips: (
+            topTool: ToolRow | null,
+            worstErrorTool: ToolRow | null,
+            kpis: KPIData,
+            dominantClient: string | null
+        ) => FirstLookChip[]
+        eventProperties: (
+            dominantClient: string | null,
+            topTool: ToolRow | null,
+            worstErrorTool: ToolRow | null
+        ) => Record<string, unknown>
+    }
+}
+
+export type mcpFirstLookLogicType = MakeLogicType<
+    mcpFirstLookLogicValues,
+    mcpFirstLookLogicActions,
+    Record<string, any>,
+    mcpFirstLookLogicMeta
+>
 
 export const mcpFirstLookLogic = kea<mcpFirstLookLogicType>([
     path(['products', 'mcp_analytics', 'frontend', 'firstLook', 'mcpFirstLookLogic']),
@@ -46,7 +139,13 @@ export const mcpFirstLookLogic = kea<mcpFirstLookLogicType>([
         // Once per user, never on demo, and only after data loads (avoids an empty-flash).
         shouldShow: [
             (s) => [s.isOnboarded, s.user, s.currentTeam, s.kpis, s.toolRows],
-            (isOnboarded, user, currentTeam, kpis: KPIData, toolRows: ToolRow[]): boolean => {
+            (
+                isOnboarded: boolean,
+                user: null | import('~/types').UserType,
+                currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType,
+                kpis: KPIData,
+                toolRows: ToolRow[]
+            ): boolean => {
                 const hasData = toolRows.length > 0 || kpis.toolCalls.value > 0
                 return (
                     Boolean(isOnboarded) &&
@@ -68,7 +167,13 @@ export const mcpFirstLookLogic = kea<mcpFirstLookLogicType>([
         ],
         headline: [
             (s) => [s.currentOrganization, s.currentTeam, s.topTool, s.dominantClient, s.kpis],
-            (currentOrganization, currentTeam, topTool, dominantClient, kpis: KPIData): string =>
+            (
+                currentOrganization: null | import('~/types').OrganizationType,
+                currentTeam: null | import('~/types').TeamPublicType | import('~/types').TeamType,
+                topTool: ToolRow | null,
+                dominantClient: string | null,
+                kpis: KPIData
+            ): string =>
                 buildHeadline({
                     company: currentOrganization?.name,
                     project: currentTeam?.name,
@@ -79,20 +184,30 @@ export const mcpFirstLookLogic = kea<mcpFirstLookLogicType>([
         ],
         maxPrompt: [
             (s) => [s.worstErrorTool, s.topTool],
-            (worstErrorTool, topTool): string => buildMaxPrompt({ worstErrorTool, topTool }),
+            (worstErrorTool: ToolRow | null, topTool: ToolRow | null): string =>
+                buildMaxPrompt({ worstErrorTool, topTool }),
         ],
         editorPrompt: [
             (s) => [s.dominantClient],
-            (dominantClient): { label: string; prompt: string } => buildEditorPrompt({ client: dominantClient }),
+            (dominantClient: string | null): { label: string; prompt: string } =>
+                buildEditorPrompt({ client: dominantClient }),
         ],
         chips: [
             (s) => [s.topTool, s.worstErrorTool, s.kpis, s.dominantClient],
-            (topTool, worstErrorTool, kpis: KPIData, dominantClient): FirstLookChip[] =>
-                buildChips({ topTool, worstErrorTool, kpis, client: dominantClient }),
+            (
+                topTool: ToolRow | null,
+                worstErrorTool: ToolRow | null,
+                kpis: KPIData,
+                dominantClient: string | null
+            ): FirstLookChip[] => buildChips({ topTool, worstErrorTool, kpis, client: dominantClient }),
         ],
         eventProperties: [
             (s) => [s.dominantClient, s.topTool, s.worstErrorTool],
-            (dominantClient, topTool: ToolRow | null, worstErrorTool: ToolRow | null): Record<string, unknown> => ({
+            (
+                dominantClient: string | null,
+                topTool: ToolRow | null,
+                worstErrorTool: ToolRow | null
+            ): Record<string, unknown> => ({
                 client: dominantClient,
                 busiest_tool: topTool?.tool ?? null,
                 flakiest_tool: worstErrorTool?.tool ?? null,
diff --git a/products/mcp_analytics/frontend/mcpAnalyticsOnboardingLogic.ts b/products/mcp_analytics/frontend/mcpAnalyticsOnboardingLogic.ts
index 2d1c61f06b72..1bc72416039a 100644
--- a/products/mcp_analytics/frontend/mcpAnalyticsOnboardingLogic.ts
+++ b/products/mcp_analytics/frontend/mcpAnalyticsOnboardingLogic.ts
@@ -1,4 +1,4 @@
-import { afterMount, kea, listeners, path, selectors } from 'kea'
+import { MakeLogicType, afterMount, kea, listeners, path, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -6,7 +6,6 @@ import { addProductIntent } from 'lib/utils/product-intents'
 
 import { HogQLQueryResponse, NodeKind, ProductIntentContext, ProductKey } from '~/queries/schema/schema-general'
 
-import type { mcpAnalyticsOnboardingLogicType } from './mcpAnalyticsOnboardingLogicType'
 import { asNumber } from './queryResultParsers'
 
 export type MCPOnboardingState = 'not-instrumented' | 'connected-no-calls' | 'onboarded'
@@ -60,6 +59,50 @@ WHERE event IN ('$mcp_initialize', '$mcp_tool_call')
 // pauses this on hidden tabs and tears it down on unmount.
 const POLL_INTERVAL_MS = 20000
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface mcpAnalyticsOnboardingLogicValues {
+    dashboardStage: MCPDashboardStage | null
+    isOnboarded: boolean
+    onboardingState: MCPOnboardingState | null
+    signals: MCPOnboardingSignals | null
+    signalsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface mcpAnalyticsOnboardingLogicActions {
+    loadSignals: (_: void) => void
+    loadSignalsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSignalsSuccess: (
+        signals: MCPOnboardingSignals,
+        payload?: void
+    ) => {
+        signals: MCPOnboardingSignals
+        payload?: void
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface mcpAnalyticsOnboardingLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        onboardingState: (signals: MCPOnboardingSignals | null) => MCPOnboardingState | null
+        isOnboarded: (onboardingState: MCPOnboardingState | null) => boolean
+        dashboardStage: (signals: MCPOnboardingSignals | null) => MCPDashboardStage | null
+    }
+}
+
+export type mcpAnalyticsOnboardingLogicType = MakeLogicType<
+    mcpAnalyticsOnboardingLogicValues,
+    mcpAnalyticsOnboardingLogicActions,
+    Record<string, any>,
+    mcpAnalyticsOnboardingLogicMeta
+>
+
 export const mcpAnalyticsOnboardingLogic = kea<mcpAnalyticsOnboardingLogicType>([
     path(['products', 'mcp_analytics', 'frontend', 'mcpAnalyticsOnboardingLogic']),
     loaders({
@@ -100,7 +143,7 @@ export const mcpAnalyticsOnboardingLogic = kea<mcpAnalyticsOnboardingLogicType>(
     selectors({
         onboardingState: [
             (s) => [s.signals],
-            (signals): MCPOnboardingState | null => {
+            (signals: MCPOnboardingSignals | null): MCPOnboardingState | null => {
                 if (!signals) {
                     return null
                 }
@@ -113,10 +156,13 @@ export const mcpAnalyticsOnboardingLogic = kea<mcpAnalyticsOnboardingLogicType>(
                 return 'not-instrumented'
             },
         ],
-        isOnboarded: [(s) => [s.onboardingState], (onboardingState): boolean => onboardingState === 'onboarded'],
+        isOnboarded: [
+            (s) => [s.onboardingState],
+            (onboardingState: MCPOnboardingState | null): boolean => onboardingState === 'onboarded',
+        ],
         dashboardStage: [
             (s) => [s.signals],
-            (signals): MCPDashboardStage | null => {
+            (signals: MCPOnboardingSignals | null): MCPDashboardStage | null => {
                 if (!signals || !signals.hasToolCall) {
                     return null
                 }
diff --git a/products/mcp_analytics/frontend/mcpAnalyticsSceneLogic.ts b/products/mcp_analytics/frontend/mcpAnalyticsSceneLogic.ts
index c7a0ba4062a0..e2c1a1a1fc1f 100644
--- a/products/mcp_analytics/frontend/mcpAnalyticsSceneLogic.ts
+++ b/products/mcp_analytics/frontend/mcpAnalyticsSceneLogic.ts
@@ -1,4 +1,4 @@
-import { connect, kea, listeners, path, selectors } from 'kea'
+import { MakeLogicType, connect, kea, listeners, path, selectors } from 'kea'
 import { combineUrl, router } from 'kea-router'
 
 import { teamLogic } from 'scenes/teamLogic'
@@ -8,8 +8,9 @@ import { ProductKey } from '~/queries/schema/schema-general'
 import { sceneLogic } from '~/scenes/sceneLogic'
 import { OnboardingStepKey } from '~/types'
 
+import type { TeamPublicType, TeamType } from '../../../frontend/src/types'
 import { mcpAnalyticsOnboardingLogic } from './mcpAnalyticsOnboardingLogic'
-import type { mcpAnalyticsSceneLogicType } from './mcpAnalyticsSceneLogicType'
+import type { MCPOnboardingState } from './mcpAnalyticsOnboardingLogic'
 
 export type MCPAnalyticsTab = 'activity' | 'dashboard' | 'sessions' | 'tool-quality' | 'intent-clustering'
 
@@ -44,6 +45,23 @@ const SCENE_KEY_TO_TAB: Record<string, MCPAnalyticsTab> = {
     mcpAnalyticsIntentClustering: 'intent-clustering',
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface mcpAnalyticsSceneLogicValues {
+    onboardingState: MCPOnboardingState | null; // mcpAnalyticsOnboardingLogic
+    sceneKey: string | null; // sceneLogic
+    currentTeam: TeamPublicType | TeamType | null; // teamLogic
+    activeTab: MCPAnalyticsTab;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface mcpAnalyticsSceneLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        activeTab: (sceneKey: string | null) => MCPAnalyticsTab;
+    };
+}
+
+export type mcpAnalyticsSceneLogicType = MakeLogicType<mcpAnalyticsSceneLogicValues, {}, Record<string, any>, mcpAnalyticsSceneLogicMeta>;
+
 export const mcpAnalyticsSceneLogic = kea<mcpAnalyticsSceneLogicType>([
     path(['products', 'mcp_analytics', 'frontend', 'mcpAnalyticsSceneLogic']),
     connect(() => ({
diff --git a/products/mcp_analytics/frontend/mcpAnalyticsToolDetailLogic.ts b/products/mcp_analytics/frontend/mcpAnalyticsToolDetailLogic.ts
index 67f2ce196ec5..de0cb175ad52 100644
--- a/products/mcp_analytics/frontend/mcpAnalyticsToolDetailLogic.ts
+++ b/products/mcp_analytics/frontend/mcpAnalyticsToolDetailLogic.ts
@@ -1,4 +1,4 @@
-import { afterMount, kea, key, path, props, selectors } from 'kea'
+import { MakeLogicType, afterMount, kea, key, path, props, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -16,8 +16,6 @@ import {
     NodeKind,
 } from '~/queries/schema/schema-general'
 
-import type { mcpAnalyticsToolDetailLogicType } from './mcpAnalyticsToolDetailLogicType'
-
 export interface ToolSummary {
     calls: number
     errors: number
@@ -115,6 +113,202 @@ async function neighborRows(toolName: string, direction: 'before' | 'after'): Pr
     return (response?.results ?? []).map((r) => [r.neighbor_tool, r.co_occurrences])
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface mcpAnalyticsToolDetailLogicValues {
+    byHarnessRows: ResultRows
+    byHarnessRowsLoading: boolean
+    dailyChartData: DailyChartData
+    dailyStats: DailyToolStat[]
+    dailyStatsLoading: boolean
+    descriptions: DescriptionRevision[]
+    descriptionsLoading: boolean
+    failureRows: ResultRows
+    failureRowsLoading: boolean
+    intentCoverage: IntentCoverage | null
+    intentCoverageLoading: boolean
+    neighborsAfterRows: ResultRows
+    neighborsAfterRowsLoading: boolean
+    neighborsBeforeRows: ResultRows
+    neighborsBeforeRowsLoading: boolean
+    sampleIntentRows: ResultRows
+    sampleIntentRowsLoading: boolean
+    summary: ToolSummary | null
+    summaryLoading: boolean
+    toolName: string
+    topUserRows: ResultRows
+    topUserRowsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface mcpAnalyticsToolDetailLogicActions {
+    loadByHarnessRows: () => any
+    loadByHarnessRowsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadByHarnessRowsSuccess: (
+        byHarnessRows: ResultRows,
+        payload?: any
+    ) => {
+        byHarnessRows: ResultRows
+        payload?: any
+    }
+    loadDailyStats: () => any
+    loadDailyStatsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadDailyStatsSuccess: (
+        dailyStats: DailyToolStat[],
+        payload?: any
+    ) => {
+        dailyStats: DailyToolStat[]
+        payload?: any
+    }
+    loadDescriptions: () => any
+    loadDescriptionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadDescriptionsSuccess: (
+        descriptions: DescriptionRevision[],
+        payload?: any
+    ) => {
+        descriptions: DescriptionRevision[]
+        payload?: any
+    }
+    loadFailureRows: () => any
+    loadFailureRowsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadFailureRowsSuccess: (
+        failureRows: ResultRows,
+        payload?: any
+    ) => {
+        failureRows: ResultRows
+        payload?: any
+    }
+    loadIntentCoverage: () => any
+    loadIntentCoverageFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadIntentCoverageSuccess: (
+        intentCoverage: IntentCoverage | null,
+        payload?: any
+    ) => {
+        intentCoverage: IntentCoverage | null
+        payload?: any
+    }
+    loadNeighborsAfterRows: () => any
+    loadNeighborsAfterRowsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadNeighborsAfterRowsSuccess: (
+        neighborsAfterRows: ResultRows,
+        payload?: any
+    ) => {
+        neighborsAfterRows: ResultRows
+        payload?: any
+    }
+    loadNeighborsBeforeRows: () => any
+    loadNeighborsBeforeRowsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadNeighborsBeforeRowsSuccess: (
+        neighborsBeforeRows: ResultRows,
+        payload?: any
+    ) => {
+        neighborsBeforeRows: ResultRows
+        payload?: any
+    }
+    loadSampleIntentRows: () => any
+    loadSampleIntentRowsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSampleIntentRowsSuccess: (
+        sampleIntentRows: ResultRows,
+        payload?: any
+    ) => {
+        sampleIntentRows: ResultRows
+        payload?: any
+    }
+    loadSummary: () => any
+    loadSummaryFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSummarySuccess: (
+        summary: ToolSummary | null,
+        payload?: any
+    ) => {
+        summary: ToolSummary | null
+        payload?: any
+    }
+    loadTopUserRows: () => any
+    loadTopUserRowsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadTopUserRowsSuccess: (
+        topUserRows: ResultRows,
+        payload?: any
+    ) => {
+        topUserRows: ResultRows
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface mcpAnalyticsToolDetailLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        toolName: (arg: any) => string
+        dailyChartData: (dailyStats: DailyToolStat[]) => DailyChartData
+    }
+}
+
+export type mcpAnalyticsToolDetailLogicType = MakeLogicType<
+    mcpAnalyticsToolDetailLogicValues,
+    mcpAnalyticsToolDetailLogicActions,
+    MCPAnalyticsToolDetailLogicProps,
+    mcpAnalyticsToolDetailLogicMeta
+>
+
 export const mcpAnalyticsToolDetailLogic = kea<mcpAnalyticsToolDetailLogicType>([
     path(['products', 'mcp_analytics', 'frontend', 'mcpAnalyticsToolDetailLogic']),
     key((props: MCPAnalyticsToolDetailLogicProps) => props.toolName),
diff --git a/products/mcp_analytics/frontend/mcpAnalyticsToolQualityLogic.ts b/products/mcp_analytics/frontend/mcpAnalyticsToolQualityLogic.ts
index 900a93c90635..aae454930958 100644
--- a/products/mcp_analytics/frontend/mcpAnalyticsToolQualityLogic.ts
+++ b/products/mcp_analytics/frontend/mcpAnalyticsToolQualityLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 
@@ -14,7 +14,6 @@ import { hogql } from '~/queries/utils'
 import { type AnyPropertyFilter, PropertyFilterType, PropertyOperator } from '~/types'
 
 import toolQualityQueryTemplate from '../backend/templates/tool_quality.sql?raw'
-import type { mcpAnalyticsToolQualityLogicType } from './mcpAnalyticsToolQualityLogicType'
 
 // `$mcp_tool_category` is stamped onto every $mcp_tool_call event by the producer
 // (PostHog's MCP server from its catalog; external servers via the SDK). We read
@@ -164,6 +163,136 @@ function sortToolRows(rows: ToolQualityRow[], sort: SortState): ToolQualityRow[]
     })
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface mcpAnalyticsToolQualityLogicValues {
+    availableCategories: string[]
+    availableCategoriesLoading: boolean
+    categoryCounts: CategoryCount[]
+    categoryCountsLoading: boolean
+    categoryProperties: AnyPropertyFilter[]
+    dailyChartData: DailyChartData
+    dailyStats: DailyToolStat[]
+    dailyStatsLoading: boolean
+    dateFilter: DateFilter
+    dateRangeLabel: string
+    filteredRows: ToolQualityRow[]
+    scopeShare: ScopeShare
+    searchTerm: string
+    selectedCategories: string[]
+    selectedTool: string | null
+    toolQualitySort: SortState
+    toolRows: ToolQualityRow[]
+    toolRowsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface mcpAnalyticsToolQualityLogicActions {
+    loadAvailableCategories: () => any
+    loadAvailableCategoriesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAvailableCategoriesSuccess: (
+        availableCategories: string[],
+        payload?: any
+    ) => {
+        availableCategories: string[]
+        payload?: any
+    }
+    loadCategoryCounts: () => any
+    loadCategoryCountsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadCategoryCountsSuccess: (
+        categoryCounts: CategoryCount[],
+        payload?: any
+    ) => {
+        categoryCounts: CategoryCount[]
+        payload?: any
+    }
+    loadDailyStats: (_: void) => void
+    loadDailyStatsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadDailyStatsSuccess: (
+        dailyStats: DailyToolStat[],
+        payload?: void
+    ) => {
+        dailyStats: DailyToolStat[]
+        payload?: void
+    }
+    loadToolRows: (_: void) => void
+    loadToolRowsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadToolRowsSuccess: (
+        toolRows: ToolQualityRow[],
+        payload?: void
+    ) => {
+        toolRows: ToolQualityRow[]
+        payload?: void
+    }
+    reloadAll: () => {
+        value: true
+    }
+    setDateFilter: (
+        dateFrom: string | null,
+        dateTo: string | null
+    ) => {
+        dateFrom: string | null
+        dateTo: string | null
+    }
+    setSearchTerm: (searchTerm: string) => {
+        searchTerm: string
+    }
+    setSelectedCategories: (categories: string[]) => {
+        categories: string[]
+    }
+    setSelectedTool: (tool: string | null) => {
+        tool: string | null
+    }
+    setToolQualitySort: (
+        column: string,
+        direction: SortDirection
+    ) => {
+        column: string
+        direction: SortDirection
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface mcpAnalyticsToolQualityLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        categoryProperties: (selectedCategories: string[]) => AnyPropertyFilter[]
+        dateRangeLabel: (dateFilter: DateFilter) => string
+        scopeShare: (categoryCounts: CategoryCount[], selectedCategories: string[]) => ScopeShare
+        filteredRows: (toolRows: ToolQualityRow[], toolQualitySort: SortState, searchTerm: string) => ToolQualityRow[]
+        dailyChartData: (dailyStats: DailyToolStat[], dateFilter: DateFilter, timezone: string) => DailyChartData
+    }
+}
+
+export type mcpAnalyticsToolQualityLogicType = MakeLogicType<
+    mcpAnalyticsToolQualityLogicValues,
+    mcpAnalyticsToolQualityLogicActions,
+    Record<string, any>,
+    mcpAnalyticsToolQualityLogicMeta
+>
+
 export const mcpAnalyticsToolQualityLogic = kea<mcpAnalyticsToolQualityLogicType>([
     path(['products', 'mcp_analytics', 'frontend', 'mcpAnalyticsToolQualityLogic']),
 
diff --git a/products/mcp_analytics/frontend/mcpDashboardOverviewLogic.ts b/products/mcp_analytics/frontend/mcpDashboardOverviewLogic.ts
index d48072fa0b08..4f64335e84b0 100644
--- a/products/mcp_analytics/frontend/mcpDashboardOverviewLogic.ts
+++ b/products/mcp_analytics/frontend/mcpDashboardOverviewLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 
@@ -12,9 +12,9 @@ import { urls } from 'scenes/urls'
 import { HogQLFilters, HogQLQueryResponse, MCPHarnessBreakdownItem, NodeKind } from '~/queries/schema/schema-general'
 import { AnyPropertyFilter, IntervalType, TeamType } from '~/types'
 
+import type { TeamPublicType } from '../../../frontend/src/types'
 import { mcpClusteringLogic } from './clustering/mcpClusteringLogic'
 import type { MCPIntentClusterApi } from './generated/api.schemas'
-import type { mcpDashboardOverviewLogicType } from './mcpDashboardOverviewLogicType'
 
 export interface DateFilter {
     dateFrom: string | null
@@ -463,6 +463,234 @@ export function buildKPIs(rows: BucketRow[], currentStartBucket: string): KPIDat
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface mcpDashboardOverviewLogicValues {
+    clusters: readonly MCPIntentClusterApi[] // mcpClusteringLogic
+    hasSnapshot: boolean // mcpClusteringLogic
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    timezone: string // teamLogic
+    activityIncompleteTail: boolean
+    activityRows: ActivityRow[]
+    activityRowsLoading: boolean
+    bucketKeys: string[]
+    dailyActivity: DailyActivity
+    dateFilter: DateFilter
+    filterTestAccounts: boolean
+    filterTestAccountsOverride: boolean | null
+    harnessRows: HarnessRow[]
+    harnessRowsLoading: boolean
+    intentClusterCount: KPIMetric
+    interval: IntervalType
+    kpis: KPIData
+    kpisLoading: boolean
+    notableSessions: NotableSession[]
+    propertyFilters: AnyPropertyFilter[]
+    queryFilters: HogQLFilters
+    sessionRows: SessionRow[]
+    sessionRowsLoading: boolean
+    toolDailyRows: ToolDailyRow[]
+    toolDailyRowsLoading: boolean
+    toolDailySeries: ToolDailySeries
+    toolRows: ToolRow[]
+    toolRowsLoading: boolean
+    users: KPIMetric
+    usersLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface mcpDashboardOverviewLogicActions {
+    loadActivityRows: (_: void) => void
+    loadActivityRowsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadActivityRowsSuccess: (
+        activityRows: ActivityRow[],
+        payload?: void
+    ) => {
+        activityRows: ActivityRow[]
+        payload?: void
+    }
+    loadHarnessRows: (_: void) => void
+    loadHarnessRowsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadHarnessRowsSuccess: (
+        harnessRows: {
+            category: string
+            error_rate_pct: number
+            errors: number
+            sessions: number
+            total_calls: number
+        }[],
+        payload?: void
+    ) => {
+        harnessRows: {
+            category: string
+            error_rate_pct: number
+            errors: number
+            sessions: number
+            total_calls: number
+        }[]
+        payload?: void
+    }
+    loadKPIs: (_: void) => void
+    loadKPIsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadKPIsSuccess: (
+        kpis: KPIData,
+        payload?: void
+    ) => {
+        kpis: KPIData
+        payload?: void
+    }
+    loadSessionRows: (_: void) => void
+    loadSessionRowsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSessionRowsSuccess: (
+        sessionRows: {
+            distinct_tools: number
+            duration_seconds: number
+            error_rate_pct: number
+            errors: number
+            last_seen: string
+            session_id: string
+            tool_calls: number
+        }[],
+        payload?: void
+    ) => {
+        sessionRows: {
+            distinct_tools: number
+            duration_seconds: number
+            error_rate_pct: number
+            errors: number
+            last_seen: string
+            session_id: string
+            tool_calls: number
+        }[]
+        payload?: void
+    }
+    loadToolDailyRows: (_: void) => void
+    loadToolDailyRowsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadToolDailyRowsSuccess: (
+        toolDailyRows: ToolDailyRow[],
+        payload?: void
+    ) => {
+        toolDailyRows: ToolDailyRow[]
+        payload?: void
+    }
+    loadToolRows: (_: void) => void
+    loadToolRowsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadToolRowsSuccess: (
+        toolRows: {
+            error_rate_pct: number
+            errors: number
+            p95_duration_ms: number
+            tool: string
+            total_calls: number
+        }[],
+        payload?: void
+    ) => {
+        toolRows: {
+            error_rate_pct: number
+            errors: number
+            p95_duration_ms: number
+            tool: string
+            total_calls: number
+        }[]
+        payload?: void
+    }
+    loadUsers: (_: void) => void
+    loadUsersFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadUsersSuccess: (
+        users: KPIMetric,
+        payload?: void
+    ) => {
+        users: KPIMetric
+        payload?: void
+    }
+    reloadAll: () => {
+        value: true
+    }
+    setDateFilter: (
+        dateFrom: string | null,
+        dateTo: string | null
+    ) => {
+        dateFrom: string | null
+        dateTo: string | null
+    }
+    setFilterTestAccounts: (filterTestAccounts: boolean | null) => {
+        filterTestAccounts: boolean | null
+    }
+    setPropertyFilters: (properties: AnyPropertyFilter[]) => {
+        properties: AnyPropertyFilter[]
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface mcpDashboardOverviewLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        filterTestAccounts: (
+            filterTestAccountsOverride: boolean | null,
+            currentTeam: TeamPublicType | TeamType | null
+        ) => boolean
+        queryFilters: (
+            dateFilter: DateFilter,
+            filterTestAccounts: boolean,
+            propertyFilters: AnyPropertyFilter[]
+        ) => HogQLFilters
+        interval: (dateFilter: DateFilter) => IntervalType
+        bucketKeys: (dateFilter: DateFilter, timezone: string, interval: IntervalType) => string[]
+        activityIncompleteTail: (bucketKeys: string[], timezone: string, interval: IntervalType) => boolean
+        dailyActivity: (activityRows: ActivityRow[], bucketKeys: string[]) => DailyActivity
+        toolDailySeries: (toolDailyRows: ToolDailyRow[], bucketKeys: string[]) => ToolDailySeries
+        notableSessions: (sessionRows: SessionRow[]) => NotableSession[]
+        intentClusterCount: (clusters: readonly MCPIntentClusterApi[]) => KPIMetric
+    }
+}
+
+export type mcpDashboardOverviewLogicType = MakeLogicType<
+    mcpDashboardOverviewLogicValues,
+    mcpDashboardOverviewLogicActions,
+    Record<string, any>,
+    mcpDashboardOverviewLogicMeta
+>
+
 export const mcpDashboardOverviewLogic = kea<mcpDashboardOverviewLogicType>([
     path(['products', 'mcp_analytics', 'frontend', 'mcpDashboardOverviewLogic']),
     connect(() => ({
diff --git a/products/mcp_analytics/frontend/sessions/mcpSessionsLogic.ts b/products/mcp_analytics/frontend/sessions/mcpSessionsLogic.ts
index ddaf9b5eba1a..0fd1538c78f8 100644
--- a/products/mcp_analytics/frontend/sessions/mcpSessionsLogic.ts
+++ b/products/mcp_analytics/frontend/sessions/mcpSessionsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 
@@ -12,7 +12,6 @@ import {
     mcpAnalyticsSessionsToolCalls,
 } from '../generated/api'
 import type { MCPSessionApi, MCPSessionIntentApi, MCPToolCallApi } from '../generated/api.schemas'
-import type { mcpSessionsLogicType } from './mcpSessionsLogicType'
 
 export interface MCPSessionsFilters {
     search: string
@@ -93,6 +92,183 @@ async function fetchToolCallsPage(
     return { calls: response.results ?? [], hasNext: response.has_next ?? false }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface mcpSessionsLogicValues {
+    currentProjectId: number | string // teamLogic
+    dateFilter: MCPSessionsDateFilter
+    filters: MCPSessionsFilters
+    generatedIntent: MCPSessionIntentApi | null
+    generatedIntentLoading: boolean
+    generatingSessionId: string | null
+    hasNext: boolean
+    intentOverrides: Record<string, string>
+    isSelectedSessionGenerating: boolean
+    selectedSession: MCPSessionApi | null
+    selectedSessionId: string | null
+    selectedSessionIntent: string
+    selectedSessionToolCalls: {
+        calls: MCPToolCallApi[]
+        hasNext: boolean
+        loading: boolean
+        loadingMore: boolean
+    }
+    sessions: MCPSessionApi[]
+    sessionsLoading: boolean
+    sorting: MCPSessionSorting | null
+    toolCalls: SessionToolCalls
+    toolCallsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface mcpSessionsLogicActions {
+    generateIntent: (sessionId: string) => string
+    generateIntentFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    generateIntentSuccess: (
+        generatedIntent: MCPSessionIntentApi | null,
+        payload?: string
+    ) => {
+        generatedIntent: MCPSessionIntentApi | null
+        payload?: string
+    }
+    loadMoreSessions: () => {
+        value: true
+    }
+    loadMoreSessionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadMoreSessionsSuccess: (
+        sessions: MCPSessionApi[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        sessions: MCPSessionApi[]
+        payload?: {
+            value: true
+        }
+    }
+    loadMoreToolCalls: () => {
+        value: true
+    }
+    loadMoreToolCallsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadMoreToolCallsSuccess: (
+        toolCalls: SessionToolCalls,
+        payload?: {
+            value: true
+        }
+    ) => {
+        toolCalls: SessionToolCalls
+        payload?: {
+            value: true
+        }
+    }
+    loadSessions: () => {
+        value: true
+    }
+    loadSessionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSessionsSuccess: (
+        sessions: MCPSessionApi[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        sessions: MCPSessionApi[]
+        payload?: {
+            value: true
+        }
+    }
+    loadToolCalls: (sessionId: string) => string
+    loadToolCallsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadToolCallsSuccess: (
+        toolCalls: SessionToolCalls,
+        payload?: string
+    ) => {
+        toolCalls: SessionToolCalls
+        payload?: string
+    }
+    selectSession: (sessionId: string | null) => {
+        sessionId: string | null
+    }
+    setDateFilter: (
+        dateFrom: string | null,
+        dateTo: string | null
+    ) => {
+        dateFrom: string | null
+        dateTo: string | null
+    }
+    setFilters: (filters: Partial<MCPSessionsFilters>) => {
+        filters: Partial<MCPSessionsFilters>
+    }
+    setHasNext: (hasNext: boolean) => {
+        hasNext: boolean
+    }
+    setSorting: (sorting: MCPSessionSorting | null) => {
+        sorting: MCPSessionSorting | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface mcpSessionsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        selectedSession: (sessions: MCPSessionApi[], selectedSessionId: string | null) => MCPSessionApi | null
+        selectedSessionIntent: (
+            selectedSession: MCPSessionApi | null,
+            intentOverrides: Record<string, string>,
+            selectedSessionId: string | null
+        ) => string
+        isSelectedSessionGenerating: (
+            generatedIntentLoading: boolean,
+            generatingSessionId: string | null,
+            selectedSessionId: string | null
+        ) => boolean
+        selectedSessionToolCalls: (
+            toolCalls: SessionToolCalls,
+            selectedSessionId: string | null,
+            toolCallsLoading: boolean
+        ) => {
+            calls: MCPToolCallApi[]
+            hasNext: boolean
+            loading: boolean
+            loadingMore: boolean
+        }
+    }
+}
+
+export type mcpSessionsLogicType = MakeLogicType<
+    mcpSessionsLogicValues,
+    mcpSessionsLogicActions,
+    Record<string, any>,
+    mcpSessionsLogicMeta
+>
+
 export const mcpSessionsLogic = kea<mcpSessionsLogicType>([
     path(['products', 'mcp_analytics', 'frontend', 'sessions', 'mcpSessionsLogic']),
     connect(() => ({
@@ -283,7 +459,7 @@ export const mcpSessionsLogic = kea<mcpSessionsLogicType>([
     selectors({
         selectedSession: [
             (s) => [s.sessions, s.selectedSessionId],
-            (sessions, selectedSessionId): MCPSessionApi | null => {
+            (sessions: MCPSessionApi[], selectedSessionId: string | null): MCPSessionApi | null => {
                 if (!selectedSessionId) {
                     return null
                 }
@@ -292,7 +468,11 @@ export const mcpSessionsLogic = kea<mcpSessionsLogicType>([
         ],
         selectedSessionIntent: [
             (s) => [s.selectedSession, s.intentOverrides, s.selectedSessionId],
-            (selectedSession, intentOverrides, selectedSessionId): string => {
+            (
+                selectedSession: MCPSessionApi | null,
+                intentOverrides: Record<string, string>,
+                selectedSessionId: string | null
+            ): string => {
                 if (selectedSessionId && intentOverrides[selectedSessionId]) {
                     return intentOverrides[selectedSessionId]
                 }
@@ -303,8 +483,11 @@ export const mcpSessionsLogic = kea<mcpSessionsLogicType>([
         // generation kicked off for another session never shows a spinner on this one.
         isSelectedSessionGenerating: [
             (s) => [s.generatedIntentLoading, s.generatingSessionId, s.selectedSessionId],
-            (generatedIntentLoading, generatingSessionId, selectedSessionId): boolean =>
-                generatedIntentLoading && generatingSessionId === selectedSessionId,
+            (
+                generatedIntentLoading: boolean,
+                generatingSessionId: string | null,
+                selectedSessionId: string | null
+            ): boolean => generatedIntentLoading && generatingSessionId === selectedSessionId,
         ],
         // Everything the detail panel needs about the selected session's calls, derived from the
         // loaded value (tagged with its session) so a previous session's calls never render under
@@ -313,9 +496,9 @@ export const mcpSessionsLogic = kea<mcpSessionsLogicType>([
         selectedSessionToolCalls: [
             (s) => [s.toolCalls, s.selectedSessionId, s.toolCallsLoading],
             (
-                toolCalls,
-                selectedSessionId,
-                toolCallsLoading
+                toolCalls: SessionToolCalls,
+                selectedSessionId: string | null,
+                toolCallsLoading: boolean
             ): { calls: MCPToolCallApi[]; hasNext: boolean; loading: boolean; loadingMore: boolean } => {
                 const isCurrent = toolCalls.sessionId === selectedSessionId
                 return {
diff --git a/products/mcp_store/frontend/mcpStoreLogic.ts b/products/mcp_store/frontend/mcpStoreLogic.ts
index 3ff0b4ba3cff..0734382a51a1 100644
--- a/products/mcp_store/frontend/mcpStoreLogic.ts
+++ b/products/mcp_store/frontend/mcpStoreLogic.ts
@@ -1,5 +1,6 @@
-import { actions, afterMount, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, listeners, path, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 
@@ -12,7 +13,6 @@ import type {
     MCPServerInstallationToolApi,
     MCPServerTemplateApi,
 } from './generated/api.schemas'
-import type { mcpStoreLogicType } from './mcpStoreLogicType'
 
 export type ToolApprovalState = 'approved' | 'needs_approval' | 'do_not_use'
 
@@ -46,6 +46,332 @@ const CUSTOM_SERVER_FORM_DEFAULTS: CustomServerFormValues = {
     template_id: '',
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface mcpStoreLogicValues {
+    addCustomServerModalVisible: boolean
+    categoryFilter: string
+    customServerForm: CustomServerFormValues
+    customServerFormAllErrors: Record<string, any>
+    customServerFormChanged: boolean
+    customServerFormErrors: DeepPartialMap<CustomServerFormValues, ValidationErrorType>
+    customServerFormHasErrors: boolean
+    customServerFormManualErrors: Record<string, any>
+    customServerFormPrefilled: boolean
+    customServerFormTouched: boolean
+    customServerFormTouches: Record<string, boolean>
+    customServerFormValidationErrors: DeepPartialMap<CustomServerFormValues, ValidationErrorType>
+    filteredInstallations: MCPServerInstallationApi[]
+    filteredServers: MCPServerTemplateApi[]
+    installationTools: Record<string, MCPServerInstallationToolApi[]>
+    installationToolsLoading: boolean
+    installations: MCPServerInstallationApi[]
+    installationsLoading: boolean
+    installedServerUrls: Set<string>
+    installedTemplateIds: Set<string>
+    isCustomServerFormSubmitting: boolean
+    isCustomServerFormValid: boolean
+    recommendedServers: MCPServerTemplateApi[]
+    sceneView: McpSceneView
+    searchQuery: string
+    selectedInstallation: MCPServerInstallationApi | null
+    selectedServerId: string | null
+    selectedTemplate: MCPServerTemplateApi | null
+    servers: MCPServerTemplateApi[]
+    serversLoading: boolean
+    showCustomServerFormErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface mcpStoreLogicActions {
+    clearFilters: () => {
+        value: true
+    }
+    closeAddCustomServerModal: () => {
+        value: true
+    }
+    installTemplate: ({ templateId }: { templateId: string }) => {
+        templateId: string
+    }
+    loadInstallationTools: ({ installationId }: { installationId: string }) => {
+        installationId: string
+    }
+    loadInstallationToolsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadInstallationToolsSuccess: (
+        installationTools: {
+            [x: string]: MCPServerInstallationToolApi[]
+        },
+        payload?: {
+            installationId: string
+        }
+    ) => {
+        installationTools: {
+            [x: string]: MCPServerInstallationToolApi[]
+        }
+        payload?: {
+            installationId: string
+        }
+    }
+    loadInstallations: () => any
+    loadInstallationsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadInstallationsSuccess: (
+        installations: MCPServerInstallationApi[],
+        payload?: any
+    ) => {
+        installations: MCPServerInstallationApi[]
+        payload?: any
+    }
+    loadServers: () => any
+    loadServersFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadServersSuccess: (
+        servers: MCPServerTemplateApi[],
+        payload?: any
+    ) => {
+        servers: MCPServerTemplateApi[]
+        payload?: any
+    }
+    openAddCustomServerModal: () => {
+        value: true
+    }
+    openAddCustomServerModalWithDefaults: (defaults: Partial<CustomServerFormValues>) => {
+        defaults: Partial<CustomServerFormValues>
+    }
+    refreshInstallationTools: ({ installationId }: { installationId: string }) => {
+        installationId: string
+    }
+    refreshInstallationToolsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    refreshInstallationToolsSuccess: (
+        installationTools: {
+            [x: string]: MCPServerInstallationToolApi[]
+        },
+        payload?: {
+            installationId: string
+        }
+    ) => {
+        installationTools: {
+            [x: string]: MCPServerInstallationToolApi[]
+        }
+        payload?: {
+            installationId: string
+        }
+    }
+    resetCustomServerForm: (values?: CustomServerFormValues) => {
+        values?: CustomServerFormValues
+    }
+    selectServer: (serverId: string | null) => {
+        serverId: string | null
+    }
+    setBulkApprovalState: ({
+        installationId,
+        approvalState,
+    }: {
+        approvalState: ToolApprovalState
+        installationId: string
+    }) => {
+        approvalState: ToolApprovalState
+        installationId: string
+    }
+    setCategoryFilter: (category: string) => {
+        category: string
+    }
+    setCustomServerFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setCustomServerFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setCustomServerFormValues: (values: DeepPartial<CustomServerFormValues>) => {
+        values: DeepPartial<CustomServerFormValues>
+    }
+    setInstallations: (installations: MCPServerInstallationApi[]) => {
+        installations: MCPServerInstallationApi[]
+    }
+    setSceneView: (view: McpSceneView) => {
+        view: McpSceneView
+    }
+    setSearchQuery: (query: string) => {
+        query: string
+    }
+    setToolApprovalState: ({
+        installationId,
+        toolName,
+        approvalState,
+    }: {
+        approvalState: ToolApprovalState
+        installationId: string
+        toolName: string
+    }) => {
+        approvalState: ToolApprovalState
+        installationId: string
+        toolName: string
+    }
+    shareInstallation: ({ id }: { id: string }) => {
+        id: string
+    }
+    shareInstallationFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    shareInstallationSuccess: (
+        installations: MCPServerInstallationApi[],
+        payload?: {
+            id: string
+        }
+    ) => {
+        installations: MCPServerInstallationApi[]
+        payload?: {
+            id: string
+        }
+    }
+    submitCustomServerForm: () => {
+        value: boolean
+    }
+    submitCustomServerFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitCustomServerFormRequest: (customServerForm: CustomServerFormValues) => {
+        customServerForm: CustomServerFormValues
+    }
+    submitCustomServerFormSuccess: (customServerForm: CustomServerFormValues) => {
+        customServerForm: CustomServerFormValues
+    }
+    toggleServerEnabled: ({ id, enabled }: { enabled: boolean; id: string }) => {
+        enabled: boolean
+        id: string
+    }
+    touchCustomServerFormField: (key: string) => {
+        key: string
+    }
+    uninstallServer: (installationId: string) => string
+    uninstallServerFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    uninstallServerSuccess: (
+        installations: MCPServerInstallationApi[],
+        payload?: string
+    ) => {
+        installations: MCPServerInstallationApi[]
+        payload?: string
+    }
+    unshareInstallation: ({ id }: { id: string }) => {
+        id: string
+    }
+    unshareInstallationFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    unshareInstallationSuccess: (
+        installations: MCPServerInstallationApi[],
+        payload?: {
+            id: string
+        }
+    ) => {
+        installations: MCPServerInstallationApi[]
+        payload?: {
+            id: string
+        }
+    }
+    updateInstallation: ({ id, data }: { data: Record<string, any>; id: string }) => {
+        id: string
+        data: Record<string, any>
+    }
+    updateInstallationFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateInstallationSuccess: (
+        installations: MCPServerInstallationApi[],
+        payload?: {
+            id: string
+            data: Record<string, any>
+        }
+    ) => {
+        installations: MCPServerInstallationApi[]
+        payload?: {
+            id: string
+            data: Record<string, any>
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface mcpStoreLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        installedTemplateIds: (installations: MCPServerInstallationApi[]) => Set<string>
+        installedServerUrls: (installations: MCPServerInstallationApi[]) => Set<string>
+        recommendedServers: (servers: MCPServerTemplateApi[]) => MCPServerTemplateApi[]
+        filteredServers: (
+            servers: MCPServerTemplateApi[],
+            searchQuery: string,
+            categoryFilter: string
+        ) => MCPServerTemplateApi[]
+        filteredInstallations: (
+            installations: MCPServerInstallationApi[],
+            searchQuery: string
+        ) => MCPServerInstallationApi[]
+        selectedInstallation: (
+            installations: MCPServerInstallationApi[],
+            selectedServerId: string | null
+        ) => MCPServerInstallationApi | null
+        selectedTemplate: (
+            servers: MCPServerTemplateApi[],
+            selectedServerId: string | null,
+            selectedInstallation: MCPServerInstallationApi | null
+        ) => MCPServerTemplateApi | null
+    }
+}
+
+export type mcpStoreLogicType = MakeLogicType<
+    mcpStoreLogicValues,
+    mcpStoreLogicActions,
+    Record<string, any>,
+    mcpStoreLogicMeta
+>
+
 export const mcpStoreLogic = kea<mcpStoreLogicType>([
     path(['products', 'mcp_store', 'frontend', 'mcpStoreLogic']),
 
diff --git a/products/metrics/frontend/components/metricNamePickerLogic.ts b/products/metrics/frontend/components/metricNamePickerLogic.ts
index 38e818041eb5..7af38498290c 100644
--- a/products/metrics/frontend/components/metricNamePickerLogic.ts
+++ b/products/metrics/frontend/components/metricNamePickerLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { teamLogic } from 'scenes/teamLogic'
@@ -6,10 +6,40 @@ import { teamLogic } from 'scenes/teamLogic'
 import { metricsValuesRetrieve } from 'products/metrics/frontend/generated/api'
 import type { _MetricNameApi } from 'products/metrics/frontend/generated/api.schemas'
 
-import type { metricNamePickerLogicType } from './metricNamePickerLogicType'
-
 export type MetricNameItem = _MetricNameApi
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface metricNamePickerLogicValues {
+    currentTeamId: number | null // teamLogic
+    items: MetricNameItem[]
+    itemsLoading: boolean
+    search: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface metricNamePickerLogicActions {
+    loadItems: (_: any) => any
+    loadItemsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadItemsSuccess: (
+        items: _MetricNameApi[],
+        payload?: any
+    ) => {
+        items: _MetricNameApi[]
+        payload?: any
+    }
+    setSearch: (search: string) => {
+        search: string
+    }
+}
+
+export type metricNamePickerLogicType = MakeLogicType<metricNamePickerLogicValues, metricNamePickerLogicActions>
+
 export const metricNamePickerLogic = kea<metricNamePickerLogicType>([
     path(['products', 'metrics', 'frontend', 'components', 'metricNamePickerLogic']),
     connect(() => ({
diff --git a/products/metrics/frontend/components/metricsSamplesLogic.tsx b/products/metrics/frontend/components/metricsSamplesLogic.tsx
index f110e917d4c7..bfb3342a8cbd 100644
--- a/products/metrics/frontend/components/metricsSamplesLogic.tsx
+++ b/products/metrics/frontend/components/metricsSamplesLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { teamLogic } from 'scenes/teamLogic'
@@ -6,7 +6,6 @@ import { teamLogic } from 'scenes/teamLogic'
 import { metricsSamplesCreate } from 'products/metrics/frontend/generated/api'
 import type { _MetricEventSampleApi } from 'products/metrics/frontend/generated/api.schemas'
 
-import type { metricsSamplesLogicType } from './metricsSamplesLogicType'
 import { formatSeriesName, seriesColor } from './metricsSeries'
 import { type MetricsViewerSeries, metricsViewerLogic, resolveDate } from './metricsViewerLogic'
 
@@ -24,6 +23,67 @@ export interface MetricsAggregateRow {
     total: number
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface metricsSamplesLogicValues {
+    dateFrom: string | null // metricsViewerLogic
+    dateTo: string | null // metricsViewerLogic
+    metricName: string // metricsViewerLogic
+    queryResults: MetricsViewerSeries[] // metricsViewerLogic
+    currentTeamId: number | null // teamLogic
+    activeTab: MetricsPanelTab
+    aggregateRows: MetricsAggregateRow[]
+    samples: _MetricEventSampleApi[]
+    samplesLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface metricsSamplesLogicActions {
+    setDateFrom: (dateFrom: string | null) => {
+        dateFrom: string | null
+    } // metricsViewerLogic
+    setDateTo: (dateTo: string | null) => {
+        dateTo: string | null
+    } // metricsViewerLogic
+    setMetricName: (metricName: string) => {
+        metricName: string
+    } // metricsViewerLogic
+    loadSamples: (_: any) => any
+    loadSamplesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSamplesSuccess: (
+        samples: _MetricEventSampleApi[],
+        payload?: any
+    ) => {
+        samples: _MetricEventSampleApi[]
+        payload?: any
+    }
+    setActiveTab: (activeTab: MetricsPanelTab) => {
+        activeTab: MetricsPanelTab
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface metricsSamplesLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        aggregateRows: (
+            queryResults: import('products/metrics/frontend/generated/api.schemas')._MetricSeriesApi[],
+            metricName: string
+        ) => MetricsAggregateRow[]
+    }
+}
+
+export type metricsSamplesLogicType = MakeLogicType<
+    metricsSamplesLogicValues,
+    metricsSamplesLogicActions,
+    Record<string, any>,
+    metricsSamplesLogicMeta
+>
+
 export const metricsSamplesLogic = kea<metricsSamplesLogicType>([
     path(['products', 'metrics', 'frontend', 'components', 'metricsSamplesLogic']),
     connect(() => ({
diff --git a/products/metrics/frontend/components/metricsSqlEditorTrackingLogic.ts b/products/metrics/frontend/components/metricsSqlEditorTrackingLogic.ts
index 8de79514852e..6d7fd59eb848 100644
--- a/products/metrics/frontend/components/metricsSqlEditorTrackingLogic.ts
+++ b/products/metrics/frontend/components/metricsSqlEditorTrackingLogic.ts
@@ -1,4 +1,4 @@
-import { connect, kea, key, listeners, path, props } from 'kea'
+import { MakeLogicType, connect, kea, key, listeners, path, props } from 'kea'
 import posthog from 'posthog-js'
 
 import { SaveAsMenuItem } from 'scenes/data-warehouse/editor/editorSceneLogic'
@@ -8,12 +8,71 @@ import { teamLogic } from 'scenes/teamLogic'
 
 import { ProductIntentContext, ProductKey } from '~/queries/schema/schema-general'
 
-import type { metricsSqlEditorTrackingLogicType } from './metricsSqlEditorTrackingLogicType'
+import type { ProductIntentProperties } from '../../../../frontend/src/lib/utils/product-intents'
 
 export interface MetricsSqlEditorTrackingLogicProps {
     sqlEditorTabId: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface metricsSqlEditorTrackingLogicActions {
+    sqlEditorRunQuery: (
+        queryOverride?: string | undefined,
+        switchTab?: boolean | undefined
+    ) => {
+        queryOverride: string | undefined
+        switchTab: boolean | undefined
+    } // sqlEditorLogic
+    sqlEditorSaveAsEndpointSubmit: (
+        name: string,
+        description?: string | undefined,
+        queryOverride?: string | undefined,
+        dagId?: string | undefined
+    ) => {
+        dagId: string | undefined
+        description: string | undefined
+        name: string
+        queryOverride: string | undefined
+    } // sqlEditorLogic
+    sqlEditorSaveAsInsightSubmit: (
+        name: string,
+        queryOverride?: string | undefined
+    ) => {
+        name: string
+        queryOverride: string | undefined
+    } // sqlEditorLogic
+    sqlEditorSaveAsViewSubmit: (
+        name: string,
+        materializeAfterSave?: any,
+        fromDraft?: string | undefined,
+        dagId?: string | undefined,
+        folderId?: string | null | undefined,
+        isTest?: any,
+        queryOverride?: string | undefined
+    ) => {
+        dagId: string | undefined
+        folderId: string | null | undefined
+        fromDraft: string | undefined
+        isTest: any
+        materializeAfterSave: any
+        name: string
+        queryOverride: string | undefined
+    } // sqlEditorLogic
+    addProductIntent: (properties: ProductIntentProperties) => ProductIntentProperties // teamLogic
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface metricsSqlEditorTrackingLogicMeta {
+    key: string
+}
+
+export type metricsSqlEditorTrackingLogicType = MakeLogicType<
+    {},
+    metricsSqlEditorTrackingLogicActions,
+    MetricsSqlEditorTrackingLogicProps,
+    metricsSqlEditorTrackingLogicMeta
+>
+
 export const metricsSqlEditorTrackingLogic = kea<metricsSqlEditorTrackingLogicType>([
     path(['products', 'metrics', 'frontend', 'components', 'metricsSqlEditorTrackingLogic']),
     props({} as MetricsSqlEditorTrackingLogicProps),
diff --git a/products/metrics/frontend/components/metricsUsageTrackingLogic.ts b/products/metrics/frontend/components/metricsUsageTrackingLogic.ts
index 63da24733eac..8fa9336900cb 100644
--- a/products/metrics/frontend/components/metricsUsageTrackingLogic.ts
+++ b/products/metrics/frontend/components/metricsUsageTrackingLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path } from 'kea'
 import posthog from 'posthog-js'
 
 import { teamLogic } from 'scenes/teamLogic'
@@ -7,10 +7,103 @@ import { type MetricsQuery, ProductIntentContext, ProductKey } from '~/queries/s
 
 import type { _MetricEventSampleApi } from 'products/metrics/frontend/generated/api.schemas'
 
+import type { MetricSummary } from '../../../../frontend/src/lib/components/Metric/metricSummary'
+import type { ProductIntentProperties } from '../../../../frontend/src/lib/utils/product-intents'
+import type { Node } from '../../../../frontend/src/queries/schema/schema-general'
+import type { QueryBasedInsightModel, UniversalFiltersGroup } from '../../../../frontend/src/types'
+import type { _MetricFilterApi, _MetricSeriesApi } from '../generated/api.schemas'
 import { metricsSceneLogic } from '../metricsSceneLogic'
+import type { MetricsSceneActiveTab } from '../metricsSceneLogic'
 import { metricsSamplesLogic } from './metricsSamplesLogic'
-import type { metricsUsageTrackingLogicType } from './metricsUsageTrackingLogicType'
+import type { MetricsPanelTab } from './metricsSamplesLogic'
 import { isUserInitiatedError, metricsViewerLogic } from './metricsViewerLogic'
+import type { MetricAggregation, MetricsViewMode } from './metricsViewerLogic'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface metricsUsageTrackingLogicValues {
+    aggregation: MetricAggregation // metricsViewerLogic
+    groupByKeys: string[] // metricsViewerLogic
+    hasMetricName: boolean // metricsViewerLogic
+    queryFilters: _MetricFilterApi[] // metricsViewerLogic
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface metricsUsageTrackingLogicActions {
+    loadSamplesSuccess: (
+        samples: _MetricEventSampleApi[],
+        payload?: any
+    ) => {
+        payload?: any
+        samples: _MetricEventSampleApi[]
+    } // metricsSamplesLogic
+    samplesPanelTabChanged: (activeTab: MetricsPanelTab) => {
+        activeTab: MetricsPanelTab
+    } // metricsSamplesLogic
+    sceneTabChanged: (activeTab: MetricsSceneActiveTab) => {
+        activeTab: MetricsSceneActiveTab
+    } // metricsSceneLogic
+    addToDashboard: () => {
+        value: true
+    } // metricsViewerLogic
+    fetchQueryResults: (_: any) => any // metricsViewerLogic
+    fetchQueryResultsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    } // metricsViewerLogic
+    fetchQueryResultsSuccess: (
+        queryResults: _MetricSeriesApi[],
+        payload?: any
+    ) => {
+        payload?: any
+        queryResults: _MetricSeriesApi[]
+    } // metricsViewerLogic
+    saveAsInsightSuccess: (
+        savedInsight: QueryBasedInsightModel<Node<Record<string, any>>> | null,
+        payload?: any
+    ) => {
+        payload?: any
+        savedInsight: QueryBasedInsightModel<Node<Record<string, any>>> | null
+    } // metricsViewerLogic
+    setAggregation: (aggregation: MetricAggregation) => {
+        aggregation: MetricAggregation
+    } // metricsViewerLogic
+    setDateFrom: (dateFrom: string | null) => {
+        dateFrom: string | null
+    } // metricsViewerLogic
+    setFilterGroup: (filterGroup: UniversalFiltersGroup) => {
+        filterGroup: UniversalFiltersGroup
+    } // metricsViewerLogic
+    setGroupByKeys: (groupByKeys: string[]) => {
+        groupByKeys: string[]
+    } // metricsViewerLogic
+    setLiveRefresh: (liveRefresh: boolean) => {
+        liveRefresh: boolean
+    } // metricsViewerLogic
+    setMetricName: (metricName: string) => {
+        metricName: string
+    } // metricsViewerLogic
+    setStatSummary: (statSummary: MetricSummary) => {
+        statSummary: MetricSummary
+    } // metricsViewerLogic
+    setViewMode: (viewMode: MetricsViewMode) => {
+        viewMode: MetricsViewMode
+    } // metricsViewerLogic
+    addProductIntent: (properties: ProductIntentProperties) => ProductIntentProperties // teamLogic
+    sampleRowExpanded: (sample: _MetricEventSampleApi) => {
+        sample: _MetricEventSampleApi
+    }
+    tracePivotClicked: (sample: _MetricEventSampleApi) => {
+        sample: _MetricEventSampleApi
+    }
+}
+
+export type metricsUsageTrackingLogicType = MakeLogicType<
+    metricsUsageTrackingLogicValues,
+    metricsUsageTrackingLogicActions
+>
 
 // Central usage tracking for the metrics scene, following the metricsSqlEditorTrackingLogic
 // precedent: captures fire from listeners on the source logics' actions, not from onClick
diff --git a/products/metrics/frontend/components/metricsViewerLogic.tsx b/products/metrics/frontend/components/metricsViewerLogic.tsx
index 6fdf15380e27..52f5ec49ca9e 100644
--- a/products/metrics/frontend/components/metricsViewerLogic.tsx
+++ b/products/metrics/frontend/components/metricsViewerLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 
@@ -33,9 +33,11 @@ import type {
     MetricAnomalyDirectionEnumApi,
 } from 'products/metrics/frontend/generated/api.schemas'
 
+import type { Node } from '../../../../frontend/src/queries/schema/schema-general'
+import type { _MetricNameApi } from '../generated/api.schemas'
 import { metricNamePickerLogic } from './metricNamePickerLogic'
+import type { MetricNameItem } from './metricNamePickerLogic'
 import { formatSeriesName, seriesColor } from './metricsSeries'
-import type { metricsViewerLogicType } from './metricsViewerLogicType'
 
 export type MetricAggregation = 'sum' | 'avg' | 'count' | 'p95' | 'rate' | 'increase'
 
@@ -149,6 +151,226 @@ const toKnownMetricType = (metricType: string | undefined): OtelMetricTypeEnumAp
     return metricType && known.includes(metricType) ? (metricType as OtelMetricTypeEnumApi) : null
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface metricsViewerLogicValues {
+    items: MetricNameItem[] // metricNamePickerLogic
+    currentTeamId: number | null // teamLogic
+    aggregation: MetricAggregation
+    anomalyBadge: MetricsAnomalyBadge | null
+    anomalyReport: _MetricAnomalyReportApi | null
+    anomalyReportLoading: boolean
+    attributeEndpointFilters: Record<string, string>
+    attributeKeyOptions: {
+        key: string
+        label: string
+    }[]
+    attributeKeyOptionsLoading: boolean
+    chartSeries: SparklineTimeSeries[]
+    currentSeries: MetricsViewerSeries | undefined
+    dateFrom: string | null
+    dateTo: string | null
+    filterGroup: UniversalFiltersGroup
+    groupByKeys: string[]
+    groupBySearch: string
+    hasMetricName: boolean
+    isAddToDashboardModalOpen: boolean
+    lastSavedQueryNode: MetricsQuery | null
+    liveRefresh: boolean
+    metricName: string
+    metricsQueryNode: MetricsQuery | null
+    pendingAddToDashboard: boolean
+    queryAbortController: AbortController | null
+    queryError: string | null
+    queryFilters: _MetricFilterApi[]
+    queryResults: MetricsViewerSeries[]
+    queryResultsLoading: boolean
+    savedInsight: QueryBasedInsightModel | null
+    savedInsightLoading: boolean
+    selectedMetricType: OtelMetricTypeEnumApi | null
+    sparklineLabels: string[]
+    sparklineValues: number[]
+    statSummary: MetricSummary
+    statTotal: number
+    viewMode: MetricsViewMode
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface metricsViewerLogicActions {
+    loadItemsSuccess: (
+        items: _MetricNameApi[],
+        payload?: any
+    ) => {
+        items: _MetricNameApi[]
+        payload?: any
+    } // metricNamePickerLogic
+    addToDashboard: () => {
+        value: true
+    }
+    cancelInProgressQuery: (controller: AbortController | null) => {
+        controller: AbortController | null
+    }
+    clearAnomaly: () => any
+    clearAnomalyFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    clearAnomalySuccess: (
+        anomalyReport: null,
+        payload?: any
+    ) => {
+        anomalyReport: null
+        payload?: any
+    }
+    closeAddToDashboardModal: () => {
+        value: true
+    }
+    fetchAnomaly: (_: any) => any
+    fetchAnomalyFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    fetchAnomalySuccess: (
+        anomalyReport: _MetricAnomalyReportApi | null,
+        payload?: any
+    ) => {
+        anomalyReport: _MetricAnomalyReportApi | null
+        payload?: any
+    }
+    fetchQueryResults: (_: any) => any
+    fetchQueryResultsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    fetchQueryResultsSuccess: (
+        queryResults: _MetricSeriesApi[],
+        payload?: any
+    ) => {
+        queryResults: _MetricSeriesApi[]
+        payload?: any
+    }
+    loadAttributeKeyOptions: (_: any) => any
+    loadAttributeKeyOptionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAttributeKeyOptionsSuccess: (
+        attributeKeyOptions: {
+            key: string
+            label: string
+        }[],
+        payload?: any
+    ) => {
+        attributeKeyOptions: {
+            key: string
+            label: string
+        }[]
+        payload?: any
+    }
+    openAddToDashboardModal: () => {
+        value: true
+    }
+    saveAsInsight: () => any
+    saveAsInsightFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    saveAsInsightSuccess: (
+        savedInsight: QueryBasedInsightModel<Node<Record<string, any>>> | null,
+        payload?: any
+    ) => {
+        savedInsight: QueryBasedInsightModel<Node<Record<string, any>>> | null
+        payload?: any
+    }
+    setAggregation: (aggregation: MetricAggregation) => {
+        aggregation: MetricAggregation
+    }
+    setDateFrom: (dateFrom: string | null) => {
+        dateFrom: string | null
+    }
+    setDateTo: (dateTo: string | null) => {
+        dateTo: string | null
+    }
+    setFilterGroup: (filterGroup: UniversalFiltersGroup) => {
+        filterGroup: UniversalFiltersGroup
+    }
+    setGroupByKeys: (groupByKeys: string[]) => {
+        groupByKeys: string[]
+    }
+    setGroupBySearch: (groupBySearch: string) => {
+        groupBySearch: string
+    }
+    setLastSavedQueryNode: (query: MetricsQuery) => {
+        query: MetricsQuery
+    }
+    setLiveRefresh: (liveRefresh: boolean) => {
+        liveRefresh: boolean
+    }
+    setMetricName: (metricName: string) => {
+        metricName: string
+    }
+    setQueryAbortController: (controller: AbortController | null) => {
+        controller: AbortController | null
+    }
+    setRecommendedAggregation: (aggregation: MetricAggregation) => {
+        aggregation: MetricAggregation
+    }
+    setSelectedMetricType: (metricType: OtelMetricTypeEnumApi | null) => {
+        metricType: OtelMetricTypeEnumApi | null
+    }
+    setStatSummary: (statSummary: MetricSummary) => {
+        statSummary: MetricSummary
+    }
+    setViewMode: (viewMode: MetricsViewMode) => {
+        viewMode: MetricsViewMode
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface metricsViewerLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        hasMetricName: (metricName: string) => boolean
+        metricsQueryNode: (
+            metricName: string,
+            aggregation: MetricAggregation,
+            selectedMetricType: OtelMetricTypeEnumApi | null,
+            dateFrom: string | null,
+            dateTo: string | null,
+            groupByKeys: string[],
+            queryFilters: _MetricFilterApi[]
+        ) => MetricsQuery | null
+        queryFilters: (filterGroup: UniversalFiltersGroup) => _MetricFilterApi[]
+        attributeEndpointFilters: (dateFrom: string | null, dateTo: string | null) => Record<string, string>
+        currentSeries: (queryResults: _MetricSeriesApi[]) => MetricsViewerSeries | undefined
+        chartSeries: (queryResults: _MetricSeriesApi[], metricName: string) => SparklineTimeSeries[]
+        sparklineValues: (currentSeries: _MetricSeriesApi | undefined) => number[]
+        sparklineLabels: (currentSeries: _MetricSeriesApi | undefined) => string[]
+        statTotal: (sparklineValues: number[]) => number
+        anomalyBadge: (anomalyReport: _MetricAnomalyReportApi | null) => MetricsAnomalyBadge | null
+    }
+}
+
+export type metricsViewerLogicType = MakeLogicType<
+    metricsViewerLogicValues,
+    metricsViewerLogicActions,
+    Record<string, any>,
+    metricsViewerLogicMeta
+>
+
 export const metricsViewerLogic = kea<metricsViewerLogicType>([
     path(['products', 'metrics', 'frontend', 'components', 'metricsViewerLogic']),
     connect(() => ({
@@ -447,7 +669,7 @@ export const metricsViewerLogic = kea<metricsViewerLogicType>([
         ],
     })),
     selectors({
-        hasMetricName: [(s) => [s.metricName], (metricName) => metricName.trim().length > 0],
+        hasMetricName: [(s) => [s.metricName], (metricName: string) => metricName.trim().length > 0],
         // The viewer state as a `MetricsQuery` schema node — what "Save as insight"
         // persists, so the saved tile re-runs exactly what the viewer shows.
         // The REST viewer's 'p95' shorthand maps to the node's quantile aggregation.
@@ -462,13 +684,13 @@ export const metricsViewerLogic = kea<metricsViewerLogicType>([
                 s.queryFilters,
             ],
             (
-                metricName,
-                aggregation,
-                selectedMetricType,
-                dateFrom,
-                dateTo,
-                groupByKeys,
-                queryFilters
+                metricName: string,
+                aggregation: MetricAggregation,
+                selectedMetricType: OtelMetricTypeEnumApi | null,
+                dateFrom: string | null,
+                dateTo: string | null,
+                groupByKeys: string[],
+                queryFilters: _MetricFilterApi[]
             ): MetricsQuery | null => {
                 const trimmedName = metricName.trim()
                 if (!trimmedName) {
@@ -516,13 +738,16 @@ export const metricsViewerLogic = kea<metricsViewerLogicType>([
         // taxonomic endpoints as query params.
         attributeEndpointFilters: [
             (s) => [s.dateFrom, s.dateTo],
-            (dateFrom, dateTo): Record<string, string> => ({
+            (dateFrom: string | null, dateTo: string | null): Record<string, string> => ({
                 ...(resolveDate(dateFrom) ? { dateFrom: resolveDate(dateFrom) as string } : {}),
                 ...(resolveDate(dateTo) ? { dateTo: resolveDate(dateTo) as string } : {}),
             }),
         ],
         // Metrics has no compare/previous-series concept, so "current" is simply the first series.
-        currentSeries: [(s) => [s.queryResults], (results): MetricsViewerSeries | undefined => results[0]],
+        currentSeries: [
+            (s) => [s.queryResults],
+            (results: MetricsViewerSeries[]): MetricsViewerSeries | undefined => results[0],
+        ],
         // All series rendered as chart lines (a group-by query returns one series per label combination).
         // The x-axis labels come from `sparklineLabels` (the backend grids every series onto one time axis).
         chartSeries: [
diff --git a/products/metrics/frontend/metricsIngestionLogic.tsx b/products/metrics/frontend/metricsIngestionLogic.tsx
index 7160c156a5b0..6672b0dcb234 100644
--- a/products/metrics/frontend/metricsIngestionLogic.tsx
+++ b/products/metrics/frontend/metricsIngestionLogic.tsx
@@ -1,4 +1,4 @@
-import { afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { retryWithBackoff } from 'lib/utils/async'
@@ -6,11 +6,55 @@ import { teamLogic } from 'scenes/teamLogic'
 
 import { ProductIntentContext, ProductKey } from '~/queries/schema/schema-general'
 
+import type { ProductIntentProperties } from '../../../frontend/src/lib/utils/product-intents'
 import { metricsHasMetricsRetrieve } from './generated/api'
-import type { metricsIngestionLogicType } from './metricsIngestionLogicType'
 
 const teamId = window.POSTHOG_APP_CONTEXT?.current_team?.id
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface metricsIngestionLogicValues {
+    currentTeamId: number | null // teamLogic
+    cachedTeamHasMetrics: boolean | null
+    hasMetrics: boolean | undefined
+    teamHasMetrics: boolean | undefined
+    teamHasMetricsCheckFailed: boolean
+    teamHasMetricsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface metricsIngestionLogicActions {
+    addProductIntent: (properties: ProductIntentProperties) => ProductIntentProperties // teamLogic
+    loadTeamHasMetrics: () => any
+    loadTeamHasMetricsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadTeamHasMetricsSuccess: (
+        teamHasMetrics: boolean,
+        payload?: any
+    ) => {
+        teamHasMetrics: boolean
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface metricsIngestionLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        hasMetrics: (teamHasMetrics: boolean | undefined, cachedTeamHasMetrics: boolean | null) => boolean | undefined
+    }
+}
+
+export type metricsIngestionLogicType = MakeLogicType<
+    metricsIngestionLogicValues,
+    metricsIngestionLogicActions,
+    Record<string, any>,
+    metricsIngestionLogicMeta
+>
+
 export const metricsIngestionLogic = kea<metricsIngestionLogicType>([
     path(['products', 'metrics', 'frontend', 'metricsIngestionLogic']),
     connect(() => ({
@@ -70,7 +114,7 @@ export const metricsIngestionLogic = kea<metricsIngestionLogicType>([
     selectors({
         hasMetrics: [
             (s) => [s.teamHasMetrics, s.cachedTeamHasMetrics],
-            (teamHasMetrics, cachedTeamHasMetrics): boolean | undefined =>
+            (teamHasMetrics: boolean | undefined, cachedTeamHasMetrics: boolean | null): boolean | undefined =>
                 teamHasMetrics ?? cachedTeamHasMetrics ?? undefined,
         ],
     }),
diff --git a/products/metrics/frontend/metricsSceneLogic.tsx b/products/metrics/frontend/metricsSceneLogic.tsx
index d0c59f0d3327..fce3e32d17c2 100644
--- a/products/metrics/frontend/metricsSceneLogic.tsx
+++ b/products/metrics/frontend/metricsSceneLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers } from 'kea'
 import { router, urlToAction } from 'kea-router'
 
 import { syncSearchParams, updateSearchParams } from '@posthog/products-error-tracking/frontend/utils'
@@ -8,14 +8,29 @@ import { sqlEditorLogic } from 'scenes/data-warehouse/editor/sqlEditorLogic'
 import { SQLEditorMode } from 'scenes/data-warehouse/editor/sqlEditorModes'
 import { Params } from 'scenes/sceneTypes'
 
-import type { metricsSceneLogicType } from './metricsSceneLogicType'
-
 export const METRICS_SQL_EDITOR_TAB_ID = 'metrics-sql-editor'
 
 export type MetricsSceneActiveTab = 'viewer' | 'sql'
 const VALID_ACTIVE_TABS: MetricsSceneActiveTab[] = ['viewer', 'sql']
 export const DEFAULT_ACTIVE_TAB: MetricsSceneActiveTab = 'viewer'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface metricsSceneLogicValues {
+    activeTab: MetricsSceneActiveTab
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface metricsSceneLogicActions {
+    keepSqlEditorMounted: (editorTabId: string) => {
+        editorTabId: string
+    }
+    setActiveTab: (activeTab: MetricsSceneActiveTab) => {
+        activeTab: MetricsSceneActiveTab
+    }
+}
+
+export type metricsSceneLogicType = MakeLogicType<metricsSceneLogicValues, metricsSceneLogicActions>
+
 export const metricsSceneLogic = kea<metricsSceneLogicType>([
     path(['products', 'metrics', 'frontend', 'metricsSceneLogic']),
     actions({
diff --git a/products/notifications/frontend/resourceEditedLogic.ts b/products/notifications/frontend/resourceEditedLogic.ts
index d84d3f8a7e1d..008d704cad77 100644
--- a/products/notifications/frontend/resourceEditedLogic.ts
+++ b/products/notifications/frontend/resourceEditedLogic.ts
@@ -1,12 +1,19 @@
-import { actions, kea, path } from 'kea'
+import { MakeLogicType, actions, kea, path } from 'kea'
 
 import { ResourceEditedEvent } from '~/types'
 
-import type { resourceEditedLogicType } from './resourceEditedLogicType'
-
 /** Discriminator on `notification_type` for transient "edited elsewhere" events on the SSE stream. */
 export const RESOURCE_EDITED_EVENT_TYPE = 'resource_edited'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface resourceEditedLogicActions {
+    resourceEdited: (event: ResourceEditedEvent) => {
+        event: ResourceEditedEvent
+    }
+}
+
+export type resourceEditedLogicType = MakeLogicType<{}, resourceEditedLogicActions>
+
 /**
  * A tiny event bus that decouples the notifications SSE consumer from editors that care about
  * "this resource was edited elsewhere" events. The SSE consumer (sidePanelNotificationsLogic)
diff --git a/products/posthog_ai/frontend/logics/debugLogsLogic.ts b/products/posthog_ai/frontend/logics/debugLogsLogic.ts
index 791a802f5e84..b7fa29d5b3c8 100644
--- a/products/posthog_ai/frontend/logics/debugLogsLogic.ts
+++ b/products/posthog_ai/frontend/logics/debugLogsLogic.ts
@@ -1,9 +1,40 @@
-import { actions, connect, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, path, reducers, selectors } from 'kea'
 
 import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
 import { userLogic } from 'scenes/userLogic'
 
-import type { debugLogsLogicType } from './debugLogsLogicType'
+import type { UserType } from '../../../../frontend/src/types'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface debugLogsLogicValues {
+    isDev: boolean | undefined // preflightLogic
+    user: UserType | null // userLogic
+    canControlDebugLogs: boolean
+    debugLogsEnabled: boolean
+    showDebugLogs: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface debugLogsLogicActions {
+    setDebugLogsEnabled: (enabled: boolean) => {
+        enabled: boolean
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface debugLogsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        canControlDebugLogs: (user: UserType | null, isDev: boolean | undefined) => boolean
+        showDebugLogs: (user: UserType | null, canControlDebugLogs: boolean, debugLogsEnabled: boolean) => boolean
+    }
+}
+
+export type debugLogsLogicType = MakeLogicType<
+    debugLogsLogicValues,
+    debugLogsLogicActions,
+    Record<string, any>,
+    debugLogsLogicMeta
+>
 
 /**
  * Staff-only preference for whether `_posthog/console` debug rows surface in the run thread. Persisted
@@ -36,7 +67,8 @@ export const debugLogsLogic = kea<debugLogsLogicType>([
          */
         canControlDebugLogs: [
             (s) => [s.user, s.isDev],
-            (user, isDev): boolean => !user?.is_impersonated && (!!user?.is_staff || !!isDev),
+            (user: null | import('~/types').UserType, isDev: boolean | undefined): boolean =>
+                !user?.is_impersonated && (!!user?.is_staff || !!isDev),
         ],
         /**
          * Whether debug rows should actually render. Impersonation always shows them; otherwise staff/dev
@@ -44,8 +76,11 @@ export const debugLogsLogic = kea<debugLogsLogicType>([
          */
         showDebugLogs: [
             (s) => [s.user, s.canControlDebugLogs, s.debugLogsEnabled],
-            (user, canControlDebugLogs, debugLogsEnabled): boolean =>
-                !!user?.is_impersonated || (canControlDebugLogs && debugLogsEnabled),
+            (
+                user: null | import('~/types').UserType,
+                canControlDebugLogs: boolean,
+                debugLogsEnabled: boolean
+            ): boolean => !!user?.is_impersonated || (canControlDebugLogs && debugLogsEnabled),
         ],
     }),
 ])
diff --git a/products/posthog_ai/frontend/logics/runInteractionLogic.ts b/products/posthog_ai/frontend/logics/runInteractionLogic.ts
index 775bd71fab2f..5751bfa9d88a 100644
--- a/products/posthog_ai/frontend/logics/runInteractionLogic.ts
+++ b/products/posthog_ai/frontend/logics/runInteractionLogic.ts
@@ -1,5 +1,6 @@
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 
 import { lemonToast } from 'lib/lemon-ui/LemonToast'
 import { projectLogic } from 'scenes/projectLogic'
@@ -16,8 +17,9 @@ import {
     type ReasoningEffortEnumApi,
 } from 'products/tasks/frontend/generated/api.schemas'
 
-import type { runInteractionLogicType } from './runInteractionLogicType'
+import type { PermissionRequestRecord } from '../types/streamTypes'
 import { isTerminalRunStatus, runStreamLogic } from './runStreamLogic'
+import type { RunStatus } from './runStreamLogic'
 
 export interface RunInteractionLogicProps {
     taskId: string
@@ -52,6 +54,205 @@ const QUEUED_MESSAGE_ID = 'queued'
 const MODEL_CONFIG_ID = 'model'
 const EFFORT_CONFIG_ID = 'effort'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface runInteractionLogicValues {
+    currentProjectId: number | null // projectLogic
+    currentRunStatus: RunStatus | null // runStreamLogic
+    isThinking: boolean // runStreamLogic
+    pendingPermissionRequest: PermissionRequestRecord | null // runStreamLogic
+    respondingToPermission: boolean // runStreamLogic
+    canSend: boolean
+    composerForm: {
+        draft: string
+    }
+    composerFormAllErrors: Record<string, any>
+    composerFormChanged: boolean
+    composerFormErrors: DeepPartialMap<
+        {
+            draft: string
+        },
+        ValidationErrorType
+    >
+    composerFormHasErrors: boolean
+    composerFormManualErrors: Record<string, any>
+    composerFormTouched: boolean
+    composerFormTouches: Record<string, boolean>
+    composerFormValidationErrors: DeepPartialMap<
+        {
+            draft: string
+        },
+        ValidationErrorType
+    >
+    effortOverride: string | null
+    isBusy: boolean
+    isComposerFormSubmitting: boolean
+    isComposerFormValid: boolean
+    isSubmitting: boolean
+    isTerminal: boolean
+    modelOverride: string | null
+    queuedMessages: QueuedMessage[]
+    selectedEffort: ReasoningEffortEnumApi
+    selectedModel: string
+    sending: boolean
+    sentEffort: string | null
+    sentModel: string | null
+    showComposerFormErrors: boolean
+    startingRun: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface runInteractionLogicActions {
+    cancelRun: (
+        run?:
+            | {
+                  runId: string
+                  taskId: string
+              }
+            | undefined
+    ) => {
+        run:
+            | {
+                  runId: string
+                  taskId: string
+              }
+            | undefined
+    } // runStreamLogic
+    markTurnComplete: () => {
+        value: true
+    } // runStreamLogic
+    pushHumanMessage: (content: string) => {
+        content: string
+    } // runStreamLogic
+    respondToPermission: (payload: {
+        answers?: Record<string, string>
+        customInput?: string
+        optionId: string
+        requestId: string
+    }) => {
+        answers?: Record<string, string> | undefined
+        customInput?: string | undefined
+        optionId: string
+        requestId: string
+    } // runStreamLogic
+    clearQueue: () => {
+        value: true
+    }
+    enqueueMessage: (content: string) => {
+        content: string
+    }
+    flushQueue: () => {
+        value: true
+    }
+    prependQueuedMessage: (content: string) => {
+        content: string
+    }
+    removeQueuedMessage: (id: string) => {
+        id: string
+    }
+    resetComposerForm: (values?: { draft: string }) => {
+        values?: {
+            draft: string
+        }
+    }
+    sendNow: (
+        content: string,
+        source: 'draft' | 'queue'
+    ) => {
+        content: string
+        source: 'draft' | 'queue'
+    }
+    setComposerFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setComposerFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setComposerFormValues: (
+        values: DeepPartial<{
+            draft: string
+        }>
+    ) => {
+        values: DeepPartial<{
+            draft: string
+        }>
+    }
+    setEffort: (effort: string) => {
+        effort: string
+    }
+    setModel: (model: string) => {
+        model: string
+    }
+    setSending: (sending: boolean) => {
+        sending: boolean
+    }
+    setSentEffort: (effort: string) => {
+        effort: string
+    }
+    setSentModel: (model: string) => {
+        model: string
+    }
+    setStartingRun: (starting: boolean) => {
+        starting: boolean
+    }
+    startNewRun: (content: string) => {
+        content: string
+    }
+    submitComposerForm: () => {
+        value: boolean
+    }
+    submitComposerFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitComposerFormRequest: (composerForm: { draft: string }) => {
+        composerForm: {
+            draft: string
+        }
+    }
+    submitComposerFormSuccess: (composerForm: { draft: string }) => {
+        composerForm: {
+            draft: string
+        }
+    }
+    touchComposerFormField: (key: string) => {
+        key: string
+    }
+    updateQueuedMessage: (
+        id: string,
+        content: string
+    ) => {
+        content: string
+        id: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface runInteractionLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        isTerminal: (currentRunStatus: RunStatus | null) => boolean
+        selectedModel: (modelOverride: string | null, arg: any) => string
+        selectedEffort: (effortOverride: string | null, arg: any, selectedModel: string) => ReasoningEffortEnumApi
+        isBusy: (isThinking: boolean) => boolean
+        canSend: (sending: boolean, isTerminal: boolean, currentProjectId: number | null) => boolean
+        isSubmitting: (sending: boolean, startingRun: boolean) => boolean
+    }
+}
+
+export type runInteractionLogicType = MakeLogicType<
+    runInteractionLogicValues,
+    runInteractionLogicActions,
+    RunInteractionLogicProps,
+    runInteractionLogicMeta
+>
+
 /**
  * Max-agnostic interaction facade for a single task run. The UI binds to this one logic to drive every
  * user → run interaction — sending follow-ups, staging an editable "Up next" message while the agent is
@@ -212,26 +413,33 @@ export const runInteractionLogic = kea<runInteractionLogicType>([
     })),
 
     selectors({
-        isTerminal: [(s) => [s.currentRunStatus], (status): boolean => isTerminalRunStatus(status)],
+        isTerminal: [
+            (s) => [s.currentRunStatus],
+            (status: null | import('./runStreamLogic').RunStatus): boolean => isTerminalRunStatus(status),
+        ],
         // The model/effort to display in the picker and launch the next run with: the optimistic client-side
         // override, else the run's stored value, else the default. Effort is clamped to one the model supports.
         selectedModel: [
             (s) => [s.modelOverride, (_, p) => p.currentModel],
-            (override, current): string => override ?? current ?? DEFAULT_COMPOSER_MODEL,
+            (override: string | null, current): string => override ?? current ?? DEFAULT_COMPOSER_MODEL,
         ],
         selectedEffort: [
             (s) => [s.effortOverride, (_, p) => p.currentEffort, s.selectedModel],
-            (override, current, model): ReasoningEffortEnumApi =>
+            (override: string | null, current, model: string): ReasoningEffortEnumApi =>
                 resolveEffortForModel(override ?? current ?? DEFAULT_COMPOSER_EFFORT, model),
         ],
         // The agent is actively working a turn — a follow-up typed now should stage rather than send.
-        isBusy: [(s) => [s.isThinking], (isThinking): boolean => isThinking],
+        isBusy: [(s) => [s.isThinking], (isThinking: boolean): boolean => isThinking],
         canSend: [
             (s) => [s.sending, s.isTerminal, s.currentProjectId],
-            (sending, isTerminal, currentProjectId): boolean => !sending && !isTerminal && currentProjectId != null,
+            (sending: boolean, isTerminal: boolean, currentProjectId: number | null): boolean =>
+                !sending && !isTerminal && currentProjectId != null,
         ],
         // In-flight indicator for the composer's send button — a live send or a new-run start.
-        isSubmitting: [(s) => [s.sending, s.startingRun], (sending, startingRun): boolean => sending || startingRun],
+        isSubmitting: [
+            (s) => [s.sending, s.startingRun],
+            (sending: boolean, startingRun: boolean): boolean => sending || startingRun,
+        ],
     }),
 
     listeners(({ actions, values, props }) => ({
diff --git a/products/posthog_ai/frontend/logics/runStreamLogic.ts b/products/posthog_ai/frontend/logics/runStreamLogic.ts
index 62265621d284..aa8121d9e280 100644
--- a/products/posthog_ai/frontend/logics/runStreamLogic.ts
+++ b/products/posthog_ai/frontend/logics/runStreamLogic.ts
@@ -1,5 +1,17 @@
 import { type EventSourceMessage, createParser } from 'eventsource-parser'
-import { type BreakPointFunction, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    type BreakPointFunction,
+    actions,
+    connect,
+    kea,
+    key,
+    listeners,
+    path,
+    props,
+    reducers,
+    selectors,
+} from 'kea'
 import posthog from 'posthog-js'
 
 import api from 'lib/api'
@@ -13,6 +25,8 @@ import { userLogic } from 'scenes/userLogic'
 import { tasksRunsCommandCreate, tasksRunsStreamTokenRetrieve } from 'products/tasks/frontend/generated/api'
 import type { TaskRunBootstrapCreateRequestInitialPermissionModeEnumApi } from 'products/tasks/frontend/generated/api.schemas'
 
+import type { FeatureFlagsSet } from '../../../../frontend/src/lib/logic/featureFlagLogic'
+import type { UserType } from '../../../../frontend/src/types'
 import { getClaudeCodeMeta, resolveToolCall } from '../components/tool/toolResolver'
 import { parseSandboxQuestions } from '../policy/questionUtils'
 import { defaultPermissionDecision, findAllowOptionId } from '../policy/toolPolicy'
@@ -49,7 +63,6 @@ import {
     isTaskRunStateFrame,
 } from '../types/wireTypes'
 import { debugLogsLogic } from './debugLogsLogic'
-import type { runStreamLogicType } from './runStreamLogicType'
 
 export type RunSseStatus = 'idle' | 'connecting' | 'open' | 'reconnecting' | 'closed' | 'error'
 export type RunStatus = 'queued' | 'in_progress' | 'completed' | 'failed' | 'cancelled'
@@ -1199,6 +1212,265 @@ function rendersThreadItemContent(item: ThreadItem): boolean {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface runStreamLogicValues {
+    showDebugLogs: boolean // debugLogsLogic
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    isDev: boolean | undefined // preflightLogic
+    currentProjectId: number | null // projectLogic
+    user: UserType | null // userLogic
+    awaitingOptimisticAttach: boolean
+    bootstrapError: StreamErrorEnvelope | null
+    bootstrapLoading: boolean
+    bootstrappedRunId: string | null
+    contextUsage: ContextUsage | null
+    cumulativeReconnectAttempt: number
+    currentMode: string | null
+    currentProgress: string | null
+    currentRunStatus: RunStatus | null
+    currentStage: string | null
+    foldedThread: FoldedThread
+    hasGitArtifacts: boolean
+    isBootstrapResumeRun: boolean
+    isThinking: boolean
+    log: RunLog
+    logBootstrapLoading: boolean
+    pendingPermissionRequest: PermissionRequestRecord | null
+    reconnectAttempt: number
+    resolvedPermissionRequestIds: Set<string>
+    resourcesUsed: ResourceProduct[]
+    respondingToPermission: boolean
+    runArtifacts: RunArtifacts
+    runConnectionState: RunConnectionState | null
+    runOpening: boolean
+    runStarted: boolean
+    sdkSession: SdkSession | null
+    seenPermissionRequestIds: Set<string>
+    showThinkingIndicator: boolean
+    sseStatus: RunSseStatus
+    streamPhase: 'idle' | 'provisioning' | 'thinking'
+    streamViaProxyEnabled: boolean
+    threadItems: ThreadItem[]
+    toolInvocations: Map<string, ToolInvocation>
+    traceId: string | null
+    turnComplete: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface runStreamLogicActions {
+    appendEntries: (entries: StoredEntry[]) => {
+        entries: StoredEntry[]
+    }
+    autoApprovePermissionRequest: (
+        record: PermissionRequestRecord,
+        optionId: string
+    ) => {
+        optionId: string
+        record: PermissionRequestRecord
+    }
+    bootstrapLogReady: () => {
+        value: true
+    }
+    bootstrapReplayComplete: () => {
+        value: true
+    }
+    bootstrapRun: (payload: { justCreatedRun?: boolean; runId: string; taskId: string; traceId?: string }) => {
+        justCreatedRun?: boolean | undefined
+        runId: string
+        taskId: string
+        traceId?: string | undefined
+    }
+    cancelRun: (run?: { runId: string; taskId: string }) => {
+        run:
+            | {
+                  runId: string
+                  taskId: string
+              }
+            | undefined
+    }
+    clearPermissionRequest: () => {
+        value: true
+    }
+    closeSse: () => {
+        value: true
+    }
+    handleStreamError: (envelope: StreamErrorEnvelope) => StreamErrorEnvelope
+    handleTerminalStatus: (status: {
+        errorMessage?: string | null
+        replayedFromHistory?: boolean
+        status: RunStatus
+    }) => {
+        errorMessage?: string | null | undefined
+        replayedFromHistory?: boolean | undefined
+        status: RunStatus
+    }
+    ingestAcpFrame: (
+        entry: StoredLogEntry,
+        source?: FrameSource
+    ) => {
+        entry: StoredLogEntry
+        source: FrameSource
+    }
+    ingestPermissionRequest: (
+        record: PermissionRequestRecord,
+        replayedFromHistory?: boolean
+    ) => {
+        record: PermissionRequestRecord
+        replayedFromHistory: boolean
+    }
+    markBootstrapResumeRun: (value: boolean) => {
+        value: boolean
+    }
+    markPermissionRequestResolved: (requestId: string) => {
+        requestId: string
+    }
+    markPermissionRequestSeen: (requestId: string) => {
+        requestId: string
+    }
+    markRunStarted: () => {
+        value: true
+    }
+    markTurnComplete: () => {
+        value: true
+    }
+    mergeResourcesUsed: (
+        products: {
+            id?: string
+            label?: string
+        }[]
+    ) => {
+        products: {
+            id?: string | undefined
+            label?: string | undefined
+        }[]
+    }
+    mergeRunArtifacts: (partial: Partial<RunArtifacts>) => {
+        partial: Partial<RunArtifacts>
+    }
+    openSseForRun: (payload: { runId: string; startLatest?: boolean; taskId: string; traceId?: string }) => {
+        runId: string
+        startLatest?: boolean | undefined
+        taskId: string
+        traceId?: string | undefined
+    }
+    permissionResponseFailed: () => {
+        value: true
+    }
+    pushErrorItem: (
+        errorMessage: string,
+        variant?: 'crash' | 'error'
+    ) => {
+        errorMessage: string
+        variant: 'crash' | 'error'
+    }
+    pushHumanMessage: (content: string) => {
+        content: string
+    }
+    reset: () => {
+        value: true
+    }
+    respondToPermission: (payload: {
+        answers?: Record<string, string>
+        customInput?: string
+        optionId: string
+        requestId: string
+    }) => {
+        answers?: Record<string, string> | undefined
+        customInput?: string | undefined
+        optionId: string
+        requestId: string
+    }
+    routePermissionRequest: (
+        record: PermissionRequestRecord,
+        replayedFromHistory?: boolean
+    ) => {
+        record: PermissionRequestRecord
+        replayedFromHistory: boolean
+    }
+    setContextUsage: (usage: ContextUsage) => {
+        usage: ContextUsage
+    }
+    setCurrentMode: (mode: string) => {
+        mode: string
+    }
+    setCurrentProgress: (progress: string) => {
+        progress: string
+    }
+    setCurrentStage: (stage: string | null) => {
+        stage: string | null
+    }
+    setRunOpening: (opening: boolean) => {
+        opening: boolean
+    }
+    setSdkSession: (session: SdkSession) => {
+        session: SdkSession
+    }
+    sseConnecting: () => {
+        value: true
+    }
+    sseDropped: () => {
+        value: true
+    }
+    sseOpened: () => {
+        value: true
+    }
+    sseReconnecting: (attempt: number) => {
+        attempt: number
+    }
+    startOptimisticRun: (message?: string) => {
+        message: string | undefined
+    }
+    streamEnded: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface runStreamLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        foldedThread: (log: RunLog, isBootstrapResumeRun: boolean) => FoldedThread
+        threadItems: (foldedThread: FoldedThread, showDebugLogs: boolean) => ThreadItem[]
+        toolInvocations: (foldedThread: FoldedThread) => Map<string, ToolInvocation>
+        isThinking: (
+            runStarted: boolean,
+            turnComplete: boolean,
+            currentRunStatus: RunStatus | null,
+            sseStatus: RunSseStatus,
+            arg: boolean | undefined
+        ) => boolean
+        streamPhase: (
+            runStarted: boolean,
+            isThinking: boolean,
+            currentRunStatus: RunStatus | null,
+            sseStatus: RunSseStatus,
+            runOpening: boolean,
+            arg: boolean | undefined
+        ) => 'idle' | 'provisioning' | 'thinking'
+        showThinkingIndicator: (
+            streamPhase: 'idle' | 'provisioning' | 'thinking',
+            threadItems: ThreadItem[],
+            toolInvocations: Map<string, ToolInvocation>
+        ) => boolean
+        hasGitArtifacts: (runArtifacts: RunArtifacts) => boolean
+        streamViaProxyEnabled: (featureFlags: FeatureFlagsSet) => boolean
+        runConnectionState: (
+            sseStatus: RunSseStatus,
+            reconnectAttempt: number,
+            bootstrapError: StreamErrorEnvelope | null,
+            currentRunStatus: RunStatus | null,
+            arg: boolean | undefined
+        ) => RunConnectionState | null
+    }
+}
+
+export type runStreamLogicType = MakeLogicType<
+    runStreamLogicValues,
+    runStreamLogicActions,
+    RunStreamLogicProps,
+    runStreamLogicMeta
+>
+
 /**
  * Owns the SSE connection to the products/tasks stream endpoint (a `fetch` reader driven by
  * `eventsource-parser`, so a reconnect can resume via a Last-Event-ID header), parses the ACP wire
@@ -1664,11 +1936,11 @@ export const runStreamLogic = kea<runStreamLogicType>([
          */
         foldedThread: [
             (s) => [s.log, s.isBootstrapResumeRun],
-            (log, isResumeRun): FoldedThread => foldLogToThread(log.entries, { isResumeRun }),
+            (log: RunLog, isResumeRun: boolean): FoldedThread => foldLogToThread(log.entries, { isResumeRun }),
         ],
         threadItems: [
             (s) => [s.foldedThread, s.showDebugLogs],
-            (foldedThread, showDebugLogs): ThreadItem[] =>
+            (foldedThread: FoldedThread, showDebugLogs: boolean): ThreadItem[] =>
                 // Filtering lives here, not in the renderer: a row the renderer would return `null` for
                 // (a content-less item, or a debug row a non-privileged user can't see) still reserves an
                 // empty, gap-padded slot in the virtualized thread. Drop them before they become rows.
@@ -1680,7 +1952,7 @@ export const runStreamLogic = kea<runStreamLogicType>([
         ],
         toolInvocations: [
             (s) => [s.foldedThread],
-            (foldedThread): Map<string, ToolInvocation> => foldedThread.toolInvocations,
+            (foldedThread: FoldedThread): Map<string, ToolInvocation> => foldedThread.toolInvocations,
         ],
         /**
          * Whether the agent is actively working a turn — drives the thread's thinking indicator.
@@ -1694,7 +1966,13 @@ export const runStreamLogic = kea<runStreamLogicType>([
         isThinking: [
             // `replayOnly` always resolves (default in `props`); `!` drops the optional-prop `undefined`.
             (s, p) => [s.runStarted, s.turnComplete, s.currentRunStatus, s.sseStatus, p.replayOnly!],
-            (runStarted, turnComplete, currentRunStatus, sseStatus, replayOnly): boolean => {
+            (
+                runStarted: boolean,
+                turnComplete: boolean,
+                currentRunStatus: RunStatus | null,
+                sseStatus: RunSseStatus,
+                replayOnly: boolean | undefined
+            ): boolean => {
                 // A read-only snapshot is never "thinking" — it's a static replay, so the indicator
                 // must never spin (an in-progress run replayed read-only has no live turn to await).
                 if (replayOnly) {
@@ -1721,12 +1999,12 @@ export const runStreamLogic = kea<runStreamLogicType>([
         streamPhase: [
             (s, p) => [s.runStarted, s.isThinking, s.currentRunStatus, s.sseStatus, s.runOpening, p.replayOnly!],
             (
-                runStarted,
-                isThinking,
-                currentRunStatus,
-                sseStatus,
-                runOpening,
-                replayOnly
+                runStarted: boolean,
+                isThinking: boolean,
+                currentRunStatus: RunStatus | null,
+                sseStatus: RunSseStatus,
+                runOpening: boolean,
+                replayOnly: boolean | undefined
             ): 'provisioning' | 'thinking' | 'idle' => {
                 // A read-only snapshot never provisions or thinks — there is no live stream behind it.
                 if (replayOnly) {
@@ -1754,7 +2032,11 @@ export const runStreamLogic = kea<runStreamLogicType>([
          */
         showThinkingIndicator: [
             (s) => [s.streamPhase, s.threadItems, s.toolInvocations],
-            (streamPhase, threadItems, toolInvocations): boolean => {
+            (
+                streamPhase: 'idle' | 'provisioning' | 'thinking',
+                threadItems: ThreadItem[],
+                toolInvocations: Map<string, ToolInvocation>
+            ): boolean => {
                 if (streamPhase !== 'thinking') {
                     return false
                 }
@@ -1786,7 +2068,7 @@ export const runStreamLogic = kea<runStreamLogicType>([
         /** Whether the run exposes any git artifact worth surfacing — gates the pre/post-turn coding UI. */
         hasGitArtifacts: [
             (s) => [s.runArtifacts],
-            (runArtifacts): boolean => !!runArtifacts.prUrl || !!runArtifacts.branch,
+            (runArtifacts: RunArtifacts): boolean => !!runArtifacts.prUrl || !!runArtifacts.branch,
         ],
         /**
          * Gates routing the live stream through the standalone agent-proxy (the durable-streaming
@@ -1798,7 +2080,8 @@ export const runStreamLogic = kea<runStreamLogicType>([
          */
         streamViaProxyEnabled: [
             (s) => [s.featureFlags],
-            (featureFlags): boolean => !!featureFlags[FEATURE_FLAGS.TASKS_STREAM_VIA_PROXY],
+            (featureFlags: import('lib/logic/featureFlagLogic').FeatureFlagsSet): boolean =>
+                !!featureFlags[FEATURE_FLAGS.TASKS_STREAM_VIA_PROXY],
         ],
         /**
          * The live connection banner view-model (footer `RunAlertActivity`), or null when the connection is
@@ -1809,7 +2092,13 @@ export const runStreamLogic = kea<runStreamLogicType>([
          */
         runConnectionState: [
             (s, p) => [s.sseStatus, s.reconnectAttempt, s.bootstrapError, s.currentRunStatus, p.replayOnly!],
-            (sseStatus, reconnectAttempt, bootstrapError, currentRunStatus, replayOnly): RunConnectionState | null => {
+            (
+                sseStatus: RunSseStatus,
+                reconnectAttempt: number,
+                bootstrapError: StreamErrorEnvelope | null,
+                currentRunStatus: RunStatus | null,
+                replayOnly: boolean | undefined
+            ): RunConnectionState | null => {
                 if (isTerminalRunStatus(currentRunStatus)) {
                     return null
                 }
diff --git a/products/posthog_ai/frontend/logics/runnerPanelLogic.ts b/products/posthog_ai/frontend/logics/runnerPanelLogic.ts
index 2e916604fa91..afbd0421bda9 100644
--- a/products/posthog_ai/frontend/logics/runnerPanelLogic.ts
+++ b/products/posthog_ai/frontend/logics/runnerPanelLogic.ts
@@ -1,6 +1,4 @@
-import { actions, kea, key, listeners, path, props, reducers, selectors } from 'kea'
-
-import type { runnerPanelLogicType } from './runnerPanelLogicType'
+import { MakeLogicType, actions, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 
 // The optimistic run opened on send, before the task/run exist. `streamKey` is the client key the pending
 // `RunSurface` (and its seeded `runStreamLogic`) bind to; `taskId`/`runId` are filled once known (reserved
@@ -18,6 +16,51 @@ export interface RunnerPanelLogicProps {
     panelId?: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface runnerPanelLogicValues {
+    activeCreation: ActiveCreation | null
+    cameFromHistory: boolean
+    canGoBack: boolean
+    historyExpanded: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface runnerPanelLogicActions {
+    clearActiveCreation: () => {
+        value: true
+    }
+    goBack: () => {
+        value: true
+    }
+    setActiveCreation: (creation: ActiveCreation) => {
+        creation: ActiveCreation
+    }
+    setCameFromHistory: (cameFromHistory: boolean) => {
+        cameFromHistory: boolean
+    }
+    setHistoryExpanded: (expanded: boolean) => {
+        expanded: boolean
+    }
+    toggleHistory: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface runnerPanelLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        canGoBack: (activeCreation: ActiveCreation | null, historyExpanded: boolean) => boolean
+    }
+}
+
+export type runnerPanelLogicType = MakeLogicType<
+    runnerPanelLogicValues,
+    runnerPanelLogicActions,
+    RunnerPanelLogicProps,
+    runnerPanelLogicMeta
+>
+
 export const runnerPanelLogic = kea<runnerPanelLogicType>([
     path(['products', 'posthog_ai', 'frontend', 'logics', 'runnerPanelLogic']),
     props({} as RunnerPanelLogicProps),
@@ -66,7 +109,8 @@ export const runnerPanelLogic = kea<runnerPanelLogicType>([
     selectors({
         canGoBack: [
             (s) => [s.activeCreation, s.historyExpanded],
-            (activeCreation, historyExpanded): boolean => !!activeCreation || historyExpanded,
+            (activeCreation: ActiveCreation | null, historyExpanded: boolean): boolean =>
+                !!activeCreation || historyExpanded,
         ],
     }),
 
diff --git a/products/posthog_ai/frontend/logics/taskHistoryLogic.ts b/products/posthog_ai/frontend/logics/taskHistoryLogic.ts
index 3a1fda8c720b..951bfb135db2 100644
--- a/products/posthog_ai/frontend/logics/taskHistoryLogic.ts
+++ b/products/posthog_ai/frontend/logics/taskHistoryLogic.ts
@@ -1,12 +1,44 @@
-import { actions, connect, events, kea, path, reducers } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, path, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
 import { userLogic } from 'scenes/userLogic'
 
+import type { UserType } from '../../../../frontend/src/types'
 import { loadErrorMessage } from '../lib/load-error'
 import { OriginProduct, Task } from '../types/taskTypes'
-import type { taskHistoryLogicType } from './taskHistoryLogicType'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface taskHistoryLogicValues {
+    user: UserType | null // userLogic
+    history: Task[]
+    historyError: string | null
+    historyLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface taskHistoryLogicActions {
+    loadHistory: (_: void) => void
+    loadHistoryFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadHistorySuccess: (
+        history: Task[],
+        payload?: void
+    ) => {
+        history: Task[]
+        payload?: void
+    }
+    taskArchived: (taskId: string) => {
+        taskId: string
+    }
+}
+
+export type taskHistoryLogicType = MakeLogicType<taskHistoryLogicValues, taskHistoryLogicActions>
 
 // Deliberately independent of `tasksLogic` — the panel history must show the user's own recent
 // posthog_ai tasks regardless of whatever search/assignee filter is active on the /tasks scene.
diff --git a/products/posthog_ai/frontend/logics/taskLogic.ts b/products/posthog_ai/frontend/logics/taskLogic.ts
index 028a9c6362e1..230b3271ecb1 100644
--- a/products/posthog_ai/frontend/logics/taskLogic.ts
+++ b/products/posthog_ai/frontend/logics/taskLogic.ts
@@ -1,4 +1,4 @@
-import { kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, kea, key, listeners, path, props, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 
@@ -7,13 +7,97 @@ import api from 'lib/api'
 import { isApiNotFound, loadErrorMessage } from '../lib/load-error'
 import { phDebugQueryParams } from '../lib/ph-debug'
 import { Task, type TaskUpsertProps } from '../types/taskTypes'
-import type { taskLogicType } from './taskLogicType'
 import { tasksLogic } from './tasksLogic'
 
 export interface TaskLogicProps {
     taskId: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface taskLogicValues {
+    task: Task | null
+    taskError: string | null
+    taskLoading: boolean
+    taskNotFound: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface taskLogicActions {
+    deleteTask: () => any
+    deleteTaskFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteTaskSuccess: (
+        task: null,
+        payload?: any
+    ) => {
+        task: null
+        payload?: any
+    }
+    loadTask: () => any
+    loadTaskFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadTaskSuccess: (
+        task: Task | null,
+        payload?: any
+    ) => {
+        task: Task | null
+        payload?: any
+    }
+    runTask: () => any
+    runTaskFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    runTaskSuccess: (
+        task: Task,
+        payload?: any
+    ) => {
+        task: Task
+        payload?: any
+    }
+    updateTask: ({ data }: { data: TaskUpsertProps }) => {
+        data: TaskUpsertProps
+    }
+    updateTaskFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateTaskSuccess: (
+        task: Task,
+        payload?: {
+            data: TaskUpsertProps
+        }
+    ) => {
+        task: Task
+        payload?: {
+            data: TaskUpsertProps
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface taskLogicMeta {
+    key: string
+}
+
+export type taskLogicType = MakeLogicType<taskLogicValues, taskLogicActions, TaskLogicProps, taskLogicMeta>
+
 export const taskLogic = kea<taskLogicType>([
     path(['products', 'posthog_ai', 'frontend', 'logics', 'taskLogic']),
     props({} as TaskLogicProps),
diff --git a/products/posthog_ai/frontend/logics/tasksLogic.ts b/products/posthog_ai/frontend/logics/tasksLogic.ts
index 7e069a4080ab..f5c99351b3be 100644
--- a/products/posthog_ai/frontend/logics/tasksLogic.ts
+++ b/products/posthog_ai/frontend/logics/tasksLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 
@@ -10,9 +10,145 @@ import { userLogic } from 'scenes/userLogic'
 
 import { ProductIntentContext, ProductKey } from '~/queries/schema/schema-general'
 
+import type { UserType } from '../../../../frontend/src/types'
 import { loadErrorMessage } from '../lib/load-error'
 import { OriginProduct, Task, TaskAssigneeFilter, TaskListParams, TaskUpsertProps } from '../types/taskTypes'
-import type { tasksLogicType } from './tasksLogicType'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tasksLogicValues {
+    user: UserType | null // userLogic
+    assigneeFilter: TaskAssigneeFilter
+    isStaffUser: boolean
+    repositories: string[]
+    repositoriesLoading: boolean
+    searchQuery: string
+    taskListParams: TaskListParams
+    tasks: Task[]
+    tasksError: string | null
+    tasksLoading: boolean
+    tasksLoadingMore: boolean
+    tasksNext: string | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tasksLogicActions {
+    createTask: ({ data }: { data: TaskUpsertProps }) => {
+        data: TaskUpsertProps
+    }
+    createTaskFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    createTaskSuccess: (
+        tasks: Task[],
+        payload?: {
+            data: TaskUpsertProps
+        }
+    ) => {
+        tasks: Task[]
+        payload?: {
+            data: TaskUpsertProps
+        }
+    }
+    deleteTask: ({ taskId }: { taskId: string }) => {
+        taskId: string
+    }
+    deleteTaskFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteTaskSuccess: (
+        tasks: Task[],
+        payload?: {
+            taskId: string
+        }
+    ) => {
+        tasks: Task[]
+        payload?: {
+            taskId: string
+        }
+    }
+    loadMoreTasks: (_: void) => void
+    loadMoreTasksFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadMoreTasksSuccess: (
+        tasks: Task[],
+        payload?: void
+    ) => {
+        tasks: Task[]
+        payload?: void
+    }
+    loadRepositories: () => any
+    loadRepositoriesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRepositoriesSuccess: (
+        repositories: string[],
+        payload?: any
+    ) => {
+        repositories: string[]
+        payload?: any
+    }
+    loadTasks: (params?: TaskListParams) => TaskListParams
+    loadTasksFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadTasksSuccess: (
+        tasks: Task[],
+        payload?: TaskListParams
+    ) => {
+        tasks: Task[]
+        payload?: TaskListParams
+    }
+    openTask: (taskId: Task['id']) => {
+        taskId: string
+    }
+    setAssigneeFilter: (assigneeFilter: TaskAssigneeFilter) => {
+        assigneeFilter: TaskAssigneeFilter
+    }
+    setSearchQuery: (search: string) => {
+        search: string
+    }
+    setTasksNext: (next: string | null) => {
+        next: string | null
+    }
+    updateTask: (task: Task) => {
+        task: Task
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tasksLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        isStaffUser: (user: UserType | null) => boolean
+        taskListParams: (
+            searchQuery: string,
+            assigneeFilter: TaskAssigneeFilter,
+            user: UserType | null
+        ) => TaskListParams
+    }
+}
+
+export type tasksLogicType = MakeLogicType<tasksLogicValues, tasksLogicActions, Record<string, any>, tasksLogicMeta>
 
 export const tasksLogic = kea<tasksLogicType>([
     path(['products', 'posthog_ai', 'frontend', 'logics', 'tasksLogic']),
@@ -140,13 +276,17 @@ export const tasksLogic = kea<tasksLogicType>([
 
     selectors({
         // The "all team" filter is staff-only; expose it so the menu can conditionally show it.
-        isStaffUser: [(s) => [s.user], (user): boolean => !!user?.is_staff],
+        isStaffUser: [(s) => [s.user], (user: null | import('~/types').UserType): boolean => !!user?.is_staff],
         // Combined list filters: search term + the assignee toggle. "For you" scopes to the current
         // user's own tasks; "team scouts" scopes to autonomous Signals Scout tasks; "all team" (staff
         // only) lists every task on the team, letting the server bypass the per-user visibility filter.
         taskListParams: [
             (s) => [s.searchQuery, s.assigneeFilter, s.user],
-            (searchQuery, assigneeFilter, user): TaskListParams => {
+            (
+                searchQuery: string,
+                assigneeFilter: TaskAssigneeFilter,
+                user: null | import('~/types').UserType
+            ): TaskListParams => {
                 const base: TaskListParams = { search: searchQuery || undefined }
                 // Guard here too: a non-staff user must never send `all_team_tasks` (the server ignores
                 // it, but this keeps the request honest and falls back to their own tasks).
diff --git a/products/posthog_ai/frontend/scenes/TaskTracker/taskDetailSceneLogic.ts b/products/posthog_ai/frontend/scenes/TaskTracker/taskDetailSceneLogic.ts
index fb30f9c4e407..973a2f566633 100644
--- a/products/posthog_ai/frontend/scenes/TaskTracker/taskDetailSceneLogic.ts
+++ b/products/posthog_ai/frontend/scenes/TaskTracker/taskDetailSceneLogic.ts
@@ -1,4 +1,17 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, propsChanged, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    afterMount,
+    connect,
+    kea,
+    key,
+    listeners,
+    path,
+    props,
+    propsChanged,
+    reducers,
+    selectors,
+} from 'kea'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 
@@ -10,10 +23,123 @@ import { phDebugQueryParams } from '../../lib/ph-debug'
 import { TaskLogicProps, taskLogic } from '../../logics/taskLogic'
 import { tasksLogic } from '../../logics/tasksLogic'
 import { TaskRun } from '../../types/taskTypes'
-import type { taskDetailSceneLogicType } from './taskDetailSceneLogicType'
+import type { Task, TaskUpsertProps } from '../../types/taskTypes'
 
 export type TaskDetailSceneLogicProps = TaskLogicProps
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface taskDetailSceneLogicValues {
+    task: Task | null // taskLogic
+    taskError: string | null // taskLogic
+    taskLoading: boolean // taskLogic
+    taskNotFound: boolean // taskLogic
+    canEditRepository: boolean
+    isHeaderLoading: boolean
+    isRunPending: boolean
+    isTaskPending: boolean
+    runs: TaskRun[]
+    runsError: string | null
+    runsLoading: boolean
+    selectedRun: TaskRun | null
+    selectedRunData: TaskRun | null
+    selectedRunDataLoading: boolean
+    selectedRunError: string | null
+    selectedRunId: TaskRun['id'] | null
+    selectedRunNotFound: boolean
+    taskId: any
+    title: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface taskDetailSceneLogicActions {
+    deleteTask: () => any // taskLogic
+    loadTask: () => any // taskLogic
+    loadTaskSuccess: (
+        task: Task | null,
+        payload?: any
+    ) => {
+        payload?: any
+        task: Task | null
+    } // taskLogic
+    runTask: () => any // taskLogic
+    runTaskSuccess: (
+        task: Task,
+        payload?: any
+    ) => {
+        payload?: any
+        task: Task
+    } // taskLogic
+    updateTask: (args_0: { data: TaskUpsertProps }) => {
+        data: TaskUpsertProps
+    } // taskLogic
+    loadSelectedTaskRun: () => any
+    loadSelectedTaskRunFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSelectedTaskRunSuccess: (
+        selectedRunData: TaskRun | null,
+        payload?: any
+    ) => {
+        selectedRunData: TaskRun | null
+        payload?: any
+    }
+    loadTaskRuns: () => any
+    loadTaskRunsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadTaskRunsSuccess: (
+        runs: TaskRun[],
+        payload?: any
+    ) => {
+        runs: TaskRun[]
+        payload?: any
+    }
+    setSelectedRunId: (
+        runId: TaskRun['id'] | null,
+        taskId: string
+    ) => {
+        runId: string | null
+        taskId: string
+    }
+    updateRun: (run: TaskRun) => {
+        run: TaskRun
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface taskDetailSceneLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        taskId: (arg: any) => any
+        selectedRun: (selectedRunData: TaskRun | null, runs: TaskRun[], selectedRunId: string | null) => TaskRun | null
+        canEditRepository: (runs: TaskRun[]) => boolean
+        isTaskPending: (taskLoading: boolean, task: Task | null) => boolean
+        isRunPending: (
+            runsLoading: boolean,
+            runs: TaskRun[],
+            selectedRunDataLoading: boolean,
+            selectedRun: TaskRun | null
+        ) => boolean
+        isHeaderLoading: (isTaskPending: boolean, isRunPending: boolean) => boolean
+        title: (task: Task | null) => string
+    }
+}
+
+export type taskDetailSceneLogicType = MakeLogicType<
+    taskDetailSceneLogicValues,
+    taskDetailSceneLogicActions,
+    TaskDetailSceneLogicProps,
+    taskDetailSceneLogicMeta
+>
+
 export const taskDetailSceneLogic = kea<taskDetailSceneLogicType>([
     path(['products', 'posthog_ai', 'frontend', 'scenes', 'TaskTracker', 'taskDetailSceneLogic']),
     props({} as TaskDetailSceneLogicProps),
@@ -112,7 +238,7 @@ export const taskDetailSceneLogic = kea<taskDetailSceneLogicType>([
         taskId: [() => [(_, props) => props.taskId], (taskId) => taskId],
         selectedRun: [
             (s) => [s.selectedRunData, s.runs, s.selectedRunId],
-            (selectedRunData, runs, selectedRunId): TaskRun | null => {
+            (selectedRunData: TaskRun | null, runs: TaskRun[], selectedRunId: TaskRun['id'] | null): TaskRun | null => {
                 if (selectedRunData && selectedRunData.id === selectedRunId) {
                     return selectedRunData
                 }
@@ -124,25 +250,32 @@ export const taskDetailSceneLogic = kea<taskDetailSceneLogicType>([
         ],
         canEditRepository: [
             (s) => [s.runs],
-            (runs): boolean => {
+            (runs: TaskRun[]): boolean => {
                 return runs.length === 0
             },
         ],
-        isTaskPending: [(s) => [s.taskLoading, s.task], (taskLoading, task): boolean => taskLoading && !task],
+        isTaskPending: [
+            (s) => [s.taskLoading, s.task],
+            (taskLoading: boolean, task: null | import('../../types/taskTypes').Task): boolean => taskLoading && !task,
+        ],
         isRunPending: [
             (s) => [s.runsLoading, s.runs, s.selectedRunDataLoading, s.selectedRun],
-            (runsLoading, runs, selectedRunDataLoading, selectedRun): boolean =>
-                (runsLoading && runs.length === 0) || (selectedRunDataLoading && !selectedRun),
+            (
+                runsLoading: boolean,
+                runs: TaskRun[],
+                selectedRunDataLoading: boolean,
+                selectedRun: TaskRun | null
+            ): boolean => (runsLoading && runs.length === 0) || (selectedRunDataLoading && !selectedRun),
         ],
         // The header (task panel + title + run metadata) and the run log share the runs-loading phase, so
         // both resolve together: one skeleton-only loading state, no piecemeal pop-in.
         isHeaderLoading: [
             (s) => [s.isTaskPending, s.isRunPending],
-            (isTaskPending, isRunPending): boolean => isTaskPending || isRunPending,
+            (isTaskPending: boolean, isRunPending: boolean): boolean => isTaskPending || isRunPending,
         ],
         title: [
             (s) => [s.task],
-            (task): string => {
+            (task: null | import('../../types/taskTypes').Task): string => {
                 return task?.title || task?.slug || 'Task'
             },
         ],
diff --git a/products/posthog_ai/frontend/scenes/TaskTracker/taskTrackerSceneLogic.ts b/products/posthog_ai/frontend/scenes/TaskTracker/taskTrackerSceneLogic.ts
index 0263bb1e4386..fb65a7f2c57b 100644
--- a/products/posthog_ai/frontend/scenes/TaskTracker/taskTrackerSceneLogic.ts
+++ b/products/posthog_ai/frontend/scenes/TaskTracker/taskTrackerSceneLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, events, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, key, listeners, path, props, reducers } from 'kea'
 import { router, urlToAction } from 'kea-router'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -13,15 +13,17 @@ import {
     TaskExecutionModeEnumApi,
 } from 'products/tasks/frontend/generated/api.schemas'
 
+import type { IntegrationType, UserBasicType } from '../../../../../frontend/src/types'
 import { runStreamLogic } from '../../api/logics'
 import type { SuggestionGroup, SuggestionItem } from '../../api/primitives'
 import { DEFAULT_HEADLINES, pickHeadline } from '../../api/primitives'
 import { runnerPanelLogic } from '../../logics/runnerPanelLogic'
+import type { ActiveCreation } from '../../logics/runnerPanelLogic'
 import { tasksLogic } from '../../logics/tasksLogic'
 import type { RepositoryConfig, Task } from '../../types/taskTypes'
 import { OriginProduct, TaskUpsertProps } from '../../types/taskTypes'
+import type { TaskListParams } from '../../types/taskTypes'
 import { DEFAULT_COMPOSER_EFFORT, DEFAULT_COMPOSER_MODEL, resolveEffortForModel } from '../../utils/composerModels'
-import type { taskTrackerSceneLogicType } from './taskTrackerSceneLogicType'
 
 export type { ActiveCreation } from '../../logics/runnerPanelLogic'
 
@@ -56,6 +58,189 @@ const EMPTY_TASK_FORM: TaskCreateForm = {
     reasoningEffort: DEFAULT_COMPOSER_EFFORT,
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface taskTrackerSceneLogicValues {
+    integrations: IntegrationType[] | null // integrationsLogic
+    activeCreation: ActiveCreation | null // runnerPanelLogic
+    historyExpanded: boolean // runnerPanelLogic
+    repositories: string[] // tasksLogic
+    taskListParams: TaskListParams // tasksLogic
+    tasks: Task[] // tasksLogic
+    activeSuggestionGroup: SuggestionGroup | null
+    headline: string
+    isSubmittingTask: boolean
+    newTaskData: TaskCreateForm
+    persistedRepositoryConfig: PersistedRepositoryConfig
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface taskTrackerSceneLogicActions {
+    loadIntegrationsSuccess: (
+        integrations: {
+            config: any
+            created_at: string
+            created_by?: UserBasicType | null | undefined
+            display_name: string
+            errors?: string | undefined
+            icon_url: any
+            id: number
+            kind:
+                | 'apns'
+                | 'aws-s3'
+                | 'azure-blob'
+                | 'bing-ads'
+                | 'clickup'
+                | 'customerio-app'
+                | 'customerio-track'
+                | 'customerio-webhook'
+                | 'databricks'
+                | 'email'
+                | 'firebase'
+                | 'github'
+                | 'gitlab'
+                | 'google-ads'
+                | 'google-analytics'
+                | 'google-cloud-service-account'
+                | 'google-cloud-storage'
+                | 'google-pubsub'
+                | 'google-search-console'
+                | 'google-sheets'
+                | 'hubspot'
+                | 'intercom'
+                | 'jira'
+                | 'linear'
+                | 'linkedin-ads'
+                | 'meta-ads'
+                | 'pinterest-ads'
+                | 'postgresql'
+                | 'reddit-ads'
+                | 's3-compatible'
+                | 'salesforce'
+                | 'slack'
+                | 'snapchat'
+                | 'stripe'
+                | 'tiktok-ads'
+                | 'twilio'
+                | 'vercel'
+        }[],
+        payload?: any
+    ) => {
+        integrations: {
+            config: any
+            created_at: string
+            created_by?: UserBasicType | null | undefined
+            display_name: string
+            errors?: string | undefined
+            icon_url: any
+            id: number
+            kind:
+                | 'apns'
+                | 'aws-s3'
+                | 'azure-blob'
+                | 'bing-ads'
+                | 'clickup'
+                | 'customerio-app'
+                | 'customerio-track'
+                | 'customerio-webhook'
+                | 'databricks'
+                | 'email'
+                | 'firebase'
+                | 'github'
+                | 'gitlab'
+                | 'google-ads'
+                | 'google-analytics'
+                | 'google-cloud-service-account'
+                | 'google-cloud-storage'
+                | 'google-pubsub'
+                | 'google-search-console'
+                | 'google-sheets'
+                | 'hubspot'
+                | 'intercom'
+                | 'jira'
+                | 'linear'
+                | 'linkedin-ads'
+                | 'meta-ads'
+                | 'pinterest-ads'
+                | 'postgresql'
+                | 'reddit-ads'
+                | 's3-compatible'
+                | 'salesforce'
+                | 'slack'
+                | 'snapchat'
+                | 'stripe'
+                | 'tiktok-ads'
+                | 'twilio'
+                | 'vercel'
+        }[]
+        payload?: any
+    } // integrationsLogic
+    clearActiveCreation: () => {
+        value: true
+    } // runnerPanelLogic
+    setActiveCreation: (creation: ActiveCreation) => {
+        creation: ActiveCreation
+    } // runnerPanelLogic
+    setHistoryExpanded: (expanded: boolean) => {
+        expanded: boolean
+    } // runnerPanelLogic
+    toggleHistory: () => {
+        value: true
+    } // runnerPanelLogic
+    deleteTask: (args_0: { taskId: string }) => {
+        taskId: string
+    } // tasksLogic
+    loadRepositories: () => any // tasksLogic
+    loadTasks: (params?: TaskListParams | undefined) => TaskListParams // tasksLogic
+    applySuggestion: (item: SuggestionItem) => {
+        item: SuggestionItem
+    }
+    maybeAutoSelectIntegration: () => {
+        value: true
+    }
+    openExistingTask: (task: Task) => {
+        task: Task
+    }
+    resetNewTaskData: () => {
+        value: true
+    }
+    setActiveSuggestionGroup: (group: SuggestionGroup | null) => {
+        group: SuggestionGroup | null
+    }
+    setHeadline: (headline: string) => {
+        headline: string
+    }
+    setNewTaskData: (data: Partial<TaskCreateForm>) => {
+        data: Partial<TaskCreateForm>
+    }
+    setPersistedRepositoryConfig: (config: PersistedRepositoryConfig) => {
+        config: PersistedRepositoryConfig
+    }
+    submitNewTask: () => {
+        value: true
+    }
+    submitNewTaskFailure: (error: string) => {
+        error: string
+    }
+    submitNewTaskSuccess: () => {
+        value: true
+    }
+    updateActiveCreationRun: (runId: string) => {
+        runId: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface taskTrackerSceneLogicMeta {
+    key: string
+}
+
+export type taskTrackerSceneLogicType = MakeLogicType<
+    taskTrackerSceneLogicValues,
+    taskTrackerSceneLogicActions,
+    TaskTrackerSceneLogicProps,
+    taskTrackerSceneLogicMeta
+>
+
 export const taskTrackerSceneLogic = kea<taskTrackerSceneLogicType>([
     path(['products', 'posthog_ai', 'frontend', 'scenes', 'TaskTracker', 'taskTrackerSceneLogic']),
     props({} as TaskTrackerSceneLogicProps),
diff --git a/products/replay_vision/frontend/logics/bulkScanLogic.ts b/products/replay_vision/frontend/logics/bulkScanLogic.ts
index 4ea1688e30e2..89e7e52b9117 100644
--- a/products/replay_vision/frontend/logics/bulkScanLogic.ts
+++ b/products/replay_vision/frontend/logics/bulkScanLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers } from 'kea'
 import { router } from 'kea-router'
 
 import { ApiError } from 'lib/api-error'
@@ -7,13 +7,39 @@ import { teamLogic } from 'scenes/teamLogic'
 import { urls } from 'scenes/urls'
 
 import { visionScannersObserveCreate } from '../generated/api'
-import type { bulkScanLogicType } from './bulkScanLogicType'
+import type { ReplayScannerApi } from '../generated/api.schemas'
 import { refreshVisionQuota } from './visionQuotaLogic'
 import { visionScannersListLogic } from './visionScannersListLogic'
 
 // Caps simultaneous workflow-start requests; the batches run sequentially.
 const BULK_SCAN_CONCURRENCY = 10
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface bulkScanLogicValues {
+    scanners: ReplayScannerApi[] // visionScannersListLogic
+    scannersLoading: boolean // visionScannersListLogic
+    scanning: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface bulkScanLogicActions {
+    scanRecordings: (
+        scannerId: string,
+        sessionIds: string[]
+    ) => {
+        scannerId: string
+        sessionIds: string[]
+    }
+    scanRecordingsFailure: () => {
+        value: true
+    }
+    scanRecordingsSuccess: () => {
+        value: true
+    }
+}
+
+export type bulkScanLogicType = MakeLogicType<bulkScanLogicValues, bulkScanLogicActions>
+
 export const bulkScanLogic = kea<bulkScanLogicType>([
     path(['products', 'replay_vision', 'frontend', 'logics', 'bulkScanLogic']),
 
diff --git a/products/replay_vision/frontend/logics/observationsDockLogic.ts b/products/replay_vision/frontend/logics/observationsDockLogic.ts
index fb48718d7c47..f275ed766bf0 100644
--- a/products/replay_vision/frontend/logics/observationsDockLogic.ts
+++ b/products/replay_vision/frontend/logics/observationsDockLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 
 import { lemonToast } from 'lib/lemon-ui/LemonToast'
 import { metricCount } from 'lib/operationalMetrics'
@@ -8,7 +8,6 @@ import { visionObservationsList, visionScannersObserveCreate } from '../generate
 import type { ReplayScannerApi, ReplayObservationApi } from '../generated/api.schemas'
 import { OBSERVE_POLL_GRACE_MS, scheduleObservationPoll, shouldPollObservations } from './observationPolling'
 import { requestObservationRetry } from './observationRetry'
-import type { observationsDockLogicType } from './observationsDockLogicType'
 import { refreshVisionQuota } from './visionQuotaLogic'
 import { visionScannersListLogic } from './visionScannersListLogic'
 
@@ -16,6 +15,77 @@ export interface ObservationsDockLogicProps {
     sessionId: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface observationsDockLogicValues {
+    scanners: ReplayScannerApi[] // visionScannersListLogic
+    dockOpen: boolean
+    filteredScanners: ReplayScannerApi[]
+    hasObservationsInFlight: boolean
+    observations: ReplayObservationApi[]
+    observationsLoading: boolean
+    observing: boolean
+    pollUntil: number
+    retryingObservationIds: string[]
+    scannerPickerOpen: boolean
+    scannerSearch: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface observationsDockLogicActions {
+    loadObservations: () => {
+        value: true
+    }
+    loadObservationsFailure: () => {
+        value: true
+    }
+    loadObservationsSuccess: (observations: ReplayObservationApi[]) => {
+        observations: ReplayObservationApi[]
+    }
+    observe: (scannerId: string) => {
+        scannerId: string
+    }
+    observeFailure: () => {
+        value: true
+    }
+    observeSuccess: () => {
+        value: true
+    }
+    retryObservation: (observationId: string) => {
+        observationId: string
+    }
+    retryObservationFailure: (observationId: string) => {
+        observationId: string
+    }
+    retryObservationSuccess: (observationId: string) => {
+        observationId: string
+    }
+    setDockOpen: (open: boolean) => {
+        open: boolean
+    }
+    setScannerPickerOpen: (open: boolean) => {
+        open: boolean
+    }
+    setScannerSearch: (search: string) => {
+        search: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface observationsDockLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        hasObservationsInFlight: (observations: ReplayObservationApi[]) => boolean
+        filteredScanners: (scanners: ReplayScannerApi[], scannerSearch: string) => ReplayScannerApi[]
+    }
+}
+
+export type observationsDockLogicType = MakeLogicType<
+    observationsDockLogicValues,
+    observationsDockLogicActions,
+    ObservationsDockLogicProps,
+    observationsDockLogicMeta
+>
+
 export const observationsDockLogic = kea<observationsDockLogicType>([
     path(['products', 'replay_vision', 'frontend', 'logics', 'observationsDockLogic']),
     props({} as ObservationsDockLogicProps),
diff --git a/products/replay_vision/frontend/logics/visionQuotaLogic.ts b/products/replay_vision/frontend/logics/visionQuotaLogic.ts
index 85ee78eef968..11ef5fa4d8de 100644
--- a/products/replay_vision/frontend/logics/visionQuotaLogic.ts
+++ b/products/replay_vision/frontend/logics/visionQuotaLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, path, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, path, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { billingLogic } from 'scenes/billing/billingLogic'
@@ -6,7 +6,43 @@ import { teamLogic } from 'scenes/teamLogic'
 
 import { environmentVisionQuotaRetrieve } from '../generated/api'
 import type { VisionQuotaApi } from '../generated/api.schemas'
-import type { visionQuotaLogicType } from './visionQuotaLogicType'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface visionQuotaLogicValues {
+    quota: VisionQuotaApi | null
+    quotaLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface visionQuotaLogicActions {
+    loadBilling: () => any // billingLogic
+    adjustProjectedMonthly: (delta: number) => {
+        delta: number
+    }
+    loadQuota: () => {
+        value: true
+    }
+    loadQuotaFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadQuotaSuccess: (
+        quota: VisionQuotaApi | null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        quota: VisionQuotaApi | null
+        payload?: {
+            value: true
+        }
+    }
+}
+
+export type visionQuotaLogicType = MakeLogicType<visionQuotaLogicValues, visionQuotaLogicActions>
 
 export const visionQuotaLogic = kea<visionQuotaLogicType>([
     path(['products', 'replay_vision', 'frontend', 'logics', 'visionQuotaLogic']),
diff --git a/products/replay_vision/frontend/logics/visionScannersListLogic.ts b/products/replay_vision/frontend/logics/visionScannersListLogic.ts
index e5a567309f83..0c529529ae7a 100644
--- a/products/replay_vision/frontend/logics/visionScannersListLogic.ts
+++ b/products/replay_vision/frontend/logics/visionScannersListLogic.ts
@@ -1,15 +1,55 @@
-import { actions, afterMount, connect, isBreakpoint, kea, listeners, path } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, isBreakpoint, kea, listeners, path } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { metricCount } from 'lib/operationalMetrics'
 import { teamLogic } from 'scenes/teamLogic'
 
+import type { TeamPublicType } from '../../../../frontend/src/types'
 import { visionScannersList } from '../generated/api'
 import type { ReplayScannerApi } from '../generated/api.schemas'
-import type { visionScannersListLogicType } from './visionScannersListLogicType'
 
 const PAGE_LIMIT = 100
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface visionScannersListLogicValues {
+    scanners: ReplayScannerApi[]
+    scannersLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface visionScannersListLogicActions {
+    loadCurrentTeamSuccess: (
+        currentTeam: TeamPublicType | null,
+        payload?: any
+    ) => {
+        currentTeam: TeamPublicType | null
+        payload?: any
+    } // teamLogic
+    loadScanners: () => {
+        value: true
+    }
+    loadScannersFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadScannersSuccess: (
+        scanners: ReplayScannerApi[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        scanners: ReplayScannerApi[]
+        payload?: {
+            value: true
+        }
+    }
+}
+
+export type visionScannersListLogicType = MakeLogicType<visionScannersListLogicValues, visionScannersListLogicActions>
+
 /** The team's full scanner list for pickers — shared and propless so each surface doesn't refetch its own copy. */
 export const visionScannersListLogic = kea<visionScannersListLogicType>([
     path(['products', 'replay_vision', 'frontend', 'logics', 'visionScannersListLogic']),
diff --git a/products/replay_vision/frontend/observations/observationLabelLogic.ts b/products/replay_vision/frontend/observations/observationLabelLogic.ts
index b88a7c0cf35b..fa38cbba0813 100644
--- a/products/replay_vision/frontend/observations/observationLabelLogic.ts
+++ b/products/replay_vision/frontend/observations/observationLabelLogic.ts
@@ -1,11 +1,10 @@
-import { actions, kea, key, listeners, path, props, propsChanged, reducers } from 'kea'
+import { MakeLogicType, actions, kea, key, listeners, path, props, propsChanged, reducers } from 'kea'
 
 import { lemonToast } from 'lib/lemon-ui/LemonToast'
 import { teamLogic } from 'scenes/teamLogic'
 
 import { visionObservationsLabelCreate, visionObservationsLabelDestroy } from '../generated/api'
 import type { ReplayObservationLabelApi } from '../generated/api.schemas'
-import type { observationLabelLogicType } from './observationLabelLogicType'
 
 export interface ObservationLabelLogicProps {
     observationId: string
@@ -15,6 +14,48 @@ export interface ObservationLabelLogicProps {
     onChange?: (label: ReplayObservationLabelApi | null) => void
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface observationLabelLogicValues {
+    feedbackDraft: string
+    label: ReplayObservationLabelApi | null
+    saving: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface observationLabelLogicActions {
+    clearRating: () => {
+        value: true
+    }
+    labelUpdated: (label: ReplayObservationLabelApi | null) => {
+        label: ReplayObservationLabelApi | null
+    }
+    rate: (
+        isCorrect: boolean,
+        feedback: string
+    ) => {
+        feedback: string
+        isCorrect: boolean
+    }
+    setFeedbackDraft: (feedback: string) => {
+        feedback: string
+    }
+    setSaving: (saving: boolean) => {
+        saving: boolean
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface observationLabelLogicMeta {
+    key: string
+}
+
+export type observationLabelLogicType = MakeLogicType<
+    observationLabelLogicValues,
+    observationLabelLogicActions,
+    ObservationLabelLogicProps,
+    observationLabelLogicMeta
+>
+
 /** One instance per observation: the team's shared thumbs up/down rating with feedback autosave. */
 export const observationLabelLogic = kea<observationLabelLogicType>([
     path(['products', 'replay_vision', 'frontend', 'observations', 'observationLabelLogic']),
diff --git a/products/replay_vision/frontend/observations/observationProgressLogic.ts b/products/replay_vision/frontend/observations/observationProgressLogic.ts
index 6ec0442736e5..9cdd48f42c86 100644
--- a/products/replay_vision/frontend/observations/observationProgressLogic.ts
+++ b/products/replay_vision/frontend/observations/observationProgressLogic.ts
@@ -1,9 +1,8 @@
-import { actions, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, kea, key, listeners, path, props, reducers } from 'kea'
 
 import { teamLogic } from 'scenes/teamLogic'
 
 import { observationsDockLogic } from '../logics/observationsDockLogic'
-import type { observationProgressLogicType } from './observationProgressLogicType'
 
 export interface ObservationFrameProgress {
     frame: number
@@ -94,6 +93,40 @@ async function consumeProgressStream(
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface observationProgressLogicValues {
+    progress: ObservationProgress | null
+    streamError: string | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface observationProgressLogicActions {
+    setProgress: (progress: ObservationProgress) => {
+        progress: ObservationProgress
+    }
+    setStreamError: (error: string) => {
+        error: string
+    }
+    startStream: () => {
+        value: true
+    }
+    streamCompleted: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface observationProgressLogicMeta {
+    key: string
+}
+
+export type observationProgressLogicType = MakeLogicType<
+    observationProgressLogicValues,
+    observationProgressLogicActions,
+    ObservationProgressLogicProps,
+    observationProgressLogicMeta
+>
+
 /**
  * Streams live progress for one in-flight observation over SSE. Keyed by observation id, so the dock card and the
  * details page share a single stream. The stream self-terminates once the observation settles.
diff --git a/products/replay_vision/frontend/observations/replayObservationLogic.ts b/products/replay_vision/frontend/observations/replayObservationLogic.ts
index 4cebd56db04e..30d5c2de73c2 100644
--- a/products/replay_vision/frontend/observations/replayObservationLogic.ts
+++ b/products/replay_vision/frontend/observations/replayObservationLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers } from 'kea'
 import { combineUrl, router } from 'kea-router'
 
 import { lemonToast } from 'lib/lemon-ui/LemonToast'
@@ -11,7 +11,6 @@ import { scheduleObservationPoll } from '../logics/observationPolling'
 import { requestObservationRetry } from '../logics/observationRetry'
 import { OBSERVATION_LIST_FILTER_KEYS } from '../replay_scanners/types'
 import { observationProgressLogic } from './observationProgressLogic'
-import type { replayObservationLogicType } from './replayObservationLogicType'
 import { replayObservationSceneLogic } from './replayObservationSceneLogic'
 
 export interface ReplayObservationLogicProps {
@@ -35,6 +34,50 @@ export function observationDetailUrl(id: string, filterParams: Record<string, st
     return combineUrl(urls.replayVisionObservation(id), filterParams).url
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface replayObservationLogicValues {
+    observation: ReplayObservationApi | null
+    observationLoading: boolean
+    retrying: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface replayObservationLogicActions {
+    streamCompleted: () => {
+        value: true
+    } // observationProgressLogic
+    loadObservation: () => {
+        value: true
+    }
+    loadObservationFailure: () => {
+        value: true
+    }
+    loadObservationSuccess: (observation: ReplayObservationApi) => {
+        observation: ReplayObservationApi
+    }
+    retryObservation: () => {
+        value: true
+    }
+    retryObservationFailure: () => {
+        value: true
+    }
+    retryObservationSuccess: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface replayObservationLogicMeta {
+    key: string
+}
+
+export type replayObservationLogicType = MakeLogicType<
+    replayObservationLogicValues,
+    replayObservationLogicActions,
+    ReplayObservationLogicProps,
+    replayObservationLogicMeta
+>
+
 export const replayObservationLogic = kea<replayObservationLogicType>([
     path(['products', 'replay_vision', 'frontend', 'observations', 'replayObservationLogic']),
     props({} as ReplayObservationLogicProps),
diff --git a/products/replay_vision/frontend/observations/replayObservationSceneLogic.ts b/products/replay_vision/frontend/observations/replayObservationSceneLogic.ts
index f1eed1248955..7730a5866a44 100644
--- a/products/replay_vision/frontend/observations/replayObservationSceneLogic.ts
+++ b/products/replay_vision/frontend/observations/replayObservationSceneLogic.ts
@@ -1,11 +1,53 @@
-import { actions, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers, selectors } from 'kea'
 import { urlToAction } from 'kea-router'
 
 import { urls } from 'scenes/urls'
 
 import { Breadcrumb } from '~/types'
 
-import type { replayObservationSceneLogicType } from './replayObservationSceneLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface replayObservationSceneLogicValues {
+    breadcrumbs: Breadcrumb[]
+    observationId: string
+    scannerContext: {
+        scannerId: string | null
+        scannerName: string | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface replayObservationSceneLogicActions {
+    setObservationId: (observationId: string) => {
+        observationId: string
+    }
+    setScannerContext: (
+        scannerId: string | null,
+        scannerName: string | null
+    ) => {
+        scannerId: string | null
+        scannerName: string | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface replayObservationSceneLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        breadcrumbs: (
+            observationId: string,
+            scannerContext: {
+                scannerId: string | null
+                scannerName: string | null
+            }
+        ) => Breadcrumb[]
+    }
+}
+
+export type replayObservationSceneLogicType = MakeLogicType<
+    replayObservationSceneLogicValues,
+    replayObservationSceneLogicActions,
+    Record<string, any>,
+    replayObservationSceneLogicMeta
+>
 
 export const replayObservationSceneLogic = kea<replayObservationSceneLogicType>([
     path(['products', 'replay_vision', 'frontend', 'observations', 'replayObservationSceneLogic']),
diff --git a/products/replay_vision/frontend/replay_scanners/actionEditorSceneLogic.ts b/products/replay_vision/frontend/replay_scanners/actionEditorSceneLogic.ts
index 92c5756a859e..cb0300fd6b75 100644
--- a/products/replay_vision/frontend/replay_scanners/actionEditorSceneLogic.ts
+++ b/products/replay_vision/frontend/replay_scanners/actionEditorSceneLogic.ts
@@ -1,5 +1,6 @@
-import { actions, isBreakpoint, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, isBreakpoint, kea, listeners, path, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { router, urlToAction } from 'kea-router'
 
 import { dayjs } from 'lib/dayjs'
@@ -21,11 +22,121 @@ import {
     VisionAlertMetricEnumApi,
 } from '../generated/api.schemas'
 import type { VisionActionApi } from '../generated/api.schemas'
-import type { actionEditorSceneLogicType } from './actionEditorSceneLogicType'
 import { parseRruleToCadence } from './cadence'
 import { visionActionRunsLogic } from './visionActionRunsLogic'
 import { buildActionBody, NEW_ACTION_FORM, VisionActionForm, visionActionsLogic } from './visionActionsLogic'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface actionEditorSceneLogicValues {
+    actionForm: VisionActionForm
+    actionFormAllErrors: Record<string, any>
+    actionFormChanged: boolean
+    actionFormErrors: DeepPartialMap<VisionActionForm, ValidationErrorType>
+    actionFormHasErrors: boolean
+    actionFormManualErrors: Record<string, any>
+    actionFormTouched: boolean
+    actionFormTouches: Record<string, boolean>
+    actionFormValidationErrors: DeepPartialMap<VisionActionForm, ValidationErrorType>
+    actionId: string
+    actionLoading: boolean
+    breadcrumbs: Breadcrumb[]
+    effectiveScannerId: string
+    isActionFormSubmitting: boolean
+    isActionFormValid: boolean
+    isNew: boolean
+    loadedAction: VisionActionApi | null
+    scannerId: string
+    scannerName: string
+    scannerType: string
+    showActionFormErrors: boolean
+    targetingMode: 'all' | 'filtered'
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface actionEditorSceneLogicActions {
+    loadAction: (actionId: string) => {
+        actionId: string
+    }
+    loadActionFailure: () => {
+        value: true
+    }
+    loadActionSuccess: (action: VisionActionApi) => {
+        action: VisionActionApi
+    }
+    resetActionForm: (values?: VisionActionForm) => {
+        values?: VisionActionForm
+    }
+    setActionFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setActionFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setActionFormValues: (values: DeepPartial<VisionActionForm>) => {
+        values: DeepPartial<VisionActionForm>
+    }
+    setActionId: (actionId: string) => {
+        actionId: string
+    }
+    setScannerId: (scannerId: string) => {
+        scannerId: string
+    }
+    setScannerName: (scannerName: string) => {
+        scannerName: string
+    }
+    setScannerType: (scannerType: string) => {
+        scannerType: string
+    }
+    setTargetingMode: (mode: 'all' | 'filtered') => {
+        mode: 'all' | 'filtered'
+    }
+    submitActionForm: () => {
+        value: boolean
+    }
+    submitActionFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitActionFormRequest: (actionForm: VisionActionForm) => {
+        actionForm: VisionActionForm
+    }
+    submitActionFormSuccess: (actionForm: VisionActionForm) => {
+        actionForm: VisionActionForm
+    }
+    touchActionFormField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface actionEditorSceneLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        isNew: (actionId: string) => boolean
+        effectiveScannerId: (scannerId: string, loadedAction: VisionActionApi | null) => string
+        breadcrumbs: (
+            isNew: boolean,
+            actionId: string,
+            effectiveScannerId: string,
+            loadedAction: VisionActionApi | null,
+            scannerName: string
+        ) => Breadcrumb[]
+    }
+}
+
+export type actionEditorSceneLogicType = MakeLogicType<
+    actionEditorSceneLogicValues,
+    actionEditorSceneLogicActions,
+    Record<string, any>,
+    actionEditorSceneLogicMeta
+>
+
 export const actionEditorSceneLogic = kea<actionEditorSceneLogicType>([
     path(['products', 'replay_vision', 'frontend', 'replay_scanners', 'actionEditorSceneLogic']),
 
diff --git a/products/replay_vision/frontend/replay_scanners/replayScannerLogic.ts b/products/replay_vision/frontend/replay_scanners/replayScannerLogic.ts
index a778058fc314..23f19906331b 100644
--- a/products/replay_vision/frontend/replay_scanners/replayScannerLogic.ts
+++ b/products/replay_vision/frontend/replay_scanners/replayScannerLogic.ts
@@ -1,5 +1,18 @@
-import { actions, afterMount, isBreakpoint, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    afterMount,
+    isBreakpoint,
+    kea,
+    key,
+    listeners,
+    path,
+    props,
+    reducers,
+    selectors,
+} from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, beforeUnload, router, urlToAction } from 'kea-router'
 import { CombinedLocation } from 'kea-router/lib/utils'
@@ -29,12 +42,12 @@ import type {
     ReplayObservationApi,
     TagSuggestionApi,
 } from '../generated/api.schemas'
+import type { ScannerTypeEnumApi } from '../generated/api.schemas'
 import { OBSERVE_POLL_GRACE_MS, scheduleObservationPoll, shouldPollObservations } from '../logics/observationPolling'
 import { requestObservationRetry } from '../logics/observationRetry'
 import { refreshVisionQuota } from '../logics/visionQuotaLogic'
 import { type UrlSorting, parseCsvParam, parseSortParam, serializeSortParam } from '../utils/urlParams'
 import { clampDurationFilter, durationFilterError } from './durationBounds'
-import type { replayScannerLogicType } from './replayScannerLogicType'
 import { SCANNER_EDITOR_STEPS, scannerEditorSceneLogic, scannerStepUrl } from './scannerEditorSceneLogic'
 import { findScannerTemplate, newScanner } from './scannerTemplates'
 import {
@@ -185,6 +198,364 @@ export function buildObservationListParams(
     return params
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface replayScannerLogicValues {
+    availableTags: string[]
+    chartDateFrom: string | null
+    chartDateTo: string | null
+    classifierTagStats: {
+        fixedRanked: [string, number][]
+        freeformRanked: [string, number][]
+        totalWithTags: number
+    }
+    coverageStats: {
+        recentDays: number
+        recentSessions: number
+        totalSessions: number
+    }
+    durationValidationError: string | null
+    estimateRequestVersion: number
+    hasActiveObservationFilters: boolean
+    hasObservationsInFlight: boolean
+    hasUnsavedChanges: boolean
+    isNew: boolean
+    isScannerSubmitting: boolean
+    isScannerValid: boolean
+    monitorStats: {
+        inconclusiveTotal: number
+        noTotal: number
+        yesTotal: number
+    }
+    observationDetailLinkParams: Record<string, string>
+    observationStats: {
+        failed: number
+        ineligible: number
+        inFlight: number
+        succeeded: number
+        successRate: number | null
+        total: number
+    }
+    observationStatsApi: ObservationStatsApi | null
+    observationStatsApiLoading: boolean
+    observationStatusFilter: ObservationStatusValue[]
+    observationSubjectFilter: string
+    observationTagFilter: string[]
+    observationTriggeredByFilter: ObservationTriggeredByValue[]
+    observationVerdictFilter: ObservationVerdictValue[]
+    observations: ReplayObservationApi[]
+    observationsLoading: boolean
+    observationsPage: number
+    observationsSort: ObservationsSorting | null
+    observationsTotal: number
+    onDemandObservationSuccessCount: number
+    originalScanner: ReplayScanner | null
+    pollUntil: number
+    retryingObservationIds: string[]
+    scanner: ReplayScanner
+    scannerAllErrors: Record<string, any>
+    scannerChanged: boolean
+    scannerErrors: DeepPartialMap<ReplayScanner, ValidationErrorType>
+    scannerEstimate: EstimateResponseApi | null
+    scannerEstimateError: string | null
+    scannerEstimateLoading: boolean
+    scannerHasErrors: boolean
+    scannerLoading: boolean
+    scannerManualErrors: Record<string, any>
+    scannerTouched: boolean
+    scannerTouches: Record<string, boolean>
+    scannerValidationErrors: DeepPartialMap<ReplayScanner, ValidationErrorType>
+    scorerHistogram: {
+        counts: number[]
+        labels: string[]
+    } | null
+    scorerSummary: {
+        count: number
+        max: number
+        mean: number
+        median: number
+        min: number
+        p25: number
+        p75: number
+    } | null
+    showScannerErrors: boolean
+    submitIntent: 'advance' | 'save'
+    tagSuggestions: TagSuggestionApi[]
+    tagSuggestionsLoading: boolean
+    togglingEnabled: boolean
+    triggeringOnDemandObservation: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface replayScannerLogicActions {
+    acceptAllTagSuggestions: () => {
+        value: true
+    }
+    acceptTagSuggestion: (tag: string) => {
+        tag: string
+    }
+    appendClassifierTags: (tags: string[]) => {
+        tags: string[]
+    }
+    clearObservationFilters: () => {
+        value: true
+    }
+    dismissTagSuggestions: () => {
+        value: true
+    }
+    loadObservationStats: () => {
+        value: true
+    }
+    loadObservationStatsFailure: () => {
+        value: true
+    }
+    loadObservationStatsSuccess: (stats: ObservationStatsApi) => {
+        stats: ObservationStatsApi
+    }
+    loadObservations: (background?: any) => {
+        background: any
+    }
+    loadObservationsFailure: () => {
+        value: true
+    }
+    loadObservationsSuccess: (
+        observations: ReplayObservationApi[],
+        total: number
+    ) => {
+        observations: ReplayObservationApi[]
+        total: number
+    }
+    loadScanner: () => {
+        value: true
+    }
+    loadScannerEstimate: () => {
+        value: true
+    }
+    loadScannerEstimateFailure: (error?: string | null) => {
+        error: string | null
+    }
+    loadScannerEstimateSuccess: (estimate: EstimateResponseApi) => {
+        estimate: EstimateResponseApi
+    }
+    loadScannerFailure: () => {
+        value: true
+    }
+    loadScannerSuccess: (scanner: ReplayScanner) => {
+        scanner: ReplayScanner
+    }
+    loadTagSuggestions: () => any
+    loadTagSuggestionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadTagSuggestionsSuccess: (
+        tagSuggestions: TagSuggestionApi[],
+        payload?: any
+    ) => {
+        tagSuggestions: TagSuggestionApi[]
+        payload?: any
+    }
+    refreshObservations: () => {
+        value: true
+    }
+    requestScannerEstimate: () => {
+        value: true
+    }
+    resetScanner: (values?: ReplayScanner) => {
+        values?: ReplayScanner
+    }
+    restoreObservationsTableState: (state: {
+        page: number
+        sort: ObservationsSorting | null
+        status: ObservationStatusValue[]
+        subject: string
+        tags: string[]
+        triggeredBy: ObservationTriggeredByValue[]
+        verdict: ObservationVerdictValue[]
+    }) => {
+        page: number
+        sort: ObservationsSorting | null
+        status: ObservationStatusEnumApi[]
+        subject: string
+        tags: string[]
+        triggeredBy: ObservationTriggerEnumApi[]
+        verdict: ObservationVerdictValue[]
+    }
+    retryObservation: (observationId: string) => {
+        observationId: string
+    }
+    retryObservationFailure: (observationId: string) => {
+        observationId: string
+    }
+    retryObservationSuccess: (observationId: string) => {
+        observationId: string
+    }
+    scannerSaved: (scanner: ReplayScanner) => {
+        scanner: ReplayScanner
+    }
+    setChartDateRange: (
+        dateFrom: string | null,
+        dateTo: string | null
+    ) => {
+        dateFrom: string | null
+        dateTo: string | null
+    }
+    setObservationStatusFilter: (values: ObservationStatusValue[]) => {
+        values: ObservationStatusEnumApi[]
+    }
+    setObservationSubjectFilter: (value: string) => {
+        value: string
+    }
+    setObservationTagFilter: (values: string[]) => {
+        values: string[]
+    }
+    setObservationTriggeredByFilter: (values: ObservationTriggeredByValue[]) => {
+        values: ObservationTriggerEnumApi[]
+    }
+    setObservationVerdictFilter: (values: ObservationVerdictValue[]) => {
+        values: ObservationVerdictValue[]
+    }
+    setObservationsPage: (page: number) => {
+        page: number
+    }
+    setObservationsSort: (sorting: ObservationsSorting | null) => {
+        sorting: ObservationsSorting | null
+    }
+    setScannerManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setScannerType: (scannerType: ScannerType) => {
+        scannerType: ScannerTypeEnumApi
+    }
+    setScannerValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setScannerValues: (values: DeepPartial<ReplayScanner>) => {
+        values: DeepPartial<ReplayScanner>
+    }
+    setSubmitIntent: (intent: 'advance' | 'save') => {
+        intent: 'advance' | 'save'
+    }
+    submitScanner: () => {
+        value: boolean
+    }
+    submitScannerFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitScannerRequest: (scanner: ReplayScanner) => {
+        scanner: ReplayScanner
+    }
+    submitScannerSuccess: (scanner: ReplayScanner) => {
+        scanner: ReplayScanner
+    }
+    toggleEnabled: () => {
+        value: true
+    }
+    toggleEnabledFailure: () => {
+        value: true
+    }
+    toggleEnabledSuccess: (enabled: boolean) => {
+        enabled: boolean
+    }
+    touchScannerField: (key: string) => {
+        key: string
+    }
+    triggerOnDemandObservation: (
+        sessionId: string,
+        silent?: any
+    ) => {
+        sessionId: string
+        silent: any
+    }
+    triggerOnDemandObservationFailure: () => {
+        value: true
+    }
+    triggerOnDemandObservationSuccess: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface replayScannerLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        isNew: (id: string) => boolean
+        durationValidationError: (scanner: ReplayScanner) => string | null
+        hasUnsavedChanges: (scanner: ReplayScanner, originalScanner: ReplayScanner | null) => boolean
+        hasObservationsInFlight: (observationStatsApi: ObservationStatsApi | null) => boolean
+        hasActiveObservationFilters: (
+            observationStatusFilter: ObservationStatusEnumApi[],
+            observationTriggeredByFilter: ObservationTriggerEnumApi[],
+            observationVerdictFilter: ObservationVerdictValue[],
+            observationTagFilter: string[],
+            observationSubjectFilter: string
+        ) => boolean
+        observationDetailLinkParams: (
+            observationStatusFilter: ObservationStatusEnumApi[],
+            observationTriggeredByFilter: ObservationTriggerEnumApi[],
+            observationVerdictFilter: ObservationVerdictValue[],
+            observationTagFilter: string[],
+            observationSubjectFilter: string,
+            observationsSort: ObservationsSorting | null,
+            scanner: ReplayScanner
+        ) => Record<string, string>
+        availableTags: (observationStatsApi: ObservationStatsApi | null) => string[]
+        observationStats: (observationStatsApi: ObservationStatsApi | null) => {
+            failed: number
+            ineligible: number
+            inFlight: number
+            succeeded: number
+            successRate: number | null
+            total: number
+        }
+        monitorStats: (observationStatsApi: ObservationStatsApi | null) => {
+            inconclusiveTotal: number
+            noTotal: number
+            yesTotal: number
+        }
+        classifierTagStats: (observationStatsApi: ObservationStatsApi | null) => {
+            fixedRanked: [string, number][]
+            freeformRanked: [string, number][]
+            totalWithTags: number
+        }
+        scorerSummary: (observationStatsApi: ObservationStatsApi | null) => {
+            count: number
+            max: number
+            mean: number
+            median: number
+            min: number
+            p25: number
+            p75: number
+        } | null
+        scorerHistogram: (observationStatsApi: ObservationStatsApi | null) => {
+            counts: number[]
+            labels: string[]
+        } | null
+        coverageStats: (observationStatsApi: ObservationStatsApi | null) => {
+            recentDays: number
+            recentSessions: number
+            totalSessions: number
+        }
+    }
+}
+
+export type replayScannerLogicType = MakeLogicType<
+    replayScannerLogicValues,
+    replayScannerLogicActions,
+    ReplayScannerLogicProps,
+    replayScannerLogicMeta
+>
+
 export const replayScannerLogic = kea<replayScannerLogicType>([
     path(['products', 'replay_vision', 'frontend', 'replay_scanners', 'replayScannerLogic']),
     props({} as ReplayScannerLogicProps),
diff --git a/products/replay_vision/frontend/replay_scanners/replayScannerSceneLogic.ts b/products/replay_vision/frontend/replay_scanners/replayScannerSceneLogic.ts
index 7bb625cb00a2..8ed346a9f48f 100644
--- a/products/replay_vision/frontend/replay_scanners/replayScannerSceneLogic.ts
+++ b/products/replay_vision/frontend/replay_scanners/replayScannerSceneLogic.ts
@@ -1,12 +1,10 @@
-import { actions, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers, selectors } from 'kea'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 
 import { urls } from 'scenes/urls'
 
 import { Breadcrumb } from '~/types'
 
-import type { replayScannerSceneLogicType } from './replayScannerSceneLogicType'
-
 export enum ReplayScannerTab {
     Observations = 'observations',
     Quality = 'quality',
@@ -22,6 +20,37 @@ function parseTab(tab: unknown): ReplayScannerTab {
     return SCANNER_TABS.includes(tab as ReplayScannerTab) ? (tab as ReplayScannerTab) : DEFAULT_TAB
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface replayScannerSceneLogicValues {
+    activeTab: ReplayScannerTab
+    breadcrumbs: Breadcrumb[]
+    scannerId: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface replayScannerSceneLogicActions {
+    setActiveTab: (tab: ReplayScannerTab) => {
+        tab: ReplayScannerTab
+    }
+    setScannerId: (scannerId: string) => {
+        scannerId: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface replayScannerSceneLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        breadcrumbs: (scannerId: string) => Breadcrumb[]
+    }
+}
+
+export type replayScannerSceneLogicType = MakeLogicType<
+    replayScannerSceneLogicValues,
+    replayScannerSceneLogicActions,
+    Record<string, any>,
+    replayScannerSceneLogicMeta
+>
+
 export const replayScannerSceneLogic = kea<replayScannerSceneLogicType>([
     path(['products', 'replay_vision', 'frontend', 'replay_scanners', 'replayScannerSceneLogic']),
 
diff --git a/products/replay_vision/frontend/replay_scanners/replayScannersLogic.ts b/products/replay_vision/frontend/replay_scanners/replayScannersLogic.ts
index d9c59cf6a53f..af0ae18a63f9 100644
--- a/products/replay_vision/frontend/replay_scanners/replayScannersLogic.ts
+++ b/products/replay_vision/frontend/replay_scanners/replayScannersLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, isBreakpoint, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, isBreakpoint, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router, urlToAction } from 'kea-router'
 
@@ -16,9 +16,9 @@ import {
     visionScannersStatsRetrieve,
 } from '../generated/api'
 import type { ScannerStatsResponseApi, UserBasicApi, VisionScannersListParams } from '../generated/api.schemas'
+import type { ScannerTypeEnumApi } from '../generated/api.schemas'
 import { refreshVisionQuota, visionQuotaLogic } from '../logics/visionQuotaLogic'
 import { csvParam, parseCsvParam, parseSortParam, serializeSortParam } from '../utils/urlParams'
-import type { replayScannersLogicType } from './replayScannersLogicType'
 import {
     ENABLED_OPTIONS,
     EnabledFilter,
@@ -116,6 +116,163 @@ export function buildScannerListParams(
     return params
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface replayScannersLogicValues {
+    chartDateFrom: string | null
+    chartDateTo: string | null
+    createdByFilter: string[]
+    createdByOptions: {
+        label: string
+        value: string
+    }[]
+    creators: UserBasicApi[]
+    creatorsLoading: boolean
+    deletingIds: string[]
+    enabledFilter: EnabledFilter[]
+    filters: ScannersFilters
+    hasActiveFilters: boolean
+    scannerStats: ScannerStatsResponseApi | null
+    scannerStatsLoading: boolean
+    scannerTypeFilter: ScannerTypeEnumApi[]
+    scanners: ReplayScanner[]
+    scannersLoading: boolean
+    scannersPage: number
+    scannersSort: ScannersSorting | null
+    scannersTotal: number
+    search: string
+    togglingIds: string[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface replayScannersLogicActions {
+    clearFilters: () => {
+        value: true
+    }
+    deleteScanner: (id: string) => {
+        id: string
+    }
+    deleteScannerSuccess: (id: string) => {
+        id: string
+    }
+    loadCreators: () => {
+        value: true
+    }
+    loadCreatorsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadCreatorsSuccess: (
+        creators: UserBasicApi[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        creators: UserBasicApi[]
+        payload?: {
+            value: true
+        }
+    }
+    loadScannerStats: () => {
+        value: true
+    }
+    loadScannerStatsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadScannerStatsSuccess: (
+        scannerStats: ScannerStatsResponseApi | null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        scannerStats: ScannerStatsResponseApi | null
+        payload?: {
+            value: true
+        }
+    }
+    loadScanners: () => {
+        value: true
+    }
+    loadScannersFailure: (error: string) => {
+        error: string
+    }
+    loadScannersSuccess: (
+        scanners: ReplayScanner[],
+        total: number
+    ) => {
+        scanners: ReplayScanner[]
+        total: number
+    }
+    revertScannerEnabled: (id: string) => {
+        id: string
+    }
+    setChartDateRange: (
+        dateFrom: string | null,
+        dateTo: string | null
+    ) => {
+        dateFrom: string | null
+        dateTo: string | null
+    }
+    setScannerDeleting: (
+        id: string,
+        deleting: boolean
+    ) => {
+        deleting: boolean
+        id: string
+    }
+    setScannersFilters: (
+        filters: Partial<ScannersFilters>,
+        replace?: boolean
+    ) => {
+        filters: Partial<ScannersFilters>
+        replace: boolean
+    }
+    toggleScannerEnabled: (id: string) => {
+        id: string
+    }
+    toggleScannerEnabledDone: (id: string) => {
+        id: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface replayScannersLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        search: (filters: ScannersFilters) => string
+        enabledFilter: (filters: ScannersFilters) => EnabledFilter[]
+        scannerTypeFilter: (filters: ScannersFilters) => ScannerTypeEnumApi[]
+        createdByFilter: (filters: ScannersFilters) => string[]
+        scannersPage: (filters: ScannersFilters) => number
+        scannersSort: (filters: ScannersFilters) => ScannersSorting | null
+        hasActiveFilters: (
+            search: string,
+            enabledFilter: EnabledFilter[],
+            scannerTypeFilter: ScannerTypeEnumApi[],
+            createdByFilter: string[]
+        ) => boolean
+        createdByOptions: (
+            creators: UserBasicApi[],
+            createdByFilter: string[]
+        ) => {
+            label: string
+            value: string
+        }[]
+    }
+}
+
+export type replayScannersLogicType = MakeLogicType<
+    replayScannersLogicValues,
+    replayScannersLogicActions,
+    Record<string, any>,
+    replayScannersLogicMeta
+>
+
 export const replayScannersLogic = kea<replayScannersLogicType>([
     path(['products', 'replay_vision', 'frontend', 'replay_scanners', 'replayScannersLogic']),
 
diff --git a/products/replay_vision/frontend/replay_scanners/scannerDigestLogic.ts b/products/replay_vision/frontend/replay_scanners/scannerDigestLogic.ts
index 7405685c7a98..350d3d8509d0 100644
--- a/products/replay_vision/frontend/replay_scanners/scannerDigestLogic.ts
+++ b/products/replay_vision/frontend/replay_scanners/scannerDigestLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 
 import { lemonToast } from 'lib/lemon-ui/LemonToast'
 import { teamLogic } from 'scenes/teamLogic'
@@ -6,7 +6,6 @@ import { teamLogic } from 'scenes/teamLogic'
 import { visionActionsCreate, visionActionsRunsList, visionActionsRunsRetrieve } from '../generated/api'
 import { VisionActionRunStatusEnumApi } from '../generated/api.schemas'
 import type { VisionActionApi, VisionActionRunApi } from '../generated/api.schemas'
-import type { scannerDigestLogicType } from './scannerDigestLogicType'
 import { visionActionsLogic } from './visionActionsLogic'
 
 export interface ScannerDigestLogicProps {
@@ -20,6 +19,66 @@ export const SCANNER_DIGEST_RRULE = 'FREQ=DAILY;BYHOUR=8;BYMINUTE=0'
 // How many recent runs to scan for the newest completed one (skipped/failed runs don't carry a summary).
 const RUN_LOOKBACK = 10
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface scannerDigestLogicValues {
+    visionActions: VisionActionApi[] // visionActionsLogic
+    visionActionsLoading: boolean // visionActionsLogic
+    digest: VisionActionApi | null
+    digestCreating: boolean
+    expanded: boolean
+    latestRun: VisionActionRunApi | null
+    latestRunLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface scannerDigestLogicActions {
+    loadActions: () => {
+        value: true
+    } // visionActionsLogic
+    loadActionsSuccess: (visionActions: VisionActionApi[]) => {
+        visionActions: VisionActionApi[]
+    } // visionActionsLogic
+    toggleActionEnabled: (id: string) => {
+        id: string
+    } // visionActionsLogic
+    createDigest: () => {
+        value: true
+    }
+    createDigestFailure: () => {
+        value: true
+    }
+    createDigestSuccess: () => {
+        value: true
+    }
+    loadLatestRun: () => {
+        value: true
+    }
+    loadLatestRunFailure: () => {
+        value: true
+    }
+    loadLatestRunSuccess: (run: VisionActionRunApi | null) => {
+        run: VisionActionRunApi | null
+    }
+    toggleExpanded: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface scannerDigestLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        digest: (visionActions: VisionActionApi[]) => VisionActionApi | null
+    }
+}
+
+export type scannerDigestLogicType = MakeLogicType<
+    scannerDigestLogicValues,
+    scannerDigestLogicActions,
+    ScannerDigestLogicProps,
+    scannerDigestLogicMeta
+>
+
 export const scannerDigestLogic = kea<scannerDigestLogicType>([
     path(['products', 'replay_vision', 'frontend', 'replay_scanners', 'scannerDigestLogic']),
     props({} as ScannerDigestLogicProps),
diff --git a/products/replay_vision/frontend/replay_scanners/scannerEditorSceneLogic.ts b/products/replay_vision/frontend/replay_scanners/scannerEditorSceneLogic.ts
index 7ba46759b3c4..65bd8465d6c3 100644
--- a/products/replay_vision/frontend/replay_scanners/scannerEditorSceneLogic.ts
+++ b/products/replay_vision/frontend/replay_scanners/scannerEditorSceneLogic.ts
@@ -1,12 +1,10 @@
-import { actions, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers, selectors } from 'kea'
 import { router, urlToAction } from 'kea-router'
 
 import { urls } from 'scenes/urls'
 
 import { Breadcrumb } from '~/types'
 
-import type { scannerEditorSceneLogicType } from './scannerEditorSceneLogicType'
-
 export type ScannerEditorStep = 'template' | 'configure' | 'triggers' | 'self_driving'
 export const SCANNER_EDITOR_STEPS: readonly ScannerEditorStep[] = ['template', 'configure', 'triggers', 'self_driving']
 export const SCANNER_EDITOR_STEP_ORDER: Record<ScannerEditorStep, number> = {
@@ -29,6 +27,41 @@ export function scannerStepUrl(step: ScannerEditorStep, scannerId: string): stri
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface scannerEditorSceneLogicValues {
+    breadcrumbs: Breadcrumb[]
+    isNew: boolean
+    scannerId: string
+    step: ScannerEditorStep
+    visibleSteps: readonly ScannerEditorStep[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface scannerEditorSceneLogicActions {
+    setScannerId: (scannerId: string) => {
+        scannerId: string
+    }
+    setStep: (step: ScannerEditorStep) => {
+        step: ScannerEditorStep
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface scannerEditorSceneLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        isNew: (scannerId: string) => boolean
+        visibleSteps: (isNew: boolean) => readonly ScannerEditorStep[]
+        breadcrumbs: (scannerId: string, isNew: boolean) => Breadcrumb[]
+    }
+}
+
+export type scannerEditorSceneLogicType = MakeLogicType<
+    scannerEditorSceneLogicValues,
+    scannerEditorSceneLogicActions,
+    Record<string, any>,
+    scannerEditorSceneLogicMeta
+>
+
 export const scannerEditorSceneLogic = kea<scannerEditorSceneLogicType>([
     path(['products', 'replay_vision', 'frontend', 'replay_scanners', 'scannerEditorSceneLogic']),
 
diff --git a/products/replay_vision/frontend/replay_scanners/scannerQualityLogic.ts b/products/replay_vision/frontend/replay_scanners/scannerQualityLogic.ts
index 5eff05f1c42a..5977ba5a1424 100644
--- a/products/replay_vision/frontend/replay_scanners/scannerQualityLogic.ts
+++ b/products/replay_vision/frontend/replay_scanners/scannerQualityLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 
 import { lemonToast } from 'lib/lemon-ui/LemonToast'
 import { teamLogic } from 'scenes/teamLogic'
@@ -24,7 +24,6 @@ import type {
 } from '../generated/api.schemas'
 import { visionQuotaLogic } from '../logics/visionQuotaLogic'
 import { ObservationsSorting, replayScannerLogic, resolveOrderByKey } from './replayScannerLogic'
-import type { scannerQualityLogicType } from './scannerQualityLogicType'
 
 export type RatedFilterValue = 'all' | 'unrated' | 'rated'
 
@@ -38,6 +37,156 @@ export interface ScannerQualityLogicProps {
     scannerId: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface scannerQualityLogicValues {
+    applying: boolean
+    currentSuggestion: ReplayScannerPromptSuggestionApi | null
+    dismissing: boolean
+    evaluating: boolean
+    evaluationSessionCap: number
+    generating: boolean
+    labelStats: ObservationLabelStatsApi | null
+    labelStatsLoading: boolean
+    observations: ReplayObservationApi[]
+    observationsLoading: boolean
+    page: number
+    plannedTestSessions: number
+    ratedCount: number
+    ratedFilter: RatedFilterValue
+    sort: ObservationsSorting | null
+    suggestionHistory: ReplayScannerPromptSuggestionApi[]
+    suggestionHistoryLoading: boolean
+    suggestionLoading: boolean
+    suggestionStale: boolean
+    testSessionLimit: number | null
+    themeFilter: FeedbackThemeApi | null
+    total: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface scannerQualityLogicActions {
+    loadQuota: () => {
+        value: true
+    } // visionQuotaLogic
+    applySuggestion: (suggestionId: string) => {
+        suggestionId: string
+    }
+    applySuggestionFailure: () => {
+        value: true
+    }
+    applySuggestionSuccess: (suggestion: ReplayScannerPromptSuggestionApi) => {
+        suggestion: ReplayScannerPromptSuggestionApi
+    }
+    dismissSuggestion: (suggestionId: string) => {
+        suggestionId: string
+    }
+    dismissSuggestionFailure: () => {
+        value: true
+    }
+    dismissSuggestionSuccess: (suggestion: ReplayScannerPromptSuggestionApi) => {
+        suggestion: ReplayScannerPromptSuggestionApi
+    }
+    evaluateSuggestion: (suggestionId: string) => {
+        suggestionId: string
+    }
+    evaluateSuggestionFailure: () => {
+        value: true
+    }
+    evaluateSuggestionSuccess: (suggestion: ReplayScannerPromptSuggestionApi) => {
+        suggestion: ReplayScannerPromptSuggestionApi
+    }
+    generateSuggestion: () => {
+        value: true
+    }
+    generateSuggestionFailure: () => {
+        value: true
+    }
+    generateSuggestionSuccess: (suggestion: ReplayScannerPromptSuggestionApi) => {
+        suggestion: ReplayScannerPromptSuggestionApi
+    }
+    labelChanged: (
+        observationId: string,
+        label: ReplayObservationLabelApi | null
+    ) => {
+        label: ReplayObservationLabelApi | null
+        observationId: string
+    }
+    loadCurrentSuggestion: () => {
+        value: true
+    }
+    loadCurrentSuggestionFailure: () => {
+        value: true
+    }
+    loadCurrentSuggestionSuccess: (current: CurrentPromptSuggestionApi) => {
+        current: CurrentPromptSuggestionApi
+    }
+    loadLabelStats: () => {
+        value: true
+    }
+    loadLabelStatsFailure: () => {
+        value: true
+    }
+    loadLabelStatsSuccess: (stats: ObservationLabelStatsApi) => {
+        stats: ObservationLabelStatsApi
+    }
+    loadObservations: () => {
+        value: true
+    }
+    loadObservationsFailure: () => {
+        value: true
+    }
+    loadObservationsSuccess: (
+        observations: ReplayObservationApi[],
+        total: number
+    ) => {
+        observations: ReplayObservationApi[]
+        total: number
+    }
+    loadSuggestionHistory: () => {
+        value: true
+    }
+    loadSuggestionHistoryFailure: () => {
+        value: true
+    }
+    loadSuggestionHistorySuccess: (history: ReplayScannerPromptSuggestionApi[]) => {
+        history: ReplayScannerPromptSuggestionApi[]
+    }
+    setPage: (page: number) => {
+        page: number
+    }
+    setRatedFilter: (value: RatedFilterValue) => {
+        value: RatedFilterValue
+    }
+    setSort: (sorting: ObservationsSorting | null) => {
+        sorting: ObservationsSorting | null
+    }
+    setTestSessionLimit: (limit: number | null) => {
+        limit: number | null
+    }
+    setThemeFilter: (theme: FeedbackThemeApi | null) => {
+        theme: FeedbackThemeApi | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface scannerQualityLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        plannedTestSessions: (
+            evaluationSessionCap: number,
+            ratedCount: number,
+            testSessionLimit: number | null
+        ) => number
+    }
+}
+
+export type scannerQualityLogicType = MakeLogicType<
+    scannerQualityLogicValues,
+    scannerQualityLogicActions,
+    ScannerQualityLogicProps,
+    scannerQualityLogicMeta
+>
+
 /** State for the Quality tab: the prompt recommendation, observations to rate, and rated-over-time aggregates. */
 export const scannerQualityLogic = kea<scannerQualityLogicType>([
     path(['products', 'replay_vision', 'frontend', 'replay_scanners', 'scannerQualityLogic']),
diff --git a/products/replay_vision/frontend/replay_scanners/scannerRunTabLogic.ts b/products/replay_vision/frontend/replay_scanners/scannerRunTabLogic.ts
index d948d517cd1f..2cbea44ad987 100644
--- a/products/replay_vision/frontend/replay_scanners/scannerRunTabLogic.ts
+++ b/products/replay_vision/frontend/replay_scanners/scannerRunTabLogic.ts
@@ -1,4 +1,16 @@
-import { actions, connect, isBreakpoint, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    connect,
+    isBreakpoint,
+    kea,
+    key,
+    listeners,
+    path,
+    props,
+    reducers,
+    selectors,
+} from 'kea'
 
 import { teamLogic } from 'scenes/teamLogic'
 
@@ -6,7 +18,6 @@ import { visionScannersObservationsList } from '../generated/api'
 import type { ReplayObservationApi } from '../generated/api.schemas'
 import { scheduleObservationPoll } from '../logics/observationPolling'
 import { replayScannerLogic } from './replayScannerLogic'
-import type { scannerRunTabLogicType } from './scannerRunTabLogicType'
 
 export interface RowObservation {
     id: string
@@ -19,6 +30,70 @@ export interface ScannerRunTabLogicProps {
     scannerId: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface scannerRunTabLogicValues {
+    triggeringOnDemandObservation: boolean // replayScannerLogic
+    observationBySession: Record<string, RowObservation>
+    pendingId: string | null
+    refreshingObservations: boolean
+    shouldPoll: boolean
+    visibleSessionIds: string[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface scannerRunTabLogicActions {
+    triggerOnDemandObservation: (
+        sessionId: string,
+        silent?: any
+    ) => {
+        sessionId: string
+        silent: any
+    } // replayScannerLogic
+    triggerOnDemandObservationFailure: () => {
+        value: true
+    } // replayScannerLogic
+    triggerOnDemandObservationSuccess: () => {
+        value: true
+    } // replayScannerLogic
+    loadObservations: (background?: any) => {
+        background: any
+    }
+    loadObservationsFailure: () => {
+        value: true
+    }
+    loadObservationsSuccess: (bySession: Record<string, RowObservation>) => {
+        bySession: Record<string, RowObservation>
+    }
+    setPendingId: (sessionId: string) => {
+        sessionId: string
+    }
+    setVisibleSessionIds: (sessionIds: string[]) => {
+        sessionIds: string[]
+    }
+    startScan: (sessionId: string) => {
+        sessionId: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface scannerRunTabLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        shouldPoll: (
+            visibleSessionIds: string[],
+            observationBySession: Record<string, RowObservation>,
+            pendingId: string | null
+        ) => boolean
+    }
+}
+
+export type scannerRunTabLogicType = MakeLogicType<
+    scannerRunTabLogicValues,
+    scannerRunTabLogicActions,
+    ScannerRunTabLogicProps,
+    scannerRunTabLogicMeta
+>
+
 /** Backs the on-demand recordings list: per-session observation lookup, scan bridging, and result polling. */
 export const scannerRunTabLogic = kea<scannerRunTabLogicType>([
     path(['products', 'replay_vision', 'frontend', 'replay_scanners', 'scannerRunTabLogic']),
diff --git a/products/replay_vision/frontend/replay_scanners/visionActionRunSceneLogic.ts b/products/replay_vision/frontend/replay_scanners/visionActionRunSceneLogic.ts
index 3b7d6e347efe..6fda5ae954d5 100644
--- a/products/replay_vision/frontend/replay_scanners/visionActionRunSceneLogic.ts
+++ b/products/replay_vision/frontend/replay_scanners/visionActionRunSceneLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers, selectors } from 'kea'
 import { urlToAction } from 'kea-router'
 
 import { dayjs } from 'lib/dayjs'
@@ -10,7 +10,6 @@ import { Breadcrumb } from '~/types'
 
 import { visionActionsRetrieve, visionActionsRunsRetrieve } from '../generated/api'
 import type { RunObservationApi, VisionActionApi, VisionActionRunApi } from '../generated/api.schemas'
-import type { visionActionRunSceneLogicType } from './visionActionRunSceneLogicType'
 
 /**
  * Resolve the `[obs N]` citation markers the synthesizer leaves in a group summary into `[N]` links to
@@ -25,6 +24,66 @@ export function resolveObservationCitations(markdown: string, observations: read
     })
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface visionActionRunSceneLogicValues {
+    action: VisionActionApi | null
+    actionId: string
+    breadcrumbs: Breadcrumb[]
+    run: VisionActionRunApi | null
+    runId: string
+    runLoading: boolean
+    summaryMarkdown: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface visionActionRunSceneLogicActions {
+    loadAction: () => {
+        value: true
+    }
+    loadActionFailure: () => {
+        value: true
+    }
+    loadActionSuccess: (action: VisionActionApi) => {
+        action: VisionActionApi
+    }
+    loadRun: () => {
+        value: true
+    }
+    loadRunFailure: () => {
+        value: true
+    }
+    loadRunSuccess: (run: VisionActionRunApi) => {
+        run: VisionActionRunApi
+    }
+    setIds: (
+        actionId: string,
+        runId: string
+    ) => {
+        actionId: string
+        runId: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface visionActionRunSceneLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        summaryMarkdown: (run: VisionActionRunApi | null) => string
+        breadcrumbs: (
+            actionId: string,
+            runId: string,
+            action: VisionActionApi | null,
+            run: VisionActionRunApi | null
+        ) => Breadcrumb[]
+    }
+}
+
+export type visionActionRunSceneLogicType = MakeLogicType<
+    visionActionRunSceneLogicValues,
+    visionActionRunSceneLogicActions,
+    Record<string, any>,
+    visionActionRunSceneLogicMeta
+>
+
 export const visionActionRunSceneLogic = kea<visionActionRunSceneLogicType>([
     path(['products', 'replay_vision', 'frontend', 'replay_scanners', 'visionActionRunSceneLogic']),
 
diff --git a/products/replay_vision/frontend/replay_scanners/visionActionRunsLogic.ts b/products/replay_vision/frontend/replay_scanners/visionActionRunsLogic.ts
index 574ad53a419e..6e6cf3db510b 100644
--- a/products/replay_vision/frontend/replay_scanners/visionActionRunsLogic.ts
+++ b/products/replay_vision/frontend/replay_scanners/visionActionRunsLogic.ts
@@ -1,17 +1,63 @@
-import { actions, afterMount, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, key, listeners, path, props, reducers } from 'kea'
 
 import { lemonToast } from 'lib/lemon-ui/LemonToast'
 import { teamLogic } from 'scenes/teamLogic'
 
 import { visionActionsRetrieve, visionActionsRunsList } from '../generated/api'
 import type { VisionActionApi, VisionActionRunListApi } from '../generated/api.schemas'
-import type { visionActionRunsLogicType } from './visionActionRunsLogicType'
 import { visionActionSceneLogic } from './visionActionSceneLogic'
 
 export interface VisionActionRunsLogicProps {
     actionId: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface visionActionRunsLogicValues {
+    action: VisionActionApi | null
+    actionLoading: boolean
+    runs: VisionActionRunListApi[]
+    runsCount: number
+    runsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface visionActionRunsLogicActions {
+    loadAction: () => {
+        value: true
+    }
+    loadActionFailure: () => {
+        value: true
+    }
+    loadActionSuccess: (action: VisionActionApi) => {
+        action: VisionActionApi
+    }
+    loadRuns: () => {
+        value: true
+    }
+    loadRunsFailure: () => {
+        value: true
+    }
+    loadRunsSuccess: (
+        runs: VisionActionRunListApi[],
+        count: number
+    ) => {
+        count: number
+        runs: VisionActionRunListApi[]
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface visionActionRunsLogicMeta {
+    key: string
+}
+
+export type visionActionRunsLogicType = MakeLogicType<
+    visionActionRunsLogicValues,
+    visionActionRunsLogicActions,
+    VisionActionRunsLogicProps,
+    visionActionRunsLogicMeta
+>
+
 export const visionActionRunsLogic = kea<visionActionRunsLogicType>([
     path(['products', 'replay_vision', 'frontend', 'replay_scanners', 'visionActionRunsLogic']),
     props({} as VisionActionRunsLogicProps),
diff --git a/products/replay_vision/frontend/replay_scanners/visionActionSceneLogic.ts b/products/replay_vision/frontend/replay_scanners/visionActionSceneLogic.ts
index 7edb72561b38..9f9368247917 100644
--- a/products/replay_vision/frontend/replay_scanners/visionActionSceneLogic.ts
+++ b/products/replay_vision/frontend/replay_scanners/visionActionSceneLogic.ts
@@ -1,11 +1,53 @@
-import { actions, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers, selectors } from 'kea'
 import { urlToAction } from 'kea-router'
 
 import { urls } from 'scenes/urls'
 
 import { Breadcrumb } from '~/types'
 
-import type { visionActionSceneLogicType } from './visionActionSceneLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface visionActionSceneLogicValues {
+    actionContext: {
+        name: string | null
+        scannerId: string | null
+    }
+    actionId: string
+    breadcrumbs: Breadcrumb[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface visionActionSceneLogicActions {
+    setActionContext: (
+        name: string | null,
+        scannerId: string | null
+    ) => {
+        name: string | null
+        scannerId: string | null
+    }
+    setActionId: (actionId: string) => {
+        actionId: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface visionActionSceneLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        breadcrumbs: (
+            actionId: string,
+            actionContext: {
+                name: string | null
+                scannerId: string | null
+            }
+        ) => Breadcrumb[]
+    }
+}
+
+export type visionActionSceneLogicType = MakeLogicType<
+    visionActionSceneLogicValues,
+    visionActionSceneLogicActions,
+    Record<string, any>,
+    visionActionSceneLogicMeta
+>
 
 export const visionActionSceneLogic = kea<visionActionSceneLogicType>([
     path(['products', 'replay_vision', 'frontend', 'replay_scanners', 'visionActionSceneLogic']),
diff --git a/products/replay_vision/frontend/replay_scanners/visionActionsLogic.ts b/products/replay_vision/frontend/replay_scanners/visionActionsLogic.ts
index dccf1afe8c8d..5a81175ff758 100644
--- a/products/replay_vision/frontend/replay_scanners/visionActionsLogic.ts
+++ b/products/replay_vision/frontend/replay_scanners/visionActionsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, key, listeners, path, props, reducers } from 'kea'
 
 import { dayjs } from 'lib/dayjs'
 import { lemonToast } from 'lib/lemon-ui/LemonToast'
@@ -19,7 +19,6 @@ import {
 } from '../generated/api.schemas'
 import type { VerdictEnumApi, VisionActionApi } from '../generated/api.schemas'
 import { CadenceState, cadenceToRrule, DEFAULT_CADENCE } from './cadence'
-import type { visionActionsLogicType } from './visionActionsLogicType'
 
 export interface VisionActionsLogicProps {
     scannerId: string
@@ -124,6 +123,53 @@ export function buildActionBody(form: VisionActionForm, scannerId: string): Para
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface visionActionsLogicValues {
+    togglingIds: string[]
+    visionActions: VisionActionApi[]
+    visionActionsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface visionActionsLogicActions {
+    deleteAction: (id: string) => {
+        id: string
+    }
+    deleteActionSuccess: (id: string) => {
+        id: string
+    }
+    loadActions: () => {
+        value: true
+    }
+    loadActionsFailure: () => {
+        value: true
+    }
+    loadActionsSuccess: (visionActions: VisionActionApi[]) => {
+        visionActions: VisionActionApi[]
+    }
+    revertActionEnabled: (id: string) => {
+        id: string
+    }
+    toggleActionEnabled: (id: string) => {
+        id: string
+    }
+    toggleActionEnabledDone: (id: string) => {
+        id: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface visionActionsLogicMeta {
+    key: string
+}
+
+export type visionActionsLogicType = MakeLogicType<
+    visionActionsLogicValues,
+    visionActionsLogicActions,
+    VisionActionsLogicProps,
+    visionActionsLogicMeta
+>
+
 export const visionActionsLogic = kea<visionActionsLogicType>([
     path(['products', 'replay_vision', 'frontend', 'replay_scanners', 'visionActionsLogic']),
     props({} as VisionActionsLogicProps),
diff --git a/products/revenue_analytics/frontend/nodes/modals/mrrBreakdownModalLogic.ts b/products/revenue_analytics/frontend/nodes/modals/mrrBreakdownModalLogic.ts
index 19fa3332a2b5..15e078c1c4c3 100644
--- a/products/revenue_analytics/frontend/nodes/modals/mrrBreakdownModalLogic.ts
+++ b/products/revenue_analytics/frontend/nodes/modals/mrrBreakdownModalLogic.ts
@@ -1,18 +1,53 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 
 import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
 
 import { RevenueAnalyticsMRRQueryResultItem } from '~/queries/schema/schema-general'
 import { GraphDataset } from '~/types'
 
-import type { mrrBreakdownModalLogicType } from './mrrBreakdownModalLogicType'
-
 const includeKey =
     (key: `revenue-analytics-${keyof RevenueAnalyticsMRRQueryResultItem}`) => (dataset: GraphDataset) => ({
         ...dataset,
         status: key,
     })
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface mrrBreakdownModalLogicValues {
+    churnDatasets: GraphDataset[]
+    contractionDatasets: GraphDataset[]
+    data: RevenueAnalyticsMRRQueryResultItem[] | null
+    expansionDatasets: GraphDataset[]
+    isModalOpen: boolean
+    newDatasets: GraphDataset[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface mrrBreakdownModalLogicActions {
+    reportRevenueAnalyticsMRRBreakdownModalOpened: () => {} // eventUsageLogic
+    closeModal: () => {
+        value: true
+    }
+    openModal: (data: RevenueAnalyticsMRRQueryResultItem[]) => RevenueAnalyticsMRRQueryResultItem[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface mrrBreakdownModalLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        isModalOpen: (data: RevenueAnalyticsMRRQueryResultItem[] | null) => boolean
+        newDatasets: (data: RevenueAnalyticsMRRQueryResultItem[] | null) => GraphDataset[]
+        expansionDatasets: (data: RevenueAnalyticsMRRQueryResultItem[] | null) => GraphDataset[]
+        contractionDatasets: (data: RevenueAnalyticsMRRQueryResultItem[] | null) => GraphDataset[]
+        churnDatasets: (data: RevenueAnalyticsMRRQueryResultItem[] | null) => GraphDataset[]
+    }
+}
+
+export type mrrBreakdownModalLogicType = MakeLogicType<
+    mrrBreakdownModalLogicValues,
+    mrrBreakdownModalLogicActions,
+    Record<string, any>,
+    mrrBreakdownModalLogicMeta
+>
+
 export const mrrBreakdownModalLogic = kea<mrrBreakdownModalLogicType>([
     path(['products', 'revenueAnalytics', 'mrrBreakdownModalLogic']),
     connect(() => ({
@@ -35,29 +70,29 @@ export const mrrBreakdownModalLogic = kea<mrrBreakdownModalLogicType>([
     }),
 
     selectors({
-        isModalOpen: [(s) => [s.data], (data): boolean => !!data],
+        isModalOpen: [(s) => [s.data], (data: RevenueAnalyticsMRRQueryResultItem[] | null): boolean => !!data],
         newDatasets: [
             (s) => [s.data],
-            (data): GraphDataset[] =>
+            (data: RevenueAnalyticsMRRQueryResultItem[] | null): GraphDataset[] =>
                 (data?.map((item) => item.new as GraphDataset) ?? []).map(includeKey('revenue-analytics-new')),
         ],
         expansionDatasets: [
             (s) => [s.data],
-            (data): GraphDataset[] =>
+            (data: RevenueAnalyticsMRRQueryResultItem[] | null): GraphDataset[] =>
                 (data?.map((item) => item.expansion as GraphDataset) ?? []).map(
                     includeKey('revenue-analytics-expansion')
                 ),
         ],
         contractionDatasets: [
             (s) => [s.data],
-            (data): GraphDataset[] =>
+            (data: RevenueAnalyticsMRRQueryResultItem[] | null): GraphDataset[] =>
                 (data?.map((item) => item.contraction as GraphDataset) ?? []).map(
                     includeKey('revenue-analytics-contraction')
                 ),
         ],
         churnDatasets: [
             (s) => [s.data],
-            (data): GraphDataset[] =>
+            (data: RevenueAnalyticsMRRQueryResultItem[] | null): GraphDataset[] =>
                 (data?.map((item) => item.churn as GraphDataset) ?? []).map(includeKey('revenue-analytics-churn')),
         ],
     }),
diff --git a/products/revenue_analytics/frontend/revenueAnalyticsLogic.ts b/products/revenue_analytics/frontend/revenueAnalyticsLogic.ts
index 82c3f610165a..5e0abc1fb460 100644
--- a/products/revenue_analytics/frontend/revenueAnalyticsLogic.ts
+++ b/products/revenue_analytics/frontend/revenueAnalyticsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { router, urlToAction } from 'kea-router'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -27,7 +27,13 @@ import { Breadcrumb, DataWarehouseSavedQuery, InsightLogicProps, InsightShortId,
 
 import { sourceManagementLogic } from 'products/data_warehouse/frontend/shared/logics/sourceManagementLogic'
 
-import type { revenueAnalyticsLogicType } from './revenueAnalyticsLogicType'
+import type { PaginatedResponse } from '../../../frontend/src/lib/api'
+import type {
+    CurrencyCode,
+    RevenueAnalyticsEventItem,
+    RevenueAnalyticsGoal,
+} from '../../../frontend/src/queries/schema/schema-general'
+import type { ExternalDataSource } from '../../../frontend/src/types'
 import { revenueAnalyticsSettingsLogic } from './settings/revenueAnalyticsSettingsLogic'
 
 export enum RevenueAnalyticsQuery {
@@ -111,6 +117,174 @@ const setQueryParams = (params: Record<string, string>): string => {
 export type MRRMode = 'mrr' | 'arr'
 export type DisplayMode = 'line' | 'area' | 'bar' | 'table'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface revenueAnalyticsLogicValues {
+    dataWarehouseSavedQueries: DataWarehouseSavedQuery[] // dataWarehouseViewsLogic
+    dataWarehouseSources: PaginatedResponse<ExternalDataSource> | null // revenueAnalyticsSettingsLogic
+    events: RevenueAnalyticsEventItem[] // revenueAnalyticsSettingsLogic
+    revenueGoals: RevenueAnalyticsGoal[] // revenueAnalyticsSettingsLogic
+    baseCurrency: CurrencyCode // teamLogic
+    allRevenueAnalyticsViews: DataWarehouseSavedQuery[]
+    breadcrumbs: Breadcrumb[]
+    breakdownProperties: RevenueAnalyticsBreakdown[]
+    dateFilter: {
+        dateFrom: string | null
+        dateTo: string | null
+        interval: SimpleIntervalType
+    }
+    disabledGrowthModeSelection: boolean
+    disabledTopCustomersModeSelection: boolean
+    hasRevenueAnalyticsViewsWithIssues: boolean
+    hasRevenueEvents: boolean
+    hasRevenueTables: boolean | null
+    insightsDisplayMode: DisplayMode
+    isRevenueAnalyticsEnabled: boolean
+    maxContext: MaxContextInput[]
+    mrrMode: MRRMode
+    pausedRevenueViews: DataWarehouseSavedQuery[]
+    queries: Record<RevenueAnalyticsQuery, QuerySchema>
+    resumingSchedules: boolean
+    resumingViewSchedule: Record<string, boolean>
+    revenueAnalyticsFilter: RevenueAnalyticsPropertyFilters
+    revenueEnabledDataWarehouseSources: ExternalDataSource[] | null
+    revenueEnabledEvents: RevenueAnalyticsEventItem[]
+    topCustomersDisplayMode: DisplayMode
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface revenueAnalyticsLogicActions {
+    loadDataWarehouseSavedQueries: () => any // dataWarehouseViewsLogic
+    reportRevenueAnalyticsBreakdownAdded: (
+        breakdownProperty: string,
+        breakdownType: string
+    ) => {
+        breakdownProperty: string
+        breakdownType: string
+    } // eventUsageLogic
+    reportRevenueAnalyticsBreakdownRemoved: (
+        breakdownProperty: string,
+        breakdownType: string
+    ) => {
+        breakdownProperty: string
+        breakdownType: string
+    } // eventUsageLogic
+    reportRevenueAnalyticsDateRangeChanged: (
+        dateFrom: string | null,
+        dateTo: string | null
+    ) => {
+        dateFrom: string | null
+        dateTo: string | null
+    } // eventUsageLogic
+    reportRevenueAnalyticsFilterApplied: (filterCount: number) => {
+        filterCount: number
+    } // eventUsageLogic
+    reportRevenueAnalyticsMRRModeChanged: (mrrMode: string) => {
+        mrrMode: string
+    } // eventUsageLogic
+    loadSourcesSuccess: (
+        dataWarehouseSources:
+            | PaginatedResponse<ExternalDataSource>
+            | {
+                  count: number
+                  next: null
+                  previous: null
+                  results: never[]
+              },
+        payload?:
+            | {
+                  value: true
+              }
+            | undefined
+    ) => {
+        dataWarehouseSources:
+            | PaginatedResponse<ExternalDataSource>
+            | {
+                  count: number
+                  next: null
+                  previous: null
+                  results: never[]
+              }
+        payload?: {
+            value: true
+        }
+    } // sourceManagementLogic
+    addBreakdown: (breakdown: RevenueAnalyticsBreakdown) => {
+        breakdown: RevenueAnalyticsBreakdown
+    }
+    removeBreakdown: (breakdown: RevenueAnalyticsBreakdown) => {
+        breakdown: RevenueAnalyticsBreakdown
+    }
+    resumeViewSchedule: (viewId: string) => {
+        viewId: string
+    }
+    setBreakdownProperties: (breakdownProperties: RevenueAnalyticsBreakdown[]) => {
+        breakdownProperties: RevenueAnalyticsBreakdown[]
+    }
+    setDates: (
+        dateFrom: string | null,
+        dateTo: string | null
+    ) => {
+        dateFrom: string | null
+        dateTo: string | null
+    }
+    setInsightsDisplayMode: (displayMode: DisplayMode) => {
+        displayMode: DisplayMode
+    }
+    setMRRMode: (mrrMode: MRRMode) => {
+        mrrMode: MRRMode
+    }
+    setRevenueAnalyticsFilters: (revenueAnalyticsFilters: RevenueAnalyticsPropertyFilters) => {
+        revenueAnalyticsFilters: RevenueAnalyticsPropertyFilters
+    }
+    setTopCustomersDisplayMode: (displayMode: DisplayMode) => {
+        displayMode: DisplayMode
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface revenueAnalyticsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        revenueEnabledEvents: (events: RevenueAnalyticsEventItem[]) => RevenueAnalyticsEventItem[]
+        revenueEnabledDataWarehouseSources: (
+            dataWarehouseSources: PaginatedResponse<ExternalDataSource> | null
+        ) => ExternalDataSource[] | null
+        disabledGrowthModeSelection: (dateFilter: {
+            dateFrom: string | null
+            dateTo: string | null
+            interval: SimpleIntervalType
+        }) => boolean
+        disabledTopCustomersModeSelection: (dateFilter: {
+            dateFrom: string | null
+            dateTo: string | null
+            interval: SimpleIntervalType
+        }) => boolean
+        hasRevenueEvents: (revenueEnabledEvents: RevenueAnalyticsEventItem[]) => boolean
+        hasRevenueTables: (revenueEnabledDataWarehouseSources: ExternalDataSource[] | null) => boolean | null
+        isRevenueAnalyticsEnabled: (hasRevenueTables: boolean | null, hasRevenueEvents: boolean) => boolean
+        allRevenueAnalyticsViews: (dataWarehouseSavedQueries: DataWarehouseSavedQuery[]) => DataWarehouseSavedQuery[]
+        pausedRevenueViews: (allRevenueAnalyticsViews: DataWarehouseSavedQuery[]) => DataWarehouseSavedQuery[]
+        hasRevenueAnalyticsViewsWithIssues: (allRevenueAnalyticsViews: DataWarehouseSavedQuery[]) => boolean
+        queries: (
+            dateFilter: {
+                dateFrom: string | null
+                dateTo: string | null
+                interval: SimpleIntervalType
+            },
+            revenueAnalyticsFilter: RevenueAnalyticsPropertyFilters,
+            topCustomersDisplayMode: DisplayMode,
+            breakdownProperties: RevenueAnalyticsBreakdown[]
+        ) => Record<RevenueAnalyticsQuery, QuerySchema>
+        maxContext: (queries: Record<RevenueAnalyticsQuery, QuerySchema>) => MaxContextInput[]
+    }
+}
+
+export type revenueAnalyticsLogicType = MakeLogicType<
+    revenueAnalyticsLogicValues,
+    revenueAnalyticsLogicActions,
+    Record<string, any>,
+    revenueAnalyticsLogicMeta
+>
+
 export const revenueAnalyticsLogic = kea<revenueAnalyticsLogicType>([
     path(['products', 'revenueAnalytics', 'frontend', 'revenueAnalyticsLogic']),
     connect(() => ({
@@ -245,33 +419,41 @@ export const revenueAnalyticsLogic = kea<revenueAnalyticsLogicType>([
             ],
         ],
 
-        revenueEnabledEvents: [(s) => [s.events], (events) => events],
+        revenueEnabledEvents: [
+            (s) => [s.events],
+            (events: import('~/queries/schema').RevenueAnalyticsEventItem[]) => events,
+        ],
 
         revenueEnabledDataWarehouseSources: [
             (s) => [s.dataWarehouseSources],
-            (dataWarehouseSources) =>
+            (dataWarehouseSources: null | import('lib/api').PaginatedResponse<import('~/types').ExternalDataSource>) =>
                 dataWarehouseSources === null
                     ? null
                     : dataWarehouseSources.results.filter((source) => source.revenue_analytics_config.enabled),
         ],
 
-        disabledGrowthModeSelection: [(s) => [s.dateFilter], (dateFilter): boolean => dateFilter.interval !== 'month'],
+        disabledGrowthModeSelection: [
+            (s) => [s.dateFilter],
+            (dateFilter: { dateFrom: string | null; dateTo: string | null; interval: SimpleIntervalType }): boolean =>
+                dateFilter.interval !== 'month',
+        ],
 
         disabledTopCustomersModeSelection: [
             (s) => [s.dateFilter],
-            (dateFilter): boolean => dateFilter.interval !== 'month',
+            (dateFilter: { dateFrom: string | null; dateTo: string | null; interval: SimpleIntervalType }): boolean =>
+                dateFilter.interval !== 'month',
         ],
 
         hasRevenueEvents: [
             (s) => [s.revenueEnabledEvents],
-            (events): boolean => {
+            (events: import('~/queries/schema').RevenueAnalyticsEventItem[]): boolean => {
                 return events.length > 0
             },
         ],
 
         hasRevenueTables: [
             (s) => [s.revenueEnabledDataWarehouseSources],
-            (dataWarehouseSources): boolean | null => {
+            (dataWarehouseSources: import('~/types').ExternalDataSource[] | null): boolean | null => {
                 // Indicate loading state with `null` if we haven't loaded this yet
                 if (dataWarehouseSources === null) {
                     return null
@@ -283,14 +465,14 @@ export const revenueAnalyticsLogic = kea<revenueAnalyticsLogicType>([
 
         isRevenueAnalyticsEnabled: [
             (s) => [s.hasRevenueTables, s.hasRevenueEvents],
-            (hasRevenueTables, hasRevenueEvents): boolean => {
+            (hasRevenueTables: boolean | null, hasRevenueEvents: boolean): boolean => {
                 return hasRevenueTables || hasRevenueEvents
             },
         ],
 
         allRevenueAnalyticsViews: [
             (s) => [s.dataWarehouseSavedQueries],
-            (savedQueries): DataWarehouseSavedQuery[] => {
+            (savedQueries: DataWarehouseSavedQuery[]): DataWarehouseSavedQuery[] => {
                 if (!savedQueries) {
                     return []
                 }
@@ -300,7 +482,7 @@ export const revenueAnalyticsLogic = kea<revenueAnalyticsLogicType>([
 
         pausedRevenueViews: [
             (s) => [s.allRevenueAnalyticsViews],
-            (allRevenueAnalyticsViews): DataWarehouseSavedQuery[] => {
+            (allRevenueAnalyticsViews: DataWarehouseSavedQuery[]): DataWarehouseSavedQuery[] => {
                 if (!allRevenueAnalyticsViews) {
                     return []
                 }
@@ -315,7 +497,7 @@ export const revenueAnalyticsLogic = kea<revenueAnalyticsLogicType>([
 
         hasRevenueAnalyticsViewsWithIssues: [
             (s) => [s.allRevenueAnalyticsViews],
-            (allRevenueAnalyticsViews): boolean => {
+            (allRevenueAnalyticsViews: DataWarehouseSavedQuery[]): boolean => {
                 return allRevenueAnalyticsViews.some((view) => view.status === 'Failed' || view.latest_error)
             },
         ],
@@ -323,10 +505,14 @@ export const revenueAnalyticsLogic = kea<revenueAnalyticsLogicType>([
         queries: [
             (s) => [s.dateFilter, s.revenueAnalyticsFilter, s.topCustomersDisplayMode, s.breakdownProperties],
             (
-                dateFilter,
-                revenueAnalyticsFilter,
-                topCustomersDisplayMode,
-                breakdown
+                dateFilter: {
+                    dateFrom: string | null
+                    dateTo: string | null
+                    interval: SimpleIntervalType
+                },
+                revenueAnalyticsFilter: RevenueAnalyticsPropertyFilters,
+                topCustomersDisplayMode: DisplayMode,
+                breakdown: RevenueAnalyticsBreakdown[]
             ): Record<RevenueAnalyticsQuery, QuerySchema> => {
                 const { dateFrom, dateTo, interval } = dateFilter
                 const dateRange = { date_from: dateFrom, date_to: dateTo }
@@ -377,7 +563,7 @@ export const revenueAnalyticsLogic = kea<revenueAnalyticsLogicType>([
 
         maxContext: [
             (s) => [s.queries],
-            (queries): MaxContextInput[] => {
+            (queries: Record<RevenueAnalyticsQuery, QuerySchema>): MaxContextInput[] => {
                 return [
                     createMaxContextHelpers.insight(
                         {
diff --git a/products/revenue_analytics/frontend/settings/deleteRevenueEventModalLogic.ts b/products/revenue_analytics/frontend/settings/deleteRevenueEventModalLogic.ts
index 4626375ba64a..1d885e0b7264 100644
--- a/products/revenue_analytics/frontend/settings/deleteRevenueEventModalLogic.ts
+++ b/products/revenue_analytics/frontend/settings/deleteRevenueEventModalLogic.ts
@@ -1,11 +1,46 @@
-import { actions, kea, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
 
 import { DataWarehouseManagedViewsetSavedQuery } from '~/types'
 
-import type { deleteRevenueEventModalLogicType } from './deleteRevenueEventModalLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface deleteRevenueEventModalLogicValues {
+    eventName: string | null
+    views: DataWarehouseManagedViewsetSavedQuery[]
+    viewsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface deleteRevenueEventModalLogicActions {
+    setEventName: (eventName: string | null) => {
+        eventName: string | null
+    }
+    setEventNameFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    setEventNameSuccess: (
+        views: DataWarehouseManagedViewsetSavedQuery[],
+        payload?: {
+            eventName: string | null
+        }
+    ) => {
+        views: DataWarehouseManagedViewsetSavedQuery[]
+        payload?: {
+            eventName: string | null
+        }
+    }
+}
+
+export type deleteRevenueEventModalLogicType = MakeLogicType<
+    deleteRevenueEventModalLogicValues,
+    deleteRevenueEventModalLogicActions
+>
 
 export const deleteRevenueEventModalLogic = kea<deleteRevenueEventModalLogicType>([
     path(['products', 'revenue_analytics', 'settings', 'deleteRevenueEventModalLogic']),
diff --git a/products/revenue_analytics/frontend/settings/disableRevenueSourceModalLogic.ts b/products/revenue_analytics/frontend/settings/disableRevenueSourceModalLogic.ts
index 8ca425baf37e..f6d44845da3a 100644
--- a/products/revenue_analytics/frontend/settings/disableRevenueSourceModalLogic.ts
+++ b/products/revenue_analytics/frontend/settings/disableRevenueSourceModalLogic.ts
@@ -1,11 +1,46 @@
-import { actions, kea, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
 
 import { DataWarehouseManagedViewsetSavedQuery, ExternalDataSource } from '~/types'
 
-import type { disableRevenueSourceModalLogicType } from './disableRevenueSourceModalLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface disableRevenueSourceModalLogicValues {
+    source: ExternalDataSource | null
+    views: DataWarehouseManagedViewsetSavedQuery[]
+    viewsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface disableRevenueSourceModalLogicActions {
+    setSource: (source: ExternalDataSource | null) => {
+        source: ExternalDataSource | null
+    }
+    setSourceFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    setSourceSuccess: (
+        views: DataWarehouseManagedViewsetSavedQuery[],
+        payload?: {
+            source: ExternalDataSource | null
+        }
+    ) => {
+        views: DataWarehouseManagedViewsetSavedQuery[]
+        payload?: {
+            source: ExternalDataSource | null
+        }
+    }
+}
+
+export type disableRevenueSourceModalLogicType = MakeLogicType<
+    disableRevenueSourceModalLogicValues,
+    disableRevenueSourceModalLogicActions
+>
 
 export const disableRevenueSourceModalLogic = kea<disableRevenueSourceModalLogicType>([
     path(['products', 'revenue_analytics', 'settings', 'disableRevenueSourceModalLogic']),
diff --git a/products/revenue_analytics/frontend/settings/revenueAnalyticsSettingsLogic.ts b/products/revenue_analytics/frontend/settings/revenueAnalyticsSettingsLogic.ts
index 9f77bceb5f6f..600c58f80014 100644
--- a/products/revenue_analytics/frontend/settings/revenueAnalyticsSettingsLogic.ts
+++ b/products/revenue_analytics/frontend/settings/revenueAnalyticsSettingsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { beforeUnload } from 'kea-router'
 
@@ -25,7 +25,14 @@ import { ExternalDataSource } from '~/types'
 
 import { sourceManagementLogic } from 'products/data_warehouse/frontend/shared/logics/sourceManagementLogic'
 
-import type { revenueAnalyticsSettingsLogicType } from './revenueAnalyticsSettingsLogicType'
+import type { PaginatedResponse } from '../../../../frontend/src/lib/api'
+import type { DatabaseSchemaQueryResponse } from '../../../../frontend/src/queries/schema/schema-general'
+import type {
+    DataWarehouseViewLink,
+    ExternalDataSourceRevenueAnalyticsConfig,
+    TeamPublicType,
+    TeamType,
+} from '../../../../frontend/src/types'
 
 const createEmptyConfig = (): RevenueAnalyticsConfig => ({
     events: [],
@@ -60,6 +67,187 @@ const updatePropertyReducerBuilder =
         }
     }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface revenueAnalyticsSettingsLogicValues {
+    database: Required<DatabaseSchemaQueryResponse> | null // databaseTableListLogic
+    dataWarehouseSources: PaginatedResponse<ExternalDataSource> | null // sourceManagementLogic
+    dataWarehouseSourcesLoading: boolean // sourceManagementLogic
+    currentTeam: TeamPublicType | TeamType | null // teamLogic
+    currentTeamId: number | null // teamLogic
+    changesMadeToEvents: boolean
+    enabledDataWarehouseSources: ExternalDataSource[]
+    events: RevenueAnalyticsEventItem[]
+    exampleDataWarehouseTablesQuery: DataTableNode | null
+    exampleEventsQuery: DataTableNode | null
+    filterTestAccounts: boolean
+    goals: RevenueAnalyticsGoal[]
+    joins: DataWarehouseViewLink[]
+    revenueAnalyticsConfig: RevenueAnalyticsConfig | null
+    revenueAnalyticsConfigLoading: boolean
+    saveEventsDisabledReason: string | null
+    savedRevenueAnalyticsConfig: RevenueAnalyticsConfig
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface revenueAnalyticsSettingsLogicActions {
+    reportRevenueAnalyticsDataSourceDisabled: (sourceType: string) => {
+        sourceType: string
+    } // eventUsageLogic
+    reportRevenueAnalyticsDataSourceEnabled: (sourceType: string) => {
+        sourceType: string
+    } // eventUsageLogic
+    reportRevenueAnalyticsEventDeleted: (eventName: string) => {
+        eventName: string
+    } // eventUsageLogic
+    reportRevenueAnalyticsTestAccountFilterUpdated: (filterTestAccounts: boolean) => {
+        filterTestAccounts: boolean
+    } // eventUsageLogic
+    deleteJoin: (join: DataWarehouseViewLink) => {
+        join: DataWarehouseViewLink
+    } // sourceManagementLogic
+    updateSourceRevenueAnalyticsConfig: (args_0: {
+        config: Partial<ExternalDataSourceRevenueAnalyticsConfig>
+        source: ExternalDataSource
+    }) => {
+        config: Partial<ExternalDataSourceRevenueAnalyticsConfig>
+        source: ExternalDataSource
+    } // sourceManagementLogic
+    updateCurrentTeam: (payload: Partial<TeamType>) => Partial<TeamType> // teamLogic
+    addEvent: (
+        eventName: string,
+        revenueCurrency: CurrencyCode
+    ) => {
+        eventName: string
+        revenueCurrency: CurrencyCode
+    }
+    addGoal: (goal: RevenueAnalyticsGoal) => {
+        goal: RevenueAnalyticsGoal
+    }
+    deleteEvent: (eventName: string) => {
+        eventName: string
+    }
+    deleteGoal: (index: number) => {
+        index: number
+    }
+    loadRevenueAnalyticsConfig: () => any
+    loadRevenueAnalyticsConfigFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRevenueAnalyticsConfigSuccess: (
+        revenueAnalyticsConfig: RevenueAnalyticsConfig | null,
+        payload?: any
+    ) => {
+        revenueAnalyticsConfig: RevenueAnalyticsConfig | null
+        payload?: any
+    }
+    resetConfig: () => {
+        value: true
+    }
+    save: () => {
+        value: true
+    }
+    updateEventCouponProperty: (
+        eventName: string,
+        property: string
+    ) => {
+        eventName: string
+        property: string
+    }
+    updateEventCurrencyAwareDecimalProperty: (
+        eventName: string,
+        property: boolean
+    ) => {
+        eventName: string
+        property: boolean
+    }
+    updateEventCurrencyProperty: (
+        eventName: string,
+        property: RevenueCurrencyPropertyConfig
+    ) => {
+        eventName: string
+        property: RevenueCurrencyPropertyConfig
+    }
+    updateEventProductProperty: (
+        eventName: string,
+        property: string
+    ) => {
+        eventName: string
+        property: string
+    }
+    updateEventRevenueProperty: (
+        eventName: string,
+        property: string
+    ) => {
+        eventName: string
+        property: string
+    }
+    updateEventSubscriptionDropoffDays: (
+        eventName: string,
+        property: number
+    ) => {
+        eventName: string
+        property: number
+    }
+    updateEventSubscriptionDropoffMode: (
+        eventName: string,
+        property: SubscriptionDropoffMode
+    ) => {
+        eventName: string
+        property: SubscriptionDropoffMode
+    }
+    updateEventSubscriptionProperty: (
+        eventName: string,
+        property: string
+    ) => {
+        eventName: string
+        property: string
+    }
+    updateFilterTestAccounts: (filterTestAccounts: boolean) => {
+        filterTestAccounts: boolean
+    }
+    updateGoal: (
+        index: number,
+        goal: RevenueAnalyticsGoal
+    ) => {
+        goal: RevenueAnalyticsGoal
+        index: number
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface revenueAnalyticsSettingsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        filterTestAccounts: (revenueAnalyticsConfig: RevenueAnalyticsConfig | null) => boolean
+        goals: (revenueAnalyticsConfig: RevenueAnalyticsConfig | null) => RevenueAnalyticsGoal[]
+        events: (revenueAnalyticsConfig: RevenueAnalyticsConfig | null) => RevenueAnalyticsEventItem[]
+        changesMadeToEvents: (
+            revenueAnalyticsConfig: RevenueAnalyticsConfig | null,
+            savedRevenueAnalyticsConfig: RevenueAnalyticsConfig
+        ) => boolean
+        saveEventsDisabledReason: (
+            revenueAnalyticsConfig: RevenueAnalyticsConfig | null,
+            changesMadeToEvents: boolean
+        ) => string | null
+        enabledDataWarehouseSources: (
+            dataWarehouseSources: PaginatedResponse<ExternalDataSource> | null
+        ) => ExternalDataSource[]
+        exampleEventsQuery: (savedRevenueAnalyticsConfig: RevenueAnalyticsConfig) => DataTableNode | null
+        exampleDataWarehouseTablesQuery: (savedRevenueAnalyticsConfig: RevenueAnalyticsConfig) => DataTableNode | null
+        joins: (database: Required<DatabaseSchemaQueryResponse> | null) => DataWarehouseViewLink[]
+    }
+}
+
+export type revenueAnalyticsSettingsLogicType = MakeLogicType<
+    revenueAnalyticsSettingsLogicValues,
+    revenueAnalyticsSettingsLogicActions,
+    Record<string, any>,
+    revenueAnalyticsSettingsLogicMeta
+>
+
 export const revenueAnalyticsSettingsLogic = kea<revenueAnalyticsSettingsLogicType>([
     path(['scenes', 'data-management', 'revenue', 'revenueAnalyticsSettingsLogic']),
     connect(() => ({
@@ -235,13 +423,13 @@ export const revenueAnalyticsSettingsLogic = kea<revenueAnalyticsSettingsLogicTy
         ],
         changesMadeToEvents: [
             (s) => [s.revenueAnalyticsConfig, s.savedRevenueAnalyticsConfig],
-            (config, savedConfig): boolean => {
+            (config: RevenueAnalyticsConfig | null, savedConfig: RevenueAnalyticsConfig): boolean => {
                 return !!config && !objectsEqual(config.events, savedConfig.events)
             },
         ],
         saveEventsDisabledReason: [
             (s) => [s.revenueAnalyticsConfig, s.changesMadeToEvents],
-            (config, changesMade): string | null => {
+            (config: RevenueAnalyticsConfig | null, changesMade: boolean): string | null => {
                 if (!config) {
                     return 'Loading...'
                 }
@@ -259,7 +447,9 @@ export const revenueAnalyticsSettingsLogic = kea<revenueAnalyticsSettingsLogicTy
 
         enabledDataWarehouseSources: [
             (s) => [s.dataWarehouseSources],
-            (dataWarehouseSources): ExternalDataSource[] => {
+            (
+                dataWarehouseSources: null | import('lib/api').PaginatedResponse<ExternalDataSource>
+            ): ExternalDataSource[] => {
                 return dataWarehouseSources?.results?.filter((source) => source.revenue_analytics_config.enabled) ?? []
             },
         ],
@@ -305,7 +495,7 @@ export const revenueAnalyticsSettingsLogic = kea<revenueAnalyticsSettingsLogicTy
 
         joins: [
             (s) => [s.database],
-            (database) => {
+            (database: Required<import('~/queries/schema').DatabaseSchemaQueryResponse> | null) => {
                 return database?.joins || []
             },
         ],
diff --git a/products/review_hog/frontend/reviewHogSettingsLogic.ts b/products/review_hog/frontend/reviewHogSettingsLogic.ts
index 3e83938f0346..fd047a1cff46 100644
--- a/products/review_hog/frontend/reviewHogSettingsLogic.ts
+++ b/products/review_hog/frontend/reviewHogSettingsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 
@@ -35,8 +35,6 @@ import type {
     ReviewValidatorConfigApi,
 } from 'products/review_hog/frontend/generated/api.schemas'
 
-import type { reviewHogSettingsLogicType } from './reviewHogSettingsLogicType'
-
 export type ReviewSkillKind = 'perspective' | 'blind_spots' | 'validator'
 
 export type ReviewDrawerTab = 'published' | 'below_threshold' | 'dismissed' | 'chunks' | 'review'
@@ -111,6 +109,234 @@ function currentProjectId(): string {
     return String(teamLogic.values.currentTeamId)
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface reviewHogSettingsLogicValues {
+    blindSpots: ReviewBlindSpotsConfigApi[] | null
+    blindSpotsLoading: boolean
+    creatingSkillKind: ReviewSkillKind | null
+    expandedReviewIds: string[]
+    initialLoadFailed: boolean
+    openedReview: ReviewRecentReviewApi | null
+    perspectiveScoreboard: PerspectiveScore[] | null
+    perspectiveStats: ReviewPerspectiveStatsApi | null
+    perspectiveStatsLoading: boolean
+    perspectives: ReviewPerspectiveConfigApi[] | null
+    perspectivesLoading: boolean
+    recentReviews: ReviewRecentReviewApi[] | null
+    recentReviewsLoading: boolean
+    reviewDetail: ReviewDetailApi | null
+    reviewDetailLoading: boolean
+    reviewDrawerOpen: boolean
+    reviewDrawerTab: ReviewDrawerTab
+    reviewFindingsSplit: ReviewFindingsSplit | null
+    savingSkillNames: string[]
+    settings: ReviewUserSettingsApi | null
+    settingsLoading: boolean
+    skillDrawerOpen: boolean
+    validators: ReviewValidatorConfigApi[] | null
+    validatorsLoading: boolean
+    viewedSkill: ViewedSkill | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface reviewHogSettingsLogicActions {
+    blockSingleActiveDeactivation: (kindLabel: string) => {
+        kindLabel: string
+    }
+    closeReviewDrawer: () => {
+        value: true
+    }
+    closeSkillDrawer: () => {
+        value: true
+    }
+    loadAll: () => {
+        value: true
+    }
+    loadBlindSpots: () => any
+    loadBlindSpotsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadBlindSpotsSuccess: (
+        blindSpots: ReviewBlindSpotsConfigApi[],
+        payload?: any
+    ) => {
+        blindSpots: ReviewBlindSpotsConfigApi[]
+        payload?: any
+    }
+    loadPerspectiveStats: () => any
+    loadPerspectiveStatsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPerspectiveStatsSuccess: (
+        perspectiveStats: ReviewPerspectiveStatsApi,
+        payload?: any
+    ) => {
+        perspectiveStats: ReviewPerspectiveStatsApi
+        payload?: any
+    }
+    loadPerspectives: () => any
+    loadPerspectivesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPerspectivesSuccess: (
+        perspectives: ReviewPerspectiveConfigApi[],
+        payload?: any
+    ) => {
+        perspectives: ReviewPerspectiveConfigApi[]
+        payload?: any
+    }
+    loadRecentReviews: () => any
+    loadRecentReviewsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRecentReviewsSuccess: (
+        recentReviews: ReviewRecentReviewApi[],
+        payload?: any
+    ) => {
+        recentReviews: ReviewRecentReviewApi[]
+        payload?: any
+    }
+    loadReviewDetail: (reviewId: string) => string
+    loadReviewDetailFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadReviewDetailSuccess: (
+        reviewDetail: ReviewDetailApi,
+        payload?: string
+    ) => {
+        reviewDetail: ReviewDetailApi
+        payload?: string
+    }
+    loadSettings: () => any
+    loadSettingsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSettingsSuccess: (
+        settings: ReviewUserSettingsApi,
+        payload?: any
+    ) => {
+        settings: ReviewUserSettingsApi
+        payload?: any
+    }
+    loadValidators: () => any
+    loadValidatorsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadValidatorsSuccess: (
+        validators: ReviewValidatorConfigApi[],
+        payload?: any
+    ) => {
+        validators: ReviewValidatorConfigApi[]
+        payload?: any
+    }
+    openReviewDetail: (review: ReviewRecentReviewApi) => {
+        review: ReviewRecentReviewApi
+    }
+    patchPerspectiveLocally: (
+        skillName: string,
+        enabled: boolean
+    ) => {
+        enabled: boolean
+        skillName: string
+    }
+    selectBlindSpots: (skillName: string) => {
+        skillName: string
+    }
+    selectValidator: (skillName: string) => {
+        skillName: string
+    }
+    setReviewDrawerTab: (tab: ReviewDrawerTab) => {
+        tab: ReviewDrawerTab
+    }
+    setSkillSaving: (
+        skillName: string,
+        saving: boolean
+    ) => {
+        saving: boolean
+        skillName: string
+    }
+    startSkillAuthorTask: (kind: ReviewSkillKind) => {
+        kind: ReviewSkillKind
+    }
+    startSkillAuthorTaskFinished: () => {
+        value: true
+    }
+    togglePerspective: (
+        skillName: string,
+        enabled: boolean
+    ) => {
+        enabled: boolean
+        skillName: string
+    }
+    toggleReviewRowExpanded: (reviewId: string) => {
+        reviewId: string
+    }
+    updateSettings: (patch: PatchedReviewUserSettingsApi) => PatchedReviewUserSettingsApi
+    updateSettingsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateSettingsSuccess: (
+        settings: ReviewUserSettingsApi,
+        payload?: PatchedReviewUserSettingsApi
+    ) => {
+        settings: ReviewUserSettingsApi
+        payload?: PatchedReviewUserSettingsApi
+    }
+    viewSkill: (skill: ViewedSkill) => {
+        skill: ViewedSkill
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface reviewHogSettingsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        reviewFindingsSplit: (
+            reviewDetail: ReviewDetailApi | null,
+            settings: ReviewUserSettingsApi | null
+        ) => ReviewFindingsSplit | null
+        perspectiveScoreboard: (reviewDetail: ReviewDetailApi | null) => PerspectiveScore[] | null
+    }
+}
+
+export type reviewHogSettingsLogicType = MakeLogicType<
+    reviewHogSettingsLogicValues,
+    reviewHogSettingsLogicActions,
+    Record<string, any>,
+    reviewHogSettingsLogicMeta
+>
+
 /**
  * State for the "Code review" scene: the user's ReviewHog settings (triggers + urgency
  * threshold) and the three skill lists (perspectives / blind-spot check / validation criteria)
@@ -295,7 +521,10 @@ export const reviewHogSettingsLogic = kea<reviewHogSettingsLogicType>([
         // what the run published (the run's own threshold snapshot isn't stored).
         reviewFindingsSplit: [
             (s) => [s.reviewDetail, s.settings],
-            (reviewDetail, settings): ReviewFindingsSplit | null => {
+            (
+                reviewDetail: ReviewDetailApi | null,
+                settings: ReviewUserSettingsApi | null
+            ): ReviewFindingsSplit | null => {
                 if (!reviewDetail) {
                     return null
                 }
@@ -312,7 +541,7 @@ export const reviewHogSettingsLogic = kea<reviewHogSettingsLogicType>([
         ],
         perspectiveScoreboard: [
             (s) => [s.reviewDetail],
-            (reviewDetail): PerspectiveScore[] | null => {
+            (reviewDetail: ReviewDetailApi | null): PerspectiveScore[] | null => {
                 if (!reviewDetail?.findings.length) {
                     return null
                 }
diff --git a/products/session_summaries/frontend/sessionGroupSummariesTableLogic.ts b/products/session_summaries/frontend/sessionGroupSummariesTableLogic.ts
index 600f7bb8ca6c..7fe5b2c349e9 100644
--- a/products/session_summaries/frontend/sessionGroupSummariesTableLogic.ts
+++ b/products/session_summaries/frontend/sessionGroupSummariesTableLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { PaginationManual, Sorting } from '@posthog/lemon-ui'
@@ -8,7 +8,6 @@ import { objectClean } from 'lib/utils/objects'
 
 import { Breadcrumb } from '~/types'
 
-import type { sessionGroupSummariesTableLogicType } from './sessionGroupSummariesTableLogicType'
 import { SessionGroupSummaryListItemType } from './types'
 
 export interface SessionGroupSummariesListFilters {
@@ -24,6 +23,93 @@ export const DEFAULT_FILTERS: SessionGroupSummariesListFilters = {
 const RESULTS_PER_PAGE = 50
 const DEFAULT_SORTING: Sorting = { columnKey: '-created_at', order: 1 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionGroupSummariesTableLogicValues {
+    breadcrumbs: Breadcrumb[]
+    filters: SessionGroupSummariesListFilters
+    page: number
+    pagination: PaginationManual
+    sessionGroupSummaries: SessionGroupSummaryListItemType[]
+    sessionGroupSummariesResponse: CountedPaginatedResponse<SessionGroupSummaryListItemType> | null
+    sessionGroupSummariesResponseLoading: boolean
+    tableSorting: Sorting
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionGroupSummariesTableLogicActions {
+    deleteSessionGroupSummary: (id: string) => {
+        id: string
+    }
+    deleteSessionGroupSummaryFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteSessionGroupSummarySuccess: (
+        sessionGroupSummariesResponse: null,
+        payload?: {
+            id: string
+        }
+    ) => {
+        sessionGroupSummariesResponse: null
+        payload?: {
+            id: string
+        }
+    }
+    loadSessionGroupSummaries: () => {
+        value: true
+    }
+    loadSessionGroupSummariesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSessionGroupSummariesSuccess: (
+        sessionGroupSummariesResponse: CountedPaginatedResponse<SessionGroupSummaryListItemType>,
+        payload?: {
+            value: true
+        }
+    ) => {
+        sessionGroupSummariesResponse: CountedPaginatedResponse<SessionGroupSummaryListItemType>
+        payload?: {
+            value: true
+        }
+    }
+    setFilters: (filters: Partial<SessionGroupSummariesListFilters>) => {
+        filters: Partial<SessionGroupSummariesListFilters>
+    }
+    setPage: (page: number) => {
+        page: number
+    }
+    tableSortingChanged: (sorting: Sorting | null) => {
+        sorting: Sorting | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionGroupSummariesTableLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        sessionGroupSummaries: (
+            sessionGroupSummariesResponse: CountedPaginatedResponse<SessionGroupSummaryListItemType> | null
+        ) => SessionGroupSummaryListItemType[]
+        pagination: (
+            page: number,
+            sessionGroupSummariesResponse: CountedPaginatedResponse<SessionGroupSummaryListItemType> | null
+        ) => PaginationManual
+    }
+}
+
+export type sessionGroupSummariesTableLogicType = MakeLogicType<
+    sessionGroupSummariesTableLogicValues,
+    sessionGroupSummariesTableLogicActions,
+    Record<string, any>,
+    sessionGroupSummariesTableLogicMeta
+>
+
 export const sessionGroupSummariesTableLogic = kea<sessionGroupSummariesTableLogicType>([
     path(['products', 'session_summaries', 'frontend', 'sessionGroupSummariesTableLogic']),
     actions({
diff --git a/products/session_summaries/frontend/sessionGroupSummarySceneLogic.ts b/products/session_summaries/frontend/sessionGroupSummarySceneLogic.ts
index 7bfb1bc06729..4568088c0fef 100644
--- a/products/session_summaries/frontend/sessionGroupSummarySceneLogic.ts
+++ b/products/session_summaries/frontend/sessionGroupSummarySceneLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, key, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, key, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 
@@ -8,7 +8,6 @@ import { urls } from 'scenes/urls'
 
 import { Breadcrumb } from '~/types'
 
-import type { sessionGroupSummarySceneLogicType } from './sessionGroupSummarySceneLogicType'
 import {
     EnrichedSessionGroupSummaryPatternsList,
     PatternAssignedEventSegmentContext,
@@ -19,6 +18,77 @@ export interface SessionGroupSummarySceneLogicProps {
     id: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionGroupSummarySceneLogicValues {
+    accessDeniedToSessionGroupSummary: boolean
+    breadcrumbs: Breadcrumb[]
+    selectedEvent: PatternAssignedEventSegmentContext | null
+    selectedEventUuid: string | null
+    selectedPatternId: number | null
+    sessionGroupSummary: SessionGroupSummaryType | null
+    sessionGroupSummaryLoading: boolean
+    sessionGroupSummaryMissing: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionGroupSummarySceneLogicActions {
+    closeSessionDetails: () => {
+        value: true
+    }
+    loadSessionGroupSummary: () => {
+        value: true
+    }
+    loadSessionGroupSummaryFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSessionGroupSummarySuccess: (
+        sessionGroupSummary: SessionGroupSummaryType | null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        sessionGroupSummary: SessionGroupSummaryType | null
+        payload?: {
+            value: true
+        }
+    }
+    openSessionDetails: (
+        patternId: number,
+        targetEventUuid: string
+    ) => {
+        patternId: number
+        targetEventUuid: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface sessionGroupSummarySceneLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        sessionGroupSummaryMissing: (
+            sessionGroupSummary: SessionGroupSummaryType | null,
+            sessionGroupSummaryLoading: boolean
+        ) => boolean
+        selectedEvent: (
+            sessionGroupSummary: SessionGroupSummaryType | null,
+            selectedPatternId: number | null,
+            selectedEventUuid: string | null
+        ) => PatternAssignedEventSegmentContext | null
+        breadcrumbs: (sessionGroupSummary: SessionGroupSummaryType | null) => Breadcrumb[]
+    }
+}
+
+export type sessionGroupSummarySceneLogicType = MakeLogicType<
+    sessionGroupSummarySceneLogicValues,
+    sessionGroupSummarySceneLogicActions,
+    SessionGroupSummarySceneLogicProps,
+    sessionGroupSummarySceneLogicMeta
+>
+
 export const sessionGroupSummarySceneLogic = kea<sessionGroupSummarySceneLogicType>([
     path(['products', 'session_summaries', 'frontend', 'sessionGroupSummarySceneLogic']),
     props({} as SessionGroupSummarySceneLogicProps),
@@ -75,13 +145,17 @@ export const sessionGroupSummarySceneLogic = kea<sessionGroupSummarySceneLogicTy
     selectors({
         sessionGroupSummaryMissing: [
             (s) => [s.sessionGroupSummary, s.sessionGroupSummaryLoading],
-            (sessionGroupSummary, sessionGroupSummaryLoading): boolean => {
+            (sessionGroupSummary: SessionGroupSummaryType | null, sessionGroupSummaryLoading: boolean): boolean => {
                 return !sessionGroupSummary && !sessionGroupSummaryLoading
             },
         ],
         selectedEvent: [
             (s) => [s.sessionGroupSummary, s.selectedPatternId, s.selectedEventUuid],
-            (sessionGroupSummary, selectedPatternId, selectedEventUuid): PatternAssignedEventSegmentContext | null => {
+            (
+                sessionGroupSummary: SessionGroupSummaryType | null,
+                selectedPatternId: number | null,
+                selectedEventUuid: string | null
+            ): PatternAssignedEventSegmentContext | null => {
                 if (!sessionGroupSummary || selectedPatternId === null || !selectedEventUuid) {
                     return null
                 }
@@ -97,7 +171,7 @@ export const sessionGroupSummarySceneLogic = kea<sessionGroupSummarySceneLogicTy
         ],
         breadcrumbs: [
             (s) => [s.sessionGroupSummary],
-            (sessionGroupSummary): Breadcrumb[] => [
+            (sessionGroupSummary: SessionGroupSummaryType | null): Breadcrumb[] => [
                 {
                     key: Scene.SessionGroupSummariesTable,
                     name: 'Session summaries',
diff --git a/products/skills/frontend/llmSkillLogic.ts b/products/skills/frontend/llmSkillLogic.ts
index 62b1449a7eb3..d142fe3bdfdc 100644
--- a/products/skills/frontend/llmSkillLogic.ts
+++ b/products/skills/frontend/llmSkillLogic.ts
@@ -1,5 +1,18 @@
-import { actions, afterMount, defaults, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    afterMount,
+    defaults,
+    kea,
+    key,
+    listeners,
+    path,
+    props,
+    reducers,
+    selectors,
+} from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { combineUrl, router, urlToAction } from 'kea-router'
 
@@ -23,7 +36,6 @@ import type {
     LLMSkillVersionSummaryApi,
 } from 'products/skills/frontend/generated/api.schemas'
 
-import type { llmSkillLogicType } from './llmSkillLogicType'
 import { exportAndDownloadSkill, llmSkillsLogic, LLM_SKILLS_FORCE_RELOAD_PARAM } from './llmSkillsLogic'
 import { SKILL_DESCRIPTION_MAX_LENGTH, validateSkillName } from './skillConstants'
 
@@ -121,6 +133,194 @@ function findExistingSkill(skillName: string): LLMSkillListApi | undefined {
     return llmSkillsLogic.findMounted()?.values.skills.results.find((s) => s.name === skillName)
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmSkillLogicValues {
+    breadcrumbs: Breadcrumb[]
+    canCompareVersions: boolean
+    canLoadMoreVersions: boolean
+    compareSkill: LLMSkillApi | null
+    compareSkillLoading: boolean
+    compareVersion: number | null
+    compareVersionOptions: Array<{
+        label: string
+        value: number
+    }>
+    downloadingZip: boolean
+    fileContentsLoading: boolean
+    isDiffVisible: boolean
+    isEditMode: boolean
+    isHistoricalVersion: boolean
+    isNewSkill: boolean
+    isOutlineExpanded: boolean
+    isSkillFormSubmitting: boolean
+    isSkillFormValid: boolean
+    isSkillMissing: boolean
+    isViewMode: boolean
+    mode: SkillMode
+    shouldDisplaySkeleton: boolean
+    showSkillFormErrors: boolean
+    skill: ResolvedLLMSkill | SkillFormValues | null
+    skillFetched: boolean
+    skillForm: SkillFormValues
+    skillFormAllErrors: Record<string, any>
+    skillFormChanged: boolean
+    skillFormErrors: DeepPartialMap<SkillFormValues, ValidationErrorType>
+    skillFormHasErrors: boolean
+    skillFormManualErrors: Record<string, any>
+    skillFormTouched: boolean
+    skillFormTouches: Record<string, boolean>
+    skillFormValidationErrors: DeepPartialMap<SkillFormValues, ValidationErrorType>
+    skillLoading: boolean
+    versions: LLMSkillVersionSummaryApi[]
+    versionsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmSkillLogicActions {
+    deleteSkill: () => {
+        value: true
+    }
+    downloadSkill: () => {
+        value: true
+    }
+    loadCompareSkill: (version: number) => number
+    loadCompareSkillFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadCompareSkillSuccess: (
+        compareSkill: LLMSkillApi,
+        payload?: number
+    ) => {
+        compareSkill: LLMSkillApi
+        payload?: number
+    }
+    loadFileContents: () => {
+        value: true
+    }
+    loadMoreVersions: () => {
+        value: true
+    }
+    loadSkill: () => any
+    loadSkillFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSkillSuccess: (
+        skill: ResolvedLLMSkill,
+        payload?: any
+    ) => {
+        skill: ResolvedLLMSkill
+        payload?: any
+    }
+    resetSkillForm: (values?: SkillFormValues) => {
+        values?: SkillFormValues
+    }
+    setCompareVersion: (compareVersion: number | null) => {
+        compareVersion: number | null
+    }
+    setDownloadingZip: (downloadingZip: boolean) => {
+        downloadingZip: boolean
+    }
+    setFileContentsLoading: (loading: boolean) => {
+        loading: boolean
+    }
+    setMode: (mode: SkillMode) => {
+        mode: SkillMode
+    }
+    setSkill: (skill: ResolvedLLMSkill | SkillFormValues) => {
+        skill: ResolvedLLMSkill | SkillFormValues
+    }
+    setSkillFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setSkillFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setSkillFormValues: (values: DeepPartial<SkillFormValues>) => {
+        values: DeepPartial<SkillFormValues>
+    }
+    setVersionsLoading: (versionsLoading: boolean) => {
+        versionsLoading: boolean
+    }
+    submitSkillForm: () => {
+        value: boolean
+    }
+    submitSkillFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitSkillFormRequest: (skillForm: SkillFormValues) => {
+        skillForm: SkillFormValues
+    }
+    submitSkillFormSuccess: (skillForm: SkillFormValues) => {
+        skillForm: SkillFormValues
+    }
+    toggleOutlineExpanded: () => {
+        value: true
+    }
+    touchSkillFormField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmSkillLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        isNewSkill: (arg: any) => boolean
+        isSkillMissing: (
+            skill: ResolvedLLMSkill | SkillFormValues | null,
+            skillLoading: boolean,
+            skillFetched: boolean
+        ) => boolean
+        shouldDisplaySkeleton: (
+            skill: ResolvedLLMSkill | SkillFormValues | null,
+            skillLoading: boolean,
+            skillFetched: boolean,
+            isNewSkill: boolean
+        ) => boolean
+        isHistoricalVersion: (skill: ResolvedLLMSkill | SkillFormValues | null) => boolean
+        breadcrumbs: (
+            skill: ResolvedLLMSkill | SkillFormValues | null,
+            searchParams: Record<string, any>
+        ) => Breadcrumb[]
+        isViewMode: (mode: SkillMode, arg: any) => boolean
+        isEditMode: (mode: SkillMode, arg: any) => boolean
+        versions: (skill: ResolvedLLMSkill | SkillFormValues | null) => LLMSkillVersionSummaryApi[]
+        canLoadMoreVersions: (skill: ResolvedLLMSkill | SkillFormValues | null) => boolean
+        isDiffVisible: (compareVersion: number | null) => boolean
+        canCompareVersions: (skill: ResolvedLLMSkill | SkillFormValues | null) => boolean
+        compareVersionOptions: (
+            skill: ResolvedLLMSkill | SkillFormValues | null,
+            versions: LLMSkillVersionSummaryApi[]
+        ) => Array<{
+            label: string
+            value: number
+        }>
+    }
+}
+
+export type llmSkillLogicType = MakeLogicType<
+    llmSkillLogicValues,
+    llmSkillLogicActions,
+    SkillLogicProps,
+    llmSkillLogicMeta
+>
+
 export const llmSkillLogic = kea<llmSkillLogicType>([
     path(['scenes', 'skills', 'llmSkillLogic']),
     props({ skillName: 'new' } as SkillLogicProps),
@@ -341,16 +541,24 @@ export const llmSkillLogic = kea<llmSkillLogicType>([
 
         isSkillMissing: [
             (s) => [s.skill, s.skillLoading, s.skillFetched],
-            (skill, skillLoading, skillFetched) => skillFetched && !skillLoading && skill === null,
+            (skill: ResolvedLLMSkill | SkillFormValues | null, skillLoading: boolean, skillFetched: boolean) =>
+                skillFetched && !skillLoading && skill === null,
         ],
 
         shouldDisplaySkeleton: [
             (s) => [s.skill, s.skillLoading, s.skillFetched, s.isNewSkill],
-            (skill, skillLoading, skillFetched, isNewSkill) =>
-                !isNewSkill && (!skillFetched || (skillLoading && skill === null)),
+            (
+                skill: ResolvedLLMSkill | SkillFormValues | null,
+                skillLoading: boolean,
+                skillFetched: boolean,
+                isNewSkill: boolean
+            ) => !isNewSkill && (!skillFetched || (skillLoading && skill === null)),
         ],
 
-        isHistoricalVersion: [(s) => [s.skill], (skill) => (isSkill(skill) ? !skill.is_latest : false)],
+        isHistoricalVersion: [
+            (s) => [s.skill],
+            (skill: ResolvedLLMSkill | SkillFormValues | null) => (isSkill(skill) ? !skill.is_latest : false),
+        ],
 
         breadcrumbs: [
             (s) => [s.skill, router.selectors.searchParams],
@@ -374,25 +582,38 @@ export const llmSkillLogic = kea<llmSkillLogicType>([
 
         isViewMode: [
             (s) => [s.mode, (_, props) => props],
-            (mode, props) => props.skillName !== 'new' && mode === SkillMode.View,
+            (mode: SkillMode, props) => props.skillName !== 'new' && mode === SkillMode.View,
         ],
 
         isEditMode: [
             (s) => [s.mode, (_, props) => props],
-            (mode, props) => props.skillName === 'new' || mode === SkillMode.Edit,
+            (mode: SkillMode, props) => props.skillName === 'new' || mode === SkillMode.Edit,
         ],
 
-        versions: [(s) => [s.skill], (skill): LLMSkillVersionSummaryApi[] => (isSkill(skill) ? skill.versions : [])],
+        versions: [
+            (s) => [s.skill],
+            (skill: ResolvedLLMSkill | SkillFormValues | null): LLMSkillVersionSummaryApi[] =>
+                isSkill(skill) ? skill.versions : [],
+        ],
 
-        canLoadMoreVersions: [(s) => [s.skill], (skill) => (isSkill(skill) ? skill.has_more : false)],
+        canLoadMoreVersions: [
+            (s) => [s.skill],
+            (skill: ResolvedLLMSkill | SkillFormValues | null) => (isSkill(skill) ? skill.has_more : false),
+        ],
 
-        isDiffVisible: [(s) => [s.compareVersion], (compareVersion): boolean => compareVersion !== null],
+        isDiffVisible: [(s) => [s.compareVersion], (compareVersion: number | null): boolean => compareVersion !== null],
 
-        canCompareVersions: [(s) => [s.skill], (skill): boolean => isSkill(skill) && skill.version_count > 1],
+        canCompareVersions: [
+            (s) => [s.skill],
+            (skill: ResolvedLLMSkill | SkillFormValues | null): boolean => isSkill(skill) && skill.version_count > 1,
+        ],
 
         compareVersionOptions: [
             (s) => [s.skill, s.versions],
-            (skill, versions: LLMSkillVersionSummaryApi[]): Array<{ value: number; label: string }> => {
+            (
+                skill: ResolvedLLMSkill | SkillFormValues | null,
+                versions: LLMSkillVersionSummaryApi[]
+            ): Array<{ value: number; label: string }> => {
                 if (!isSkill(skill)) {
                     return []
                 }
diff --git a/products/skills/frontend/llmSkillsLogic.ts b/products/skills/frontend/llmSkillsLogic.ts
index 3ab7194937ee..9ef6ad1fd6ac 100644
--- a/products/skills/frontend/llmSkillsLogic.ts
+++ b/products/skills/frontend/llmSkillsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router, urlToAction } from 'kea-router'
 
@@ -28,8 +28,6 @@ import type {
     PaginatedLLMSkillListListApi,
 } from 'products/skills/frontend/generated/api.schemas'
 
-import type { llmSkillsLogicType } from './llmSkillsLogicType'
-
 /** Builds the `/plugin marketplace add` command. The token is embedded once minted; until then
  * a placeholder is shown. */
 export function buildMarketplaceCommand(token: string | null): string {
@@ -234,6 +232,155 @@ export function groupSkillsByPrefix(skills: LLMSkillListApi[]): SkillGroupTree {
 
 export type LLMSkillsLogicProps = Record<string, never>
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmSkillsLogicValues {
+    activeCategory: string
+    activeTabDescription: string
+    activeTabKey: string
+    categoryCounts: Record<string, number>
+    categoryCountsLoading: boolean
+    codexCommand: string
+    connectModalOpen: boolean
+    count: number
+    filters: SkillFilters
+    groupedSkills: SkillGroupTree | null
+    importing: boolean
+    issuingCredential: boolean
+    marketplaceCommand: string
+    marketplaceLoading: boolean
+    marketplaceState: LLMSkillMarketplaceCommandApi | null
+    pagination: PaginationManual | undefined
+    rawFilters: Partial<SkillFilters> | null
+    skillCountLabel: string
+    skills: PaginatedLLMSkillListListApi
+    skillsLoading: boolean
+    sorting: Sorting | null
+    visibleCategoryTabs: SkillCategoryTab[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmSkillsLogicActions {
+    deleteSkill: (skillName: string) => {
+        skillName: string
+    }
+    downloadSkillZip: (skillName: string) => {
+        skillName: string
+    }
+    duplicateSkill: (
+        skillName: string,
+        newName: string
+    ) => {
+        newName: string
+        skillName: string
+    }
+    importSkill: (file: File) => {
+        file: File
+    }
+    issueMarketplaceCommand: (rotate?: boolean) => {
+        rotate: boolean
+    }
+    loadCategoryCounts: () => {
+        value: true
+    }
+    loadCategoryCountsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadCategoryCountsSuccess: (
+        categoryCounts: {
+            [k: string]: number
+        },
+        payload?: {
+            value: true
+        }
+    ) => {
+        categoryCounts: {
+            [k: string]: number
+        }
+        payload?: {
+            value: true
+        }
+    }
+    loadMarketplaceState: () => {
+        value: true
+    }
+    loadSkills: (debounce?: boolean) => {
+        debounce: boolean
+    }
+    loadSkillsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSkillsSuccess: (
+        skills: PaginatedLLMSkillListListApi,
+        payload?: {
+            debounce: boolean
+        }
+    ) => {
+        skills: PaginatedLLMSkillListListApi
+        payload?: {
+            debounce: boolean
+        }
+    }
+    setActiveTab: (tabKey: string) => {
+        tabKey: string
+    }
+    setConnectModalOpen: (open: boolean) => {
+        open: boolean
+    }
+    setFilters: (
+        filters: Partial<SkillFilters>,
+        merge?: boolean,
+        debounce?: boolean
+    ) => {
+        debounce: boolean
+        filters: Partial<SkillFilters>
+        merge: boolean
+    }
+    setImporting: (importing: boolean) => {
+        importing: boolean
+    }
+    setIssuingCredential: (issuing: boolean) => {
+        issuing: boolean
+    }
+    setMarketplaceLoading: (loading: boolean) => {
+        loading: boolean
+    }
+    setMarketplaceState: (state: LLMSkillMarketplaceCommandApi | null) => {
+        state: LLMSkillMarketplaceCommandApi | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface llmSkillsLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        filters: (rawFilters: Partial<SkillFilters> | null) => SkillFilters
+        activeCategory: (activeTabKey: string) => string
+        activeTabDescription: (activeTabKey: string) => string
+        visibleCategoryTabs: (categoryCounts: Record<string, number>, activeTabKey: string) => SkillCategoryTab[]
+        count: (skills: PaginatedLLMSkillListListApi) => number
+        marketplaceCommand: (marketplaceState: LLMSkillMarketplaceCommandApi | null) => string
+        codexCommand: (marketplaceState: LLMSkillMarketplaceCommandApi | null) => string
+        sorting: (filters: SkillFilters) => Sorting | null
+        pagination: (filters: SkillFilters, count: number) => PaginationManual | undefined
+        groupedSkills: (skills: PaginatedLLMSkillListListApi, filters: SkillFilters) => SkillGroupTree | null
+        skillCountLabel: (filters: SkillFilters, count: number, skills: PaginatedLLMSkillListListApi) => string
+    }
+}
+
+export type llmSkillsLogicType = MakeLogicType<
+    llmSkillsLogicValues,
+    llmSkillsLogicActions,
+    LLMSkillsLogicProps,
+    llmSkillsLogicMeta
+>
+
 export const llmSkillsLogic = kea<llmSkillsLogicType>([
     path(['scenes', 'skills', 'llmSkillsLogic']),
     props({} as LLMSkillsLogicProps),
diff --git a/products/skills/frontend/skillFileLogic.ts b/products/skills/frontend/skillFileLogic.ts
index 7b349399cda4..487bee4589de 100644
--- a/products/skills/frontend/skillFileLogic.ts
+++ b/products/skills/frontend/skillFileLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, kea, key, listeners, path, props, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { ApiConfig } from '~/lib/api'
@@ -6,14 +6,56 @@ import { ApiConfig } from '~/lib/api'
 import { llmSkillsNameFilesRetrieve } from 'products/skills/frontend/generated/api'
 import type { LLMSkillFileApi } from 'products/skills/frontend/generated/api.schemas'
 
-import type { skillFileLogicType } from './skillFileLogicType'
-
 export interface SkillFileLogicProps {
     skillName: string
     filePath: string
     version?: number
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface skillFileLogicValues {
+    content: string | null
+    contentLoading: boolean
+    expanded: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface skillFileLogicActions {
+    autoOpen: () => {
+        value: true
+    }
+    loadContent: () => any
+    loadContentFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadContentSuccess: (
+        content: string,
+        payload?: any
+    ) => {
+        content: string
+        payload?: any
+    }
+    toggleExpand: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface skillFileLogicMeta {
+    key: string
+}
+
+export type skillFileLogicType = MakeLogicType<
+    skillFileLogicValues,
+    skillFileLogicActions,
+    SkillFileLogicProps,
+    skillFileLogicMeta
+>
+
 export const skillFileLogic = kea<skillFileLogicType>([
     path(['scenes', 'skills', 'skillFileLogic']),
     props({ skillName: '', filePath: '' } as SkillFileLogicProps),
diff --git a/products/subscriptions/frontend/components/Subscriptions/insightSelectorLogic.ts b/products/subscriptions/frontend/components/Subscriptions/insightSelectorLogic.ts
index 7f6f41424156..341fc46efe94 100644
--- a/products/subscriptions/frontend/components/Subscriptions/insightSelectorLogic.ts
+++ b/products/subscriptions/frontend/components/Subscriptions/insightSelectorLogic.ts
@@ -1,9 +1,7 @@
-import { actions, kea, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, path, props, reducers, selectors } from 'kea'
 
 import { DashboardTile, InsightModel } from '~/types'
 
-import type { insightSelectorLogicType } from './insightSelectorLogicType'
-
 // Keep in sync with DEFAULT_MAX_ASSET_COUNT in ee/tasks/subscriptions/subscription_utils.py
 export const MAX_INSIGHTS = 6
 
@@ -11,6 +9,44 @@ export interface InsightSelectorLogicProps {
     tiles: DashboardTile[]
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightSelectorLogicValues {
+    filteredTiles: DashboardTile<InsightModel>[]
+    insightTiles: DashboardTile<InsightModel>[]
+    searchTerm: string
+    showSearch: boolean
+    userHasInteracted: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightSelectorLogicActions {
+    setSearchTerm: (searchTerm: string) => {
+        searchTerm: string
+    }
+    setUserHasInteracted: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface insightSelectorLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        insightTiles: (tiles: DashboardTile<InsightModel>[]) => DashboardTile<InsightModel>[]
+        filteredTiles: (
+            insightTiles: DashboardTile<InsightModel>[],
+            searchTerm: string
+        ) => DashboardTile<InsightModel>[]
+        showSearch: (insightTiles: DashboardTile<InsightModel>[]) => boolean
+    }
+}
+
+export type insightSelectorLogicType = MakeLogicType<
+    insightSelectorLogicValues,
+    insightSelectorLogicActions,
+    InsightSelectorLogicProps,
+    insightSelectorLogicMeta
+>
+
 export const insightSelectorLogic = kea<insightSelectorLogicType>([
     props({} as InsightSelectorLogicProps),
     path(['lib', 'components', 'Subscriptions', 'insightSelectorLogic']),
@@ -28,7 +64,7 @@ export const insightSelectorLogic = kea<insightSelectorLogicType>([
     selectors({
         insightTiles: [
             (_, p) => [p.tiles],
-            (tiles): DashboardTile<InsightModel>[] =>
+            (tiles: DashboardTile<InsightModel>[]): DashboardTile<InsightModel>[] =>
                 ((tiles || []) as DashboardTile<InsightModel>[])
                     .filter(
                         (tile): tile is DashboardTile<InsightModel> =>
@@ -42,7 +78,7 @@ export const insightSelectorLogic = kea<insightSelectorLogicType>([
         ],
         filteredTiles: [
             (s) => [s.insightTiles, s.searchTerm],
-            (insightTiles, searchTerm): DashboardTile<InsightModel>[] => {
+            (insightTiles: DashboardTile<InsightModel>[], searchTerm: string): DashboardTile<InsightModel>[] => {
                 if (!searchTerm.trim()) {
                     return insightTiles
                 }
@@ -53,6 +89,9 @@ export const insightSelectorLogic = kea<insightSelectorLogicType>([
                 })
             },
         ],
-        showSearch: [(s) => [s.insightTiles], (insightTiles) => insightTiles.length > 10],
+        showSearch: [
+            (s) => [s.insightTiles],
+            (insightTiles: DashboardTile<InsightModel>[]) => insightTiles.length > 10,
+        ],
     }),
 ])
diff --git a/products/subscriptions/frontend/components/Subscriptions/subscriptionCountLogic.ts b/products/subscriptions/frontend/components/Subscriptions/subscriptionCountLogic.ts
index bcf372454a49..87eeae7b6045 100644
--- a/products/subscriptions/frontend/components/Subscriptions/subscriptionCountLogic.ts
+++ b/products/subscriptions/frontend/components/Subscriptions/subscriptionCountLogic.ts
@@ -1,11 +1,36 @@
-import { afterMount, kea, path } from 'kea'
+import { MakeLogicType, afterMount, kea, path } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { getCurrentTeamId } from 'lib/utils/getAppContext'
 
 import { subscriptionsList } from 'products/subscriptions/frontend/generated/api'
 
-import type { subscriptionCountLogicType } from './subscriptionCountLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface subscriptionCountLogicValues {
+    subscriptionCount: number | null
+    subscriptionCountLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface subscriptionCountLogicActions {
+    loadSubscriptionCount: () => any
+    loadSubscriptionCountFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSubscriptionCountSuccess: (
+        subscriptionCount: number,
+        payload?: any
+    ) => {
+        subscriptionCount: number
+        payload?: any
+    }
+}
+
+export type subscriptionCountLogicType = MakeLogicType<subscriptionCountLogicValues, subscriptionCountLogicActions>
 
 export const subscriptionCountLogic = kea<subscriptionCountLogicType>([
     path(['lib', 'components', 'Subscriptions', 'subscriptionCountLogic']),
diff --git a/products/subscriptions/frontend/components/Subscriptions/subscriptionLogic.ts b/products/subscriptions/frontend/components/Subscriptions/subscriptionLogic.ts
index e8187d1f059c..b5b43c39d769 100644
--- a/products/subscriptions/frontend/components/Subscriptions/subscriptionLogic.ts
+++ b/products/subscriptions/frontend/components/Subscriptions/subscriptionLogic.ts
@@ -1,5 +1,6 @@
-import { actions, events, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, events, kea, key, listeners, path, props, reducers } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { beforeUnload, router, urlToAction } from 'kea-router'
 import posthog from 'posthog-js'
@@ -15,7 +16,8 @@ import { ExportedAssetType, ExporterFormat, SubscriptionResourceTypes, Subscript
 
 import type { AIWindowConfigApi } from 'products/subscriptions/frontend/generated/api.schemas'
 
-import type { subscriptionLogicType } from './subscriptionLogicType'
+import type { SubscriptionResourceType, UserBasicType, WeekdayType } from '../../../../../frontend/src/types'
+import type { AIPromptConfigApi } from '../../generated/api.schemas'
 import { subscriptionsLogic } from './subscriptionsLogic'
 import { AI_PROMPT_MAX_LENGTH, SubscriptionBaseProps, urlForSubscription } from './utils'
 
@@ -127,6 +129,204 @@ const NEW_SUBSCRIPTION: Partial<SubscriptionType> = {
 export interface SubscriptionLogicProps extends SubscriptionBaseProps {
     id: number | 'new'
 }
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface subscriptionLogicValues {
+    isSubscriptionSubmitting: boolean
+    isSubscriptionValid: boolean
+    previewAsset: ExportedAssetType | null
+    previewError: string | null
+    previewImageUrl: string | null
+    previewLoading: boolean
+    showSubscriptionErrors: boolean
+    subscription: SubscriptionType
+    subscriptionAllErrors: Record<string, any>
+    subscriptionChanged: boolean
+    subscriptionErrors: DeepPartialMap<SubscriptionType, ValidationErrorType>
+    subscriptionHasErrors: boolean
+    subscriptionLoading: boolean
+    subscriptionManualErrors: Record<string, any>
+    subscriptionTouched: boolean
+    subscriptionTouches: Record<string, boolean>
+    subscriptionValidationErrors: DeepPartialMap<SubscriptionType, ValidationErrorType>
+    summaryQuota: {
+        active_count: number
+        at_limit: boolean
+        limit: number | null
+    } | null
+    summaryQuotaLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface subscriptionLogicActions {
+    generatePreview: () => {
+        value: true
+    }
+    loadSubscription: () => any
+    loadSubscriptionFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSubscriptionSuccess: (
+        subscription: {
+            ai_prompt_config?: AIPromptConfigApi | null | undefined
+            bysetpos?: number | null | undefined
+            byweekday?: WeekdayType[] | null | undefined
+            created_at?: string | undefined
+            created_by?: UserBasicType | null | undefined
+            dashboard?: number | undefined
+            dashboard_export_insights?: number[] | undefined
+            deleted?: boolean | undefined
+            enabled?: boolean | undefined
+            frequency?: 'daily' | 'monthly' | 'weekly' | 'yearly' | undefined
+            id?: number | undefined
+            insight?: number | undefined
+            insight_short_id?: string | null | undefined
+            integration_id?: number | null | undefined
+            interval?: number | undefined
+            next_delivery_date?: string | null | undefined
+            prompt?: string | null | undefined
+            resource_name?: string | null | undefined
+            resource_type?: SubscriptionResourceType | undefined
+            send_test_now?: boolean | undefined
+            start_date?: string | undefined
+            summary?: string | undefined
+            summary_enabled?: boolean | undefined
+            summary_prompt_guide?: string | undefined
+            target_type?: string | undefined
+            target_value?: string | undefined
+            title?: string | undefined
+            until_date?: string | undefined
+        },
+        payload?: any
+    ) => {
+        subscription: {
+            ai_prompt_config?: AIPromptConfigApi | null | undefined
+            bysetpos?: number | null | undefined
+            byweekday?: WeekdayType[] | null | undefined
+            created_at?: string | undefined
+            created_by?: UserBasicType | null | undefined
+            dashboard?: number | undefined
+            dashboard_export_insights?: number[] | undefined
+            deleted?: boolean | undefined
+            enabled?: boolean | undefined
+            frequency?: 'daily' | 'monthly' | 'weekly' | 'yearly' | undefined
+            id?: number | undefined
+            insight?: number | undefined
+            insight_short_id?: string | null | undefined
+            integration_id?: number | null | undefined
+            interval?: number | undefined
+            next_delivery_date?: string | null | undefined
+            prompt?: string | null | undefined
+            resource_name?: string | null | undefined
+            resource_type?: SubscriptionResourceType | undefined
+            send_test_now?: boolean | undefined
+            start_date?: string | undefined
+            summary?: string | undefined
+            summary_enabled?: boolean | undefined
+            summary_prompt_guide?: string | undefined
+            target_type?: string | undefined
+            target_value?: string | undefined
+            title?: string | undefined
+            until_date?: string | undefined
+        }
+        payload?: any
+    }
+    loadSummaryQuota: () => any
+    loadSummaryQuotaFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSummaryQuotaSuccess: (
+        summaryQuota: {
+            active_count: number
+            at_limit: boolean
+            limit: number | null
+        },
+        payload?: any
+    ) => {
+        summaryQuota: {
+            active_count: number
+            at_limit: boolean
+            limit: number | null
+        }
+        payload?: any
+    }
+    resetSubscription: (values?: SubscriptionType) => {
+        values?: SubscriptionType
+    }
+    selectAiExamplePrompt: (
+        prompt: string,
+        label: string,
+        window?: AIWindowConfigApi
+    ) => {
+        label: string
+        prompt: string
+        window: AIWindowConfigApi | undefined
+    }
+    setPreviewAsset: (asset: ExportedAssetType | null) => {
+        asset: ExportedAssetType | null
+    }
+    setPreviewError: (error: string | null) => {
+        error: string | null
+    }
+    setPreviewImageUrl: (url: string | null) => {
+        url: string | null
+    }
+    setPreviewLoading: (loading: boolean) => {
+        loading: boolean
+    }
+    setSubscriptionManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setSubscriptionValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setSubscriptionValues: (values: DeepPartial<SubscriptionType>) => {
+        values: DeepPartial<SubscriptionType>
+    }
+    submitSubscription: () => {
+        value: boolean
+    }
+    submitSubscriptionFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitSubscriptionRequest: (subscription: SubscriptionType) => {
+        subscription: SubscriptionType
+    }
+    submitSubscriptionSuccess: (subscription: SubscriptionType) => {
+        subscription: SubscriptionType
+    }
+    touchSubscriptionField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface subscriptionLogicMeta {
+    key: string
+}
+
+export type subscriptionLogicType = MakeLogicType<
+    subscriptionLogicValues,
+    subscriptionLogicActions,
+    SubscriptionLogicProps,
+    subscriptionLogicMeta
+>
+
 export const subscriptionLogic = kea<subscriptionLogicType>([
     path(['lib', 'components', 'Subscriptions', 'subscriptionLogic']),
     props({} as SubscriptionLogicProps),
diff --git a/products/subscriptions/frontend/components/Subscriptions/subscriptionsLogic.ts b/products/subscriptions/frontend/components/Subscriptions/subscriptionsLogic.ts
index 58afb7d8cbb5..690d215ad446 100644
--- a/products/subscriptions/frontend/components/Subscriptions/subscriptionsLogic.ts
+++ b/products/subscriptions/frontend/components/Subscriptions/subscriptionsLogic.ts
@@ -1,4 +1,16 @@
-import { BreakPointFunction, actions, afterMount, connect, kea, key, listeners, path, props, reducers } from 'kea'
+import {
+    MakeLogicType,
+    BreakPointFunction,
+    actions,
+    afterMount,
+    connect,
+    kea,
+    key,
+    listeners,
+    path,
+    props,
+    reducers,
+} from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -9,11 +21,113 @@ import { getInsightId } from 'scenes/insights/utils'
 
 import { SubscriptionResourceTypes, SubscriptionType } from '~/types'
 
+import type { FeatureFlagsSet } from '../../../../../frontend/src/lib/logic/featureFlagLogic'
 import { runSubscriptionTestDelivery } from './runSubscriptionTestDelivery'
-import type { subscriptionsLogicType } from './subscriptionsLogicType'
 import { toggleSubscriptionEnabled } from './toggleSubscriptionEnabled'
 import { SubscriptionsLogicProps } from './utils'
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface subscriptionsLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    aiSubscriptions: SubscriptionType[]
+    aiSubscriptionsLoading: boolean
+    deliveringSubscriptionId: number | null
+    insightSubscriptions: SubscriptionType[]
+    insightSubscriptionsLoading: boolean
+    subscriptions: SubscriptionType[]
+    subscriptionsLoading: boolean
+    togglingEnabledId: number | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface subscriptionsLogicActions {
+    deleteSubscription: (id: number) => {
+        id: number
+    }
+    deliverSubscription: (id: number) => {
+        id: number
+    }
+    deliverSubscriptionFailure: () => {
+        value: true
+    }
+    deliverSubscriptionSuccess: () => {
+        value: true
+    }
+    loadAiSubscriptions: (_?: any) => any
+    loadAiSubscriptionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAiSubscriptionsSuccess: (
+        aiSubscriptions: SubscriptionType[],
+        payload?: any
+    ) => {
+        aiSubscriptions: SubscriptionType[]
+        payload?: any
+    }
+    loadAllSubscriptions: () => {
+        value: true
+    }
+    loadInsightSubscriptions: (_?: any) => any
+    loadInsightSubscriptionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadInsightSubscriptionsSuccess: (
+        insightSubscriptions: SubscriptionType[],
+        payload?: any
+    ) => {
+        insightSubscriptions: SubscriptionType[]
+        payload?: any
+    }
+    loadSubscriptions: (_?: any) => any
+    loadSubscriptionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSubscriptionsSuccess: (
+        subscriptions: SubscriptionType[],
+        payload?: any
+    ) => {
+        subscriptions: SubscriptionType[]
+        payload?: any
+    }
+    setSubscriptionEnabled: (
+        id: number,
+        enabled: boolean
+    ) => {
+        enabled: boolean
+        id: number
+    }
+    setSubscriptionEnabledFailure: () => {
+        value: true
+    }
+    setSubscriptionEnabledSuccess: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface subscriptionsLogicMeta {
+    key: string
+}
+
+export type subscriptionsLogicType = MakeLogicType<
+    subscriptionsLogicValues,
+    subscriptionsLogicActions,
+    SubscriptionsLogicProps,
+    subscriptionsLogicMeta
+>
+
 export const subscriptionsLogic = kea<subscriptionsLogicType>([
     path(['lib', 'components', 'Subscriptions', 'subscriptionsLogic']),
     props({} as SubscriptionsLogicProps),
diff --git a/products/subscriptions/frontend/scenes/subscriptionSceneLogic.tsx b/products/subscriptions/frontend/scenes/subscriptionSceneLogic.tsx
index b348ae023902..ccd488bc0cf7 100644
--- a/products/subscriptions/frontend/scenes/subscriptionSceneLogic.tsx
+++ b/products/subscriptions/frontend/scenes/subscriptionSceneLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router, urlToAction } from 'kea-router'
 import posthog from 'posthog-js'
@@ -25,7 +25,6 @@ import type {
 
 import { runSubscriptionTestDelivery } from '../components/Subscriptions/runSubscriptionTestDelivery'
 import { subscriptionName } from './components/SubscriptionsTable'
-import type { subscriptionSceneLogicType } from './subscriptionSceneLogicType'
 
 export type SubscriptionSceneLogicProps = {
     id: string
@@ -49,6 +48,113 @@ function parseCursorFromPaginationUrl(url: string | null | undefined): string |
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface subscriptionSceneLogicValues {
+    breadcrumbs: Breadcrumb[]
+    deliveriesPage: PaginatedSubscriptionDeliveryListApi | null
+    deliveriesPageLoading: boolean
+    deliveringSubscriptionId: number | null
+    deliveryFeedback: Record<string, DeliveryFeedback>
+    deliveryStatusFilter: SubscriptionsDeliveriesListStatus | null
+    recentlyThankedDeliveries: Record<string, true>
+    subscription: SubscriptionApi | null
+    subscriptionLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface subscriptionSceneLogicActions {
+    deliverSubscription: (id: number) => {
+        id: number
+    }
+    deliverSubscriptionFailure: () => {
+        value: true
+    }
+    deliverSubscriptionSuccess: () => {
+        value: true
+    }
+    expireDeliveryThanks: (deliveryId: string) => {
+        deliveryId: string
+    }
+    loadDeliveriesPage: (targetUrl: string | null) => string | null
+    loadDeliveriesPageFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadDeliveriesPageSuccess: (
+        deliveriesPage: PaginatedSubscriptionDeliveryListApi | null,
+        payload?: string | null
+    ) => {
+        deliveriesPage: PaginatedSubscriptionDeliveryListApi | null
+        payload?: string | null
+    }
+    loadSubscription: () => any
+    loadSubscriptionFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSubscriptionSuccess: (
+        subscription: SubscriptionApi | null,
+        payload?: any
+    ) => {
+        subscription: SubscriptionApi | null
+        payload?: any
+    }
+    setDeliveryStatusFilter: (status: SubscriptionsDeliveriesListStatus | null) => {
+        status: SubscriptionsDeliveriesListStatus | null
+    }
+    setEnabled: ({ enabled }: { enabled: boolean }) => {
+        enabled: boolean
+    }
+    setEnabledFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    setEnabledSuccess: (
+        subscription: SubscriptionApi | null,
+        payload?: {
+            enabled: boolean
+        }
+    ) => {
+        subscription: SubscriptionApi | null
+        payload?: {
+            enabled: boolean
+        }
+    }
+    submitDeliveryFeedback: (
+        deliveryId: string,
+        feedback: DeliveryFeedback,
+        source: DeliveryFeedbackSource
+    ) => {
+        deliveryId: string
+        feedback: DeliveryFeedback
+        source: DeliveryFeedbackSource
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface subscriptionSceneLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        breadcrumbs: (subscription: SubscriptionApi | null) => Breadcrumb[]
+    }
+}
+
+export type subscriptionSceneLogicType = MakeLogicType<
+    subscriptionSceneLogicValues,
+    subscriptionSceneLogicActions,
+    SubscriptionSceneLogicProps,
+    subscriptionSceneLogicMeta
+>
+
 export const subscriptionSceneLogic = kea<subscriptionSceneLogicType>([
     props({} as SubscriptionSceneLogicProps),
     key(({ id }) => id),
@@ -150,7 +256,7 @@ export const subscriptionSceneLogic = kea<subscriptionSceneLogicType>([
     selectors({
         breadcrumbs: [
             (s) => [s.subscription],
-            (subscription): Breadcrumb[] => {
+            (subscription: SubscriptionApi | null): Breadcrumb[] => {
                 const listCrumb: Breadcrumb = {
                     key: Scene.Subscriptions,
                     name: sceneConfigurations[Scene.Subscriptions].name,
diff --git a/products/subscriptions/frontend/scenes/subscriptionsSceneLogic.tsx b/products/subscriptions/frontend/scenes/subscriptionsSceneLogic.tsx
index 8ae9b65ade0e..4c179627fb38 100644
--- a/products/subscriptions/frontend/scenes/subscriptionsSceneLogic.tsx
+++ b/products/subscriptions/frontend/scenes/subscriptionsSceneLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router, urlToAction } from 'kea-router'
 
@@ -21,9 +21,10 @@ import {
     type SubscriptionsListTargetType,
 } from 'products/subscriptions/frontend/generated/api.schemas'
 
+import type { UserType } from '../../../../frontend/src/types'
 import { runSubscriptionTestDelivery } from '../components/Subscriptions/runSubscriptionTestDelivery'
 import { toggleSubscriptionEnabled } from '../components/Subscriptions/toggleSubscriptionEnabled'
-import type { subscriptionsSceneLogicType } from './subscriptionsSceneLogicType'
+import type { SubscriptionApi } from '../generated/api.schemas'
 
 const PAGE_SIZE = 20
 
@@ -190,6 +191,134 @@ function buildSubscriptionsListOrdering(sorting: Sorting | null): string {
     return `${dir}${field}`
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface subscriptionsSceneLogicValues {
+    user: UserType | null // userLogic
+    breadcrumbs: Breadcrumb[]
+    createdByUuid: string | null
+    currentTab: SubscriptionsTab
+    deliveringSubscriptionId: number | null
+    page: number
+    pagination: {
+        controlled: true
+        currentPage: number
+        entryCount: number
+        onBackward: () => void
+        onForward: () => void
+        pageSize: number
+    }
+    search: string
+    subscriptionModalId: number | 'new' | null
+    subscriptions: SubscriptionApi[]
+    subscriptionsListAwaitingDebouncedFetch: boolean
+    subscriptionsLoading: boolean
+    subscriptionsResponse: PaginatedSubscriptionListApi | null
+    subscriptionsResponseLoading: boolean
+    subscriptionsSorting: Sorting | null
+    targetTypeFilter: SubscriptionsListTargetType | null
+    togglingEnabledId: number | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface subscriptionsSceneLogicActions {
+    applySubscriptionsQueryFromUrl: (query: SubscriptionsQueryFromUrl) => {
+        query: SubscriptionsQueryFromUrl
+    }
+    deleteSubscriptionSuccess: () => {
+        value: true
+    }
+    deliverSubscription: (id: number) => {
+        id: number
+    }
+    deliverSubscriptionFailure: () => {
+        value: true
+    }
+    deliverSubscriptionSuccess: () => {
+        value: true
+    }
+    loadSubscriptions: () => {
+        value: true
+    }
+    loadSubscriptionsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSubscriptionsSuccess: (
+        subscriptionsResponse: PaginatedSubscriptionListApi,
+        payload?: {
+            value: true
+        }
+    ) => {
+        subscriptionsResponse: PaginatedSubscriptionListApi
+        payload?: {
+            value: true
+        }
+    }
+    setCreatedByFilter: (uuid: string | null) => {
+        uuid: string | null
+    }
+    setCurrentTab: (tab: SubscriptionsTab) => {
+        tab: SubscriptionsTab
+    }
+    setPage: (page: number) => {
+        page: number
+    }
+    setSearch: (search: string) => {
+        search: string
+    }
+    setSubscriptionEnabled: (
+        id: number,
+        enabled: boolean
+    ) => {
+        enabled: boolean
+        id: number
+    }
+    setSubscriptionEnabledFailure: () => {
+        value: true
+    }
+    setSubscriptionEnabledSuccess: () => {
+        value: true
+    }
+    setSubscriptionModalId: (id: number | 'new' | null) => {
+        id: number | 'new' | null
+    }
+    setSubscriptionsSorting: (sorting: Sorting | null) => {
+        sorting: Sorting | null
+    }
+    setTargetTypeFilter: (targetType: SubscriptionsListTargetType | null) => {
+        targetType: SubscriptionsListTargetType | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface subscriptionsSceneLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        subscriptions: (subscriptionsResponse: PaginatedSubscriptionListApi | null) => SubscriptionApi[]
+        subscriptionsLoading: (subscriptionsResponseLoading: boolean) => boolean
+        pagination: (
+            page: number,
+            subscriptionsResponse: PaginatedSubscriptionListApi | null
+        ) => {
+            controlled: true
+            currentPage: number
+            entryCount: number
+            onBackward: () => void
+            onForward: () => void
+            pageSize: number
+        }
+    }
+}
+
+export type subscriptionsSceneLogicType = MakeLogicType<
+    subscriptionsSceneLogicValues,
+    subscriptionsSceneLogicActions,
+    Record<string, any>,
+    subscriptionsSceneLogicMeta
+>
+
 export const subscriptionsSceneLogic = kea<subscriptionsSceneLogicType>([
     path(['scenes', 'subscriptions', 'subscriptionsSceneLogic']),
     connect(() => ({ values: [userLogic, ['user']] })),
diff --git a/products/tasks/frontend/logics/slackTaskContextSceneLogic.ts b/products/tasks/frontend/logics/slackTaskContextSceneLogic.ts
index ea0500fef243..34313726b714 100644
--- a/products/tasks/frontend/logics/slackTaskContextSceneLogic.ts
+++ b/products/tasks/frontend/logics/slackTaskContextSceneLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { teamLogic } from 'scenes/teamLogic'
@@ -6,13 +6,80 @@ import { teamLogic } from 'scenes/teamLogic'
 import { tasksSlackThreadContextRetrieve } from 'products/tasks/frontend/generated/api'
 import { SlackThreadContextResponseApi } from 'products/tasks/frontend/generated/api.schemas'
 
-import type { slackTaskContextSceneLogicType } from './slackTaskContextSceneLogicType'
-
 export type SlackTaskContextSubmissionError = {
     status: number | null
     detail: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface slackTaskContextSceneLogicValues {
+    canSubmit: boolean
+    result: SlackThreadContextResponseApi | null
+    resultLoading: boolean
+    submissionError: SlackTaskContextSubmissionError | null
+    url: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface slackTaskContextSceneLogicActions {
+    clearResult: () => {
+        value: true
+    }
+    clearResultFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    clearResultSuccess: (
+        result: null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        result: null
+        payload?: {
+            value: true
+        }
+    }
+    loadResult: () => any
+    loadResultFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadResultSuccess: (
+        result: SlackThreadContextResponseApi | null,
+        payload?: any
+    ) => {
+        result: SlackThreadContextResponseApi | null
+        payload?: any
+    }
+    setSubmissionError: (error: SlackTaskContextSubmissionError | null) => {
+        error: SlackTaskContextSubmissionError | null
+    }
+    setUrl: (url: string) => {
+        url: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface slackTaskContextSceneLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        canSubmit: (url: string, resultLoading: boolean) => boolean
+    }
+}
+
+export type slackTaskContextSceneLogicType = MakeLogicType<
+    slackTaskContextSceneLogicValues,
+    slackTaskContextSceneLogicActions,
+    Record<string, any>,
+    slackTaskContextSceneLogicMeta
+>
+
 export const slackTaskContextSceneLogic = kea<slackTaskContextSceneLogicType>([
     path(['products', 'tasks', 'frontend', 'logics', 'slackTaskContextSceneLogic']),
 
@@ -77,6 +144,9 @@ export const slackTaskContextSceneLogic = kea<slackTaskContextSceneLogicType>([
     })),
 
     selectors({
-        canSubmit: [(s) => [s.url, s.resultLoading], (url, loading): boolean => url.trim().length > 0 && !loading],
+        canSubmit: [
+            (s) => [s.url, s.resultLoading],
+            (url: string, loading: boolean): boolean => url.trim().length > 0 && !loading,
+        ],
     }),
 ])
diff --git a/products/tracing/frontend/components/FacetRail/facetCountsLogic.ts b/products/tracing/frontend/components/FacetRail/facetCountsLogic.ts
index e938fd73431c..7c9aac36ec63 100644
--- a/products/tracing/frontend/components/FacetRail/facetCountsLogic.ts
+++ b/products/tracing/frontend/components/FacetRail/facetCountsLogic.ts
@@ -1,4 +1,4 @@
-import { connect, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, connect, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { subscriptions } from 'kea-subscriptions'
 
@@ -21,7 +21,6 @@ import {
     SpanPropertyTypeEnumApi,
     TracingSpansAttributesRetrieveAttributeType,
 } from '../../generated/api.schemas'
-import type { facetCountsLogicType } from './facetCountsLogicType'
 import { FACETS, FacetConfig, innerFilters } from './facets'
 
 export interface FacetCountsLogicProps {
@@ -35,6 +34,60 @@ export interface BreakdownScope {
     queryFilterGroup: UniversalFiltersGroup
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface facetCountsLogicValues {
+    currentTeamId: number | null; // teamLogic
+    queryFilterGroup: UniversalFiltersGroup; // tracingFiltersLogic
+    serviceNames: string[]; // tracingFiltersLogic
+    utcDateRange: {
+        date_from: string | null | undefined;
+        date_to: string | null | undefined;
+    }; // tracingFiltersLogic
+    breakdownScope: BreakdownScope;
+    facetValues: Record<string, _TracingAttributeBreakdownRowApi[]>;
+    facetValuesLoading: boolean;
+    presenceLoaded: boolean;
+    presentResourceKeys: string[];
+    presentResourceKeysLoading: boolean;
+    visibleFacets: FacetConfig[];
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface facetCountsLogicActions {
+    loadFacetValues: (facetKeys: string[] | null) => string[] | null;
+    loadFacetValuesFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadFacetValuesSuccess: (facetValues: Record<string, _TracingAttributeBreakdownRowApi[]>, payload?: string[] | null) => {
+        facetValues: Record<string, _TracingAttributeBreakdownRowApi[]>;
+        payload?: string[] | null;
+    };
+    loadPresentResourceKeys: () => any;
+    loadPresentResourceKeysFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadPresentResourceKeysSuccess: (presentResourceKeys: string[], payload?: any) => {
+        presentResourceKeys: string[];
+        payload?: any;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface facetCountsLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        visibleFacets: (presentResourceKeys: string[]) => FacetConfig[];
+        breakdownScope: (utcDateRange: {
+            date_from: string | null | undefined;
+            date_to: string | null | undefined;
+        }, serviceNames: string[], queryFilterGroup: UniversalFiltersGroup) => BreakdownScope;
+    };
+}
+
+export type facetCountsLogicType = MakeLogicType<facetCountsLogicValues, facetCountsLogicActions, FacetCountsLogicProps, facetCountsLogicMeta>;
+
 /**
  * Per-facet values + counts, cross-filtered server-side: each facet's results reflect every active
  * filter except its own selection (excludeBreakdownFilter drops the facet's own column, serviceNames,
@@ -157,7 +210,7 @@ export const facetCountsLogic = kea<facetCountsLogicType>([
         // Column facets always render; resource-attribute facets only when the tenant emits the key.
         visibleFacets: [
             (s) => [s.presentResourceKeys],
-            (presentResourceKeys): FacetConfig[] =>
+            (presentResourceKeys: string[]): FacetConfig[] =>
                 FACETS.filter((f) => f.source.type === 'column' || presentResourceKeys.includes(f.source.key)),
         ],
         // The subset of filter state the breakdown queries actually depend on, built from the stable
@@ -166,7 +219,14 @@ export const facetCountsLogic = kea<facetCountsLogicType>([
         // Subscribing to this keeps a view-mode or sort toggle from refetching every facet.
         breakdownScope: [
             (s) => [s.utcDateRange, s.serviceNames, s.queryFilterGroup],
-            (utcDateRange, serviceNames, queryFilterGroup): BreakdownScope => ({
+            (
+                utcDateRange: {
+                    date_from: string | null | undefined
+                    date_to: string | null | undefined
+                },
+                serviceNames: string[],
+                queryFilterGroup: UniversalFiltersGroup
+            ): BreakdownScope => ({
                 utcDateRange,
                 serviceNames,
                 queryFilterGroup,
diff --git a/products/tracing/frontend/components/FacetRail/facetRailLogic.ts b/products/tracing/frontend/components/FacetRail/facetRailLogic.ts
index 6ceca144b8ce..b3317cf6d28c 100644
--- a/products/tracing/frontend/components/FacetRail/facetRailLogic.ts
+++ b/products/tracing/frontend/components/FacetRail/facetRailLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers } from 'kea'
 
 import {
     TRACING_SCENE_VIEWER_ID,
@@ -6,7 +6,7 @@ import {
     TracingFiltersLogicProps,
 } from 'products/tracing/frontend/tracingFiltersLogic'
 
-import type { facetRailLogicType } from './facetRailLogicType'
+import type { UniversalFiltersGroup } from '../../../../../frontend/src/types'
 import { FacetSource, toggleFacetFilter } from './facets'
 
 export interface FacetRailLogicProps {
@@ -18,6 +18,39 @@ function toggleMembership(values: readonly string[] | undefined | null, value: s
     return current.includes(value) ? current.filter((v) => v !== value) : [...current, value]
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface facetRailLogicValues {
+    collapsedFacets: string[];
+    facetNameSearch: string;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface facetRailLogicActions {
+    setFilterGroup: (filterGroup: UniversalFiltersGroup) => {
+        filterGroup: UniversalFiltersGroup;
+    }; // tracingFiltersLogic
+    setServiceNames: (serviceNames: string[]) => {
+        serviceNames: string[];
+    }; // tracingFiltersLogic
+    setFacetNameSearch: (search: string) => {
+        search: string;
+    };
+    toggleFacetCollapsed: (facetKey: string) => {
+        facetKey: string;
+    };
+    toggleFacetValue: (source: FacetSource, value: string) => {
+        source: FacetSource;
+        value: string;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface facetRailLogicMeta {
+    key: string;
+}
+
+export type facetRailLogicType = MakeLogicType<facetRailLogicValues, facetRailLogicActions, FacetRailLogicProps, facetRailLogicMeta>;
+
 // The rail is a lens over the existing filter model — facet toggles write straight back to
 // tracingFiltersLogic's reducers, so URL sync, saved views, and the filter chips stay in step.
 export const facetRailLogic = kea<facetRailLogicType>([
diff --git a/products/tracing/frontend/components/SetupPrompt/tracingIngestionLogic.tsx b/products/tracing/frontend/components/SetupPrompt/tracingIngestionLogic.tsx
index 55c54d002f06..370f31e07c76 100644
--- a/products/tracing/frontend/components/SetupPrompt/tracingIngestionLogic.tsx
+++ b/products/tracing/frontend/components/SetupPrompt/tracingIngestionLogic.tsx
@@ -1,13 +1,53 @@
-import { afterMount, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, afterMount, kea, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
 import { retryWithBackoff } from 'lib/utils/async'
 
-import type { tracingIngestionLogicType } from './tracingIngestionLogicType'
-
 const teamId = window.POSTHOG_APP_CONTEXT?.current_team?.id
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tracingIngestionLogicValues {
+    cachedTeamHasSpans: boolean | null
+    hasSpans: boolean | undefined
+    teamHasSpans: boolean | undefined
+    teamHasSpansCheckFailed: boolean
+    teamHasSpansLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tracingIngestionLogicActions {
+    loadTeamHasSpans: () => any
+    loadTeamHasSpansFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadTeamHasSpansSuccess: (
+        teamHasSpans: boolean,
+        payload?: any
+    ) => {
+        teamHasSpans: boolean
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tracingIngestionLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        hasSpans: (teamHasSpans: boolean | undefined, cachedTeamHasSpans: boolean | null) => boolean | undefined
+    }
+}
+
+export type tracingIngestionLogicType = MakeLogicType<
+    tracingIngestionLogicValues,
+    tracingIngestionLogicActions,
+    Record<string, any>,
+    tracingIngestionLogicMeta
+>
+
 export const tracingIngestionLogic = kea<tracingIngestionLogicType>([
     path(['products', 'tracing', 'components', 'SetupPrompt', 'tracingIngestionLogic']),
     loaders({
@@ -41,7 +81,8 @@ export const tracingIngestionLogic = kea<tracingIngestionLogicType>([
     selectors({
         hasSpans: [
             (s) => [s.teamHasSpans, s.cachedTeamHasSpans],
-            (teamHasSpans, cachedTeamHasSpans): boolean | undefined => teamHasSpans ?? cachedTeamHasSpans ?? undefined,
+            (teamHasSpans: boolean | undefined, cachedTeamHasSpans: boolean | null): boolean | undefined =>
+                teamHasSpans ?? cachedTeamHasSpans ?? undefined,
         ],
     }),
 
diff --git a/products/tracing/frontend/savedViews/tracingViewsListLogic.ts b/products/tracing/frontend/savedViews/tracingViewsListLogic.ts
index 09b2fbcf3a84..9fd4af780199 100644
--- a/products/tracing/frontend/savedViews/tracingViewsListLogic.ts
+++ b/products/tracing/frontend/savedViews/tracingViewsListLogic.ts
@@ -1,8 +1,62 @@
-import { actions, connect, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers } from 'kea'
 
 import { TRACING_SCENE_VIEWER_ID, tracingFiltersLogic } from '../tracingFiltersLogic'
-import type { tracingViewsListLogicType } from './tracingViewsListLogicType'
+import type { TracingFilters } from '../tracingFiltersLogic'
 import { tracingViewsLogic } from './tracingViewsLogic'
+import type { SavedTracingFilters, TracingView } from './tracingViewsLogic'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tracingViewsListLogicValues {
+    filters: TracingFilters; // tracingFiltersLogic
+    isModalOpen: boolean;
+    isSaveModalOpen: boolean;
+    viewName: string;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tracingViewsListLogicActions {
+    createView: (args_0: {
+        filters: Partial<SavedTracingFilters>;
+        name: string;
+    }) => {
+        filters: Partial<SavedTracingFilters>;
+        name: string;
+    }; // tracingViewsLogic
+    createViewSuccess: (views: TracingView[], payload?: {
+        filters: Partial<SavedTracingFilters>;
+        name: string;
+    } | undefined) => {
+        payload?: {
+            filters: Partial<SavedTracingFilters>;
+            name: string;
+        };
+        views: TracingView[];
+    }; // tracingViewsLogic
+    loadView: (view: TracingView) => {
+        view: TracingView;
+    }; // tracingViewsLogic
+    loadViews: () => any; // tracingViewsLogic
+    closeModal: () => {
+        value: true;
+    };
+    closeSaveModal: () => {
+        value: true;
+    };
+    openModal: () => {
+        value: true;
+    };
+    openSaveModal: () => {
+        value: true;
+    };
+    saveView: () => {
+        value: true;
+    };
+    setViewName: (viewName: string) => {
+        viewName: string;
+    };
+}
+
+export type tracingViewsListLogicType = MakeLogicType<tracingViewsListLogicValues, tracingViewsListLogicActions>;
 
 export const tracingViewsListLogic = kea<tracingViewsListLogicType>([
     path(['products', 'tracing', 'frontend', 'savedViews', 'tracingViewsListLogic']),
diff --git a/products/tracing/frontend/savedViews/tracingViewsLogic.ts b/products/tracing/frontend/savedViews/tracingViewsLogic.ts
index cfe422a1e9ad..614232a719ab 100644
--- a/products/tracing/frontend/savedViews/tracingViewsLogic.ts
+++ b/products/tracing/frontend/savedViews/tracingViewsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -7,7 +7,6 @@ import api from 'lib/api'
 import { teamLogic } from 'scenes/teamLogic'
 
 import { TRACING_SCENE_VIEWER_ID, TracingFilters, tracingFiltersLogic } from '../tracingFiltersLogic'
-import type { tracingViewsLogicType } from './tracingViewsLogicType'
 
 // Subset of TracingFilters persisted in a saved view. Compare-mode and the dragged overlay windows
 // are ephemeral UI state tied to on-screen sparkline data, so they're intentionally excluded.
@@ -33,6 +32,58 @@ export interface TracingView {
 
 const tracingViewsUrl = (teamId: number | null): string => `api/projects/${teamId}/tracing/views`
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tracingViewsLogicValues {
+    currentTeamId: number | null; // teamLogic
+    views: TracingView[];
+    viewsLoading: boolean;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tracingViewsLogicActions {
+    setFilters: (filters: Partial<TracingFilters>) => {
+        filters: Partial<TracingFilters>;
+    }; // tracingFiltersLogic
+    createView: ({ name, filters }: {
+        filters: Partial<SavedTracingFilters>;
+        name: string;
+    }) => {
+        name: string;
+        filters: Partial<SavedTracingFilters>;
+    };
+    createViewFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    createViewSuccess: (views: TracingView[], payload?: {
+        name: string;
+        filters: Partial<SavedTracingFilters>;
+    }) => {
+        views: TracingView[];
+        payload?: {
+            name: string;
+            filters: Partial<SavedTracingFilters>;
+        };
+    };
+    deleteView: (shortId: string) => {
+        shortId: string;
+    };
+    loadView: (view: TracingView) => {
+        view: TracingView;
+    };
+    loadViews: () => any;
+    loadViewsFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadViewsSuccess: (views: TracingView[], payload?: any) => {
+        views: TracingView[];
+        payload?: any;
+    };
+}
+
+export type tracingViewsLogicType = MakeLogicType<tracingViewsLogicValues, tracingViewsLogicActions>;
+
 export const tracingViewsLogic = kea<tracingViewsLogicType>([
     path(['products', 'tracing', 'frontend', 'savedViews', 'tracingViewsLogic']),
 
diff --git a/products/tracing/frontend/tracingConfigLogic.ts b/products/tracing/frontend/tracingConfigLogic.ts
index a902ee93e814..208d3f76e151 100644
--- a/products/tracing/frontend/tracingConfigLogic.ts
+++ b/products/tracing/frontend/tracingConfigLogic.ts
@@ -1,6 +1,18 @@
-import { actions, kea, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers } from 'kea'
 
-import type { tracingConfigLogicType } from './tracingConfigLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tracingConfigLogicValues {
+    facetRailCollapsed: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tracingConfigLogicActions {
+    setFacetRailCollapsed: (facetRailCollapsed: boolean) => {
+        facetRailCollapsed: boolean
+    }
+}
+
+export type tracingConfigLogicType = MakeLogicType<tracingConfigLogicValues, tracingConfigLogicActions>
 
 /** Display-only preferences for the tracing scene — never affects the query. */
 export const tracingConfigLogic = kea<tracingConfigLogicType>([
diff --git a/products/tracing/frontend/tracingDataLogic.ts b/products/tracing/frontend/tracingDataLogic.ts
index 70346f0e7a1f..76921a16c43c 100644
--- a/products/tracing/frontend/tracingDataLogic.ts
+++ b/products/tracing/frontend/tracingDataLogic.ts
@@ -1,4 +1,17 @@
-import { actions, afterMount, connect, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    afterMount,
+    connect,
+    events,
+    kea,
+    key,
+    listeners,
+    path,
+    props,
+    reducers,
+    selectors,
+} from 'kea'
 import { loaders } from 'kea-loaders'
 import posthog from 'posthog-js'
 
@@ -12,6 +25,8 @@ import { humanFriendlyDetailedTime } from 'lib/utils/datetime'
 import { AggregatedSpanRow, SpanTreeNode } from '~/queries/schema/schema-general'
 import { PropertyGroupFilter } from '~/types'
 
+import type { DateRange } from '../../../frontend/src/queries/schema/schema-general'
+import type { UniversalFiltersGroup } from '../../../frontend/src/types'
 import {
     type DurationHistogramRow,
     pivotDurationHistogram,
@@ -20,13 +35,13 @@ import {
     visibleDurationRange,
 } from './durationBuckets'
 import { traceLookupDateRange } from './traceLinks'
-import type { tracingDataLogicType } from './tracingDataLogicType'
 import {
     type TracingFilters,
     type TracingOrderBy,
     TRACING_SCENE_VIEWER_ID,
     tracingFiltersLogic,
 } from './tracingFiltersLogic'
+import type { OverlayWindow, TimeComparison, TracingOrderDirection, TracingViewMode } from './tracingFiltersLogic'
 import type { Span } from './types'
 
 export interface SparklineRow {
@@ -93,6 +108,375 @@ export interface TracingDataLogicProps {
     autoLoad?: boolean
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tracingDataLogicValues {
+    compareActive: boolean; // tracingFiltersLogic
+    currentWindowMs: OverlayWindow; // tracingFiltersLogic
+    filters: TracingFilters; // tracingFiltersLogic
+    orderBy: TracingOrderBy; // tracingFiltersLogic
+    previousWindowMs: OverlayWindow; // tracingFiltersLogic
+    queryFilterGroup: UniversalFiltersGroup; // tracingFiltersLogic
+    sparklineWindowMs: OverlayWindow; // tracingFiltersLogic
+    timeComparison: TimeComparison | null; // tracingFiltersLogic
+    utcDateRange: {
+        date_from: string | null | undefined;
+        date_to: string | null | undefined;
+    }; // tracingFiltersLogic
+    aggregation: {
+        current: AggregatedSpanRow[];
+        previous: AggregatedSpanRow[] | null;
+    };
+    aggregationAbortController: AbortController | null;
+    aggregationLoading: boolean;
+    durationHistogramAbortController: AbortController | null;
+    durationHistogramData: TracingDurationHistogramData;
+    durationHistogramLoading: boolean;
+    hasMoreToLoad: boolean;
+    hasRunQuery: boolean;
+    isDurationMode: boolean;
+    lastAggregationWindow: {
+        currentEndMs: number;
+        currentStartMs: number;
+        previousEndMs: number;
+        previousStartMs: number;
+    } | null;
+    listRowDurations: number[];
+    listRows: Span[];
+    matchingCounts: {
+        count: number;
+        traceCount: number;
+    };
+    matchingCountsAbortController: AbortController | null;
+    matchingCountsLoading: boolean;
+    nextCursor: string | null;
+    rawDurationHistogram: DurationHistogramRow[];
+    rawDurationHistogramLoading: boolean;
+    rawSparklineData: SparklineRow[];
+    rawSparklineDataLoading: boolean;
+    spanTree: {
+        current: SpanTreeNode[];
+        previous: SpanTreeNode[] | null;
+        spanName: string | null;
+    };
+    spanTreeAbortController: AbortController | null;
+    spanTreeLoading: boolean;
+    spans: Span[];
+    spansAbortController: AbortController | null;
+    spansLoading: boolean;
+    sparklineAbortController: AbortController | null;
+    sparklineData: TracingSparklineData;
+    sparklineLoading: boolean;
+    totalMatchingFilters: number;
+    traceLoadContext: {
+        traceId: string;
+        ts?: string | null;
+    } | null;
+    traceSpans: Span[];
+    traceSpansHasMore: boolean;
+    traceSpansLoading: boolean;
+    traceSpansLoadingMore: boolean;
+    traceSpansNextOffset: number;
+    visibleRowDateRange: VisibleSpanTimeRange | null;
+    visibleRowDurationRange: VisibleDurationRange | null;
+    visibleRowRange: VisibleRowRange | null;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tracingDataLogicActions {
+    setComparison: (comparison: TimeComparison | null) => {
+        comparison: TimeComparison | null;
+    }; // tracingFiltersLogic
+    setDateRange: (dateRange: DateRange) => {
+        dateRange: DateRange;
+    }; // tracingFiltersLogic
+    setFilterGroup: (filterGroup: UniversalFiltersGroup) => {
+        filterGroup: UniversalFiltersGroup;
+    }; // tracingFiltersLogic
+    setFilters: (filters: Partial<TracingFilters>) => {
+        filters: Partial<TracingFilters>;
+    }; // tracingFiltersLogic
+    setServiceNames: (serviceNames: string[]) => {
+        serviceNames: string[];
+    }; // tracingFiltersLogic
+    setSort: (orderBy: TracingOrderBy, orderDirection: TracingOrderDirection) => {
+        orderBy: TracingOrderBy;
+        orderDirection: TracingOrderDirection;
+    }; // tracingFiltersLogic
+    setViewMode: (viewMode: TracingViewMode) => {
+        viewMode: TracingViewMode;
+    }; // tracingFiltersLogic
+    updateComparisonWindows: (current: OverlayWindow, previous: OverlayWindow) => {
+        current: OverlayWindow;
+        previous: OverlayWindow;
+    }; // tracingFiltersLogic
+    cancelInProgressAggregation: (controller: AbortController | null) => {
+        controller: AbortController | null;
+    };
+    cancelInProgressDurationHistogram: (controller: AbortController | null) => {
+        controller: AbortController | null;
+    };
+    cancelInProgressMatchingCounts: (controller: AbortController | null) => {
+        controller: AbortController | null;
+    };
+    cancelInProgressSpanTree: (controller: AbortController | null) => {
+        controller: AbortController | null;
+    };
+    cancelInProgressSpans: (controller: AbortController | null) => {
+        controller: AbortController | null;
+    };
+    cancelInProgressSparkline: (controller: AbortController | null) => {
+        controller: AbortController | null;
+    };
+    clearSpans: () => {
+        value: true;
+    };
+    clearSpansFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    clearSpansSuccess: (spans: never[], payload?: {
+        value: true;
+    }) => {
+        spans: never[];
+        payload?: {
+            value: true;
+        };
+    };
+    fetchAggregation: (options?: {
+        fullRange?: boolean;
+    } | null) => {
+        fullRange?: boolean;
+    } | null;
+    fetchAggregationFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    fetchAggregationSuccess: (aggregation: {
+        current: AggregatedSpanRow[];
+        previous: AggregatedSpanRow[] | null;
+    }, payload?: {
+        fullRange?: boolean;
+    } | null) => {
+        aggregation: {
+            current: AggregatedSpanRow[];
+            previous: AggregatedSpanRow[] | null;
+        };
+        payload?: {
+            fullRange?: boolean;
+        } | null;
+    };
+    fetchDurationHistogram: () => any;
+    fetchDurationHistogramFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    fetchDurationHistogramSuccess: (rawDurationHistogram: {
+        bucket_ns: number;
+        count: number;
+        service: string;
+    }[], payload?: any) => {
+        rawDurationHistogram: {
+            bucket_ns: number;
+            count: number;
+            service: string;
+        }[];
+        payload?: any;
+    };
+    fetchMatchingCounts: () => any;
+    fetchMatchingCountsFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    fetchMatchingCountsSuccess: (matchingCounts: {
+        count: number;
+        traceCount: number;
+    }, payload?: any) => {
+        matchingCounts: {
+            count: number;
+            traceCount: number;
+        };
+        payload?: any;
+    };
+    fetchNextPage: () => {
+        value: true;
+    };
+    fetchNextPageFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    fetchNextPageSuccess: (spans: Span[], payload?: {
+        value: true;
+    }) => {
+        spans: Span[];
+        payload?: {
+            value: true;
+        };
+    };
+    fetchSpanTree: (params: {
+        serviceName: string;
+        spanName: string;
+    }) => {
+        spanName: string;
+        serviceName: string;
+    };
+    fetchSpanTreeFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    fetchSpanTreeSuccess: (spanTree: {
+        current: SpanTreeNode[];
+        previous: SpanTreeNode[] | null;
+        spanName: string;
+    }, payload?: {
+        spanName: string;
+        serviceName: string;
+    }) => {
+        spanTree: {
+            current: SpanTreeNode[];
+            previous: SpanTreeNode[] | null;
+            spanName: string;
+        };
+        payload?: {
+            spanName: string;
+            serviceName: string;
+        };
+    };
+    fetchSpans: () => any;
+    fetchSpansFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    fetchSpansSuccess: (spans: Span[], payload?: any) => {
+        spans: Span[];
+        payload?: any;
+    };
+    fetchSparkline: () => any;
+    fetchSparklineFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    fetchSparklineSuccess: (rawSparklineData: {
+        count: number;
+        service: string;
+        time: string;
+    }[], payload?: any) => {
+        rawSparklineData: {
+            count: number;
+            service: string;
+            time: string;
+        }[];
+        payload?: any;
+    };
+    handleFilterChange: (filterType: string, extraProps?: Record<string, unknown>) => {
+        extraProps: Record<string, unknown> | undefined;
+        filterType: string;
+    };
+    loadMoreTraceSpans: () => {
+        value: true;
+    };
+    loadMoreTraceSpansFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadMoreTraceSpansSuccess: (traceSpans: Span[], payload?: {
+        value: true;
+    }) => {
+        traceSpans: Span[];
+        payload?: {
+            value: true;
+        };
+    };
+    loadTraceSpans: ({ traceId, ts }: {
+        traceId: string;
+        ts?: string | null;
+    }) => {
+        traceId: string;
+        ts?: string | null;
+    };
+    loadTraceSpansFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadTraceSpansSuccess: (traceSpans: Span[], payload?: {
+        traceId: string;
+        ts?: string | null;
+    }) => {
+        traceSpans: Span[];
+        payload?: {
+            traceId: string;
+            ts?: string | null;
+        };
+    };
+    runQuery: () => {
+        value: true;
+    };
+    setAggregationAbortController: (controller: AbortController | null) => {
+        controller: AbortController | null;
+    };
+    setDurationHistogramAbortController: (controller: AbortController | null) => {
+        controller: AbortController | null;
+    };
+    setHasMoreToLoad: (hasMore: boolean) => {
+        hasMore: boolean;
+    };
+    setLastAggregationWindow: (window: {
+        currentEndMs: number;
+        currentStartMs: number;
+        previousEndMs: number;
+        previousStartMs: number;
+    }) => {
+        window: {
+            currentEndMs: number;
+            currentStartMs: number;
+            previousEndMs: number;
+            previousStartMs: number;
+        };
+    };
+    setMatchingCountsAbortController: (controller: AbortController | null) => {
+        controller: AbortController | null;
+    };
+    setNextCursor: (cursor: string | null) => {
+        cursor: string | null;
+    };
+    setSpanTreeAbortController: (controller: AbortController | null) => {
+        controller: AbortController | null;
+    };
+    setSpansAbortController: (controller: AbortController | null) => {
+        controller: AbortController | null;
+    };
+    setSparklineAbortController: (controller: AbortController | null) => {
+        controller: AbortController | null;
+    };
+    setTracePagination: (hasMore: boolean, nextOffset: number | null) => {
+        hasMore: boolean;
+        nextOffset: number | null;
+    };
+    setVisibleRowRange: (startIndex: number, stopIndex: number) => {
+        startIndex: number;
+        stopIndex: number;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tracingDataLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        sparklineData: (rawSparklineData: SparklineRow[]) => TracingSparklineData;
+        totalMatchingFilters: (matchingCounts: {
+            count: number;
+            traceCount: number;
+        }, filters: TracingFilters) => number;
+        durationHistogramData: (rawDurationHistogram: DurationHistogramRow[]) => TracingDurationHistogramData;
+        listRows: (spans: Span[], filters: TracingFilters) => Span[];
+        listRowDurations: (listRows: Span[]) => number[];
+        isDurationMode: (filters: TracingFilters, compareActive: boolean) => boolean;
+        visibleRowDurationRange: (visibleRowRange: VisibleRowRange | null, listRowDurations: number[], isDurationMode: boolean) => VisibleDurationRange | null;
+        visibleRowDateRange: (visibleRowRange: VisibleRowRange | null, listRows: Span[], orderBy: TracingOrderBy) => VisibleSpanTimeRange | null;
+    };
+}
+
+export type tracingDataLogicType = MakeLogicType<tracingDataLogicValues, tracingDataLogicActions, TracingDataLogicProps, tracingDataLogicMeta>;
+
 export const tracingDataLogic = kea<tracingDataLogicType>([
     props({ id: TRACING_SCENE_VIEWER_ID, autoLoad: false } as TracingDataLogicProps),
     key((props) => props.id),
diff --git a/products/tracing/frontend/tracingFiltersLogic.ts b/products/tracing/frontend/tracingFiltersLogic.ts
index 020b2571d193..83e36a4d1eb5 100644
--- a/products/tracing/frontend/tracingFiltersLogic.ts
+++ b/products/tracing/frontend/tracingFiltersLogic.ts
@@ -1,5 +1,5 @@
 import { deepEqual as equal } from 'fast-equals'
-import { actions, afterMount, kea, key, path, props, propsChanged, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, key, path, props, propsChanged, reducers, selectors } from 'kea'
 
 import { DEFAULT_UNIVERSAL_GROUP_FILTER } from 'lib/components/UniversalFilters/universalFiltersLogic'
 import { dayjs } from 'lib/dayjs'
@@ -7,7 +7,6 @@ import { dayjs } from 'lib/dayjs'
 import { DateRange } from '~/queries/schema/schema-general'
 import { FilterLogicalOperator, UniversalFiltersGroup } from '~/types'
 
-import type { tracingFiltersLogicType } from './tracingFiltersLogicType'
 
 export const DEFAULT_DATE_RANGE: DateRange = { date_from: '-1h', date_to: null }
 export const DEFAULT_TIMEZONE: string = 'UTC'
@@ -146,6 +145,86 @@ export function combineWithPinnedFilters(
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tracingFiltersLogicValues {
+    compareActive: boolean;
+    comparison: TracingComparison | null;
+    currentWindowMs: OverlayWindow;
+    dateRange: DateRange;
+    filterGroup: UniversalFiltersGroup;
+    filters: TracingFilters;
+    orderBy: TracingOrderBy;
+    orderDirection: TracingOrderDirection;
+    pinnedFilters: UniversalFiltersGroup | undefined;
+    previousWindowMs: OverlayWindow;
+    queryFilterGroup: UniversalFiltersGroup;
+    serviceNames: string[];
+    sparklineWindowMs: OverlayWindow;
+    timeComparison: TimeComparison | null;
+    timezone: string;
+    utcDateRange: {
+        date_from: string | null | undefined;
+        date_to: string | null | undefined;
+    };
+    viewMode: TracingViewMode;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tracingFiltersLogicActions {
+    setComparison: (comparison: TracingComparison | null) => {
+        comparison: TimeComparison | null;
+    };
+    setDateRange: (dateRange: DateRange) => {
+        dateRange: DateRange;
+    };
+    setFilterGroup: (filterGroup: UniversalFiltersGroup) => {
+        filterGroup: UniversalFiltersGroup;
+    };
+    setFilters: (filters: Partial<TracingFilters>) => {
+        filters: Partial<TracingFilters>;
+    };
+    setPinnedFilters: (pinnedFilters: UniversalFiltersGroup | undefined) => {
+        pinnedFilters: UniversalFiltersGroup | undefined;
+    };
+    setServiceNames: (serviceNames: string[]) => {
+        serviceNames: string[];
+    };
+    setSort: (orderBy: TracingOrderBy, orderDirection: TracingOrderDirection) => {
+        orderBy: TracingOrderBy;
+        orderDirection: TracingOrderDirection;
+    };
+    setTimezone: (timezone: string) => {
+        timezone: string;
+    };
+    setViewMode: (viewMode: TracingViewMode) => {
+        viewMode: TracingViewMode;
+    };
+    updateComparisonWindows: (current: OverlayWindow, previous: OverlayWindow) => {
+        current: OverlayWindow;
+        previous: OverlayWindow;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tracingFiltersLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        filters: (dateRange: DateRange, serviceNames: string[], filterGroup: UniversalFiltersGroup, orderBy: TracingOrderBy, orderDirection: TracingOrderDirection, viewMode: TracingViewMode, comparison: TimeComparison | null) => TracingFilters;
+        compareActive: (comparison: TimeComparison | null) => boolean;
+        timeComparison: (comparison: TimeComparison | null) => TimeComparison | null;
+        queryFilterGroup: (filterGroup: UniversalFiltersGroup, pinnedFilters: UniversalFiltersGroup | undefined) => UniversalFiltersGroup;
+        utcDateRange: (dateRange: DateRange) => {
+            date_from: string | null | undefined;
+            date_to: string | null | undefined;
+        };
+        sparklineWindowMs: (dateRange: DateRange) => OverlayWindow;
+        currentWindowMs: (sparklineWindowMs: OverlayWindow, timeComparison: TimeComparison | null) => OverlayWindow;
+        previousWindowMs: (sparklineWindowMs: OverlayWindow, currentWindowMs: OverlayWindow, timeComparison: TimeComparison | null) => OverlayWindow;
+    };
+}
+
+export type tracingFiltersLogicType = MakeLogicType<tracingFiltersLogicValues, tracingFiltersLogicActions, TracingFiltersLogicProps, tracingFiltersLogicMeta>;
+
 export const tracingFiltersLogic = kea<tracingFiltersLogicType>([
     props({ id: TRACING_SCENE_VIEWER_ID } as TracingFiltersLogicProps),
     key((props) => props.id),
@@ -253,7 +332,7 @@ export const tracingFiltersLogic = kea<tracingFiltersLogicType>([
     selectors({
         filters: [
             (s) => [s.dateRange, s.serviceNames, s.filterGroup, s.orderBy, s.orderDirection, s.viewMode, s.comparison],
-            (dateRange, serviceNames, filterGroup, orderBy, orderDirection, viewMode, comparison): TracingFilters => ({
+            (dateRange: DateRange, serviceNames: string[], filterGroup: UniversalFiltersGroup, orderBy: TracingOrderBy, orderDirection: TracingOrderDirection, viewMode: TracingViewMode, comparison: TimeComparison | null): TracingFilters => ({
                 dateRange,
                 serviceNames,
                 filterGroup,
diff --git a/products/tracing/frontend/tracingOperationSceneLogic.ts b/products/tracing/frontend/tracingOperationSceneLogic.ts
index 3b3799d3791a..bb333beda7dd 100644
--- a/products/tracing/frontend/tracingOperationSceneLogic.ts
+++ b/products/tracing/frontend/tracingOperationSceneLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 
@@ -13,7 +13,6 @@ import { type DurationHistogramRow, pivotDurationHistogram, type TracingDuration
 import { type DurationRange, operationFilterGroup } from './operationFilters'
 import { traceLookupDateRange } from './traceLinks'
 import { DEFAULT_DATE_RANGE } from './tracingFiltersLogic'
-import type { tracingOperationSceneLogicType } from './tracingOperationSceneLogicType'
 import type { Span } from './types'
 
 export interface TracingOperationSceneLogicProps {
@@ -23,6 +22,138 @@ export interface TracingOperationSceneLogicProps {
 
 const SAMPLE_LIMIT = 100
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tracingOperationSceneLogicValues {
+    currentSample: Span | null
+    dateRange: DateRange
+    durationSelection: DurationRange | null
+    histogramData: TracingDurationHistogramData
+    operationStats: AggregatedSpanRow | null
+    operationStatsLoading: boolean
+    rawHistogram: DurationHistogramRow[]
+    rawHistogramLoading: boolean
+    sampleIndex: number
+    sampleTraceSpans: Span[]
+    sampleTraceSpansLoading: boolean
+    samples: Span[]
+    samplesHaveMore: boolean
+    samplesLoading: boolean
+    selectedSpanId: string | null
+    serviceName: string
+    spanName: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tracingOperationSceneLogicActions {
+    fetchHistogram: (_: void) => void
+    fetchHistogramFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    fetchHistogramSuccess: (
+        rawHistogram: {
+            bucket_ns: number
+            count: number
+            service: string
+        }[],
+        payload?: void
+    ) => {
+        rawHistogram: {
+            bucket_ns: number
+            count: number
+            service: string
+        }[]
+        payload?: void
+    }
+    fetchSampleTrace: ({ sample }: { sample: Span }) => {
+        sample: Span
+    }
+    fetchSampleTraceFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    fetchSampleTraceSuccess: (
+        sampleTraceSpans: Span[],
+        payload?: {
+            sample: Span
+        }
+    ) => {
+        sampleTraceSpans: Span[]
+        payload?: {
+            sample: Span
+        }
+    }
+    fetchSamples: (_: void) => void
+    fetchSamplesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    fetchSamplesSuccess: (
+        samples: Span[],
+        payload?: void
+    ) => {
+        samples: Span[]
+        payload?: void
+    }
+    fetchStats: (_: void) => void
+    fetchStatsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    fetchStatsSuccess: (
+        operationStats: AggregatedSpanRow | null,
+        payload?: void
+    ) => {
+        operationStats: AggregatedSpanRow | null
+        payload?: void
+    }
+    selectSpan: (spanId: string | null) => {
+        spanId: string | null
+    }
+    setDateRange: (dateRange: DateRange) => {
+        dateRange: DateRange
+    }
+    setDurationSelection: (selection: DurationRange | null) => {
+        selection: DurationRange | null
+    }
+    setSampleIndex: (index: number) => {
+        index: number
+    }
+    setSamplesHaveMore: (hasMore: boolean) => {
+        hasMore: boolean
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tracingOperationSceneLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        serviceName: (arg: any) => string
+        spanName: (arg: any) => string
+        histogramData: (rawHistogram: DurationHistogramRow[]) => TracingDurationHistogramData
+        currentSample: (samples: Span[], sampleIndex: number) => Span | null
+    }
+}
+
+export type tracingOperationSceneLogicType = MakeLogicType<
+    tracingOperationSceneLogicValues,
+    tracingOperationSceneLogicActions,
+    TracingOperationSceneLogicProps,
+    tracingOperationSceneLogicMeta
+>
+
 export const tracingOperationSceneLogic = kea<tracingOperationSceneLogicType>([
     props({} as TracingOperationSceneLogicProps),
     key(({ serviceName, spanName }) => `${serviceName}//${spanName}`),
diff --git a/products/tracing/frontend/tracingSceneLogic.ts b/products/tracing/frontend/tracingSceneLogic.ts
index 31546e53d44c..c59273f7fca6 100644
--- a/products/tracing/frontend/tracingSceneLogic.ts
+++ b/products/tracing/frontend/tracingSceneLogic.ts
@@ -1,5 +1,5 @@
 import { deepEqual as equal } from 'fast-equals'
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { router, urlToAction } from 'kea-router'
 
 import { DEFAULT_UNIVERSAL_GROUP_FILTER } from 'lib/components/UniversalFilters/universalFiltersLogic'
@@ -23,8 +23,159 @@ import {
     type TracingComparison,
     tracingFiltersLogic,
 } from './tracingFiltersLogic'
-import type { tracingSceneLogicType } from './tracingSceneLogicType'
 import { tracingViewerLogic } from './tracingViewerLogic'
+import type { AggregatedSpanRow, SpanTreeNode } from '../../../frontend/src/queries/schema/schema-general'
+import type { TracingDurationHistogramData, VisibleDurationRange } from './durationBuckets'
+import type { Span } from './types'
+import type { TracingSparklineData, VisibleSpanTimeRange } from './tracingDataLogic'
+import type { OverlayWindow, TracingFilters } from './tracingFiltersLogic'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tracingSceneLogicValues {
+    aggregation: {
+        current: AggregatedSpanRow[];
+        previous: AggregatedSpanRow[] | null;
+    }; // tracingDataLogic
+    aggregationLoading: boolean; // tracingDataLogic
+    durationHistogramData: TracingDurationHistogramData; // tracingDataLogic
+    durationHistogramLoading: boolean; // tracingDataLogic
+    hasMoreToLoad: boolean; // tracingDataLogic
+    hasRunQuery: boolean; // tracingDataLogic
+    isDurationMode: boolean; // tracingDataLogic
+    listRows: Span[]; // tracingDataLogic
+    spanTree: {
+        current: SpanTreeNode[];
+        previous: SpanTreeNode[] | null;
+        spanName: string | null;
+    }; // tracingDataLogic
+    spanTreeLoading: boolean; // tracingDataLogic
+    spans: Span[]; // tracingDataLogic
+    spansLoading: boolean; // tracingDataLogic
+    sparklineData: TracingSparklineData; // tracingDataLogic
+    sparklineLoading: boolean; // tracingDataLogic
+    totalMatchingFilters: number; // tracingDataLogic
+    traceSpans: Span[]; // tracingDataLogic
+    traceSpansHasMore: boolean; // tracingDataLogic
+    traceSpansLoading: boolean; // tracingDataLogic
+    traceSpansLoadingMore: boolean; // tracingDataLogic
+    visibleRowDateRange: VisibleSpanTimeRange | null; // tracingDataLogic
+    visibleRowDurationRange: VisibleDurationRange | null; // tracingDataLogic
+    compareActive: boolean; // tracingFiltersLogic
+    currentWindowMs: OverlayWindow; // tracingFiltersLogic
+    filters: TracingFilters; // tracingFiltersLogic
+    previousWindowMs: OverlayWindow; // tracingFiltersLogic
+    sparklineWindowMs: OverlayWindow; // tracingFiltersLogic
+    utcDateRange: {
+        date_from: string | null | undefined;
+        date_to: string | null | undefined;
+    }; // tracingFiltersLogic
+    canLoadMoreTraceSpans: boolean; // tracingViewerLogic
+    compareFlameServiceName: string | null; // tracingViewerLogic
+    compareFlameSpanName: string | null; // tracingViewerLogic
+    isLoadingFullTrace: boolean; // tracingViewerLogic
+    isTraceOpen: boolean; // tracingViewerLogic
+    openTraceSpans: Span[]; // tracingViewerLogic
+    selectedSpanId: string | null; // tracingViewerLogic
+    selectedTraceId: string | null; // tracingViewerLogic
+    selectedTraceTs: string | null; // tracingViewerLogic
+    activeTracingTab: "operations" | "traces";
+    breadcrumbs: Breadcrumb[];
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tracingSceneLogicActions {
+    fetchAggregation: (options?: {
+        fullRange?: boolean;
+    } | null | undefined) => {
+        fullRange?: boolean;
+    } | null; // tracingDataLogic
+    fetchNextPage: () => {
+        value: true;
+    }; // tracingDataLogic
+    fetchSpanTree: (params: {
+        serviceName: string;
+        spanName: string;
+    }) => {
+        serviceName: string;
+        spanName: string;
+    }; // tracingDataLogic
+    handleFilterChange: (filterType: string, extraProps?: Record<string, unknown> | undefined) => {
+        extraProps: Record<string, unknown> | undefined;
+        filterType: string;
+    }; // tracingDataLogic
+    loadMoreTraceSpans: () => {
+        value: true;
+    }; // tracingDataLogic
+    loadTraceSpans: (args_0: {
+        traceId: string;
+        ts?: string | null;
+    }) => {
+        traceId: string;
+        ts?: string | null;
+    }; // tracingDataLogic
+    runQuery: () => {
+        value: true;
+    }; // tracingDataLogic
+    setVisibleRowRange: (startIndex: number, stopIndex: number) => {
+        startIndex: number;
+        stopIndex: number;
+    }; // tracingDataLogic
+    setComparison: (comparison: null | import("./tracingFiltersLogic").TimeComparison) => {
+        comparison: null | import("./tracingFiltersLogic").TimeComparison;
+    }; // tracingFiltersLogic
+    setDateRange: (dateRange: import("~/queries/schema").DateRange) => {
+        dateRange: import("~/queries/schema").DateRange;
+    }; // tracingFiltersLogic
+    setFilterGroup: (filterGroup: import("~/types").UniversalFiltersGroup) => {
+        filterGroup: import("~/types").UniversalFiltersGroup;
+    }; // tracingFiltersLogic
+    setFilters: (filters: Partial<TracingFilters>) => {
+        filters: Partial<TracingFilters>;
+    }; // tracingFiltersLogic
+    setServiceNames: (serviceNames: string[]) => {
+        serviceNames: string[];
+    }; // tracingFiltersLogic
+    setSort: (orderBy: import("./tracingFiltersLogic").TracingOrderBy, orderDirection: import("./tracingFiltersLogic").TracingOrderDirection) => {
+        orderBy: import("./tracingFiltersLogic").TracingOrderBy;
+        orderDirection: import("./tracingFiltersLogic").TracingOrderDirection;
+    }; // tracingFiltersLogic
+    setViewMode: (viewMode: import("./tracingFiltersLogic").TracingViewMode) => {
+        viewMode: import("./tracingFiltersLogic").TracingViewMode;
+    }; // tracingFiltersLogic
+    updateComparisonWindows: (current: OverlayWindow, previous: OverlayWindow) => {
+        current: OverlayWindow;
+        previous: OverlayWindow;
+    }; // tracingFiltersLogic
+    closeCompareFlame: () => {
+        value: true;
+    }; // tracingViewerLogic
+    closeTrace: () => {
+        value: true;
+    }; // tracingViewerLogic
+    openCompareFlame: (spanName: string, serviceName: string) => {
+        serviceName: string;
+        spanName: string;
+    }; // tracingViewerLogic
+    openTrace: (traceId: string, options?: {
+        spanId?: string | null;
+        ts?: string | null;
+    } | undefined) => {
+        spanId: string | null;
+        traceId: string;
+        ts: string | null;
+    }; // tracingViewerLogic
+    selectSpan: (spanId: string | null) => {
+        spanId: string | null;
+    }; // tracingViewerLogic
+    setActiveTracingTab: (tab: "operations" | "traces") => {
+        tab: "operations" | "traces";
+    };
+    syncUrl: () => {
+        value: true;
+    };
+}
+
+export type tracingSceneLogicType = MakeLogicType<tracingSceneLogicValues, tracingSceneLogicActions>;
 
 export const tracingSceneLogic = kea<tracingSceneLogicType>([
     path(['products', 'tracing', 'frontend', 'tracingSceneLogic']),
diff --git a/products/tracing/frontend/tracingServiceFilterLogic.ts b/products/tracing/frontend/tracingServiceFilterLogic.ts
index 21be186c964d..2c983239a3ba 100644
--- a/products/tracing/frontend/tracingServiceFilterLogic.ts
+++ b/products/tracing/frontend/tracingServiceFilterLogic.ts
@@ -1,4 +1,17 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, propsChanged, reducers, selectors } from 'kea'
+import {
+    MakeLogicType,
+    actions,
+    afterMount,
+    connect,
+    kea,
+    key,
+    listeners,
+    path,
+    props,
+    propsChanged,
+    reducers,
+    selectors,
+} from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -6,12 +19,56 @@ import { teamLogic } from 'scenes/teamLogic'
 
 import { DateRange } from '~/queries/schema/schema-general'
 
-import type { tracingServiceFilterLogicType } from './tracingServiceFilterLogicType'
-
 export interface TracingServiceFilterLogicProps {
     dateRange?: DateRange
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tracingServiceFilterLogicValues {
+    currentTeamId: number | null // teamLogic
+    allServiceNames: string[]
+    allServiceNamesLoading: boolean
+    search: string
+    serviceNames: string[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tracingServiceFilterLogicActions {
+    loadServiceNames: () => any
+    loadServiceNamesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadServiceNamesSuccess: (
+        allServiceNames: string[],
+        payload?: any
+    ) => {
+        allServiceNames: string[]
+        payload?: any
+    }
+    setSearch: (search: string) => {
+        search: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tracingServiceFilterLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        serviceNames: (allServiceNames: string[], search: string) => string[]
+    }
+}
+
+export type tracingServiceFilterLogicType = MakeLogicType<
+    tracingServiceFilterLogicValues,
+    tracingServiceFilterLogicActions,
+    TracingServiceFilterLogicProps,
+    tracingServiceFilterLogicMeta
+>
+
 export const tracingServiceFilterLogic = kea<tracingServiceFilterLogicType>([
     path(['products', 'tracing', 'frontend', 'tracingServiceFilterLogic']),
     props({} as TracingServiceFilterLogicProps),
diff --git a/products/tracing/frontend/tracingViewerLogic.ts b/products/tracing/frontend/tracingViewerLogic.ts
index acff01519805..242c1fcf4ca5 100644
--- a/products/tracing/frontend/tracingViewerLogic.ts
+++ b/products/tracing/frontend/tracingViewerLogic.ts
@@ -1,15 +1,94 @@
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import posthog from 'posthog-js'
 
 import { PREFETCH_SPANS, tracingDataLogic } from './tracingDataLogic'
 import { TRACING_SCENE_VIEWER_ID, tracingFiltersLogic } from './tracingFiltersLogic'
-import type { tracingViewerLogicType } from './tracingViewerLogicType'
+import type { OverlayWindow } from './tracingFiltersLogic'
 import type { Span } from './types'
 
 export interface TracingViewerLogicProps {
     id: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tracingViewerLogicValues {
+    spans: Span[]; // tracingDataLogic
+    traceSpans: Span[]; // tracingDataLogic
+    traceSpansHasMore: boolean; // tracingDataLogic
+    traceSpansLoading: boolean; // tracingDataLogic
+    traceSpansLoadingMore: boolean; // tracingDataLogic
+    canLoadMoreTraceSpans: boolean;
+    compareFlameServiceName: string | null;
+    compareFlameSpanName: string | null;
+    isLoadingFullTrace: boolean;
+    isTraceOpen: boolean;
+    openTraceSpans: Span[];
+    selectedSpanId: string | null;
+    selectedTraceId: string | null;
+    selectedTraceTs: string | null;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tracingViewerLogicActions {
+    fetchAggregation: (options?: {
+        fullRange?: boolean;
+    } | null | undefined) => {
+        fullRange?: boolean;
+    } | null; // tracingDataLogic
+    fetchSpanTree: (params: {
+        serviceName: string;
+        spanName: string;
+    }) => {
+        serviceName: string;
+        spanName: string;
+    }; // tracingDataLogic
+    loadTraceSpans: (args_0: {
+        traceId: string;
+        ts?: string | null;
+    }) => {
+        traceId: string;
+        ts?: string | null;
+    }; // tracingDataLogic
+    updateComparisonWindows: (current: OverlayWindow, previous: OverlayWindow) => {
+        current: OverlayWindow;
+        previous: OverlayWindow;
+    }; // tracingFiltersLogic
+    closeCompareFlame: () => {
+        value: true;
+    };
+    closeTrace: () => {
+        value: true;
+    };
+    openCompareFlame: (spanName: string, serviceName: string) => {
+        serviceName: string;
+        spanName: string;
+    };
+    openTrace: (traceId: string, options?: {
+        spanId?: string | null;
+        ts?: string | null;
+    }) => {
+        spanId: string | null;
+        traceId: string;
+        ts: string | null;
+    };
+    selectSpan: (spanId: string | null) => {
+        spanId: string | null;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface tracingViewerLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        isTraceOpen: (selectedTraceId: string | null) => boolean;
+        openTraceSpans: (selectedTraceId: string | null, spans: Span[], traceSpans: Span[]) => Span[];
+        isLoadingFullTrace: (traceSpansLoading: boolean, traceSpansLoadingMore: boolean) => boolean;
+        canLoadMoreTraceSpans: (traceSpansHasMore: boolean, traceSpans: Span[], selectedTraceId: string | null) => boolean;
+    };
+}
+
+export type tracingViewerLogicType = MakeLogicType<tracingViewerLogicValues, tracingViewerLogicActions, TracingViewerLogicProps, tracingViewerLogicMeta>;
+
 // Per-instance viewer UI state: the trace drawer and the compare-flame modal. URL-free by
 // design — the /tracing scene logic reads and writes this instance's state to sync the URL;
 // an embedded viewer just never wires it up. Mirrors the logsViewerLogic boundary.
diff --git a/products/user_interviews/frontend/userInterviewLogic.ts b/products/user_interviews/frontend/userInterviewLogic.ts
index 13174e62554d..01b44376ae9d 100644
--- a/products/user_interviews/frontend/userInterviewLogic.ts
+++ b/products/user_interviews/frontend/userInterviewLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -26,7 +26,6 @@ import type {
     UserInterviewApi,
     UserInterviewTopicApi,
 } from './generated/api.schemas'
-import type { userInterviewLogicType } from './userInterviewLogicType'
 
 export interface UserInterviewLogicProps {
     id: string
@@ -39,6 +38,161 @@ function unwrapPaginatedOrArray<T>(response: T[] | { results?: T[] }): T[] {
     return response.results ?? []
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface userInterviewLogicValues {
+    breadcrumbs: Breadcrumb[]
+    interviewees: IntervieweeContextApi[]
+    intervieweesLoading: boolean
+    interviews: UserInterviewApi[]
+    interviewsLoading: boolean
+    invitePreview: PreviewInviteResultApi | null
+    invitePreviewLoading: boolean
+    linkByIdentifier: Record<string, string>
+    linkForIdentifier: (identifier: string) => string | undefined
+    links: InterviewLinkApi[]
+    linksCsvExporting: boolean
+    linksLoadFailed: boolean
+    linksLoading: boolean
+    previewInviteIdentifier: string | null
+    respondedCount: number
+    respondedIdentifiers: Set<string>
+    responseRate: number
+    testLink: TestInterviewLinkApi | null
+    testLinkLoading: boolean
+    topic: UserInterviewTopicApi | null
+    topicInterviews: UserInterviewApi[]
+    topicLoading: boolean
+    totalTargeted: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface userInterviewLogicActions {
+    closeInvitePreview: () => {
+        value: true
+    }
+    exportLinksCsv: () => {
+        value: true
+    }
+    exportLinksCsvDone: () => {
+        value: true
+    }
+    loadInterviewees: () => any
+    loadIntervieweesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadIntervieweesSuccess: (
+        interviewees: IntervieweeContextApi[],
+        payload?: any
+    ) => {
+        interviewees: IntervieweeContextApi[]
+        payload?: any
+    }
+    loadInterviews: () => any
+    loadInterviewsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadInterviewsSuccess: (
+        interviews: UserInterviewApi[],
+        payload?: any
+    ) => {
+        interviews: UserInterviewApi[]
+        payload?: any
+    }
+    loadInvitePreview: (identifier: string) => string
+    loadInvitePreviewFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadInvitePreviewSuccess: (
+        invitePreview: PreviewInviteResultApi,
+        payload?: string
+    ) => {
+        invitePreview: PreviewInviteResultApi
+        payload?: string
+    }
+    loadLinks: () => any
+    loadLinksFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadLinksSuccess: (
+        links: InterviewLinkApi[],
+        payload?: any
+    ) => {
+        links: InterviewLinkApi[]
+        payload?: any
+    }
+    loadTestLink: () => any
+    loadTestLinkFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadTestLinkSuccess: (
+        testLink: TestInterviewLinkApi,
+        payload?: any
+    ) => {
+        testLink: TestInterviewLinkApi
+        payload?: any
+    }
+    loadTopic: () => any
+    loadTopicFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadTopicSuccess: (
+        topic: UserInterviewTopicApi | null,
+        payload?: any
+    ) => {
+        topic: UserInterviewTopicApi | null
+        payload?: any
+    }
+    openInvitePreview: (identifier: string) => {
+        identifier: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface userInterviewLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        topicInterviews: (interviews: UserInterviewApi[]) => UserInterviewApi[]
+        linkByIdentifier: (links: InterviewLinkApi[]) => Record<string, string>
+        linkForIdentifier: (linkByIdentifier: Record<string, string>) => (identifier: string) => string | undefined
+        respondedIdentifiers: (topicInterviews: UserInterviewApi[]) => Set<string>
+        respondedCount: (topic: UserInterviewTopicApi | null, respondedIdentifiers: Set<string>) => number
+        totalTargeted: (topic: UserInterviewTopicApi | null) => number
+        responseRate: (respondedCount: number, totalTargeted: number) => number
+        breadcrumbs: (topic: UserInterviewTopicApi | null) => Breadcrumb[]
+    }
+}
+
+export type userInterviewLogicType = MakeLogicType<
+    userInterviewLogicValues,
+    userInterviewLogicActions,
+    UserInterviewLogicProps,
+    userInterviewLogicMeta
+>
+
 export const userInterviewLogic = kea<userInterviewLogicType>([
     path(['products', 'user_interviews', 'frontend', 'userInterviewLogic']),
     props({} as UserInterviewLogicProps),
@@ -168,22 +322,22 @@ export const userInterviewLogic = kea<userInterviewLogicType>([
     selectors(({ props }) => ({
         topicInterviews: [
             (s) => [s.interviews],
-            (interviews): UserInterviewApi[] => interviews.filter((i) => i.topic === props.id),
+            (interviews: UserInterviewApi[]): UserInterviewApi[] => interviews.filter((i) => i.topic === props.id),
         ],
         linkByIdentifier: [
             (s) => [s.links],
-            (links): Record<string, string> =>
+            (links: InterviewLinkApi[]): Record<string, string> =>
                 Object.fromEntries(links.map((link) => [link.interviewee_identifier, link.interview_url])),
         ],
         linkForIdentifier: [
             (s) => [s.linkByIdentifier],
-            (linkByIdentifier): ((identifier: string) => string | undefined) =>
+            (linkByIdentifier: Record<string, string>): ((identifier: string) => string | undefined) =>
                 (identifier: string) =>
                     linkByIdentifier[identifier],
         ],
         respondedIdentifiers: [
             (s) => [s.topicInterviews],
-            (interviews): Set<string> => {
+            (interviews: UserInterviewApi[]): Set<string> => {
                 const responded = new Set<string>()
                 for (const interview of interviews) {
                     if (interview.transcript || interview.summary) {
@@ -197,24 +351,24 @@ export const userInterviewLogic = kea<userInterviewLogicType>([
         ],
         respondedCount: [
             (s) => [s.topic, s.respondedIdentifiers],
-            (topic, respondedIdentifiers): number => {
+            (topic: UserInterviewTopicApi | null, respondedIdentifiers: Set<string>): number => {
                 const allTargeted = [...(topic?.interviewee_emails || []), ...(topic?.interviewee_distinct_ids || [])]
                 return allTargeted.filter((id) => respondedIdentifiers.has(id)).length
             },
         ],
         totalTargeted: [
             (s) => [s.topic],
-            (topic): number =>
+            (topic: UserInterviewTopicApi | null): number =>
                 (topic?.interviewee_emails?.length || 0) + (topic?.interviewee_distinct_ids?.length || 0),
         ],
         responseRate: [
             (s) => [s.respondedCount, s.totalTargeted],
-            (respondedCount, totalTargeted): number =>
+            (respondedCount: number, totalTargeted: number): number =>
                 totalTargeted > 0 ? Math.round((respondedCount / totalTargeted) * 100) : 0,
         ],
         breadcrumbs: [
             (s) => [s.topic],
-            (topic): Breadcrumb[] => [
+            (topic: UserInterviewTopicApi | null): Breadcrumb[] => [
                 {
                     key: 'UserInterviews',
                     name: 'User research',
diff --git a/products/user_interviews/frontend/userInterviewsLogic.ts b/products/user_interviews/frontend/userInterviewsLogic.ts
index 6531d4d36296..48c84e7d9269 100644
--- a/products/user_interviews/frontend/userInterviewsLogic.ts
+++ b/products/user_interviews/frontend/userInterviewsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { teamLogic } from 'scenes/teamLogic'
@@ -8,7 +8,55 @@ import { Breadcrumb } from '~/types'
 
 import { userInterviewTopicsList, userInterviewsSearchCreate } from './generated/api'
 import type { UserInterviewSearchResultApi, UserInterviewTopicApi } from './generated/api.schemas'
-import type { userInterviewsLogicType } from './userInterviewsLogicType'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface userInterviewsLogicValues {
+    breadcrumbs: Breadcrumb[]
+    searchQuery: string
+    searchResults: UserInterviewSearchResultApi[]
+    searchResultsLoading: boolean
+    topics: UserInterviewTopicApi[]
+    topicsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface userInterviewsLogicActions {
+    loadSearchResults: (_: unknown) => unknown
+    loadSearchResultsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSearchResultsSuccess: (
+        searchResults: UserInterviewSearchResultApi[],
+        payload?: unknown
+    ) => {
+        searchResults: UserInterviewSearchResultApi[]
+        payload?: unknown
+    }
+    loadTopics: () => any
+    loadTopicsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadTopicsSuccess: (
+        topics: UserInterviewTopicApi[],
+        payload?: any
+    ) => {
+        topics: UserInterviewTopicApi[]
+        payload?: any
+    }
+    setSearchQuery: (searchQuery: string) => {
+        searchQuery: string
+    }
+}
+
+export type userInterviewsLogicType = MakeLogicType<userInterviewsLogicValues, userInterviewsLogicActions>
 
 export const userInterviewsLogic = kea<userInterviewsLogicType>([
     path(['products', 'user_interviews', 'frontend', 'userInterviewsLogic']),
diff --git a/products/visual_review/frontend/scenes/visualReviewIndexSceneLogic.ts b/products/visual_review/frontend/scenes/visualReviewIndexSceneLogic.ts
index 11766bcbdc32..cac011e34fb9 100644
--- a/products/visual_review/frontend/scenes/visualReviewIndexSceneLogic.ts
+++ b/products/visual_review/frontend/scenes/visualReviewIndexSceneLogic.ts
@@ -1,4 +1,4 @@
-import { afterMount, connect, kea, path, selectors } from 'kea'
+import { MakeLogicType, afterMount, connect, kea, path, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 
@@ -9,7 +9,38 @@ import { Breadcrumb } from '~/types'
 
 import { visualReviewReposList } from '../generated/api'
 import type { RepoApi } from '../generated/api.schemas'
-import type { visualReviewIndexSceneLogicType } from './visualReviewIndexSceneLogicType'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface visualReviewIndexSceneLogicValues {
+    currentProjectId: number | string // teamLogic
+    breadcrumbs: Breadcrumb[]
+    repos: RepoApi[]
+    reposLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface visualReviewIndexSceneLogicActions {
+    loadRepos: () => any
+    loadReposFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadReposSuccess: (
+        repos: RepoApi[],
+        payload?: any
+    ) => {
+        repos: RepoApi[]
+        payload?: any
+    }
+}
+
+export type visualReviewIndexSceneLogicType = MakeLogicType<
+    visualReviewIndexSceneLogicValues,
+    visualReviewIndexSceneLogicActions
+>
 
 // Index scene logic. Loads the team's repos and forwards to the first repo's
 // Runs page. The header-bar repo switcher handles the multi-repo case, so
diff --git a/products/visual_review/frontend/scenes/visualReviewPreferencesLogic.ts b/products/visual_review/frontend/scenes/visualReviewPreferencesLogic.ts
index f23bf6af6d03..16cfaeb6b2b3 100644
--- a/products/visual_review/frontend/scenes/visualReviewPreferencesLogic.ts
+++ b/products/visual_review/frontend/scenes/visualReviewPreferencesLogic.ts
@@ -1,8 +1,27 @@
-import { actions, kea, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, path, reducers } from 'kea'
 
 import type { ComparisonMode } from 'lib/components/VisualImageDiffViewer/VisualImageDiffViewer'
 
-import type { visualReviewPreferencesLogicType } from './visualReviewPreferencesLogicType'
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface visualReviewPreferencesLogicValues {
+    addImagesToComment: boolean
+    comparisonMode: ComparisonMode
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface visualReviewPreferencesLogicActions {
+    setAddImagesToComment: (enabled: boolean) => {
+        enabled: boolean
+    }
+    setComparisonMode: (mode: ComparisonMode) => {
+        mode: ComparisonMode
+    }
+}
+
+export type visualReviewPreferencesLogicType = MakeLogicType<
+    visualReviewPreferencesLogicValues,
+    visualReviewPreferencesLogicActions
+>
 
 export const visualReviewPreferencesLogic = kea<visualReviewPreferencesLogicType>([
     path(['products', 'visual_review', 'frontend', 'scenes', 'visualReviewPreferencesLogic']),
diff --git a/products/visual_review/frontend/scenes/visualReviewRepoLogic.ts b/products/visual_review/frontend/scenes/visualReviewRepoLogic.ts
index 2326ce02e1ca..1f223bf564b3 100644
--- a/products/visual_review/frontend/scenes/visualReviewRepoLogic.ts
+++ b/products/visual_review/frontend/scenes/visualReviewRepoLogic.ts
@@ -1,16 +1,76 @@
-import { afterMount, connect, kea, key, path, props, selectors } from 'kea'
+import { MakeLogicType, afterMount, connect, kea, key, path, props, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { teamLogic } from 'scenes/teamLogic'
 
 import { visualReviewReposList, visualReviewReposRetrieve } from '../generated/api'
 import type { RepoApi } from '../generated/api.schemas'
-import type { visualReviewRepoLogicType } from './visualReviewRepoLogicType'
 
 export interface VisualReviewRepoLogicProps {
     repoId: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface visualReviewRepoLogicValues {
+    currentProjectId: number | string // teamLogic
+    allRepos: RepoApi[]
+    allReposLoading: boolean
+    otherRepos: RepoApi[]
+    repo: RepoApi | null
+    repoFullName: string | undefined
+    repoLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface visualReviewRepoLogicActions {
+    loadAllRepos: () => any
+    loadAllReposFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAllReposSuccess: (
+        allRepos: RepoApi[],
+        payload?: any
+    ) => {
+        allRepos: RepoApi[]
+        payload?: any
+    }
+    loadRepo: () => any
+    loadRepoFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRepoSuccess: (
+        repo: RepoApi,
+        payload?: any
+    ) => {
+        repo: RepoApi
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface visualReviewRepoLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        repoFullName: (repo: RepoApi | null) => string | undefined
+        otherRepos: (allRepos: RepoApi[], arg: any) => RepoApi[]
+    }
+}
+
+export type visualReviewRepoLogicType = MakeLogicType<
+    visualReviewRepoLogicValues,
+    visualReviewRepoLogicActions,
+    VisualReviewRepoLogicProps,
+    visualReviewRepoLogicMeta
+>
+
 // Shared repo state for both Runs and Snapshots scenes — keyed by repoId so
 // the data only loads once per workspace and survives tab navigation. Without
 // this, each scene's own loadRepo re-fetches on mount and the title/tab
diff --git a/products/visual_review/frontend/scenes/visualReviewRunSceneLogic.ts b/products/visual_review/frontend/scenes/visualReviewRunSceneLogic.ts
index e29bda004d38..d6e8299fa25d 100644
--- a/products/visual_review/frontend/scenes/visualReviewRunSceneLogic.ts
+++ b/products/visual_review/frontend/scenes/visualReviewRunSceneLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, urlToAction } from 'kea-router'
 import posthog from 'posthog-js'
@@ -30,12 +30,213 @@ import type {
 } from '../generated/api.schemas'
 import { isReportingOnlyRun } from '../lib/runPredicates'
 import { visualReviewPreferencesLogic } from './visualReviewPreferencesLogic'
-import type { visualReviewRunSceneLogicType } from './visualReviewRunSceneLogicType'
 
 export interface VisualReviewRunSceneLogicProps {
     runId: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface visualReviewRunSceneLogicValues {
+    currentProjectId: number | string // teamLogic
+    addImagesToComment: boolean // visualReviewPreferencesLogic
+    breadcrumbs: Breadcrumb[]
+    changedSnapshots: SnapshotApi[]
+    failedThumbnails: Set<string>
+    hasChanges: boolean
+    isApprovingSnapshot: boolean
+    isFinalizing: boolean
+    isRecomputing: boolean
+    isReportingOnly: boolean
+    isRunInProgress: boolean
+    isRunProcessing: boolean
+    quarantinedIdentifierSet: Set<string>
+    quarantinedIdentifiers: QuarantinedIdentifierEntryApi[]
+    quarantinedIdentifiersLoading: boolean
+    repo: RepoApi | null
+    repoFullName: string | null
+    repoLoading: boolean
+    run: RunApi | null
+    runLoading: boolean
+    selectedSnapshot: SnapshotApi | null
+    selectedSnapshotId: string | null
+    showQuarantinedThumbnails: boolean
+    snapshots: SnapshotApi[]
+    snapshotsLoading: boolean
+    sortedChangedSnapshots: SnapshotApi[]
+    thumbnailBasePath: string | null
+    toleratedHashes: ToleratedHashEntryApi[]
+    toleratedHashesLoading: boolean
+    unreviewedChangesCount: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface visualReviewRunSceneLogicActions {
+    setAddImagesToComment: (enabled: boolean) => {
+        enabled: boolean
+    } // visualReviewPreferencesLogic
+    approveSnapshot: (snapshot: SnapshotApi) => {
+        snapshot: SnapshotApi
+    }
+    approveSnapshotFailure: () => {
+        value: true
+    }
+    approveSnapshotSuccess: () => {
+        value: true
+    }
+    finalizeRun: () => {
+        value: true
+    }
+    finalizeRunFailure: () => {
+        value: true
+    }
+    finalizeRunSuccess: () => {
+        value: true
+    }
+    loadQuarantinedIdentifiers: () => any
+    loadQuarantinedIdentifiersFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadQuarantinedIdentifiersSuccess: (
+        quarantinedIdentifiers: QuarantinedIdentifierEntryApi[],
+        payload?: any
+    ) => {
+        quarantinedIdentifiers: QuarantinedIdentifierEntryApi[]
+        payload?: any
+    }
+    loadRepo: () => any
+    loadRepoFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRepoSuccess: (
+        repo: RepoApi | null,
+        payload?: any
+    ) => {
+        repo: RepoApi | null
+        payload?: any
+    }
+    loadRun: () => any
+    loadRunFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRunSuccess: (
+        run: RunApi,
+        payload?: any
+    ) => {
+        run: RunApi
+        payload?: any
+    }
+    loadSnapshots: () => any
+    loadSnapshotsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSnapshotsSuccess: (
+        snapshots: SnapshotApi[],
+        payload?: any
+    ) => {
+        snapshots: SnapshotApi[]
+        payload?: any
+    }
+    loadToleratedHashes: (identifier: string) => string
+    loadToleratedHashesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadToleratedHashesSuccess: (
+        toleratedHashes: ToleratedHashEntryApi[],
+        payload?: string
+    ) => {
+        toleratedHashes: ToleratedHashEntryApi[]
+        payload?: string
+    }
+    markAsTolerated: (snapshot: SnapshotApi) => {
+        snapshot: SnapshotApi
+    }
+    markThumbnailFailed: (identifier: string) => {
+        identifier: string
+    }
+    quarantineSnapshot: (
+        reason: string,
+        identifiers: string[],
+        expiresAt: string | null,
+        sourceRunId?: string | null
+    ) => {
+        expiresAt: string | null
+        identifiers: string[]
+        reason: string
+        sourceRunId: string | null
+    }
+    recomputeRun: () => {
+        value: true
+    }
+    recomputeRunFailure: () => {
+        value: true
+    }
+    recomputeRunSuccess: () => {
+        value: true
+    }
+    setSelectedSnapshotId: (snapshotId: string | null) => {
+        snapshotId: string | null
+    }
+    toggleQuarantinedThumbnails: () => {
+        value: true
+    }
+    unquarantineSnapshot: (snapshot: SnapshotApi) => {
+        snapshot: SnapshotApi
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface visualReviewRunSceneLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        selectedSnapshot: (
+            snapshots: SnapshotApi[],
+            selectedSnapshotId: string | null,
+            quarantinedIdentifierSet: Set<string>
+        ) => SnapshotApi | null
+        changedSnapshots: (snapshots: SnapshotApi[]) => SnapshotApi[]
+        sortedChangedSnapshots: (changedSnapshots: SnapshotApi[]) => SnapshotApi[]
+        hasChanges: (changedSnapshots: SnapshotApi[]) => boolean
+        unreviewedChangesCount: (changedSnapshots: SnapshotApi[]) => number
+        quarantinedIdentifierSet: (
+            quarantinedIdentifiers: QuarantinedIdentifierEntryApi[],
+            run: RunApi | null
+        ) => Set<string>
+        repoFullName: (repo: RepoApi | null) => string | null
+        thumbnailBasePath: (run: RunApi | null, currentProjectId: number | string) => string | null
+        isRunInProgress: (run: RunApi | null) => boolean
+        isRunProcessing: (run: RunApi | null) => boolean
+        isReportingOnly: (run: RunApi | null) => boolean
+        breadcrumbs: (run: RunApi | null) => Breadcrumb[]
+    }
+}
+
+export type visualReviewRunSceneLogicType = MakeLogicType<
+    visualReviewRunSceneLogicValues,
+    visualReviewRunSceneLogicActions,
+    VisualReviewRunSceneLogicProps,
+    visualReviewRunSceneLogicMeta
+>
+
 export const visualReviewRunSceneLogic = kea<visualReviewRunSceneLogicType>([
     path(['products', 'visual_review', 'frontend', 'scenes', 'visualReviewRunSceneLogic']),
     props({} as VisualReviewRunSceneLogicProps),
@@ -186,7 +387,11 @@ export const visualReviewRunSceneLogic = kea<visualReviewRunSceneLogicType>([
     selectors({
         selectedSnapshot: [
             (s) => [s.snapshots, s.selectedSnapshotId, s.quarantinedIdentifierSet],
-            (snapshots, selectedSnapshotId, quarantinedIdentifierSet): SnapshotApi | null => {
+            (
+                snapshots: SnapshotApi[],
+                selectedSnapshotId: string | null,
+                quarantinedIdentifierSet: Set<string>
+            ): SnapshotApi | null => {
                 if (selectedSnapshotId) {
                     return snapshots.find((s) => s.id === selectedSnapshotId) || null
                 }
@@ -197,7 +402,7 @@ export const visualReviewRunSceneLogic = kea<visualReviewRunSceneLogicType>([
         ],
         changedSnapshots: [
             (s) => [s.snapshots],
-            (snapshots): SnapshotApi[] => snapshots.filter((s) => s.result !== 'unchanged'),
+            (snapshots: SnapshotApi[]): SnapshotApi[] => snapshots.filter((s) => s.result !== 'unchanged'),
         ],
         sortedChangedSnapshots: [
             (s) => [s.changedSnapshots],
@@ -247,10 +452,13 @@ export const visualReviewRunSceneLogic = kea<visualReviewRunSceneLogicType>([
                 return sortedGroups.flat()
             },
         ],
-        hasChanges: [(s) => [s.changedSnapshots], (changedSnapshots): boolean => changedSnapshots.length > 0],
+        hasChanges: [
+            (s) => [s.changedSnapshots],
+            (changedSnapshots: SnapshotApi[]): boolean => changedSnapshots.length > 0,
+        ],
         unreviewedChangesCount: [
             (s) => [s.changedSnapshots],
-            (changedSnapshots): number =>
+            (changedSnapshots: SnapshotApi[]): number =>
                 changedSnapshots.filter((s) => s.review_state !== 'approved' && s.review_state !== 'tolerated').length,
         ],
         quarantinedIdentifierSet: [
@@ -265,22 +473,25 @@ export const visualReviewRunSceneLogic = kea<visualReviewRunSceneLogicType>([
                         .map((q: QuarantinedIdentifierEntryApi) => q.identifier)
                 ),
         ],
-        repoFullName: [(s) => [s.repo], (repo): string | null => repo?.repo_full_name || null],
+        repoFullName: [(s) => [s.repo], (repo: RepoApi | null): string | null => repo?.repo_full_name || null],
         thumbnailBasePath: [
             (s) => [s.run, s.currentProjectId],
-            (run, projectId): string | null => {
+            (run: RunApi | null, projectId: number | string): string | null => {
                 if (!run || !projectId) {
                     return null
                 }
                 return `/api/projects/${projectId}/visual_review/repos/${run.repo_id}/thumbnails`
             },
         ],
-        isRunInProgress: [(s) => [s.run], (run): boolean => run?.status === 'pending' || run?.status === 'processing'],
-        isRunProcessing: [(s) => [s.run], (run): boolean => run?.status === 'processing'],
-        isReportingOnly: [(s) => [s.run], (run): boolean => isReportingOnlyRun(run)],
+        isRunInProgress: [
+            (s) => [s.run],
+            (run: RunApi | null): boolean => run?.status === 'pending' || run?.status === 'processing',
+        ],
+        isRunProcessing: [(s) => [s.run], (run: RunApi | null): boolean => run?.status === 'processing'],
+        isReportingOnly: [(s) => [s.run], (run: RunApi | null): boolean => isReportingOnlyRun(run)],
         breadcrumbs: [
             (s) => [s.run],
-            (run): Breadcrumb[] => [
+            (run: RunApi | null): Breadcrumb[] => [
                 {
                     key: 'visual_review',
                     name: 'Visual review',
diff --git a/products/visual_review/frontend/scenes/visualReviewRunsSceneLogic.ts b/products/visual_review/frontend/scenes/visualReviewRunsSceneLogic.ts
index 35a99552cf59..cf52bb9c61b0 100644
--- a/products/visual_review/frontend/scenes/visualReviewRunsSceneLogic.ts
+++ b/products/visual_review/frontend/scenes/visualReviewRunsSceneLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { teamLogic } from 'scenes/teamLogic'
@@ -8,7 +8,6 @@ import { Breadcrumb } from '~/types'
 import { visualReviewReposRunsCountsRetrieve, visualReviewReposRunsList } from '../generated/api'
 import type { PaginatedRunListApi, RepoApi, ReviewStateCountsApi } from '../generated/api.schemas'
 import { visualReviewRepoLogic } from './visualReviewRepoLogic'
-import type { visualReviewRunsSceneLogicType } from './visualReviewRunsSceneLogicType'
 
 export type ReviewState = 'needs_review' | 'clean' | 'processing' | 'stale'
 
@@ -18,6 +17,87 @@ export interface VisualReviewRunsSceneLogicProps {
     repoId: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface visualReviewRunsSceneLogicValues {
+    currentProjectId: number | string // teamLogic
+    repo: RepoApi | null // visualReviewRepoLogic
+    repoFullName: string | undefined // visualReviewRepoLogic
+    activeTab: ReviewState
+    breadcrumbs: Breadcrumb[]
+    counts: ReviewStateCountsApi
+    countsLoading: boolean
+    page: number
+    repoId: string
+    runs: PaginatedRunListApi['results']
+    runsLoading: boolean
+    runsResponse: PaginatedRunListApi
+    runsResponseLoading: boolean
+    searchQuery: string
+    totalCount: number
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface visualReviewRunsSceneLogicActions {
+    loadCounts: () => any
+    loadCountsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadCountsSuccess: (
+        counts: ReviewStateCountsApi,
+        payload?: any
+    ) => {
+        counts: ReviewStateCountsApi
+        payload?: any
+    }
+    loadRuns: () => any
+    loadRunsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRunsSuccess: (
+        runsResponse: PaginatedRunListApi,
+        payload?: any
+    ) => {
+        runsResponse: PaginatedRunListApi
+        payload?: any
+    }
+    setActiveTab: (tab: ReviewState) => {
+        tab: ReviewState
+    }
+    setPage: (page: number) => {
+        page: number
+    }
+    setSearchQuery: (searchQuery: string) => {
+        searchQuery: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface visualReviewRunsSceneLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        repoId: (arg: any) => string
+        runs: (runsResponse: PaginatedRunListApi) => PaginatedRunListApi['results']
+        runsLoading: (runsResponseLoading: boolean) => boolean
+        totalCount: (runsResponse: PaginatedRunListApi) => number
+        breadcrumbs: (repo: RepoApi | null) => Breadcrumb[]
+    }
+}
+
+export type visualReviewRunsSceneLogicType = MakeLogicType<
+    visualReviewRunsSceneLogicValues,
+    visualReviewRunsSceneLogicActions,
+    VisualReviewRunsSceneLogicProps,
+    visualReviewRunsSceneLogicMeta
+>
+
 export const visualReviewRunsSceneLogic = kea<visualReviewRunsSceneLogicType>([
     path(['products', 'visual_review', 'frontend', 'scenes', 'visualReviewRunsSceneLogic']),
     props({} as VisualReviewRunsSceneLogicProps),
diff --git a/products/visual_review/frontend/scenes/visualReviewSettingsSceneLogic.ts b/products/visual_review/frontend/scenes/visualReviewSettingsSceneLogic.ts
index 969ac368cd9d..0e97b49d0513 100644
--- a/products/visual_review/frontend/scenes/visualReviewSettingsSceneLogic.ts
+++ b/products/visual_review/frontend/scenes/visualReviewSettingsSceneLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { integrationsLogic } from 'lib/integrations/integrationsLogic'
@@ -9,9 +9,9 @@ import { Breadcrumb } from '~/types'
 
 import type { GitHubRepoApi } from 'products/integrations/frontend/generated/api.schemas'
 
+import type { IntegrationType, UserBasicType } from '../../../../frontend/src/types'
 import { visualReviewReposCreate, visualReviewReposList, visualReviewReposPartialUpdate } from '../generated/api'
 import type { PatchedUpdateRepoRequestInputApi, RepoApi } from '../generated/api.schemas'
-import type { visualReviewSettingsSceneLogicType } from './visualReviewSettingsSceneLogicType'
 
 export interface RepoFormValues {
     baseline_file_paths: Record<string, string>
@@ -30,6 +30,182 @@ function formValuesFromRepo(repo: RepoApi): RepoFormValues {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface visualReviewSettingsSceneLogicValues {
+    getGitHubRepositoriesFull: (integrationId: number) => GitHubRepoApi[] // integrationsLogic
+    integrations: IntegrationType[] | null // integrationsLogic
+    currentProjectId: number | string // teamLogic
+    availableRepos: GitHubRepoApi[]
+    breadcrumbs: Breadcrumb[]
+    editingRepo: RepoApi | null
+    editingRepoId: string | null
+    existingRepoNames: Set<string>
+    formValues: RepoFormValues
+    githubManageAccessUrl: string | null
+    hasChanges: boolean
+    repos: RepoApi[]
+    reposLoading: boolean
+    saving: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface visualReviewSettingsSceneLogicActions {
+    loadIntegrationsSuccess: (
+        integrations: {
+            config: any
+            created_at: string
+            created_by?: UserBasicType | null | undefined
+            display_name: string
+            errors?: string | undefined
+            icon_url: any
+            id: number
+            kind:
+                | 'apns'
+                | 'aws-s3'
+                | 'azure-blob'
+                | 'bing-ads'
+                | 'clickup'
+                | 'customerio-app'
+                | 'customerio-track'
+                | 'customerio-webhook'
+                | 'databricks'
+                | 'email'
+                | 'firebase'
+                | 'github'
+                | 'gitlab'
+                | 'google-ads'
+                | 'google-analytics'
+                | 'google-cloud-service-account'
+                | 'google-cloud-storage'
+                | 'google-pubsub'
+                | 'google-search-console'
+                | 'google-sheets'
+                | 'hubspot'
+                | 'intercom'
+                | 'jira'
+                | 'linear'
+                | 'linkedin-ads'
+                | 'meta-ads'
+                | 'pinterest-ads'
+                | 'postgresql'
+                | 'reddit-ads'
+                | 's3-compatible'
+                | 'salesforce'
+                | 'slack'
+                | 'snapchat'
+                | 'stripe'
+                | 'tiktok-ads'
+                | 'twilio'
+                | 'vercel'
+        }[],
+        payload?: any
+    ) => {
+        integrations: {
+            config: any
+            created_at: string
+            created_by?: UserBasicType | null | undefined
+            display_name: string
+            errors?: string | undefined
+            icon_url: any
+            id: number
+            kind:
+                | 'apns'
+                | 'aws-s3'
+                | 'azure-blob'
+                | 'bing-ads'
+                | 'clickup'
+                | 'customerio-app'
+                | 'customerio-track'
+                | 'customerio-webhook'
+                | 'databricks'
+                | 'email'
+                | 'firebase'
+                | 'github'
+                | 'gitlab'
+                | 'google-ads'
+                | 'google-analytics'
+                | 'google-cloud-service-account'
+                | 'google-cloud-storage'
+                | 'google-pubsub'
+                | 'google-search-console'
+                | 'google-sheets'
+                | 'hubspot'
+                | 'intercom'
+                | 'jira'
+                | 'linear'
+                | 'linkedin-ads'
+                | 'meta-ads'
+                | 'pinterest-ads'
+                | 'postgresql'
+                | 'reddit-ads'
+                | 's3-compatible'
+                | 'salesforce'
+                | 'slack'
+                | 'snapchat'
+                | 'stripe'
+                | 'tiktok-ads'
+                | 'twilio'
+                | 'vercel'
+        }[]
+        payload?: any
+    } // integrationsLogic
+    addRepo: (githubRepo: GitHubRepoApi) => {
+        githubRepo: GitHubRepoApi
+    }
+    cancelEdit: () => {
+        value: true
+    }
+    editRepo: (repoId: string) => {
+        repoId: string
+    }
+    loadRepos: () => any
+    loadReposFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadReposSuccess: (
+        repos: RepoApi[],
+        payload?: any
+    ) => {
+        repos: RepoApi[]
+        payload?: any
+    }
+    saveRepo: () => {
+        value: true
+    }
+    setFormField: (
+        field: keyof RepoFormValues,
+        value: RepoFormValues[keyof RepoFormValues]
+    ) => {
+        field: keyof RepoFormValues
+        value: boolean | Record<string, string>
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface visualReviewSettingsSceneLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        editingRepo: (repos: RepoApi[], editingRepoId: string | null) => RepoApi | null
+        hasChanges: (formValues: RepoFormValues, editingRepo: RepoApi | null) => boolean
+        availableRepos: (
+            integrations: IntegrationType[] | null,
+            getGitHubRepositoriesFull: (integrationId: number) => GitHubRepoApi[]
+        ) => GitHubRepoApi[]
+        existingRepoNames: (repos: RepoApi[]) => Set<string>
+        githubManageAccessUrl: (integrations: IntegrationType[] | null) => string | null
+    }
+}
+
+export type visualReviewSettingsSceneLogicType = MakeLogicType<
+    visualReviewSettingsSceneLogicValues,
+    visualReviewSettingsSceneLogicActions,
+    Record<string, any>,
+    visualReviewSettingsSceneLogicMeta
+>
+
 export const visualReviewSettingsSceneLogic = kea<visualReviewSettingsSceneLogicType>([
     path(['products', 'visual_review', 'frontend', 'scenes', 'visualReviewSettingsSceneLogic']),
 
@@ -89,7 +265,7 @@ export const visualReviewSettingsSceneLogic = kea<visualReviewSettingsSceneLogic
     selectors({
         editingRepo: [
             (s) => [s.repos, s.editingRepoId],
-            (repos, editingRepoId): RepoApi | null => {
+            (repos: RepoApi[], editingRepoId: string | null): RepoApi | null => {
                 if (!editingRepoId) {
                     return null
                 }
@@ -98,7 +274,7 @@ export const visualReviewSettingsSceneLogic = kea<visualReviewSettingsSceneLogic
         ],
         hasChanges: [
             (s) => [s.formValues, s.editingRepo],
-            (formValues, editingRepo): boolean => {
+            (formValues: RepoFormValues, editingRepo: RepoApi | null): boolean => {
                 if (!editingRepo) {
                     return false
                 }
@@ -125,7 +301,10 @@ export const visualReviewSettingsSceneLogic = kea<visualReviewSettingsSceneLogic
                 return repos
             },
         ],
-        existingRepoNames: [(s) => [s.repos], (repos): Set<string> => new Set(repos.map((r) => r.repo_full_name))],
+        existingRepoNames: [
+            (s) => [s.repos],
+            (repos: RepoApi[]): Set<string> => new Set(repos.map((r) => r.repo_full_name)),
+        ],
         githubManageAccessUrl: [
             (s) => [s.integrations],
             (integrations: any[] | null): string | null => {
diff --git a/products/visual_review/frontend/scenes/visualReviewSnapshotHistorySceneLogic.ts b/products/visual_review/frontend/scenes/visualReviewSnapshotHistorySceneLogic.ts
index 116814800f79..9510bf411311 100644
--- a/products/visual_review/frontend/scenes/visualReviewSnapshotHistorySceneLogic.ts
+++ b/products/visual_review/frontend/scenes/visualReviewSnapshotHistorySceneLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
@@ -15,7 +15,6 @@ import {
     visualReviewReposSnapshotsList,
 } from '../generated/api'
 import type { QuarantinedIdentifierEntryApi, RepoApi, SnapshotHistoryEntryApi } from '../generated/api.schemas'
-import type { visualReviewSnapshotHistorySceneLogicType } from './visualReviewSnapshotHistorySceneLogicType'
 
 export interface VisualReviewSnapshotHistorySceneLogicProps {
     repoId: string
@@ -44,6 +43,149 @@ function detectTheme(identifier: string): { stem: string; theme: 'light' | 'dark
     return { stem: identifier, theme: null }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface visualReviewSnapshotHistorySceneLogicValues {
+    currentProjectId: number | string // teamLogic
+    breadcrumbs: Breadcrumb[]
+    history: SnapshotHistoryEntryApi[]
+    historyLoading: boolean
+    identifier: string
+    pairedHistory: ThemePair[]
+    partnerHistory: SnapshotHistoryEntryApi[]
+    partnerHistoryLoading: boolean
+    primaryTheme: 'dark' | 'light' | null
+    quarantineEntry: QuarantinedIdentifierEntryApi | null
+    quarantineEntryLoading: boolean
+    repo: RepoApi | null
+    repoId: string
+    repoLoading: boolean
+    runType: string
+    siblingIdentifier: string | null
+    siblingQuarantineEntry: QuarantinedIdentifierEntryApi | null
+    siblingQuarantineEntryLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface visualReviewSnapshotHistorySceneLogicActions {
+    loadHistory: () => any
+    loadHistoryFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadHistorySuccess: (
+        history: SnapshotHistoryEntryApi[],
+        payload?: any
+    ) => {
+        history: SnapshotHistoryEntryApi[]
+        payload?: any
+    }
+    loadPartnerHistory: () => any
+    loadPartnerHistoryFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPartnerHistorySuccess: (
+        partnerHistory: SnapshotHistoryEntryApi[],
+        payload?: any
+    ) => {
+        partnerHistory: SnapshotHistoryEntryApi[]
+        payload?: any
+    }
+    loadQuarantineEntry: () => any
+    loadQuarantineEntryFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadQuarantineEntrySuccess: (
+        quarantineEntry: QuarantinedIdentifierEntryApi | null,
+        payload?: any
+    ) => {
+        quarantineEntry: QuarantinedIdentifierEntryApi | null
+        payload?: any
+    }
+    loadRepo: () => any
+    loadRepoFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadRepoSuccess: (
+        repo: RepoApi,
+        payload?: any
+    ) => {
+        repo: RepoApi
+        payload?: any
+    }
+    loadSiblingQuarantineEntry: () => any
+    loadSiblingQuarantineEntryFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSiblingQuarantineEntrySuccess: (
+        siblingQuarantineEntry: QuarantinedIdentifierEntryApi | null,
+        payload?: any
+    ) => {
+        siblingQuarantineEntry: QuarantinedIdentifierEntryApi | null
+        payload?: any
+    }
+    quarantineIdentifier: (
+        reason: string,
+        identifiers: string[],
+        expiresAt: string | null,
+        sourceRunId?: string | null
+    ) => {
+        expiresAt: string | null
+        identifiers: string[]
+        reason: string
+        sourceRunId: string | null
+    }
+    unquarantineIdentifier: () => {
+        value: true
+    }
+    unquarantineSibling: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface visualReviewSnapshotHistorySceneLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        identifier: (arg: any) => string
+        runType: (arg: any) => string
+        repoId: (arg: any) => string
+        primaryTheme: (arg: any) => 'dark' | 'light' | null
+        siblingIdentifier: (arg: any) => string | null
+        pairedHistory: (
+            history: SnapshotHistoryEntryApi[],
+            partnerHistory: SnapshotHistoryEntryApi[],
+            primaryTheme: 'dark' | 'light' | null
+        ) => ThemePair[]
+        breadcrumbs: (arg: any, arg2: any) => Breadcrumb[]
+    }
+}
+
+export type visualReviewSnapshotHistorySceneLogicType = MakeLogicType<
+    visualReviewSnapshotHistorySceneLogicValues,
+    visualReviewSnapshotHistorySceneLogicActions,
+    VisualReviewSnapshotHistorySceneLogicProps,
+    visualReviewSnapshotHistorySceneLogicMeta
+>
+
 export const visualReviewSnapshotHistorySceneLogic = kea<visualReviewSnapshotHistorySceneLogicType>([
     path(['products', 'visual_review', 'frontend', 'scenes', 'visualReviewSnapshotHistorySceneLogic']),
     props({} as VisualReviewSnapshotHistorySceneLogicProps),
diff --git a/products/visual_review/frontend/scenes/visualReviewSnapshotOverviewSceneLogic.ts b/products/visual_review/frontend/scenes/visualReviewSnapshotOverviewSceneLogic.ts
index 4d0dfae9b977..ea2969787b30 100644
--- a/products/visual_review/frontend/scenes/visualReviewSnapshotOverviewSceneLogic.ts
+++ b/products/visual_review/frontend/scenes/visualReviewSnapshotOverviewSceneLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, urlToAction } from 'kea-router'
 
@@ -10,9 +10,9 @@ import type { FacetBucket, FacetGroups, FacetSelection } from '../components/Sna
 import type { StatPreset } from '../components/SnapshotStatRow'
 import { visualReviewReposBaselinesRetrieve } from '../generated/api'
 import type { BaselineEntryApi, BaselineOverviewApi } from '../generated/api.schemas'
+import type { RepoApi } from '../generated/api.schemas'
 import { parseArea, parseTheme, runTypeLabel } from '../lib/parseIdentifier'
 import { visualReviewRepoLogic } from './visualReviewRepoLogic'
-import type { visualReviewSnapshotOverviewSceneLogicType } from './visualReviewSnapshotOverviewSceneLogicType'
 
 export interface VisualReviewSnapshotOverviewSceneLogicProps {
     repoId: string
@@ -156,6 +156,135 @@ function applyFilters(
     })
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface visualReviewSnapshotOverviewSceneLogicValues {
+    currentProjectId: number | string // teamLogic
+    repo: RepoApi | null // visualReviewRepoLogic
+    breadcrumbs: Breadcrumb[]
+    decoratedEntries: Array<
+        BaselineEntryApi & {
+            _area: string
+            _stability: string[]
+            _theme: 'dark' | 'light' | null
+            _typeKey: string
+        }
+    >
+    entries: BaselineEntryApi[]
+    facetGroups: FacetGroups
+    facetSelection: FacetSelection
+    filteredEntries: DecoratedEntry[]
+    filters: Filters
+    frequentlyToleratedCount: number
+    overview: BaselineOverviewApi | null
+    overviewLoading: boolean
+    repoId: string
+    statCounts: Record<StatPreset, number>
+    thumbnailBasePath: string | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface visualReviewSnapshotOverviewSceneLogicActions {
+    clearAllFilters: () => {
+        value: true
+    }
+    loadOverview: () => any
+    loadOverviewFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadOverviewSuccess: (
+        overview: BaselineOverviewApi,
+        payload?: any
+    ) => {
+        overview: BaselineOverviewApi
+        payload?: any
+    }
+    setSearch: (search: string) => {
+        search: string
+    }
+    setStatPreset: (preset: StatPreset) => {
+        preset: StatPreset
+    }
+    setTheme: (theme: ThemeFilter) => {
+        theme: ThemeFilter
+    }
+    toggleArea: (value: string) => {
+        value: string
+    }
+    toggleStability: (value: string) => {
+        value: string
+    }
+    toggleType: (value: string) => {
+        value: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface visualReviewSnapshotOverviewSceneLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        repoId: (arg: any) => string
+        entries: (overview: BaselineOverviewApi | null) => BaselineEntryApi[]
+        decoratedEntries: (entries: BaselineEntryApi[]) => Array<
+            BaselineEntryApi & {
+                _area: string
+                _stability: string[]
+                _theme: 'dark' | 'light' | null
+                _typeKey: string
+            }
+        >
+        filteredEntries: (
+            decoratedEntries: (BaselineEntryApi & {
+                _area: string
+                _stability: string[]
+                _theme: 'dark' | 'light' | null
+                _typeKey: string
+            })[],
+            filters: Filters
+        ) => DecoratedEntry[]
+        frequentlyToleratedCount: (
+            decoratedEntries: (BaselineEntryApi & {
+                _area: string
+                _stability: string[]
+                _theme: 'dark' | 'light' | null
+                _typeKey: string
+            })[],
+            overview: BaselineOverviewApi | null
+        ) => number
+        statCounts: (
+            decoratedEntries: (BaselineEntryApi & {
+                _area: string
+                _stability: string[]
+                _theme: 'dark' | 'light' | null
+                _typeKey: string
+            })[],
+            overview: BaselineOverviewApi | null
+        ) => Record<StatPreset, number>
+        facetGroups: (
+            decoratedEntries: (BaselineEntryApi & {
+                _area: string
+                _stability: string[]
+                _theme: 'dark' | 'light' | null
+                _typeKey: string
+            })[],
+            filters: Filters
+        ) => FacetGroups
+        facetSelection: (filters: Filters) => FacetSelection
+        thumbnailBasePath: (currentProjectId: number | string, arg: any) => string | null
+        breadcrumbs: (repo: RepoApi | null) => Breadcrumb[]
+    }
+}
+
+export type visualReviewSnapshotOverviewSceneLogicType = MakeLogicType<
+    visualReviewSnapshotOverviewSceneLogicValues,
+    visualReviewSnapshotOverviewSceneLogicActions,
+    VisualReviewSnapshotOverviewSceneLogicProps,
+    visualReviewSnapshotOverviewSceneLogicMeta
+>
+
 export const visualReviewSnapshotOverviewSceneLogic = kea<visualReviewSnapshotOverviewSceneLogicType>([
     path(['products', 'visual_review', 'frontend', 'scenes', 'visualReviewSnapshotOverviewSceneLogic']),
     props({} as VisualReviewSnapshotOverviewSceneLogicProps),
@@ -213,13 +342,16 @@ export const visualReviewSnapshotOverviewSceneLogic = kea<visualReviewSnapshotOv
     })),
     selectors({
         repoId: [() => [(_, p) => p.repoId], (repoId: string): string => repoId],
-        entries: [(s) => [s.overview], (overview): BaselineEntryApi[] => overview?.entries ?? []],
+        entries: [
+            (s) => [s.overview],
+            (overview: BaselineOverviewApi | null): BaselineEntryApi[] => overview?.entries ?? [],
+        ],
         // Pre-compute parsed area + theme + typeKey + stability tags for each
         // entry so subsequent filter passes don't re-derive on every keystroke.
         decoratedEntries: [
             (s) => [s.entries],
             (
-                entries
+                entries: BaselineEntryApi[]
             ): Array<
                 BaselineEntryApi & {
                     _area: string
@@ -244,7 +376,17 @@ export const visualReviewSnapshotOverviewSceneLogic = kea<visualReviewSnapshotOv
         // re-explaining itself; one axis everywhere is calmer.
         filteredEntries: [
             (s) => [s.decoratedEntries, s.filters],
-            (entries, filters) => {
+            (
+                entries: Array<
+                    BaselineEntryApi & {
+                        _area: string
+                        _stability: string[]
+                        _theme: 'dark' | 'light' | null
+                        _typeKey: string
+                    }
+                >,
+                filters: Filters
+            ) => {
                 const filtered = applyFilters(entries, filters)
                 filtered.sort(
                     (a, b) =>
@@ -260,12 +402,32 @@ export const visualReviewSnapshotOverviewSceneLogic = kea<visualReviewSnapshotOv
         // to recomputing client-side when the server didn't ship totals.
         frequentlyToleratedCount: [
             (s) => [s.decoratedEntries, s.overview],
-            (entries, overview): number =>
+            (
+                entries: Array<
+                    BaselineEntryApi & {
+                        _area: string
+                        _stability: string[]
+                        _theme: 'dark' | 'light' | null
+                        _typeKey: string
+                    }
+                >,
+                overview: BaselineOverviewApi | null
+            ): number =>
                 overview?.totals.frequently_tolerated ?? entries.filter((e) => e.tolerate_count_90d >= 3).length,
         ],
         statCounts: [
             (s) => [s.decoratedEntries, s.overview],
-            (entries, overview): Record<StatPreset, number> => {
+            (
+                entries: Array<
+                    BaselineEntryApi & {
+                        _area: string
+                        _stability: string[]
+                        _theme: 'dark' | 'light' | null
+                        _typeKey: string
+                    }
+                >,
+                overview: BaselineOverviewApi | null
+            ): Record<StatPreset, number> => {
                 const totals = overview?.totals
                 // When the filter set is "neutral" (preset=all) we want the
                 // stat row to show the full universe counts even if entries
@@ -289,7 +451,17 @@ export const visualReviewSnapshotOverviewSceneLogic = kea<visualReviewSnapshotOv
         // (otherwise picking a TYPE would zero out every other TYPE bucket).
         facetGroups: [
             (s) => [s.decoratedEntries, s.filters],
-            (entries, filters): FacetGroups => {
+            (
+                entries: Array<
+                    BaselineEntryApi & {
+                        _area: string
+                        _stability: string[]
+                        _theme: 'dark' | 'light' | null
+                        _typeKey: string
+                    }
+                >,
+                filters: Filters
+            ): FacetGroups => {
                 const typeBase = applyFilters(entries, filters, 'typeKeys')
                 const areaBase = applyFilters(entries, filters, 'areas')
                 const stabilityBase = applyFilters(entries, filters, 'stability')
@@ -310,7 +482,7 @@ export const visualReviewSnapshotOverviewSceneLogic = kea<visualReviewSnapshotOv
         ],
         facetSelection: [
             (s) => [s.filters],
-            (filters): FacetSelection => ({
+            (filters: Filters): FacetSelection => ({
                 type: new Set(filters.typeKeys),
                 area: new Set(filters.areas),
                 stability: new Set(filters.stability),
@@ -318,13 +490,13 @@ export const visualReviewSnapshotOverviewSceneLogic = kea<visualReviewSnapshotOv
         ],
         thumbnailBasePath: [
             (s) => [s.currentProjectId, (_, p) => p.repoId],
-            (projectId, repoId): string | null =>
+            (projectId: number | string, repoId): string | null =>
                 projectId ? `/api/projects/${projectId}/visual_review/repos/${repoId}/thumbnails` : null,
         ],
         // Single scene crumb — see runs scene for why we collapse to one.
         breadcrumbs: [
             (s) => [s.repo],
-            (repo): Breadcrumb[] => [
+            (repo: null | import('../generated/api.schemas').RepoApi): Breadcrumb[] => [
                 {
                     key: ['visual_review_repo', repo?.id ?? 'unknown'],
                     name: repo?.repo_full_name ?? 'Visual review',
diff --git a/products/wizard/frontend/wizardSessionStreamLogic.ts b/products/wizard/frontend/wizardSessionStreamLogic.ts
index 746752982555..847d3a380c67 100644
--- a/products/wizard/frontend/wizardSessionStreamLogic.ts
+++ b/products/wizard/frontend/wizardSessionStreamLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers } from 'kea'
 import posthog from 'posthog-js'
 
 import { FEATURE_FLAGS } from 'lib/constants'
@@ -13,9 +13,9 @@ import {
 import { logSyncDebug } from 'lib/wizard-sync/wizardSyncDebugLogic'
 import { projectLogic } from 'scenes/projectLogic'
 
+import type { FeatureFlagsSet } from '../../../frontend/src/lib/logic/featureFlagLogic'
 import { getWizardSessionsStreamRetrieveUrl, wizardSessionsLatestRetrieve } from './generated/api'
 import type { WizardSessionDTOApi } from './generated/api.schemas'
-import type { wizardSessionStreamLogicType } from './wizardSessionStreamLogicType'
 
 export type WizardConnectionStatus = 'idle' | 'connecting' | 'open' | 'closed' | 'error'
 
@@ -29,6 +29,46 @@ export interface WizardSessionStreamLogicProps {
     skillId?: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface wizardSessionStreamLogicValues {
+    featureFlags: FeatureFlagsSet // featureFlagLogic
+    currentProjectId: number | null // projectLogic
+    connectionStatus: WizardConnectionStatus
+    lastError: string | null
+    latestSession: WizardSessionDTOApi | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface wizardSessionStreamLogicActions {
+    connect: () => {
+        value: true
+    }
+    connectionErrored: (error: string) => {
+        error: string
+    }
+    connectionOpened: () => {
+        value: true
+    }
+    disconnect: () => {
+        value: true
+    }
+    sessionUpdated: (session: WizardSessionDTOApi) => {
+        session: WizardSessionDTOApi
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface wizardSessionStreamLogicMeta {
+    key: string
+}
+
+export type wizardSessionStreamLogicType = MakeLogicType<
+    wizardSessionStreamLogicValues,
+    wizardSessionStreamLogicActions,
+    WizardSessionStreamLogicProps,
+    wizardSessionStreamLogicMeta
+>
+
 /**
  * Subscribes to the SSE stream for a wizard workflow (optionally a specific skill)
  * and exposes the latest WizardSession state plus connection status.
diff --git a/products/workflows/frontend/Channels/APNSSetup/apnsSetupModalLogic.ts b/products/workflows/frontend/Channels/APNSSetup/apnsSetupModalLogic.ts
index 3c0e42ed3f9e..fd1ff2b45077 100644
--- a/products/workflows/frontend/Channels/APNSSetup/apnsSetupModalLogic.ts
+++ b/products/workflows/frontend/Channels/APNSSetup/apnsSetupModalLogic.ts
@@ -1,5 +1,6 @@
-import { connect, kea, path, props } from 'kea'
+import { MakeLogicType, connect, kea, path, props } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 
 import api from 'lib/api'
 import { integrationsLogic } from 'lib/integrations/integrationsLogic'
@@ -7,8 +8,6 @@ import { lemonToast } from 'lib/lemon-ui/LemonToast'
 
 import { IntegrationType } from '~/types'
 
-import type { apnsSetupModalLogicType } from './apnsSetupModalLogicType'
-
 export interface APNSSetupModalLogicProps {
     integration?: IntegrationType | null
     onComplete: (integrationId?: number) => void
@@ -23,6 +22,142 @@ export interface APNSFormType {
     environment: 'production' | 'sandbox'
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface apnsSetupModalLogicValues {
+    apnsIntegration: {
+        bundleId: string
+        environment: 'production'
+        keyId: string
+        signingKey: string
+        teamId: string
+    }
+    apnsIntegrationAllErrors: Record<string, any>
+    apnsIntegrationChanged: boolean
+    apnsIntegrationErrors: DeepPartialMap<
+        {
+            bundleId: string
+            environment: 'production'
+            keyId: string
+            signingKey: string
+            teamId: string
+        },
+        ValidationErrorType
+    >
+    apnsIntegrationHasErrors: boolean
+    apnsIntegrationManualErrors: Record<string, any>
+    apnsIntegrationTouched: boolean
+    apnsIntegrationTouches: Record<string, boolean>
+    apnsIntegrationValidationErrors: DeepPartialMap<
+        {
+            bundleId: string
+            environment: 'production'
+            keyId: string
+            signingKey: string
+            teamId: string
+        },
+        ValidationErrorType
+    >
+    isApnsIntegrationSubmitting: boolean
+    isApnsIntegrationValid: boolean
+    showApnsIntegrationErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface apnsSetupModalLogicActions {
+    loadIntegrations: () => any // integrationsLogic
+    resetApnsIntegration: (values?: {
+        bundleId: string
+        environment: 'production'
+        keyId: string
+        signingKey: string
+        teamId: string
+    }) => {
+        values?: {
+            bundleId: string
+            environment: 'production'
+            keyId: string
+            signingKey: string
+            teamId: string
+        }
+    }
+    setApnsIntegrationManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setApnsIntegrationValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setApnsIntegrationValues: (
+        values: DeepPartial<{
+            bundleId: string
+            environment: 'production'
+            keyId: string
+            signingKey: string
+            teamId: string
+        }>
+    ) => {
+        values: DeepPartial<{
+            bundleId: string
+            environment: 'production'
+            keyId: string
+            signingKey: string
+            teamId: string
+        }>
+    }
+    submitApnsIntegration: () => {
+        value: boolean
+    }
+    submitApnsIntegrationFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitApnsIntegrationRequest: (apnsIntegration: {
+        bundleId: string
+        environment: 'production'
+        keyId: string
+        signingKey: string
+        teamId: string
+    }) => {
+        apnsIntegration: {
+            bundleId: string
+            environment: 'production'
+            keyId: string
+            signingKey: string
+            teamId: string
+        }
+    }
+    submitApnsIntegrationSuccess: (apnsIntegration: {
+        bundleId: string
+        environment: 'production'
+        keyId: string
+        signingKey: string
+        teamId: string
+    }) => {
+        apnsIntegration: {
+            bundleId: string
+            environment: 'production'
+            keyId: string
+            signingKey: string
+            teamId: string
+        }
+    }
+    touchApnsIntegrationField: (key: string) => {
+        key: string
+    }
+}
+
+export type apnsSetupModalLogicType = MakeLogicType<
+    apnsSetupModalLogicValues,
+    apnsSetupModalLogicActions,
+    APNSSetupModalLogicProps
+>
+
 export const apnsSetupModalLogic = kea<apnsSetupModalLogicType>([
     path(['products', 'workflows', 'frontend', 'APNSSetup', 'apnsSetupModalLogic']),
     props({} as APNSSetupModalLogicProps),
diff --git a/products/workflows/frontend/Channels/EmailSetup/emailSetupModalLogic.ts b/products/workflows/frontend/Channels/EmailSetup/emailSetupModalLogic.ts
index 709588c4c9e8..d0e3a4f85324 100644
--- a/products/workflows/frontend/Channels/EmailSetup/emailSetupModalLogic.ts
+++ b/products/workflows/frontend/Channels/EmailSetup/emailSetupModalLogic.ts
@@ -1,5 +1,6 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 
 import api, { ApiError } from 'lib/api'
@@ -8,7 +9,7 @@ import { lemonToast } from 'lib/lemon-ui/LemonToast'
 
 import { IntegrationType } from '~/types'
 
-import type { emailSetupModalLogicType } from './emailSetupModalLogicType'
+import type { EmailSenderDomainStatus } from '../../../../../frontend/src/types'
 
 export interface EmailSetupModalLogicProps {
     integration?: IntegrationType | null
@@ -61,6 +62,111 @@ const getEmailSenderFromIntegration = (integration: IntegrationType): EmailSende
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface emailSetupModalLogicValues {
+    integrations: IntegrationType[] | null // integrationsLogic
+    integrationsLoading: boolean // integrationsLogic
+    dnsRecords: DnsRecord[]
+    domain: string
+    emailSender: EmailSenderFormType
+    emailSenderAllErrors: Record<string, any>
+    emailSenderChanged: boolean
+    emailSenderErrors: DeepPartialMap<EmailSenderFormType, ValidationErrorType>
+    emailSenderHasErrors: boolean
+    emailSenderManualErrors: Record<string, any>
+    emailSenderTouched: boolean
+    emailSenderTouches: Record<string, boolean>
+    emailSenderValidationErrors: DeepPartialMap<EmailSenderFormType, ValidationErrorType>
+    isDomainVerified: boolean
+    isEmailSenderSubmitting: boolean
+    isEmailSenderValid: boolean
+    savedIntegration: IntegrationType | null
+    showEmailSenderErrors: boolean
+    verification: any
+    verificationLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface emailSetupModalLogicActions {
+    loadIntegrations: () => any // integrationsLogic
+    resetEmailSender: (values?: EmailSenderFormType) => {
+        values?: EmailSenderFormType
+    }
+    setEmailSenderManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setEmailSenderValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setEmailSenderValues: (values: DeepPartial<EmailSenderFormType>) => {
+        values: DeepPartial<EmailSenderFormType>
+    }
+    setSavedIntegration: (integration: IntegrationType | null) => {
+        integration: IntegrationType | null
+    }
+    submitEmailSender: () => {
+        value: boolean
+    }
+    submitEmailSenderFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitEmailSenderRequest: (emailSender: EmailSenderFormType) => {
+        emailSender: EmailSenderFormType
+    }
+    submitEmailSenderSuccess: (emailSender: EmailSenderFormType) => {
+        emailSender: EmailSenderFormType
+    }
+    touchEmailSenderField: (key: string) => {
+        key: string
+    }
+    verifyDomain: () => {
+        value: true
+    }
+    verifyDomainFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    verifyDomainSuccess: (
+        verification: EmailSenderDomainStatus | undefined,
+        payload?: {
+            value: true
+        }
+    ) => {
+        verification: EmailSenderDomainStatus | undefined
+        payload?: {
+            value: true
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface emailSetupModalLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        dnsRecords: (verification: any, savedIntegration: IntegrationType | null) => DnsRecord[]
+        domain: (emailSender: EmailSenderFormType) => string
+        isDomainVerified: (verification: any) => boolean
+    }
+}
+
+export type emailSetupModalLogicType = MakeLogicType<
+    emailSetupModalLogicValues,
+    emailSetupModalLogicActions,
+    EmailSetupModalLogicProps,
+    emailSetupModalLogicMeta
+>
+
 export const emailSetupModalLogic = kea<emailSetupModalLogicType>([
     path(['products', 'workflows', 'frontend', 'EmailSetup', 'emailSetupModalLogic']),
     props({} as EmailSetupModalLogicProps),
diff --git a/products/workflows/frontend/Channels/FCMSetup/fcmSetupModalLogic.ts b/products/workflows/frontend/Channels/FCMSetup/fcmSetupModalLogic.ts
index 44041cdd8e0f..711f46d6ad1a 100644
--- a/products/workflows/frontend/Channels/FCMSetup/fcmSetupModalLogic.ts
+++ b/products/workflows/frontend/Channels/FCMSetup/fcmSetupModalLogic.ts
@@ -1,5 +1,6 @@
-import { connect, kea, path, props } from 'kea'
+import { MakeLogicType, connect, kea, path, props } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 
 import api from 'lib/api'
 import { integrationsLogic } from 'lib/integrations/integrationsLogic'
@@ -7,8 +8,6 @@ import { lemonToast } from 'lib/lemon-ui/LemonToast'
 
 import { IntegrationType } from '~/types'
 
-import type { fcmSetupModalLogicType } from './fcmSetupModalLogicType'
-
 export interface FCMSetupModalLogicProps {
     integration?: IntegrationType | null
     onComplete: (integrationId?: number) => void
@@ -19,6 +18,92 @@ export interface FCMFormType {
     serviceAccountKey: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface fcmSetupModalLogicValues {
+    fcmIntegration: {
+        serviceAccountKey: string
+    }
+    fcmIntegrationAllErrors: Record<string, any>
+    fcmIntegrationChanged: boolean
+    fcmIntegrationErrors: DeepPartialMap<
+        {
+            serviceAccountKey: string
+        },
+        ValidationErrorType
+    >
+    fcmIntegrationHasErrors: boolean
+    fcmIntegrationManualErrors: Record<string, any>
+    fcmIntegrationTouched: boolean
+    fcmIntegrationTouches: Record<string, boolean>
+    fcmIntegrationValidationErrors: DeepPartialMap<
+        {
+            serviceAccountKey: string
+        },
+        ValidationErrorType
+    >
+    isFcmIntegrationSubmitting: boolean
+    isFcmIntegrationValid: boolean
+    showFcmIntegrationErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface fcmSetupModalLogicActions {
+    loadIntegrations: () => any // integrationsLogic
+    resetFcmIntegration: (values?: { serviceAccountKey: string }) => {
+        values?: {
+            serviceAccountKey: string
+        }
+    }
+    setFcmIntegrationManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setFcmIntegrationValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setFcmIntegrationValues: (
+        values: DeepPartial<{
+            serviceAccountKey: string
+        }>
+    ) => {
+        values: DeepPartial<{
+            serviceAccountKey: string
+        }>
+    }
+    submitFcmIntegration: () => {
+        value: boolean
+    }
+    submitFcmIntegrationFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitFcmIntegrationRequest: (fcmIntegration: { serviceAccountKey: string }) => {
+        fcmIntegration: {
+            serviceAccountKey: string
+        }
+    }
+    submitFcmIntegrationSuccess: (fcmIntegration: { serviceAccountKey: string }) => {
+        fcmIntegration: {
+            serviceAccountKey: string
+        }
+    }
+    touchFcmIntegrationField: (key: string) => {
+        key: string
+    }
+}
+
+export type fcmSetupModalLogicType = MakeLogicType<
+    fcmSetupModalLogicValues,
+    fcmSetupModalLogicActions,
+    FCMSetupModalLogicProps
+>
+
 export const fcmSetupModalLogic = kea<fcmSetupModalLogicType>([
     path(['products', 'workflows', 'frontend', 'FCMSetup', 'fcmSetupModalLogic']),
     props({} as FCMSetupModalLogicProps),
diff --git a/products/workflows/frontend/Channels/SlackSetup/slackSetupModalLogic.ts b/products/workflows/frontend/Channels/SlackSetup/slackSetupModalLogic.ts
index 318828dbee80..635b5c4263cd 100644
--- a/products/workflows/frontend/Channels/SlackSetup/slackSetupModalLogic.ts
+++ b/products/workflows/frontend/Channels/SlackSetup/slackSetupModalLogic.ts
@@ -1,5 +1,6 @@
-import { connect, kea, path, props } from 'kea'
+import { MakeLogicType, connect, kea, path, props } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 
 import api from 'lib/api'
 import { integrationsLogic } from 'lib/integrations/integrationsLogic'
@@ -8,7 +9,7 @@ import { userLogic } from 'scenes/userLogic'
 
 import { IntegrationType } from '~/types'
 
-import type { slackSetupModalLogicType } from './slackSetupModalLogicType'
+import type { UserType } from '../../../../../frontend/src/types'
 
 export interface SlackSetupModalLogicProps {
     integration?: IntegrationType | null
@@ -21,6 +22,104 @@ export interface SlackFormType {
     channelId: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface slackSetupModalLogicValues {
+    integrations: IntegrationType[] | null // integrationsLogic
+    integrationsLoading: boolean // integrationsLogic
+    slackAvailable: boolean | undefined // integrationsLogic
+    user: UserType | null // userLogic
+    isSlackIntegrationSubmitting: boolean
+    isSlackIntegrationValid: boolean
+    showSlackIntegrationErrors: boolean
+    slackIntegration: {
+        botToken: string
+        channelId: string
+    }
+    slackIntegrationAllErrors: Record<string, any>
+    slackIntegrationChanged: boolean
+    slackIntegrationErrors: DeepPartialMap<
+        {
+            botToken: string
+            channelId: string
+        },
+        ValidationErrorType
+    >
+    slackIntegrationHasErrors: boolean
+    slackIntegrationManualErrors: Record<string, any>
+    slackIntegrationTouched: boolean
+    slackIntegrationTouches: Record<string, boolean>
+    slackIntegrationValidationErrors: DeepPartialMap<
+        {
+            botToken: string
+            channelId: string
+        },
+        ValidationErrorType
+    >
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface slackSetupModalLogicActions {
+    loadIntegrations: () => any // integrationsLogic
+    resetSlackIntegration: (values?: { botToken: string; channelId: string }) => {
+        values?: {
+            botToken: string
+            channelId: string
+        }
+    }
+    setSlackIntegrationManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setSlackIntegrationValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setSlackIntegrationValues: (
+        values: DeepPartial<{
+            botToken: string
+            channelId: string
+        }>
+    ) => {
+        values: DeepPartial<{
+            botToken: string
+            channelId: string
+        }>
+    }
+    submitSlackIntegration: () => {
+        value: boolean
+    }
+    submitSlackIntegrationFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitSlackIntegrationRequest: (slackIntegration: { botToken: string; channelId: string }) => {
+        slackIntegration: {
+            botToken: string
+            channelId: string
+        }
+    }
+    submitSlackIntegrationSuccess: (slackIntegration: { botToken: string; channelId: string }) => {
+        slackIntegration: {
+            botToken: string
+            channelId: string
+        }
+    }
+    touchSlackIntegrationField: (key: string) => {
+        key: string
+    }
+}
+
+export type slackSetupModalLogicType = MakeLogicType<
+    slackSetupModalLogicValues,
+    slackSetupModalLogicActions,
+    SlackSetupModalLogicProps
+>
+
 export const slackSetupModalLogic = kea<slackSetupModalLogicType>([
     path(['products', 'workflows', 'frontend', 'SlackSetup', 'slackSetupModalLogic']),
     props({} as SlackSetupModalLogicProps),
diff --git a/products/workflows/frontend/Channels/TwilioSetup/twilioSetupModalLogic.ts b/products/workflows/frontend/Channels/TwilioSetup/twilioSetupModalLogic.ts
index 714cec813cf7..ba65b0a76cdc 100644
--- a/products/workflows/frontend/Channels/TwilioSetup/twilioSetupModalLogic.ts
+++ b/products/workflows/frontend/Channels/TwilioSetup/twilioSetupModalLogic.ts
@@ -1,5 +1,6 @@
-import { connect, kea, path, props } from 'kea'
+import { MakeLogicType, connect, kea, path, props } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 
 import api from 'lib/api'
 import { integrationsLogic } from 'lib/integrations/integrationsLogic'
@@ -7,8 +8,6 @@ import { lemonToast } from 'lib/lemon-ui/LemonToast'
 
 import { IntegrationType } from '~/types'
 
-import type { twilioSetupModalLogicType } from './twilioSetupModalLogicType'
-
 export interface TwilioSetupModalLogicProps {
     integration?: IntegrationType | null
     onComplete: (integrationId?: number) => void
@@ -20,6 +19,100 @@ export interface TwilioFormType {
     authToken: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface twilioSetupModalLogicValues {
+    isTwilioIntegrationSubmitting: boolean
+    isTwilioIntegrationValid: boolean
+    showTwilioIntegrationErrors: boolean
+    twilioIntegration: {
+        accountSid: string
+        authToken: string
+    }
+    twilioIntegrationAllErrors: Record<string, any>
+    twilioIntegrationChanged: boolean
+    twilioIntegrationErrors: DeepPartialMap<
+        {
+            accountSid: string
+            authToken: string
+        },
+        ValidationErrorType
+    >
+    twilioIntegrationHasErrors: boolean
+    twilioIntegrationManualErrors: Record<string, any>
+    twilioIntegrationTouched: boolean
+    twilioIntegrationTouches: Record<string, boolean>
+    twilioIntegrationValidationErrors: DeepPartialMap<
+        {
+            accountSid: string
+            authToken: string
+        },
+        ValidationErrorType
+    >
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface twilioSetupModalLogicActions {
+    loadIntegrations: () => any // integrationsLogic
+    resetTwilioIntegration: (values?: { accountSid: string; authToken: string }) => {
+        values?: {
+            accountSid: string
+            authToken: string
+        }
+    }
+    setTwilioIntegrationManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setTwilioIntegrationValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setTwilioIntegrationValues: (
+        values: DeepPartial<{
+            accountSid: string
+            authToken: string
+        }>
+    ) => {
+        values: DeepPartial<{
+            accountSid: string
+            authToken: string
+        }>
+    }
+    submitTwilioIntegration: () => {
+        value: boolean
+    }
+    submitTwilioIntegrationFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitTwilioIntegrationRequest: (twilioIntegration: { accountSid: string; authToken: string }) => {
+        twilioIntegration: {
+            accountSid: string
+            authToken: string
+        }
+    }
+    submitTwilioIntegrationSuccess: (twilioIntegration: { accountSid: string; authToken: string }) => {
+        twilioIntegration: {
+            accountSid: string
+            authToken: string
+        }
+    }
+    touchTwilioIntegrationField: (key: string) => {
+        key: string
+    }
+}
+
+export type twilioSetupModalLogicType = MakeLogicType<
+    twilioSetupModalLogicValues,
+    twilioSetupModalLogicActions,
+    TwilioSetupModalLogicProps
+>
+
 export const twilioSetupModalLogic = kea<twilioSetupModalLogicType>([
     path(['products', 'workflows', 'frontend', 'TwilioSetup', 'twilioSetupModalLogic']),
     props({} as TwilioSetupModalLogicProps),
diff --git a/products/workflows/frontend/Channels/messageChannelLogic.ts b/products/workflows/frontend/Channels/messageChannelLogic.ts
index 63f4895dcb10..dbced003b2e4 100644
--- a/products/workflows/frontend/Channels/messageChannelLogic.ts
+++ b/products/workflows/frontend/Channels/messageChannelLogic.ts
@@ -1,13 +1,35 @@
-import { kea, key, path, props, selectors } from 'kea'
+import { MakeLogicType, kea, key, path, props, selectors } from 'kea'
 
 import { IntegrationType } from '~/types'
 
-import type { messageChannelLogicType } from './messageChannelLogicType'
-
 export interface MessageChannelLogicProps {
     integration?: IntegrationType
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface messageChannelLogicValues {
+    displayName: string
+    isVerificationRequired: boolean
+    isVerified: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface messageChannelLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        displayName: (arg: any) => string
+        isVerificationRequired: (arg: any) => boolean
+        isVerified: (arg: any) => boolean
+    }
+}
+
+export type messageChannelLogicType = MakeLogicType<
+    messageChannelLogicValues,
+    {},
+    MessageChannelLogicProps,
+    messageChannelLogicMeta
+>
+
 export const messageChannelLogic = kea<messageChannelLogicType>([
     path(['products', 'workflows', 'frontend', 'messageChannelLogic']),
     props({} as MessageChannelLogicProps),
diff --git a/products/workflows/frontend/OptOuts/customerIOImportLogic.ts b/products/workflows/frontend/OptOuts/customerIOImportLogic.ts
index f9b8d61f9abd..dbb7c6ee5dcb 100644
--- a/products/workflows/frontend/OptOuts/customerIOImportLogic.ts
+++ b/products/workflows/frontend/OptOuts/customerIOImportLogic.ts
@@ -1,5 +1,6 @@
-import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 
 import { ApiRequest, getCookie } from 'lib/api'
@@ -7,7 +8,7 @@ import { lemonToast } from 'lib/lemon-ui/LemonToast'
 import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
 import { teamLogic } from 'scenes/teamLogic'
 
-import type { customerIOImportLogicType } from './customerIOImportLogicType'
+import type { PreflightStatus } from '../../../../frontend/src/types'
 import { optOutCategoriesLogic } from './optOutCategoriesLogic'
 
 export interface ImportFormValues {
@@ -68,6 +69,213 @@ export interface OptOutSyncConfigResponse {
     has_track_credentials: boolean
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface customerIOImportLogicValues {
+    preflight: PreflightStatus | null // preflightLogic
+    currentTeamIdStrict: number | string // teamLogic
+    csvFile: File | null
+    csvProgress: CSVImportProgress | null
+    hasTrackCredentials: boolean
+    importError: string | null
+    importForm: ImportFormValues
+    importFormAllErrors: Record<string, any>
+    importFormChanged: boolean
+    importFormErrors: DeepPartialMap<ImportFormValues, ValidationErrorType>
+    importFormHasErrors: boolean
+    importFormManualErrors: Record<string, any>
+    importFormTouched: boolean
+    importFormTouches: Record<string, boolean>
+    importFormValidationErrors: DeepPartialMap<ImportFormValues, ValidationErrorType>
+    importProgress: ImportProgress | null
+    isImportComplete: boolean
+    isImportFailed: boolean
+    isImportFormSubmitting: boolean
+    isImportFormValid: boolean
+    isImportModalOpen: boolean
+    isImporting: boolean
+    isRemovingAppConfig: boolean
+    isRemovingTrackConfig: boolean
+    isRemovingWebhookConfig: boolean
+    isSavingTrack: boolean
+    isSavingWebhook: boolean
+    isUploadingCSV: boolean
+    showImportFormErrors: boolean
+    stepCompletion: {
+        step1: 'completed' | 'failed' | false
+        step2: 'completed' | 'failed' | false
+        step3: 'completed' | false
+        step4: 'completed' | false
+    }
+    syncConfig: OptOutSyncConfigResponse | null
+    syncConfigLoading: boolean
+    trackApiKey: string
+    trackEnabled: boolean
+    trackError: string | null
+    trackRegion: string
+    trackSiteId: string
+    webhookError: string | null
+    webhookSigningSecret: string
+    webhookUrl: string
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface customerIOImportLogicActions {
+    closeImportModal: () => {
+        value: true
+    }
+    loadSyncConfig: () => any
+    loadSyncConfigFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSyncConfigSuccess: (
+        syncConfig: OptOutSyncConfigResponse | null,
+        payload?: any
+    ) => {
+        syncConfig: OptOutSyncConfigResponse | null
+        payload?: any
+    }
+    openImportModal: () => {
+        value: true
+    }
+    removeAppConfig: () => {
+        value: true
+    }
+    removeTrackConfig: () => {
+        value: true
+    }
+    removeWebhookConfig: () => {
+        value: true
+    }
+    rerunImport: () => {
+        value: true
+    }
+    resetImport: () => {
+        value: true
+    }
+    resetImportForm: (values?: ImportFormValues) => {
+        values?: ImportFormValues
+    }
+    saveTrackConfig: () => {
+        value: true
+    }
+    saveWebhookConfig: () => {
+        value: true
+    }
+    setCSVFile: (file: File | null) => {
+        file: File | null
+    }
+    setCSVProgress: (csvProgress: CSVImportProgress | null) => {
+        csvProgress: CSVImportProgress | null
+    }
+    setImportError: (error: string | null) => {
+        error: string | null
+    }
+    setImportFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setImportFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setImportFormValues: (values: DeepPartial<ImportFormValues>) => {
+        values: DeepPartial<ImportFormValues>
+    }
+    setImportProgress: (importProgress: ImportProgress) => {
+        importProgress: ImportProgress
+    }
+    setIsSavingTrack: (isSaving: boolean) => {
+        isSaving: boolean
+    }
+    setIsSavingWebhook: (isSaving: boolean) => {
+        isSaving: boolean
+    }
+    setIsUploadingCSV: (isUploading: boolean) => {
+        isUploading: boolean
+    }
+    setTrackApiKey: (apiKey: string) => {
+        apiKey: string
+    }
+    setTrackError: (error: string | null) => {
+        error: string | null
+    }
+    setTrackRegion: (region: string) => {
+        region: string
+    }
+    setTrackSiteId: (siteId: string) => {
+        siteId: string
+    }
+    setWebhookError: (error: string | null) => {
+        error: string | null
+    }
+    setWebhookSigningSecret: (secret: string) => {
+        secret: string
+    }
+    submitImportForm: () => {
+        value: boolean
+    }
+    submitImportFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitImportFormRequest: (importForm: ImportFormValues) => {
+        importForm: ImportFormValues
+    }
+    submitImportFormSuccess: (importForm: ImportFormValues) => {
+        importForm: ImportFormValues
+    }
+    toggleTrackSync: (enabled: boolean) => {
+        enabled: boolean
+    }
+    toggleWebhook: (enabled: boolean) => {
+        enabled: boolean
+    }
+    touchImportFormField: (key: string) => {
+        key: string
+    }
+    uploadCSV: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface customerIOImportLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        isImporting: (isImportFormSubmitting: boolean, importProgress: ImportProgress | null) => boolean
+        isImportComplete: (importProgress: ImportProgress | null) => boolean
+        isImportFailed: (importProgress: ImportProgress | null) => boolean
+        webhookUrl: (currentTeamIdStrict: number | string) => string
+        stepCompletion: (
+            syncConfig: OptOutSyncConfigResponse | null,
+            importProgress: ImportProgress | null,
+            csvProgress: CSVImportProgress | null
+        ) => {
+            step1: 'completed' | 'failed' | false
+            step2: 'completed' | 'failed' | false
+            step3: 'completed' | false
+            step4: 'completed' | false
+        }
+        trackEnabled: (syncConfig: OptOutSyncConfigResponse | null) => boolean
+        hasTrackCredentials: (syncConfig: OptOutSyncConfigResponse | null) => boolean
+    }
+}
+
+export type customerIOImportLogicType = MakeLogicType<
+    customerIOImportLogicValues,
+    customerIOImportLogicActions,
+    Record<string, any>,
+    customerIOImportLogicMeta
+>
+
 export const customerIOImportLogic = kea<customerIOImportLogicType>([
     path(['products', 'workflows', 'customerIOImportLogic']),
     connect(() => ({
@@ -265,14 +473,20 @@ export const customerIOImportLogic = kea<customerIOImportLogicType>([
     selectors({
         isImporting: [
             (s) => [s.isImportFormSubmitting, s.importProgress],
-            (isImportFormSubmitting, importProgress) =>
+            (isImportFormSubmitting: boolean, importProgress: ImportProgress | null) =>
                 isImportFormSubmitting || importProgress?.status === 'importing',
         ],
-        isImportComplete: [(s) => [s.importProgress], (importProgress) => importProgress?.status === 'completed'],
-        isImportFailed: [(s) => [s.importProgress], (importProgress) => importProgress?.status === 'failed'],
+        isImportComplete: [
+            (s) => [s.importProgress],
+            (importProgress: ImportProgress | null) => importProgress?.status === 'completed',
+        ],
+        isImportFailed: [
+            (s) => [s.importProgress],
+            (importProgress: ImportProgress | null) => importProgress?.status === 'failed',
+        ],
         webhookUrl: [
             (s) => [s.currentTeamIdStrict],
-            (currentTeamIdStrict): string => {
+            (currentTeamIdStrict: number | string): string => {
                 const host = window.location.origin
                 return `${host}/api/environments/${currentTeamIdStrict}/messaging/customerio/webhook/`
             },
@@ -280,9 +494,9 @@ export const customerIOImportLogic = kea<customerIOImportLogicType>([
         stepCompletion: [
             (s) => [s.syncConfig, s.importProgress, s.csvProgress],
             (
-                syncConfig,
-                importProgress,
-                csvProgress
+                syncConfig: OptOutSyncConfigResponse | null,
+                importProgress: ImportProgress | null,
+                csvProgress: CSVImportProgress | null
             ): {
                 step1: 'completed' | 'failed' | false
                 step2: 'completed' | 'failed' | false
@@ -308,10 +522,13 @@ export const customerIOImportLogic = kea<customerIOImportLogicType>([
                 }
             },
         ],
-        trackEnabled: [(s) => [s.syncConfig], (syncConfig): boolean => syncConfig?.track_enabled ?? false],
+        trackEnabled: [
+            (s) => [s.syncConfig],
+            (syncConfig: OptOutSyncConfigResponse | null): boolean => syncConfig?.track_enabled ?? false,
+        ],
         hasTrackCredentials: [
             (s) => [s.syncConfig],
-            (syncConfig): boolean => syncConfig?.has_track_credentials ?? false,
+            (syncConfig: OptOutSyncConfigResponse | null): boolean => syncConfig?.has_track_credentials ?? false,
         ],
     }),
     listeners(({ actions, values }) => ({
diff --git a/products/workflows/frontend/OptOuts/newCategoryLogic.ts b/products/workflows/frontend/OptOuts/newCategoryLogic.ts
index d7e83ce6319d..bf2fccbaca6b 100644
--- a/products/workflows/frontend/OptOuts/newCategoryLogic.ts
+++ b/products/workflows/frontend/OptOuts/newCategoryLogic.ts
@@ -1,10 +1,10 @@
-import { actions, kea, key, listeners, path, props } from 'kea'
+import { MakeLogicType, actions, kea, key, listeners, path, props } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 
 import api from 'lib/api'
 import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
 
-import type { newCategoryLogicType } from './newCategoryLogicType'
 import { MessageCategory, optOutCategoriesLogic } from './optOutCategoriesLogic'
 
 export type CategoryForm = {
@@ -28,6 +28,79 @@ const NEW_CATEGORY: CategoryForm = {
     category_type: 'marketing',
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface newCategoryLogicValues {
+    categoryForm: CategoryForm
+    categoryFormAllErrors: Record<string, any>
+    categoryFormChanged: boolean
+    categoryFormErrors: DeepPartialMap<CategoryForm, ValidationErrorType>
+    categoryFormHasErrors: boolean
+    categoryFormManualErrors: Record<string, any>
+    categoryFormTouched: boolean
+    categoryFormTouches: Record<string, boolean>
+    categoryFormValidationErrors: DeepPartialMap<CategoryForm, ValidationErrorType>
+    isCategoryFormSubmitting: boolean
+    isCategoryFormValid: boolean
+    showCategoryFormErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface newCategoryLogicActions {
+    resetCategoryForm: (values?: CategoryForm) => {
+        values?: CategoryForm
+    }
+    resetForm: () => {
+        value: true
+    }
+    setCategoryFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setCategoryFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setCategoryFormValues: (values: DeepPartial<CategoryForm>) => {
+        values: DeepPartial<CategoryForm>
+    }
+    submitCategoryForm: () => {
+        value: boolean
+    }
+    submitCategoryFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitCategoryFormRequest: (categoryForm: CategoryForm) => {
+        categoryForm: CategoryForm
+    }
+    submitCategoryFormSuccess: (categoryForm: CategoryForm) => {
+        categoryForm: CategoryForm
+    }
+    submitForm: () => {
+        value: true
+    }
+    touchCategoryFormField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface newCategoryLogicMeta {
+    key: string
+}
+
+export type newCategoryLogicType = MakeLogicType<
+    newCategoryLogicValues,
+    newCategoryLogicActions,
+    CategoryLogicProps,
+    newCategoryLogicMeta
+>
+
 export const newCategoryLogic = kea<newCategoryLogicType>([
     path(['products', 'workflows', 'frontend', 'OptOuts', 'newCategoryLogic']),
     props({} as CategoryLogicProps),
diff --git a/products/workflows/frontend/OptOuts/optOutCategoriesLogic.ts b/products/workflows/frontend/OptOuts/optOutCategoriesLogic.ts
index db11bdcb6e23..8d6b4eb08748 100644
--- a/products/workflows/frontend/OptOuts/optOutCategoriesLogic.ts
+++ b/products/workflows/frontend/OptOuts/optOutCategoriesLogic.ts
@@ -1,10 +1,8 @@
-import { actions, afterMount, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, listeners, path, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
 
-import type { optOutCategoriesLogicType } from './optOutCategoriesLogicType'
-
 export type MessageCategory = {
     id: string
     key: string
@@ -14,6 +12,49 @@ export type MessageCategory = {
     category_type: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface optOutCategoriesLogicValues {
+    categories: MessageCategory[]
+    categoriesLoading: boolean
+    isNewCategoryModalOpen: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface optOutCategoriesLogicActions {
+    closeNewCategoryModal: () => {
+        value: true
+    }
+    deleteCategory: (id: string) => {
+        id: string
+    }
+    loadCategories: () => {
+        value: true
+    }
+    loadCategoriesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadCategoriesSuccess: (
+        categories: MessageCategory[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        categories: MessageCategory[]
+        payload?: {
+            value: true
+        }
+    }
+    openNewCategoryModal: () => {
+        value: true
+    }
+}
+
+export type optOutCategoriesLogicType = MakeLogicType<optOutCategoriesLogicValues, optOutCategoriesLogicActions>
+
 export const optOutCategoriesLogic = kea<optOutCategoriesLogicType>([
     path(['products', 'workflows', 'frontend', 'OptOuts', 'optOutCategoriesLogic']),
 
diff --git a/products/workflows/frontend/OptOuts/optOutListLogic.ts b/products/workflows/frontend/OptOuts/optOutListLogic.ts
index ee2e750fd46c..b9f76024a6f1 100644
--- a/products/workflows/frontend/OptOuts/optOutListLogic.ts
+++ b/products/workflows/frontend/OptOuts/optOutListLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, key, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, path, props, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -6,7 +6,6 @@ import { lemonToast } from '@posthog/lemon-ui'
 import api, { CountedPaginatedResponse } from 'lib/api'
 
 import { MessageCategory } from './optOutCategoriesLogic'
-import type { optOutListLogicType } from './optOutListLogicType'
 import { optOutSceneLogic } from './optOutSceneLogic'
 import type { OptOutEntry, OptOutPersonPreference } from './types'
 
@@ -18,6 +17,131 @@ export type OptOutListLogicProps = {
     category?: MessageCategory
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface optOutListLogicValues {
+    preferencesUrlLoading: boolean // optOutSceneLogic
+    addOptOut: OptOutEntry | null
+    addOptOutLoading: boolean
+    currentPage: number
+    managePreferencesModalOpen: boolean
+    newOptOutIdentifier: string
+    optOutPersons: PaginatedOptOuts
+    optOutPersonsLoading: boolean
+    personsModalOpen: boolean
+    selectedIdentifier: string | null
+    showAddOptOutModal: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface optOutListLogicActions {
+    openPreferencesPage: (recipient?: string | undefined) => string // optOutSceneLogic
+    addOptOut: (identifier: string) => string
+    addOptOutFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    addOptOutSuccess: (
+        addOptOut: OptOutEntry,
+        payload?: string
+    ) => {
+        addOptOut: OptOutEntry
+        payload?: string
+    }
+    loadNextPage: () => {
+        value: true
+    }
+    loadNextPageFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadNextPageSuccess: (
+        optOutPersons: PaginatedOptOuts,
+        payload?: {
+            value: true
+        }
+    ) => {
+        optOutPersons: PaginatedOptOuts
+        payload?: {
+            value: true
+        }
+    }
+    loadOptOutPersons: () => any
+    loadOptOutPersonsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadOptOutPersonsSuccess: (
+        optOutPersons: PaginatedOptOuts,
+        payload?: any
+    ) => {
+        optOutPersons: PaginatedOptOuts
+        payload?: any
+    }
+    loadPreviousPage: () => {
+        value: true
+    }
+    loadPreviousPageFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadPreviousPageSuccess: (
+        optOutPersons: PaginatedOptOuts,
+        payload?: {
+            value: true
+        }
+    ) => {
+        optOutPersons: PaginatedOptOuts
+        payload?: {
+            value: true
+        }
+    }
+    loadUnsubscribeLink: () => {
+        value: true
+    }
+    setCurrentPage: (page: number) => {
+        page: number
+    }
+    setManagePreferencesModalOpen: (open: boolean) => {
+        open: boolean
+    }
+    setNewOptOutIdentifier: (identifier: string) => {
+        identifier: string
+    }
+    setPersonsModalOpen: (open: boolean) => {
+        open: boolean
+    }
+    setSelectedIdentifier: (identifier: string | null) => {
+        identifier: string | null
+    }
+    setShowAddOptOutModal: (show: boolean) => {
+        show: boolean
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface optOutListLogicMeta {
+    key: string
+}
+
+export type optOutListLogicType = MakeLogicType<
+    optOutListLogicValues,
+    optOutListLogicActions,
+    OptOutListLogicProps,
+    optOutListLogicMeta
+>
+
 export const optOutListLogic = kea<optOutListLogicType>([
     key((props) => props.category?.id || '$all'),
     path(['products', 'workflows', 'frontend', 'OptOuts', 'optOutListLogic']),
diff --git a/products/workflows/frontend/OptOuts/optOutSceneLogic.ts b/products/workflows/frontend/OptOuts/optOutSceneLogic.ts
index a538a82ae559..f51f8e75b803 100644
--- a/products/workflows/frontend/OptOuts/optOutSceneLogic.ts
+++ b/products/workflows/frontend/OptOuts/optOutSceneLogic.ts
@@ -1,4 +1,4 @@
-import { actions, connect, kea, path } from 'kea'
+import { MakeLogicType, actions, connect, kea, path } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -6,7 +6,38 @@ import { lemonToast } from '@posthog/lemon-ui'
 import api from 'lib/api'
 import { userLogic } from 'scenes/userLogic'
 
-import type { optOutSceneLogicType } from './optOutSceneLogicType'
+import type { UserType } from '../../../../frontend/src/types'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface optOutSceneLogicValues {
+    user: UserType | null // userLogic
+    preferencesUrl: string | null
+    preferencesUrlLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface optOutSceneLogicActions {
+    loadUnsubscribeLink: () => {
+        value: true
+    }
+    openPreferencesPage: (recipient?: string) => string
+    openPreferencesPageFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    openPreferencesPageSuccess: (
+        preferencesUrl: string | null,
+        payload?: string
+    ) => {
+        preferencesUrl: string | null
+        payload?: string
+    }
+}
+
+export type optOutSceneLogicType = MakeLogicType<optOutSceneLogicValues, optOutSceneLogicActions>
 
 export const optOutSceneLogic = kea<optOutSceneLogicType>([
     path(['products', 'workflows', 'frontend', 'OptOuts', 'optOutSceneLogic']),
diff --git a/products/workflows/frontend/TemplateLibrary/messageTemplateLogic.ts b/products/workflows/frontend/TemplateLibrary/messageTemplateLogic.ts
index bee180ad30fe..5d8403acf175 100644
--- a/products/workflows/frontend/TemplateLibrary/messageTemplateLogic.ts
+++ b/products/workflows/frontend/TemplateLibrary/messageTemplateLogic.ts
@@ -1,5 +1,6 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 import { beforeUnload, router } from 'kea-router'
 
@@ -9,8 +10,9 @@ import { deleteWithUndo } from 'lib/utils/deleteWithUndo'
 import { teamLogic } from 'scenes/teamLogic'
 import { urls } from 'scenes/urls'
 
+import type { EmailTemplate } from '../../../../frontend/src/scenes/hog-functions/email-templater/types'
+import type { HogFunctionType, UserBasicType } from '../../../../frontend/src/types'
 import { NEW_TEMPLATE } from './constants'
-import type { messageTemplateLogicType } from './messageTemplateLogicType'
 import { MessageTemplate } from './types'
 
 export interface MessageTemplateLogicProps {
@@ -18,6 +20,257 @@ export interface MessageTemplateLogicProps {
     messageId?: string | null
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface messageTemplateLogicValues {
+    currentTeamIdStrict: number | string // teamLogic
+    isTemplateSubmitting: boolean
+    isTemplateValid: boolean
+    logicProps: MessageTemplateLogicProps
+    message: any
+    messageLoading: boolean
+    originalTemplate: MessageTemplate
+    showTemplateErrors: boolean
+    template: MessageTemplate
+    templateAllErrors: Record<string, any>
+    templateChanged: boolean
+    templateErrors: DeepPartialMap<
+        {
+            content: {
+                email: EmailTemplate
+                templating: 'hog' | 'liquid'
+            }
+            created_at: string | null
+            created_by: UserBasicType | null
+            description: string
+            id: string
+            name: string
+            updated_at: string | null
+        },
+        ValidationErrorType
+    >
+    templateHasErrors: boolean
+    templateLoading: boolean
+    templateManualErrors: Record<string, any>
+    templateTouched: boolean
+    templateTouches: Record<string, boolean>
+    templateValidationErrors: DeepPartialMap<
+        {
+            content: {
+                email: EmailTemplate
+                templating: 'hog' | 'liquid'
+            }
+            created_at: string | null
+            created_by: UserBasicType | null
+            description: string
+            id: string
+            name: string
+            updated_at: string | null
+        },
+        ValidationErrorType
+    >
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface messageTemplateLogicActions {
+    deleteTemplate: () => {
+        value: true
+    }
+    duplicateTemplate: () => {
+        value: true
+    }
+    loadMessage: () => any
+    loadMessageFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadMessageSuccess: (
+        message: HogFunctionType | null,
+        payload?: any
+    ) => {
+        message: HogFunctionType | null
+        payload?: any
+    }
+    loadTemplate: () => any
+    loadTemplateFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadTemplateSuccess: (
+        template: MessageTemplate,
+        payload?: any
+    ) => {
+        template: MessageTemplate
+        payload?: any
+    }
+    resetTemplate: (values?: {
+        content: {
+            email: EmailTemplate
+            templating: 'hog' | 'liquid'
+        }
+        created_at: string | null
+        created_by: UserBasicType | null
+        description: string
+        id: string
+        name: string
+        updated_at: string | null
+    }) => {
+        values?: {
+            content: {
+                email: EmailTemplate
+                templating: 'hog' | 'liquid'
+            }
+            created_at: string | null
+            created_by: UserBasicType | null
+            description: string
+            id: string
+            name: string
+            updated_at: string | null
+        }
+    }
+    saveTemplate: (template: any) => any
+    saveTemplateFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    saveTemplateSuccess: (
+        template: MessageTemplate,
+        payload?: any
+    ) => {
+        template: MessageTemplate
+        payload?: any
+    }
+    setOriginalTemplate: (template: MessageTemplate) => {
+        template: MessageTemplate
+    }
+    setTemplate: (template: MessageTemplate) => {
+        template: MessageTemplate
+    }
+    setTemplateManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setTemplateValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setTemplateValues: (
+        values: DeepPartial<{
+            content: {
+                email: EmailTemplate
+                templating: 'hog' | 'liquid'
+            }
+            created_at: string | null
+            created_by: UserBasicType | null
+            description: string
+            id: string
+            name: string
+            updated_at: string | null
+        }>
+    ) => {
+        values: DeepPartial<{
+            content: {
+                email: EmailTemplate
+                templating: 'hog' | 'liquid'
+            }
+            created_at: string | null
+            created_by: UserBasicType | null
+            description: string
+            id: string
+            name: string
+            updated_at: string | null
+        }>
+    }
+    submitTemplate: () => {
+        value: boolean
+    }
+    submitTemplateFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitTemplateRequest: (template: {
+        content: {
+            email: EmailTemplate
+            templating: 'hog' | 'liquid'
+        }
+        created_at: string | null
+        created_by: UserBasicType | null
+        description: string
+        id: string
+        name: string
+        updated_at: string | null
+    }) => {
+        template: {
+            content: {
+                email: EmailTemplate
+                templating: 'hog' | 'liquid'
+            }
+            created_at: string | null
+            created_by: UserBasicType | null
+            description: string
+            id: string
+            name: string
+            updated_at: string | null
+        }
+    }
+    submitTemplateSuccess: (template: {
+        content: {
+            email: EmailTemplate
+            templating: 'hog' | 'liquid'
+        }
+        created_at: string | null
+        created_by: UserBasicType | null
+        description: string
+        id: string
+        name: string
+        updated_at: string | null
+    }) => {
+        template: {
+            content: {
+                email: EmailTemplate
+                templating: 'hog' | 'liquid'
+            }
+            created_at: string | null
+            created_by: UserBasicType | null
+            description: string
+            id: string
+            name: string
+            updated_at: string | null
+        }
+    }
+    touchTemplateField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface messageTemplateLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        logicProps: (arg: MessageTemplateLogicProps) => MessageTemplateLogicProps
+    }
+}
+
+export type messageTemplateLogicType = MakeLogicType<
+    messageTemplateLogicValues,
+    messageTemplateLogicActions,
+    MessageTemplateLogicProps,
+    messageTemplateLogicMeta
+>
+
 export const messageTemplateLogic = kea<messageTemplateLogicType>([
     path(['products', 'workflows', 'frontend', 'messageTemplateLogic']),
     props({} as MessageTemplateLogicProps),
diff --git a/products/workflows/frontend/TemplateLibrary/messageTemplateSceneLogic.ts b/products/workflows/frontend/TemplateLibrary/messageTemplateSceneLogic.ts
index 0a6a84e7b1f0..a2e0279d1322 100644
--- a/products/workflows/frontend/TemplateLibrary/messageTemplateSceneLogic.ts
+++ b/products/workflows/frontend/TemplateLibrary/messageTemplateSceneLogic.ts
@@ -1,4 +1,4 @@
-import { kea, path, props, selectors } from 'kea'
+import { MakeLogicType, kea, path, props, selectors } from 'kea'
 
 import { Scene } from 'scenes/sceneTypes'
 import { urls } from 'scenes/urls'
@@ -6,13 +6,30 @@ import { urls } from 'scenes/urls'
 import { FileSystemIconType } from '~/queries/schema/schema-general'
 import { Breadcrumb } from '~/types'
 
-import type { messageTemplateSceneLogicType } from './messageTemplateSceneLogicType'
-
 export interface MessageTemplateSceneLogicProps {
     id: string
     messageId?: string | null
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface messageTemplateSceneLogicValues {
+    breadcrumbs: Breadcrumb[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface messageTemplateSceneLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        breadcrumbs: (id: string) => Breadcrumb[]
+    }
+}
+
+export type messageTemplateSceneLogicType = MakeLogicType<
+    messageTemplateSceneLogicValues,
+    {},
+    MessageTemplateSceneLogicProps,
+    messageTemplateSceneLogicMeta
+>
+
 export const messageTemplateSceneLogic = kea<messageTemplateSceneLogicType>([
     path(['products', 'workflows', 'frontend', 'messageTemplateSceneLogic']),
     props({} as MessageTemplateSceneLogicProps),
diff --git a/products/workflows/frontend/TemplateLibrary/messageTemplatesLogic.ts b/products/workflows/frontend/TemplateLibrary/messageTemplatesLogic.ts
index 4ca3309f9b12..e8332198471e 100644
--- a/products/workflows/frontend/TemplateLibrary/messageTemplatesLogic.ts
+++ b/products/workflows/frontend/TemplateLibrary/messageTemplatesLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, connect, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
@@ -6,11 +6,138 @@ import { lemonToast } from 'lib/lemon-ui/LemonToast'
 import { deleteWithUndo } from 'lib/utils/deleteWithUndo'
 import { teamLogic } from 'scenes/teamLogic'
 
-import type { messageTemplatesLogicType } from './messageTemplatesLogicType'
 import { MessageTemplate } from './types'
 
 export type { MessageTemplate }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface messageTemplatesLogicValues {
+    currentTeamIdStrict: number | string // teamLogic
+    createdByFilter: number | null
+    filteredTemplates: MessageTemplate[]
+    search: string
+    templates: MessageTemplate[]
+    templatesLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface messageTemplatesLogicActions {
+    createTemplate: ({ template }: { template: Partial<MessageTemplate> }) => {
+        template: Partial<MessageTemplate>
+    }
+    createTemplateFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    createTemplateSuccess: (
+        templates: MessageTemplate[],
+        payload?: {
+            template: Partial<MessageTemplate>
+        }
+    ) => {
+        templates: MessageTemplate[]
+        payload?: {
+            template: Partial<MessageTemplate>
+        }
+    }
+    deleteTemplate: (template: MessageTemplate) => MessageTemplate
+    deleteTemplateFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteTemplateSuccess: (
+        templates: MessageTemplate[],
+        payload?: MessageTemplate
+    ) => {
+        templates: MessageTemplate[]
+        payload?: MessageTemplate
+    }
+    duplicateTemplate: (template: MessageTemplate) => MessageTemplate
+    duplicateTemplateFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    duplicateTemplateSuccess: (
+        templates: MessageTemplate[],
+        payload?: MessageTemplate
+    ) => {
+        templates: MessageTemplate[]
+        payload?: MessageTemplate
+    }
+    loadTemplates: () => any
+    loadTemplatesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadTemplatesSuccess: (
+        templates: MessageTemplate[],
+        payload?: any
+    ) => {
+        templates: MessageTemplate[]
+        payload?: any
+    }
+    setCreatedByFilter: (createdBy: number | null) => {
+        createdBy: number | null
+    }
+    setSearch: (search: string) => {
+        search: string
+    }
+    updateTemplate: ({ templateId, template }: { template: Partial<MessageTemplate>; templateId: string }) => {
+        templateId: string
+        template: Partial<MessageTemplate>
+    }
+    updateTemplateFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    updateTemplateSuccess: (
+        templates: MessageTemplate[],
+        payload?: {
+            templateId: string
+            template: Partial<MessageTemplate>
+        }
+    ) => {
+        templates: MessageTemplate[]
+        payload?: {
+            templateId: string
+            template: Partial<MessageTemplate>
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface messageTemplatesLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        filteredTemplates: (
+            templates: MessageTemplate[],
+            search: string,
+            createdByFilter: number | null
+        ) => MessageTemplate[]
+    }
+}
+
+export type messageTemplatesLogicType = MakeLogicType<
+    messageTemplatesLogicValues,
+    messageTemplatesLogicActions,
+    Record<string, any>,
+    messageTemplatesLogicMeta
+>
+
 export const messageTemplatesLogic = kea<messageTemplatesLogicType>([
     path(['products', 'workflows', 'frontend', 'library', 'messageTemplatesLogic']),
     connect(() => ({
diff --git a/products/workflows/frontend/Workflows/batchWorkflowJobsLogic.ts b/products/workflows/frontend/Workflows/batchWorkflowJobsLogic.ts
index dbc36fd8d5c3..6d52f9eac442 100644
--- a/products/workflows/frontend/Workflows/batchWorkflowJobsLogic.ts
+++ b/products/workflows/frontend/Workflows/batchWorkflowJobsLogic.ts
@@ -1,17 +1,57 @@
-import { kea, key, path, props, selectors } from 'kea'
+import { MakeLogicType, kea, key, path, props, selectors } from 'kea'
 import { lazyLoaders } from 'kea-loaders'
 import { urlToAction } from 'kea-router'
 
 import api from 'lib/api'
 import { urls } from 'scenes/urls'
 
-import type { batchWorkflowJobsLogicType } from './batchWorkflowJobsLogicType'
 import { HogFlowBatchJob } from './hogflows/types'
 
 export interface BatchWorkflowJobsLogicProps {
     id?: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface batchWorkflowJobsLogicValues {
+    batchWorkflowJobs: HogFlowBatchJob[] | null
+    batchWorkflowJobsLoading: boolean
+    jobs: HogFlowBatchJob[]
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface batchWorkflowJobsLogicActions {
+    loadBatchWorkflowJobs: () => any
+    loadBatchWorkflowJobsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadBatchWorkflowJobsSuccess: (
+        batchWorkflowJobs: HogFlowBatchJob[] | null,
+        payload?: any
+    ) => {
+        batchWorkflowJobs: HogFlowBatchJob[] | null
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface batchWorkflowJobsLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        jobs: (batchWorkflowJobs: HogFlowBatchJob[] | null) => HogFlowBatchJob[]
+    }
+}
+
+export type batchWorkflowJobsLogicType = MakeLogicType<
+    batchWorkflowJobsLogicValues,
+    batchWorkflowJobsLogicActions,
+    BatchWorkflowJobsLogicProps,
+    batchWorkflowJobsLogicMeta
+>
+
 export const batchWorkflowJobsLogic = kea<batchWorkflowJobsLogicType>([
     path(['products', 'workflows', 'frontend', 'Workflows', 'batchWorkflowJobsLogic']),
     props({ id: 'new' } as BatchWorkflowJobsLogicProps),
@@ -31,7 +71,7 @@ export const batchWorkflowJobsLogic = kea<batchWorkflowJobsLogicType>([
         ],
     })),
     selectors({
-        jobs: [(s) => [s.batchWorkflowJobs], (batchWorkflowJobs) => batchWorkflowJobs || []],
+        jobs: [(s) => [s.batchWorkflowJobs], (batchWorkflowJobs: HogFlowBatchJob[] | null) => batchWorkflowJobs || []],
     }),
     urlToAction(({ props, actions }) => ({
         [urls.workflow(props.id || 'new', 'logs')]: (_, __, ___, currentLocation, previousLocation) => {
diff --git a/products/workflows/frontend/Workflows/hogflows/HogFlowManualTriggerButtonLogic.ts b/products/workflows/frontend/Workflows/hogflows/HogFlowManualTriggerButtonLogic.ts
index 85a8a6a3574b..d3b6021a58f5 100644
--- a/products/workflows/frontend/Workflows/hogflows/HogFlowManualTriggerButtonLogic.ts
+++ b/products/workflows/frontend/Workflows/hogflows/HogFlowManualTriggerButtonLogic.ts
@@ -1,12 +1,13 @@
-import { actions, connect, kea, key, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, path, props, reducers, selectors } from 'kea'
 
 import { teamLogic } from 'scenes/teamLogic'
 import { userLogic } from 'scenes/userLogic'
 
 import { CyclotronJobInputSchemaType } from '~/types'
 
+import type { UserType } from '../../../../../frontend/src/types'
 import { WorkflowLogicProps, workflowLogic } from '../workflowLogic'
-import type { hogFlowManualTriggerButtonLogicType } from './HogFlowManualTriggerButtonLogicType'
+import type { HogFlow } from './types'
 
 const parseValue = (value: string, variableType: string): any => {
     if (value === '') {
@@ -29,6 +30,60 @@ const parseValue = (value: string, variableType: string): any => {
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFlowManualTriggerButtonLogicValues {
+    timezone: string // teamLogic
+    user: UserType | null // userLogic
+    workflow: HogFlow // workflowLogic
+    inputs: Record<string, string>
+    popoverVisible: boolean
+    variableValues: Record<string, any>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFlowManualTriggerButtonLogicActions {
+    triggerBatchWorkflow: (
+        variables: Record<string, any>,
+        filters: {
+            properties: any[]
+        }
+    ) => {
+        filters: {
+            properties: any[]
+        }
+        variables: Record<string, any>
+    } // workflowLogic
+    triggerManualWorkflow: (variables: Record<string, any>) => {
+        variables: Record<string, any>
+    } // workflowLogic
+    clearInputs: () => {}
+    setInput: (
+        key: string,
+        value: string
+    ) => {
+        key: string
+        value: string
+    }
+    setPopoverVisible: (visible: boolean) => {
+        visible: boolean
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFlowManualTriggerButtonLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        variableValues: (inputs: Record<string, string>, workflow: HogFlow) => Record<string, any>
+    }
+}
+
+export type hogFlowManualTriggerButtonLogicType = MakeLogicType<
+    hogFlowManualTriggerButtonLogicValues,
+    hogFlowManualTriggerButtonLogicActions,
+    WorkflowLogicProps,
+    hogFlowManualTriggerButtonLogicMeta
+>
+
 export const hogFlowManualTriggerButtonLogic = kea<hogFlowManualTriggerButtonLogicType>([
     path(['products', 'workflows', 'frontend', 'Workflows', 'hogflows', 'hogFlowManualTriggerButtonLogic']),
     props({} as WorkflowLogicProps),
diff --git a/products/workflows/frontend/Workflows/hogflows/hogFlowEditorLogic.tsx b/products/workflows/frontend/Workflows/hogflows/hogFlowEditorLogic.tsx
index b36289ddbdfb..04635917b02f 100644
--- a/products/workflows/frontend/Workflows/hogflows/hogFlowEditorLogic.tsx
+++ b/products/workflows/frontend/Workflows/hogflows/hogFlowEditorLogic.tsx
@@ -10,7 +10,7 @@ import {
     applyNodeChanges,
     getOutgoers,
 } from '@xyflow/react'
-import { actions, connect, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, events, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router, urlToAction } from 'kea-router'
 import { subscriptions } from 'kea-subscriptions'
@@ -25,15 +25,17 @@ import { objectsEqual, reconcileById } from 'lib/utils/objects'
 import { templateToConfiguration } from 'scenes/hog-functions/configuration/hogFunctionConfigurationLogic'
 import { urls } from 'scenes/urls'
 
+import type { HogFunctionTemplateType, UserBasicType } from '../../../../../frontend/src/types'
 import { optOutCategoriesLogic } from '../../OptOuts/optOutCategoriesLogic'
+import type { MessageCategory } from '../../OptOuts/optOutCategoriesLogic'
 import { EXIT_NODE_ID, TRIGGER_NODE_ID, WorkflowLogicProps, workflowLogic } from '../workflowLogic'
-import type { hogFlowEditorLogicType } from './hogFlowEditorLogicType'
 import { getFormattedNodes } from './react_flow_utils/autolayout'
 import { BOTTOM_HANDLE_POSITION, NODE_HEIGHT, NODE_WIDTH, TOP_HANDLE_POSITION } from './react_flow_utils/constants'
 import { getSmartStepPath } from './react_flow_utils/SmartEdge'
 import { getHogFlowStep } from './steps/HogFlowSteps'
 import { CyclotronInputType, StepViewNodeHandle } from './steps/types'
 import type { DropzoneNode, HogFlow, HogFlowAction, HogFlowActionEdge, HogFlowActionNode } from './types'
+import type { HogFlowEdge } from './types'
 
 const getEdgeId = (edge: HogFlow['edges'][number]): string =>
     `${edge.from}->${edge.to} ${edge.type} ${edge.index ?? ''}`.trim()
@@ -155,6 +157,1780 @@ export type CreateActionType = Pick<HogFlowAction, 'type' | 'config' | 'name' |
     getOutputMappingSuggestions?: () => Promise<OutputMappingSuggestion[]>
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFlowEditorLogicValues {
+    categories: MessageCategory[] // optOutCategoriesLogic
+    categoriesLoading: boolean // optOutCategoriesLogic
+    edgesByActionId: Record<string, HogFlowEdge[]> // workflowLogic
+    hogFunctionTemplatesById: Record<string, HogFunctionTemplateType> // workflowLogic
+    workflow: HogFlow // workflowLogic
+    actionMetricsById: Record<string, HogFlowEditorActionMetrics> | null
+    actionMetricsByIdLoading: boolean
+    animatingEdgePair: string | null
+    dropzoneNodes: DropzoneNode[]
+    edges: HogFlowActionEdge[]
+    highlightedDropzoneNodeId: string | null
+    isCopyingNode: boolean
+    isMovingNode: boolean
+    mode: HogFlowEditorMode
+    movingNodeId: string | null
+    nodeToBeAdded: CreateActionType | HogFlowActionNode | null
+    nodes: HogFlowActionNode[]
+    nodesById: Record<string, HogFlowActionNode>
+    reactFlowInstance: ReactFlowInstance<Node, Edge> | null
+    reactFlowWrapper: RefObject<HTMLDivElement> | null
+    selectedNode: HogFlowActionNode | null
+    selectedNodeCanBeCopiedOrMoved: boolean
+    selectedNodeCanBeDeleted: boolean
+    selectedNodeId: string | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFlowEditorLogicActions {
+    loadCategories: () => {
+        value: true
+    } // optOutCategoriesLogic
+    loadWorkflowSuccess: (
+        originalWorkflow:
+            | HogFlow
+            | {
+                  abort_action?: string | undefined
+                  actions: (
+                      | {
+                            config: {
+                                cohorts: {
+                                    name?: string | undefined
+                                    percentage: number
+                                }[]
+                            }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'random_cohort_branch'
+                            updated_at?: number | undefined
+                        }
+                      | {
+                            config: {
+                                delay_duration: string
+                            }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'delay'
+                            updated_at?: number | undefined
+                        }
+                      | {
+                            config: {
+                                reason?: string | undefined
+                            }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'exit'
+                            updated_at?: number | undefined
+                        }
+                      | {
+                            config: {
+                                conditions: {
+                                    filters: {
+                                        actions?: any[] | undefined
+                                        events?: any[] | undefined
+                                        properties?: any[] | undefined
+                                    }
+                                    name?: string | undefined
+                                }[]
+                                delay_duration?: string | undefined
+                            }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'conditional_branch'
+                            updated_at?: number | undefined
+                        }
+                      | {
+                            config: {
+                                condition: {
+                                    filters?:
+                                        | {
+                                              actions?: any[] | undefined
+                                              events?: any[] | undefined
+                                              properties?: any[] | undefined
+                                          }
+                                        | null
+                                        | undefined
+                                    name?: string | undefined
+                                }
+                                events?:
+                                    | {
+                                          filters?:
+                                              | {
+                                                    actions?: any[] | undefined
+                                                    events?: any[] | undefined
+                                                    properties?: any[] | undefined
+                                                }
+                                              | null
+                                              | undefined
+                                          name?: string | undefined
+                                      }[]
+                                    | undefined
+                                max_wait_duration: string
+                            }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'wait_until_condition'
+                            updated_at?: number | undefined
+                        }
+                      | {
+                            config: {
+                                inputs: Record<
+                                    string,
+                                    {
+                                        bytecode?: any
+                                        order?: number | undefined
+                                        secret?: boolean | undefined
+                                        templating?: 'hog' | 'liquid' | undefined
+                                        value: any
+                                    }
+                                >
+                                mappings?:
+                                    | {
+                                          disabled?: boolean | undefined
+                                          filters?: any
+                                          inputs?:
+                                              | Record<
+                                                    string,
+                                                    {
+                                                        bytecode?: any
+                                                        order?: number | undefined
+                                                        secret?: boolean | undefined
+                                                        templating?: 'hog' | 'liquid' | undefined
+                                                        value: any
+                                                    }
+                                                >
+                                              | null
+                                              | undefined
+                                          inputs_schema?:
+                                              | {
+                                                    choices?:
+                                                        | {
+                                                              label: string
+                                                              value: string
+                                                          }[]
+                                                        | undefined
+                                                    default?: any
+                                                    description?: string | undefined
+                                                    hidden?: boolean | undefined
+                                                    integration?: string | undefined
+                                                    integration_field?: string | undefined
+                                                    integration_key?: string | undefined
+                                                    key: string
+                                                    label: string
+                                                    required?: boolean | undefined
+                                                    requiredScopes?: string | undefined
+                                                    requires_field?: string | undefined
+                                                    secret?: boolean | undefined
+                                                    templating?: boolean | undefined
+                                                    type:
+                                                        | 'boolean'
+                                                        | 'choice'
+                                                        | 'customer_analytics_account_properties'
+                                                        | 'customer_analytics_account_relationships'
+                                                        | 'dictionary'
+                                                        | 'email'
+                                                        | 'integration'
+                                                        | 'integration_field'
+                                                        | 'integration_multi'
+                                                        | 'json'
+                                                        | 'native_email'
+                                                        | 'non_failure_status_codes'
+                                                        | 'number'
+                                                        | 'posthog_assignee'
+                                                        | 'posthog_business_hours'
+                                                        | 'posthog_ticket_tags'
+                                                        | 'string'
+                                                }[]
+                                              | undefined
+                                          name: string
+                                      }[]
+                                    | undefined
+                                template_id: string
+                                template_uuid?: string | undefined
+                            }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'function'
+                            updated_at?: number | undefined
+                        }
+                      | {
+                            config: {
+                                day:
+                                    | (
+                                          | 'friday'
+                                          | 'monday'
+                                          | 'saturday'
+                                          | 'sunday'
+                                          | 'thursday'
+                                          | 'tuesday'
+                                          | 'wednesday'
+                                      )[]
+                                    | 'any'
+                                    | 'weekday'
+                                    | 'weekend'
+                                fallback_timezone?: string | null | undefined
+                                time: [string, string] | 'any'
+                                timezone: string | null
+                                use_person_timezone?: boolean | undefined
+                            }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'wait_until_time_window'
+                            updated_at?: number | undefined
+                        }
+                      | {
+                            config: {
+                                inputs: Record<
+                                    string,
+                                    {
+                                        bytecode?: any
+                                        order?: number | undefined
+                                        secret?: boolean | undefined
+                                        templating?: 'hog' | 'liquid' | undefined
+                                        value: any
+                                    }
+                                >
+                                message_category_id?: string | undefined
+                                message_category_type?: 'marketing' | 'transactional' | undefined
+                                template_id: 'template-email'
+                                template_uuid?: string | undefined
+                            }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'function_email'
+                            updated_at?: number | undefined
+                        }
+                      | {
+                            config: {
+                                inputs: Record<
+                                    string,
+                                    {
+                                        bytecode?: any
+                                        order?: number | undefined
+                                        secret?: boolean | undefined
+                                        templating?: 'hog' | 'liquid' | undefined
+                                        value: any
+                                    }
+                                >
+                                message_category_id?: string | undefined
+                                message_category_type?: 'marketing' | 'transactional' | undefined
+                                template_id: 'template-native-push'
+                                template_uuid?: string | undefined
+                            }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'function_push'
+                            updated_at?: number | undefined
+                        }
+                      | {
+                            config: {
+                                inputs: Record<
+                                    string,
+                                    {
+                                        bytecode?: any
+                                        order?: number | undefined
+                                        secret?: boolean | undefined
+                                        templating?: 'hog' | 'liquid' | undefined
+                                        value: any
+                                    }
+                                >
+                                message_category_id?: string | undefined
+                                message_category_type?: 'marketing' | 'transactional' | undefined
+                                template_id: 'template-twilio'
+                                template_uuid?: string | undefined
+                            }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'function_sms'
+                            updated_at?: number | undefined
+                        }
+                      | {
+                            config:
+                                | {
+                                      type: 'schedule'
+                                  }
+                                | {
+                                      filters: {
+                                          properties: any[]
+                                      }
+                                      type: 'batch'
+                                  }
+                                | {
+                                      filters: {
+                                          actions?: any[] | undefined
+                                          events?: any[] | undefined
+                                          filter_test_accounts?: boolean | undefined
+                                          properties?: any[] | undefined
+                                      }
+                                      type: 'event'
+                                  }
+                                | {
+                                      filters: {
+                                          properties?: any[] | undefined
+                                      }
+                                      key_property?: string | undefined
+                                      table_name: string
+                                      type: 'data-warehouse-table'
+                                  }
+                                | {
+                                      inputs: Record<
+                                          string,
+                                          {
+                                              bytecode?: any
+                                              order?: number | undefined
+                                              secret?: boolean | undefined
+                                              templating?: 'hog' | 'liquid' | undefined
+                                              value: any
+                                          }
+                                      >
+                                      template_id: string
+                                      template_uuid?: string | undefined
+                                      type: 'manual'
+                                  }
+                                | {
+                                      inputs: Record<
+                                          string,
+                                          {
+                                              bytecode?: any
+                                              order?: number | undefined
+                                              secret?: boolean | undefined
+                                              templating?: 'hog' | 'liquid' | undefined
+                                              value: any
+                                          }
+                                      >
+                                      template_id: string
+                                      template_uuid?: string | undefined
+                                      type: 'tracking_pixel'
+                                  }
+                                | {
+                                      inputs: Record<
+                                          string,
+                                          {
+                                              bytecode?: any
+                                              order?: number | undefined
+                                              secret?: boolean | undefined
+                                              templating?: 'hog' | 'liquid' | undefined
+                                              value: any
+                                          }
+                                      >
+                                      template_id: string
+                                      template_uuid?: string | undefined
+                                      type: 'webhook'
+                                  }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'trigger'
+                            updated_at?: number | undefined
+                        }
+                  )[]
+                  conversion?:
+                      | {
+                            bytecode?: (number | string)[] | undefined
+                            events?:
+                                | {
+                                      filters?: any
+                                      name?: string | undefined
+                                  }[]
+                                | undefined
+                            filters: any
+                            window_minutes: number | null
+                        }
+                      | undefined
+                  created_at: string
+                  created_by?: UserBasicType | null | undefined
+                  description?: string | undefined
+                  edges: {
+                      from: string
+                      index?: number | undefined
+                      to: string
+                      type: 'branch' | 'continue'
+                  }[]
+                  exit_condition:
+                      | 'exit_on_conversion'
+                      | 'exit_on_trigger_not_matched'
+                      | 'exit_on_trigger_not_matched_or_conversion'
+                      | 'exit_only_at_end'
+                  id: string
+                  image_url?: string | null | undefined
+                  name: string
+                  scope?: 'global' | 'organization' | 'team' | null | undefined
+                  status: 'draft'
+                  tags: string[]
+                  team_id: number
+                  trigger?:
+                      | {
+                            type: 'schedule'
+                        }
+                      | {
+                            filters: {
+                                properties: any[]
+                            }
+                            type: 'batch'
+                        }
+                      | {
+                            filters: {
+                                actions?: any[] | undefined
+                                events?: any[] | undefined
+                                filter_test_accounts?: boolean | undefined
+                                properties?: any[] | undefined
+                            }
+                            type: 'event'
+                        }
+                      | {
+                            filters: {
+                                properties?: any[] | undefined
+                            }
+                            key_property?: string | undefined
+                            table_name: string
+                            type: 'data-warehouse-table'
+                        }
+                      | {
+                            inputs: Record<
+                                string,
+                                {
+                                    bytecode?: any
+                                    order?: number | undefined
+                                    secret?: boolean | undefined
+                                    templating?: 'hog' | 'liquid' | undefined
+                                    value: any
+                                }
+                            >
+                            template_id: string
+                            template_uuid?: string | undefined
+                            type: 'manual'
+                        }
+                      | {
+                            inputs: Record<
+                                string,
+                                {
+                                    bytecode?: any
+                                    order?: number | undefined
+                                    secret?: boolean | undefined
+                                    templating?: 'hog' | 'liquid' | undefined
+                                    value: any
+                                }
+                            >
+                            template_id: string
+                            template_uuid?: string | undefined
+                            type: 'tracking_pixel'
+                        }
+                      | {
+                            inputs: Record<
+                                string,
+                                {
+                                    bytecode?: any
+                                    order?: number | undefined
+                                    secret?: boolean | undefined
+                                    templating?: 'hog' | 'liquid' | undefined
+                                    value: any
+                                }
+                            >
+                            template_id: string
+                            template_uuid?: string | undefined
+                            type: 'webhook'
+                        }
+                      | undefined
+                  trigger_masking?:
+                      | {
+                            bytecode: (number | string)[]
+                            hash: string
+                            threshold: number | null
+                            ttl: number | null
+                        }
+                      | null
+                      | undefined
+                  updated_at: string
+                  variables?:
+                      | {
+                            choices?:
+                                | {
+                                      label: string
+                                      value: string
+                                  }[]
+                                | undefined
+                            default?: any
+                            description?: string | undefined
+                            hidden?: boolean | undefined
+                            integration?: string | undefined
+                            integration_field?: string | undefined
+                            integration_key?: string | undefined
+                            key: string
+                            label: string
+                            required?: boolean | undefined
+                            requiredScopes?: string | undefined
+                            requires_field?: string | undefined
+                            secret?: boolean | undefined
+                            templating?: boolean | undefined
+                            type:
+                                | 'boolean'
+                                | 'choice'
+                                | 'customer_analytics_account_properties'
+                                | 'customer_analytics_account_relationships'
+                                | 'dictionary'
+                                | 'email'
+                                | 'integration'
+                                | 'integration_field'
+                                | 'integration_multi'
+                                | 'json'
+                                | 'native_email'
+                                | 'non_failure_status_codes'
+                                | 'number'
+                                | 'posthog_assignee'
+                                | 'posthog_business_hours'
+                                | 'posthog_ticket_tags'
+                                | 'string'
+                        }[]
+                      | null
+                      | undefined
+                  version: number
+              },
+        payload?: any
+    ) => {
+        originalWorkflow:
+            | HogFlow
+            | {
+                  abort_action?: string | undefined
+                  actions: (
+                      | {
+                            config: {
+                                cohorts: {
+                                    name?: string | undefined
+                                    percentage: number
+                                }[]
+                            }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'random_cohort_branch'
+                            updated_at?: number | undefined
+                        }
+                      | {
+                            config: {
+                                delay_duration: string
+                            }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'delay'
+                            updated_at?: number | undefined
+                        }
+                      | {
+                            config: {
+                                reason?: string | undefined
+                            }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'exit'
+                            updated_at?: number | undefined
+                        }
+                      | {
+                            config: {
+                                conditions: {
+                                    filters: {
+                                        actions?: any[] | undefined
+                                        events?: any[] | undefined
+                                        properties?: any[] | undefined
+                                    }
+                                    name?: string | undefined
+                                }[]
+                                delay_duration?: string | undefined
+                            }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'conditional_branch'
+                            updated_at?: number | undefined
+                        }
+                      | {
+                            config: {
+                                condition: {
+                                    filters?:
+                                        | {
+                                              actions?: any[] | undefined
+                                              events?: any[] | undefined
+                                              properties?: any[] | undefined
+                                          }
+                                        | null
+                                        | undefined
+                                    name?: string | undefined
+                                }
+                                events?:
+                                    | {
+                                          filters?:
+                                              | {
+                                                    actions?: any[] | undefined
+                                                    events?: any[] | undefined
+                                                    properties?: any[] | undefined
+                                                }
+                                              | null
+                                              | undefined
+                                          name?: string | undefined
+                                      }[]
+                                    | undefined
+                                max_wait_duration: string
+                            }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'wait_until_condition'
+                            updated_at?: number | undefined
+                        }
+                      | {
+                            config: {
+                                inputs: Record<
+                                    string,
+                                    {
+                                        bytecode?: any
+                                        order?: number | undefined
+                                        secret?: boolean | undefined
+                                        templating?: 'hog' | 'liquid' | undefined
+                                        value: any
+                                    }
+                                >
+                                mappings?:
+                                    | {
+                                          disabled?: boolean | undefined
+                                          filters?: any
+                                          inputs?:
+                                              | Record<
+                                                    string,
+                                                    {
+                                                        bytecode?: any
+                                                        order?: number | undefined
+                                                        secret?: boolean | undefined
+                                                        templating?: 'hog' | 'liquid' | undefined
+                                                        value: any
+                                                    }
+                                                >
+                                              | null
+                                              | undefined
+                                          inputs_schema?:
+                                              | {
+                                                    choices?:
+                                                        | {
+                                                              label: string
+                                                              value: string
+                                                          }[]
+                                                        | undefined
+                                                    default?: any
+                                                    description?: string | undefined
+                                                    hidden?: boolean | undefined
+                                                    integration?: string | undefined
+                                                    integration_field?: string | undefined
+                                                    integration_key?: string | undefined
+                                                    key: string
+                                                    label: string
+                                                    required?: boolean | undefined
+                                                    requiredScopes?: string | undefined
+                                                    requires_field?: string | undefined
+                                                    secret?: boolean | undefined
+                                                    templating?: boolean | undefined
+                                                    type:
+                                                        | 'boolean'
+                                                        | 'choice'
+                                                        | 'customer_analytics_account_properties'
+                                                        | 'customer_analytics_account_relationships'
+                                                        | 'dictionary'
+                                                        | 'email'
+                                                        | 'integration'
+                                                        | 'integration_field'
+                                                        | 'integration_multi'
+                                                        | 'json'
+                                                        | 'native_email'
+                                                        | 'non_failure_status_codes'
+                                                        | 'number'
+                                                        | 'posthog_assignee'
+                                                        | 'posthog_business_hours'
+                                                        | 'posthog_ticket_tags'
+                                                        | 'string'
+                                                }[]
+                                              | undefined
+                                          name: string
+                                      }[]
+                                    | undefined
+                                template_id: string
+                                template_uuid?: string | undefined
+                            }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'function'
+                            updated_at?: number | undefined
+                        }
+                      | {
+                            config: {
+                                day:
+                                    | (
+                                          | 'friday'
+                                          | 'monday'
+                                          | 'saturday'
+                                          | 'sunday'
+                                          | 'thursday'
+                                          | 'tuesday'
+                                          | 'wednesday'
+                                      )[]
+                                    | 'any'
+                                    | 'weekday'
+                                    | 'weekend'
+                                fallback_timezone?: string | null | undefined
+                                time: [string, string] | 'any'
+                                timezone: string | null
+                                use_person_timezone?: boolean | undefined
+                            }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'wait_until_time_window'
+                            updated_at?: number | undefined
+                        }
+                      | {
+                            config: {
+                                inputs: Record<
+                                    string,
+                                    {
+                                        bytecode?: any
+                                        order?: number | undefined
+                                        secret?: boolean | undefined
+                                        templating?: 'hog' | 'liquid' | undefined
+                                        value: any
+                                    }
+                                >
+                                message_category_id?: string | undefined
+                                message_category_type?: 'marketing' | 'transactional' | undefined
+                                template_id: 'template-email'
+                                template_uuid?: string | undefined
+                            }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'function_email'
+                            updated_at?: number | undefined
+                        }
+                      | {
+                            config: {
+                                inputs: Record<
+                                    string,
+                                    {
+                                        bytecode?: any
+                                        order?: number | undefined
+                                        secret?: boolean | undefined
+                                        templating?: 'hog' | 'liquid' | undefined
+                                        value: any
+                                    }
+                                >
+                                message_category_id?: string | undefined
+                                message_category_type?: 'marketing' | 'transactional' | undefined
+                                template_id: 'template-native-push'
+                                template_uuid?: string | undefined
+                            }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'function_push'
+                            updated_at?: number | undefined
+                        }
+                      | {
+                            config: {
+                                inputs: Record<
+                                    string,
+                                    {
+                                        bytecode?: any
+                                        order?: number | undefined
+                                        secret?: boolean | undefined
+                                        templating?: 'hog' | 'liquid' | undefined
+                                        value: any
+                                    }
+                                >
+                                message_category_id?: string | undefined
+                                message_category_type?: 'marketing' | 'transactional' | undefined
+                                template_id: 'template-twilio'
+                                template_uuid?: string | undefined
+                            }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'function_sms'
+                            updated_at?: number | undefined
+                        }
+                      | {
+                            config:
+                                | {
+                                      type: 'schedule'
+                                  }
+                                | {
+                                      filters: {
+                                          properties: any[]
+                                      }
+                                      type: 'batch'
+                                  }
+                                | {
+                                      filters: {
+                                          actions?: any[] | undefined
+                                          events?: any[] | undefined
+                                          filter_test_accounts?: boolean | undefined
+                                          properties?: any[] | undefined
+                                      }
+                                      type: 'event'
+                                  }
+                                | {
+                                      filters: {
+                                          properties?: any[] | undefined
+                                      }
+                                      key_property?: string | undefined
+                                      table_name: string
+                                      type: 'data-warehouse-table'
+                                  }
+                                | {
+                                      inputs: Record<
+                                          string,
+                                          {
+                                              bytecode?: any
+                                              order?: number | undefined
+                                              secret?: boolean | undefined
+                                              templating?: 'hog' | 'liquid' | undefined
+                                              value: any
+                                          }
+                                      >
+                                      template_id: string
+                                      template_uuid?: string | undefined
+                                      type: 'manual'
+                                  }
+                                | {
+                                      inputs: Record<
+                                          string,
+                                          {
+                                              bytecode?: any
+                                              order?: number | undefined
+                                              secret?: boolean | undefined
+                                              templating?: 'hog' | 'liquid' | undefined
+                                              value: any
+                                          }
+                                      >
+                                      template_id: string
+                                      template_uuid?: string | undefined
+                                      type: 'tracking_pixel'
+                                  }
+                                | {
+                                      inputs: Record<
+                                          string,
+                                          {
+                                              bytecode?: any
+                                              order?: number | undefined
+                                              secret?: boolean | undefined
+                                              templating?: 'hog' | 'liquid' | undefined
+                                              value: any
+                                          }
+                                      >
+                                      template_id: string
+                                      template_uuid?: string | undefined
+                                      type: 'webhook'
+                                  }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'trigger'
+                            updated_at?: number | undefined
+                        }
+                  )[]
+                  conversion?:
+                      | {
+                            bytecode?: (number | string)[] | undefined
+                            events?:
+                                | {
+                                      filters?: any
+                                      name?: string | undefined
+                                  }[]
+                                | undefined
+                            filters: any
+                            window_minutes: number | null
+                        }
+                      | undefined
+                  created_at: string
+                  created_by?: UserBasicType | null | undefined
+                  description?: string | undefined
+                  edges: {
+                      from: string
+                      index?: number | undefined
+                      to: string
+                      type: 'branch' | 'continue'
+                  }[]
+                  exit_condition:
+                      | 'exit_on_conversion'
+                      | 'exit_on_trigger_not_matched'
+                      | 'exit_on_trigger_not_matched_or_conversion'
+                      | 'exit_only_at_end'
+                  id: string
+                  image_url?: string | null | undefined
+                  name: string
+                  scope?: 'global' | 'organization' | 'team' | null | undefined
+                  status: 'draft'
+                  tags: string[]
+                  team_id: number
+                  trigger?:
+                      | {
+                            type: 'schedule'
+                        }
+                      | {
+                            filters: {
+                                properties: any[]
+                            }
+                            type: 'batch'
+                        }
+                      | {
+                            filters: {
+                                actions?: any[] | undefined
+                                events?: any[] | undefined
+                                filter_test_accounts?: boolean | undefined
+                                properties?: any[] | undefined
+                            }
+                            type: 'event'
+                        }
+                      | {
+                            filters: {
+                                properties?: any[] | undefined
+                            }
+                            key_property?: string | undefined
+                            table_name: string
+                            type: 'data-warehouse-table'
+                        }
+                      | {
+                            inputs: Record<
+                                string,
+                                {
+                                    bytecode?: any
+                                    order?: number | undefined
+                                    secret?: boolean | undefined
+                                    templating?: 'hog' | 'liquid' | undefined
+                                    value: any
+                                }
+                            >
+                            template_id: string
+                            template_uuid?: string | undefined
+                            type: 'manual'
+                        }
+                      | {
+                            inputs: Record<
+                                string,
+                                {
+                                    bytecode?: any
+                                    order?: number | undefined
+                                    secret?: boolean | undefined
+                                    templating?: 'hog' | 'liquid' | undefined
+                                    value: any
+                                }
+                            >
+                            template_id: string
+                            template_uuid?: string | undefined
+                            type: 'tracking_pixel'
+                        }
+                      | {
+                            inputs: Record<
+                                string,
+                                {
+                                    bytecode?: any
+                                    order?: number | undefined
+                                    secret?: boolean | undefined
+                                    templating?: 'hog' | 'liquid' | undefined
+                                    value: any
+                                }
+                            >
+                            template_id: string
+                            template_uuid?: string | undefined
+                            type: 'webhook'
+                        }
+                      | undefined
+                  trigger_masking?:
+                      | {
+                            bytecode: (number | string)[]
+                            hash: string
+                            threshold: number | null
+                            ttl: number | null
+                        }
+                      | null
+                      | undefined
+                  updated_at: string
+                  variables?:
+                      | {
+                            choices?:
+                                | {
+                                      label: string
+                                      value: string
+                                  }[]
+                                | undefined
+                            default?: any
+                            description?: string | undefined
+                            hidden?: boolean | undefined
+                            integration?: string | undefined
+                            integration_field?: string | undefined
+                            integration_key?: string | undefined
+                            key: string
+                            label: string
+                            required?: boolean | undefined
+                            requiredScopes?: string | undefined
+                            requires_field?: string | undefined
+                            secret?: boolean | undefined
+                            templating?: boolean | undefined
+                            type:
+                                | 'boolean'
+                                | 'choice'
+                                | 'customer_analytics_account_properties'
+                                | 'customer_analytics_account_relationships'
+                                | 'dictionary'
+                                | 'email'
+                                | 'integration'
+                                | 'integration_field'
+                                | 'integration_multi'
+                                | 'json'
+                                | 'native_email'
+                                | 'non_failure_status_codes'
+                                | 'number'
+                                | 'posthog_assignee'
+                                | 'posthog_business_hours'
+                                | 'posthog_ticket_tags'
+                                | 'string'
+                        }[]
+                      | null
+                      | undefined
+                  version: number
+              }
+        payload?: any
+    } // workflowLogic
+    setWorkflowAction: (
+        actionId: string,
+        action: HogFlowAction
+    ) => {
+        action: HogFlowAction
+        actionId: string
+    } // workflowLogic
+    setWorkflowActionEdges: (
+        actionId: string,
+        edges: {
+            from: string
+            index?: number | undefined
+            to: string
+            type: 'branch' | 'continue'
+        }[]
+    ) => {
+        actionId: string
+        edges: {
+            from: string
+            index?: number | undefined
+            to: string
+            type: 'branch' | 'continue'
+        }[]
+    } // workflowLogic
+    setWorkflowInfo: (workflow: Partial<HogFlow>) => {
+        workflow: Partial<HogFlow>
+    } // workflowLogic
+    clearAnimatingEdgePair: () => {
+        value: true
+    }
+    copyNodeToHighlightedDropzone: () => {
+        value: true
+    }
+    fitView: (options?: { duration?: number; noZoom?: boolean }) => {
+        duration?: number | undefined
+        noZoom?: boolean | undefined
+    }
+    handlePaneClick: () => {
+        value: true
+    }
+    hideDropzones: () => {
+        value: true
+    }
+    loadActionMetricsById: (
+        params: Pick<AppMetricsTotalsRequest, 'appSource' | 'appSourceId' | 'dateFrom' | 'dateTo'>,
+        timezone: string
+    ) => {
+        params: Pick<AppMetricsTotalsRequest, 'appSource' | 'appSourceId' | 'dateFrom' | 'dateTo'>
+        timezone: string
+    }
+    loadActionMetricsByIdFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadActionMetricsByIdSuccess: (
+        actionMetricsById: Record<string, HogFlowEditorActionMetrics>,
+        payload?: {
+            params: Pick<AppMetricsTotalsRequest, 'appSource' | 'appSourceId' | 'dateFrom' | 'dateTo'>
+            timezone: string
+        }
+    ) => {
+        actionMetricsById: Record<string, HogFlowEditorActionMetrics>
+        payload?: {
+            params: Pick<AppMetricsTotalsRequest, 'appSource' | 'appSourceId' | 'dateFrom' | 'dateTo'>
+            timezone: string
+        }
+    }
+    moveNodeToHighlightedDropzone: () => {
+        value: true
+    }
+    onDragOver: (event: DragEvent) => {
+        event: DragEvent<Element>
+    }
+    onDrop: (event?: DragEvent) => {
+        event: DragEvent<Element> | undefined
+    }
+    onEdgesChange: (edges: EdgeChange<HogFlowActionEdge>[]) => {
+        edges: EdgeChange<HogFlowActionEdge>[]
+    }
+    onNodesChange: (nodes: NodeChange<HogFlowActionNode>[]) => {
+        nodes: NodeChange<HogFlowActionNode>[]
+    }
+    onNodesDelete: (deleted: HogFlowActionNode[]) => {
+        deleted: HogFlowActionNode[]
+    }
+    resetFlowFromHogFlow: (hogFlow: HogFlow) => {
+        hogFlow: HogFlow
+    }
+    setAnimatingEdgePair: (
+        from: string,
+        to: string
+    ) => {
+        from: string
+        to: string
+    }
+    setDropzoneNodes: (dropzoneNodes: DropzoneNode[]) => {
+        dropzoneNodes: DropzoneNode[]
+    }
+    setEdges: (edges: HogFlowActionEdge[]) => {
+        edges: HogFlowActionEdge[]
+    }
+    setHighlightedDropzoneNodeId: (highlightedDropzoneNodeId: string | null) => {
+        highlightedDropzoneNodeId: string | null
+    }
+    setMode: (mode: HogFlowEditorMode) => {
+        mode: 'build' | 'logs' | 'metrics' | 'test' | 'variables'
+    }
+    setNodeToBeAdded: (nodeToBeAdded: CreateActionType | HogFlowActionNode | null) => {
+        nodeToBeAdded: CreateActionType | HogFlowActionNode | null
+    }
+    setNodes: (nodes: HogFlowActionNode[]) => {
+        nodes: HogFlowActionNode[]
+    }
+    setNodesRaw: (nodes: HogFlowActionNode[]) => {
+        nodes: HogFlowActionNode[]
+    }
+    setReactFlowInstance: (reactFlowInstance: ReactFlowInstance<Node, Edge>) => {
+        reactFlowInstance: ReactFlowInstance<Node, Edge>
+    }
+    setReactFlowWrapper: (reactFlowWrapper: RefObject<HTMLDivElement>) => {
+        reactFlowWrapper: RefObject<HTMLDivElement>
+    }
+    setSelectedNodeId: (selectedNodeId: string | null) => {
+        selectedNodeId: string | null
+    }
+    showDropzones: () => {
+        value: true
+    }
+    startCopyingNode: (node: HogFlowActionNode) => {
+        node: HogFlowActionNode
+    }
+    startMovingNode: (node: HogFlowActionNode) => {
+        node: HogFlowActionNode
+    }
+    stopCopyingNode: () => {
+        value: true
+    }
+    stopMovingNode: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFlowEditorLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        nodesById: (nodes: HogFlowActionNode[]) => Record<string, HogFlowActionNode>
+        selectedNode: (nodes: HogFlowActionNode[], selectedNodeId: string | null) => HogFlowActionNode | null
+        selectedNodeCanBeDeleted: (
+            selectedNode: HogFlowActionNode | null,
+            nodes: HogFlowActionNode[],
+            edges: HogFlowActionEdge[]
+        ) => boolean
+        selectedNodeCanBeCopiedOrMoved: (
+            selectedNode: HogFlowActionNode | null,
+            selectedNodeCanBeDeleted: boolean
+        ) => boolean
+    }
+}
+
+export type hogFlowEditorLogicType = MakeLogicType<
+    hogFlowEditorLogicValues,
+    hogFlowEditorLogicActions,
+    WorkflowLogicProps,
+    hogFlowEditorLogicMeta
+>
+
 export const hogFlowEditorLogic = kea<hogFlowEditorLogicType>([
     props({} as WorkflowLogicProps),
     path((key) => ['scenes', 'hogflows', 'hogFlowEditorLogic', key]),
@@ -302,7 +2078,7 @@ export const hogFlowEditorLogic = kea<hogFlowEditorLogicType>([
     selectors({
         nodesById: [
             (s) => [s.nodes],
-            (nodes): Record<string, HogFlowActionNode> => {
+            (nodes: HogFlowActionNode[]): Record<string, HogFlowActionNode> => {
                 return nodes.reduce(
                     (acc, node) => {
                         acc[node.id] = node
@@ -314,13 +2090,13 @@ export const hogFlowEditorLogic = kea<hogFlowEditorLogicType>([
         ],
         selectedNode: [
             (s) => [s.nodes, s.selectedNodeId],
-            (nodes, selectedNodeId) => {
+            (nodes: HogFlowActionNode[], selectedNodeId: string | null) => {
                 return nodes.find((node) => node.id === selectedNodeId) ?? null
             },
         ],
         selectedNodeCanBeDeleted: [
             (s) => [s.selectedNode, s.nodes, s.edges],
-            (selectedNode, nodes, edges) => {
+            (selectedNode: HogFlowActionNode | null, nodes: HogFlowActionNode[], edges: HogFlowActionEdge[]) => {
                 if (!selectedNode) {
                     return false
                 }
@@ -335,7 +2111,7 @@ export const hogFlowEditorLogic = kea<hogFlowEditorLogicType>([
         ],
         selectedNodeCanBeCopiedOrMoved: [
             (s) => [s.selectedNode, s.selectedNodeCanBeDeleted],
-            (selectedNode, selectedNodeCanBeDeleted) => {
+            (selectedNode: HogFlowActionNode | null, selectedNodeCanBeDeleted: boolean) => {
                 if (!selectedNodeCanBeDeleted) {
                     return false
                 }
diff --git a/products/workflows/frontend/Workflows/hogflows/panel/hogFlowOutputMappingLogic.ts b/products/workflows/frontend/Workflows/hogflows/panel/hogFlowOutputMappingLogic.ts
index d24890b26753..b2c7ace64179 100644
--- a/products/workflows/frontend/Workflows/hogflows/panel/hogFlowOutputMappingLogic.ts
+++ b/products/workflows/frontend/Workflows/hogflows/panel/hogFlowOutputMappingLogic.ts
@@ -1,15 +1,16 @@
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api from 'lib/api'
 
+import type { CyclotronJobInvocationGlobals, HogFunctionTemplateType } from '../../../../../../frontend/src/types'
 import { WorkflowLogicProps, sanitizeWorkflow, workflowLogic } from '../../workflowLogic'
 import { OutputMappingSuggestion } from '../hogFlowEditorLogic'
 import { hogFlowEditorLogic } from '../hogFlowEditorLogic'
 import { getRegisteredActionNodeCategories } from '../registry/actions/actionNodeRegistry'
 import type { HogflowTestResult } from '../steps/types'
 import type { HogFlowAction } from '../types'
-import type { hogFlowOutputMappingLogicType } from './hogFlowOutputMappingLogicType'
+import type { HogFlow, HogFlowActionNode } from '../types'
 import { createExampleEvent, hogFlowEditorTestLogic } from './testing/hogFlowEditorTestLogic'
 
 export type OutputMapping = { key: string; result_path: string; spread?: boolean | null }
@@ -27,6 +28,100 @@ export function normalizeOutputVariable(raw: HogFlowAction['output_variable']):
     return []
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFlowOutputMappingLogicValues {
+    selectedNode: HogFlowActionNode | null; // hogFlowEditorLogic
+    accumulatedVariables: Record<string, any>; // hogFlowEditorTestLogic
+    sampleGlobals: CyclotronJobInvocationGlobals | null; // hogFlowEditorTestLogic
+    hogFunctionTemplatesById: Record<string, HogFunctionTemplateType>; // workflowLogic
+    workflow: HogFlow; // workflowLogic
+    mappings: OutputMapping[];
+    pendingPath: string | null;
+    pendingSuggestions: OutputMappingSuggestion[];
+    selectedAction: HogFlowAction | null;
+    selectedActionId: string | null;
+    shakePickButton: boolean;
+    suggestions: OutputMappingSuggestion[];
+    suggestionsLoading: boolean;
+    testError: string | null;
+    testLoading: boolean;
+    testResultData: unknown | null;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFlowOutputMappingLogicActions {
+    addMapping: () => {
+        value: true;
+    };
+    applySuggestion: (suggestion: OutputMappingSuggestion) => {
+        suggestion: OutputMappingSuggestion;
+    };
+    assignPendingPathToMapping: (index: number, path: string) => {
+        index: number;
+        path: string;
+    };
+    cancelPendingPath: () => {
+        value: true;
+    };
+    initMappings: (mappings: OutputMapping[]) => {
+        mappings: OutputMapping[];
+    };
+    loadSuggestions: (_: any) => any;
+    loadSuggestionsFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadSuggestionsSuccess: (suggestions: OutputMappingSuggestion[], payload?: any) => {
+        suggestions: OutputMappingSuggestion[];
+        payload?: any;
+    };
+    removeMapping: (index: number) => {
+        index: number;
+    };
+    runOutputTest: () => {
+        value: true;
+    };
+    selectPath: (path: string) => {
+        path: string;
+    };
+    setMappings: (mappings: OutputMapping[]) => {
+        mappings: OutputMapping[];
+    };
+    setSelectedActionId: (actionId: string | null) => {
+        actionId: string | null;
+    };
+    setShakePickButton: (shake: boolean) => {
+        shake: boolean;
+    };
+    setTestError: (error: string | null) => {
+        error: string | null;
+    };
+    setTestLoading: (loading: boolean) => {
+        loading: boolean;
+    };
+    setTestResultData: (data: unknown | null) => {
+        data: unknown;
+    };
+    triggerShake: () => {
+        value: true;
+    };
+    updateMappingResultPath: (index: number, path: string) => {
+        index: number;
+        path: string;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFlowOutputMappingLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        selectedAction: (selectedNode: HogFlowActionNode | null) => HogFlowAction | null;
+        pendingSuggestions: (suggestions: OutputMappingSuggestion[], mappings: OutputMapping[]) => OutputMappingSuggestion[];
+    };
+}
+
+export type hogFlowOutputMappingLogicType = MakeLogicType<hogFlowOutputMappingLogicValues, hogFlowOutputMappingLogicActions, WorkflowLogicProps, hogFlowOutputMappingLogicMeta>;
+
 export const hogFlowOutputMappingLogic = kea<hogFlowOutputMappingLogicType>([
     path((key) => [
         'products',
@@ -161,10 +256,13 @@ export const hogFlowOutputMappingLogic = kea<hogFlowOutputMappingLogicType>([
         ],
     }),
     selectors({
-        selectedAction: [(s) => [s.selectedNode], (selectedNode) => selectedNode?.data ?? null],
+        selectedAction: [
+            (s) => [s.selectedNode],
+            (selectedNode: null | import('../types').HogFlowActionNode) => selectedNode?.data ?? null,
+        ],
         pendingSuggestions: [
             (s) => [s.suggestions, s.mappings],
-            (suggestions, mappings): OutputMappingSuggestion[] => {
+            (suggestions: OutputMappingSuggestion[], mappings: OutputMapping[]): OutputMappingSuggestion[] => {
                 const usedResultPaths = new Set(mappings.map((m) => m.result_path).filter(Boolean))
                 const usedKeys = new Set(mappings.map((m) => m.key).filter(Boolean))
                 return suggestions.filter((s) => !usedResultPaths.has(s.result_path) && !usedKeys.has(s.key))
diff --git a/products/workflows/frontend/Workflows/hogflows/panel/testing/hogFlowEditorNotificationTestLogic.ts b/products/workflows/frontend/Workflows/hogflows/panel/testing/hogFlowEditorNotificationTestLogic.ts
index 713b9d501fb8..4be9699706b6 100644
--- a/products/workflows/frontend/Workflows/hogflows/panel/testing/hogFlowEditorNotificationTestLogic.ts
+++ b/products/workflows/frontend/Workflows/hogflows/panel/testing/hogFlowEditorNotificationTestLogic.ts
@@ -1,5 +1,6 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -16,13 +17,181 @@ import { CyclotronJobInvocationGlobals, FilterLogicalOperator, PersonType, Prope
 import { WorkflowLogicProps, workflowLogic } from '../../../workflowLogic'
 import { hogFlowEditorLogic } from '../../hogFlowEditorLogic'
 import { HogflowTestResult } from '../../steps/types'
-import type { hogFlowEditorNotificationTestLogicType } from './hogFlowEditorNotificationTestLogicType'
+import type { HogFlow } from '../../types'
 import { createExampleEvent, createGlobalsFromResponse } from './hogFlowEditorTestLogic'
 import type { HogflowTestInvocation } from './hogFlowEditorTestLogic'
 
 // Time range constants for event search
 const STANDARD_SEARCH_RANGE = `-7d`
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFlowEditorNotificationTestLogicValues {
+    selectedNodeId: string | null // hogFlowEditorLogic
+    workflow: HogFlow // workflowLogic
+    workflowSanitized: HogFlow // workflowLogic
+    emailAddressOverride: string | null
+    isTestInvocationSubmitting: boolean
+    isTestInvocationValid: boolean
+    nextActionId: string | null
+    personSearchResults: PersonType[]
+    personSearchResultsLoading: boolean
+    personSearchTerm: string
+    personSelectorOpen: boolean
+    sampleGlobals: CyclotronJobInvocationGlobals | null
+    sampleGlobalsError: string | null
+    sampleGlobalsLoading: boolean
+    samplePersons: PersonType[]
+    samplePersonsLoading: boolean
+    selectedPersonDistinctId: string | null
+    showTestInvocationErrors: boolean
+    testInvocation: HogflowTestInvocation
+    testInvocationAllErrors: Record<string, any>
+    testInvocationChanged: boolean
+    testInvocationErrors: DeepPartialMap<HogflowTestInvocation, ValidationErrorType>
+    testInvocationHasErrors: boolean
+    testInvocationManualErrors: Record<string, any>
+    testInvocationTouched: boolean
+    testInvocationTouches: Record<string, boolean>
+    testInvocationValidationErrors: DeepPartialMap<HogflowTestInvocation, ValidationErrorType>
+    testResult: HogflowTestResult | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFlowEditorNotificationTestLogicActions {
+    setSelectedNodeId: (selectedNodeId: string | null) => {
+        selectedNodeId: string | null
+    } // hogFlowEditorLogic
+    clearPersonSearch: () => {
+        value: true
+    }
+    loadSamplePersonByDistinctId: (payload: { distinctId: string }) => {
+        distinctId: string
+    }
+    loadSamplePersonByDistinctIdFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject: any
+    }
+    loadSamplePersonByDistinctIdSuccess: (sampleGlobals: CyclotronJobInvocationGlobals | null) => {
+        sampleGlobals: CyclotronJobInvocationGlobals | null
+    }
+    loadSamplePersons: () => {
+        value: true
+    }
+    loadSamplePersonsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSamplePersonsSuccess: (
+        samplePersons: PersonType[],
+        payload?: {
+            value: true
+        }
+    ) => {
+        samplePersons: PersonType[]
+        payload?: {
+            value: true
+        }
+    }
+    resetTestInvocation: (values?: HogflowTestInvocation) => {
+        values?: HogflowTestInvocation
+    }
+    searchPersons: (searchTerm: string) => {
+        searchTerm: string
+    }
+    searchPersonsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    searchPersonsSuccess: (
+        personSearchResults: PersonType[],
+        payload?: {
+            searchTerm: string
+        }
+    ) => {
+        personSearchResults: PersonType[]
+        payload?: {
+            searchTerm: string
+        }
+    }
+    setEmailAddressOverride: (email: string) => {
+        email: string
+    }
+    setNextActionId: (nextActionId: string | null) => {
+        nextActionId: string | null
+    }
+    setPersonSearchTerm: (term: string) => {
+        term: string
+    }
+    setPersonSelectorOpen: (open: boolean) => {
+        open: boolean
+    }
+    setSampleGlobals: (globals?: string | null) => {
+        globals: string | null
+    }
+    setSampleGlobalsError: (error: string | null) => {
+        error: string | null
+    }
+    setSelectedPersonDistinctId: (distinctId: string | null) => {
+        distinctId: string | null
+    }
+    setTestInvocationManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setTestInvocationValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setTestInvocationValues: (values: DeepPartial<HogflowTestInvocation>) => {
+        values: DeepPartial<HogflowTestInvocation>
+    }
+    setTestResult: (testResult: HogflowTestResult | null) => {
+        testResult: HogflowTestResult | null
+    }
+    submitTestInvocation: () => {
+        value: boolean
+    }
+    submitTestInvocationFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitTestInvocationRequest: (testInvocation: HogflowTestInvocation) => {
+        testInvocation: HogflowTestInvocation
+    }
+    submitTestInvocationSuccess: (testInvocation: HogflowTestInvocation) => {
+        testInvocation: HogflowTestInvocation
+    }
+    touchTestInvocationField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFlowEditorNotificationTestLogicMeta {
+    key: string
+}
+
+export type hogFlowEditorNotificationTestLogicType = MakeLogicType<
+    hogFlowEditorNotificationTestLogicValues,
+    hogFlowEditorNotificationTestLogicActions,
+    WorkflowLogicProps,
+    hogFlowEditorNotificationTestLogicMeta
+>
+
 export const hogFlowEditorNotificationTestLogic = kea<hogFlowEditorNotificationTestLogicType>([
     path((key) => [
         'products',
diff --git a/products/workflows/frontend/Workflows/hogflows/panel/testing/hogFlowEditorTestLogic.ts b/products/workflows/frontend/Workflows/hogflows/panel/testing/hogFlowEditorTestLogic.ts
index cdccd737e930..74cb026d0654 100644
--- a/products/workflows/frontend/Workflows/hogflows/panel/testing/hogFlowEditorTestLogic.ts
+++ b/products/workflows/frontend/Workflows/hogflows/panel/testing/hogFlowEditorTestLogic.ts
@@ -1,5 +1,5 @@
 import { deepEqual as equal } from 'fast-equals'
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
 import { loaders } from 'kea-loaders'
 
@@ -28,7 +28,9 @@ import {
 import { WorkflowLogicProps, workflowLogic } from '../../../workflowLogic'
 import { hogFlowEditorLogic } from '../../hogFlowEditorLogic'
 import { HogflowTestResult } from '../../steps/types'
-import type { hogFlowEditorTestLogicType } from './hogFlowEditorTestLogicType'
+import type { TriggerAction } from '../../../workflowLogic'
+import type { HogFlow } from '../../types'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 
 // Time range constants for event search
 const STANDARD_SEARCH_DAYS = 7
@@ -168,6 +170,339 @@ export const createGlobalsFromResponse = (
     }
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFlowEditorTestLogicValues {
+    groupsEnabled: boolean; // groupsAccessLogic
+    groupTypes: Map<GroupTypeIndex, GroupType>; // groupsModel
+    selectedNodeId: string | null; // hogFlowEditorLogic
+    triggerAction: TriggerAction | null; // workflowLogic
+    workflow: HogFlow; // workflowLogic
+    workflowSanitized: HogFlow; // workflowLogic
+    accumulatedVariables: Record<string, any>;
+    canTryExtendedSearch: boolean;
+    eventPanelOpen: string[];
+    eventSelectorOpen: boolean;
+    fetchCancelled: boolean;
+    groupTypesForTest: Map<GroupTypeIndex, GroupType>;
+    isTestInvocationSubmitting: boolean;
+    isTestInvocationValid: boolean;
+    lastSearchedEventName: string | null;
+    matchingFilters: PropertyGroupFilter;
+    nextActionId: string | null;
+    noMatchingEvents: boolean;
+    sampleGlobals: CyclotronJobInvocationGlobals | null;
+    sampleGlobalsError: string | null;
+    sampleGlobalsLoading: boolean;
+    shouldLoadSampleGlobals: boolean;
+    showTestInvocationErrors: boolean;
+    testInvocation: HogflowTestInvocation;
+    testInvocationAllErrors: Record<string, any>;
+    testInvocationChanged: boolean;
+    testInvocationErrors: DeepPartialMap<HogflowTestInvocation, ValidationErrorType>;
+    testInvocationHasErrors: boolean;
+    testInvocationManualErrors: Record<string, any>;
+    testInvocationTouched: boolean;
+    testInvocationTouches: Record<string, boolean>;
+    testInvocationValidationErrors: DeepPartialMap<HogflowTestInvocation, ValidationErrorType>;
+    testResult: HogflowTestResult | null;
+    testResultMode: "diff" | "raw";
+    workflowVariableDefaults: Record<string, any>;
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFlowEditorTestLogicActions {
+    setAnimatingEdgePair: (from: string, to: string) => {
+        from: string;
+        to: string;
+    }; // hogFlowEditorLogic
+    setSelectedNodeId: (selectedNodeId: string | null) => {
+        selectedNodeId: string | null;
+    }; // hogFlowEditorLogic
+    cancelSampleGlobalsLoading: () => {
+        value: true;
+    };
+    loadSampleEventByName: (payload: {
+        eventName: string;
+        extendedSearch?: boolean;
+    }) => {
+        eventName: string;
+        extendedSearch: boolean | undefined;
+    };
+    loadSampleEventByNameFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadSampleEventByNameSuccess: (sampleGlobals: CyclotronJobInvocationGlobals | null, payload?: {
+        eventName: string;
+        extendedSearch: boolean | undefined;
+    }) => {
+        sampleGlobals: CyclotronJobInvocationGlobals | null;
+        payload?: {
+            eventName: string;
+            extendedSearch: boolean | undefined;
+        };
+    };
+    loadSampleGlobals: (payload?: {
+        eventId?: string;
+        extendedSearch?: boolean;
+    }) => {
+        eventId: string | undefined;
+        extendedSearch: boolean | undefined;
+    };
+    loadSampleGlobalsFailure: (error: string, errorObject?: any) => {
+        error: string;
+        errorObject?: any;
+    };
+    loadSampleGlobalsSuccess: (sampleGlobals: CyclotronJobInvocationGlobals | null, payload?: {
+        eventId: string | undefined;
+        extendedSearch: boolean | undefined;
+    }) => {
+        sampleGlobals: CyclotronJobInvocationGlobals | null;
+        payload?: {
+            eventId: string | undefined;
+            extendedSearch: boolean | undefined;
+        };
+    };
+    receiveExampleGlobals: (globals: object | null) => {
+        globals: object | null;
+    };
+    resetAccumulatedVariables: () => {
+        value: true;
+    };
+    resetTestInvocation: (values?: HogflowTestInvocation) => {
+        values?: HogflowTestInvocation;
+    };
+    setCanTryExtendedSearch: (canTryExtendedSearch: boolean) => {
+        canTryExtendedSearch: boolean;
+    };
+    setEventPanelOpen: (eventPanelOpen: string[]) => {
+        eventPanelOpen: string[];
+    };
+    setEventSelectorOpen: (eventSelectorOpen: boolean) => {
+        eventSelectorOpen: boolean;
+    };
+    setLastSearchedEventName: (eventName: string | null) => {
+        eventName: string | null;
+    };
+    setNextActionId: (nextActionId: string | null) => {
+        nextActionId: string | null;
+    };
+    setNoMatchingEvents: (noMatchingEvents: boolean) => {
+        noMatchingEvents: boolean;
+    };
+    setSampleGlobals: (globals?: string | null) => {
+        globals: string | null | undefined;
+    };
+    setSampleGlobalsError: (error: string | null) => {
+        error: string | null;
+    };
+    setTestInvocationManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>;
+    };
+    setTestInvocationValue: (key: FieldName, value: any) => {
+        name: FieldName;
+        value: any;
+    };
+    setTestInvocationValues: (values: DeepPartial<HogflowTestInvocation>) => {
+        values: DeepPartial<HogflowTestInvocation>;
+    };
+    setTestResult: (testResult: HogflowTestResult | null) => {
+        testResult: HogflowTestResult | null;
+    };
+    setTestResultMode: (mode: "diff" | "raw") => {
+        mode: "diff" | "raw";
+    };
+    submitTestInvocation: () => {
+        value: boolean;
+    };
+    submitTestInvocationFailure: (error: Error, errors: Record<string, any>) => {
+        error: Error;
+        errors: Record<string, any>;
+    };
+    submitTestInvocationRequest: (testInvocation: HogflowTestInvocation) => {
+        testInvocation: HogflowTestInvocation;
+    };
+    submitTestInvocationSuccess: (testInvocation: HogflowTestInvocation) => {
+        testInvocation: HogflowTestInvocation;
+    };
+    touchTestInvocationField: (key: string) => {
+        key: string;
+    };
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFlowEditorTestLogicMeta {
+    key: string;
+    __keaTypeGenInternalSelectorTypes: {
+        shouldLoadSampleGlobals: (triggerAction: ({
+            config: {
+                type: "schedule";
+            } | {
+                filters: {
+                    properties: any[];
+                };
+                type: "batch";
+            } | {
+                filters: {
+                    actions?: any[] | undefined;
+                    events?: any[] | undefined;
+                    filter_test_accounts?: boolean | undefined;
+                    properties?: any[] | undefined;
+                };
+                type: "event";
+            } | {
+                filters: {
+                    properties?: any[] | undefined;
+                };
+                key_property?: string | undefined;
+                table_name: string;
+                type: "data-warehouse-table";
+            } | {
+                inputs: Record<string, {
+                    bytecode?: any;
+                    order?: number | undefined;
+                    secret?: boolean | undefined;
+                    templating?: "hog" | "liquid" | undefined;
+                    value: any;
+                }>;
+                template_id: string;
+                template_uuid?: string | undefined;
+                type: "manual";
+            } | {
+                inputs: Record<string, {
+                    bytecode?: any;
+                    order?: number | undefined;
+                    secret?: boolean | undefined;
+                    templating?: "hog" | "liquid" | undefined;
+                    value: any;
+                }>;
+                template_id: string;
+                template_uuid?: string | undefined;
+                type: "tracking_pixel";
+            } | {
+                inputs: Record<string, {
+                    bytecode?: any;
+                    order?: number | undefined;
+                    secret?: boolean | undefined;
+                    templating?: "hog" | "liquid" | undefined;
+                    value: any;
+                }>;
+                template_id: string;
+                template_uuid?: string | undefined;
+                type: "webhook";
+            };
+            created_at?: number | undefined;
+            description: string;
+            filters?: {
+                actions?: any[] | undefined;
+                events?: any[] | undefined;
+                properties?: any[] | undefined;
+            } | null | undefined;
+            id: string;
+            name: string;
+            on_error?: "abort" | "continue" | null | undefined;
+            output_variable?: {
+                key: string;
+                label?: string | null | undefined;
+                result_path?: string | null | undefined;
+                spread?: boolean | null | undefined;
+            } | {
+                key: string;
+                label?: string | null | undefined;
+                result_path?: string | null | undefined;
+                spread?: boolean | null | undefined;
+            }[] | null | undefined;
+            type: "trigger";
+            updated_at?: number | undefined;
+        } & Record<string, unknown>) | null) => boolean;
+        groupTypesForTest: (groupsEnabled: boolean, groupTypes: Map<GroupTypeIndex, GroupType>) => Map<GroupTypeIndex, GroupType>;
+        matchingFilters: (triggerAction: ({
+            config: {
+                type: "schedule";
+            } | {
+                filters: {
+                    properties: any[];
+                };
+                type: "batch";
+            } | {
+                filters: {
+                    actions?: any[] | undefined;
+                    events?: any[] | undefined;
+                    filter_test_accounts?: boolean | undefined;
+                    properties?: any[] | undefined;
+                };
+                type: "event";
+            } | {
+                filters: {
+                    properties?: any[] | undefined;
+                };
+                key_property?: string | undefined;
+                table_name: string;
+                type: "data-warehouse-table";
+            } | {
+                inputs: Record<string, {
+                    bytecode?: any;
+                    order?: number | undefined;
+                    secret?: boolean | undefined;
+                    templating?: "hog" | "liquid" | undefined;
+                    value: any;
+                }>;
+                template_id: string;
+                template_uuid?: string | undefined;
+                type: "manual";
+            } | {
+                inputs: Record<string, {
+                    bytecode?: any;
+                    order?: number | undefined;
+                    secret?: boolean | undefined;
+                    templating?: "hog" | "liquid" | undefined;
+                    value: any;
+                }>;
+                template_id: string;
+                template_uuid?: string | undefined;
+                type: "tracking_pixel";
+            } | {
+                inputs: Record<string, {
+                    bytecode?: any;
+                    order?: number | undefined;
+                    secret?: boolean | undefined;
+                    templating?: "hog" | "liquid" | undefined;
+                    value: any;
+                }>;
+                template_id: string;
+                template_uuid?: string | undefined;
+                type: "webhook";
+            };
+            created_at?: number | undefined;
+            description: string;
+            filters?: {
+                actions?: any[] | undefined;
+                events?: any[] | undefined;
+                properties?: any[] | undefined;
+            } | null | undefined;
+            id: string;
+            name: string;
+            on_error?: "abort" | "continue" | null | undefined;
+            output_variable?: {
+                key: string;
+                label?: string | null | undefined;
+                result_path?: string | null | undefined;
+                spread?: boolean | null | undefined;
+            } | {
+                key: string;
+                label?: string | null | undefined;
+                result_path?: string | null | undefined;
+                spread?: boolean | null | undefined;
+            }[] | null | undefined;
+            type: "trigger";
+            updated_at?: number | undefined;
+        } & Record<string, unknown>) | null) => PropertyGroupFilter;
+        workflowVariableDefaults: (workflow: HogFlow) => Record<string, any>;
+    };
+}
+
+export type hogFlowEditorTestLogicType = MakeLogicType<hogFlowEditorTestLogicValues, hogFlowEditorTestLogicActions, WorkflowLogicProps, hogFlowEditorTestLogicMeta>;
+
 export const hogFlowEditorTestLogic = kea<hogFlowEditorTestLogicType>([
     path((key) => ['products', 'workflows', 'frontend', 'Workflows', 'hogflows', 'actions', 'workflowTestLogic', key]),
     props({} as WorkflowLogicProps),
@@ -464,7 +799,87 @@ export const hogFlowEditorTestLogic = kea<hogFlowEditorTestLogicType>([
     selectors(() => ({
         shouldLoadSampleGlobals: [
             (s) => [s.triggerAction],
-            (triggerAction): boolean => {
+            (triggerAction: ({
+    config: {
+        type: "schedule";
+    } | {
+        filters: {
+            properties: any[];
+        };
+        type: "batch";
+    } | {
+        filters: {
+            actions?: any[] | undefined;
+            events?: any[] | undefined;
+            filter_test_accounts?: boolean | undefined;
+            properties?: any[] | undefined;
+        };
+        type: "event";
+    } | {
+        filters: {
+            properties?: any[] | undefined;
+        };
+        key_property?: string | undefined;
+        table_name: string;
+        type: "data-warehouse-table";
+    } | {
+        inputs: Record<string, {
+            bytecode?: any;
+            order?: number | undefined;
+            secret?: boolean | undefined;
+            templating?: "hog" | "liquid" | undefined;
+            value: any;
+        }>;
+        template_id: string;
+        template_uuid?: string | undefined;
+        type: "manual";
+    } | {
+        inputs: Record<string, {
+            bytecode?: any;
+            order?: number | undefined;
+            secret?: boolean | undefined;
+            templating?: "hog" | "liquid" | undefined;
+            value: any;
+        }>;
+        template_id: string;
+        template_uuid?: string | undefined;
+        type: "tracking_pixel";
+    } | {
+        inputs: Record<string, {
+            bytecode?: any;
+            order?: number | undefined;
+            secret?: boolean | undefined;
+            templating?: "hog" | "liquid" | undefined;
+            value: any;
+        }>;
+        template_id: string;
+        template_uuid?: string | undefined;
+        type: "webhook";
+    };
+    created_at?: number | undefined;
+    description: string;
+    filters?: {
+        actions?: any[] | undefined;
+        events?: any[] | undefined;
+        properties?: any[] | undefined;
+    } | null | undefined;
+    id: string;
+    name: string;
+    on_error?: "abort" | "continue" | null | undefined;
+    output_variable?: {
+        key: string;
+        label?: string | null | undefined;
+        result_path?: string | null | undefined;
+        spread?: boolean | null | undefined;
+    } | {
+        key: string;
+        label?: string | null | undefined;
+        result_path?: string | null | undefined;
+        spread?: boolean | null | undefined;
+    }[] | null | undefined;
+    type: "trigger";
+    updated_at?: number | undefined;
+} & Record<string, unknown>) | null): boolean => {
                 // Only load samples if the trigger is event
                 return !!(triggerAction && triggerAction.config.type === 'event')
             },
@@ -474,12 +889,92 @@ export const hogFlowEditorTestLogic = kea<hogFlowEditorTestLogicType>([
         // here but never in production).
         groupTypesForTest: [
             (s) => [s.groupsEnabled, s.groupTypes],
-            (groupsEnabled, groupTypes): Map<GroupTypeIndex, GroupType> => (groupsEnabled ? groupTypes : new Map()),
+            (groupsEnabled: boolean, groupTypes: Map<GroupTypeIndex, GroupType>): Map<GroupTypeIndex, GroupType> => (groupsEnabled ? groupTypes : new Map()),
         ],
         // TODO(workflows): DRY up matchingFilters with implementation in hogFunctionConfigurationLogic
         matchingFilters: [
             (s) => [s.triggerAction],
-            (triggerAction): PropertyGroupFilter => {
+            (triggerAction: ({
+    config: {
+        type: "schedule";
+    } | {
+        filters: {
+            properties: any[];
+        };
+        type: "batch";
+    } | {
+        filters: {
+            actions?: any[] | undefined;
+            events?: any[] | undefined;
+            filter_test_accounts?: boolean | undefined;
+            properties?: any[] | undefined;
+        };
+        type: "event";
+    } | {
+        filters: {
+            properties?: any[] | undefined;
+        };
+        key_property?: string | undefined;
+        table_name: string;
+        type: "data-warehouse-table";
+    } | {
+        inputs: Record<string, {
+            bytecode?: any;
+            order?: number | undefined;
+            secret?: boolean | undefined;
+            templating?: "hog" | "liquid" | undefined;
+            value: any;
+        }>;
+        template_id: string;
+        template_uuid?: string | undefined;
+        type: "manual";
+    } | {
+        inputs: Record<string, {
+            bytecode?: any;
+            order?: number | undefined;
+            secret?: boolean | undefined;
+            templating?: "hog" | "liquid" | undefined;
+            value: any;
+        }>;
+        template_id: string;
+        template_uuid?: string | undefined;
+        type: "tracking_pixel";
+    } | {
+        inputs: Record<string, {
+            bytecode?: any;
+            order?: number | undefined;
+            secret?: boolean | undefined;
+            templating?: "hog" | "liquid" | undefined;
+            value: any;
+        }>;
+        template_id: string;
+        template_uuid?: string | undefined;
+        type: "webhook";
+    };
+    created_at?: number | undefined;
+    description: string;
+    filters?: {
+        actions?: any[] | undefined;
+        events?: any[] | undefined;
+        properties?: any[] | undefined;
+    } | null | undefined;
+    id: string;
+    name: string;
+    on_error?: "abort" | "continue" | null | undefined;
+    output_variable?: {
+        key: string;
+        label?: string | null | undefined;
+        result_path?: string | null | undefined;
+        spread?: boolean | null | undefined;
+    } | {
+        key: string;
+        label?: string | null | undefined;
+        result_path?: string | null | undefined;
+        spread?: boolean | null | undefined;
+    }[] | null | undefined;
+    type: "trigger";
+    updated_at?: number | undefined;
+} & Record<string, unknown>) | null): PropertyGroupFilter => {
                 if (!triggerAction || triggerAction.config.type !== 'event') {
                     return {
                         type: FilterLogicalOperator.And,
@@ -548,7 +1043,7 @@ export const hogFlowEditorTestLogic = kea<hogFlowEditorTestLogicType>([
         ],
         workflowVariableDefaults: [
             (s) => [s.workflow],
-            (workflow): Record<string, any> =>
+            (workflow: HogFlow): Record<string, any> =>
                 workflow.variables?.reduce(
                     (acc, variable) => {
                         acc[variable.key] = variable.default
diff --git a/products/workflows/frontend/Workflows/hogflows/registry/triggers/surveyTriggerLogic.ts b/products/workflows/frontend/Workflows/hogflows/registry/triggers/surveyTriggerLogic.ts
index a2c3c291503c..dbdb00019b94 100644
--- a/products/workflows/frontend/Workflows/hogflows/registry/triggers/surveyTriggerLogic.ts
+++ b/products/workflows/frontend/Workflows/hogflows/registry/triggers/surveyTriggerLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import { lemonToast } from '@posthog/lemon-ui'
@@ -7,10 +7,92 @@ import api from 'lib/api'
 
 import { Survey } from '~/types'
 
-import type { surveyTriggerLogicType } from './surveyTriggerLogicType'
-
 const SURVEYS_PAGE_SIZE = 20
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface surveyTriggerLogicValues {
+    allSurveys: Survey[]
+    filteredSurveys: Survey[]
+    hasMoreSurveys: boolean
+    moreSurveys: Survey[]
+    moreSurveysLoading: boolean
+    responseCounts: Record<string, number>
+    responseCountsLoading: boolean
+    searchTerm: string
+    surveys: Survey[]
+    surveysLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface surveyTriggerLogicActions {
+    loadMoreSurveys: () => any
+    loadMoreSurveysFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadMoreSurveysSuccess: (
+        moreSurveys: Survey[],
+        payload?: any
+    ) => {
+        moreSurveys: Survey[]
+        payload?: any
+    }
+    loadResponseCounts: () => any
+    loadResponseCountsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadResponseCountsSuccess: (
+        responseCounts: {
+            [key: string]: number
+        },
+        payload?: any
+    ) => {
+        responseCounts: {
+            [key: string]: number
+        }
+        payload?: any
+    }
+    loadSurveys: () => any
+    loadSurveysFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadSurveysSuccess: (
+        surveys: Survey[],
+        payload?: any
+    ) => {
+        surveys: Survey[]
+        payload?: any
+    }
+    setSearchTerm: (searchTerm: string) => {
+        searchTerm: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface surveyTriggerLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        filteredSurveys: (allSurveys: Survey[], searchTerm: string) => Survey[]
+    }
+}
+
+export type surveyTriggerLogicType = MakeLogicType<
+    surveyTriggerLogicValues,
+    surveyTriggerLogicActions,
+    Record<string, any>,
+    surveyTriggerLogicMeta
+>
+
 export const surveyTriggerLogic = kea<surveyTriggerLogicType>([
     path(['products', 'workflows', 'frontend', 'Workflows', 'hogflows', 'registry', 'triggers', 'surveyTriggerLogic']),
     actions({
diff --git a/products/workflows/frontend/Workflows/hogflows/steps/batchTriggerLogic.ts b/products/workflows/frontend/Workflows/hogflows/steps/batchTriggerLogic.ts
index 1742bbec70d5..ceebc1a6b7ae 100644
--- a/products/workflows/frontend/Workflows/hogflows/steps/batchTriggerLogic.ts
+++ b/products/workflows/frontend/Workflows/hogflows/steps/batchTriggerLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, key, listeners, path, props, propsChanged, reducers } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, key, listeners, path, props, propsChanged, reducers } from 'kea'
 import { loaders } from 'kea-loaders'
 
 import api, { ApiError } from 'lib/api'
@@ -7,7 +7,6 @@ import { objectsEqual } from 'lib/utils/objects'
 import { BlastRadiusApi } from 'products/workflows/frontend/generated/api.schemas'
 
 import { HogFlowAction } from '../types'
-import type { batchTriggerLogicType } from './batchTriggerLogicType'
 
 // Matches the default email template's `to.email` value: `{{ person.properties.email }}`, whitespace-tolerant.
 // Anything else (custom property, computed Liquid, static address) makes the dedupe key diverge from the
@@ -35,6 +34,54 @@ export interface BatchTriggerLogicProps {
     dedupeKey?: 'email'
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface batchTriggerLogicValues {
+    blastRadius: BlastRadiusApi | null
+    blastRadiusError: string | null
+    blastRadiusLoading: boolean
+    filters: any
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface batchTriggerLogicActions {
+    loadBlastRadius: () => {
+        value: true
+    }
+    loadBlastRadiusFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadBlastRadiusSuccess: (
+        blastRadius: BlastRadiusApi | null,
+        payload?: {
+            value: true
+        }
+    ) => {
+        blastRadius: BlastRadiusApi | null
+        payload?: {
+            value: true
+        }
+    }
+    setBlastRadiusError: (error: string | null) => {
+        error: string | null
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface batchTriggerLogicMeta {
+    key: string
+}
+
+export type batchTriggerLogicType = MakeLogicType<
+    batchTriggerLogicValues,
+    batchTriggerLogicActions,
+    BatchTriggerLogicProps,
+    batchTriggerLogicMeta
+>
+
 export const batchTriggerLogic = kea<batchTriggerLogicType>([
     path(['products', 'workflows', 'frontend', 'Workflows', 'hogflows', 'steps', 'batchTriggerLogic']),
     props({} as BatchTriggerLogicProps),
diff --git a/products/workflows/frontend/Workflows/hogflows/steps/components/stepViewLogic.ts b/products/workflows/frontend/Workflows/hogflows/steps/components/stepViewLogic.ts
index 976deeb03037..3656b0d6f0a0 100644
--- a/products/workflows/frontend/Workflows/hogflows/steps/components/stepViewLogic.ts
+++ b/products/workflows/frontend/Workflows/hogflows/steps/components/stepViewLogic.ts
@@ -1,14 +1,68 @@
-import { actions, connect, kea, key, listeners, path, props, propsChanged, reducers } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, propsChanged, reducers } from 'kea'
 
 import { WorkflowLogicProps, workflowLogic } from '../../../workflowLogic'
 import { HogFlowAction } from '../../types'
-import type { stepViewLogicType } from './stepViewLogicType'
 
 export type StepViewLogicProps = {
     action: HogFlowAction
     workflowLogicProps: WorkflowLogicProps
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface stepViewLogicValues {
+    editDescriptionValue: string
+    editNameValue: string
+    isEditingDescription: boolean
+    isEditingName: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface stepViewLogicActions {
+    setWorkflowAction: (
+        actionId: string,
+        action: HogFlowAction
+    ) => {
+        action: HogFlowAction
+        actionId: string
+    } // workflowLogic
+    cancelEditingDescription: () => {
+        value: true
+    }
+    cancelEditingName: () => {
+        value: true
+    }
+    saveDescription: () => {
+        value: true
+    }
+    saveName: () => {
+        value: true
+    }
+    setEditDescriptionValue: (value: string) => {
+        value: string
+    }
+    setEditNameValue: (value: string) => {
+        value: string
+    }
+    startEditingDescription: () => {
+        value: true
+    }
+    startEditingName: () => {
+        value: true
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface stepViewLogicMeta {
+    key: string
+}
+
+export type stepViewLogicType = MakeLogicType<
+    stepViewLogicValues,
+    stepViewLogicActions,
+    StepViewLogicProps,
+    stepViewLogicMeta
+>
+
 export const stepViewLogic = kea<stepViewLogicType>([
     path((key) => [
         'products',
diff --git a/products/workflows/frontend/Workflows/hogflows/steps/hogFunctionStepLogic.tsx b/products/workflows/frontend/Workflows/hogflows/steps/hogFunctionStepLogic.tsx
index bdbb565360e1..805ff91a6bd4 100644
--- a/products/workflows/frontend/Workflows/hogflows/steps/hogFunctionStepLogic.tsx
+++ b/products/workflows/frontend/Workflows/hogflows/steps/hogFunctionStepLogic.tsx
@@ -1,13 +1,13 @@
 import { Node } from '@xyflow/react'
-import { kea, key, path, props, propsChanged } from 'kea'
+import { MakeLogicType, kea, key, path, props, propsChanged } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 
 import { templateToConfiguration } from 'scenes/hog-functions/configuration/hogFunctionConfigurationLogic'
 
 import { HogFunctionTemplateType } from '~/types'
 
 import { HogFlowAction } from '../types'
-import type { hogFunctionStepLogicType } from './hogFunctionStepLogicType'
 
 export type StepFunctionNode = Node<
     Extract<
@@ -21,6 +21,202 @@ export interface HogFunctionStepLogicProps {
     template?: HogFunctionTemplateType
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFunctionStepLogicValues {
+    configuration: {
+        inputs: Record<
+            string,
+            {
+                bytecode?: any
+                order?: number | undefined
+                secret?: boolean | undefined
+                templating?: 'hog' | 'liquid' | undefined
+                value: any
+            }
+        >
+    }
+    configurationAllErrors: Record<string, any>
+    configurationChanged: boolean
+    configurationErrors: DeepPartialMap<
+        {
+            inputs: Record<
+                string,
+                {
+                    bytecode?: any
+                    order?: number | undefined
+                    secret?: boolean | undefined
+                    templating?: 'hog' | 'liquid' | undefined
+                    value: any
+                }
+            >
+        },
+        ValidationErrorType
+    >
+    configurationHasErrors: boolean
+    configurationManualErrors: Record<string, any>
+    configurationTouched: boolean
+    configurationTouches: Record<string, boolean>
+    configurationValidationErrors: DeepPartialMap<
+        {
+            inputs: Record<
+                string,
+                {
+                    bytecode?: any
+                    order?: number | undefined
+                    secret?: boolean | undefined
+                    templating?: 'hog' | 'liquid' | undefined
+                    value: any
+                }
+            >
+        },
+        ValidationErrorType
+    >
+    isConfigurationSubmitting: boolean
+    isConfigurationValid: boolean
+    showConfigurationErrors: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFunctionStepLogicActions {
+    resetConfiguration: (values?: {
+        inputs: Record<
+            string,
+            {
+                bytecode?: any
+                order?: number | undefined
+                secret?: boolean | undefined
+                templating?: 'hog' | 'liquid' | undefined
+                value: any
+            }
+        >
+    }) => {
+        values?: {
+            inputs: Record<
+                string,
+                {
+                    bytecode?: any
+                    order?: number | undefined
+                    secret?: boolean | undefined
+                    templating?: 'hog' | 'liquid' | undefined
+                    value: any
+                }
+            >
+        }
+    }
+    setConfigurationManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setConfigurationValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setConfigurationValues: (
+        values: DeepPartial<{
+            inputs: Record<
+                string,
+                {
+                    bytecode?: any
+                    order?: number | undefined
+                    secret?: boolean | undefined
+                    templating?: 'hog' | 'liquid' | undefined
+                    value: any
+                }
+            >
+        }>
+    ) => {
+        values: DeepPartial<{
+            inputs: Record<
+                string,
+                {
+                    bytecode?: any
+                    order?: number | undefined
+                    secret?: boolean | undefined
+                    templating?: 'hog' | 'liquid' | undefined
+                    value: any
+                }
+            >
+        }>
+    }
+    submitConfiguration: () => {
+        value: boolean
+    }
+    submitConfigurationFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitConfigurationRequest: (configuration: {
+        inputs: Record<
+            string,
+            {
+                bytecode?: any
+                order?: number | undefined
+                secret?: boolean | undefined
+                templating?: 'hog' | 'liquid' | undefined
+                value: any
+            }
+        >
+    }) => {
+        configuration: {
+            inputs: Record<
+                string,
+                {
+                    bytecode?: any
+                    order?: number | undefined
+                    secret?: boolean | undefined
+                    templating?: 'hog' | 'liquid' | undefined
+                    value: any
+                }
+            >
+        }
+    }
+    submitConfigurationSuccess: (configuration: {
+        inputs: Record<
+            string,
+            {
+                bytecode?: any
+                order?: number | undefined
+                secret?: boolean | undefined
+                templating?: 'hog' | 'liquid' | undefined
+                value: any
+            }
+        >
+    }) => {
+        configuration: {
+            inputs: Record<
+                string,
+                {
+                    bytecode?: any
+                    order?: number | undefined
+                    secret?: boolean | undefined
+                    templating?: 'hog' | 'liquid' | undefined
+                    value: any
+                }
+            >
+        }
+    }
+    touchConfigurationField: (key: string) => {
+        key: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface hogFunctionStepLogicMeta {
+    key: string
+}
+
+export type hogFunctionStepLogicType = MakeLogicType<
+    hogFunctionStepLogicValues,
+    hogFunctionStepLogicActions,
+    HogFunctionStepLogicProps,
+    hogFunctionStepLogicMeta
+>
+
 export const hogFunctionStepLogic = kea<hogFunctionStepLogicType>([
     path(['products', 'workflows', 'frontend', 'Workflows', 'hogflows', 'steps']),
     props({} as HogFunctionStepLogicProps),
diff --git a/products/workflows/frontend/Workflows/hogflows/steps/stepDelayLogic.ts b/products/workflows/frontend/Workflows/hogflows/steps/stepDelayLogic.ts
index 167f534f0914..5c79e9592b97 100644
--- a/products/workflows/frontend/Workflows/hogflows/steps/stepDelayLogic.ts
+++ b/products/workflows/frontend/Workflows/hogflows/steps/stepDelayLogic.ts
@@ -1,7 +1,7 @@
-import { actions, connect, kea, key, listeners, path, props } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props } from 'kea'
 
 import { WorkflowLogicProps, workflowLogic } from '../../workflowLogic'
-import type { stepDelayLogicType } from './stepDelayLogicType'
+import type { HogFlow, HogFlowAction } from '../types'
 
 const DURATION_REGEX = /^(\d*\.?\d*)([dhm])$/
 const AUTO_DESCRIPTION_REGEX = /^Wait for \d*\.?\d+ (minute|hour|day)s?\.$/
@@ -32,6 +32,562 @@ export type StepDelayLogicProps = {
     workflowLogicProps: WorkflowLogicProps
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface stepDelayLogicValues {
+    workflow: HogFlow // workflowLogic
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface stepDelayLogicActions {
+    setWorkflowAction: (
+        actionId: string,
+        action: HogFlowAction
+    ) => {
+        action: HogFlowAction
+        actionId: string
+    } // workflowLogic
+    setWorkflowActionConfig: (
+        actionId: string,
+        config:
+            | {
+                  cohorts: {
+                      name?: string | undefined
+                      percentage: number
+                  }[]
+              }
+            | {
+                  delay_duration: string
+              }
+            | {
+                  reason?: string | undefined
+              }
+            | {
+                  type: 'schedule'
+              }
+            | {
+                  conditions: {
+                      filters: {
+                          actions?: any[] | undefined
+                          events?: any[] | undefined
+                          properties?: any[] | undefined
+                      }
+                      name?: string | undefined
+                  }[]
+                  delay_duration?: string | undefined
+              }
+            | {
+                  filters: {
+                      properties: any[]
+                  }
+                  type: 'batch'
+              }
+            | {
+                  filters: {
+                      actions?: any[] | undefined
+                      events?: any[] | undefined
+                      filter_test_accounts?: boolean | undefined
+                      properties?: any[] | undefined
+                  }
+                  type: 'event'
+              }
+            | {
+                  condition: {
+                      filters?:
+                          | {
+                                actions?: any[] | undefined
+                                events?: any[] | undefined
+                                properties?: any[] | undefined
+                            }
+                          | null
+                          | undefined
+                      name?: string | undefined
+                  }
+                  events?:
+                      | {
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            name?: string | undefined
+                        }[]
+                      | undefined
+                  max_wait_duration: string
+              }
+            | {
+                  inputs: Record<
+                      string,
+                      {
+                          bytecode?: any
+                          order?: number | undefined
+                          secret?: boolean | undefined
+                          templating?: 'hog' | 'liquid' | undefined
+                          value: any
+                      }
+                  >
+                  mappings?:
+                      | {
+                            disabled?: boolean | undefined
+                            filters?: any
+                            inputs?:
+                                | Record<
+                                      string,
+                                      {
+                                          bytecode?: any
+                                          order?: number | undefined
+                                          secret?: boolean | undefined
+                                          templating?: 'hog' | 'liquid' | undefined
+                                          value: any
+                                      }
+                                  >
+                                | null
+                                | undefined
+                            inputs_schema?:
+                                | {
+                                      choices?:
+                                          | {
+                                                label: string
+                                                value: string
+                                            }[]
+                                          | undefined
+                                      default?: any
+                                      description?: string | undefined
+                                      hidden?: boolean | undefined
+                                      integration?: string | undefined
+                                      integration_field?: string | undefined
+                                      integration_key?: string | undefined
+                                      key: string
+                                      label: string
+                                      required?: boolean | undefined
+                                      requiredScopes?: string | undefined
+                                      requires_field?: string | undefined
+                                      secret?: boolean | undefined
+                                      templating?: boolean | undefined
+                                      type:
+                                          | 'boolean'
+                                          | 'choice'
+                                          | 'customer_analytics_account_properties'
+                                          | 'customer_analytics_account_relationships'
+                                          | 'dictionary'
+                                          | 'email'
+                                          | 'integration'
+                                          | 'integration_field'
+                                          | 'integration_multi'
+                                          | 'json'
+                                          | 'native_email'
+                                          | 'non_failure_status_codes'
+                                          | 'number'
+                                          | 'posthog_assignee'
+                                          | 'posthog_business_hours'
+                                          | 'posthog_ticket_tags'
+                                          | 'string'
+                                  }[]
+                                | undefined
+                            name: string
+                        }[]
+                      | undefined
+                  template_id: string
+                  template_uuid?: string | undefined
+              }
+            | {
+                  filters: {
+                      properties?: any[] | undefined
+                  }
+                  key_property?: string | undefined
+                  table_name: string
+                  type: 'data-warehouse-table'
+              }
+            | {
+                  inputs: Record<
+                      string,
+                      {
+                          bytecode?: any
+                          order?: number | undefined
+                          secret?: boolean | undefined
+                          templating?: 'hog' | 'liquid' | undefined
+                          value: any
+                      }
+                  >
+                  template_id: string
+                  template_uuid?: string | undefined
+                  type: 'manual'
+              }
+            | {
+                  inputs: Record<
+                      string,
+                      {
+                          bytecode?: any
+                          order?: number | undefined
+                          secret?: boolean | undefined
+                          templating?: 'hog' | 'liquid' | undefined
+                          value: any
+                      }
+                  >
+                  template_id: string
+                  template_uuid?: string | undefined
+                  type: 'tracking_pixel'
+              }
+            | {
+                  inputs: Record<
+                      string,
+                      {
+                          bytecode?: any
+                          order?: number | undefined
+                          secret?: boolean | undefined
+                          templating?: 'hog' | 'liquid' | undefined
+                          value: any
+                      }
+                  >
+                  template_id: string
+                  template_uuid?: string | undefined
+                  type: 'webhook'
+              }
+            | {
+                  inputs: Record<
+                      string,
+                      {
+                          bytecode?: any
+                          order?: number | undefined
+                          secret?: boolean | undefined
+                          templating?: 'hog' | 'liquid' | undefined
+                          value: any
+                      }
+                  >
+                  message_category_id?: string | undefined
+                  message_category_type?: 'marketing' | 'transactional' | undefined
+                  template_id: 'template-email'
+                  template_uuid?: string | undefined
+              }
+            | {
+                  inputs: Record<
+                      string,
+                      {
+                          bytecode?: any
+                          order?: number | undefined
+                          secret?: boolean | undefined
+                          templating?: 'hog' | 'liquid' | undefined
+                          value: any
+                      }
+                  >
+                  message_category_id?: string | undefined
+                  message_category_type?: 'marketing' | 'transactional' | undefined
+                  template_id: 'template-native-push'
+                  template_uuid?: string | undefined
+              }
+            | {
+                  inputs: Record<
+                      string,
+                      {
+                          bytecode?: any
+                          order?: number | undefined
+                          secret?: boolean | undefined
+                          templating?: 'hog' | 'liquid' | undefined
+                          value: any
+                      }
+                  >
+                  message_category_id?: string | undefined
+                  message_category_type?: 'marketing' | 'transactional' | undefined
+                  template_id: 'template-twilio'
+                  template_uuid?: string | undefined
+              }
+            | {
+                  day:
+                      | ('friday' | 'monday' | 'saturday' | 'sunday' | 'thursday' | 'tuesday' | 'wednesday')[]
+                      | 'any'
+                      | 'weekday'
+                      | 'weekend'
+                  fallback_timezone?: string | null | undefined
+                  time: [string, string] | 'any'
+                  timezone: string | null
+                  use_person_timezone?: boolean | undefined
+              }
+    ) => {
+        actionId: string
+        config:
+            | {
+                  cohorts: {
+                      name?: string | undefined
+                      percentage: number
+                  }[]
+              }
+            | {
+                  delay_duration: string
+              }
+            | {
+                  reason?: string | undefined
+              }
+            | {
+                  type: 'schedule'
+              }
+            | {
+                  conditions: {
+                      filters: {
+                          actions?: any[] | undefined
+                          events?: any[] | undefined
+                          properties?: any[] | undefined
+                      }
+                      name?: string | undefined
+                  }[]
+                  delay_duration?: string | undefined
+              }
+            | {
+                  filters: {
+                      properties: any[]
+                  }
+                  type: 'batch'
+              }
+            | {
+                  filters: {
+                      actions?: any[] | undefined
+                      events?: any[] | undefined
+                      filter_test_accounts?: boolean | undefined
+                      properties?: any[] | undefined
+                  }
+                  type: 'event'
+              }
+            | {
+                  condition: {
+                      filters?:
+                          | {
+                                actions?: any[] | undefined
+                                events?: any[] | undefined
+                                properties?: any[] | undefined
+                            }
+                          | null
+                          | undefined
+                      name?: string | undefined
+                  }
+                  events?:
+                      | {
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            name?: string | undefined
+                        }[]
+                      | undefined
+                  max_wait_duration: string
+              }
+            | {
+                  filters: {
+                      properties?: any[] | undefined
+                  }
+                  key_property?: string | undefined
+                  table_name: string
+                  type: 'data-warehouse-table'
+              }
+            | {
+                  inputs: Record<
+                      string,
+                      {
+                          bytecode?: any
+                          order?: number | undefined
+                          secret?: boolean | undefined
+                          templating?: 'hog' | 'liquid' | undefined
+                          value: any
+                      }
+                  >
+                  mappings?:
+                      | {
+                            disabled?: boolean | undefined
+                            filters?: any
+                            inputs?:
+                                | Record<
+                                      string,
+                                      {
+                                          bytecode?: any
+                                          order?: number | undefined
+                                          secret?: boolean | undefined
+                                          templating?: 'hog' | 'liquid' | undefined
+                                          value: any
+                                      }
+                                  >
+                                | null
+                                | undefined
+                            inputs_schema?:
+                                | {
+                                      choices?:
+                                          | {
+                                                label: string
+                                                value: string
+                                            }[]
+                                          | undefined
+                                      default?: any
+                                      description?: string | undefined
+                                      hidden?: boolean | undefined
+                                      integration?: string | undefined
+                                      integration_field?: string | undefined
+                                      integration_key?: string | undefined
+                                      key: string
+                                      label: string
+                                      required?: boolean | undefined
+                                      requiredScopes?: string | undefined
+                                      requires_field?: string | undefined
+                                      secret?: boolean | undefined
+                                      templating?: boolean | undefined
+                                      type:
+                                          | 'boolean'
+                                          | 'choice'
+                                          | 'customer_analytics_account_properties'
+                                          | 'customer_analytics_account_relationships'
+                                          | 'dictionary'
+                                          | 'email'
+                                          | 'integration'
+                                          | 'integration_field'
+                                          | 'integration_multi'
+                                          | 'json'
+                                          | 'native_email'
+                                          | 'non_failure_status_codes'
+                                          | 'number'
+                                          | 'posthog_assignee'
+                                          | 'posthog_business_hours'
+                                          | 'posthog_ticket_tags'
+                                          | 'string'
+                                  }[]
+                                | undefined
+                            name: string
+                        }[]
+                      | undefined
+                  template_id: string
+                  template_uuid?: string | undefined
+              }
+            | {
+                  inputs: Record<
+                      string,
+                      {
+                          bytecode?: any
+                          order?: number | undefined
+                          secret?: boolean | undefined
+                          templating?: 'hog' | 'liquid' | undefined
+                          value: any
+                      }
+                  >
+                  template_id: string
+                  template_uuid?: string | undefined
+                  type: 'manual'
+              }
+            | {
+                  inputs: Record<
+                      string,
+                      {
+                          bytecode?: any
+                          order?: number | undefined
+                          secret?: boolean | undefined
+                          templating?: 'hog' | 'liquid' | undefined
+                          value: any
+                      }
+                  >
+                  template_id: string
+                  template_uuid?: string | undefined
+                  type: 'tracking_pixel'
+              }
+            | {
+                  inputs: Record<
+                      string,
+                      {
+                          bytecode?: any
+                          order?: number | undefined
+                          secret?: boolean | undefined
+                          templating?: 'hog' | 'liquid' | undefined
+                          value: any
+                      }
+                  >
+                  template_id: string
+                  template_uuid?: string | undefined
+                  type: 'webhook'
+              }
+            | {
+                  day:
+                      | ('friday' | 'monday' | 'saturday' | 'sunday' | 'thursday' | 'tuesday' | 'wednesday')[]
+                      | 'any'
+                      | 'weekday'
+                      | 'weekend'
+                  fallback_timezone?: string | null | undefined
+                  time: [string, string] | 'any'
+                  timezone: string | null
+                  use_person_timezone?: boolean | undefined
+              }
+            | {
+                  inputs: Record<
+                      string,
+                      {
+                          bytecode?: any
+                          order?: number | undefined
+                          secret?: boolean | undefined
+                          templating?: 'hog' | 'liquid' | undefined
+                          value: any
+                      }
+                  >
+                  message_category_id?: string | undefined
+                  message_category_type?: 'marketing' | 'transactional' | undefined
+                  template_id: 'template-email'
+                  template_uuid?: string | undefined
+              }
+            | {
+                  inputs: Record<
+                      string,
+                      {
+                          bytecode?: any
+                          order?: number | undefined
+                          secret?: boolean | undefined
+                          templating?: 'hog' | 'liquid' | undefined
+                          value: any
+                      }
+                  >
+                  message_category_id?: string | undefined
+                  message_category_type?: 'marketing' | 'transactional' | undefined
+                  template_id: 'template-native-push'
+                  template_uuid?: string | undefined
+              }
+            | {
+                  inputs: Record<
+                      string,
+                      {
+                          bytecode?: any
+                          order?: number | undefined
+                          secret?: boolean | undefined
+                          templating?: 'hog' | 'liquid' | undefined
+                          value: any
+                      }
+                  >
+                  message_category_id?: string | undefined
+                  message_category_type?: 'marketing' | 'transactional' | undefined
+                  template_id: 'template-twilio'
+                  template_uuid?: string | undefined
+              }
+    } // workflowLogic
+    setDelayWorkflowActionConfig: (
+        actionId: string,
+        config: {
+            delay_duration: string
+        }
+    ) => {
+        actionId: string
+        config: {
+            delay_duration: string
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface stepDelayLogicMeta {
+    key: string
+}
+
+export type stepDelayLogicType = MakeLogicType<
+    stepDelayLogicValues,
+    stepDelayLogicActions,
+    StepDelayLogicProps,
+    stepDelayLogicMeta
+>
+
 export const stepDelayLogic = kea<stepDelayLogicType>([
     path((key) => ['products', 'workflows', 'frontend', 'Workflows', 'hogflows', 'steps', 'stepDelayLogic', key]),
     props({} as StepDelayLogicProps),
diff --git a/products/workflows/frontend/Workflows/hogflows/steps/stepWaitUntilTimeWindowLogic.ts b/products/workflows/frontend/Workflows/hogflows/steps/stepWaitUntilTimeWindowLogic.ts
index 36221d1a5705..3e30c9ef4db5 100644
--- a/products/workflows/frontend/Workflows/hogflows/steps/stepWaitUntilTimeWindowLogic.ts
+++ b/products/workflows/frontend/Workflows/hogflows/steps/stepWaitUntilTimeWindowLogic.ts
@@ -1,9 +1,9 @@
-import { actions, connect, kea, key, listeners, path, props } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props } from 'kea'
 
 import { WeekdayType } from '~/types'
 
 import { WorkflowLogicProps, workflowLogic } from '../../workflowLogic'
-import type { stepWaitUntilTimeWindowLogicType } from './stepWaitUntilTimeWindowLogicType'
+import type { HogFlow, HogFlowAction } from '../types'
 
 type DayConfig = 'any' | 'weekday' | 'weekend' | WeekdayType[]
 type TimeConfig = 'any' | [string, string]
@@ -87,6 +87,560 @@ export type StepWaitUntilTimeWindowLogicProps = {
     workflowLogicProps: WorkflowLogicProps
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface stepWaitUntilTimeWindowLogicValues {
+    workflow: HogFlow // workflowLogic
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface stepWaitUntilTimeWindowLogicActions {
+    partialSetWorkflowActionConfig: (
+        actionId: string,
+        config: Partial<
+            | {
+                  cohorts: {
+                      name?: string | undefined
+                      percentage: number
+                  }[]
+              }
+            | {
+                  delay_duration: string
+              }
+            | {
+                  reason?: string | undefined
+              }
+            | {
+                  type: 'schedule'
+              }
+            | {
+                  conditions: {
+                      filters: {
+                          actions?: any[] | undefined
+                          events?: any[] | undefined
+                          properties?: any[] | undefined
+                      }
+                      name?: string | undefined
+                  }[]
+                  delay_duration?: string | undefined
+              }
+            | {
+                  filters: {
+                      properties: any[]
+                  }
+                  type: 'batch'
+              }
+            | {
+                  filters: {
+                      actions?: any[] | undefined
+                      events?: any[] | undefined
+                      filter_test_accounts?: boolean | undefined
+                      properties?: any[] | undefined
+                  }
+                  type: 'event'
+              }
+            | {
+                  condition: {
+                      filters?:
+                          | {
+                                actions?: any[] | undefined
+                                events?: any[] | undefined
+                                properties?: any[] | undefined
+                            }
+                          | null
+                          | undefined
+                      name?: string | undefined
+                  }
+                  events?:
+                      | {
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            name?: string | undefined
+                        }[]
+                      | undefined
+                  max_wait_duration: string
+              }
+            | {
+                  inputs: Record<
+                      string,
+                      {
+                          bytecode?: any
+                          order?: number | undefined
+                          secret?: boolean | undefined
+                          templating?: 'hog' | 'liquid' | undefined
+                          value: any
+                      }
+                  >
+                  mappings?:
+                      | {
+                            disabled?: boolean | undefined
+                            filters?: any
+                            inputs?:
+                                | Record<
+                                      string,
+                                      {
+                                          bytecode?: any
+                                          order?: number | undefined
+                                          secret?: boolean | undefined
+                                          templating?: 'hog' | 'liquid' | undefined
+                                          value: any
+                                      }
+                                  >
+                                | null
+                                | undefined
+                            inputs_schema?:
+                                | {
+                                      choices?:
+                                          | {
+                                                label: string
+                                                value: string
+                                            }[]
+                                          | undefined
+                                      default?: any
+                                      description?: string | undefined
+                                      hidden?: boolean | undefined
+                                      integration?: string | undefined
+                                      integration_field?: string | undefined
+                                      integration_key?: string | undefined
+                                      key: string
+                                      label: string
+                                      required?: boolean | undefined
+                                      requiredScopes?: string | undefined
+                                      requires_field?: string | undefined
+                                      secret?: boolean | undefined
+                                      templating?: boolean | undefined
+                                      type:
+                                          | 'boolean'
+                                          | 'choice'
+                                          | 'customer_analytics_account_properties'
+                                          | 'customer_analytics_account_relationships'
+                                          | 'dictionary'
+                                          | 'email'
+                                          | 'integration'
+                                          | 'integration_field'
+                                          | 'integration_multi'
+                                          | 'json'
+                                          | 'native_email'
+                                          | 'non_failure_status_codes'
+                                          | 'number'
+                                          | 'posthog_assignee'
+                                          | 'posthog_business_hours'
+                                          | 'posthog_ticket_tags'
+                                          | 'string'
+                                  }[]
+                                | undefined
+                            name: string
+                        }[]
+                      | undefined
+                  template_id: string
+                  template_uuid?: string | undefined
+              }
+            | {
+                  filters: {
+                      properties?: any[] | undefined
+                  }
+                  key_property?: string | undefined
+                  table_name: string
+                  type: 'data-warehouse-table'
+              }
+            | {
+                  inputs: Record<
+                      string,
+                      {
+                          bytecode?: any
+                          order?: number | undefined
+                          secret?: boolean | undefined
+                          templating?: 'hog' | 'liquid' | undefined
+                          value: any
+                      }
+                  >
+                  template_id: string
+                  template_uuid?: string | undefined
+                  type: 'manual'
+              }
+            | {
+                  inputs: Record<
+                      string,
+                      {
+                          bytecode?: any
+                          order?: number | undefined
+                          secret?: boolean | undefined
+                          templating?: 'hog' | 'liquid' | undefined
+                          value: any
+                      }
+                  >
+                  template_id: string
+                  template_uuid?: string | undefined
+                  type: 'tracking_pixel'
+              }
+            | {
+                  inputs: Record<
+                      string,
+                      {
+                          bytecode?: any
+                          order?: number | undefined
+                          secret?: boolean | undefined
+                          templating?: 'hog' | 'liquid' | undefined
+                          value: any
+                      }
+                  >
+                  template_id: string
+                  template_uuid?: string | undefined
+                  type: 'webhook'
+              }
+            | {
+                  inputs: Record<
+                      string,
+                      {
+                          bytecode?: any
+                          order?: number | undefined
+                          secret?: boolean | undefined
+                          templating?: 'hog' | 'liquid' | undefined
+                          value: any
+                      }
+                  >
+                  message_category_id?: string | undefined
+                  message_category_type?: 'marketing' | 'transactional' | undefined
+                  template_id: 'template-email'
+                  template_uuid?: string | undefined
+              }
+            | {
+                  inputs: Record<
+                      string,
+                      {
+                          bytecode?: any
+                          order?: number | undefined
+                          secret?: boolean | undefined
+                          templating?: 'hog' | 'liquid' | undefined
+                          value: any
+                      }
+                  >
+                  message_category_id?: string | undefined
+                  message_category_type?: 'marketing' | 'transactional' | undefined
+                  template_id: 'template-native-push'
+                  template_uuid?: string | undefined
+              }
+            | {
+                  inputs: Record<
+                      string,
+                      {
+                          bytecode?: any
+                          order?: number | undefined
+                          secret?: boolean | undefined
+                          templating?: 'hog' | 'liquid' | undefined
+                          value: any
+                      }
+                  >
+                  message_category_id?: string | undefined
+                  message_category_type?: 'marketing' | 'transactional' | undefined
+                  template_id: 'template-twilio'
+                  template_uuid?: string | undefined
+              }
+            | {
+                  day:
+                      | ('friday' | 'monday' | 'saturday' | 'sunday' | 'thursday' | 'tuesday' | 'wednesday')[]
+                      | 'any'
+                      | 'weekday'
+                      | 'weekend'
+                  fallback_timezone?: string | null | undefined
+                  time: [string, string] | 'any'
+                  timezone: string | null
+                  use_person_timezone?: boolean | undefined
+              }
+        >
+    ) => {
+        actionId: string
+        config: Partial<
+            | {
+                  cohorts: {
+                      name?: string | undefined
+                      percentage: number
+                  }[]
+              }
+            | {
+                  delay_duration: string
+              }
+            | {
+                  reason?: string | undefined
+              }
+            | {
+                  type: 'schedule'
+              }
+            | {
+                  conditions: {
+                      filters: {
+                          actions?: any[] | undefined
+                          events?: any[] | undefined
+                          properties?: any[] | undefined
+                      }
+                      name?: string | undefined
+                  }[]
+                  delay_duration?: string | undefined
+              }
+            | {
+                  filters: {
+                      properties: any[]
+                  }
+                  type: 'batch'
+              }
+            | {
+                  filters: {
+                      actions?: any[] | undefined
+                      events?: any[] | undefined
+                      filter_test_accounts?: boolean | undefined
+                      properties?: any[] | undefined
+                  }
+                  type: 'event'
+              }
+            | {
+                  condition: {
+                      filters?:
+                          | {
+                                actions?: any[] | undefined
+                                events?: any[] | undefined
+                                properties?: any[] | undefined
+                            }
+                          | null
+                          | undefined
+                      name?: string | undefined
+                  }
+                  events?:
+                      | {
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            name?: string | undefined
+                        }[]
+                      | undefined
+                  max_wait_duration: string
+              }
+            | {
+                  filters: {
+                      properties?: any[] | undefined
+                  }
+                  key_property?: string | undefined
+                  table_name: string
+                  type: 'data-warehouse-table'
+              }
+            | {
+                  inputs: Record<
+                      string,
+                      {
+                          bytecode?: any
+                          order?: number | undefined
+                          secret?: boolean | undefined
+                          templating?: 'hog' | 'liquid' | undefined
+                          value: any
+                      }
+                  >
+                  mappings?:
+                      | {
+                            disabled?: boolean | undefined
+                            filters?: any
+                            inputs?:
+                                | Record<
+                                      string,
+                                      {
+                                          bytecode?: any
+                                          order?: number | undefined
+                                          secret?: boolean | undefined
+                                          templating?: 'hog' | 'liquid' | undefined
+                                          value: any
+                                      }
+                                  >
+                                | null
+                                | undefined
+                            inputs_schema?:
+                                | {
+                                      choices?:
+                                          | {
+                                                label: string
+                                                value: string
+                                            }[]
+                                          | undefined
+                                      default?: any
+                                      description?: string | undefined
+                                      hidden?: boolean | undefined
+                                      integration?: string | undefined
+                                      integration_field?: string | undefined
+                                      integration_key?: string | undefined
+                                      key: string
+                                      label: string
+                                      required?: boolean | undefined
+                                      requiredScopes?: string | undefined
+                                      requires_field?: string | undefined
+                                      secret?: boolean | undefined
+                                      templating?: boolean | undefined
+                                      type:
+                                          | 'boolean'
+                                          | 'choice'
+                                          | 'customer_analytics_account_properties'
+                                          | 'customer_analytics_account_relationships'
+                                          | 'dictionary'
+                                          | 'email'
+                                          | 'integration'
+                                          | 'integration_field'
+                                          | 'integration_multi'
+                                          | 'json'
+                                          | 'native_email'
+                                          | 'non_failure_status_codes'
+                                          | 'number'
+                                          | 'posthog_assignee'
+                                          | 'posthog_business_hours'
+                                          | 'posthog_ticket_tags'
+                                          | 'string'
+                                  }[]
+                                | undefined
+                            name: string
+                        }[]
+                      | undefined
+                  template_id: string
+                  template_uuid?: string | undefined
+              }
+            | {
+                  inputs: Record<
+                      string,
+                      {
+                          bytecode?: any
+                          order?: number | undefined
+                          secret?: boolean | undefined
+                          templating?: 'hog' | 'liquid' | undefined
+                          value: any
+                      }
+                  >
+                  template_id: string
+                  template_uuid?: string | undefined
+                  type: 'manual'
+              }
+            | {
+                  inputs: Record<
+                      string,
+                      {
+                          bytecode?: any
+                          order?: number | undefined
+                          secret?: boolean | undefined
+                          templating?: 'hog' | 'liquid' | undefined
+                          value: any
+                      }
+                  >
+                  template_id: string
+                  template_uuid?: string | undefined
+                  type: 'tracking_pixel'
+              }
+            | {
+                  inputs: Record<
+                      string,
+                      {
+                          bytecode?: any
+                          order?: number | undefined
+                          secret?: boolean | undefined
+                          templating?: 'hog' | 'liquid' | undefined
+                          value: any
+                      }
+                  >
+                  template_id: string
+                  template_uuid?: string | undefined
+                  type: 'webhook'
+              }
+            | {
+                  day:
+                      | ('friday' | 'monday' | 'saturday' | 'sunday' | 'thursday' | 'tuesday' | 'wednesday')[]
+                      | 'any'
+                      | 'weekday'
+                      | 'weekend'
+                  fallback_timezone?: string | null | undefined
+                  time: [string, string] | 'any'
+                  timezone: string | null
+                  use_person_timezone?: boolean | undefined
+              }
+            | {
+                  inputs: Record<
+                      string,
+                      {
+                          bytecode?: any
+                          order?: number | undefined
+                          secret?: boolean | undefined
+                          templating?: 'hog' | 'liquid' | undefined
+                          value: any
+                      }
+                  >
+                  message_category_id?: string | undefined
+                  message_category_type?: 'marketing' | 'transactional' | undefined
+                  template_id: 'template-email'
+                  template_uuid?: string | undefined
+              }
+            | {
+                  inputs: Record<
+                      string,
+                      {
+                          bytecode?: any
+                          order?: number | undefined
+                          secret?: boolean | undefined
+                          templating?: 'hog' | 'liquid' | undefined
+                          value: any
+                      }
+                  >
+                  message_category_id?: string | undefined
+                  message_category_type?: 'marketing' | 'transactional' | undefined
+                  template_id: 'template-native-push'
+                  template_uuid?: string | undefined
+              }
+            | {
+                  inputs: Record<
+                      string,
+                      {
+                          bytecode?: any
+                          order?: number | undefined
+                          secret?: boolean | undefined
+                          templating?: 'hog' | 'liquid' | undefined
+                          value: any
+                      }
+                  >
+                  message_category_id?: string | undefined
+                  message_category_type?: 'marketing' | 'transactional' | undefined
+                  template_id: 'template-twilio'
+                  template_uuid?: string | undefined
+              }
+        >
+    } // workflowLogic
+    setWorkflowAction: (
+        actionId: string,
+        action: HogFlowAction
+    ) => {
+        action: HogFlowAction
+        actionId: string
+    } // workflowLogic
+    partialSetWaitUntilTimeWindowConfig: (
+        actionId: string,
+        config: WaitUntilTimeWindowConfig
+    ) => {
+        actionId: string
+        config: WaitUntilTimeWindowConfig
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface stepWaitUntilTimeWindowLogicMeta {
+    key: string
+}
+
+export type stepWaitUntilTimeWindowLogicType = MakeLogicType<
+    stepWaitUntilTimeWindowLogicValues,
+    stepWaitUntilTimeWindowLogicActions,
+    StepWaitUntilTimeWindowLogicProps,
+    stepWaitUntilTimeWindowLogicMeta
+>
+
 export const stepWaitUntilTimeWindowLogic = kea<stepWaitUntilTimeWindowLogicType>([
     path((key) => [
         'products',
diff --git a/products/workflows/frontend/Workflows/newWorkflowLogic.ts b/products/workflows/frontend/Workflows/newWorkflowLogic.ts
index 440073a4b736..95306d2fec35 100644
--- a/products/workflows/frontend/Workflows/newWorkflowLogic.ts
+++ b/products/workflows/frontend/Workflows/newWorkflowLogic.ts
@@ -1,10 +1,32 @@
-import { actions, kea, listeners, path, reducers } from 'kea'
+import { MakeLogicType, actions, kea, listeners, path, reducers } from 'kea'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 
 import { urls } from 'scenes/urls'
 
 import type { HogFlowTemplate } from './hogflows/types'
-import type { newWorkflowLogicType } from './newWorkflowLogicType'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface newWorkflowLogicValues {
+    newWorkflowModalVisible: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface newWorkflowLogicActions {
+    createEmptyWorkflow: () => {
+        value: true
+    }
+    createWorkflowFromTemplate: (template: HogFlowTemplate) => {
+        template: HogFlowTemplate
+    }
+    hideNewWorkflowModal: () => {
+        value: true
+    }
+    showNewWorkflowModal: () => {
+        value: true
+    }
+}
+
+export type newWorkflowLogicType = MakeLogicType<newWorkflowLogicValues, newWorkflowLogicActions>
 
 export const newWorkflowLogic = kea<newWorkflowLogicType>([
     path(['products', 'workflows', 'frontend', 'newWorkflowLogic']),
diff --git a/products/workflows/frontend/Workflows/templates/workflowTemplateLogic.ts b/products/workflows/frontend/Workflows/templates/workflowTemplateLogic.ts
index a4d284be3ff6..027dbba8a4fc 100644
--- a/products/workflows/frontend/Workflows/templates/workflowTemplateLogic.ts
+++ b/products/workflows/frontend/Workflows/templates/workflowTemplateLogic.ts
@@ -1,13 +1,15 @@
-import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { forms } from 'kea-forms'
+import type { DeepPartial, DeepPartialMap, FieldName, ValidationErrorType } from 'kea-forms'
 
 import api from 'lib/api'
 import { lemonToast } from 'lib/lemon-ui/LemonToast'
 import { userLogic } from 'scenes/userLogic'
 
+import type { UserType } from '../../../../../frontend/src/types'
 import type { HogFlowTemplate } from '../hogflows/types'
+import type { HogFlow } from '../hogflows/types'
 import { workflowLogic } from '../workflowLogic'
-import type { workflowTemplateLogicType } from './workflowTemplateLogicType'
 import { workflowTemplatesLogic } from './workflowTemplatesLogic'
 
 export interface WorkflowTemplateLogicProps {
@@ -16,6 +18,184 @@ export interface WorkflowTemplateLogicProps {
     editTemplateId?: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface workflowTemplateLogicValues {
+    user: UserType | null // userLogic
+    workflow: HogFlow // workflowLogic
+    editTemplateId: string | undefined
+    isEditMode: boolean
+    isTemplateFormSubmitting: boolean
+    isTemplateFormValid: boolean
+    saveAsTemplateModalVisible: boolean
+    showTemplateFormErrors: boolean
+    templateForm: {
+        description: string
+        image_url: string | null
+        name: string
+        scope: 'global' | 'organization' | 'team'
+        tags: string[]
+    }
+    templateFormAllErrors: Record<string, any>
+    templateFormChanged: boolean
+    templateFormErrors: DeepPartialMap<
+        {
+            description: string
+            image_url: string | null
+            name: string
+            scope: 'global' | 'organization' | 'team'
+            tags: string[]
+        },
+        ValidationErrorType
+    >
+    templateFormHasErrors: boolean
+    templateFormManualErrors: Record<string, any>
+    templateFormTouched: boolean
+    templateFormTouches: Record<string, boolean>
+    templateFormValidationErrors: DeepPartialMap<
+        {
+            description: string
+            image_url: string | null
+            name: string
+            scope: 'global' | 'organization' | 'team'
+            tags: string[]
+        },
+        ValidationErrorType
+    >
+    templateJson: string
+    templateJsonModalVisible: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface workflowTemplateLogicActions {
+    loadWorkflowTemplates: () => any // workflowTemplatesLogic
+    hideSaveAsTemplateModal: () => {
+        value: true
+    }
+    hideTemplateJsonModal: () => {
+        value: true
+    }
+    resetTemplateForm: (values?: {
+        description: string
+        image_url: string | null
+        name: string
+        scope: 'global' | 'organization' | 'team'
+        tags: string[]
+    }) => {
+        values?: {
+            description: string
+            image_url: string | null
+            name: string
+            scope: 'global' | 'organization' | 'team'
+            tags: string[]
+        }
+    }
+    setTemplateFormManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setTemplateFormValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setTemplateFormValues: (
+        values: DeepPartial<{
+            description: string
+            image_url: string | null
+            name: string
+            scope: 'global' | 'organization' | 'team'
+            tags: string[]
+        }>
+    ) => {
+        values: DeepPartial<{
+            description: string
+            image_url: string | null
+            name: string
+            scope: 'global' | 'organization' | 'team'
+            tags: string[]
+        }>
+    }
+    showSaveAsTemplateModal: () => {
+        value: true
+    }
+    showTemplateJsonModal: () => {
+        value: true
+    }
+    submitTemplateForm: () => {
+        value: boolean
+    }
+    submitTemplateFormFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitTemplateFormRequest: (templateForm: {
+        description: string
+        image_url: string | null
+        name: string
+        scope: 'global' | 'organization' | 'team'
+        tags: string[]
+    }) => {
+        templateForm: {
+            description: string
+            image_url: string | null
+            name: string
+            scope: 'global' | 'organization' | 'team'
+            tags: string[]
+        }
+    }
+    submitTemplateFormSuccess: (templateForm: {
+        description: string
+        image_url: string | null
+        name: string
+        scope: 'global' | 'organization' | 'team'
+        tags: string[]
+    }) => {
+        templateForm: {
+            description: string
+            image_url: string | null
+            name: string
+            scope: 'global' | 'organization' | 'team'
+            tags: string[]
+        }
+    }
+    touchTemplateFormField: (key: string) => {
+        key: string
+    }
+    updateTemplate: (workflowTemplate: HogFlowTemplate) => {
+        workflowTemplate: HogFlowTemplate
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface workflowTemplateLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        isEditMode: (arg: WorkflowTemplateLogicProps) => boolean
+        editTemplateId: (arg: WorkflowTemplateLogicProps) => string | undefined
+        templateJson: (
+            workflow: HogFlow,
+            templateForm: {
+                description: string
+                image_url: string | null
+                name: string
+                scope: 'global' | 'organization' | 'team'
+                tags: string[]
+            }
+        ) => string
+    }
+}
+
+export type workflowTemplateLogicType = MakeLogicType<
+    workflowTemplateLogicValues,
+    workflowTemplateLogicActions,
+    WorkflowTemplateLogicProps,
+    workflowTemplateLogicMeta
+>
+
 export const workflowTemplateLogic = kea<workflowTemplateLogicType>([
     path(['products', 'workflows', 'frontend', 'Workflows', 'workflowTemplateLogic']),
     props({ id: 'new' } as WorkflowTemplateLogicProps),
@@ -131,7 +311,16 @@ export const workflowTemplateLogic = kea<workflowTemplateLogicType>([
         ],
         templateJson: [
             (s) => [s.workflow, s.templateForm],
-            (workflow, templateForm): string => {
+            (
+                workflow: import('../hogflows/types').HogFlow,
+                templateForm: {
+                    description: string
+                    image_url: string | null
+                    name: string
+                    scope: 'global' | 'organization' | 'team'
+                    tags: string[]
+                }
+            ): string => {
                 if (!workflow) {
                     return ''
                 }
diff --git a/products/workflows/frontend/Workflows/templates/workflowTemplatesLogic.ts b/products/workflows/frontend/Workflows/templates/workflowTemplatesLogic.ts
index f124af681820..e60725bd13e5 100644
--- a/products/workflows/frontend/Workflows/templates/workflowTemplatesLogic.ts
+++ b/products/workflows/frontend/Workflows/templates/workflowTemplatesLogic.ts
@@ -1,4 +1,4 @@
-import { actions, afterMount, kea, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, kea, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { actionToUrl, router, urlToAction } from 'kea-router'
 
@@ -6,7 +6,84 @@ import api from 'lib/api'
 import { createFuse, Fuse } from 'lib/utils/fuseSearch'
 
 import type { HogFlowTemplate } from '../hogflows/types'
-import type { workflowTemplatesLogicType } from './workflowTemplatesLogicType'
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface workflowTemplatesLogicValues {
+    availableTags: string[]
+    filteredTemplates: HogFlowTemplate[]
+    tagFilter: string | null
+    templateFilter: string
+    workflowTemplateFuse: Fuse<HogFlowTemplate>
+    workflowTemplates: HogFlowTemplate[]
+    workflowTemplatesLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface workflowTemplatesLogicActions {
+    deleteHogflowTemplate: (template: HogFlowTemplate) => {
+        template: HogFlowTemplate
+    }
+    deleteHogflowTemplateFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteHogflowTemplateSuccess: (
+        workflowTemplates: HogFlowTemplate[],
+        payload?: {
+            template: HogFlowTemplate
+        }
+    ) => {
+        workflowTemplates: HogFlowTemplate[]
+        payload?: {
+            template: HogFlowTemplate
+        }
+    }
+    loadWorkflowTemplates: () => any
+    loadWorkflowTemplatesFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadWorkflowTemplatesSuccess: (
+        workflowTemplates: HogFlowTemplate[],
+        payload?: any
+    ) => {
+        workflowTemplates: HogFlowTemplate[]
+        payload?: any
+    }
+    setTagFilter: (tag: string | null) => {
+        tag: string | null
+    }
+    setTemplateFilter: (search: string) => {
+        search: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface workflowTemplatesLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        workflowTemplateFuse: (workflowTemplates: HogFlowTemplate[]) => Fuse<HogFlowTemplate>
+        filteredTemplates: (
+            workflowTemplates: HogFlowTemplate[],
+            templateFilter: string,
+            tagFilter: string | null,
+            workflowTemplateFuse: Fuse<HogFlowTemplate>
+        ) => HogFlowTemplate[]
+        availableTags: (workflowTemplates: HogFlowTemplate[]) => string[]
+    }
+}
+
+export type workflowTemplatesLogicType = MakeLogicType<
+    workflowTemplatesLogicValues,
+    workflowTemplatesLogicActions,
+    Record<string, any>,
+    workflowTemplatesLogicMeta
+>
 
 export const workflowTemplatesLogic = kea<workflowTemplatesLogicType>([
     path(['products', 'workflows', 'frontend', 'Workflows', 'workflowTemplatesLogic']),
diff --git a/products/workflows/frontend/Workflows/workflowAssetsLogic.ts b/products/workflows/frontend/Workflows/workflowAssetsLogic.ts
index 9adf2c99e0e0..3b5ce41487a3 100644
--- a/products/workflows/frontend/Workflows/workflowAssetsLogic.ts
+++ b/products/workflows/frontend/Workflows/workflowAssetsLogic.ts
@@ -1,8 +1,7 @@
-import { actions, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { lazyLoaders } from 'kea-loaders'
 
 import { getMessageAssetContentUrl, getMessageAssets, MessageAsset } from './messageAssetsApi'
-import type { workflowAssetsLogicType } from './workflowAssetsLogicType'
 
 export interface WorkflowAssetsLogicProps {
     id: string
@@ -14,6 +13,58 @@ export interface WorkflowAssetsLogicProps {
     invocationId?: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface workflowAssetsLogicValues {
+    assets: MessageAsset[]
+    assetsLoading: boolean
+    contentUrl: (asset: MessageAsset) => string
+    search: string
+    selectedAsset: MessageAsset | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface workflowAssetsLogicActions {
+    closeAsset: () => {
+        value: true
+    }
+    loadAssets: () => any
+    loadAssetsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadAssetsSuccess: (
+        assets: MessageAsset[],
+        payload?: any
+    ) => {
+        assets: MessageAsset[]
+        payload?: any
+    }
+    openAsset: (asset: MessageAsset) => {
+        asset: MessageAsset
+    }
+    setSearch: (search: string) => {
+        search: string
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface workflowAssetsLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        contentUrl: (arg: string) => (asset: MessageAsset) => string
+    }
+}
+
+export type workflowAssetsLogicType = MakeLogicType<
+    workflowAssetsLogicValues,
+    workflowAssetsLogicActions,
+    WorkflowAssetsLogicProps,
+    workflowAssetsLogicMeta
+>
+
 export const workflowAssetsLogic = kea<workflowAssetsLogicType>([
     path(['products', 'workflows', 'frontend', 'Workflows', 'workflowAssetsLogic']),
     props({ id: 'new' } as WorkflowAssetsLogicProps),
@@ -57,7 +108,7 @@ export const workflowAssetsLogic = kea<workflowAssetsLogicType>([
     selectors({
         contentUrl: [
             () => [(_, props) => props.id as string],
-            (id): ((asset: MessageAsset) => string) => {
+            (id: string): ((asset: MessageAsset) => string) => {
                 return (asset: MessageAsset) => getMessageAssetContentUrl(id, asset.invocation_id, asset.action_id)
             },
         ],
diff --git a/products/workflows/frontend/Workflows/workflowLogic.ts b/products/workflows/frontend/Workflows/workflowLogic.ts
index 722abd609cf7..6136f687e407 100644
--- a/products/workflows/frontend/Workflows/workflowLogic.ts
+++ b/products/workflows/frontend/Workflows/workflowLogic.ts
@@ -1,5 +1,6 @@
-import { actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, afterMount, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
 import { DeepPartialMap, ValidationErrorType, forms } from 'kea-forms'
+import type { DeepPartial, FieldName } from 'kea-forms'
 import { lazyLoaders, loaders } from 'kea-loaders'
 import { beforeUnload, router } from 'kea-router'
 import posthog from 'posthog-js'
@@ -24,6 +25,7 @@ import { AccessControlLevel, HogFunctionTemplateType } from '~/types'
 
 import { resourceEditedLogic } from 'products/notifications/frontend/resourceEditedLogic'
 
+import type { ResourceEditedEvent, UserBasicType, UserType } from '../../../../frontend/src/types'
 import { getRegisteredTriggerTypes } from './hogflows/registry/triggers/triggerTypeRegistry'
 import {
     DEFAULT_STATE,
@@ -46,7 +48,6 @@ import {
     type HogFlowEdge,
     type HogFlowSchedule,
 } from './hogflows/types'
-import type { workflowLogicType } from './workflowLogicType'
 import { workflowSceneLogic } from './workflowSceneLogic'
 import { workflowsLogic } from './workflowsLogic'
 
@@ -139,6 +140,2507 @@ export function sanitizeWorkflow(
     return workflow
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface workflowLogicValues {
+    currentProjectId: number | null // projectLogic
+    user: UserType | null // userLogic
+    actionValidationErrorsById: Record<string, HogFlowActionValidationResult | null>
+    autoSaveEnabled: boolean
+    currentSchedule: HogFlowSchedule | null
+    edgesByActionId: Record<string, HogFlowEdge[]>
+    externallyEdited: boolean
+    hasUnsavedChanges: boolean
+    hogFunctionTemplatesById: Record<string, HogFunctionTemplateType>
+    hogFunctionTemplatesByIdLoading: boolean
+    isAutoSave: boolean
+    isAutoSavePending: boolean
+    isRowScopedTrigger: boolean
+    isScheduleRepeating: boolean
+    isSyncingExternalEdit: boolean
+    isWorkflowSubmitting: boolean
+    isWorkflowValid: boolean
+    lastSavedAt: string | null
+    logicProps: WorkflowLogicProps
+    originalWorkflow: HogFlow | null
+    originalWorkflowLoading: boolean
+    pendingSchedule:
+        | {
+              rrule: string
+              starts_at: string
+              timezone?: string
+          }
+        | false
+        | null
+    saveBaseUpdatedAt: string | null
+    scheduleConfigSources: {
+        natural_language: boolean
+        picker: boolean
+    }
+    scheduleStartsAt: string | null
+    scheduleState: ScheduleState
+    scheduleTimezone: string
+    schedules: HogFlowSchedule[]
+    showWorkflowErrors: boolean
+    triggerAction: TriggerAction | null
+    workflow: HogFlow
+    workflowAllErrors: Record<string, any>
+    workflowChanged: boolean
+    workflowErrors: DeepPartialMap<HogFlow, ValidationErrorType>
+    workflowHasActionErrors: boolean
+    workflowHasErrors: boolean
+    workflowLoading: boolean
+    workflowManualErrors: Record<string, any>
+    workflowSanitized: HogFlow
+    workflowTouched: boolean
+    workflowTouches: Record<string, boolean>
+    workflowUserAccessLevel: AccessControlLevel | null
+    workflowValidationErrors: DeepPartialMap<HogFlow, ValidationErrorType>
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface workflowLogicActions {
+    resourceEdited: (event: ResourceEditedEvent) => {
+        event: ResourceEditedEvent
+    } // resourceEditedLogic
+    archiveWorkflow: (workflow: HogFlow) => {
+        workflow: HogFlow
+    } // workflowsLogic
+    autoSaveWorkflow: () => {
+        value: true
+    }
+    clearAutoSavePending: () => {
+        value: true
+    }
+    discardChanges: () => {
+        value: true
+    }
+    duplicate: () => {
+        value: true
+    }
+    keepMyWorkflowVersion: () => {
+        value: true
+    }
+    loadHogFunctionTemplatesById: () => any
+    loadHogFunctionTemplatesByIdFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadHogFunctionTemplatesByIdSuccess: (
+        hogFunctionTemplatesById: Record<string, HogFunctionTemplateType>,
+        payload?: any
+    ) => {
+        hogFunctionTemplatesById: Record<string, HogFunctionTemplateType>
+        payload?: any
+    }
+    loadWorkflow: () => any
+    loadWorkflowFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadWorkflowSuccess: (
+        originalWorkflow:
+            | HogFlow
+            | {
+                  abort_action?: string | undefined
+                  actions: (
+                      | {
+                            config: {
+                                conditions: {
+                                    filters: {
+                                        actions?: any[] | undefined
+                                        events?: any[] | undefined
+                                        properties?: any[] | undefined
+                                    }
+                                    name?: string | undefined
+                                }[]
+                                delay_duration?: string | undefined
+                            }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'conditional_branch'
+                            updated_at?: number | undefined
+                        }
+                      | {
+                            config: {
+                                delay_duration: string
+                            }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'delay'
+                            updated_at?: number | undefined
+                        }
+                      | {
+                            config: {
+                                reason?: string | undefined
+                            }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'exit'
+                            updated_at?: number | undefined
+                        }
+                      | {
+                            config: {
+                                inputs: Record<
+                                    string,
+                                    {
+                                        bytecode?: any
+                                        order?: number | undefined
+                                        secret?: boolean | undefined
+                                        templating?: 'hog' | 'liquid' | undefined
+                                        value: any
+                                    }
+                                >
+                                mappings?:
+                                    | {
+                                          disabled?: boolean | undefined
+                                          filters?: any
+                                          inputs?:
+                                              | Record<
+                                                    string,
+                                                    {
+                                                        bytecode?: any
+                                                        order?: number | undefined
+                                                        secret?: boolean | undefined
+                                                        templating?: 'hog' | 'liquid' | undefined
+                                                        value: any
+                                                    }
+                                                >
+                                              | null
+                                              | undefined
+                                          inputs_schema?:
+                                              | {
+                                                    choices?:
+                                                        | {
+                                                              label: string
+                                                              value: string
+                                                          }[]
+                                                        | undefined
+                                                    default?: any
+                                                    description?: string | undefined
+                                                    hidden?: boolean | undefined
+                                                    integration?: string | undefined
+                                                    integration_field?: string | undefined
+                                                    integration_key?: string | undefined
+                                                    key: string
+                                                    label: string
+                                                    required?: boolean | undefined
+                                                    requiredScopes?: string | undefined
+                                                    requires_field?: string | undefined
+                                                    secret?: boolean | undefined
+                                                    templating?: boolean | undefined
+                                                    type:
+                                                        | 'boolean'
+                                                        | 'choice'
+                                                        | 'customer_analytics_account_properties'
+                                                        | 'customer_analytics_account_relationships'
+                                                        | 'dictionary'
+                                                        | 'email'
+                                                        | 'integration'
+                                                        | 'integration_field'
+                                                        | 'integration_multi'
+                                                        | 'json'
+                                                        | 'native_email'
+                                                        | 'non_failure_status_codes'
+                                                        | 'number'
+                                                        | 'posthog_assignee'
+                                                        | 'posthog_business_hours'
+                                                        | 'posthog_ticket_tags'
+                                                        | 'string'
+                                                }[]
+                                              | undefined
+                                          name: string
+                                      }[]
+                                    | undefined
+                                template_id: string
+                                template_uuid?: string | undefined
+                            }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'function'
+                            updated_at?: number | undefined
+                        }
+                      | {
+                            config: {
+                                inputs: Record<
+                                    string,
+                                    {
+                                        bytecode?: any
+                                        order?: number | undefined
+                                        secret?: boolean | undefined
+                                        templating?: 'hog' | 'liquid' | undefined
+                                        value: any
+                                    }
+                                >
+                                message_category_id?: string | undefined
+                                message_category_type?: 'marketing' | 'transactional' | undefined
+                                template_id: 'template-email'
+                                template_uuid?: string | undefined
+                            }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'function_email'
+                            updated_at?: number | undefined
+                        }
+                      | {
+                            config: {
+                                inputs: Record<
+                                    string,
+                                    {
+                                        bytecode?: any
+                                        order?: number | undefined
+                                        secret?: boolean | undefined
+                                        templating?: 'hog' | 'liquid' | undefined
+                                        value: any
+                                    }
+                                >
+                                message_category_id?: string | undefined
+                                message_category_type?: 'marketing' | 'transactional' | undefined
+                                template_id: 'template-native-push'
+                                template_uuid?: string | undefined
+                            }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'function_push'
+                            updated_at?: number | undefined
+                        }
+                      | {
+                            config: {
+                                inputs: Record<
+                                    string,
+                                    {
+                                        bytecode?: any
+                                        order?: number | undefined
+                                        secret?: boolean | undefined
+                                        templating?: 'hog' | 'liquid' | undefined
+                                        value: any
+                                    }
+                                >
+                                message_category_id?: string | undefined
+                                message_category_type?: 'marketing' | 'transactional' | undefined
+                                template_id: 'template-twilio'
+                                template_uuid?: string | undefined
+                            }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'function_sms'
+                            updated_at?: number | undefined
+                        }
+                      | {
+                            config: {
+                                cohorts: {
+                                    name?: string | undefined
+                                    percentage: number
+                                }[]
+                            }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'random_cohort_branch'
+                            updated_at?: number | undefined
+                        }
+                      | {
+                            config:
+                                | {
+                                      type: 'schedule'
+                                  }
+                                | {
+                                      filters: {
+                                          properties: any[]
+                                      }
+                                      type: 'batch'
+                                  }
+                                | {
+                                      filters: {
+                                          actions?: any[] | undefined
+                                          events?: any[] | undefined
+                                          filter_test_accounts?: boolean | undefined
+                                          properties?: any[] | undefined
+                                      }
+                                      type: 'event'
+                                  }
+                                | {
+                                      filters: {
+                                          properties?: any[] | undefined
+                                      }
+                                      key_property?: string | undefined
+                                      table_name: string
+                                      type: 'data-warehouse-table'
+                                  }
+                                | {
+                                      inputs: Record<
+                                          string,
+                                          {
+                                              bytecode?: any
+                                              order?: number | undefined
+                                              secret?: boolean | undefined
+                                              templating?: 'hog' | 'liquid' | undefined
+                                              value: any
+                                          }
+                                      >
+                                      template_id: string
+                                      template_uuid?: string | undefined
+                                      type: 'manual'
+                                  }
+                                | {
+                                      inputs: Record<
+                                          string,
+                                          {
+                                              bytecode?: any
+                                              order?: number | undefined
+                                              secret?: boolean | undefined
+                                              templating?: 'hog' | 'liquid' | undefined
+                                              value: any
+                                          }
+                                      >
+                                      template_id: string
+                                      template_uuid?: string | undefined
+                                      type: 'tracking_pixel'
+                                  }
+                                | {
+                                      inputs: Record<
+                                          string,
+                                          {
+                                              bytecode?: any
+                                              order?: number | undefined
+                                              secret?: boolean | undefined
+                                              templating?: 'hog' | 'liquid' | undefined
+                                              value: any
+                                          }
+                                      >
+                                      template_id: string
+                                      template_uuid?: string | undefined
+                                      type: 'webhook'
+                                  }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'trigger'
+                            updated_at?: number | undefined
+                        }
+                      | {
+                            config: {
+                                condition: {
+                                    filters?:
+                                        | {
+                                              actions?: any[] | undefined
+                                              events?: any[] | undefined
+                                              properties?: any[] | undefined
+                                          }
+                                        | null
+                                        | undefined
+                                    name?: string | undefined
+                                }
+                                events?:
+                                    | {
+                                          filters?:
+                                              | {
+                                                    actions?: any[] | undefined
+                                                    events?: any[] | undefined
+                                                    properties?: any[] | undefined
+                                                }
+                                              | null
+                                              | undefined
+                                          name?: string | undefined
+                                      }[]
+                                    | undefined
+                                max_wait_duration: string
+                            }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'wait_until_condition'
+                            updated_at?: number | undefined
+                        }
+                      | {
+                            config: {
+                                day:
+                                    | (
+                                          | 'friday'
+                                          | 'monday'
+                                          | 'saturday'
+                                          | 'sunday'
+                                          | 'thursday'
+                                          | 'tuesday'
+                                          | 'wednesday'
+                                      )[]
+                                    | 'any'
+                                    | 'weekday'
+                                    | 'weekend'
+                                fallback_timezone?: string | null | undefined
+                                time: [string, string] | 'any'
+                                timezone: string | null
+                                use_person_timezone?: boolean | undefined
+                            }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'wait_until_time_window'
+                            updated_at?: number | undefined
+                        }
+                  )[]
+                  conversion?:
+                      | {
+                            bytecode?: (number | string)[] | undefined
+                            events?:
+                                | {
+                                      filters?: any
+                                      name?: string | undefined
+                                  }[]
+                                | undefined
+                            filters: any
+                            window_minutes: number | null
+                        }
+                      | undefined
+                  created_at: string
+                  created_by?: UserBasicType | null | undefined
+                  description?: string | undefined
+                  edges: {
+                      from: string
+                      index?: number | undefined
+                      to: string
+                      type: 'branch' | 'continue'
+                  }[]
+                  exit_condition:
+                      | 'exit_on_conversion'
+                      | 'exit_on_trigger_not_matched'
+                      | 'exit_on_trigger_not_matched_or_conversion'
+                      | 'exit_only_at_end'
+                  id: string
+                  image_url?: string | null | undefined
+                  name: string
+                  scope?: 'global' | 'organization' | 'team' | null | undefined
+                  status: 'draft'
+                  tags: string[]
+                  team_id: number
+                  trigger?:
+                      | {
+                            type: 'schedule'
+                        }
+                      | {
+                            filters: {
+                                properties: any[]
+                            }
+                            type: 'batch'
+                        }
+                      | {
+                            filters: {
+                                actions?: any[] | undefined
+                                events?: any[] | undefined
+                                filter_test_accounts?: boolean | undefined
+                                properties?: any[] | undefined
+                            }
+                            type: 'event'
+                        }
+                      | {
+                            filters: {
+                                properties?: any[] | undefined
+                            }
+                            key_property?: string | undefined
+                            table_name: string
+                            type: 'data-warehouse-table'
+                        }
+                      | {
+                            inputs: Record<
+                                string,
+                                {
+                                    bytecode?: any
+                                    order?: number | undefined
+                                    secret?: boolean | undefined
+                                    templating?: 'hog' | 'liquid' | undefined
+                                    value: any
+                                }
+                            >
+                            template_id: string
+                            template_uuid?: string | undefined
+                            type: 'manual'
+                        }
+                      | {
+                            inputs: Record<
+                                string,
+                                {
+                                    bytecode?: any
+                                    order?: number | undefined
+                                    secret?: boolean | undefined
+                                    templating?: 'hog' | 'liquid' | undefined
+                                    value: any
+                                }
+                            >
+                            template_id: string
+                            template_uuid?: string | undefined
+                            type: 'tracking_pixel'
+                        }
+                      | {
+                            inputs: Record<
+                                string,
+                                {
+                                    bytecode?: any
+                                    order?: number | undefined
+                                    secret?: boolean | undefined
+                                    templating?: 'hog' | 'liquid' | undefined
+                                    value: any
+                                }
+                            >
+                            template_id: string
+                            template_uuid?: string | undefined
+                            type: 'webhook'
+                        }
+                      | undefined
+                  trigger_masking?:
+                      | {
+                            bytecode: (number | string)[]
+                            hash: string
+                            threshold: number | null
+                            ttl: number | null
+                        }
+                      | null
+                      | undefined
+                  updated_at: string
+                  variables?:
+                      | {
+                            choices?:
+                                | {
+                                      label: string
+                                      value: string
+                                  }[]
+                                | undefined
+                            default?: any
+                            description?: string | undefined
+                            hidden?: boolean | undefined
+                            integration?: string | undefined
+                            integration_field?: string | undefined
+                            integration_key?: string | undefined
+                            key: string
+                            label: string
+                            required?: boolean | undefined
+                            requiredScopes?: string | undefined
+                            requires_field?: string | undefined
+                            secret?: boolean | undefined
+                            templating?: boolean | undefined
+                            type:
+                                | 'boolean'
+                                | 'choice'
+                                | 'customer_analytics_account_properties'
+                                | 'customer_analytics_account_relationships'
+                                | 'dictionary'
+                                | 'email'
+                                | 'integration'
+                                | 'integration_field'
+                                | 'integration_multi'
+                                | 'json'
+                                | 'native_email'
+                                | 'non_failure_status_codes'
+                                | 'number'
+                                | 'posthog_assignee'
+                                | 'posthog_business_hours'
+                                | 'posthog_ticket_tags'
+                                | 'string'
+                        }[]
+                      | null
+                      | undefined
+                  version: number
+              },
+        payload?: any
+    ) => {
+        originalWorkflow:
+            | HogFlow
+            | {
+                  abort_action?: string | undefined
+                  actions: (
+                      | {
+                            config: {
+                                conditions: {
+                                    filters: {
+                                        actions?: any[] | undefined
+                                        events?: any[] | undefined
+                                        properties?: any[] | undefined
+                                    }
+                                    name?: string | undefined
+                                }[]
+                                delay_duration?: string | undefined
+                            }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'conditional_branch'
+                            updated_at?: number | undefined
+                        }
+                      | {
+                            config: {
+                                delay_duration: string
+                            }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'delay'
+                            updated_at?: number | undefined
+                        }
+                      | {
+                            config: {
+                                reason?: string | undefined
+                            }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'exit'
+                            updated_at?: number | undefined
+                        }
+                      | {
+                            config: {
+                                inputs: Record<
+                                    string,
+                                    {
+                                        bytecode?: any
+                                        order?: number | undefined
+                                        secret?: boolean | undefined
+                                        templating?: 'hog' | 'liquid' | undefined
+                                        value: any
+                                    }
+                                >
+                                mappings?:
+                                    | {
+                                          disabled?: boolean | undefined
+                                          filters?: any
+                                          inputs?:
+                                              | Record<
+                                                    string,
+                                                    {
+                                                        bytecode?: any
+                                                        order?: number | undefined
+                                                        secret?: boolean | undefined
+                                                        templating?: 'hog' | 'liquid' | undefined
+                                                        value: any
+                                                    }
+                                                >
+                                              | null
+                                              | undefined
+                                          inputs_schema?:
+                                              | {
+                                                    choices?:
+                                                        | {
+                                                              label: string
+                                                              value: string
+                                                          }[]
+                                                        | undefined
+                                                    default?: any
+                                                    description?: string | undefined
+                                                    hidden?: boolean | undefined
+                                                    integration?: string | undefined
+                                                    integration_field?: string | undefined
+                                                    integration_key?: string | undefined
+                                                    key: string
+                                                    label: string
+                                                    required?: boolean | undefined
+                                                    requiredScopes?: string | undefined
+                                                    requires_field?: string | undefined
+                                                    secret?: boolean | undefined
+                                                    templating?: boolean | undefined
+                                                    type:
+                                                        | 'boolean'
+                                                        | 'choice'
+                                                        | 'customer_analytics_account_properties'
+                                                        | 'customer_analytics_account_relationships'
+                                                        | 'dictionary'
+                                                        | 'email'
+                                                        | 'integration'
+                                                        | 'integration_field'
+                                                        | 'integration_multi'
+                                                        | 'json'
+                                                        | 'native_email'
+                                                        | 'non_failure_status_codes'
+                                                        | 'number'
+                                                        | 'posthog_assignee'
+                                                        | 'posthog_business_hours'
+                                                        | 'posthog_ticket_tags'
+                                                        | 'string'
+                                                }[]
+                                              | undefined
+                                          name: string
+                                      }[]
+                                    | undefined
+                                template_id: string
+                                template_uuid?: string | undefined
+                            }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'function'
+                            updated_at?: number | undefined
+                        }
+                      | {
+                            config: {
+                                inputs: Record<
+                                    string,
+                                    {
+                                        bytecode?: any
+                                        order?: number | undefined
+                                        secret?: boolean | undefined
+                                        templating?: 'hog' | 'liquid' | undefined
+                                        value: any
+                                    }
+                                >
+                                message_category_id?: string | undefined
+                                message_category_type?: 'marketing' | 'transactional' | undefined
+                                template_id: 'template-email'
+                                template_uuid?: string | undefined
+                            }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'function_email'
+                            updated_at?: number | undefined
+                        }
+                      | {
+                            config: {
+                                inputs: Record<
+                                    string,
+                                    {
+                                        bytecode?: any
+                                        order?: number | undefined
+                                        secret?: boolean | undefined
+                                        templating?: 'hog' | 'liquid' | undefined
+                                        value: any
+                                    }
+                                >
+                                message_category_id?: string | undefined
+                                message_category_type?: 'marketing' | 'transactional' | undefined
+                                template_id: 'template-native-push'
+                                template_uuid?: string | undefined
+                            }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'function_push'
+                            updated_at?: number | undefined
+                        }
+                      | {
+                            config: {
+                                inputs: Record<
+                                    string,
+                                    {
+                                        bytecode?: any
+                                        order?: number | undefined
+                                        secret?: boolean | undefined
+                                        templating?: 'hog' | 'liquid' | undefined
+                                        value: any
+                                    }
+                                >
+                                message_category_id?: string | undefined
+                                message_category_type?: 'marketing' | 'transactional' | undefined
+                                template_id: 'template-twilio'
+                                template_uuid?: string | undefined
+                            }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'function_sms'
+                            updated_at?: number | undefined
+                        }
+                      | {
+                            config: {
+                                cohorts: {
+                                    name?: string | undefined
+                                    percentage: number
+                                }[]
+                            }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'random_cohort_branch'
+                            updated_at?: number | undefined
+                        }
+                      | {
+                            config:
+                                | {
+                                      type: 'schedule'
+                                  }
+                                | {
+                                      filters: {
+                                          properties: any[]
+                                      }
+                                      type: 'batch'
+                                  }
+                                | {
+                                      filters: {
+                                          actions?: any[] | undefined
+                                          events?: any[] | undefined
+                                          filter_test_accounts?: boolean | undefined
+                                          properties?: any[] | undefined
+                                      }
+                                      type: 'event'
+                                  }
+                                | {
+                                      filters: {
+                                          properties?: any[] | undefined
+                                      }
+                                      key_property?: string | undefined
+                                      table_name: string
+                                      type: 'data-warehouse-table'
+                                  }
+                                | {
+                                      inputs: Record<
+                                          string,
+                                          {
+                                              bytecode?: any
+                                              order?: number | undefined
+                                              secret?: boolean | undefined
+                                              templating?: 'hog' | 'liquid' | undefined
+                                              value: any
+                                          }
+                                      >
+                                      template_id: string
+                                      template_uuid?: string | undefined
+                                      type: 'manual'
+                                  }
+                                | {
+                                      inputs: Record<
+                                          string,
+                                          {
+                                              bytecode?: any
+                                              order?: number | undefined
+                                              secret?: boolean | undefined
+                                              templating?: 'hog' | 'liquid' | undefined
+                                              value: any
+                                          }
+                                      >
+                                      template_id: string
+                                      template_uuid?: string | undefined
+                                      type: 'tracking_pixel'
+                                  }
+                                | {
+                                      inputs: Record<
+                                          string,
+                                          {
+                                              bytecode?: any
+                                              order?: number | undefined
+                                              secret?: boolean | undefined
+                                              templating?: 'hog' | 'liquid' | undefined
+                                              value: any
+                                          }
+                                      >
+                                      template_id: string
+                                      template_uuid?: string | undefined
+                                      type: 'webhook'
+                                  }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'trigger'
+                            updated_at?: number | undefined
+                        }
+                      | {
+                            config: {
+                                condition: {
+                                    filters?:
+                                        | {
+                                              actions?: any[] | undefined
+                                              events?: any[] | undefined
+                                              properties?: any[] | undefined
+                                          }
+                                        | null
+                                        | undefined
+                                    name?: string | undefined
+                                }
+                                events?:
+                                    | {
+                                          filters?:
+                                              | {
+                                                    actions?: any[] | undefined
+                                                    events?: any[] | undefined
+                                                    properties?: any[] | undefined
+                                                }
+                                              | null
+                                              | undefined
+                                          name?: string | undefined
+                                      }[]
+                                    | undefined
+                                max_wait_duration: string
+                            }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'wait_until_condition'
+                            updated_at?: number | undefined
+                        }
+                      | {
+                            config: {
+                                day:
+                                    | (
+                                          | 'friday'
+                                          | 'monday'
+                                          | 'saturday'
+                                          | 'sunday'
+                                          | 'thursday'
+                                          | 'tuesday'
+                                          | 'wednesday'
+                                      )[]
+                                    | 'any'
+                                    | 'weekday'
+                                    | 'weekend'
+                                fallback_timezone?: string | null | undefined
+                                time: [string, string] | 'any'
+                                timezone: string | null
+                                use_person_timezone?: boolean | undefined
+                            }
+                            created_at?: number | undefined
+                            description: string
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            id: string
+                            name: string
+                            on_error?: 'abort' | 'continue' | null | undefined
+                            output_variable?:
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }
+                                | {
+                                      key: string
+                                      label?: string | null | undefined
+                                      result_path?: string | null | undefined
+                                      spread?: boolean | null | undefined
+                                  }[]
+                                | null
+                                | undefined
+                            type: 'wait_until_time_window'
+                            updated_at?: number | undefined
+                        }
+                  )[]
+                  conversion?:
+                      | {
+                            bytecode?: (number | string)[] | undefined
+                            events?:
+                                | {
+                                      filters?: any
+                                      name?: string | undefined
+                                  }[]
+                                | undefined
+                            filters: any
+                            window_minutes: number | null
+                        }
+                      | undefined
+                  created_at: string
+                  created_by?: UserBasicType | null | undefined
+                  description?: string | undefined
+                  edges: {
+                      from: string
+                      index?: number | undefined
+                      to: string
+                      type: 'branch' | 'continue'
+                  }[]
+                  exit_condition:
+                      | 'exit_on_conversion'
+                      | 'exit_on_trigger_not_matched'
+                      | 'exit_on_trigger_not_matched_or_conversion'
+                      | 'exit_only_at_end'
+                  id: string
+                  image_url?: string | null | undefined
+                  name: string
+                  scope?: 'global' | 'organization' | 'team' | null | undefined
+                  status: 'draft'
+                  tags: string[]
+                  team_id: number
+                  trigger?:
+                      | {
+                            type: 'schedule'
+                        }
+                      | {
+                            filters: {
+                                properties: any[]
+                            }
+                            type: 'batch'
+                        }
+                      | {
+                            filters: {
+                                actions?: any[] | undefined
+                                events?: any[] | undefined
+                                filter_test_accounts?: boolean | undefined
+                                properties?: any[] | undefined
+                            }
+                            type: 'event'
+                        }
+                      | {
+                            filters: {
+                                properties?: any[] | undefined
+                            }
+                            key_property?: string | undefined
+                            table_name: string
+                            type: 'data-warehouse-table'
+                        }
+                      | {
+                            inputs: Record<
+                                string,
+                                {
+                                    bytecode?: any
+                                    order?: number | undefined
+                                    secret?: boolean | undefined
+                                    templating?: 'hog' | 'liquid' | undefined
+                                    value: any
+                                }
+                            >
+                            template_id: string
+                            template_uuid?: string | undefined
+                            type: 'manual'
+                        }
+                      | {
+                            inputs: Record<
+                                string,
+                                {
+                                    bytecode?: any
+                                    order?: number | undefined
+                                    secret?: boolean | undefined
+                                    templating?: 'hog' | 'liquid' | undefined
+                                    value: any
+                                }
+                            >
+                            template_id: string
+                            template_uuid?: string | undefined
+                            type: 'tracking_pixel'
+                        }
+                      | {
+                            inputs: Record<
+                                string,
+                                {
+                                    bytecode?: any
+                                    order?: number | undefined
+                                    secret?: boolean | undefined
+                                    templating?: 'hog' | 'liquid' | undefined
+                                    value: any
+                                }
+                            >
+                            template_id: string
+                            template_uuid?: string | undefined
+                            type: 'webhook'
+                        }
+                      | undefined
+                  trigger_masking?:
+                      | {
+                            bytecode: (number | string)[]
+                            hash: string
+                            threshold: number | null
+                            ttl: number | null
+                        }
+                      | null
+                      | undefined
+                  updated_at: string
+                  variables?:
+                      | {
+                            choices?:
+                                | {
+                                      label: string
+                                      value: string
+                                  }[]
+                                | undefined
+                            default?: any
+                            description?: string | undefined
+                            hidden?: boolean | undefined
+                            integration?: string | undefined
+                            integration_field?: string | undefined
+                            integration_key?: string | undefined
+                            key: string
+                            label: string
+                            required?: boolean | undefined
+                            requiredScopes?: string | undefined
+                            requires_field?: string | undefined
+                            secret?: boolean | undefined
+                            templating?: boolean | undefined
+                            type:
+                                | 'boolean'
+                                | 'choice'
+                                | 'customer_analytics_account_properties'
+                                | 'customer_analytics_account_relationships'
+                                | 'dictionary'
+                                | 'email'
+                                | 'integration'
+                                | 'integration_field'
+                                | 'integration_multi'
+                                | 'json'
+                                | 'native_email'
+                                | 'non_failure_status_codes'
+                                | 'number'
+                                | 'posthog_assignee'
+                                | 'posthog_business_hours'
+                                | 'posthog_ticket_tags'
+                                | 'string'
+                        }[]
+                      | null
+                      | undefined
+                  version: number
+              }
+        payload?: any
+    }
+    markAutoSave: (isAutoSave: boolean) => {
+        isAutoSave: boolean
+    }
+    partialSetWorkflowActionConfig: (
+        actionId: string,
+        config: Partial<HogFlowAction['config']>
+    ) => {
+        actionId: string
+        config: Partial<
+            | {
+                  cohorts: {
+                      name?: string | undefined
+                      percentage: number
+                  }[]
+              }
+            | {
+                  delay_duration: string
+              }
+            | {
+                  reason?: string | undefined
+              }
+            | {
+                  type: 'schedule'
+              }
+            | {
+                  conditions: {
+                      filters: {
+                          actions?: any[] | undefined
+                          events?: any[] | undefined
+                          properties?: any[] | undefined
+                      }
+                      name?: string | undefined
+                  }[]
+                  delay_duration?: string | undefined
+              }
+            | {
+                  filters: {
+                      properties: any[]
+                  }
+                  type: 'batch'
+              }
+            | {
+                  filters: {
+                      actions?: any[] | undefined
+                      events?: any[] | undefined
+                      filter_test_accounts?: boolean | undefined
+                      properties?: any[] | undefined
+                  }
+                  type: 'event'
+              }
+            | {
+                  condition: {
+                      filters?:
+                          | {
+                                actions?: any[] | undefined
+                                events?: any[] | undefined
+                                properties?: any[] | undefined
+                            }
+                          | null
+                          | undefined
+                      name?: string | undefined
+                  }
+                  events?:
+                      | {
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            name?: string | undefined
+                        }[]
+                      | undefined
+                  max_wait_duration: string
+              }
+            | {
+                  inputs: Record<
+                      string,
+                      {
+                          bytecode?: any
+                          order?: number | undefined
+                          secret?: boolean | undefined
+                          templating?: 'hog' | 'liquid' | undefined
+                          value: any
+                      }
+                  >
+                  mappings?:
+                      | {
+                            disabled?: boolean | undefined
+                            filters?: any
+                            inputs?:
+                                | Record<
+                                      string,
+                                      {
+                                          bytecode?: any
+                                          order?: number | undefined
+                                          secret?: boolean | undefined
+                                          templating?: 'hog' | 'liquid' | undefined
+                                          value: any
+                                      }
+                                  >
+                                | null
+                                | undefined
+                            inputs_schema?:
+                                | {
+                                      choices?:
+                                          | {
+                                                label: string
+                                                value: string
+                                            }[]
+                                          | undefined
+                                      default?: any
+                                      description?: string | undefined
+                                      hidden?: boolean | undefined
+                                      integration?: string | undefined
+                                      integration_field?: string | undefined
+                                      integration_key?: string | undefined
+                                      key: string
+                                      label: string
+                                      required?: boolean | undefined
+                                      requiredScopes?: string | undefined
+                                      requires_field?: string | undefined
+                                      secret?: boolean | undefined
+                                      templating?: boolean | undefined
+                                      type:
+                                          | 'boolean'
+                                          | 'choice'
+                                          | 'customer_analytics_account_properties'
+                                          | 'customer_analytics_account_relationships'
+                                          | 'dictionary'
+                                          | 'email'
+                                          | 'integration'
+                                          | 'integration_field'
+                                          | 'integration_multi'
+                                          | 'json'
+                                          | 'native_email'
+                                          | 'non_failure_status_codes'
+                                          | 'number'
+                                          | 'posthog_assignee'
+                                          | 'posthog_business_hours'
+                                          | 'posthog_ticket_tags'
+                                          | 'string'
+                                  }[]
+                                | undefined
+                            name: string
+                        }[]
+                      | undefined
+                  template_id: string
+                  template_uuid?: string | undefined
+              }
+            | {
+                  filters: {
+                      properties?: any[] | undefined
+                  }
+                  key_property?: string | undefined
+                  table_name: string
+                  type: 'data-warehouse-table'
+              }
+            | {
+                  inputs: Record<
+                      string,
+                      {
+                          bytecode?: any
+                          order?: number | undefined
+                          secret?: boolean | undefined
+                          templating?: 'hog' | 'liquid' | undefined
+                          value: any
+                      }
+                  >
+                  template_id: string
+                  template_uuid?: string | undefined
+                  type: 'manual'
+              }
+            | {
+                  inputs: Record<
+                      string,
+                      {
+                          bytecode?: any
+                          order?: number | undefined
+                          secret?: boolean | undefined
+                          templating?: 'hog' | 'liquid' | undefined
+                          value: any
+                      }
+                  >
+                  template_id: string
+                  template_uuid?: string | undefined
+                  type: 'tracking_pixel'
+              }
+            | {
+                  inputs: Record<
+                      string,
+                      {
+                          bytecode?: any
+                          order?: number | undefined
+                          secret?: boolean | undefined
+                          templating?: 'hog' | 'liquid' | undefined
+                          value: any
+                      }
+                  >
+                  template_id: string
+                  template_uuid?: string | undefined
+                  type: 'webhook'
+              }
+            | {
+                  inputs: Record<
+                      string,
+                      {
+                          bytecode?: any
+                          order?: number | undefined
+                          secret?: boolean | undefined
+                          templating?: 'hog' | 'liquid' | undefined
+                          value: any
+                      }
+                  >
+                  message_category_id?: string | undefined
+                  message_category_type?: 'marketing' | 'transactional' | undefined
+                  template_id: 'template-email'
+                  template_uuid?: string | undefined
+              }
+            | {
+                  inputs: Record<
+                      string,
+                      {
+                          bytecode?: any
+                          order?: number | undefined
+                          secret?: boolean | undefined
+                          templating?: 'hog' | 'liquid' | undefined
+                          value: any
+                      }
+                  >
+                  message_category_id?: string | undefined
+                  message_category_type?: 'marketing' | 'transactional' | undefined
+                  template_id: 'template-native-push'
+                  template_uuid?: string | undefined
+              }
+            | {
+                  inputs: Record<
+                      string,
+                      {
+                          bytecode?: any
+                          order?: number | undefined
+                          secret?: boolean | undefined
+                          templating?: 'hog' | 'liquid' | undefined
+                          value: any
+                      }
+                  >
+                  message_category_id?: string | undefined
+                  message_category_type?: 'marketing' | 'transactional' | undefined
+                  template_id: 'template-twilio'
+                  template_uuid?: string | undefined
+              }
+            | {
+                  day:
+                      | ('friday' | 'monday' | 'saturday' | 'sunday' | 'thursday' | 'tuesday' | 'wednesday')[]
+                      | 'any'
+                      | 'weekday'
+                      | 'weekend'
+                  fallback_timezone?: string | null | undefined
+                  time: [string, string] | 'any'
+                  timezone: string | null
+                  use_person_timezone?: boolean | undefined
+              }
+        >
+    }
+    resetWorkflow: (values?: HogFlow) => {
+        values?: HogFlow
+    }
+    saveWorkflow: (updates: HogFlow) => HogFlow
+    saveWorkflowFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    saveWorkflowPartial: (workflow: Partial<HogFlow>) => {
+        workflow: Partial<HogFlow>
+    }
+    saveWorkflowSuccess: (
+        originalWorkflow: HogFlow,
+        payload?: HogFlow
+    ) => {
+        originalWorkflow: HogFlow
+        payload?: HogFlow
+    }
+    setAutoSaveEnabled: (enabled: boolean) => {
+        enabled: boolean
+    }
+    setExternallyEdited: (externallyEdited: boolean) => {
+        externallyEdited: boolean
+    }
+    setSaveBaseUpdatedAt: (updatedAt: string | null) => {
+        updatedAt: string | null
+    }
+    setScheduleRepeating: (repeating: boolean) => {
+        repeating: boolean
+    }
+    setScheduleStartsAt: (startsAt: string | null) => {
+        startsAt: string | null
+    }
+    setScheduleStartsAtFromPicker: (pickerDate: string | null) => {
+        pickerDate: string | null
+    }
+    setScheduleState: (
+        scheduleState: ScheduleState,
+        source?: 'natural_language' | 'picker'
+    ) => {
+        scheduleState: ScheduleState
+        source: 'natural_language' | 'picker'
+    }
+    setScheduleTimezone: (
+        timezone: string,
+        previousTimezone?: string
+    ) => {
+        previousTimezone: string | undefined
+        timezone: string
+    }
+    setSchedules: (schedules: HogFlowSchedule[]) => {
+        schedules: HogFlowSchedule[]
+    }
+    setSyncingExternalEdit: (syncing: boolean) => {
+        syncing: boolean
+    }
+    setWorkflowAction: (
+        actionId: string,
+        action: HogFlowAction
+    ) => {
+        action: HogFlowAction
+        actionId: string
+    }
+    setWorkflowActionConfig: (
+        actionId: string,
+        config: HogFlowAction['config']
+    ) => {
+        actionId: string
+        config:
+            | {
+                  cohorts: {
+                      name?: string | undefined
+                      percentage: number
+                  }[]
+              }
+            | {
+                  delay_duration: string
+              }
+            | {
+                  reason?: string | undefined
+              }
+            | {
+                  type: 'schedule'
+              }
+            | {
+                  conditions: {
+                      filters: {
+                          actions?: any[] | undefined
+                          events?: any[] | undefined
+                          properties?: any[] | undefined
+                      }
+                      name?: string | undefined
+                  }[]
+                  delay_duration?: string | undefined
+              }
+            | {
+                  filters: {
+                      properties: any[]
+                  }
+                  type: 'batch'
+              }
+            | {
+                  filters: {
+                      actions?: any[] | undefined
+                      events?: any[] | undefined
+                      filter_test_accounts?: boolean | undefined
+                      properties?: any[] | undefined
+                  }
+                  type: 'event'
+              }
+            | {
+                  condition: {
+                      filters?:
+                          | {
+                                actions?: any[] | undefined
+                                events?: any[] | undefined
+                                properties?: any[] | undefined
+                            }
+                          | null
+                          | undefined
+                      name?: string | undefined
+                  }
+                  events?:
+                      | {
+                            filters?:
+                                | {
+                                      actions?: any[] | undefined
+                                      events?: any[] | undefined
+                                      properties?: any[] | undefined
+                                  }
+                                | null
+                                | undefined
+                            name?: string | undefined
+                        }[]
+                      | undefined
+                  max_wait_duration: string
+              }
+            | {
+                  inputs: Record<
+                      string,
+                      {
+                          bytecode?: any
+                          order?: number | undefined
+                          secret?: boolean | undefined
+                          templating?: 'hog' | 'liquid' | undefined
+                          value: any
+                      }
+                  >
+                  mappings?:
+                      | {
+                            disabled?: boolean | undefined
+                            filters?: any
+                            inputs?:
+                                | Record<
+                                      string,
+                                      {
+                                          bytecode?: any
+                                          order?: number | undefined
+                                          secret?: boolean | undefined
+                                          templating?: 'hog' | 'liquid' | undefined
+                                          value: any
+                                      }
+                                  >
+                                | null
+                                | undefined
+                            inputs_schema?:
+                                | {
+                                      choices?:
+                                          | {
+                                                label: string
+                                                value: string
+                                            }[]
+                                          | undefined
+                                      default?: any
+                                      description?: string | undefined
+                                      hidden?: boolean | undefined
+                                      integration?: string | undefined
+                                      integration_field?: string | undefined
+                                      integration_key?: string | undefined
+                                      key: string
+                                      label: string
+                                      required?: boolean | undefined
+                                      requiredScopes?: string | undefined
+                                      requires_field?: string | undefined
+                                      secret?: boolean | undefined
+                                      templating?: boolean | undefined
+                                      type:
+                                          | 'boolean'
+                                          | 'choice'
+                                          | 'customer_analytics_account_properties'
+                                          | 'customer_analytics_account_relationships'
+                                          | 'dictionary'
+                                          | 'email'
+                                          | 'integration'
+                                          | 'integration_field'
+                                          | 'integration_multi'
+                                          | 'json'
+                                          | 'native_email'
+                                          | 'non_failure_status_codes'
+                                          | 'number'
+                                          | 'posthog_assignee'
+                                          | 'posthog_business_hours'
+                                          | 'posthog_ticket_tags'
+                                          | 'string'
+                                  }[]
+                                | undefined
+                            name: string
+                        }[]
+                      | undefined
+                  template_id: string
+                  template_uuid?: string | undefined
+              }
+            | {
+                  filters: {
+                      properties?: any[] | undefined
+                  }
+                  key_property?: string | undefined
+                  table_name: string
+                  type: 'data-warehouse-table'
+              }
+            | {
+                  inputs: Record<
+                      string,
+                      {
+                          bytecode?: any
+                          order?: number | undefined
+                          secret?: boolean | undefined
+                          templating?: 'hog' | 'liquid' | undefined
+                          value: any
+                      }
+                  >
+                  template_id: string
+                  template_uuid?: string | undefined
+                  type: 'manual'
+              }
+            | {
+                  inputs: Record<
+                      string,
+                      {
+                          bytecode?: any
+                          order?: number | undefined
+                          secret?: boolean | undefined
+                          templating?: 'hog' | 'liquid' | undefined
+                          value: any
+                      }
+                  >
+                  template_id: string
+                  template_uuid?: string | undefined
+                  type: 'tracking_pixel'
+              }
+            | {
+                  inputs: Record<
+                      string,
+                      {
+                          bytecode?: any
+                          order?: number | undefined
+                          secret?: boolean | undefined
+                          templating?: 'hog' | 'liquid' | undefined
+                          value: any
+                      }
+                  >
+                  template_id: string
+                  template_uuid?: string | undefined
+                  type: 'webhook'
+              }
+            | {
+                  inputs: Record<
+                      string,
+                      {
+                          bytecode?: any
+                          order?: number | undefined
+                          secret?: boolean | undefined
+                          templating?: 'hog' | 'liquid' | undefined
+                          value: any
+                      }
+                  >
+                  message_category_id?: string | undefined
+                  message_category_type?: 'marketing' | 'transactional' | undefined
+                  template_id: 'template-email'
+                  template_uuid?: string | undefined
+              }
+            | {
+                  inputs: Record<
+                      string,
+                      {
+                          bytecode?: any
+                          order?: number | undefined
+                          secret?: boolean | undefined
+                          templating?: 'hog' | 'liquid' | undefined
+                          value: any
+                      }
+                  >
+                  message_category_id?: string | undefined
+                  message_category_type?: 'marketing' | 'transactional' | undefined
+                  template_id: 'template-native-push'
+                  template_uuid?: string | undefined
+              }
+            | {
+                  inputs: Record<
+                      string,
+                      {
+                          bytecode?: any
+                          order?: number | undefined
+                          secret?: boolean | undefined
+                          templating?: 'hog' | 'liquid' | undefined
+                          value: any
+                      }
+                  >
+                  message_category_id?: string | undefined
+                  message_category_type?: 'marketing' | 'transactional' | undefined
+                  template_id: 'template-twilio'
+                  template_uuid?: string | undefined
+              }
+            | {
+                  day:
+                      | ('friday' | 'monday' | 'saturday' | 'sunday' | 'thursday' | 'tuesday' | 'wednesday')[]
+                      | 'any'
+                      | 'weekday'
+                      | 'weekend'
+                  fallback_timezone?: string | null | undefined
+                  time: [string, string] | 'any'
+                  timezone: string | null
+                  use_person_timezone?: boolean | undefined
+              }
+    }
+    setWorkflowActionEdges: (
+        actionId: string,
+        edges: HogFlow['edges']
+    ) => {
+        actionId: string
+        edges: {
+            from: string
+            index?: number | undefined
+            to: string
+            type: 'branch' | 'continue'
+        }[]
+    }
+    setWorkflowInfo: (workflow: Partial<HogFlow>) => {
+        workflow: Partial<HogFlow>
+    }
+    setWorkflowManualErrors: (errors: Record<string, any>) => {
+        errors: Record<string, any>
+    }
+    setWorkflowValue: (
+        key: FieldName,
+        value: any
+    ) => {
+        name: FieldName
+        value: any
+    }
+    setWorkflowValues: (values: DeepPartial<HogFlow>) => {
+        values: DeepPartial<HogFlow>
+    }
+    submitWorkflow: () => {
+        value: boolean
+    }
+    submitWorkflowFailure: (
+        error: Error,
+        errors: Record<string, any>
+    ) => {
+        error: Error
+        errors: Record<string, any>
+    }
+    submitWorkflowRequest: (workflow: HogFlow) => {
+        workflow: HogFlow
+    }
+    submitWorkflowSuccess: (workflow: HogFlow) => {
+        workflow: HogFlow
+    }
+    touchWorkflowField: (key: string) => {
+        key: string
+    }
+    triggerBatchWorkflow: (
+        variables: Record<string, any>,
+        filters: Extract<
+            HogFlowAction['config'],
+            {
+                type: 'batch'
+            }
+        >['filters']
+    ) => {
+        filters: {
+            properties: any[]
+        }
+        variables: Record<string, any>
+    }
+    triggerManualWorkflow: (variables: Record<string, any>) => {
+        variables: Record<string, any>
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface workflowLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        logicProps: (arg: WorkflowLogicProps) => WorkflowLogicProps
+        workflowUserAccessLevel: (originalWorkflow: HogFlow | null) => AccessControlLevel | null
+        currentSchedule: (schedules: HogFlowSchedule[]) => HogFlowSchedule | null
+        pendingSchedule: (
+            currentSchedule: HogFlowSchedule | null,
+            scheduleState: ScheduleState,
+            scheduleStartsAt: string | null,
+            scheduleTimezone: string,
+            isScheduleRepeating: boolean
+        ) =>
+            | {
+                  rrule: string
+                  starts_at: string
+                  timezone?: string
+              }
+            | false
+            | null
+        hasUnsavedChanges: (
+            workflowChanged: boolean,
+            pendingSchedule:
+                | {
+                      rrule: string
+                      starts_at: string
+                      timezone?: string
+                  }
+                | false
+                | null
+        ) => boolean
+        workflowLoading: (originalWorkflowLoading: boolean) => boolean
+        edgesByActionId: (workflow: HogFlow) => Record<string, HogFlowEdge[]>
+        actionValidationErrorsById: (
+            workflow: HogFlow,
+            hogFunctionTemplatesById: Record<string, HogFunctionTemplateType>,
+            hogFunctionTemplatesByIdLoading: boolean,
+            scheduleStartsAt: string | null
+        ) => Record<string, HogFlowActionValidationResult | null>
+        workflowHasActionErrors: (
+            workflow: HogFlow,
+            actionValidationErrorsById: Record<string, HogFlowActionValidationResult | null>
+        ) => boolean
+        triggerAction: (workflow: HogFlow) => TriggerAction | null
+        isRowScopedTrigger: (
+            triggerAction:
+                | ({
+                      config:
+                          | {
+                                type: 'schedule'
+                            }
+                          | {
+                                filters: {
+                                    properties: any[]
+                                }
+                                type: 'batch'
+                            }
+                          | {
+                                filters: {
+                                    actions?: any[] | undefined
+                                    events?: any[] | undefined
+                                    filter_test_accounts?: boolean | undefined
+                                    properties?: any[] | undefined
+                                }
+                                type: 'event'
+                            }
+                          | {
+                                filters: {
+                                    properties?: any[] | undefined
+                                }
+                                key_property?: string | undefined
+                                table_name: string
+                                type: 'data-warehouse-table'
+                            }
+                          | {
+                                inputs: Record<
+                                    string,
+                                    {
+                                        bytecode?: any
+                                        order?: number | undefined
+                                        secret?: boolean | undefined
+                                        templating?: 'hog' | 'liquid' | undefined
+                                        value: any
+                                    }
+                                >
+                                template_id: string
+                                template_uuid?: string | undefined
+                                type: 'manual'
+                            }
+                          | {
+                                inputs: Record<
+                                    string,
+                                    {
+                                        bytecode?: any
+                                        order?: number | undefined
+                                        secret?: boolean | undefined
+                                        templating?: 'hog' | 'liquid' | undefined
+                                        value: any
+                                    }
+                                >
+                                template_id: string
+                                template_uuid?: string | undefined
+                                type: 'tracking_pixel'
+                            }
+                          | {
+                                inputs: Record<
+                                    string,
+                                    {
+                                        bytecode?: any
+                                        order?: number | undefined
+                                        secret?: boolean | undefined
+                                        templating?: 'hog' | 'liquid' | undefined
+                                        value: any
+                                    }
+                                >
+                                template_id: string
+                                template_uuid?: string | undefined
+                                type: 'webhook'
+                            }
+                      created_at?: number | undefined
+                      description: string
+                      filters?:
+                          | {
+                                actions?: any[] | undefined
+                                events?: any[] | undefined
+                                properties?: any[] | undefined
+                            }
+                          | null
+                          | undefined
+                      id: string
+                      name: string
+                      on_error?: 'abort' | 'continue' | null | undefined
+                      output_variable?:
+                          | {
+                                key: string
+                                label?: string | null | undefined
+                                result_path?: string | null | undefined
+                                spread?: boolean | null | undefined
+                            }
+                          | {
+                                key: string
+                                label?: string | null | undefined
+                                result_path?: string | null | undefined
+                                spread?: boolean | null | undefined
+                            }[]
+                          | null
+                          | undefined
+                      type: 'trigger'
+                      updated_at?: number | undefined
+                  } & Record<string, unknown>)
+                | null
+        ) => boolean
+        workflowSanitized: (
+            workflow: HogFlow,
+            hogFunctionTemplatesById: Record<string, HogFunctionTemplateType>
+        ) => HogFlow
+    }
+}
+
+export type workflowLogicType = MakeLogicType<
+    workflowLogicValues,
+    workflowLogicActions,
+    WorkflowLogicProps,
+    workflowLogicMeta
+>
+
 export const workflowLogic = kea<workflowLogicType>([
     path((key) => ['products', 'workflows', 'frontend', 'Workflows', 'workflowLogic', key]),
     props({ id: 'new' } as WorkflowLogicProps),
@@ -426,20 +2928,27 @@ export const workflowLogic = kea<workflowLogicType>([
         ],
     }),
     selectors({
-        logicProps: [() => [(_, props: WorkflowLogicProps) => props], (props): WorkflowLogicProps => props],
+        logicProps: [
+            () => [(_, props: WorkflowLogicProps) => props],
+            (props: WorkflowLogicProps): WorkflowLogicProps => props,
+        ],
         workflowUserAccessLevel: [
             (s) => [s.originalWorkflow],
-            (originalWorkflow): AccessControlLevel | null => originalWorkflow?.user_access_level ?? null,
+            (originalWorkflow: HogFlow | null): AccessControlLevel | null =>
+                originalWorkflow?.user_access_level ?? null,
+        ],
+        currentSchedule: [
+            (s) => [s.schedules],
+            (schedules: HogFlowSchedule[]): HogFlowSchedule | null => schedules[0] ?? null,
         ],
-        currentSchedule: [(s) => [s.schedules], (schedules): HogFlowSchedule | null => schedules[0] ?? null],
         pendingSchedule: [
             (s) => [s.currentSchedule, s.scheduleState, s.scheduleStartsAt, s.scheduleTimezone, s.isScheduleRepeating],
             (
-                currentSchedule,
-                scheduleState,
-                scheduleStartsAt,
-                scheduleTimezone,
-                isScheduleRepeating
+                currentSchedule: HogFlowSchedule | null,
+                scheduleState: ScheduleState,
+                scheduleStartsAt: string | null,
+                scheduleTimezone: string,
+                isScheduleRepeating: boolean
             ): { rrule: string; starts_at: string; timezone?: string } | null | false => {
                 // Build what the schedule would look like from current reducer state
                 if (!scheduleStartsAt) {
@@ -469,12 +2978,25 @@ export const workflowLogic = kea<workflowLogicType>([
         ],
         hasUnsavedChanges: [
             (s) => [s.workflowChanged, s.pendingSchedule],
-            (formChanged, pendingSchedule): boolean => formChanged || pendingSchedule !== false,
+            (
+                formChanged: boolean,
+                pendingSchedule:
+                    | {
+                          rrule: string
+                          starts_at: string
+                          timezone?: string
+                      }
+                    | false
+                    | null
+            ): boolean => formChanged || pendingSchedule !== false,
+        ],
+        workflowLoading: [
+            (s) => [s.originalWorkflowLoading],
+            (originalWorkflowLoading: boolean) => originalWorkflowLoading,
         ],
-        workflowLoading: [(s) => [s.originalWorkflowLoading], (originalWorkflowLoading) => originalWorkflowLoading],
         edgesByActionId: [
             (s) => [s.workflow],
-            (workflow): Record<string, HogFlowEdge[]> => {
+            (workflow: HogFlow): Record<string, HogFlowEdge[]> => {
                 return workflow.edges.reduce(
                     (acc, edge) => {
                         if (!acc[edge.from]) {
@@ -497,10 +3019,10 @@ export const workflowLogic = kea<workflowLogicType>([
         actionValidationErrorsById: [
             (s) => [s.workflow, s.hogFunctionTemplatesById, s.hogFunctionTemplatesByIdLoading, s.scheduleStartsAt],
             (
-                workflow,
-                hogFunctionTemplatesById,
-                hogFunctionTemplatesByIdLoading,
-                scheduleStartsAt
+                workflow: HogFlow,
+                hogFunctionTemplatesById: Record<string, HogFunctionTemplateType>,
+                hogFunctionTemplatesByIdLoading: boolean,
+                scheduleStartsAt: string | null
             ): Record<string, HogFlowActionValidationResult | null> => {
                 // Warehouse-triggered workflows are person-less ("row-scoped"). Person-dependent
                 // step types make no sense without a person, so we block them at save time.
@@ -661,7 +3183,7 @@ export const workflowLogic = kea<workflowLogicType>([
 
         triggerAction: [
             (s) => [s.workflow],
-            (workflow): TriggerAction | null => {
+            (workflow: HogFlow): TriggerAction | null => {
                 return (workflow.actions.find((action) => action.type === 'trigger') as TriggerAction) ?? null
             },
         ],
@@ -676,7 +3198,7 @@ export const workflowLogic = kea<workflowLogicType>([
 
         workflowSanitized: [
             (s) => [s.workflow, s.hogFunctionTemplatesById],
-            (workflow, hogFunctionTemplatesById): HogFlow => {
+            (workflow: HogFlow, hogFunctionTemplatesById: Record<string, HogFunctionTemplateType>): HogFlow => {
                 return sanitizeWorkflow(workflow, hogFunctionTemplatesById)
             },
         ],
diff --git a/products/workflows/frontend/Workflows/workflowMetricsSummaryLogic.ts b/products/workflows/frontend/Workflows/workflowMetricsSummaryLogic.ts
index 82139e3eee96..8c98aef8d2ae 100644
--- a/products/workflows/frontend/Workflows/workflowMetricsSummaryLogic.ts
+++ b/products/workflows/frontend/Workflows/workflowMetricsSummaryLogic.ts
@@ -1,4 +1,4 @@
-import { afterMount, connect, kea, key, listeners, path, props, selectors } from 'kea'
+import { MakeLogicType, afterMount, connect, kea, key, listeners, path, props, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { combineUrl } from 'kea-router'
 
@@ -17,9 +17,12 @@ import { defaultDataTableColumns } from '~/queries/nodes/DataTable/utils'
 import { DataTableNode, EventsQuery, NodeKind } from '~/queries/schema/schema-general'
 import { ActivityTab, LogEntryLevel, PropertyFilterType, PropertyOperator } from '~/types'
 
+import type { AppMetricsCommonParams } from '../../../../frontend/src/lib/components/AppMetrics/appMetricsLogic'
+import type { Dayjs } from '../../../../frontend/src/lib/dayjs'
+import type { TeamPublicType, TeamType } from '../../../../frontend/src/types'
 import { isEmailAction } from './hogflows/steps/types'
+import type { HogFlow } from './hogflows/types'
 import { workflowLogic } from './workflowLogic'
-import type { workflowMetricsSummaryLogicType } from './workflowMetricsSummaryLogicType'
 
 // Each conversion is emitted as a `$workflows_conversion` PostHog event carrying `$workflow_id`, so
 // "View converted users" deep-links to the events explorer scoped to this workflow and date range.
@@ -217,6 +220,296 @@ export interface WorkflowMetricsSummaryLogicProps {
     appSourceId?: string
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface workflowMetricsSummaryLogicValues {
+    appMetricsTrends: AppMetricsTimeSeriesResponse | null // appMetricsLogic
+    appMetricsTrendsLoading: boolean // appMetricsLogic
+    completedLoading: boolean // appMetricsLogic
+    completedTrends: AppMetricsTimeSeriesResponse | null // appMetricsLogic
+    currentTeam: TeamPublicType | TeamType | null // appMetricsLogic
+    getCompletedSingleTrendSeries: (name: string, previousPeriod?: boolean) => AppMetricsTimeSeriesResponse | null // appMetricsLogic
+    getDateRangeAbsolute: () => {
+        dateFrom: Dayjs
+        dateTo: Dayjs
+        diffMs: number
+    } // appMetricsLogic
+    getSingleTrendSeries: (name: string, previousPeriod?: boolean) => AppMetricsTimeSeriesResponse | null // appMetricsLogic
+    params: Partial<AppMetricsCommonParams> // appMetricsLogic
+    workflow: HogFlow // workflowLogic
+    conversionRate: number
+    conversionStats: {
+        conversions: number
+        started: number
+    }
+    conversionStatsLoading: boolean
+    convertedUsersUrl: string
+    emailActions: ({
+        config: {
+            inputs: Record<
+                string,
+                {
+                    bytecode?: any
+                    order?: number | undefined
+                    secret?: boolean | undefined
+                    templating?: 'hog' | 'liquid' | undefined
+                    value: any
+                }
+            >
+            message_category_id?: string | undefined
+            message_category_type?: 'marketing' | 'transactional' | undefined
+            template_id: 'template-email'
+            template_uuid?: string | undefined
+        }
+        created_at?: number | undefined
+        description: string
+        filters?:
+            | {
+                  actions?: any[] | undefined
+                  events?: any[] | undefined
+                  properties?: any[] | undefined
+              }
+            | null
+            | undefined
+        id: string
+        name: string
+        on_error?: 'abort' | 'continue' | null | undefined
+        output_variable?:
+            | {
+                  key: string
+                  label?: string | null | undefined
+                  result_path?: string | null | undefined
+                  spread?: boolean | null | undefined
+              }
+            | {
+                  key: string
+                  label?: string | null | undefined
+                  result_path?: string | null | undefined
+                  spread?: boolean | null | undefined
+              }[]
+            | null
+            | undefined
+        type: 'function_email'
+        updated_at?: number | undefined
+    } & Record<string, unknown>)[]
+    emailMetricsRows: EmailMetricRow[]
+    emailTotalsByActionId: Record<string, Partial<Record<EmailMetric, number>>>
+    emailTotalsByActionIdLoading: boolean
+    hasConversionGoal: boolean
+    inProgressTotal: number
+    inProgressTotalLoading: boolean
+    loading: boolean
+    metricNameBySummaryMetric: Record<WorkflowSummaryMetric, string>
+    summaryMetricKeys: WorkflowSummaryMetric[]
+    workflowSummaryTrends: AppMetricsTimeSeriesResponse | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface workflowMetricsSummaryLogicActions {
+    loadAppMetricsTrendsSuccess: (
+        appMetricsTrends: AppMetricsTimeSeriesResponse,
+        payload?:
+            | {
+                  value: true
+              }
+            | undefined
+    ) => {
+        appMetricsTrends: AppMetricsTimeSeriesResponse
+        payload?: {
+            value: true
+        }
+    } // appMetricsLogic
+    setParams: (params: Partial<AppMetricsCommonParams>) => {
+        params: Partial<AppMetricsCommonParams>
+    } // appMetricsLogic
+    loadConversionStats: (_: any) => any
+    loadConversionStatsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadConversionStatsSuccess: (
+        conversionStats: {
+            conversions: number
+            started: number
+        },
+        payload?: any
+    ) => {
+        conversionStats: {
+            conversions: number
+            started: number
+        }
+        payload?: any
+    }
+    loadEmailTotals: (_: any) => any
+    loadEmailTotalsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadEmailTotalsSuccess: (
+        emailTotalsByActionId: Record<string, Partial<Record<EmailMetric, number>>>,
+        payload?: any
+    ) => {
+        emailTotalsByActionId: Record<string, Partial<Record<EmailMetric, number>>>
+        payload?: any
+    }
+    loadInProgressTotal: (_: any) => any
+    loadInProgressTotalFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadInProgressTotalSuccess: (
+        inProgressTotal: number,
+        payload?: any
+    ) => {
+        inProgressTotal: number
+        payload?: any
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface workflowMetricsSummaryLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        loading: (appMetricsTrendsLoading: boolean, completedLoading: boolean) => boolean
+        emailActions: (workflow: HogFlow) => ({
+            config: {
+                inputs: Record<
+                    string,
+                    {
+                        bytecode?: any
+                        order?: number | undefined
+                        secret?: boolean | undefined
+                        templating?: 'hog' | 'liquid' | undefined
+                        value: any
+                    }
+                >
+                message_category_id?: string | undefined
+                message_category_type?: 'marketing' | 'transactional' | undefined
+                template_id: 'template-email'
+                template_uuid?: string | undefined
+            }
+            created_at?: number | undefined
+            description: string
+            filters?:
+                | {
+                      actions?: any[] | undefined
+                      events?: any[] | undefined
+                      properties?: any[] | undefined
+                  }
+                | null
+                | undefined
+            id: string
+            name: string
+            on_error?: 'abort' | 'continue' | null | undefined
+            output_variable?:
+                | {
+                      key: string
+                      label?: string | null | undefined
+                      result_path?: string | null | undefined
+                      spread?: boolean | null | undefined
+                  }
+                | {
+                      key: string
+                      label?: string | null | undefined
+                      result_path?: string | null | undefined
+                      spread?: boolean | null | undefined
+                  }[]
+                | null
+                | undefined
+            type: 'function_email'
+            updated_at?: number | undefined
+        } & Record<string, unknown>)[]
+        metricNameBySummaryMetric: (
+            appMetricsTrends: AppMetricsTimeSeriesResponse | null
+        ) => Record<WorkflowSummaryMetric, string>
+        conversionRate: (conversionStats: { conversions: number; started: number }) => number
+        hasConversionGoal: (workflow: HogFlow) => boolean
+        convertedUsersUrl: (
+            getDateRangeAbsolute: () => {
+                dateFrom: Dayjs
+                dateTo: Dayjs
+                diffMs: number
+            },
+            arg: string
+        ) => string
+        workflowSummaryTrends: (
+            appMetricsTrends: AppMetricsTimeSeriesResponse | null,
+            completedTrends: AppMetricsTimeSeriesResponse | null,
+            metricNameBySummaryMetric: Record<WorkflowSummaryMetric, string>,
+            getCompletedSingleTrendSeries: (
+                name: string,
+                previousPeriod?: boolean
+            ) => AppMetricsTimeSeriesResponse | null
+        ) => AppMetricsTimeSeriesResponse | null
+        emailMetricsRows: (
+            emailActions: ({
+                config: {
+                    inputs: Record<
+                        string,
+                        {
+                            bytecode?: any
+                            order?: number | undefined
+                            secret?: boolean | undefined
+                            templating?: 'hog' | 'liquid' | undefined
+                            value: any
+                        }
+                    >
+                    message_category_id?: string | undefined
+                    message_category_type?: 'marketing' | 'transactional' | undefined
+                    template_id: 'template-email'
+                    template_uuid?: string | undefined
+                }
+                created_at?: number | undefined
+                description: string
+                filters?:
+                    | {
+                          actions?: any[] | undefined
+                          events?: any[] | undefined
+                          properties?: any[] | undefined
+                      }
+                    | null
+                    | undefined
+                id: string
+                name: string
+                on_error?: 'abort' | 'continue' | null | undefined
+                output_variable?:
+                    | {
+                          key: string
+                          label?: string | null | undefined
+                          result_path?: string | null | undefined
+                          spread?: boolean | null | undefined
+                      }
+                    | {
+                          key: string
+                          label?: string | null | undefined
+                          result_path?: string | null | undefined
+                          spread?: boolean | null | undefined
+                      }[]
+                    | null
+                    | undefined
+                type: 'function_email'
+                updated_at?: number | undefined
+            } & Record<string, unknown>)[],
+            emailTotalsByActionId: Record<string, Partial<Record<EmailMetric, number>>>
+        ) => EmailMetricRow[]
+    }
+}
+
+export type workflowMetricsSummaryLogicType = MakeLogicType<
+    workflowMetricsSummaryLogicValues,
+    workflowMetricsSummaryLogicActions,
+    WorkflowMetricsSummaryLogicProps,
+    workflowMetricsSummaryLogicMeta
+>
+
 export const workflowMetricsSummaryLogic = kea<workflowMetricsSummaryLogicType>([
     path(['products', 'workflows', 'frontend', 'Workflows', 'workflowMetricsSummaryLogic']),
     props({} as WorkflowMetricsSummaryLogicProps),
@@ -348,11 +641,14 @@ export const workflowMetricsSummaryLogic = kea<workflowMetricsSummaryLogicType>(
                 appMetricsTrendsLoading || completedLoading,
         ],
 
-        emailActions: [(s) => [s.workflow], (workflow) => workflow.actions.filter(isEmailAction)],
+        emailActions: [
+            (s) => [s.workflow],
+            (workflow: import('./hogflows/types').HogFlow) => workflow.actions.filter(isEmailAction),
+        ],
 
         metricNameBySummaryMetric: [
             (s) => [s.appMetricsTrends],
-            (appMetricsTrends): Record<WorkflowSummaryMetric, string> =>
+            (appMetricsTrends: AppMetricsTimeSeriesResponse | null): Record<WorkflowSummaryMetric, string> =>
                 SUMMARY_METRIC_KEYS.reduce(
                     (acc, metricKey) => {
                         const metric = WORKFLOW_SUMMARY_METRICS[metricKey]
@@ -377,7 +673,7 @@ export const workflowMetricsSummaryLogic = kea<workflowMetricsSummaryLogicType>(
         // backend never emits conversion metrics/events, so the tiles would always read empty.
         hasConversionGoal: [
             (s) => [s.workflow],
-            (workflow): boolean => {
+            (workflow: import('./hogflows/types').HogFlow): boolean => {
                 const filters = workflow.conversion?.filters
                 const hasPropertyGoal = Array.isArray(filters) && filters.length > 0
                 const hasEventGoal = (workflow.conversion?.events?.length ?? 0) > 0
@@ -387,7 +683,14 @@ export const workflowMetricsSummaryLogic = kea<workflowMetricsSummaryLogicType>(
 
         convertedUsersUrl: [
             (s) => [s.getDateRangeAbsolute, (_, p: WorkflowMetricsSummaryLogicProps) => p.id],
-            (getDateRangeAbsolute, id): string => {
+            (
+                getDateRangeAbsolute: () => {
+                    dateFrom: import('lib/dayjs').Dayjs
+                    dateTo: import('lib/dayjs').Dayjs
+                    diffMs: number
+                },
+                id: string
+            ): string => {
                 const { dateFrom, dateTo } = getDateRangeAbsolute()
                 const source: EventsQuery = {
                     kind: NodeKind.EventsQuery,
@@ -428,10 +731,13 @@ export const workflowMetricsSummaryLogic = kea<workflowMetricsSummaryLogicType>(
                 s.getCompletedSingleTrendSeries,
             ],
             (
-                appMetricsTrends,
-                completedTrends,
-                metricNameBySummaryMetric,
-                getCompletedSingleTrendSeries
+                appMetricsTrends: AppMetricsTimeSeriesResponse | null,
+                completedTrends: AppMetricsTimeSeriesResponse | null,
+                metricNameBySummaryMetric: Record<WorkflowSummaryMetric, string>,
+                getCompletedSingleTrendSeries: (
+                    name: string,
+                    previousPeriod?: boolean
+                ) => AppMetricsTimeSeriesResponse | null
             ): AppMetricsTimeSeriesResponse | null => {
                 if (!appMetricsTrends && !completedTrends) {
                     return null
@@ -468,7 +774,57 @@ export const workflowMetricsSummaryLogic = kea<workflowMetricsSummaryLogicType>(
 
         emailMetricsRows: [
             (s) => [s.emailActions, s.emailTotalsByActionId],
-            (emailActions, emailTotalsByActionId): EmailMetricRow[] =>
+            (
+                emailActions: ({
+                    config: {
+                        inputs: Record<
+                            string,
+                            {
+                                bytecode?: any
+                                order?: number | undefined
+                                secret?: boolean | undefined
+                                templating?: 'hog' | 'liquid' | undefined
+                                value: any
+                            }
+                        >
+                        message_category_id?: string | undefined
+                        message_category_type?: 'marketing' | 'transactional' | undefined
+                        template_id: 'template-email'
+                        template_uuid?: string | undefined
+                    }
+                    created_at?: number | undefined
+                    description: string
+                    filters?:
+                        | {
+                              actions?: any[] | undefined
+                              events?: any[] | undefined
+                              properties?: any[] | undefined
+                          }
+                        | null
+                        | undefined
+                    id: string
+                    name: string
+                    on_error?: 'abort' | 'continue' | null | undefined
+                    output_variable?:
+                        | {
+                              key: string
+                              label?: string | null | undefined
+                              result_path?: string | null | undefined
+                              spread?: boolean | null | undefined
+                          }
+                        | {
+                              key: string
+                              label?: string | null | undefined
+                              result_path?: string | null | undefined
+                              spread?: boolean | null | undefined
+                          }[]
+                        | null
+                        | undefined
+                    type: 'function_email'
+                    updated_at?: number | undefined
+                } & Record<string, unknown>)[],
+                emailTotalsByActionId: Record<string, Partial<Record<EmailMetric, number>>>
+            ): EmailMetricRow[] =>
                 emailActions.map((action: { id: string; name: string }) => {
                     const totals = emailTotalsByActionId[action.id] || {}
                     const sent = totals.email_sent ?? 0
diff --git a/products/workflows/frontend/Workflows/workflowSceneLogic.ts b/products/workflows/frontend/Workflows/workflowSceneLogic.ts
index 117be2173611..2f33502f6f16 100644
--- a/products/workflows/frontend/Workflows/workflowSceneLogic.ts
+++ b/products/workflows/frontend/Workflows/workflowSceneLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, key, path, props, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, key, path, props, reducers, selectors } from 'kea'
 import { urlToAction } from 'kea-router'
 
 import { Scene } from 'scenes/sceneTypes'
@@ -7,8 +7,6 @@ import { urls } from 'scenes/urls'
 import { SIDE_PANEL_CONTEXT_KEY, SidePanelSceneContext } from '~/layout/navigation-3000/sidepanel/types'
 import { ActivityScope, Breadcrumb } from '~/types'
 
-import type { workflowSceneLogicType } from './workflowSceneLogicType'
-
 export const WorkflowTabs = ['workflow', 'logs', 'invocations', 'metrics', 'assets', 'history'] as const
 export type WorkflowTab = (typeof WorkflowTabs)[number]
 
@@ -17,6 +15,36 @@ export interface WorkflowSceneLogicProps {
     tab?: WorkflowTab
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface workflowSceneLogicValues {
+    breadcrumbs: Breadcrumb[]
+    currentTab: WorkflowTab
+    sidePanelContext: SidePanelSceneContext | null
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface workflowSceneLogicActions {
+    setCurrentTab: (tab: WorkflowTab) => {
+        tab: 'assets' | 'history' | 'invocations' | 'logs' | 'metrics' | 'workflow'
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface workflowSceneLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        breadcrumbs: (arg: WorkflowSceneLogicProps['id']) => Breadcrumb[]
+        sidePanelContext: (arg: WorkflowSceneLogicProps['id']) => SidePanelSceneContext | null
+    }
+}
+
+export type workflowSceneLogicType = MakeLogicType<
+    workflowSceneLogicValues,
+    workflowSceneLogicActions,
+    WorkflowSceneLogicProps,
+    workflowSceneLogicMeta
+>
+
 export const workflowSceneLogic = kea<workflowSceneLogicType>([
     path(['products', 'workflows', 'frontend', 'workflowSceneLogic']),
     props({ id: 'new' } as WorkflowSceneLogicProps),
@@ -35,7 +63,7 @@ export const workflowSceneLogic = kea<workflowSceneLogicType>([
     selectors({
         breadcrumbs: [
             () => [(_, props) => props.id as WorkflowSceneLogicProps['id']],
-            (id): Breadcrumb[] => {
+            (id: WorkflowSceneLogicProps['id']): Breadcrumb[] => {
                 return [
                     {
                         key: [Scene.Workflows, 'workflows'],
@@ -56,7 +84,7 @@ export const workflowSceneLogic = kea<workflowSceneLogicType>([
         // scene's registered logic, not workflowLogic.
         [SIDE_PANEL_CONTEXT_KEY]: [
             () => [(_, props) => props.id as WorkflowSceneLogicProps['id']],
-            (id): SidePanelSceneContext | null =>
+            (id: WorkflowSceneLogicProps['id']): SidePanelSceneContext | null =>
                 id && id !== 'new'
                     ? {
                           activity_scope: ActivityScope.HOG_FLOW,
diff --git a/products/workflows/frontend/Workflows/workflowsLogic.ts b/products/workflows/frontend/Workflows/workflowsLogic.ts
index 671a3068db96..907c152f2beb 100644
--- a/products/workflows/frontend/Workflows/workflowsLogic.ts
+++ b/products/workflows/frontend/Workflows/workflowsLogic.ts
@@ -1,4 +1,4 @@
-import { actions, kea, key, listeners, path, reducers, selectors } from 'kea'
+import { MakeLogicType, actions, kea, key, listeners, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { router } from 'kea-router'
 
@@ -11,7 +11,6 @@ import { urls } from 'scenes/urls'
 import { deleteFromTree } from '~/layout/panel-layout/ProjectTree/projectTreeLogic'
 
 import type { HogFlow } from './hogflows/types'
-import type { workflowsLogicType } from './workflowsLogicType'
 
 export type WorkflowStatusFilter = 'all' | 'active' | 'draft' | 'archived'
 
@@ -21,6 +20,197 @@ export interface WorkflowsFilters {
     status: WorkflowStatusFilter
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface workflowsLogicValues {
+    allArchivedSelected: boolean
+    creators: {
+        email: string
+        id: number
+        name: string
+        uuid: string
+    }[]
+    filteredWorkflows: HogFlow[]
+    filters: WorkflowsFilters
+    hasLoadedWorkflows: boolean
+    selectedArchivedCount: number
+    selectedArchivedWorkflowIds: Set<string>
+    workflows: HogFlow[]
+    workflowsFuse: Fuse<HogFlow>
+    workflowsLoading: boolean
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface workflowsLogicActions {
+    archiveWorkflow: (workflow: HogFlow) => {
+        workflow: HogFlow
+    }
+    archiveWorkflowFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    archiveWorkflowSuccess: (
+        workflows: HogFlow[],
+        payload?: {
+            workflow: HogFlow
+        }
+    ) => {
+        workflows: HogFlow[]
+        payload?: {
+            workflow: HogFlow
+        }
+    }
+    clearArchivedWorkflowSelection: () => {
+        value: true
+    }
+    deleteSelectedWorkflows: () => {
+        value: true
+    }
+    deleteWorkflow: (workflow: HogFlow) => {
+        workflow: HogFlow
+    }
+    deleteWorkflowFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    deleteWorkflowSuccess: (
+        workflows: HogFlow[],
+        payload?: {
+            workflow: HogFlow
+        }
+    ) => {
+        workflows: HogFlow[]
+        payload?: {
+            workflow: HogFlow
+        }
+    }
+    duplicateWorkflow: (workflow: HogFlow) => {
+        workflow: HogFlow
+    }
+    duplicateWorkflowFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    duplicateWorkflowSuccess: (
+        workflows: HogFlow[],
+        payload?: {
+            workflow: HogFlow
+        }
+    ) => {
+        workflows: HogFlow[]
+        payload?: {
+            workflow: HogFlow
+        }
+    }
+    loadWorkflows: () => {}
+    loadWorkflowsFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    loadWorkflowsSuccess: (
+        workflows: HogFlow[],
+        payload?: {}
+    ) => {
+        workflows: HogFlow[]
+        payload?: {}
+    }
+    restoreWorkflow: (workflow: HogFlow) => {
+        workflow: HogFlow
+    }
+    restoreWorkflowFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    restoreWorkflowSuccess: (
+        workflows: HogFlow[],
+        payload?: {
+            workflow: HogFlow
+        }
+    ) => {
+        workflows: HogFlow[]
+        payload?: {
+            workflow: HogFlow
+        }
+    }
+    selectAllArchivedWorkflows: (ids: string[]) => {
+        ids: string[]
+    }
+    setCreatedBy: (createdBy: string | null) => {
+        createdBy: string | null
+    }
+    setFilters: (filters: Partial<WorkflowsFilters>) => {
+        filters: Partial<WorkflowsFilters>
+    }
+    setSearchTerm: (search: string) => {
+        search: string
+    }
+    setStatusFilter: (status: WorkflowStatusFilter) => {
+        status: WorkflowStatusFilter
+    }
+    toggleArchivedWorkflowSelection: (id: string) => {
+        id: string
+    }
+    toggleWorkflowStatus: (workflow: HogFlow) => {
+        workflow: HogFlow
+    }
+    toggleWorkflowStatusFailure: (
+        error: string,
+        errorObject?: any
+    ) => {
+        error: string
+        errorObject?: any
+    }
+    toggleWorkflowStatusSuccess: (
+        workflows: HogFlow[],
+        payload?: {
+            workflow: HogFlow
+        }
+    ) => {
+        workflows: HogFlow[]
+        payload?: {
+            workflow: HogFlow
+        }
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface workflowsLogicMeta {
+    key: string
+    __keaTypeGenInternalSelectorTypes: {
+        workflowsFuse: (workflows: HogFlow[]) => Fuse<HogFlow>
+        filteredWorkflows: (workflows: HogFlow[], filters: WorkflowsFilters, workflowsFuse: Fuse<HogFlow>) => HogFlow[]
+        allArchivedSelected: (filteredWorkflows: HogFlow[], selectedArchivedWorkflowIds: Set<string>) => boolean
+        selectedArchivedCount: (selectedArchivedWorkflowIds: Set<string>) => number
+        creators: (workflows: HogFlow[]) => {
+            email: string
+            id: number
+            name: string
+            uuid: string
+        }[]
+    }
+}
+
+export type workflowsLogicType = MakeLogicType<
+    workflowsLogicValues,
+    workflowsLogicActions,
+    Record<string, any>,
+    workflowsLogicMeta
+>
+
 export const workflowsLogic = kea<workflowsLogicType>([
     key(() => 'workflowsLogic'),
     path(['products', 'workflows', 'frontend', 'workflowsLogic']),
@@ -181,7 +371,7 @@ export const workflowsLogic = kea<workflowsLogicType>([
     selectors({
         workflowsFuse: [
             (s) => [s.workflows],
-            (workflows): Fuse<HogFlow> => {
+            (workflows: HogFlow[]): Fuse<HogFlow> => {
                 return createFuse(workflows || [], {
                     keys: [{ name: 'name', weight: 2 }, 'description'],
                     threshold: 0.3,
@@ -192,7 +382,7 @@ export const workflowsLogic = kea<workflowsLogicType>([
         ],
         filteredWorkflows: [
             (s) => [s.workflows, s.filters, s.workflowsFuse],
-            (workflows, filters, workflowsFuse): HogFlow[] => {
+            (workflows: HogFlow[], filters: WorkflowsFilters, workflowsFuse: Fuse<HogFlow>): HogFlow[] => {
                 let filtered = workflows
 
                 if (filters.search) {
@@ -214,14 +404,17 @@ export const workflowsLogic = kea<workflowsLogicType>([
         ],
         allArchivedSelected: [
             (s) => [s.filteredWorkflows, s.selectedArchivedWorkflowIds],
-            (filteredWorkflows, selectedIds): boolean => {
+            (filteredWorkflows: HogFlow[], selectedIds: Set<string>): boolean => {
                 return filteredWorkflows.length > 0 && filteredWorkflows.every((w) => selectedIds.has(w.id))
             },
         ],
-        selectedArchivedCount: [(s) => [s.selectedArchivedWorkflowIds], (selectedIds): number => selectedIds.size],
+        selectedArchivedCount: [
+            (s) => [s.selectedArchivedWorkflowIds],
+            (selectedIds: Set<string>): number => selectedIds.size,
+        ],
         creators: [
             (s) => [s.workflows],
-            (workflows) => {
+            (workflows: HogFlow[]) => {
                 const uniqueCreators = new Map<number, { id: number; uuid: string; name: string; email: string }>()
                 workflows.forEach((workflow) => {
                     if (workflow.created_by) {
diff --git a/products/workflows/frontend/WorkflowsScene.tsx b/products/workflows/frontend/WorkflowsScene.tsx
index 03a72faeeee5..719b307313ff 100644
--- a/products/workflows/frontend/WorkflowsScene.tsx
+++ b/products/workflows/frontend/WorkflowsScene.tsx
@@ -1,4 +1,4 @@
-import { actions, kea, path, props, reducers, selectors, useActions, useValues } from 'kea'
+import { MakeLogicType, actions, kea, path, props, reducers, selectors, useActions, useValues } from 'kea'
 import { urlToAction } from 'kea-router'
 
 import { IconApple, IconAndroid, IconLetter, IconPlusSmall } from '@posthog/icons'
@@ -31,7 +31,6 @@ import { MessageTemplatesTable } from './TemplateLibrary/MessageTemplatesTable'
 import { newWorkflowLogic } from './Workflows/newWorkflowLogic'
 import { NewWorkflowModal } from './Workflows/NewWorkflowModal'
 import { WorkflowsTable } from './Workflows/WorkflowsTable'
-import type { workflowsSceneLogicType } from './WorkflowsSceneType'
 
 const WORKFLOW_SCENE_TABS = ['workflows', 'library', 'channels', 'opt-outs'] as const
 export type WorkflowsSceneTab = (typeof WORKFLOW_SCENE_TABS)[number]
@@ -40,6 +39,35 @@ export type WorkflowsSceneProps = {
     tab?: WorkflowsSceneTab
 }
 
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface workflowsSceneLogicValues {
+    breadcrumbs: Breadcrumb[]
+    currentTab: WorkflowsSceneTab
+    logicProps: any
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface workflowsSceneLogicActions {
+    setCurrentTab: (tab: WorkflowsSceneTab) => {
+        tab: 'channels' | 'library' | 'opt-outs' | 'workflows'
+    }
+}
+
+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
+export interface workflowsSceneLogicMeta {
+    __keaTypeGenInternalSelectorTypes: {
+        logicProps: (arg: any) => any
+        breadcrumbs: (currentTab: 'channels' | 'library' | 'opt-outs' | 'workflows') => Breadcrumb[]
+    }
+}
+
+export type workflowsSceneLogicType = MakeLogicType<
+    workflowsSceneLogicValues,
+    workflowsSceneLogicActions,
+    WorkflowsSceneProps,
+    workflowsSceneLogicMeta
+>
+
 export const workflowsSceneLogic = kea<workflowsSceneLogicType>([
     props({} as WorkflowsSceneProps),
     path(() => ['scenes', 'workflows', 'workflowsSceneLogic']),
@@ -58,7 +86,7 @@ export const workflowsSceneLogic = kea<workflowsSceneLogicType>([
         logicProps: [() => [(_, props) => props], (props) => props],
         breadcrumbs: [
             (s) => [s.currentTab],
-            (currentTab): Breadcrumb[] => {
+            (currentTab: WorkflowsSceneTab): Breadcrumb[] => {
                 return [
                     {
                         key: [Scene.Workflows, currentTab],